github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into stats 

Conflicts:
	app/components/containers/containers.html
	app/components/images/images.html
pull/2/head
Kevan Ahlquist 2015-09-09 22:55:07 -05:00
parent abccb316f8 a96298db59
commit c57a75f78f
3 changed files with 51 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/components/container/container.html
View File

@ -12,7 +12,7 @@
Container: Container:
<input type="text" ng-model="container.newContainerName"> <input type="text" ng-model="container.newContainerName">
<button class="btn btn-success" <button class="btn btn-success"
ng-click="renameContainer()">Edit ng-click="renameContainer()">Save
</button> </button>
<button class="btn btn-danger" <button class="btn btn-danger"
ng-click="container.edit = false;">&times;</button> ng-click="container.edit = false;">&times;</button>

12
app/components/containers/containers.html
View File

@ -1,10 +1,10 @@
<h2>Containers:</h2> <h2>Containers:</h2>
<div> <div>
<ul class="nav nav-pills pull-left"> <ul class="nav nav-pills pull-left">
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" data-target="#">Actions <b <a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" data-target="#">Actions <b class="caret"></b></a>
class="caret"></b></a>
<ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4"> <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
<li><a tabindex="-1" href="" ng-click="startAction()">Start</a></li> <li><a tabindex="-1" href="" ng-click="startAction()">Start</a></li>
<li><a tabindex="-1" href="" ng-click="stopAction()">Stop</a></li> <li><a tabindex="-1" href="" ng-click="stopAction()">Stop</a></li>
@ -17,9 +17,9 @@
</li> </li>
</ul> </ul>
<div class="pull-right"> <div class="pull-right form-inline">
<input type="checkbox" ng-model="displayAll" id="displayAll" ng-change="toggleGetAll()"/> <label <input type="checkbox" ng-model="displayAll" id="displayAll" ng-change="toggleGetAll()"/> <label for="displayAll">Display All</label>&nbsp;
for="displayAll">Display All</label> <input type="text" class="form-control" style="vertical-align: center" id="filter" placeholder="Filter" ng-model="filter"/> <label class="sr-only" for="filter">Filter</label>
</div> </div>
</div> </div>
<table class="table table-striped"> <table class="table table-striped">
@ -34,7 +34,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="container in containers|orderBy:predicate"> <tr ng-repeat="container in containers | filter:filter | orderBy:predicate">
<td><input type="checkbox" ng-model="container.Checked" /></td> <td><input type="checkbox" ng-model="container.Checked" /></td>
<td><a href="#/containers/{{ container.Id }}/">{{ container|containername}}</a></td> <td><a href="#/containers/{{ container.Id }}/">{{ container|containername}}</a></td>
<td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td> <td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td>

13
app/components/images/images.html
View File

@ -3,16 +3,21 @@
<h2>Images:</h2> <h2>Images:</h2>
<ul class="nav nav-pills"> <div>
<ul class="nav nav-pills pull-left">
<li class="dropdown"> <li class="dropdown">
<a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" data-target="#">Actions <b <a class="dropdown-toggle" id="drop4" role="button" data-toggle="dropdown" data-target="#">Actions <b class="caret"></b></a>
class="caret"></b></a>
<ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4"> <ul id="menu1" class="dropdown-menu" role="menu" aria-labelledby="drop4">
<li><a tabindex="-1" href="" ng-click="removeAction()">Remove</a></li> <li><a tabindex="-1" href="" ng-click="removeAction()">Remove</a></li>
</ul> </ul>
</li> </li>
<li><a data-toggle="modal" data-target="#pull-modal" href="">Pull</a></li> <li><a data-toggle="modal" data-target="#pull-modal" href="">Pull</a></li>
</ul> </ul>
<div class="pull-right form-inline">
<input type="text" class="form-control" id="filter" placeholder="Filter" ng-model="filter"/> <label class="sr-only" for="filter">Filter</label>
</div>
</div>
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
@ -24,7 +29,7 @@
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<tr ng-repeat="image in images | orderBy:predicate"> <tr ng-repeat="image in images | filter:filter | orderBy:predicate">
<td><input type="checkbox" ng-model="image.Checked" /></td> <td><input type="checkbox" ng-model="image.Checked" /></td>
<td><a href="#/images/{{ image.Id }}/?tag={{ image|repotag }}">{{ image.Id|truncate:20}}</a></td> <td><a href="#/images/{{ image.Id }}/?tag={{ image|repotag }}">{{ image.Id|truncate:20}}</a></td>
<td>{{ image|repotag }}</td> <td>{{ image|repotag }}</td>