External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 15:27:47 -02:30
Code Issues Packages Projects Releases Wiki Activity

Dashboard

Browse Source 
Fixed boarder around job widget. Cleaned up JS lint issues.
This commit is contained in:
Chris Houseknecht
2014-07-02 10:04:14 -04:00
parent 2e075d56f5
commit 0b1308f411
7 changed files with 100 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/static/js/widgets/DashboardCounts.js
View File

@@ -17,13 +17,11 @@ angular.module('DashboardCountsWidget', ['RestServices', 'Utilities'])
var scope = params.scope, var scope = params.scope,
target = params.target, target = params.target,
dashboard = params.dashboard, dashboard = params.dashboard,
html, element; html, element;
function createHTML(html){ function createHTML(html){
var docw = $(window).width(); var docw = $(window).width();
if(docw<768){ if (docw<768){
html = "<div id=\"dash-count-carousel\" class=\"carousel slide\" data-interval=\"1000\" data-ride=\"carousel\">\n" ; html = "<div id=\"dash-count-carousel\" class=\"carousel slide\" data-interval=\"1000\" data-ride=\"carousel\">\n" ;
// html += " <!-- Indicators -->\n"; // html += " <!-- Indicators -->\n";
html += "<ol class=\"carousel-indicators\">\n"; html += "<ol class=\"carousel-indicators\">\n";
@@ -108,10 +106,7 @@ angular.module('DashboardCountsWidget', ['RestServices', 'Utilities'])
html += "</table>\n"; html += "</table>\n";
html += "</div>\n"; html += "</div>\n";
// html += "<hr>\n"; // html += "<hr>\n";
} }
return html; return html;
} }
@@ -180,13 +175,13 @@ angular.module('DashboardCountsWidget', ['RestServices', 'Utilities'])
//window.onresize = scaleForSmallDevices; //window.onresize = scaleForSmallDevices;
function scaleForSmallDevices(){ /*function scaleForSmallDevices(){
var docw = $(window).width(); var docw = $(window).width();
if(docw<600){ if(docw<600){
alert('success'); alert('success');
} }
}; };*/
}; };
} }

2
awx/ui/static/js/widgets/DashboardJobs.js
View File

@@ -23,6 +23,7 @@ angular.module('DashboardJobsWidget', ['RestServices', 'Utilities'])
html, e; html, e;
html = ''; html = '';
html += "<div class=\"dashboard-jobs-list-container\">\n";
html += "<ul id=\"job_status_tabs\" class=\"nav nav-tabs\">\n"; html += "<ul id=\"job_status_tabs\" class=\"nav nav-tabs\">\n";
html += "<li class=\"active\"><a id=\"active_jobs_link\" ng-click=\"toggleTab($event, 'active_jobs_link', 'job_status_tabs')\"\n"; html += "<li class=\"active\"><a id=\"active_jobs_link\" ng-click=\"toggleTab($event, 'active_jobs_link', 'job_status_tabs')\"\n";
html += " href=\"#active-jobs-tab\" data-toggle=\"tab\">Jobs</a></li>\n"; html += " href=\"#active-jobs-tab\" data-toggle=\"tab\">Jobs</a></li>\n";
@@ -39,6 +40,7 @@ angular.module('DashboardJobsWidget', ['RestServices', 'Utilities'])
html += "</div>\n"; //list html += "</div>\n"; //list
html += "</div>\n"; //active-jobs-tab html += "</div>\n"; //active-jobs-tab
html += "<div class=\"tab-pane\" id=\"scheduled-jobs-tab\"></div>\n"; html += "<div class=\"tab-pane\" id=\"scheduled-jobs-tab\"></div>\n";
html += "</div>\n"; // jobs-list-container
html += "</div>\n"; html += "</div>\n";
e = angular.element(document.getElementById(target)); e = angular.element(document.getElementById(target));

3
awx/ui/static/js/widgets/JobStatusGraph.js
View File

@@ -101,7 +101,7 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
}); });
} }
function makeHostCountGraph(){ /*function makeHostCountGraph(){
d3.json("static/js/hostcount.json",function(error,data) { d3.json("static/js/hostcount.json",function(error,data) {
data.map(function(series) { data.map(function(series) {
@@ -160,6 +160,7 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
}); });
}); });
} }
*/
element = angular.element(document.getElementById(target)); element = angular.element(document.getElementById(target));
element.html(html); element.html(html);

5
awx/ui/static/less/new-dashboard.less
View File

@@ -27,11 +27,12 @@
stroke: steelblue; stroke: steelblue;
stroke-width: 1.5px; stroke-width: 1.5px;
} }
.jobs-list-container {
.dashboard-jobs-list-container {
border: 1px solid @grey; border: 1px solid @grey;
border-radius: 4px; border-radius: 4px;
padding: 5px; padding: 5px;
} }
.carousel-control.left, .carousel-control.right { .carousel-control.left, .carousel-control.right {
background-image: none background-image: none

2
awx/ui/templates/ui/index.html
View File

@@ -201,7 +201,7 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand" href="http://www.ansible.com" target="_blank"><img id="ansible-brand-logo" src="{{ STATIC_URL }}img/tower_console_bug_black.png" /></a> <a class="navbar-brand" href="#home"><img id="ansible-brand-logo" src="{{ STATIC_URL }}img/tower_console_bug_black.png" /></a>
</div> </div>
<div class="navbar-collapse collapse" id="main-navbar-collapse"> <div class="navbar-collapse collapse" id="main-navbar-collapse">
<ul class="nav navbar-nav" id="ansible-main-menu"> <ul class="nav navbar-nav" id="ansible-main-menu">