Some more content.

This commit is contained in:
Kevin Dungs
2014-08-02 18:36:54 +02:00
parent 81857a688f
commit 3082f9d0c1
8 changed files with 49 additions and 14 deletions
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 5.2 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

+5
View File
@@ -21,3 +21,8 @@ body {
stroke: #000;
shape-rendering: crispEdges;
}
.scrollable {
height: 50%;
overflow: auto;
}
+4 -8
View File
@@ -37,15 +37,13 @@
</canvas>
</div>
<div class="col-xs-3" id="Research" ng-controller="ResearchController as rc">
<div class="scrollable col-xs-3" id="Research" ng-controller="ResearchController as rc">
<h1>Research</h1>
<hr>
<div id="ResearchHist"></div>
<ul class="media-list">
<li class="media" ng-repeat="r in rc.research" ng-show="r.is_visible()">
<a class="pull-left" href="#">
<img class="media-object" src="http://placekitten.com/64/64" alt="...">
</a>
<img class="pull-left" class="media-object" src="{{ r.image }}" alt="">
<div class="media-body">
<h4 class="media-heading">{{ r.name }} <span ng-show="r.level > 0" class="badge">Level {{ r.level }}</span></h4>
<p ng-show="r.level > 0">{{ r.description }} Researching it will give you {{ r.reputation }} reputation.</p>
@@ -55,14 +53,12 @@
</ul>
</div>
<div class="col-xs-3" id="HR" ng-controller="HRController as hrc">
<div class="scrollable col-xs-3" id="HR" ng-controller="HRController as hrc">
<h1>HR Department</h1>
<hr>
<ul class="media-list">
<li class="media" ng-repeat="w in hrc.workers" ng-show="w.is_visible()">
<a class="pull-left" href="#">
<img class="media-object" src="http://placekitten.com/64/64" alt="...">
</a>
<img class="pull-left" class="media-object" src="{{ w.image }}" alt="">
<div class="media-body">
<h4 class="media-heading">{{ w.name }} <span ng-show="w.hired > 0" class="badge">{{ w.hired }}</span></h4>
<p ng-show="w.hired > 0">{{ w.description }} They produce {{ w.rate }} data per second.</p>
+20 -4
View File
@@ -5,14 +5,30 @@
"reputation": 1,
"cost": 10,
"cost_increase": 1.2,
"histogram": {}
"image": "assets/W.png"
},
{
"name": "Z-Boson",
"description": "The Z-Boson.",
"reputation": 5,
"cost": 50,
"cost_increase": 1.2,
"image": "assets/Z.png"
},
{
"name": "top-Quark",
"description": "The top-Quark.",
"reputation": 100,
"cost": 1000,
"cost_increase": 1.2,
"image": "assets/t.png"
},
{
"name": "Higgs-Boson",
"description": "The Higgs-Boson...",
"reputation": 100,
"cost": 1000,
"reputation": 1000,
"cost": 10000,
"cost_increase": 1.2,
"histogram": {}
"image": "assets/H.png"
}
]
+20 -2
View File
@@ -4,13 +4,31 @@
"description": "Basically slaves, just with fewer rights.",
"cost": 100,
"cost_increase": 1.4,
"rate": 1
"rate": 1,
"image": "http://placekitten.com/64/64"
},
{
"name": "Postdocs",
"description": "Can get shit done for you.",
"cost": 1000,
"cost_increase": 1.4,
"rate": 10
"rate": 10,
"image": "http://placekitten.com/64/64"
},
{
"name": "Fellows",
"description": "You pay them a lot. They work a lot.",
"cost": 10000,
"cost_increase": 1.5,
"rate": 100,
"image": "http://placekitten.com/64/64"
},
{
"name": "Tenured Professors",
"description": "They bring their own group along and are able to get a lot of work done.",
"cost": 100000,
"cost_increase": 1.6,
"rate": 1000,
"image": "http://placekitten.com/64/64"
}
]