On 10/21/2010 01:15 PM, [email protected] wrote: > From: Jakub Steiner<[email protected]> > > This fixes the Cancel button and changes the markup to wrap the form in the > .modalbox class only when the user is not logged in. > --- > src/app/stylesheets/aggregator.scss | 3 +- > src/app/views/users/_form.haml | 82 > +++++++++++++++++++---------------- > src/app/views/users/new.haml | 13 ++--- > 3 files changed, 52 insertions(+), 46 deletions(-) > > diff --git a/src/app/stylesheets/aggregator.scss > b/src/app/stylesheets/aggregator.scss > index 76021c2..1b43b88 100644 > --- a/src/app/stylesheets/aggregator.scss > +++ b/src/app/stylesheets/aggregator.scss > @@ -121,6 +121,7 @@ input[type='submit'],button,.button { > display: inline-block; > margin-left: 3px; > margin: 40px 4px 4px; > + float: left; > } > &.actionlink { > margin: 40px 0 0; > @@ -861,7 +862,7 @@ fieldset.gap { > padding: 4px 10px 0 0; > max-width: 10em; > } > - input { > + input[type='text'], input[type='password'], textarea { > display: inline-block; > width: 20em; > } > diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml > index 1e5dc59..9f4adce 100644 > --- a/src/app/views/users/_form.haml > +++ b/src/app/views/users/_form.haml > @@ -1,38 +1,46 @@ > -%fieldset.clear > - = form.label :login, t(:choose_name), :class => "grid_3 alpha" > - = form.text_field :login, :class => "grid_5" > -%fieldset.clear > - = form.label :password, form.object.new_record? ? t(:choose_password) : > t(:change_password), :class => "grid_3 alpha" > - = form.password_field :password, :class => "grid_5" > -%fieldset > - = form.label :password_confirmation, t(:confirm_password), :class => > "grid_3 alpha" > - = form.password_field :password_confirmation, :class => "grid_5" > --if has_user_modify? > - %fieldset.clear > - = form.label :user_status, "User Status:", :class => "alpha grid_3" > - .grid_5 > - = 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.clear > - = form.label :first_name, t(:first_name), :class => "alpha grid_3" > - = form.text_field :first_name, :class => "grid_5" > -%fieldset.clear > - = form.label :last_name, t(:last_name), :class => "alpha grid_3" > - = form.text_field :last_name, :class => "grid_5" > -%fieldset.clear > - = form.label :email, t(:email), :class => "alpha grid_3" > - = form.text_field :email, :class => "grid_5" > --if has_user_modify? > - %h3.grid_16 User Treatment > - = 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 > - > - - form.fields_for :quota do |quota_form| > +%h2 New Account > +.dcloud_form > + - form_for @user, :url => account_path do |form| > + = form.error_messages > + %fieldset.clear > + = form.label :login, t(:choose_name), :class => "grid_3 alpha" > + = form.text_field :login, :class => "grid_5" > + %fieldset.clear > + = form.label :password, form.object.new_record? ? t(:choose_password) > : t(:change_password), :class => "grid_3 alpha" > + = form.password_field :password, :class => "grid_5" > + %fieldset > + = form.label :password_confirmation, t(:confirm_password), :class => > "grid_3 alpha" > + = form.password_field :password_confirmation, :class => "grid_5" > + -if has_user_modify? > + %fieldset.clear > + = form.label :user_status, "User Status:", :class => "alpha grid_3" > + .grid_5 > + = 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.clear > - = 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 ' > \ No newline at end of file > + = form.label :first_name, t(:first_name), :class => "alpha grid_3" > + = form.text_field :first_name, :class => "grid_5" > + %fieldset.clear > + = form.label :last_name, t(:last_name), :class => "alpha grid_3" > + = form.text_field :last_name, :class => "grid_5" > + %fieldset.clear > + = form.label :email, t(:email), :class => "alpha grid_3" > + = form.text_field :email, :class => "grid_5" > + -if has_user_modify? > + %h3.grid_16 User Treatment > + %fieldset.clearfix > + = 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.clear > + = 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.clearfix > + = form.submit t(:create_account), :class => "submit formbutton" > + = link_to t(:cancel), cancel_path, :class => 'button formbutton' > diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml > index b6ed86b..4cd3e76 100644 > --- a/src/app/views/users/new.haml > +++ b/src/app/views/users/new.haml > @@ -1,8 +1,5 @@ > -.modalbox > - %h2 New Account > - .dcloud_form > - - form_for @user, :url => account_path do |f| > - = f.error_messages > - = render :partial => "form", :object => f > - = f.submit t(:create_account), :class => "submit dialogbutton" > - = link_to t(:cancel), :class => 'actionlink button dialogbutton' > +-if (current_user) > + = render :partial => "form", :locals => { :cancel_path => users_path} > +-else > + .modalbox > + = render :partial => "form", :locals => { :cancel_path => login_path} NACK on this one, the edit user form is broken with this patch. I just sent another patch to the list integrating your changes here, Jakub's changes, and my stuff for the user form error messages / quota fields.
-Mo _______________________________________________ deltacloud-devel mailing list [email protected] https://fedorahosted.org/mailman/listinfo/deltacloud-devel
