modifications to stylesheet for mobile devices
Change-Id: I91bc06acf7f6bcc823ac3a6696f1faf54fec6d2c
This commit is contained in:
Steven Weston
parent
297cfd8de3
commit
ee2c628cd7
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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([
|
||||
|
|
|
|||
|
|
@ -1,31 +0,0 @@
|
|||
<!DOCTYPE html>
|
||||
<html id="ng-app">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta name="description" content="">
|
||||
<meta name="author" content="">
|
||||
<title>Radar Third Party Dashboard</title>
|
||||
|
||||
<!-- Google's Ajax Crawling: https://developers.google.com/webmasters/ajax-crawling -->
|
||||
<meta name="fragment" content="!">
|
||||
|
||||
<!-- Icons -->
|
||||
<link rel="shortcut icon" href="favicon.ico">
|
||||
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.2.0/css/font-awesome.min.css" rel="stylesheet">
|
||||
<link rel="stylesheet" href="styles/main.css">
|
||||
|
||||
<script src="js/libs.js"></script>
|
||||
|
||||
<script src="js/templates.js"></script>
|
||||
<script src="js/dashboard.js"></script>
|
||||
|
||||
</head>
|
||||
<body ng-class="{'logged-in' : isLoggedIn, 'submenu': hasSubmenu}">
|
||||
<header ng-include src="'app/header/template/header_menu.html'" ></header>
|
||||
<div ui-view class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main"></div>
|
||||
<notifications></notifications>
|
||||
</body>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -1,3 +1,15 @@
|
|||
<nav class="navbar navbar-default navbar-fixed-top"
|
||||
role="navigation">
|
||||
<div class="container-fluid visible-xs"
|
||||
ng-include
|
||||
src="'/inline/header_mobile.html'">
|
||||
</div>
|
||||
<div class="container-fluid hidden-xs"
|
||||
ng-include
|
||||
src="'/inline/header_regular.html'">
|
||||
</div>
|
||||
</nav>
|
||||
<script type="text/ng-template" id="/inline/header_regular.html">
|
||||
<div ng-controller="HeaderController">
|
||||
<nav class="navbar navbar-inverse navbar-fixed-top"
|
||||
role="navigation">
|
||||
|
|
@ -8,43 +20,43 @@
|
|||
</a>
|
||||
</div>
|
||||
<div id="navbar" class="navbar-collapse collapse">
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li ng-hide="isLoggedIn">
|
||||
<a href="#!/auth/authorize">
|
||||
Login
|
||||
<span class="glyphicon glyphicon-log-in"
|
||||
aria-hidden="true"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="dropdown" ng-show="isLoggedIn" dropdown>
|
||||
<a href="#" class="dropdown-toggle"
|
||||
data-toggle="dropdown"
|
||||
dropdown-toggle>
|
||||
<span ng-show="currentUser.$resolved">
|
||||
{{currentUser.full_name}}
|
||||
<ul class="nav navbar-nav navbar-right">
|
||||
<li ng-hide="isLoggedIn">
|
||||
<a href="#!/auth/authorize">
|
||||
Login
|
||||
<span class="glyphicon glyphicon-log-in"
|
||||
aria-hidden="true"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="dropdown" ng-show="isLoggedIn" dropdown>
|
||||
<a href="#" class="dropdown-toggle"
|
||||
data-toggle="dropdown"
|
||||
dropdown-toggle>
|
||||
<span ng-show="currentUser.$resolved">
|
||||
{{currentUser.full_name}}
|
||||
<span class="caret dropdown" aria-hidden="true"></span>
|
||||
</span>
|
||||
<em class="text-muted" ng-hide="currentUser.$resolved">
|
||||
Loading...
|
||||
</em>
|
||||
</a>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li>
|
||||
<a href="#!/profile/preferences">
|
||||
<i class="fa fa-cog"></i>
|
||||
Preferences
|
||||
</a>
|
||||
</li>
|
||||
<li class="divider"></li>
|
||||
<li>
|
||||
<a href="#!/auth/deauthorize">
|
||||
<span class="glyphicon glyphicon-log-out"
|
||||
aria-hidden="true"></span>
|
||||
Logout
|
||||
</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
</span>
|
||||
<em class="text-muted" ng-hide="currentUser.$resolved">
|
||||
Loading...
|
||||
</em>
|
||||
</a>
|
||||
<ul class="dropdown-menu" role="menu">
|
||||
<li>
|
||||
<a href="#!/profile/preferences">
|
||||
<i class="fa fa-cog"></i>
|
||||
Preferences
|
||||
</a>
|
||||
</li>
|
||||
<li class="divider"></li>
|
||||
<li>
|
||||
<a href="#!/auth/deauthorize">
|
||||
<span class="glyphicon glyphicon-log-out"
|
||||
aria-hidden="true"></span>
|
||||
Logout
|
||||
</a></li>
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
<form class="navbar-form navbar-right">
|
||||
<div class="form-group has-feedback">
|
||||
<input type="text"
|
||||
|
|
@ -72,26 +84,42 @@
|
|||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<div class="container-fluid">
|
||||
<div class="row">
|
||||
<div class="col-sm-3 col-md-1 sidebar" align="center">
|
||||
<ul class="nav nav-sidebar navbar-fixed-side">
|
||||
<li ng-class="{active:isActive('/dashboard')}">
|
||||
<a href="#!/dashboard">
|
||||
<i class="fa fa-dashboard fa-3x visible-lg visible-md"></i>
|
||||
<small class="visible-lg visible-md">Dashboard</small>
|
||||
</div>
|
||||
</script>
|
||||
<!-- The menu for xs sized screens -->
|
||||
<script type="text/ng-template" id="/inline/header_mobile.html">
|
||||
<div ng-controller="HeaderController">
|
||||
<nav class="navbar navbar-inverse navbar-fixed-top"
|
||||
role="navigation">
|
||||
<div class="container-fluid">
|
||||
<div class="navbar-header">
|
||||
<a class="navbar-brand navbar-header" href="#">
|
||||
Radar
|
||||
</a>
|
||||
<li ng-class="{active:isActive('/systems')}">
|
||||
<a href="#!/systems">
|
||||
<i class="fa fa-desktop fa-3x visible-lg visible-md"></i>
|
||||
<small class="visible-lg visible-md">Systems</small>
|
||||
<a href="#!/auth/authorize" class="btn btn-sm btn-default navbar-btn pull-right" ng-hide="isLoggedIn" style="margin-right: 10px">
|
||||
<span class="glyphicon glyphicon-log-in"
|
||||
aria-hidden="true"></span>
|
||||
</a>
|
||||
</li>
|
||||
<li ng-class="{active:isActive('/operators')}">
|
||||
<a href="#!/operators">
|
||||
<i class="fa fa-user fa-3x visible-lg visible-md"></i>
|
||||
<small class="visible-lg visible-md">Operators</small>
|
||||
</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="btn-group pull-right" dropdown is-open="status.isopen" ng-show="isLoggedIn" style="margin-right: 10px">
|
||||
<button type="button" class="btn btn-default btn-sm navbar-btn dropdown-toggle" dropdown-toggle ng-disabled="disabled">
|
||||
<span class="caret dropdown" aria-hidden="true"></span>
|
||||
</button>
|
||||
<ul class="dropdown-menu dropdown-menu-mobile" role="menu">
|
||||
<li>
|
||||
<a href="#!/profile/preferences">
|
||||
<i class="fa fa-cog"></i>
|
||||
</a>
|
||||
</li>
|
||||
<li class="divider"></li>
|
||||
<li>
|
||||
<a href="#!/auth/deauthorize">
|
||||
<span class="glyphicon glyphicon-log-out"
|
||||
aria-hidden="true"></span>
|
||||
</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
</div>
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -0,0 +1,27 @@
|
|||
<nav class="navbar navbar-fixed-side
|
||||
navbar-fixed-side-header-offset"
|
||||
role="navigation">
|
||||
<div class="nav-main">
|
||||
<ul class="nav nav-pills nav-stacked text-center">
|
||||
<li ng-class="{active:isActive('/dashboard')}">
|
||||
<a href="#!/dashboard">
|
||||
<i class="fa fa-dashboard fa-lg visible-sm visible-xs"></i>
|
||||
<i class="fa fa-dashboard fa-3x visible-lg visible-md"></i>
|
||||
<small class="visible-lg visible-md">Dashboard</small>
|
||||
</a>
|
||||
<li ng-class="{active:isActive('/systems')}">
|
||||
<a href="#!/systems">
|
||||
<i class="fa fa-desktop fa-lg visible-sm visible-xs"></i>
|
||||
<i class="fa fa-desktop fa-3x visible-lg visible-md"></i>
|
||||
<small class="visible-lg visible-md">Systems</small>
|
||||
</a>
|
||||
</li>
|
||||
<li ng-class="{active:isActive('/operators')}">
|
||||
<a href="#!/operators">
|
||||
<i class="fa fa-user fa-lg visible-sm visible-xs"></i>
|
||||
<i class="fa fa-user fa-3x visible-lg visible-md"></i>
|
||||
<small class="visible-lg visible-md">Operators</small>
|
||||
</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
</nav>
|
||||
|
|
@ -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';
|
||||
|
||||
})
|
||||
})
|
||||
|
|
|
|||
|
|
@ -27,15 +27,26 @@
|
|||
<script src="moment/moment.js"></script>
|
||||
<script src="angular-moment/angular-moment.js"></script>
|
||||
<script src="ng-table/ng-table.js"></script>
|
||||
<script src="angulartics/dist/angulartics.min.js"></script>
|
||||
<script src="angulartics/dist/angulartics-ga.min.js"></script>
|
||||
<!-- endbuild -->
|
||||
|
||||
<script src="js/templates.js"></script>
|
||||
<script src="js/dashboard.js"></script>
|
||||
<script>
|
||||
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
|
||||
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
|
||||
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
|
||||
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
|
||||
|
||||
ga('create', 'UA-58091800-1', 'auto');
|
||||
</script>
|
||||
|
||||
</head>
|
||||
<body ng-class="{'logged-in' : isLoggedIn, 'submenu': hasSubmenu}">
|
||||
<header ng-include src="'app/header/template/header_menu.html'" ></header>
|
||||
<div ui-view class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main"></div>
|
||||
<div ng-include src="'app/header/template/side_menu.html'" ></div>
|
||||
<div ui-view class="col-sm-9 col-xs-9 col-sm-offset-3 col-md-10 col-md-offset-2 main"></div>
|
||||
<notifications></notifications>
|
||||
</body>
|
||||
</body>
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue