---
src/app/stylesheets/aggregator.scss | 34 ++++++++++-
src/app/views/templates/builds.haml | 107 +++++++++++++++++++---------------
src/public/images/icons/status.png | Bin 0 -> 1124 bytes
3 files changed, 91 insertions(+), 50 deletions(-)
create mode 100644 src/public/images/icons/status.png
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index a833417..cba4373 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -150,6 +150,12 @@ h4 {
}
h5 { font-size: 100%; text-transform: uppercase; }
+h1,h2,h3,h4,h5 {
+ margin-top: 1em;
+ &:first-child {
+ margin-top: 0;
+ }
+}
.clear {
clear: both;
}
@@ -159,9 +165,8 @@ h5 { font-size: 100%; text-transform: uppercase; }
margin-bottom: 2em;
}
-.la {
- text-align: left;
-}
+.la { text-align: left; }
+.ra { text-align: right; }
.twocolumn {
@include column-count(2);
@@ -171,6 +176,11 @@ h5 { font-size: 100%; text-transform: uppercase; }
.placeholder { margin-bottom: 2em; }
.disabled { opacity: 0.4; }
+div,section,fieldset {
+ display: block;
+ overflow: hidden; /* force to wrap floats */
+}
+
/* TABLES */
table {
@@ -863,6 +873,24 @@ footer {
}
}
+.status {
+ span {
+ display: inline-block;
+ width: 10px;
+ height: 10px;
+ background: url(/images/icons/status.png) no-repeat 0 0;
+ &.good {
+ background-position: 0 0;
+ }
+ &.ok {
+ background-position: 0 -10px;
+ }
+ &.bad {
+ background-position: 0 -20px;
+ }
+ }
+}
+
/* IE and other horror browser workarounds */
/* basic image styling for buttons in older browsers */
diff --git a/src/app/views/templates/builds.haml
b/src/app/views/templates/builds.haml
index d472d0b..2da0031 100644
--- a/src/app/views/templates/builds.haml
+++ b/src/app/views/templates/builds.haml
@@ -7,52 +7,65 @@
] |
- form_tag :action => "" do
- %ul
- %li GRIND JOB ACTIONS
- %li JOB QUEUE
- %li= submit_tag "Show Job Details", :name => "job_details", :disabled =>
true
- %li= submit_tag "Show Job Log", :name => "job_log", :disabled => true
-
- %h3 STATUS
- %hr
- Image Warehouse Status: Green
- %br
- Total Grind in Queue:
- = @running_images.size
- %br
- Number of VM's Grinding:
- = @running_images.select {|i| i.status == Image::STATE_BUILDING}.size
- %h3 RUNNING
- %hr
- %table
- = sortable_table_header(columns)
- %tbody
- - if @running_images.empty?
- %tr
- %td{:colspan => 5} No Images
- - else
- - @running_images.each do |img|
+ .actionsidebar.grid_3
+ %dl
+ %dt Grind Job Actions
+ %dd
+ %h5 JOB QUEUE
+ %ul
+ %li.show
+ %span
+ = submit_tag "Show Job Details", :name => "job_details", :disabled
=> true, :class => "icon"
+ %li.show
+ %span
+ = submit_tag "Show Job Log", :name => "job_log", :disabled =>
true, :class => "icon"
+
+ .grid_13
+ %h1 Status
+ %section.wrap.status
+ %label.grid_4.alpha Image Warehouse Status:
+ .grid_3.suffix_6.omega
+ %span.good
+ Green
+
+ %label.grid_4.alpha Total Grind in Queue:
+ .grid_3.suffix_6.omega
+ = @running_images.size
+
+ %label.grid_4.alpha Number of VM's Grinding:
+ .grid_3.suffix_6.omega
+ = @running_images.select {|i| i.status == Image::STATE_BUILDING}.size
+
+ %h1 Running
+
+ %table
+ = sortable_table_header(columns)
+ %tbody
+ - if @running_images.empty?
%tr
- %td= img.template.name
- %td= img.template.platform
- %td= img.template.platform_version
- %td= img.template.architecture
- %td= img.status
-
-
- %h3 COMPLETED
- %hr
- %table
- = sortable_table_header(columns)
- %tbody
- - if @completed_images.empty?
- %tr
- %td{:colspan => 5} No Images
- - else
- - @completed_images.each do |img|
+ %td{:colspan => 5} No Images
+ - else
+ - @running_images.each do |img|
+ %tr
+ %td= img.template.name
+ %td= img.template.platform
+ %td= img.template.platform_version
+ %td= img.template.architecture
+ %td= img.status
+
+
+ %h1 Completed
+ %table
+ = sortable_table_header(columns)
+ %tbody
+ - if @completed_images.empty?
%tr
- %td= img.template.name
- %td= img.template.platform
- %td= img.template.platform_version
- %td= img.template.architecture
- %td OK
+ %td{:colspan => 5} No Images
+ - else
+ - @completed_images.each do |img|
+ %tr
+ %td= img.template.name
+ %td= img.template.platform
+ %td= img.template.platform_version
+ %td= img.template.architecture
+ %td OK
diff --git a/src/public/images/icons/status.png
b/src/public/images/icons/status.png
new file mode 100644
index
0000000000000000000000000000000000000000..57a1b9ce67f51448fbbc23ddd94c33d3d15ec6ce
GIT binary patch
literal 1124
zcmV-q1e^PbP)<h;3K|lk000e1njltq000ua0015...@s66?km=00004b3#c}2nyxw
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaahuua%y?...@h11k~+tk~y-6rnbdgtz3=(@bCY>_s-n8Gg=>`j*kf;<DfP#(}0K?
zlgtr^kwitty9pojlt?1fhpr4`5...@xj(%zwGgnY5=si%(p00MF->s...@~>J7B$v5
zqZ!A!kGap&g^apy2m...@%<PP0RXOC51is0y+nus0Aoma9y%|aHHHCz5fMK7D$wos
z=Y4Q+{~JnGc`H0}u(UjehtoH8(^5a}e9!1+pY+T1oU_S>gC~{Ja1%r!2!LQaStQq{
z...@zh&0-senfv`n1ev9nywd?qac2^`n40b~i...@qzx^fbhpfa&WDsQZa#KD9mn2ruf
zECK*n?iwJjqoO>HnMbRQqNc$L1|leUNrLNX0G0s&q7M*w3DRy6G!2%RNz+6sncEYq
z-pwsHf&Y(Bh~cltb6zG*6Fil)`vwPp)*un~p+%wqxfrrs...@79ifc74&K&NNxP2`
z5l*zpr<Fjk|6IqJU~E?n1AxTbEPe6$H=1r}?L*(^Zm<`HA3q`ORf5tbA~ZZN{JyT)
zUAKqq#{eL{$n#;u2}y9m9uNWm4uqZj&3j8`{0uuM$jar~=GTLHwZ}l719f%;Gk1T`
zJk#hpJV0Nv+wY)G0=s{p<+YGp-3rKgfaig78JLMX_<iCh)n;hmj*X5;SwxW}5u`4I
z))zpTML>ND$>&2P5>Xr*9iriiP5IG19Og4nIsv8>0{}>01<W+^qkFkAzuF{jn4Iy#
z7(__}Yy-%xZ>HxWP_Pr+4r0R`XX1v%rc$c&a>?!k4B3CT$sn%+sYid(hQ+3MGHqTR
zzV)492CBfrb>K>PbHjBo16BC()=fQ`Hm~xF<1}L!xsUpL+V#a$7IsNJ?2>vcB(v!6
zY1efl_wmJXn%R=+I?9eHa^SLQ+Vue7_e+0hIpad_9h%rCQ}lOqO=K(;0y58EDVgZm
zHkrQYj?<#wf4#A_RjE33h>_#q$>b#cIyR;|r...@l#f2n}n>y~1z}WQhSC55Cj~;;#
z3IU!6N6jKRHjZCLM^%?-zi>D&|59~XSz|OF<4oXibq(%D7H%d3o->e3uL~=x>Jzg>
zEs=O!aGtIJt_QKO03g6gr{SbhD2rDM50;l(#C0N{Tv-X9uEW!HIJ&;ow?7<4KvA$x
z<P+Ci_ui6a)mFyiuvb>L!ANCgSo&uUYp#1wC}4bkc5&hDlW)B#`FwuBb;139_$n(w
z<>lzPc1=%av+sh4&|Fy5-BwepO%DuEdSsN+Bcn9^^#HZi)N0LzMcqV%Etyw>p;IAQ
q?zM?x03b1zP;<G?hnhMJ0RI7p(&1Kj$BSnG0000<MNUMnLSTYEqWs7J
literal 0
HcmV?d00001
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
