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

Fixed dashboard graphs, Chart.js doesn't like charts being hidden on creation, fixed routing issue to dashboard, version bump.

pull/2/head
Kevan Ahlquist 2015-08-29 01:57:08 -05:00
parent ce90515c95
commit 5d4a2a7c25
4 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/app.js
View File

@ -48,5 +48,5 @@ angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services'
// You need to set this to the api endpoint without the port i.e. http://192.168.1.9 // You need to set this to the api endpoint without the port i.e. http://192.168.1.9
.constant('DOCKER_ENDPOINT', 'dockerapi') .constant('DOCKER_ENDPOINT', 'dockerapi')
.constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243 .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred. If you have a port, prefix it with a ':' i.e. :4243
.constant('UI_VERSION', 'v0.6.0') .constant('UI_VERSION', 'v0.8.0')
.constant('DOCKER_API_VERSION', 'v1.17'); .constant('DOCKER_API_VERSION', 'v1.20');

2
app/components/dashboard/dashboardController.js
View File

@ -19,14 +19,12 @@ angular.module('dashboard', [])
var opts = {animation: false}; var opts = {animation: false};
if (Settings.firstLoad) { if (Settings.firstLoad) {
$('#stats').hide();
opts.animation = true; opts.animation = true;
Settings.firstLoad = false; Settings.firstLoad = false;
$('#masthead').show(); $('#masthead').show();
setTimeout(function () { setTimeout(function () {
$('#masthead').slideUp('slow'); $('#masthead').slideUp('slow');
$('#stats').slideDown('slow');
}, 5000); }, 5000);
} }

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

@ -1,7 +1,7 @@
<div class="masthead"> <div class="masthead">
<h3 class="text-muted">DockerUI</h3> <h3 class="text-muted">DockerUI</h3>
<ul class="nav well"> <ul class="nav well">
<li><a href="#">Dashboard</a></li> <li><a href="#/">Dashboard</a></li>
<li><a href="#/containers/">Containers</a></li> <li><a href="#/containers/">Containers</a></li>
<li><a href="#/containers_network/">Containers Network</a></li> <li><a href="#/containers_network/">Containers Network</a></li>
<li><a href="#/images/">Images</a></li> <li><a href="#/images/">Images</a></li>

2
package.json
View File

@ -2,7 +2,7 @@
"author": "Michael Crosby & Kevan Ahlquist", "author": "Michael Crosby & Kevan Ahlquist",
"name": "dockerui", "name": "dockerui",
"homepage": "https://github.com/crosbymichael/dockerui", "homepage": "https://github.com/crosbymichael/dockerui",
"version": "0.6.0", "version": "0.8.0",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:crosbymichael/dockerui.git" "url": "git@github.com:crosbymichael/dockerui.git"