From jreidinger@suse.cz Wed Nov 18 15:22:11 2009 From: Josef Reidinger To: yast-devel@lists.opensuse.org Subject: [yast-devel] Re: [yast-commit] master : adjusted layout of edit users Date: Wed, 18 Nov 2009 16:19:23 +0100 Message-ID: <200911181619.23197.jreidinger@suse.cz> In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5438474256952358530==" --===============5438474256952358530== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Martin Schmidkunz write: > ref: refs/heads/master > commit 8eff8b208f34e489c539b3eb948856f7895702be > Author: Martin Schmidkunz > Date: Wed Nov 18 16:17:59 2009 +0100 >=20 > 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(-) >=20 > 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 @@ >
> <% #not ready to set permissions submit_tag _("Set"), :disabled=3D> > !@right_set_permissions, :class =3D> 'button' %> > - <%=3D_("Back")%> > <% end %> > + <%=3D form_send_buttons :disabled =3D> disabled, :class =3D> "button" %> Please don't use send buttons. In comment above code was said that permission= =20 module cannot set permission so save do nothing. Permission module is now onl= y=20 for viewing permissions for certain user. > <% end %> > > > 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 >=20 > 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 @@ > -

<%=3D_("Edit User %s") %@user.uid%>

> +

<%=3D_("Edit user %s") %@user.uid%>

>
>=20 > <% disabled =3D ! @permissions[:usermodify] %> > @@ -6,44 +6,40 @@ > <% form_for(:user, @user, :url =3D> { :action =3D> "update" }, :html =3D> { > :method =3D> :put } ) do |f| %> <%=3D f.error_messages %> >=20 > -
> - > - > - > - > - > - > - > - > - - > - > - > - - > - > - > - - > - > - > - - > - > - > - > - > - > - - > - > - > - - > -
<%=3D_("User")%>
<%=3D_("Full Name")%><= /td> > - <%=3D f.text_field :cn , :disabled =3D> disabled %> > -
<%=3D_("Groups")%><%=3D f.text_field :grp_string, :disabled =3D> disabled > %>
<%=3D_("Default Group")%><%=3D f.text_field :groupname, :disabled =3D> disabled > %>
<%=3D_("Home Directory")%><%=3D f.text_field :home_directory, :disabled =3D> dis= abled > %>
<%=3D_("Login Shell")%><%=3D f.text_field :login_shell, :disabled =3D> disabl= ed > %>
<%=3D_("Login Name")%><%=3D f.text_field :uid, :disabled =3D> disabled %> > -
<%=3D_("UID Number")%><%=3D f.text_field :uid_number , :disabled =3D> disabl= ed > %>
<%=3D_("Password")%><%=3D f.password_field :user_password, :disabled =3D> > disabled %>
> +
> +

> + > + <%=3D f.text_field :cn , :disabled =3D> disabled %> > +

> +

> + > + <%=3D f.text_field :grp_string, :disabled =3D> disabled %> > +

> +

> + > + <%=3D f.text_field :groupname, :disabled =3D> disabled %> > +

> +

> + > + <%=3D f.text_field :home_directory, :disabled =3D> disabled %> > +

> +

> + > + <%=3D f.text_field :login_shell, :disabled =3D> disabled %> > +

> +

> + > + <%=3D f.text_field :uid, :disabled =3D> disabled %> > +

> +

> + > + <%=3D f.text_field :uid_number , :disabled =3D> disabled %> > +

> +

> + > + <%=3D f.password_field :user_password, :disabled =3D> disabled %> > +

> +
>

<%=3D f.submit _("Update"), :disabled =3D> disabled %><%=3D link_to > _('Back'), {:action =3D> :index}, :onclick=3D>"$('#progress').show()", :cl= ass > =3D> "button"%>

> <% end %> >=20 --=20 Josef Reidinger YaST team maintainer of perl-Bootloader, YaST2-Repair, webyast=20 (language,time,basesystem,ntp) --=20 To unsubscribe, e-mail: yast-devel+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-devel+help(a)opensuse.org --===============5438474256952358530==--