From: Tomas Sedovic <tsedovic(a)redhat.com>
---
src/app/controllers/users_controller.rb | 7 ++++++-
src/app/views/users/_form.haml | 19 +++++++++----------
src/app/views/users/_list.haml | 2 +-
src/app/views/users/index.haml | 3 ++-
src/app/views/users/show.haml | 3 +++
5 files changed, 21 insertions(+), 13 deletions(-)
create mode 100644 src/app/views/users/show.haml
diff --git a/src/app/controllers/users_controller.rb
b/src/app/controllers/users_controller.rb
index 2d9459c..3cfbbc5 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -1,6 +1,11 @@
class UsersController < ApplicationController
before_filter :require_user, :except => [:new, :create]
before_filter :load_users, :only => [:show]
+ layout 'application'
+
+ def top_section
+ :administer
+ end
def index
require_privilege(Privilege::VIEW, User)
@@ -61,7 +66,7 @@ class UsersController < ApplicationController
end
render :partial => @details_tab
end
- format.html { render :partial => @details_tab }
+ format.html
end
end
diff --git a/src/app/views/users/_form.haml b/src/app/views/users/_form.haml
index f1b8aa3..87f06e4 100644
--- a/src/app/views/users/_form.haml
+++ b/src/app/views/users/_form.haml
@@ -1,44 +1,43 @@
= form.error_messages
-%fieldset.clear
+%fieldset
= form.label :login, t(:choose_name), :class => "grid_3 alpha"
= form.text_field :login, :class => "grid_5"
-%fieldset.clear
+%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"
%fieldset
= form.label :password_confirmation, t(:confirm_password), :class => "grid_3
alpha"
= form.password_field :password_confirmation, :class => "grid_5"
-if check_privilege(Privilege::MODIFY, User)
- %fieldset.clear
+ %fieldset
= 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
+%fieldset
= form.label :first_name, t(:first_name), :class => "alpha grid_3"
= form.text_field :first_name, :class => "grid_5"
-%fieldset.clear
+%fieldset
= form.label :last_name, t(:last_name), :class => "alpha grid_3"
= form.text_field :last_name, :class => "grid_5"
-%fieldset.clear
+%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.clearfix
+ %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.clear
+ %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.clearfix
+%fieldset
= form.submit "Save", :class => "submit formbutton"
- = form.submit "Reset", :class => "submit formbutton"
= link_to t(:cancel), cancel_path, :class => 'button formbutton'
diff --git a/src/app/views/users/_list.haml b/src/app/views/users/_list.haml
index 0204695..08282aa 100644
--- a/src/app/views/users/_list.haml
+++ b/src/app/views/users/_list.haml
@@ -1,6 +1,6 @@
- form_tag do
= link_to "Create", new_user_url, :class => 'button'
- = restful_submit_tag "Delete", 'destroy', multi_destroy_users_path,
'DELETE', :id => 'delete_button'
+ = restful_submit_tag "Delete", 'destroy', multi_destroy_users_path,
'DELETE', :id => 'delete_button', :class => 'button'
%table#users_table
%thead
diff --git a/src/app/views/users/index.haml b/src/app/views/users/index.haml
index 62ccbc6..acfa09b 100644
--- a/src/app/views/users/index.haml
+++ b/src/app/views/users/index.haml
@@ -1,2 +1,3 @@
-- content_for :list do
+= render :partial => 'layouts/admin_header'
+%div#view
= render :partial => 'list'
diff --git a/src/app/views/users/show.haml b/src/app/views/users/show.haml
new file mode 100644
index 0000000..2eadbfd
--- /dev/null
+++ b/src/app/views/users/show.haml
@@ -0,0 +1,3 @@
+= render :partial => 'layouts/admin_header'
+%div#view
+ = render :partial => 'properties'
--
1.7.4.4