diff options
-rw-r--r-- | users/app/views/users/_new.html.haml | 7 | ||||
-rw-r--r-- | users/app/views/users/show.html.haml | 35 |
2 files changed, 1 insertions, 41 deletions
diff --git a/users/app/views/users/_new.html.haml b/users/app/views/users/_new.html.haml deleted file mode 100644 index 3d0f2ac..0000000 --- a/users/app/views/users/_new.html.haml +++ /dev/null @@ -1,7 +0,0 @@ -- @user ||= User.new -= user_form do |f| - = render :partial => 'users/login_field', :locals => {:f => f} - = render :partial => 'users/password_fields', :locals => {:f => f} - .form-actions - = f.button :submit, :value => t(:signup), :class => 'btn-primary' - = link_to t(:cancel), root_url, :class => :btn diff --git a/users/app/views/users/show.html.haml b/users/app/views/users/show.html.haml index dc5e015..08e9dc3 100644 --- a/users/app/views/users/show.html.haml +++ b/users/app/views/users/show.html.haml @@ -1,34 +1 @@ -= render 'edit' - --# - .span8.offset1 - %h2= @user.login - .small - = link_to 'edit', edit_user_path(@user) - %dl.offset1 - - fields = ['login', 'email_address', 'created_at', 'updated_at', 'email_forward'] - - fields.each do |field| - %dt - = field.titleize - %dd - = user_field(field) - %dt - =t :email_aliases - %dd - - aliases = @user.email_aliases - - if aliases.present? - %ul.pull-left.unstyled - = render aliases - - else - =t :none - .clearfix - %dt - =t :most_recently_updated_tickets - %dd - - tix = @user.most_recent_tickets - - if tix.present? - %table - %tbody - = render @user.most_recent_tickets - - else - =t :none
\ No newline at end of file += render 'edit'
\ No newline at end of file |