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

Merge pull request #35 from zbbfufu/master 

Fixed Javascript/AngularJS problems
pull/2/head
Michael Crosby 2014-07-28 11:47:31 -07:00
parent 5075995129 56b009155c
commit 43922a7d26
9 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
index.html
View File

@ -18,38 +18,19 @@
<script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
<!-- Fav and touch icons -->
<link rel="shortcut icon" href="../assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="../assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="../assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="../assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="../assets/ico/apple-touch-icon-57-precomposed.png">
</head>
<body>
<div class="container">
<div ng-include="template" ng-controller="MastheadController"></div>
<div id="view" ng-view></div>
<div class="container-bottom"></div>
<div ng-include="template" ng-controller="StatusBarController"></div>
</div>
<script src="../assets/js/jquery.js"></script>
<script src="../assets/js/bootstrap-transition.js"></script>
<script src="../assets/js/bootstrap-alert.js"></script>
<script src="../assets/js/bootstrap-modal.js"></script>
<script src="../assets/js/bootstrap-dropdown.js"></script>
<script src="../assets/js/bootstrap-scrollspy.js"></script>
<script src="../assets/js/bootstrap-tab.js"></script>
<script src="../assets/js/bootstrap-tooltip.js"></script>
<script src="../assets/js/bootstrap-popover.js"></script>
<script src="../assets/js/bootstrap-button.js"></script>
<script src="../assets/js/bootstrap-collapse.js"></script>
<script src="../assets/js/bootstrap-carousel.js"></script>
<script src="../assets/js/bootstrap-typeahead.js"></script>
<script src="assets/js/jquery.js"></script>
<script src="assets/js/bootstrap-transition.js"></script>
<script src="assets/js/bootstrap-alert.js"></script>
<script src="assets/js/bootstrap-modal.js"></script>
<script src="assets/js/bootstrap-dropdown.js"></script>
<script src="assets/js/bootstrap-scrollspy.js"></script>
<script src="assets/js/bootstrap-tab.js"></script>
<script src="assets/js/bootstrap-tooltip.js"></script>
<script src="assets/js/bootstrap-popover.js"></script>
<script src="assets/js/bootstrap-button.js"></script>
<script src="assets/js/bootstrap-collapse.js"></script>
<script src="assets/js/bootstrap-carousel.js"></script>
<script src="assets/js/bootstrap-typeahead.js"></script>
<script src="lib/spin.js" type="text/javascript" charset="utf-8"></script>
@ -67,5 +48,25 @@
<script src="js/controllers.js"></script>
<script src="js/viewmodel.js"></script>
<!-- Fav and touch icons -->
<link rel="shortcut icon" href="assets/ico/favicon.ico">
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png">
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png">
<link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png">
</head>
<body>
<div class="container">
<div ng-include="template" ng-controller="MastheadController"></div>
<div id="view" ng-view></div>
<div class="container-bottom"></div>
<div ng-include="template" ng-controller="StatusBarController"></div>
</div>
</body>
</html>

4
js/controllers.js
View File

@ -188,7 +188,7 @@ function ContainerController($scope, $routeParams, $location, Container, Message
};
$scope.hasContent = function(data) {
return data !== null && data !== undefined && data.length > 1;
return data !== null && data !== undefined;
};
$scope.getChanges = function() {
@ -435,7 +435,7 @@ function StartContainerController($scope, $routeParams, $location, Container, Me
}
function BuilderController($scope, Dockerfile, Messages) {
$scope.template = '/partials/builder.html';
$scope.template = 'partials/builder.html';
}
function failedRequestHandler(e, Messages) {

2
partials/container.html
View File

@ -68,7 +68,7 @@
</tr>
<tr>
<td>Image:</td>
<td><a href="/#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
<td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
</tr>
<tr>
<td>State:</td>

4
partials/containers.html
View File

@ -33,8 +33,8 @@
<tbody>
<tr ng-repeat="container in containers|orderBy:predicate">
<td><input type="checkbox" ng-model="container.Checked" /></td>
<td><a href="/#/containers/{{ container.Id }}/">{{ container|containername}}</a></td>
<td><a href="/#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
<td><a href="#/containers/{{ container.Id }}/">{{ container|containername}}</a></td>
<td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
<td>{{ container.Command|truncate:40 }}</td>
<td>{{ container.Created|getdate }}</td>
<td><span class="label label-{{ container.Status|statusbadge }}">{{ container.Status }}</span></td>

2
partials/dashboard.html
View File

@ -16,7 +16,7 @@
<h3>Running Containers</h3>
<ul>
<li ng-repeat="container in containers|orderBy:predicate">
<a href="/#/containers/{{ container.Id }}/">{{ container|containername }}</a>
<a href="#/containers/{{ container.Id }}/">{{ container|containername }}</a>
<span class="label label-{{ container.Status|statusbadge }}">{{ container.Status }}</span>
</li>
</ul>

2
partials/image.html
View File

@ -27,7 +27,7 @@
</tr>
<tr>
<td>Parent:</td>
<td><a href="/#/images/{{ image.parent }}/">{{ image.parent }}</a></td>
<td><a href="#/images/{{ image.parent }}/">{{ image.parent }}</a></td>
</tr>
<tr>
<td>Size:</td>

2
partials/images.html
View File

@ -23,7 +23,7 @@
<tbody>
<tr ng-repeat="image in images | orderBy:predicate">
<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.Created|getdate }}</td>
</tr>

6
partials/masthead.html
View File

@ -5,9 +5,9 @@
<div class="container">
<ul class="nav">
<li><a href="#">Dashboard</a></li>
<li><a href="/#/containers/">Containers</a></li>
<li><a href="/#/images/">Images</a></li>
<li><a href="/#/settings/">Settings</a></li>
<li><a href="#/containers/">Containers</a></li>
<li><a href="#/images/">Images</a></li>
<li><a href="#/settings/">Settings</a></li>
</ul>
</div>
</div>

2
partials/sidebar.html
View File

@ -4,7 +4,7 @@
<strong>Endpoint: </strong>{{ endpoint }}
<ul>
<li ng-repeat="container in containers">
<a href="/#/containers/{{ container.Id }}/">{{ container.Id|truncate:20 }}</a>
<a href="#/containers/{{ container.Id }}/">{{ container.Id|truncate:20 }}</a>
<span class="pull-right label label-{{ container.Status|statusbadge }}">{{ container.Status }}</span>
</li>
</ul>