Merge branch 'dev' into komplexeDatenobjekte

BP2014W1 · Mar 16, 2015 · ebad722 · ebad722
2 parents 5d5cfda + 118d8f1
commit ebad722
Showing 1 changed file with 25 additions and 25 deletions.
diff --git a/src/main/webapp/asset/templates/scenarioDetails.html b/src/main/webapp/asset/templates/scenarioDetails.html
@@ -17,32 +17,32 @@ <h2>{{scenarioCtrl.getCurrentScenario()['label']}}</h2>
 			<th>{{scenarioCtrl.getCurrentScenario()['instanceIds'].length}}</th>
 		</tr>
 	</table>
+	<div class="pull-right">
+		<input ng-model="searchText" placeholder="SearchTerm">
+		<a type="button" data-toggle="modal" data-target="#createInstance" class="btn btn-default">
+					Start Instance
+		</a>
+	</div>
 </div>
-<hr>
-
-<input ng-model="searchText" placeholder="SearchTerm">
-<a type="button" data-toggle="modal" data-target="#createInstance" class="btn btn-default">
-			Start Instance
-</a>
-
-<div class="table-responsive">
-	<table class="table table-striped table-hover">
-		<caption>Instances of {{instanceCtrl.getScenarioName()}} currently running</caption>
-
-		<thead>
-			<tr>
-				<th>Instance #</th>
-				<th>Process name</th>
-			</tr>
-		</thead>
-		<tbody>
-			<tr style="cursor: pointer" ng-repeat="(key, value) in instanceCtrl.instances track by $index"  ng-show="!searchText || value['label'].indexOf(searchText) > -1" ng-click="instanceCtrl.goToDetailsFrom(key);">
-				<td>{{key}}</td>
-				<td>{{value['label']}}</td>
-			</tr>
-			</a>
-		</tbody>
-	</table>
+<hr><br>
+<div class="row">
+	<div class="table-responsive" ng-controller="ScenarioInstanceController as instanceCtrl">
+		<table class="table table-striped table-hover">		
+			<thead>
+				<tr>
+					<th>Instance #</th>
+					<th>Process name</th>
+				</tr>
+			</thead>
+			<tbody>
+				<tr style="cursor: pointer" ng-repeat="(key, value) in instanceCtrl.instances track by $index"  ng-show="!searchText || value['label'].indexOf(searchText) > -1" ng-click="instanceCtrl.goToDetailsFrom(key);" >
+					<td>{{key}}</td>
+					<td>{{value['label']}}</td>
+				</tr>
+				</a>
+			</tbody>
+		</table>
+	</div>
 </div>
 
 <!-- modals -->