[PATCH conductor] Remove User Treatment from User form BZ767189
jtomasek at redhat.com
jtomasek at redhat.com
Wed Dec 14 16:00:03 UTC 2011
From: Jiri Tomasek <jtomasek at redhat.com>
---
src/app/stylesheets/layout.scss | 7 +------
src/app/views/users/_form.html.haml | 15 +++------------
2 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/src/app/stylesheets/layout.scss b/src/app/stylesheets/layout.scss
index 5163a6a..ba1e843 100644
--- a/src/app/stylesheets/layout.scss
+++ b/src/app/stylesheets/layout.scss
@@ -3169,13 +3169,8 @@ body.administer form.generic{
p + p{
margin-top: 10px;
}
- p.radio-group label{
- display: inline;
- }
ul.radio-group input{
- display: inline;
- margin-left: 1em;
- margin-top: 0.7em;
+ margin: 6px 0px 0px 0px;
}
ul.radio-group li{
display: block;
diff --git a/src/app/views/users/_form.html.haml b/src/app/views/users/_form.html.haml
index e3b8945..0dc6bc6 100644
--- a/src/app/views/users/_form.html.haml
+++ b/src/app/views/users/_form.html.haml
@@ -22,22 +22,13 @@
= form.label :password_confirmation, t(:confirm_password), :required => form.object.new_record?
= form.password_field :password_confirmation
--if check_privilege(Privilege::MODIFY, User)
- %fieldset.inline
- %p
- %label=t'users.form.user_treatment'
- = select_tag 'user_treatment', options_for_select([t(:choose_treatment)])
- %p
- = submit_tag t(:apply), :disabled => true, :class => 'button pill'
-
- = form.fields_for :quota do |quota_form|
- %fieldset
+- if check_privilege(Privilege::MODIFY, User)
+ %fieldset
+ = form.fields_for :quota do |quota_form|
%p
= quota_form.label :maximum_running_instances, t(:maximum_running_instances)
= quota_form.text_field :maximum_running_instances
- =t'instances.instances'
--if check_privilege(Privilege::MODIFY, User)
%fieldset
%legend=t'users.form.user_status'
%ul.radio-group
--
1.7.7.3
More information about the aeolus-devel
mailing list