On 03/01/2012 01:35 PM, jtomasek(a)redhat.com wrote:
From: Jiri Tomasek<jtomasek(a)redhat.com>
---
src/app/stylesheets/layout.scss | 18 +++++++++++++++---
src/app/views/instances/_list.html.haml | 5 ++++-
src/public/images/more_actions_drop.png | Bin 0 -> 1084 bytes
3 files changed, 19 insertions(+), 4 deletions(-)
create mode 100644 src/public/images/more_actions_drop.png
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index d081ae7..e8ff9ce 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -3018,10 +3018,14 @@ form.filterable-data{
font-size: 12px;
border: 1px solid #ccc;
border-bottom: none;
- padding: 7px 5px;
+ padding: 6px 5px;
ul{ list-style: none; }
- li{ display: inline; vertical-align: middle; }
+ li{
+ @include display_inline_block;
+ vertical-align: middle;
+ padding: 1px 0px;
+ }
li> *{vertical-align: middle;}
ul.filter-controls{
float: right;
@@ -3040,6 +3044,7 @@ form.filterable-data{
li.more_actions{
position: relative;
padding: 8px 0px 8px 0px;
+ display: inline;
& > span {
border: 1px solid #bbb;
border-radius: 3px;
@@ -3054,10 +3059,17 @@ form.filterable-data{
background: white;
border: 1px solid #bbb;
padding: 4px 6px;
- width: 150px;
+ width: 200px;
line-height: 1.5;
li a{ text-decoration: none; }
li a:hover{ text-decoration: underline; }
+ li input[type="submit"]{
+ border: none;
+ padding: 0px;
+ margin: 0px;
+ background: transparent;
+ font-family: $font-family-primary;
+ }
}
&:hover> ul{
display: block;
diff --git a/src/app/views/instances/_list.html.haml
b/src/app/views/instances/_list.html.haml
index 675efc2..ea3602e 100644
--- a/src/app/views/instances/_list.html.haml
+++ b/src/app/views/instances/_list.html.haml
@@ -1,7 +1,10 @@
- content_for :form_header do
- %li= link_to "#{t'instances.list.export_events'}",
export_events_instances_path(:deployment_id => @deployment), :class =>
'button'
%li= restful_submit_tag
"#{t'instances.list.stop_selected_instances'}", 'stop',
multi_stop_instances_path, 'GET', :class => 'button', :id =>
'stop_selected_instances'
%li= restful_submit_tag
"#{t'instances.list.reboot_selected_instances'}", 'reboot',
multi_reboot_instances_path, 'GET', :class => 'button', :id =>
'reboot_selected_instances'
+ %li.more_actions
+ %span= image_tag "more_actions_drop.png"
+ %ul
+ %li= link_to "#{t'instances.list.export_events'}",
export_events_instances_path(:deployment_id => @deployment)
= hidden_field_tag 'backlink', request.url
- content_for :filter_controls do
diff --git a/src/public/images/more_actions_drop.png
b/src/public/images/more_actions_drop.png
new file mode 100644
index 0000000000000000000000000000000000000000..d83074475225dcc41bde293dd830e981cdae2d52
GIT binary patch
literal 1084
zcmV-C1jGA@P)<h;3K|Lk000e1NJLTq001BW000mO1^@s6cL04^00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01E2>01E2?f{P7W00007bV*G`2iyYz
z3JW&?>XK6c00X>9L_t(Y$E}r5NGn$q#(xvXXw+8+5h00{1f?PtY%O$EMJS}|Mv=HQ
z>8`Y^w~>b%p}G(%g@T((F`}reAnHcw>LJ0!+w=*BAQ+9l#(-d6ta(oU+?m_WObPyb
z?V}%j%)K+*@60{-eCJXwm$50Oe2|eyL=FrL$Ven2rIfykZ;F(%MoLMAj#4g{t1ES%
zV6DS6O>El8=ktzKD&+!@Qch(u8ER^3$Ye4|DPI6hsZ^>epU?Y&GC+lnG)=Qysrv*A
zimvPb1g@>E<@);CF+V^5^Tox*^U={!PESucI5?oHstUs}=;`Uf@AtE{wS~vyF(xM`
zs~Z~|WuZ{uL!egf93Y#`n(1`<d7)5XeSIAOhr@xC5=Bwi-`{6{e;<d#K{}nT%4V})
zH8wWJOw*Jf@&gXTFt7>W_xqd1$Hy^E6HU`lRh6!;E(Qk&>FVl2RaG=i!!%9C$H(#e
z{a@eJ`7c!Mz<>gLA%vJuCX)c%+}sch1{oR}(p)arwXW+mySuxEXfz5yGMPjO@lsXQ
zPYlC21L}cyKoO9D!{S|-fB;aguCDBt&$hR>|GK!i;Q06$UDxUE?q+IgN>No+u>=u9
zXmfLOZ{zVeE|-grjt)E?4<jQZ^}sFg-NeMiuaBjCc6RnRpU?L_U;sFT5LooCuC5Y`
z#ZXlh0H4o?s;Zh5Tmev3HShEJu*Sq<F;-Vs5kfdEoyCofjZYOtxfgtGZS9-Z*47_{
z5QZJM(uUbkC`4ahA3_KKQmGU|h@7?F&VVzON@0!Z>+2&F3SpXN&eqa(J-)oWJYm~Y
zO3BjFQd_ZD{M|H7QEA1>;<*e20z=_&_+@WzFH%Ypi3B@4J5ty6X8^jc*X-=<yh|h!
zNGa*<?Ij!z{}KoUoOg?>R4T14E-nU|o10l!SO^$~@#di-RL;)M?q=$<!^6WrR#sNf
zG>v>dPiJQ*ZEbCwpPzGdbVNf#1G!v|a5&8H@bKs7=jX2<I&Vc$aJgLdg+k%>F`FtU
zCnt9oX)`l3Z*OmJky76419sm~6otCFI;N+mKax`3@PVkbApk8cExOn1C7n()Ha12w
znY`Bt+uPgO+}y<L_0rVT#O3AXy^Yy5^FAm?M@N<OD$5>UI-O2RrP3(yZ8REn@9pi;
z-``I#82k~~ayp%_OQn(v&>ztK7{~$DKppVszs-O>d1c)ZuYg^*+r3vT7IC}X7>4l^
zaBF?nAJKhN+1;PaKs+9Q?=e|jtJ`{>*f-$+fxiJCnYU^lfF`*B0000<MNUMnLSTY2
CtNVxm
literal 0
HcmV?d00001
ACK.