ref: refs/heads/backgroud_patches_bnc550934
commit ab7f1e3b684e352e03945fddb2f7ad03babe7ab9
Author: Jiri Suchomel
Date: Thu Nov 12 13:50:00 2009 +0100
- added explanation text about plugin usage (bnc#554689)
- move validation check to password field so the message does not
break the layout (bnc#554698)
- password cannot be empty (bnc#554699)
- 0.0.10
---
.../app/views/administrator/index.html.erb | 20 +++++++++++++-------
.../package/yast2-webclient-administrator.changes | 5 +++++
.../package/yast2-webclient-administrator.spec | 2 +-
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/plugins/administrator/app/views/administrator/index.html.erb b/plugins/administrator/app/views/administrator/index.html.erb
index 8272642..1cd8104 100644
--- a/plugins/administrator/app/views/administrator/index.html.erb
+++ b/plugins/administrator/app/views/administrator/index.html.erb
@@ -1,4 +1,5 @@
-<div class="plugin-icon"><img src='/icons/yast-system-user.png' alt='<%= _("Administrator Settings") %>'><%=_("Administrator Settings")%></div>
+<div class='plugin-icon'><img src='/icons/yast-system-user.png' alt='<%= _("Administrator Settings") %>'/></div>
+<h2><%=_("Administrator Settings")%></h2>
<div class="plugin-content grid_12">
<% content_for :head do %>
@@ -48,17 +49,22 @@
<% disabled = ! @permissions[:write] %>
+ <p>
+ <%=
+ _("Here, configure the settings for system administrator ('root').")
+ %>
+ </p>
+
<% form_for(:administrator, @administrator, :url => { :action => "update" }, :html => { :method => :put, :id => "adminForm", :onsubmit => "$('#progress').show()", :autocomplete => :off } ) do |f| %>
<%= f.error_messages %>
<fieldset id="password">
<p><label><%=_("Password")%></label>
- <%= f.password_field :password, :disabled => disabled %>
+ <%= f.password_field :password, :disabled => disabled, :equalTo => "#administrator_confirm_password", :class => "required" %>
+ </p>
+ <p><label><%=_("Confirm password")%></label>
+ <%= f.password_field :confirm_password, :disabled => disabled %>
+ <%= f.submit _("Save"), :name => "save_password", :disabled => disabled, :onclick=>"return $('#adminForm').validate().element('#administrator_password');", :class=>'cancel' %>
</p>
- <p>
- <label><%=_("Confirm password")%></label>
- <%= f.password_field :confirm_password, :disabled => disabled, :equalTo => "#administrator_password" %>
- <%= f.submit _("Save"), :name => "save_password", :disabled => disabled, :onclick=>"return $('#adminForm').validate().element('#administrator_confirm_password');", :class=>'cancel' %>
- </p>
<p>
<label><%=_("Forward mail to")%></label>
<%= f.text_field :aliases, :disabled => disabled, :class => "emails" %>
diff --git a/plugins/administrator/package/yast2-webclient-administrator.changes b/plugins/administrator/package/yast2-webclient-administrator.changes
index 3e4fde8..1cf1ced 100644
--- a/plugins/administrator/package/yast2-webclient-administrator.changes
+++ b/plugins/administrator/package/yast2-webclient-administrator.changes
@@ -2,6 +2,11 @@
Thu Nov 12 09:42:41 CET 2009 - jsuchome@suse.cz
- disable browser autocomplete (bnc#554693)
+- added explanation text about plugin usage (bnc#554689)
+- move validation check to password field so the message does not
+ break the layout (bnc#554698)
+- password cannot be empty (bnc#554699)
+- 0.0.10
-------------------------------------------------------------------
Tue Nov 10 11:11:30 CET 2009 - jsuchome@suse.cz
diff --git a/plugins/administrator/package/yast2-webclient-administrator.spec b/plugins/administrator/package/yast2-webclient-administrator.spec
index d8595b0..49a3b2e 100644
--- a/plugins/administrator/package/yast2-webclient-administrator.spec
+++ b/plugins/administrator/package/yast2-webclient-administrator.spec
@@ -14,7 +14,7 @@ PreReq: yast2-webclient >= 0.0.2
License: GPL v2 only
Group: Productivity/Networking/Web/Utilities
Autoreqprov: on
-Version: 0.0.9
+Version: 0.0.10
Release: 0
Summary: YaST2 - Webclient - Administrator
Source: www.tar.bz2
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
