Martin Schmidkunz write:

ref: refs/heads/master commit 8eff8b208f34e489c539b3eb948856f7895702be Author: Martin Schmidkunz <mschmidkunz@suse.de> Date: Wed Nov 18 16:17:59 2009 +0100

adjusted layout of edit users --- .../permissions/app/views/permissions/index.rhtml | 2 +- plugins/security/shortcuts.yml | 2 +- plugins/users/app/views/users/edit.html.erb | 74 +++++++++---------- 3 files changed, 37 insertions(+), 41 deletions(-)

diff --git a/plugins/permissions/app/views/permissions/index.rhtml b/plugins/permissions/app/views/permissions/index.rhtml index 5869f3f..f459c4f 100644 --- a/plugins/permissions/app/views/permissions/index.rhtml +++ b/plugins/permissions/app/views/permissions/index.rhtml @@ -155,8 +155,8 @@ <br> <% #not ready to set permissions submit_tag _("Set"), :disabled=> !@right_set_permissions, :class => 'button' %> - <a href="/" class="button"><%=_("Back")%></a> <% end %> + <%= form_send_buttons :disabled => disabled, :class => "button" %>

Please don't use send buttons. In comment above code was said that permission module cannot set permission so save do nothing. Permission module is now only for viewing permissions for certain user.

<% end %> </div> </html> diff --git a/plugins/security/shortcuts.yml b/plugins/security/shortcuts.yml index d84e21e..a5a6db8 100644 --- a/plugins/security/shortcuts.yml +++ b/plugins/security/shortcuts.yml @@ -2,7 +2,7 @@ main: icon: '/icons/yast-firewall.png' url: /security groups: [ Network ] - tags: [ security, access] + tags: [ access, security ] title: Firewall/SSH description: Setting firewall and Secure Shell

diff --git a/plugins/users/app/views/users/edit.html.erb b/plugins/users/app/views/users/edit.html.erb index 6cbd33c..d7a178d 100644 --- a/plugins/users/app/views/users/edit.html.erb +++ b/plugins/users/app/views/users/edit.html.erb @@ -1,4 +1,4 @@ -<h1><%=_("Edit User %s") %@user.uid%></h1> +<h1><%=_("Edit user %s") %@user.uid%></h1> <br>

<% disabled = ! @permissions[:usermodify] %> @@ -6,44 +6,40 @@ <% form_for(:user, @user, :url => { :action => "update" }, :html => { :method => :put } ) do |f| %> <%= f.error_messages %>

- <div class="table"> - <table class="list" cellpadding="0" cellspacing="0"> - <tr> - <th class="full" colspan="2"><%=_("User")%></th> - </tr> - <tr> - <td class="first" width="120"><strong><%=_("Full Name")%></strong></td> - <td class="last"><%= f.text_field :cn , :disabled => disabled %></td> - </tr> - <tr class="bg"> - <td class="first"><strong><%=_("Groups")%></strong></td> - <td class="last"><%= f.text_field :grp_string, :disabled => disabled %></td> - </tr> - <tr> - <td class="first"><strong><%=_("Default Group")%></strong></td> - <td class="last"><%= f.text_field :groupname, :disabled => disabled %></td> - </tr> - <tr class="bg"> - <td class="first"><strong><%=_("Home Directory")%></strong></td> - <td class="last"><%= f.text_field :home_directory, :disabled => disabled %></td> - </tr> - <tr> - <td class="first"><strong><%=_("Login Shell")%></strong></td> - <td class="last"><%= f.text_field :login_shell, :disabled => disabled %></td> - </tr> - <tr class="bg"> - <td class="first"><strong><%=_("Login Name")%></strong></td> - <td class="last"><%= f.text_field :uid, :disabled => disabled %></td> - </tr> - <tr> - <td class="first"><strong><%=_("UID Number")%></strong></td> - <td class="last"><%= f.text_field :uid_number , :disabled => disabled %></td> - </tr> - <tr class="bg"> - <td class="first"><strong><%=_("Password")%></strong></td> - <td class="last"><%= f.password_field :user_password, :disabled => disabled %></td> - </tr> - </table> + <fieldset> + <p> + <label><%=_("Full Name")%></label> + <%= f.text_field :cn , :disabled => disabled %> + </p> + <p> + <label><%=_("Groups")%></label> + <%= f.text_field :grp_string, :disabled => disabled %> + </p> + <p> + <label><%=_("Default Group")%></label> + <%= f.text_field :groupname, :disabled => disabled %> + </p> + <p> + <label><%=_("Home Directory")%></label> + <%= f.text_field :home_directory, :disabled => disabled %> + </p> + <p> + <label><%=_("Login Shell")%></label> + <%= f.text_field :login_shell, :disabled => disabled %> + </p> + <p> + <label><%=_("Login Name")%></label> + <%= f.text_field :uid, :disabled => disabled %> + </p> + <p> + <label><%=_("UID Number")%></label> + <%= f.text_field :uid_number , :disabled => disabled %> + </p> + <p> + <label><%=_("Password")%></label> + <%= f.password_field :user_password, :disabled => disabled %> + </p> + </fieldset> <p><%= f.submit _("Update"), :disabled => disabled %><%= link_to _('Back'), {:action => :index}, :onclick=>"$('#progress').show()", :class => "button"%></p> </div> <% end %>

-- Josef Reidinger YaST team maintainer of perl-Bootloader, YaST2-Repair, webyast (language,time,basesystem,ntp) -- To unsubscribe, e-mail: yast-devel+unsubscribe@opensuse.org For additional commands, e-mail: yast-devel+help@opensuse.org