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

Fixed grunt template issues, version bump.

pull/2/head
Kevan Ahlquist 2015-01-18 16:39:10 -06:00
parent 2974f69932
commit f65fed8d0a
7 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -3,5 +3,4 @@ logs/*
dockerui dockerui
*.esproj/* *.esproj/*
node_modules node_modules
dist
.idea .idea

4
Makefile
View File

@ -12,6 +12,10 @@ build:
grunt build grunt build
docker build --rm -t dockerui . docker build --rm -t dockerui .
build-release:
grunt release
docker build --rm -t dockerui .
test: test:
grunt grunt

6
app/app.js
View File

@ -1,4 +1,4 @@
angular.module('<%= pkg.name %>', ['<%= pkg.name %>.templates', 'ngRoute', '<%= pkg.name %>.services', '<%= pkg.name %>.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings', 'builder', 'containerLogs']) angular.module('dockerui', ['dockerui.templates', 'ngRoute', 'dockerui.services', 'dockerui.filters', 'masthead', 'footer', 'dashboard', 'container', 'containers', 'images', 'image', 'startContainer', 'sidebar', 'settings', 'builder', 'containerLogs'])
.config(['$routeProvider', function ($routeProvider) { .config(['$routeProvider', function ($routeProvider) {
'use strict'; 'use strict';
$routeProvider.when('/', {templateUrl: 'app/components/dashboard/dashboard.html', controller: 'DashboardController'}); $routeProvider.when('/', {templateUrl: 'app/components/dashboard/dashboard.html', controller: 'DashboardController'});
@ -14,5 +14,5 @@ angular.module('<%= pkg.name %>', ['<%= pkg.name %>.templates', 'ngRoute', '<%=
// 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', 'v<%= pkg.version %>') .constant('UI_VERSION', 'v0.6.0')
.constant('DOCKER_API_VERSION', 'v1.15'); .constant('DOCKER_API_VERSION', 'v1.16');

2
app/shared/filters.js
View File

@ -1,4 +1,4 @@
angular.module('<%= pkg.name %>.filters', []) angular.module('dockerui.filters', [])
.filter('truncate', function() { .filter('truncate', function() {
'use strict'; 'use strict';
return function(text, length, end) { return function(text, length, end) {

2
app/shared/services.js
View File

@ -1,4 +1,4 @@
angular.module('<%= pkg.name %>.services', ['ngResource']) angular.module('dockerui.services', ['ngResource'])
.factory('Container', function($resource, Settings) { .factory('Container', function($resource, Settings) {
'use strict'; 'use strict';
// Resource for interacting with the docker containers // Resource for interacting with the docker containers

2
package.json
View File

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

2
test/unit/shared/filters.spec.js
View File

@ -1,5 +1,5 @@
describe('filters', function () { describe('filters', function () {
beforeEach(module('<%= pkg.name %>.filters')); beforeEach(module('dockerui.filters'));
describe('truncate', function () { describe('truncate', function () {
it('should truncate the string to 10 characters ending in "..." by default', inject(function(truncateFilter) { it('should truncate the string to 10 characters ending in "..." by default', inject(function(truncateFilter) {