ref: refs/heads/backgroud_patches_bnc550934
commit 17f2d24bd3023d74bf5473406e7b5398fbe1009a
Author: Ladislav Slezak
Date: Thu Nov 12 15:48:55 2009 +0100
the administrator settings page - fixed layout
- added placeholders for error messages (jQury will reuse them
instead of adding new elements at wrong positions) (bnc#554698)
- email input field - set the same width as for the other fields
---
.../app/views/administrator/index.html.erb | 17 +++++++++++------
.../package/yast2-webclient-administrator.changes | 6 ++++++
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/plugins/administrator/app/views/administrator/index.html.erb b/plugins/administrator/app/views/administrator/index.html.erb
index 1cd8104..94f0861 100644
--- a/plugins/administrator/app/views/administrator/index.html.erb
+++ b/plugins/administrator/app/views/administrator/index.html.erb
@@ -6,7 +6,7 @@
<%= javascript_include_tag :defaults %>
<style type="text/css">
- label.error { float: none; color: red; padding-left: .5em; vertical-align: top; }
+ label.error { display: none; color: red; padding-left: 7.5em; padding-bottom: 1em; text-align: left; vertical-align: top; width: 50% }
</style>
<script type="text/javascript">
@@ -61,15 +61,20 @@
<p><label><%=_("Password")%></label>
<%= 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>
+ <!-- this is a pre-generated placeholder for the validation messages -->
+ <p><label for="administrator_confirm_password" generated="true" class="error"></label><p>
<p>
<label><%=_("Forward mail to")%></label>
- <%= f.text_field :aliases, :disabled => disabled, :class => "emails" %>
+ <%= f.text_field :aliases, :disabled => disabled, :class => "emails", :style => 'width: auto' %>
<%= f.submit _("Save"), :name => "save_aliases", :disabled => disabled, :onclick=>"return $('#adminForm').validate().element('#administrator_aliases');", :class=>'cancel' %>
</p>
+ <!-- this is a pre-generated placeholder for the validation messages -->
+ <p><label for="administrator_aliases" generated="true" class="error"></label></p>
</fieldset>
<p><%= form_send_buttons :onclick=>"alias_valid = $('#adminForm').validate().element('#administrator_aliases'); return $('#adminForm').validate().element('#administrator_confirm_password') && alias_valid;", :disabled => disabled %>
</p>
diff --git a/plugins/administrator/package/yast2-webclient-administrator.changes b/plugins/administrator/package/yast2-webclient-administrator.changes
index 1cf1ced..ce2691a 100644
--- a/plugins/administrator/package/yast2-webclient-administrator.changes
+++ b/plugins/administrator/package/yast2-webclient-administrator.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu Nov 12 15:46:24 CET 2009 - lslezak@suse.cz
+
+- fixed layout: added placeholders for error messages (bnc#554698),
+ email input field - set the same width as for the other fields
+
+-------------------------------------------------------------------
Thu Nov 12 09:42:41 CET 2009 - jsuchome@suse.cz
- disable browser autocomplete (bnc#554693)
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
Ladislav Slezak