diff --git a/radar/worker/task/process_update.py b/radar/worker/task/process_update.py index 5dad303..2f42076 100644 --- a/radar/worker/task/process_update.py +++ b/radar/worker/task/process_update.py @@ -145,7 +145,7 @@ class ProcessCISystems(): print "operator %s was updated successfully" % theoperator['operator_name'] def _request_json(self, path, params, headers=None, method="post", - status=None, path_prefix="http://localhost/v1"): + status=None, path_prefix="http://localhost/api/v1"): merged_headers = self.default_headers.copy() if headers: diff --git a/webclient/Gruntfile.js b/webclient/Gruntfile.js index f170820..7f3b974 100644 --- a/webclient/Gruntfile.js +++ b/webclient/Gruntfile.js @@ -78,19 +78,6 @@ module.exports = function(grunt) { } ] }, - publish: { - files: [ - { - expand: true, - dot: true, - cwd: dir.build, - dest: dir.publish, - src: [ - '**/*.*' - ] - } - ] - } }, html2js: { options: { @@ -193,7 +180,8 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-connect-proxy'); grunt.loadNpmTasks('grunt-open'); grunt.loadNpmTasks('grunt-contrib-watch'); - grunt.registerTask('default', ['html2js','cssmin','useminPrepare','concat','copy','usemin','copy:publish','serve']); + grunt.registerTask('build', ['html2js','cssmin','useminPrepare','concat','copy','usemin']); + grunt.registerTask('default', ['html2js','cssmin','useminPrepare','concat','copy','usemin','serve']); grunt.registerTask('publish', ['copy']); grunt.registerTask('serve', function (target) { grunt.task.run([ diff --git a/webclient/index.html b/webclient/index.html deleted file mode 100644 index 6e28fb6..0000000 --- a/webclient/index.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - Radar Third Party Dashboard - - - - - - - - - - - - - - - - -
-
- - - - diff --git a/webclient/src/app/header/template/header_menu.html b/webclient/src/app/header/template/header_menu.html index f49d4ac..f2581cb 100644 --- a/webclient/src/app/header/template/header_menu.html +++ b/webclient/src/app/header/template/header_menu.html @@ -1,3 +1,15 @@ + + + + diff --git a/webclient/src/app/header/template/side_menu.html b/webclient/src/app/header/template/side_menu.html new file mode 100644 index 0000000..2aacee2 --- /dev/null +++ b/webclient/src/app/header/template/side_menu.html @@ -0,0 +1,27 @@ + diff --git a/webclient/src/app/root/module.js b/webclient/src/app/root/module.js index a6330fa..41ab52f 100644 --- a/webclient/src/app/root/module.js +++ b/webclient/src/app/root/module.js @@ -2,7 +2,7 @@ angular.module('db.root', ['db.services', 'db.templates', 'db.header', 'db.home', 'db.dashboard', 'db.pages', 'db.auth', 'db.systems', 'db.operators', 'db.profile', 'db.notification', 'db.search', 'ui.router', 'ui.bootstrap', 'angular-data.DSCacheFactory', - 'angularMoment']) + 'angularMoment', 'angulartics', 'angulartics.google.analytics']) .config(function ($urlRouterProvider, $locationProvider, $httpProvider) { @@ -17,4 +17,4 @@ angular.module('db.root', // Attach common request headers out of courtesy to the API $httpProvider.defaults.headers.common['X-Client'] = 'Dashboard'; - }) \ No newline at end of file + }) diff --git a/webclient/src/index.html b/webclient/src/index.html index 04b4799..7dfff4e 100644 --- a/webclient/src/index.html +++ b/webclient/src/index.html @@ -27,15 +27,26 @@ + + +
-
+
+
diff --git a/webclient/src/theme/css/bootstrap.css b/webclient/src/theme/css/bootstrap.css index 62be186..0a7a384 100644 --- a/webclient/src/theme/css/bootstrap.css +++ b/webclient/src/theme/css/bootstrap.css @@ -3499,6 +3499,10 @@ tbody.collapse.in { box-shadow: 0 6px 12px rgba(0, 0, 0, .175) } +.dropdown-menu-mobile { + min-width: 20px; +} + .dropdown-menu.pull-right { right: 0; left: auto