commit webyast-root-user-ui for openSUSE:Factory
Hello community, here is the log from the commit of package webyast-root-user-ui for openSUSE:Factory checked in at Mon May 16 18:25:41 CEST 2011. -------- --- webyast-root-user-ui/webyast-root-user-ui.changes 2010-08-30 11:39:39.000000000 +0200 +++ webyast-root-user-ui/webyast-root-user-ui.changes 2011-05-02 16:14:04.000000000 +0200 @@ -1,0 +2,12 @@ +Mon May 2 14:11:36 UTC 2011 - vlewin@novell.com + +- uniform appearance for all modules in basesystem setup workflow +- 0.2.7 + +------------------------------------------------------------------- +Tue Apr 12 14:13:47 UTC 2011 - schubi@novell.com + +- new caching +- 0.2.6 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-root-user-ui.spec ++++++ --- /var/tmp/diff_new_pack.WCrgH2/_old 2011-05-16 18:24:05.000000000 +0200 +++ /var/tmp/diff_new_pack.WCrgH2/_new 2011-05-16 18:24:05.000000000 +0200 @@ -22,11 +22,11 @@ Provides: yast2-webclient-administrator = %{version} Obsoletes: yast2-webclient-administrator < %{version} PreReq: yast2-webclient >= 0.0.2 -License: GPLv2 +License: GPL v2 only Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.5 +Version: 0.2.7 Release: 1 Summary: WebYaST - Administrator UI Source: www.tar.bz2 @@ -42,7 +42,7 @@ # %package testsuite -License: GPLv2 + Group: Productivity/Networking/Web/Utilities Requires: %{name} = %{version} Requires: webyast-base-ui-testsuite rubygem-mocha rubygem-test-unit tidy ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/administrator/index.html.erb new/www/app/views/administrator/index.html.erb --- old/www/app/views/administrator/index.html.erb 2010-08-25 11:06:17.000000000 +0200 +++ new/www/app/views/administrator/index.html.erb 2011-04-26 17:48:49.000000000 +0200 @@ -1,43 +1,35 @@ <!-- # Copyright (c) 2009-2010 Novell, Inc. -# +# # All Rights Reserved. -# +# # This program is free software; you can redistribute it and/or modify it # under the terms of version 2 of the GNU General Public License # as published by the Free Software Foundation. -# +# # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -# +# # You should have received a copy of the GNU General Public License # along with this program; if not, contact Novell, Inc. -# +# # To contact Novell about this file by physical or electronic mail, # you may find current contact information at www.novell.com --> -<div class='plugin-icon'><img alt="yast-system-user" src='/icons/yast-system-user.png'/><%=_("Administrator Settings")%></div> - -<div class="plugin-content"> <% content_for :head do %> - <% if JSMIN == false %> - <%= javascript_include_tag "digitalspaghetti.password.js" %> + + <% unless JSMIN == true %> + <%= stylesheet_link_tag "webyast-administrator" %> + #<% javascript_include_tag "digitalspaghetti.password.js" %> + <%= javascript_include_tag "passwordStrengthMeter" %> <% end %> - - <!-- Move to style.css --> - <style type="text/css"> - label.error { - font-weight:bold; - color:#990000; - padding-left:.5em; - vertical-align:middle; - } - </style> <script type="text/javascript"> + var AUTH_TOKEN = 'authenticity_token=' + encodeURIComponent("<%= escape_javascript form_authenticity_token %>"); + startNotifier({'module':'administrator', 'AUTH_TOKEN':AUTH_TOKEN}, 1000, 11000); // define custom validation function // alias is actually a list of email aliases jQuery.validator.addMethod("emails", function(value, element) { @@ -47,8 +39,8 @@ for(i=0; i < emails.length; i++){ var email = $.trim(emails[i]); - // this is the email regexp from jQuery validator - if (!/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(email)) + // this is the email regexp from jQuery validator RORSCAN_INL + if (!/^((([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+(\.([a-z]|\d|[!#\$%&'\*\+\-\/=\?\^_`{\|}~]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])+)*)|((\x22)((((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(([\x01-\x08\x0b\x0c\x0e-\x1f\x7f]|\x21|[\x23-\x5b]|[\x5d-\x7e]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(\\([\x01-\x09\x0b\x0c\x0d-\x7f]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]))))*(((\x20|\x09)*(\x0d\x0a))?(\x20|\x09)+)?(\x22)))@((([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|\d|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.)+(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])|(([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])([a-z]|\d|-|\.|_|~|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])*([a-z]|[\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF])))\.?$/i.test(email)) return false; } @@ -58,85 +50,127 @@ // disable global onsubmit validation, the relevant fields are validated explicitly in onclick handlers $(document).ready(function() { $("#adminForm").validate({ - onkeyup: function(element) { this.element(element); }, - submitHandler: function(form) { - var message = <%= jss _("Please wait") -%>; - disableFormOnSubmit(message); - form.submit(); - } + onkeyup: function(element) { this.element(element); }, + submitHandler: function(form) { + var message = <%= jss _("Please wait") -%>; + $.modalDialog.wait( {message: message}); + //disableFormOnSubmit(message); + form.submit(); + } }) // make the error message translatable - override the default messsage $.extend($.validator.messages, { - equalTo: <%= jss _("The passwords do not match.") -%>, - required: <%= jss _("A password is required.") -%> + qualTo: <%= jss _("The passwords do not match.") -%>, + required: <%= jss _("A password is required.") -%> }); - $("#administrator_password").pstrength({ - 'displayMinChar' : true, - 'minCharText' : <%= jss _("Password Strength:") %>, - 'verdicts' : [ - <%= jss _("Weak") %>, - <%= jss _("Normal") %>, - <%= jss _("Medium") %>, - <%= jss _("Strong") %>, - <%= jss _("Very Strong") %> - ] - }); + /*$("#administrator_password").pstrength({ + 'displayMinChar' : true, + 'minCharText' : <%= jss _("Password Strength:") %>, + 'verdicts' : [ + <%= jss _("Weak") %>, + <%= jss _("Normal") %>, + <%= jss _("Medium") %>, + <%= jss _("Strong") %>, + <%= jss _("Very Strong") %> + ] + }); */ + checkPassword(); $("#adminForm input").keypress(function(e){ - if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) { - if ($('#adminForm').valid()) { - $("input#default_submit").click(); - } - return false; - } + if ((e.which && e.which == 13) || (e.keyCode && e.keyCode == 13)) { + if ($('#adminForm').valid()) { + $("input#default_submit").click(); + } + return false; + } }); - }); - // start password validation workaround only when "Save" button has been pressed - password_validation_enabled = false; - - </script> + // start password validation workaround only when "Save" button has been pressed + password_validation_enabled = false; + </script> <% end %> -<% disabled = ! @permissions[:write] %> +<!--<div class='plugin-icon'><img alt="yast-system-user" src='/icons/yast-system-user.png'/><%=_("Administrator Settings")%><span id="questionMark">?</span></div> + +<div class="plugin-content">--> + +<div class="plugin-content plugin-border"> + <% disabled = ! @permissions[:write] %> + <%= render :partial => 'shared/missing_write_permissions' if disabled %> + + <% form_for(:administrator, @administrator, :url => { :action => "update" }, :html => { :method => :put, :id => "adminForm", :class=>"webyast_form", :onsubmit => "disable_forms ()", :autocomplete => :off } ) do |f| %> + <%= f.error_messages %> + + <div class="plugin-header"> + <div class="left"> + <label class="plugin-icon-container"><img class="plugin-icon" src="/icons/administrator.png"></label> + <label class="plugin-name"><%=_("Administrator Settings")%></label> + </div> + <div class="right" > + <span id="questionMark" class="right" style="margin:2px 5px;">?</span> + </div> + <div class="clearfix"></div> + </div> + + <fieldset id="password" class="webyast_fieldset"> + <div class="fieldset_header"> + <span class="fieldset_header_title" ><%= _("Password Setup for User 'root'") -%></span> + </div> + + <div class="fieldset_body"> + <div class="row password_container"> + + <label><%=_("New Password")%></label> + <%= f.password_field :password, :disabled => disabled %> + <span class="graybar" id="graybar"></span> + <span class="colorbar" id="colorbar"></span> + + <span class="percent" id="percent">0%</span> + <label class="error" generated="true" id="validation_result" ></label> + </div> + + <div style="clear:both"></div> + + <div class="row"> + <label style="float:none;"><%=_("Confirm Password")%></label> + <%= f.password_field :confirm_password, :disabled => disabled, :equalTo => "#administrator_password", :class => "required" %> -<%= render :partial => 'shared/missing_write_permissions' if disabled %> + </div> + </div> - <% form_for(:administrator, @administrator, :url => { :action => "update" }, :html => { :method => :put, :id => "adminForm", :onsubmit => "$('#progress').show(); disable_forms ()", :autocomplete => :off } ) do |f| %> - <%= f.error_messages %> - <fieldset id="password"> - <legend><%= _("Password Setup for User 'root'") -%></legend> - <p><label><%=_("New Password")%></label> - <%= f.password_field :password, :disabled => disabled %> - </p> - <p> - <label><%=_("Confirm Password")%></label> - <%= f.password_field :confirm_password, :disabled => disabled, :equalTo => "#administrator_password", :class => "required" %> - <div style="clear:both"></div> - </p> - <!-- this is a pre-generated placeholder for the validation messages - <p><label for="administrator_confirm_password" generated="true" class="error"></label></p> - --> </fieldset> - <fieldset> - <legend><%= _("Mail Setup for User 'root'") -%></legend> - <p> - <label style="float:left;"><%=_("Forward system mail to")%></label> - <%= f.text_field :aliases, :disabled => disabled, :class => "emails" %> - <% unless params.has_key? "firstboot" # during initial configuration, allow only main Save button %> - <%= f.submit _("Save Mail Only"), :name => "save_aliases", :disabled => disabled, :onclick=>"return $('#adminForm').validate().element('#administrator_aliases');", :class=>'cancel' %> - <label style="float:left" for="administrator_aliases" generated="true" class="error"></label> - <div style="clear:both"></div> - <% end %> - </p> + + <fieldset class="webyast_fieldset"> + <div class="fieldset_header"> + <span class="fieldset_header_title" ><%= _("Mail Setup for User 'root'") -%></span> + </div> + + <div class="fieldset_body"> + <div class="row"> + <label style="float:left; display:inline-block; width:204px; line-height:24px;"><%=_("Forward system mail to")%></label> <!-- RORSCAN_ITL --> + <%= f.text_field :aliases, :disabled => disabled, :class => "emails" %> + <% unless params.has_key? "firstboot" # during initial configuration, allow only main Save button %> + <%= f.submit _("Save Mail Only"), :name => "save_aliases", :disabled => disabled, :onclick=>"return $('#adminForm').validate().element('#administrator_aliases');", :class=>'cancel' %> + <label style="line-height:26px;" for="administrator_aliases" generated="true" class="error"></label> + <% end %> + + <div style="clear:both height:2px;"></div> + </div> </fieldset> - <div class="nav-buttons"> - <%= form_send_buttons :onclick=>"password_validation_enabled = true; alias_valid = $('#adminForm').validate().element('#administrator_aliases'); return $('#adminForm').validate().element('#administrator_confirm_password') && alias_valid;", :id => "default_submit", :disabled => disabled %> + + <div class="clearfix"></div> + + <div class="button_container"> + <div class="hr"> </div> + <div class="nav-buttons"> + <%= form_send_buttons :onclick=>"password_validation_enabled = true; alias_valid = $('#adminForm').validate().element('#administrator_aliases'); return $('#adminForm').validate().element('#administrator_confirm_password') && alias_valid;", :id => "default_submit", :disabled => disabled %> + </div> </div> <% end %> </div> + ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de