---
src/app/stylesheets/layout.scss | 107 +++++++++++++++++++-
src/app/views/pools/_form.haml | 4 +-
.../provider_accounts/_provider_selection.haml | 1 +
src/app/views/providers/_form.haml | 4 +-
src/config/navigation.rb | 4 +-
5 files changed, 111 insertions(+), 9 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index 208b78a..fb9ca99 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -2246,7 +2246,7 @@ $font-family-base: "Lucida Sans Unicode", "Lucida
Grande", Verdana, Arial, Helve
$label-font: "Lucida Sans", "Lucida Sans Unicode", "Lucida
Grande", Verdana, Arial, Helvetica, sans-serif;
$font-family-primary: Helvetica, Arial, "Lucida Grande", sans-serif;
-form.generic{
+body.monitor form.generic{
fieldset{
p + p{
@@ -2280,13 +2280,27 @@ form.generic{
label{
display: block;
+ padding-bottom: 2px;
font-family: $label-font;
font-size: 12px;
text-shadow: 0px 1px 0px #ffffff;
- padding-bottom: 2px;
font-weight: normal;
}
+ body.administer label{
+ float: left;
+ width: 200px;
+ text-align: right;
+ padding: 6px 7px 5px 0px;
+
+ &.checkbox{
+ padding: 3px 7px 0px 0px;
+ }
+ &.em{
+ padding: 10px 7px 8px 0px;
+ }
+ }
+
label span{
font-size: 11px;
color: #666;
@@ -2298,9 +2312,96 @@ form.generic{
font-size: 13px;
}
+ body.administer input[type="text"],input[type="password"]{
+ border: 1px solid #C4C4C4;
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.50);
+ -moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
+ -webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
+ }
+
input.em{
font-size: 16px;
- padding: 6px;
+ padding: 6px 4px;
+ }
+
+ input.long{
+ width: 400px;
+ }
+
+ input.short{
+ width: 100px;
+ }
+
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Administer section Form Components -- v.0.0.1 [form] (form.scss)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+$font-family-base: "Lucida Sans Unicode", "Lucida Grande", Verdana,
Arial, Helvetica, sans-serif;
+$label-font: "Lucida Sans", "Lucida Sans Unicode", "Lucida
Grande", Verdana, Arial, Helvetica, sans-serif;
+$font-family-primary: Helvetica, Arial, "Lucida Grande", sans-serif;
+
+body.administer form.generic{
+
+ fieldset{
+ p + p{
+ margin-top: 10px;
+ }
+ p.radio-group label{
+ display: inline;
+ }
+ }
+
+ fieldset.inline p{
+ display: inline-block;
+ }
+
+ fieldset.em{
+ padding: 10px;
+ background-color: #dfdfdf;
+ border: 1px solid #999;
+ margin: 10px 0px 10px 0px;
+ }
+
+ fieldset + fieldset{
+ margin-top: 10px;
+ }
+
+ fieldset legend{
+ font-family: $font-family-primary;
+ font-size: 16px;
+ font-weight: light;
+ }
+
+ label{
+ display: block;
+ float: left;
+ width: 160px;
+ text-align: right;
+ padding: 6px 7px 5px 0px;
+ font-family: $label-font;
+ font-size: 12px;
+ text-shadow: 0px 1px 0px #ffffff;
+ font-weight: normal;
+
+ &.checkbox{
+ padding: 3px 7px 0px 0px;
+ }
+ }
+
+ label span{
+ font-size: 11px;
+ color: #666;
+ }
+
+ input[type="text"],input[type="password"]{
+ padding: 4px;
+ width: 200px;
+ font-size: 13px;
+ border: 1px solid #C4C4C4;
+ box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.50);
+ -moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
+ -webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.50);
}
input.long{
diff --git a/src/app/views/pools/_form.haml b/src/app/views/pools/_form.haml
index 50e91fa..8c1a6f1 100644
--- a/src/app/views/pools/_form.haml
+++ b/src/app/views/pools/_form.haml
@@ -3,7 +3,7 @@
%fieldset
%p
- = form.label :name, "Name"
+ = form.label :name, "Name", :class => 'em'
= form.text_field :name, :class => 'em long'
%p
= form.label :pool_family_id, "Pool Family"
@@ -21,7 +21,7 @@
%fieldset
%p
- = form.label :enabled, "Pool Enabled?"
+ = form.label :enabled, "Pool Enabled?", :class => 'checkbox'
= form.check_box :enabled
%fieldset.options
diff --git a/src/app/views/provider_accounts/_provider_selection.haml
b/src/app/views/provider_accounts/_provider_selection.haml
index fc7e225..068c1c3 100644
--- a/src/app/views/provider_accounts/_provider_selection.haml
+++ b/src/app/views/provider_accounts/_provider_selection.haml
@@ -6,6 +6,7 @@
%p
= label_tag "Cloud type: "
= @selected_provider.provider_type.name
+ .clear
- unless @selected_provider.provider_type.deltacloud_driver.nil?
= render :partial => "provider_form", :locals => { :provider_type
=> @selected_provider.provider_type}
- else
diff --git a/src/app/views/providers/_form.haml b/src/app/views/providers/_form.haml
index f7a1047..fc1f918 100644
--- a/src/app/views/providers/_form.haml
+++ b/src/app/views/providers/_form.haml
@@ -2,12 +2,12 @@
%fieldset
%p
= form.label :name,'Provider name:'
- = form.text_field :name, :title => 'provider_name', :value =>
@provider.name, :class => 'em long'
+ = form.text_field :name, :title => 'provider_name', :value =>
@provider.name, :class => 'long'
%p
= form.label :url, 'Provider URL:'
= form.text_field :url, :title => 'provider_url', :value =>
@provider.url, :class => 'long'
%p
- = form.label :provider_type
+ = form.label :provider_type, 'Provider type:'
= form.select(:provider_type_id, ProviderType.all.collect {|provider_type|
[provider_type.name,provider_type.id] }, :prompt => "Select type of
provider")
%p
= form.label :url, 'X-Deltacloud-Provider:'
diff --git a/src/config/navigation.rb b/src/config/navigation.rb
index 38e02dc..b93a8ba 100644
--- a/src/config/navigation.rb
+++ b/src/config/navigation.rb
@@ -5,8 +5,8 @@ SimpleNavigation::Configuration.run do |navigation|
first_level.item :monitor, t(:monitor), pools_path, :class => 'monitor',
:link => { :id => 'monitor' }, :highlights_on =>
/\/deployments|\/pools|\/instances/
first_level.item :administer, t(:administer), users_path, :class =>
'administer' do |second_level|
second_level.item :users_and_groups, "Users & Groups", users_path,
:link => { :class => 'users' }, :highlights_on => /\/users/
- second_level.item :environments, "Environments", hardware_profiles_path,
:link => { :class => 'environments' }, :highlights_on =>
/\/hardware_profiles/
- second_level.item :content, "Content", realms_path, :link => { :class
=> 'content' }, :highlights_on => /\/realms/
+ second_level.item :environments, "Environments", settings_path, :link
=> { :class => 'environments' }, :highlights_on => /\/settings/
+ second_level.item :content, "Content", settings_path, :link => {
:class => 'content' }, :highlights_on => /\/settings/
second_level.item :cloud_providers, "Cloud Providers", providers_path,
:link => { :class => 'providers' }, :highlights_on => /\/providers/
end
end
--
1.7.6