On 06/30/2011 06:33 PM, kkeiter(a)redhat.com wrote:
From: Kenneth Keiter<kkeiter(a)redhat.com>
---
src/app/stylesheets/layout.scss | 178 +++++++++++++++++++-
src/app/views/pool_families/_form.haml | 14 +-
src/app/views/pool_families/edit.haml | 2 +-
src/app/views/pool_families/new.haml | 2 +-
src/app/views/pools/_form.haml | 50 ++++---
src/app/views/provider_accounts/_form.haml | 4 +-
.../views/provider_accounts/_provider_form.haml | 33 ++--
.../provider_accounts/_provider_selection.haml | 20 ++-
src/app/views/provider_accounts/edit.haml | 2 +-
src/app/views/provider_accounts/new.haml | 2 +-
src/app/views/providers/_form.haml | 23 ++--
src/app/views/providers/edit.haml | 2 +-
src/app/views/providers/new.haml | 2 +-
src/app/views/realms/_form.haml | 6 +-
src/app/views/realms/edit.haml | 2 +-
src/app/views/realms/new.haml | 2 +-
src/app/views/roles/_form.haml | 6 +-
src/app/views/roles/edit.haml | 2 +-
src/app/views/roles/new.haml | 2 +-
src/app/views/suggested_deployables/_form.haml | 19 +-
src/app/views/suggested_deployables/edit.haml | 2 +-
src/app/views/suggested_deployables/new.haml | 2 +-
src/app/views/users/_form.haml | 74 +++++----
src/app/views/users/edit.haml | 2 +-
src/app/views/users/new.haml | 2 +-
25 files changed, 331 insertions(+), 124 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index 18fff1c..d8e8315 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -1,6 +1,6 @@
/* ###########################################################################
Generated SCSS for Aeolus UI [aeolus_ui]
-Compiled on 2011-06-16 22:42:20 -0700
+Compiled on Wed Jun 29 20:41:07 -0700 2011
########################################################################### */
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -2331,6 +2331,182 @@ ul.deployment-array.small + ul.deployment-array.small{
}
/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Flat Table Component -- v.0.0.1 [flat_table] (flat_table.scss)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+
+$font-family-primary: Helvetica, Arial, "Lucida Grande", sans-serif;
+
+/* padding configuration */
+$th_padding: 8px 10px 8px 10px;
+$td_padding: 8px;
+
+/* color configuration */
+$cell_color_base: #ffffff;
+$cell_color_header: #cccccc;
+$cell_color_stripe: #efefef;
+$cell_color_selected: #f9fafe;
+$cell_color_gradient: 5%;
+
+$cell_header_text_color: #666666;
+
+/* useful mixins */
+@mixin gradient-bg($from, $to){
+ background-color: $cell_color_base;
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from($from), to($to));
+ background-image: -moz-linear-gradient($from, $to);
+ background-image: -o-linear-gradient($from, $to);
+ background-image: linear-gradient($from, $to);
+}
+
+/* Flat Table ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
+table.flat{
+
+ border-collapse: separate;
+ font-family: $font-family-primary;
+
+ /* header */
+
+ th{
+ @include gradient-bg($cell_color_base, $cell_color_header);
+ text-align: center;
+ font-size: 11px;
+ color: $cell_header_text_color;
+ font-weight: bold;
+ text-shadow: 0px 1px 0px #ffffff;
+ padding: $th_padding;
+ border-bottom: 1px solid #D6DADD;
+ border-left: 1px solid darken(#E9EAEC, $cell_color_gradient);
+ }
+
+ th.ignore{
+ background-color: transparent;
+ background-image: none;
+ border: 0;
+ }
+
+ th.ignore + th{
+ -webkit-border-top-left-radius: 5px;
+ -moz-border-radius-topleft: 5px;
+ border-top-left-radius: 5px;
+ }
+
+ td{
+ $cell_color_end: darken($cell_color_base, $cell_color_gradient);
+ border-spacing: 0px;
+ text-align: center;
+ padding: $td_padding;
+ border-top: 1px solid #fff;
+ font-size: 12px;
+ color: #333;
+ @include gradient-bg($cell_color_base, $cell_color_end);
+ border-top: 1px solid #fff;
+ border-left: 1px solid #fff;
+ border-bottom: 1px solid darken($cell_color_end, $cell_color_gradient);
+ border-right: 1px solid darken($cell_color_end, $cell_color_gradient);
+ }
+
+ tr{
+ height: 30px;
+ }
+
+ tr.stripe{
+ td{
+ $cell_color_end: darken($cell_color_stripe, $cell_color_gradient);
+ @include gradient-bg($cell_color_stripe, $cell_color_end);
+ border-bottom: 1px solid darken($cell_color_stripe, $cell_color_gradient);
+ border-right: 1px solid darken($cell_color_stripe, $cell_color_gradient);
+ }
+ }
+
+ tr.selected{
+ td{
+ $cell_color_end: darken($cell_color_selected, $cell_color_gradient);
+ @include gradient-bg($cell_color_selected, $cell_color_end);
+ border-top: 1px solid #fff;
+ border-left: 1px solid #fff;
+ border-bottom: 1px solid darken($cell_color_end, $cell_color_gradient);
+ border-right: 1px solid darken($cell_color_end, $cell_color_gradient);
+ }
+ }
+
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+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;
+
+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;
+ font-family: $label-font;
+ font-size: 12px;
+ text-shadow: 0px 1px 0px #ffffff;
+ padding-bottom: 2px;
+ font-weight: normal;
+ }
+
+ label span{
+ font-size: 11px;
+ color: #666;
+ }
+
+ input[type="text"],input[type="password"]{
+ padding: 4px;
+ width: 200px;
+ font-size: 13px;
+ }
+
+ input.em{
+ font-size: 16px;
+ padding: 6px;
+ }
+
+ input.long{
+ width: 400px;
+ }
+
+ input.short{
+ width: 100px;
+ }
+
+}
+
+/* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Page Footer -- v.0.0.1 [footer] (footer.scss)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ */
diff --git a/src/app/views/pool_families/_form.haml
b/src/app/views/pool_families/_form.haml
index e196468..2027f78 100644
--- a/src/app/views/pool_families/_form.haml
+++ b/src/app/views/pool_families/_form.haml
@@ -1,12 +1,14 @@
= error_messages_for :pool_family
-= form.error_message_on :name, 'Name '
%fieldset
- = form.label :name,'Pool Family Name:'
- = form.text_field :name, :title => 'pool_family_name', :value =>
@pool_family.name
+ %p
+ = form.label :name,'Pool Family Name'
+ = form.text_field :name, :title => 'pool_family_name', :value =>
@pool_family.name, :class => 'em long'
+
%fieldset
- form.fields_for :quota do |quota_form|
- %fieldset
- = quota_form.label :maximum_running_instances, t(:maximum_running_instances),
:class => "alpha grid_3"
+ %p
+ = quota_form.label :maximum_running_instances, t(:maximum_running_instances)
= quota_form.text_field :maximum_running_instances
-%fieldset
+
+%fieldset.options
= form.submit "Save", :class => "submit button"
diff --git a/src/app/views/pool_families/edit.haml
b/src/app/views/pool_families/edit.haml
index e827862..73c35b3 100644
--- a/src/app/views/pool_families/edit.haml
+++ b/src/app/views/pool_families/edit.haml
@@ -13,5 +13,5 @@
%h2 Properties
.content
- -form_for @pool_family, :url => pool_family_path(@pool_family), :html => {
:method => :put } do |f|
+ -form_for @pool_family, :url => pool_family_path(@pool_family), :html => {
:method => :put, :class => 'generic' } do |f|
= render :partial => 'form', :locals => { :form => f,
:cancel_path => providers_path }
diff --git a/src/app/views/pool_families/new.haml b/src/app/views/pool_families/new.haml
index 45130fa..0bf86b2 100644
--- a/src/app/views/pool_families/new.haml
+++ b/src/app/views/pool_families/new.haml
@@ -6,5 +6,5 @@
%h2 New Pool Family
.content
- - form_for @pool_family, :url => pool_families_path do |f|
+ - form_for @pool_family, :url => pool_families_path, :html => {:class =>
'generic'} do |f|
= render :partial => "form", :locals => { :form => f,
:cancel_path => pool_families_path }
diff --git a/src/app/views/pools/_form.haml b/src/app/views/pools/_form.haml
index e2f1b66..ad79aaa 100644
--- a/src/app/views/pools/_form.haml
+++ b/src/app/views/pools/_form.haml
@@ -1,27 +1,37 @@
-- form_for @pool do |form|
+- form_for @pool, :html => {:class => 'generic'} do |form|
= error_messages_for :pool
+
%fieldset
- = form.label :name, "Name:", :class => "grid_2 alpha"
- = form.text_field :name
- %fieldset
- = form.label :pool_family_id, "Pool Family:", :class => "grid_2
alpha"
- = form.collection_select :pool_family_id, PoolFamily.all, :id, :name
+ %p
+ = form.label :name, "Name"
+ = form.text_field :name, :class => 'em long'
+ %p
+ = form.label :pool_family_id, "Pool Family"
+ = form.collection_select :pool_family_id, PoolFamily.all, :id, :name
+
%fieldset
- = label_tag "Quota:"
- = text_field :quota, :maximum_running_instances, :title =>
t('provider_accounts.form.quota_instances'), :value =>
@quota.maximum_running_instances || "unlimited", :id =>
"quota_instances", :class => "grid_3 omega"
- (
- %button.linkbutton.nospace{ :type => 'button', :onclick =>
"set_unlimited_quota(\"quota_instances\");" }<>
- = t('provider_accounts.form.unlimited_quota')
- )
+ %p
+ %label
+ Quota
+ %span
+ (# instances or
+ %a#unlimited_quota_btn{:href => '#'} unlimited
+ )
+ = text_field :quota, :maximum_running_instances, :title =>
t('provider_accounts.form.quota_instances'), :value =>
@quota.maximum_running_instances || "unlimited", :id =>
"quota_instances"
+
%fieldset
- = form.label :enabled, "Enabled:",{ :class => "grid_2 alpha"
}
- = form.check_box :enabled
- %fieldset.clear
+ %p
+ = form.label :enabled, "Pool Enabled?"
+ = form.check_box :enabled
- = form.submit "Save", :class => 'button'
- = link_to 'Cancel', pools_path, :class => 'button danger'
+ %fieldset.options
+ = form.submit "Save", :class => 'button'
+ = link_to 'Cancel', pools_path, :class => 'button danger'
:javascript
- function set_unlimited_quota(elem_id) {
- $("#" + elem_id)[0].value = "unlimited";
- }
+ $(document).ready(function(){
+ $('#unlimited_quota_btn').click(function(){
+ $('#quota_instances').val('unlimited');
+ return false;
+ });
+ });
diff --git a/src/app/views/provider_accounts/_form.haml
b/src/app/views/provider_accounts/_form.haml
index 8959966..b935687 100644
--- a/src/app/views/provider_accounts/_form.haml
+++ b/src/app/views/provider_accounts/_form.haml
@@ -1,5 +1,5 @@
= error_messages_for :provider_account
= render :partial => 'provider_selection'
-%fieldset
+%fieldset.options
= form.submit 'Save', :class => "button"
- = link_to t(:cancel), provider_accounts_path, :class => 'button button
danger'
+ = link_to t(:cancel), provider_accounts_path, :class => 'button danger'
diff --git a/src/app/views/provider_accounts/_provider_form.haml
b/src/app/views/provider_accounts/_provider_form.haml
index 9240934..35e2520 100644
--- a/src/app/views/provider_accounts/_provider_form.haml
+++ b/src/app/views/provider_accounts/_provider_form.haml
@@ -1,25 +1,28 @@
%fieldset
- = label :provider_account, "Account name:"
- = text_field :provider_account, :label
+ %p
+ = label :provider_account, "Account Name"
+ = text_field :provider_account, :label, :class => 'em long'
- CredentialDefinition::CREDENTIAL_DEFINITIONS_ORDER.each do |cred_order|
- @provider_account.all_credentials((a)selected_provider).each do |cred|
- if cred_order == cred.credential_definition.name
%fieldset
- = label_tag cred.credential_definition.label
- - if cred.credential_definition.input_type == "password"
- = password_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]",
cred.value
- - elsif cred.credential_definition.input_type == "file"
- = file_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]", :value
=> cred.value
- - else
- = text_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]",
cred.value
+ %p
+ = label_tag cred.credential_definition.label
+ - if cred.credential_definition.input_type == "password"
+ = password_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]",
cred.value
+ - elsif cred.credential_definition.input_type == "file"
+ = file_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]", :value
=> cred.value
+ - else
+ = text_field_tag
"provider_account[credentials_hash][#{cred.credential_definition.name}]",
cred.value
-= label_tag "Quota"
-= text_field :quota, :maximum_running_instances, :title =>
t('provider_accounts.form.quota_instances'), :value =>
@quota.maximum_running_instances || "unlimited", :id =>
"quota_instances", :class => "grid_3 omega"
-(
-%button.linkbutton.nospace{ :type => 'button', :onclick =>
"set_unlimited_quota(\"quota_instances\");" }<>
- = t('provider_accounts.form.unlimited_quota')
-)
%fieldset
+ %p
+ = label_tag "Quota"
+ = text_field :quota, :maximum_running_instances, :title =>
t('provider_accounts.form.quota_instances'), :value =>
@quota.maximum_running_instances || "unlimited", :id =>
"quota_instances"
+ (
+ %button.linkbutton.nospace{ :type => 'button', :onclick =>
"set_unlimited_quota(\"quota_instances\");" }<>
+ = t('provider_accounts.form.unlimited_quota')
+ )
:javascript
function set_unlimited_quota(elem_id) {
diff --git a/src/app/views/provider_accounts/_provider_selection.haml
b/src/app/views/provider_accounts/_provider_selection.haml
index 27176b5..0dee71e 100644
--- a/src/app/views/provider_accounts/_provider_selection.haml
+++ b/src/app/views/provider_accounts/_provider_selection.haml
@@ -1,13 +1,15 @@
%fieldset#provider_type
- = label_tag "Provider: "
- = select(:provider_account, :provider_id, options_for_select((a)providers.map{ |p|
[p.name, p.id] }, :selected => @selected_provider.id))
- = restful_submit_tag "Choose",
'set_selected_provider',set_selected_provider_provider_accounts_path,
'GET', :class => 'button'
- = label_tag "Cloud type: "
- = @selected_provider.provider_type.name
- - unless @selected_provider.provider_type.codename.nil?
- = render :partial => "provider_form", :locals => { :provider_type
=> @selected_provider.provider_type}
- - else
- = flash.now[:warning] = "You don't have any provider yet"
+ %p
+ = label_tag "Provider"
+ = select(:provider_account, :provider_id, options_for_select((a)providers.map{ |p|
[p.name, p.id] }, :selected => @selected_provider.id))
+ = restful_submit_tag "Choose",
'set_selected_provider',set_selected_provider_provider_accounts_path,
'GET', :class => 'button'
+ %p
+ = label_tag "Cloud type: "
+ = @selected_provider.provider_type.name
+ - unless @selected_provider.provider_type.codename.nil?
+ = render :partial => "provider_form", :locals => {
:provider_type => @selected_provider.provider_type}
+ - else
+ = flash.now[:warning] = "You don't have any provider yet"
:javascript
$(document).ready(function(){
diff --git a/src/app/views/provider_accounts/edit.haml
b/src/app/views/provider_accounts/edit.haml
index 8a35dbf..4ab22b1 100644
--- a/src/app/views/provider_accounts/edit.haml
+++ b/src/app/views/provider_accounts/edit.haml
@@ -15,5 +15,5 @@
.content
- unless @providers.empty?
- - form_for(@provider_account, :url =>
provider_account_path(@provider_account), :html => {:multipart => true,:method
=> :put}) do |f|
+ - form_for(@provider_account, :url =>
provider_account_path(@provider_account), :html => {:multipart => true,:method
=> :put, :class => 'generic'}) do |f|
= render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/provider_accounts/new.haml
b/src/app/views/provider_accounts/new.haml
index f5ef97d..61346c7 100644
--- a/src/app/views/provider_accounts/new.haml
+++ b/src/app/views/provider_accounts/new.haml
@@ -7,5 +7,5 @@
.content
- unless @providers.empty?
- - form_for(@provider_account, :url => provider_accounts_path, :html =>
{:multipart => true}) do |f|
+ - form_for(@provider_account, :url => provider_accounts_path, :html =>
{:multipart => true, :class => 'generic'}) do |f|
= render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/providers/_form.haml b/src/app/views/providers/_form.haml
index 7c7b991..f07ed24 100644
--- a/src/app/views/providers/_form.haml
+++ b/src/app/views/providers/_form.haml
@@ -1,14 +1,15 @@
= form.error_messages
%fieldset
- = form.label :name,'Provider name:'
- = form.text_field :name, :title => 'provider_name', :value =>
@provider.name
-%fieldset
- = form.label :url, 'Provider URL:'
- = form.text_field :url, :title => 'provider_url', :value =>
@provider.url
-%fieldset
- = form.label :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 :name,'Provider name:'
+ = form.text_field :name, :title => 'provider_name', :value =>
@provider.name, :class => 'em 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.select(:provider_type_id, ProviderType.all.collect {|provider_type|
[provider_type.name,provider_type.id] }, :prompt => "Select type of
provider")
-%fieldset
- = form.submit "Save", :class => "submit button button"
- = link_to t(:cancel), cancel_path, :class => 'button button danger'
+%fieldset.options
+ = form.submit "Save", :class => "submit button"
+ = link_to t(:cancel), cancel_path, :class => 'button danger'
diff --git a/src/app/views/providers/edit.haml b/src/app/views/providers/edit.haml
index 89e4b3a..2cef1e2 100644
--- a/src/app/views/providers/edit.haml
+++ b/src/app/views/providers/edit.haml
@@ -15,5 +15,5 @@
= @provider.name
.content
- -form_for @provider, :url => provider_path(@provider), :html => { :method
=> :put } do |f|
+ -form_for @provider, :url => provider_path(@provider), :html => { :method
=> :put, :class => 'generic' } do |f|
= render :partial => 'form', :locals => { :form => f,
:cancel_path => provider_path(@provider)}
diff --git a/src/app/views/providers/new.haml b/src/app/views/providers/new.haml
index 763e250..4cb3965 100644
--- a/src/app/views/providers/new.haml
+++ b/src/app/views/providers/new.haml
@@ -5,5 +5,5 @@
%header
%h2 New Provider
.content
- - form_for @provider, :url => providers_path do |f|
+ - form_for @provider, :url => providers_path, :html => {:class =>
'generic'} do |f|
= render :partial => "form", :locals => { :form => f,
:cancel_path => providers_path }
diff --git a/src/app/views/realms/_form.haml b/src/app/views/realms/_form.haml
index 6b826f2..684aa1a 100644
--- a/src/app/views/realms/_form.haml
+++ b/src/app/views/realms/_form.haml
@@ -1,6 +1,6 @@
= form.error_messages
%fieldset
- = form.label :name,'Realm Name :'
- = form.text_field :name, :title => 'realm_name', :value =>
@realm.name
-%fieldset
+ = form.label :name, 'Realm Name'
+ = form.text_field :name, :title => 'realm_name', :value =>
@realm.name, :class => 'em long'
+%fieldset.options
= form.submit "Save", :class => "submit button"
diff --git a/src/app/views/realms/edit.haml b/src/app/views/realms/edit.haml
index b05ea79..8d77484 100644
--- a/src/app/views/realms/edit.haml
+++ b/src/app/views/realms/edit.haml
@@ -13,5 +13,5 @@
%h2 Properties
.content
- - form_for @realm, :url => realm_path(@realm), :html => { :method =>
:put } do |f|
+ - form_for @realm, :url => realm_path(@realm), :html => { :method =>
:put, :class => 'generic' } do |f|
= render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/realms/new.haml b/src/app/views/realms/new.haml
index 50b6865..0f0c13a 100644
--- a/src/app/views/realms/new.haml
+++ b/src/app/views/realms/new.haml
@@ -6,5 +6,5 @@
%h2 Create a new Realm
.content
- - form_for @realm, :url => realms_path do |f|
+ - form_for @realm, :url => realms_path, :html => {:class =>
'generic'} do |f|
= render :partial => "form", :locals => { :form => f,
:cancel_path => realms_path }
diff --git a/src/app/views/roles/_form.haml b/src/app/views/roles/_form.haml
index 5b224bc..a22b97c 100644
--- a/src/app/views/roles/_form.haml
+++ b/src/app/views/roles/_form.haml
@@ -1,7 +1,7 @@
= form.error_messages
%fieldset
- = form.label :name, 'Name', :class => "grid_3 alpha"
- = form.text_field :name, :class => "grid_5"
-%fieldset
+ = form.label :name, 'Name'
+ = form.text_field :name, :class => "em long"
+%fieldset.options
= form.submit "Save", :class => "submit button"
= link_to t(:cancel), roles_path, :class => 'button button'
diff --git a/src/app/views/roles/edit.haml b/src/app/views/roles/edit.haml
index 756d43c..0bae7b4 100644
--- a/src/app/views/roles/edit.haml
+++ b/src/app/views/roles/edit.haml
@@ -18,5 +18,5 @@
- else
%h2 Editing Role:
- - form_for @role, :url => role_path(@role), :html => { :method => :put }
do |f|
+ - form_for @role, :url => role_path(@role), :html => { :method => :put,
:class => 'generic' } do |f|
= render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/roles/new.haml b/src/app/views/roles/new.haml
index 7f94487..bc9fb06 100644
--- a/src/app/views/roles/new.haml
+++ b/src/app/views/roles/new.haml
@@ -5,5 +5,5 @@
%h2 New Role
.content
- - form_for @role, :url => roles_path do |f|
+ - form_for @role, :url => roles_path, :html => {:class =>
'generic'} do |f|
= render :partial => "form", :locals => { :form => f }
\ No newline at end of file
diff --git a/src/app/views/suggested_deployables/_form.haml
b/src/app/views/suggested_deployables/_form.haml
index cf47953..cef100e 100644
--- a/src/app/views/suggested_deployables/_form.haml
+++ b/src/app/views/suggested_deployables/_form.haml
@@ -1,14 +1,15 @@
= error_messages_for 'suggested_deployable'
-%ul
- %li
+%fieldset
+ %p
= form.label :name
- = form.text_field :name
- %li
+ = form.text_field :name, :class => 'em long'
+ %p
= form.label :description
- = form.text_area :description
- %li
+ = form.text_area :description, :class => 'long'
+ %p
= form.label :url, 'URL'
- = form.text_field :url
+ = form.text_field :url, :class => 'long'
-= link_to 'Cancel', suggested_deployables_path, :class => 'button
danger'
-= submit_tag 'Save', :name => 'save', :class =>
'button'
+%fieldset.options
+ = link_to 'Cancel', suggested_deployables_path, :class => 'button
danger'
+ = submit_tag 'Save', :name => 'save', :class =>
'button'
diff --git a/src/app/views/suggested_deployables/edit.haml
b/src/app/views/suggested_deployables/edit.haml
index 5eb800b..4b2b05f 100644
--- a/src/app/views/suggested_deployables/edit.haml
+++ b/src/app/views/suggested_deployables/edit.haml
@@ -11,5 +11,5 @@
%h2 Editing Deployable
.content
- - form_for @suggested_deployable, :url =>
suggested_deployable_path(@suggested_deployable), :html => { :method => :put } do
|f|
+ - form_for @suggested_deployable, :url =>
suggested_deployable_path(@suggested_deployable), :html => { :method => :put,
:class => 'generic' } do |f|
= render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/suggested_deployables/new.haml
b/src/app/views/suggested_deployables/new.haml
index 0ba6a5e..d7f8035 100644
--- a/src/app/views/suggested_deployables/new.haml
+++ b/src/app/views/suggested_deployables/new.haml
@@ -6,5 +6,5 @@
%h2 Add New Deployable
.content
- - form_for @suggested_deployable, :url => suggested_deployables_path do |f|
+ - form_for @suggested_deployable, :url => suggested_deployables_path, :html
=> {:class => 'generic'} do |f|
= render :partial => "form", :locals => { :form => f }
diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml
index 48bf857..b174b1b 100644
--- a/src/app/views/users/_form.haml
+++ b/src/app/views/users/_form.haml
@@ -1,43 +1,55 @@
= form.error_messages
%fieldset
- = form.label :login, t(:choose_name), :class => "grid_3 alpha"
- = form.text_field :login, :class => "grid_5"
-%fieldset
- = form.label :password, form.object.new_record? ? t(:choose_password) :
t(:change_password), :class => "grid_3 alpha"
- = form.password_field :password, :class => "grid_5"
+ %p
+ = form.label :login, t(:choose_name)
+ = form.text_field :login, :class => "em"
+
+%fieldset.inline
+ %p
+ = form.label :password, form.object.new_record? ? t(:choose_password) :
t(:change_password)
+ = form.password_field :password
+ %p
+ = form.label :password_confirmation, t(:confirm_password)
+ = form.password_field :password_confirmation
+
+%fieldset.inline
+ %p
+ = form.label :first_name, t(:first_name)
+ = form.text_field :first_name
+ %p
+ = form.label :last_name, t(:last_name)
+ = form.text_field :last_name
+
%fieldset
- = form.label :password_confirmation, t(:confirm_password), :class => "grid_3
alpha"
- = form.password_field :password_confirmation, :class => "grid_5"
+ %p
+ = form.label :email, t(:email)
+ = form.text_field :email, :class => 'long'
+
+-if check_privilege(Privilege::MODIFY, User)
+ %fieldset.inline
+ %legend User Treatment
+ %p
+ = select_tag 'user_treatment', options_for_select([t(:choose_treatment)])
+ %p
+ = submit_tag t(:apply), :disabled => true
+
+ - form.fields_for :quota do |quota_form|
+ %fieldset
+ %p
+ = quota_form.label :maximum_running_instances, t(:maximum_running_instances)
+ = quota_form.text_field :maximum_running_instances
+ (instances)
+ = quota_form.error_message_on :maximum_running_instances, 'Maximum Running
Instances '
+
-if check_privilege(Privilege::MODIFY, User)
%fieldset
- = form.label :user_status, "User Status:", :class => "alpha
grid_3"
- .grid_5
+ %legend User Status
+ %p.radio-group
= radio_button_tag "user_status","Active",true
= label_tag "user_status_active", "Active"
= radio_button_tag "user_status","Inactive", false, :disabled
=> true
= label_tag "user_status_inactive", "Inactive"
-%fieldset
- = form.label :first_name, t(:first_name), :class => "alpha grid_3"
- = form.text_field :first_name, :class => "grid_5"
-%fieldset
- = form.label :last_name, t(:last_name), :class => "alpha grid_3"
- = form.text_field :last_name, :class => "grid_5"
-%fieldset
- = form.label :email, t(:email), :class => "alpha grid_3"
- = form.text_field :email, :class => "grid_5"
--if check_privilege(Privilege::MODIFY, User)
- %h3.grid_16 User Treatment
- %fieldset
- = label_tag 'apply_treatment', t(:apply_treatment), :class =>
"alpha grid_3"
- = select_tag 'user_treatment', options_for_select([t(:choose_treatment)]),
:class => "grid_5"
- = submit_tag t(:apply), :disabled => true, :class => "grid_2"
- - form.fields_for :quota do |quota_form|
- %fieldset
- = quota_form.label :maximum_running_instances, t(:maximum_running_instances),
:class => "alpha grid_3"
- = quota_form.text_field :maximum_running_instances, :class =>
"grid_5"
- (instances)
- = quota_form.error_message_on :maximum_running_instances, 'Maximum Running
Instances '
-%fieldset
+%fieldset.options
= form.submit "Save", :class => "submit button"
= link_to t(:cancel), cancel_path, :class => 'button danger'
diff --git a/src/app/views/users/edit.haml b/src/app/views/users/edit.haml
index 710c53e..063c6a7 100644
--- a/src/app/views/users/edit.haml
+++ b/src/app/views/users/edit.haml
@@ -16,5 +16,5 @@
%h2 Editing Account
.content
- - form_for @user, :url => user_path(@user), :html => { :method => :put }
do |f|
+ - form_for @user, :url => user_path(@user), :html => { :method => :put,
:class => 'generic' } do |f|
= render :partial => "form", :locals => { :form => f,
:cancel_path => users_path }
diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml
index 26befe6..66eb648 100644
--- a/src/app/views/users/new.haml
+++ b/src/app/views/users/new.haml
@@ -6,7 +6,7 @@
%h2 New Account
.content
- - form_for @user, :url => users_path do |f|
+ - form_for @user, :url => users_path, :html => {:class =>
'generic'} do |f|
-if current_user
= render :partial => "form", :locals => { :form => f,
:cancel_path => users_path }
-else
ACK & pushed
Thomas
--
No trees were killed to send this message, but a large number of
electrons were terribly inconvenienced.