From 4463a4827e2bb52b7aadf2162687f8515fcd541e Mon Sep 17 00:00:00 2001 From: Ken Hoes Date: Wed, 4 May 2016 11:02:12 -0400 Subject: [PATCH] Dashboard updates --- awx/static/favicon.ico | Bin 6518 -> 1150 bytes awx/ui/client/assets/favicon.ico | Bin 5430 -> 1150 bytes awx/ui/client/legacy-styles/ansible-ui.less | 1 + .../legacy-styles/jquery-ui-overrides.less | 2 + .../counts/dashboard-counts.block.less | 46 ++++++ .../client/src/dashboard/dashboard.block.less | 18 +++ .../graphs/dashboard-graphs.partial.html | 132 +++++++++--------- .../dashboard/lists/dashboard-list.block.less | 2 +- .../job-templates-list.partial.html | 6 +- .../lists/jobs/jobs-list.partial.html | 6 +- .../src/smart-status/smart-status.block.less | 1 + 11 files changed, 143 insertions(+), 71 deletions(-) diff --git a/awx/static/favicon.ico b/awx/static/favicon.ico index 31b759caf9efd7d8b9130d6df61d9e62fccc36d0..5c6280873a3db0a72a05241afde4a13eae34d2ec 100644 GIT binary patch literal 1150 zcmaiz%WG3X6vijE;!21h?$l~pO&_$h#X@zHjV{!M_!qcQgf6=9MHh-9MXivk_(H^P zMJNUT0WBh}NppQ*d{m_|y|F&JFj1ir+t2U2&0NM1knp=_=FIs{X3m^3Ccer46YgJ!F`8WApCbZH_r=O4a&3J6~cpzkq>b zGuYPd;mJe^eTUu!=W}B@R)4&$@}Y%w9KH7q!`z2-6OW7N>F~muI`J8fZ#(m_jt37+ z2X)Zd&kyEn{kLM1BtgEoIaJ5)HV>2Bx9|VPuEdMr9^Dv@XNh{fo?Ia6Pg|Fujz@Tx z$ss@J3wMp3{I%7^pLf3x>ij_v%ztNlmj{pDw literal 6518 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 diff --git a/awx/ui/client/assets/favicon.ico b/awx/ui/client/assets/favicon.ico index f53629b961508ea2f031df98bdabefd57143a620..41132fb823fe65afe5e9f967cd9b0c690f188e01 100644 GIT binary patch literal 1150 zcmaiz+e=hY6vmfm`6^Kck!6n7Skc9xkidrmeb652PbjG9At<^K^blAikr_b{^J>(Th=Sk9blij3@6qMS|vz)erd?r|g zkBqmIWyI>#t|0eGu5Rt3TIBowFz*hrW9XVY2{x>Yp<(j~Hr2(8=2u;`CWfu`2^-fj zE|F5wOui82#L?3|jmsC`+qqD?CWdVr6S&beh2Gnr+_9&r(OUJYR*6)3IDKLq{>UtL zHTbAm?V+jhIUe=RV17Pl#t!XI>pWrg+Sj(TwWxopppAQVG1634>_Gq`poz>z~^7#_-C=XSqPQzw6n?R$=2sN>;-Z;*&*G592n zs~wZ5{daE7y+zu{H+KxJquv9L^M06`L(85QrY>#{+j>v;l5%pB6zxsxc;@7|Id{Dm z;ePsh=geE6T}ApyQJ&tpde$No&(ZHAmBf7mI)<*}I|*y7ulwvGD~ZwChnV+uFRest js^_9-t4xx+q=hUcRwk)(k%3Z?3nhine;b;s8rA*<4!;8` literal 5430 zcmc&%txhCC5T3oPL@W-u>T(GNfd#c>u%; z9sq$ru0S9Vec#vD-=wDLne9C;p^~D1>gTJjuC7^%qEmb;dc6YFFMf85;yY*kzw6)F z|AoCDSW<=C9sjo|2H20uIoGia`6_q_o`PqAIp^N0)s5$npMd9J*T9sW#CBX`f81bG z^R=?F!u8ntpikO9KR>&NhliTJe6Fpnxw0(X%gc-8J`TuvULW(>*%{nAx3#q;9Y1nS z-=zEdd&y{{T=_j>yuZJ@o0}WyxWmIk_xASYZTaWm;GmMhUU{zeZf|eh>+7rQ^?L5= z>dM>AW-}i?I^3^%2p%fs>vzlv%s7u-!D=R|NqYHGkx#?tUfdHy$KtJ6kqNL z(>?G-;1VNQ>%Ck*%jm&BF_|ly^R_v4KOGBvY=U{dHmo)oZ8w)Wt8`(~%?N{==o zerK#~(VX$x_~|FI`B0OPmsW@ITZ-}+`>WRDF|ikMGgq~f%9Eq#rwfs_p~p(Fezo!UL7>M(WJ z!sd8-dfMol_=qE!d&N8&jVgC>9a@=`?ESapEchq(g|Jd1zqOW_Yu*EE$`Y~m_xJsI zwZEul0(L7tW3pJRG3LP%*ZNJRH&1!Sn;~|YI=9_p{WcNLsJgUz@m*PeW=`yd_|&)O zQY>+8*`AfERfDUVB=*Am(~ejo-gW$@nFA5!39Qr}v9s{$pMFKkxo~WJd;{8FFcN!j zfllSi<~Pp0y&u(LhF{+UGxU56tY;DNWM}Ix(d#Qc>1%{9^}l5Qm7X1Kk5>)Y_sJe$ z^;_n)|7PET{U-1}Y=5#jX~9)|KKCXEWrmHnwRLFwZCn#A{z~C$gl_HkM~khqn6R%X zeiJP|KK%ZGlMeLx9+aQP(dJy>yo(%LVi2o|A)n;69t{hS!=o6GF= zS=fpLF)X|be*c+=jI+1qT$u5Q7{2WPFB=QuV1LN&Q9-x%zOBE{%tI`^8*&*~>!mSa H|E2T?(AG#m diff --git a/awx/ui/client/legacy-styles/ansible-ui.less b/awx/ui/client/legacy-styles/ansible-ui.less index 287e92b690..d9a319a298 100644 --- a/awx/ui/client/legacy-styles/ansible-ui.less +++ b/awx/ui/client/legacy-styles/ansible-ui.less @@ -1891,6 +1891,7 @@ tr td button i { .nvtooltip { border-radius: 4px; + padding: 10px; } .nvtooltip td.value { diff --git a/awx/ui/client/legacy-styles/jquery-ui-overrides.less b/awx/ui/client/legacy-styles/jquery-ui-overrides.less index f9748fc807..826b77e711 100644 --- a/awx/ui/client/legacy-styles/jquery-ui-overrides.less +++ b/awx/ui/client/legacy-styles/jquery-ui-overrides.less @@ -8,6 +8,7 @@ * */ +@import "awx/ui/client/src/shared/branding/colors.default.less"; table.ui-datepicker-calendar { background-color: @well; @@ -174,6 +175,7 @@ table.ui-datepicker-calendar { .dropdown-menu>li>a { color: @black; + color: @default-interface-txt } .pagination .active { diff --git a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less index a29476fd90..cd563cfff3 100644 --- a/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less +++ b/awx/ui/client/src/dashboard/counts/dashboard-counts.block.less @@ -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 { background-color: @db-count-succ; border-color: @db-count-succ; diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less index 75d9525040..286ee0c406 100644 --- a/awx/ui/client/src/dashboard/dashboard.block.less +++ b/awx/ui/client/src/dashboard/dashboard.block.less @@ -18,6 +18,24 @@ 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 { border: 1px solid @default-border; border-radius: 5px; diff --git a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html index 663a53b8ff..62e8ffe02d 100644 --- a/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html +++ b/awx/ui/client/src/dashboard/graphs/dashboard-graphs.partial.html @@ -4,74 +4,80 @@ JOB STATUS
-
Period
-
- - Past Month - - +
+
Period
+
+ + Past Month + + +
-
Job Type
-
+
+
Job Type
+
- + + All + + + +
+
+
+
View
+
+ All - -
-
View
-
- - All - - - + +
diff --git a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less index 4c25e4d4ad..bad3b06e96 100644 --- a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less +++ b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less @@ -35,7 +35,7 @@ color: @btn-txt; background-color: @btn-bg; font-size: 12px; - border: 1px solid @btn-bord; + border: 1px solid @default-icon-hov; border-radius: 5px; margin-right: 15px; margin-top: 10px; diff --git a/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html b/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html index 103de983c9..da60bce8cf 100644 --- a/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html +++ b/awx/ui/client/src/dashboard/lists/job-templates/job-templates-list.partial.html @@ -10,10 +10,8 @@
-
+ Title - Activity @@ -53,7 +51,7 @@
-

It doesn't seem like you have used any currently available job templates.
+

No job templates were recently used.
You can create a job template here.

diff --git a/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html b/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html index 86235f700f..a728d64d2e 100644 --- a/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html +++ b/awx/ui/client/src/dashboard/lists/jobs/jobs-list.partial.html @@ -10,7 +10,7 @@
- +

- RECENT JOB RUNS + RECENTLY RUN JOBS

-

It doesn't seem like you have any recent job runs.

+

No jobs were recently run.

diff --git a/awx/ui/client/src/smart-status/smart-status.block.less b/awx/ui/client/src/smart-status/smart-status.block.less index fdb80aaa65..92b5244e4f 100644 --- a/awx/ui/client/src/smart-status/smart-status.block.less +++ b/awx/ui/client/src/smart-status/smart-status.block.less @@ -35,6 +35,7 @@ text-align: left; max-width: 250px; padding: 10px; + line-height: 22px; } .SmartStatus-tooltip--success{
Title Title Time