---
src/app/stylesheets/aggregator.scss | 91 +++++++++++++++++++++++++++-
src/app/views/provider/_providers.haml | 4 +-
src/app/views/provider/show.haml | 35 ++++++-----
src/public/images/actionsidebar-bullet.png | Bin 0 -> 325 bytes
4 files changed, 108 insertions(+), 22 deletions(-)
create mode 100644 src/public/images/actionsidebar-bullet.png
diff --git a/src/app/stylesheets/aggregator.scss
b/src/app/stylesheets/aggregator.scss
index 1abab1e..d97637d 100644
--- a/src/app/stylesheets/aggregator.scss
+++ b/src/app/stylesheets/aggregator.scss
@@ -23,19 +23,21 @@ input,textarea {
background-color: #f0f0f0;
background: #f0f0f0 url(/images/input-bg.png) repeat-x 0 0;
padding: 4px;
- margin: 1px;
+ margin: 0;
&:focus {
border-width: 2px;
- margin: 0;
+ padding: 3px;
background-color: #fff;
outline: none;
}
}
-
input[type="search"] {
@include border-radius(20px);
padding: 4px 30px 4px 10px;
width: 80%;
+ &:focus {
+ padding: 3px 29px 3px 9px;
+ }
}
/* CHECKBOXES and RADIOBUTTONS*/
input[type="checkbox"],input[type="radio"] {
@@ -49,6 +51,14 @@ input,textarea {
}
}
+/* compensate grid_* for padding+border of the inputboxes and textareas */
+input.grid_1 { width: 50px !important; }
+input.grid_2 { width: 110px !important; }
+input.grid_3 { width: 150px !important; }
+input.grid_4 { width: 210px !important; }
+input.grid_5 { width: 270px !important; }
+
+
/* BUTTONS */
input[type='submit'],button,.button {
font-family: $screenfont; /* for some reason ff3.6 won't inherit from body */
@@ -226,6 +236,36 @@ table {
}
}
+.actionsidebar {
+ border-right: 1px solid darken($footerbg, 10%);
+ width: 159px !important;
+ dt {
+ background-color: $footerbg;
+ border-bottom: 1px solid darken($footerbg, 10%);
+ border-top: 1px solid darken($footerbg, 10%);
+ color: $headercl;
+ font-family: $headlinefont;
+ font-size: 110%;
+ font-weight: bold;
+ margin: 3px 0 20px;
+ padding:14px 20px 12px;
+ text-transform: uppercase;
+ }
+ dd {
+ padding: 4px 4px 4px 10px;
+ margin: 0;
+ font-size: 110%;
+ &.selected {
+ background: url("/images/actionsidebar-bullet.png") no-repeat left
center;
+ font-weight: bold;
+ color: $dcprimary;
+ }
+ }
+ form {
+ display: inline-block;
+ }
+}
+
#notification {
&>div {
padding: 10px;
@@ -473,6 +513,35 @@ nav {
}
}
}
+ &.subsubnav { /* in page tabs */
+ position: static;
+ overflow: hidden;
+ bottom: inherit;
+ left: inherit;
+ right: inherit;
+ margin-bottom: 2em;
+ &>ul {
+ display: block;
+ li {
+ display: block;
+ float: left;
+ a {
+ cursor: pointer;
+ font-family: $screenfont;
+ text-transform: none;
+ font-weight: normal;
+ color: black;
+ display: block;
+ padding: 6px 12px; margin-right: 10px;
+ &.selected {
+ color: #fff;
+ background-color: $dcprimary;
+ @include border-radius(5px);
+ }
+ }
+ }
+ }
+ }
}
/* color coding for the subnav */
@@ -531,6 +600,20 @@ li.operation>ul, li.administration>ul, li.build>ul,
li.runtime>ul {
/* FORMS */
+/* generic */
+label {
+ /* padding: 4px 10px 4px 0; so that it aligns to the padding of the
inputboxes */
+ &.big {
+ text-transform: uppercase;
+ font-family: $headlinefont;
+ font-size: 110%;
+ font-weight: bold;
+ color: $formheadfg;
+ }
+}
+
+
+
/* simple two column label + input pairs */
.dcloud_form {
fieldset {
@@ -570,6 +653,8 @@ li.operation>ul, li.administration>ul, li.build>ul,
li.runtime>ul {
}
}
+
+
/* WIZARD TILES */
ul.tiles {
diff --git a/src/app/views/provider/_providers.haml
b/src/app/views/provider/_providers.haml
index 9efd8c4..84cb1fd 100644
--- a/src/app/views/provider/_providers.haml
+++ b/src/app/views/provider/_providers.haml
@@ -1,6 +1,4 @@
-%h2 Providers
-%ul#providers
-#providers_nav.grid_3
+#providers_nav.grid_3.actionsidebar
%dl
%dt
= t('provider.providers')
diff --git a/src/app/views/provider/show.haml b/src/app/views/provider/show.haml
index 81726e7..81e556b 100644
--- a/src/app/views/provider/show.haml
+++ b/src/app/views/provider/show.haml
@@ -1,28 +1,31 @@
- readonly = controller.action_name == 'show' ? true : false
= render :partial => 'providers'
#details.grid_13
- = render_navigation(:level => 4)
+ %nav.subsubnav
+ = render_navigation(:level => 4)
- if controller.action_name == 'new'
- form_action = 'create'
- elsif controller.action_name == 'edit'
- form_action = 'update'
- - form_tag :controller => :provider, :action => form_action do
- %h2.first
- = t('.provider_name')
- - unless readonly
- %span.required
- *
- %h2.second
- = t('.provider_url')
- - unless readonly
- %span.required
- *
- .fieldGroup.clearfix
- = text_field :provider, :name, :title => t('.provider_name'), :value =>
(@provider.name if @provider), :disabled => ('disabled' if
controller.action_name == 'show')
- = text_field :provider, :url, :title => t('.provider_url'), :class =>
'emailinput', :value => (@provider.url if @provider), :disabled => ('disabled'
unless controller.action_name == 'new')
+ - form_tag :controller => :provider, :action => form_action, :class =>
"dcloud_form" do
+ %fieldset
+ %label.grid_4.alpha.big{ :for => "provider_name" }
+ = t('.provider_name')
+ - unless readonly
+ %span.required
+ *
+ %label.grid_5.big{ :for => "provider_url" }
+ = t('.provider_url')
+ - unless readonly
+ %span.required
+ *
+ /for error messages
+ %div.grid_4.omega
+ = text_field :provider, :name, :title => t('.provider_name'), :value =>
(@provider.name if @provider), :disabled => ('disabled' if
controller.action_name == 'show'), :class => "clear grid_4 alpha"
+ = text_field :provider, :url, :title => t('.provider_url'), :class =>
'emailinput', :value => (@provider.url if @provider), :disabled => ('disabled'
unless controller.action_name == 'new'), :class => "grid_5"
- if controller.action_name == 'edit':
= hidden_field :provider, :id, :value => @provider.id
- %p
+ .clear.prefix_4.grid_5.suffix_4.alpha.omega
%span
(
%a{ :href => ''}<>
diff --git a/src/public/images/actionsidebar-bullet.png
b/src/public/images/actionsidebar-bullet.png
new file mode 100644
index
0000000000000000000000000000000000000000..e6acef9158e7e3e48716cd094ea0bbcdfa2f2242
GIT binary patch
literal 325
zcm...@n?(olHy`uVBq!ia0vp^LO?9Y!3HERME&^*q*#ibjvq8uposx*1i...@q5r1
zs=p4xj7}P}D}aKMC9V-A!TD(=<%vb94CUqJdYO6I#mR{Use1WE>9gp2nc...@^o<w
zvFJT}MUn52g8=IV`zc8Q9_ucoWM>sf9O5ltaX-Yl!+AXepKH?*K_0%%p4PL!aCzAH
zo8...@xcgyc*{nuc%w`_f<HWtcVA+8S~;((u_NQ`nc2&JUJsb7YW%)?(Tkl<3<j%L
zy*hEGHk?Drh_%4%7|)yqR?31qGuF1R6JS_jz*BCg5IpVaA<<nz7cD#|-99fMIG4d^
zO3?Rhd)FPcWN|d;U-Tl;`UYF>V~aS(idzB<4IO(zr=`ajukf...@#h=infsh?#ic5
Q0{Vu*)78&qol`;+0QyFFlmGw#
literal 0
HcmV?d00001
--
1.7.2.3
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
