External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-03 17:51:06 -03:30
Code Issues Packages Projects Releases Wiki Activity

Dashboard updates

Browse Source
This commit is contained in:
Ken Hoes
2016-05-04 11:02:12 -04:00
committed by John Mitchell
parent 1f0d88c7ab
commit 4463a4827e
11 changed files with 143 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
awx/static/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
awx/ui/client/assets/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

1
awx/ui/client/legacy-styles/ansible-ui.less
View File

@@ -1891,6 +1891,7 @@ tr td button i {
.nvtooltip { .nvtooltip {
border-radius: 4px; border-radius: 4px;
padding: 10px;
} }
.nvtooltip td.value { .nvtooltip td.value {

2
awx/ui/client/legacy-styles/jquery-ui-overrides.less
View File

@@ -8,6 +8,7 @@
* *
*/ */
@import "awx/ui/client/src/shared/branding/colors.default.less";
table.ui-datepicker-calendar { table.ui-datepicker-calendar {
background-color: @well; background-color: @well;
@@ -174,6 +175,7 @@ table.ui-datepicker-calendar {
.dropdown-menu>li>a { .dropdown-menu>li>a {
color: @black; color: @black;
color: @default-interface-txt
} }
.pagination .active { .pagination .active {

46
awx/ui/client/src/dashboard/counts/dashboard-counts.block.less
View File

@@ -42,6 +42,52 @@
} }
} }
@media only screen and (max-width: 360px) {
.DashboardCounts-label {
font-size: 10px;
}
.DashboardList-headerText {
white-space: normal;
line-height: 22px;
padding-top: 10px;
}
.DashboardList-timeCell {
white-space: normal;
}
}
.DashboardGraphs-filteringDropdowns {
display: inherit;
}
@media only screen and (max-width: 540px) {
.DashboardGraphs-filteringDropdowns {
float: left;
width: 100%;
}
.DashboardGraphs-filterLabel {
width: 50%;
float:left;
}
.DashboardGraphs-periodDropdown {
width: 50%;
float: left;
}
.DashboardList-container {
th {
width: 25%;
white-space: nowrap;
}
}
}
.DashboardCounts-buttonStyle:hover { .DashboardCounts-buttonStyle:hover {
background-color: @db-count-succ; background-color: @db-count-succ;
border-color: @db-count-succ; border-color: @db-count-succ;

18
awx/ui/client/src/dashboard/dashboard.block.less
View File

@@ -18,6 +18,24 @@
width: 100%; width: 100%;
} }
.DashboardGraphs-filterDropdownItems {
li > a {
color: @default-interface-txt;
}
}
#status-dropdown + ul.dropdown-menu {
margin-left: -96px;
}
#type-dropdown + ul.dropdown-menu {
margin-left: -95px;
}
#period-dropdown + ul.dropdown-menu {
margin-left: -40px;
}
.Dashboard-list { .Dashboard-list {
border: 1px solid @default-border; border: 1px solid @default-border;
border-radius: 5px; border-radius: 5px;

132
awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html
View File

@@ -4,74 +4,80 @@
JOB STATUS JOB STATUS
</h3> </h3>
<div class="DashboardGraphs-graphToolbar" ng-show="!hostStatusSelected"> <div class="DashboardGraphs-graphToolbar" ng-show="!hostStatusSelected">
<div class="DashboardGraphs-filterLabel">Period</div> <div class="DashboardGraphs-filteringDropdowns">
<div class="DashboardGraphs-periodDropdown"> <div class="DashboardGraphs-filterLabel">Period</div>
<a id="period-dropdown" role="button" <div class="DashboardGraphs-periodDropdown">
data-toggle="dropdown" <a id="period-dropdown" role="button"
data-target="#" data-toggle="dropdown"
href="/page.html" data-target="#"
class="DashboardGraphs-filterDropdownText"> href="/page.html"
Past Month <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i> class="DashboardGraphs-filterDropdownText">
</a> Past Month <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i>
<ul class="dropdown-menu DashboardGraphs-filterDropdownItems </a>
DashboardGraphs-filterDropdownItems--period" role="menu" aria-labelledby="period-dropdown"> <ul class="dropdown-menu DashboardGraphs-filterDropdownItems
<li> DashboardGraphs-filterDropdownItems--period" role="menu" aria-labelledby="period-dropdown">
<a class="n" id="day" >Past 24 Hours </a> <li>
</li> <a class="n" id="day" >Past 24 Hours </a>
<li> </li>
<a class="n" id="week">Past Week</a> <li>
</li> <a class="n" id="week">Past Week</a>
<li> </li>
<a class="n" id="month">Past Month</a> <li>
</li> <a class="n" id="month">Past Month</a>
</ul> </li>
</ul>
</div>
</div> </div>
<div class="DashboardGraphs-filterLabel">Job Type</div> <div class="DashboardGraphs-filteringDropdowns">
<div class="DashboardGraphs-jobTypeDropdown"> <div class="DashboardGraphs-filterLabel">Job Type</div>
<div class="DashboardGraphs-jobTypeDropdown">
<a id="type-dropdown" role="button" data-toggle="dropdown" data-target="#" class="DashboardGraphs-filterDropdownText" <a id="type-dropdown" role="button" data-toggle="dropdown" data-target="#" class="DashboardGraphs-filterDropdownText"
href="/page.html"> href="/page.html">
All <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i>
</a>
<ul class="dropdown-menu DashboardGraphs-filterDropdownItems
DashboardGraphs-filterDropdownItems--jobType" role="menu" aria-labelledby="type-dropdown">
<li>
<a class="m" id="all">All</a>
</li>
<li>
<a class="m" id="inv_sync">Inventory Sync</a>
</li>
<li>
<a class="m" id="scm_update">SCM Update</a>
</li>
<li>
<a class="m" id="playbook_run">Playbook Run</a>
</li>
</ul>
</div>
</div>
<div class="DashboardGraphs-filteringDropdowns">
<div class="DashboardGraphs-filterLabel">View</div>
<div class="DashboardGraphs-periodDropdown">
<a id="status-dropdown" role="button"
data-toggle="dropdown"
data-target="#"
href="/page.html"
class="DashboardGraphs-filterDropdownText">
All <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i> All <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i>
</a> </a>
<ul class="dropdown-menu DashboardGraphs-filterDropdownItems <ul class="dropdown-menu DashboardGraphs-filterDropdownItems
DashboardGraphs-filterDropdownItems--jobType" role="menu" aria-labelledby="type-dropdown"> DashboardGraphs-filterDropdownItems--period" role="menu" aria-labelledby="status-dropdown">
<li> <li>
<a class="m" id="all">All</a> <a class="o" id="both" >All</a>
</li> </li>
<li> <li>
<a class="m" id="inv_sync">Inventory Sync</a> <a class="o" id="failed">Successful</a>
</li> </li>
<li> <li>
<a class="m" id="scm_update">SCM Update</a> <a class="o" id="successful">Failed</a>
</li> </li>
<li> </ul>
<a class="m" id="playbook_run">Playbook Run</a> </div>
</li>
</ul>
</div>
<div class="DashboardGraphs-filterLabel">View</div>
<div class="DashboardGraphs-periodDropdown">
<a id="status-dropdown" role="button"
data-toggle="dropdown"
data-target="#"
href="/page.html"
class="DashboardGraphs-filterDropdownText">
All <i class="fa fa-chevron-down DashboardGraphs-filterIcon"></i>
</a>
<ul class="dropdown-menu DashboardGraphs-filterDropdownItems
DashboardGraphs-filterDropdownItems--period" role="menu" aria-labelledby="status-dropdown">
<li>
<a class="o" id="both" >All</a>
</li>
<li>
<a class="o" id="failed">Successful</a>
</li>
<li>
<a class="o" id="successful">Failed</a>
</li>
</ul>
</div> </div>
</div> </div>
</div> </div>

2
awx/ui/client/src/dashboard/lists/dashboard-list.block.less
View File

@@ -35,7 +35,7 @@
color: @btn-txt; color: @btn-txt;
background-color: @btn-bg; background-color: @btn-bg;
font-size: 12px; font-size: 12px;
border: 1px solid @btn-bord; border: 1px solid @default-icon-hov;
border-radius: 5px; border-radius: 5px;
margin-right: 15px; margin-right: 15px;
margin-top: 10px; margin-top: 10px;

6
awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html
View File

@@ -10,10 +10,8 @@
<div class="DashboardList-container"> <div class="DashboardList-container">
<table class="List-table"> <table class="List-table">
<tr class="List-tableHeaderRow"> <tr class="List-tableHeaderRow">
<th class="List-tableHeader DashboardList-tableHeader--name" <th class="List-tableHeader DashboardList-tableHeader--name">
ng-click="sort('job_templates','name')">
Title Title
<i class="DashboardList-tableHeaderIcon fa fa-sort-up"></i>
</th> </th>
<th class="List-tableHeader DashboardList-tableHeader--activity"> <th class="List-tableHeader DashboardList-tableHeader--activity">
Activity Activity
@@ -53,7 +51,7 @@
</h3> </h3>
</div> </div>
<div class="DashboardList-container"> <div class="DashboardList-container">
<p class="DashboardList-noJobs">It doesn't seem like you have used any currently available job templates.<br /> <p class="DashboardList-noJobs">No job templates were recently used.<br />
You can create a job template <a href="#/job_templates/add">here</a>.</p> You can create a job template <a href="#/job_templates/add">here</a>.</p>
</div> </div>
</div> </div>

6
awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html
View File

@@ -10,7 +10,7 @@
<div class="DashboardList-container"> <div class="DashboardList-container">
<table class="List-table"> <table class="List-table">
<tr> <tr>
<th class="List-tableHeader DashboardList-tableHeader--name" ng-click="sort('job_templates','name')">Title <i class="DashboardList-tableHeaderIcon fa fa-sort-up"></i></th> <th class="List-tableHeader DashboardList-tableHeader--name">Title</th>
<th class="List-tableHeader DashboardList-tableHeader--time">Time</th> <th class="List-tableHeader DashboardList-tableHeader--time">Time</th>
</tr> </tr>
<tr class="List-tableRow" <tr class="List-tableRow"
@@ -38,10 +38,10 @@
<div class="DashboardList" ng-show="noJobs"> <div class="DashboardList" ng-show="noJobs">
<div class="DashboardList-header"> <div class="DashboardList-header">
<h3 class="DashboardList-headerText"> <h3 class="DashboardList-headerText">
RECENT JOB RUNS RECENTLY RUN JOBS
</h3> </h3>
</div> </div>
<div class="DashboardList-container"> <div class="DashboardList-container">
<p class="DashboardList-noJobs">It doesn't seem like you have any recent job runs.</p> <p class="DashboardList-noJobs">No jobs were recently run.</p>
</div> </div>
</div> </div>

1
awx/ui/client/src/smart-status/smart-status.block.less
View File

@@ -35,6 +35,7 @@
text-align: left; text-align: left;
max-width: 250px; max-width: 250px;
padding: 10px; padding: 10px;
line-height: 22px;
} }
.SmartStatus-tooltip--success{ .SmartStatus-tooltip--success{