NACK (see at the bottom)
On 10/18/2010 02:37 PM, Jakub Steiner wrote:
> ---
> src/app/stylesheets/aggregator.scss | 3 ++-
> src/app/views/users/_form.haml | 7 ++++---
> src/app/views/users/new.haml | 16 +++++++++++++---
> 3 files changed, 19 insertions(+), 7 deletions(-)
>
> diff --git a/src/app/stylesheets/aggregator.scss
> b/src/app/stylesheets/aggregator.scss
> index 6711ee6..81f3aea 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;
> @@ -862,7 +863,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 1017858..7ff42b3 100644
> --- a/src/app/views/users/_form.haml
> +++ b/src/app/views/users/_form.haml
> @@ -26,9 +26,10 @@
> = 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
> + %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
> diff --git a/src/app/views/users/new.haml b/src/app/views/users/new.haml
> index b0c158a..fa5784b 100644
> --- a/src/app/views/users/new.haml
> +++ b/src/app/views/users/new.haml
> @@ -1,8 +1,18 @@
> -.modalbox
> +-if (current_user)
> %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), {:controller => 'users'}, :class =>
> 'actionlink button dialogbutton'
> + %fieldset.clearfix
> + = f.submit t(:create_account), :class => "submit formbutton"
> + = link_to t(:cancel), {:controller => 'users'}, :class => 'button
> formbutton'
> +-else
> + .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), {:controller => 'users'}, :class => 'button
> dialogbutton'
This code duplication is unnecessary and makes any future changes more
complicatied. Please move the code in the if/else blocks to a partial
instead.
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
