Hello community, here is the log from the commit of package webyast-mail-ui for openSUSE:Factory checked in at Thu May 19 13:30:16 CEST 2011. -------- --- webyast-mail-ui/webyast-mail-ui.changes 2010-08-30 12:05:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-mail-ui/webyast-mail-ui.changes 2011-05-18 15:20:24.000000000 +0200 @@ -1,0 +2,18 @@ +Wed May 18 13:19:12 UTC 2011 - schubi@novell.com + +- changed the licence to the correct name (is still gpl2 only) +- 0.2.7 + +------------------------------------------------------------------- +Mon May 2 14:20:16 UTC 2011 - vlewin@novell.com + +- uniform appearance for all modules in basesystem setup workflow +- 0.2.6 + +------------------------------------------------------------------- +Tue Apr 12 14:25:32 UTC 2011 - schubi@novell.com + +- new caching +- 0.2.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-mail-ui.spec ++++++ --- /var/tmp/diff_new_pack.gC5Kw2/_old 2011-05-19 13:28:55.000000000 +0200 +++ /var/tmp/diff_new_pack.gC5Kw2/_new 2011-05-19 13:28:55.000000000 +0200 @@ -22,11 +22,11 @@ Provides: yast2-webclient-mailsettings = %{version} Obsoletes: yast2-webclient-mailsettings < %{version} PreReq: yast2-webclient >= 0.0.2 -License: GPLv2 +License: GPL-2.0 Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.4 +Version: 0.2.7 Release: 1 Summary: WebYaST - Mail Settings UI Source: www.tar.bz2 @@ -43,7 +43,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/controllers/mail_controller.rb new/www/app/controllers/mail_controller.rb --- old/www/app/controllers/mail_controller.rb 2010-05-28 09:52:16.000000000 +0200 +++ new/www/app/controllers/mail_controller.rb 2011-05-03 11:32:50.000000000 +0200 @@ -1,20 +1,20 @@ #-- # 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 #++ @@ -37,6 +37,9 @@ @mail.confirm_password = @mail.password @mail.test_mail_address = "" @mail.test_mail_address = params["email"] if params.has_key? "email" + + #remove square brackets from smtp_server string + @mail.smtp_server = @mail.smtp_server.gsub(/^(\[)|(\])/, '') unless @mail.smtp_server.nil? end # PUT @@ -49,7 +52,7 @@ if @mail.password != @mail.confirm_password flash[:error] = _("Passwords do not match.") redirect_to :action => "index" - return + return end begin @@ -99,3 +102,4 @@ end # vim: ft=ruby + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/mail/index.html.erb new/www/app/views/mail/index.html.erb --- old/www/app/views/mail/index.html.erb 2010-08-25 12:06:17.000000000 +0200 +++ new/www/app/views/mail/index.html.erb 2011-05-03 11:32:50.000000000 +0200 @@ -1,117 +1,143 @@ <!-- # 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 --> <% content_for :head do %> - <!--<%= javascript_include_tag :defaults %>--> <!-- is not needed --> -<!-- Move to style.css --> -<style type="text/css"> - label.error { - font-weight:bold; - color:#990000; - padding-left:.5em; - vertical-align:middle; - } -</style> - -<%= javascript_include_tag "validation.js" %> -<script type="text/javascript"> - - $(document).ready(function() { - validateDomainNameWithPortNumber("smtp_server"); - $("#mailForm").validate({ - onkeyup: function(element) { this.element(element); }, - submitHandler: function(form) { - var message = <%= jss _("Please wait") -%>; - disableFormOnSubmit(message); - form.submit(); - } - }); - // make the error message translatable - override the default messsage - $.extend($.validator.messages, { - equalTo: <%= jss _("The passwords do not match.") -%>, - email: <%= jss _("Enter a valid e-mail address.") -%>, - smtp_server: <%= jss _("Enter a valid domain name or an IP address.") -%> - }); - }); - - $(document).ready(function() { - if ($("#mail_test_mail_address", "#mailForm").val() == "") { - $("#mail_submit").attr("disabled","disabled"); - } - $("#mail_test_mail_address").keyup(function () { - if ($("#mail_test_mail_address", "#mailForm").val() == "") $("#mail_submit").attr("disabled","disabled"); - else $("#mail_submit", "#mailForm").removeAttr("disabled"); - }); - }); -</script> + <%= javascript_include_tag "validation.js" %> + <script type="text/javascript"> + var AUTH_TOKEN = 'authenticity_token=' + encodeURIComponent("<%= escape_javascript form_authenticity_token %>"); + startNotifier({'module':'mail', 'AUTH_TOKEN':AUTH_TOKEN}, 1000, 11000); + + $(document).ready(function() { + validateDomainNameWithPortNumber("smtp_server"); + $("#mailForm").validate({ + onkeyup: function(element) { this.element(element); }, + submitHandler: function(form) { + var message = <%= jss _("Please wait") -%>; + //disableFormOnSubmit(message); + $.modalDialog.wait( {message: message}); + form.submit(); + } + }); + // make the error message translatable - override the default messsage + $.extend($.validator.messages, { + equalTo: <%= jss _("The passwords do not match.") -%>, + email: <%= jss _("Enter a valid e-mail address.") -%>, + smtp_server: <%= jss _("Enter a valid domain name or an IP address.") -%> + }); + }); + + $(document).ready(function() { + if ($("#mail_test_mail_address", "#mailForm").val() == "") { + $("#mail_submit").attr("disabled","disabled"); + } + $("#mail_test_mail_address").keyup(function () { + if ($("#mail_test_mail_address", "#mailForm").val() == "") $("#mail_submit").attr("disabled","disabled"); + else $("#mail_submit", "#mailForm").removeAttr("disabled"); + }); + }); + </script> <% end %> -<div class='plugin-icon'><img alt="yast-mail-server" src='/icons/yast-mail-server.png'/><%=_("Mail Settings")%></div> +<!--<div class='plugin-icon'><img alt="yast-mail-server" src='/icons/yast-mail-server.png'/><%=_("Mail 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(:mail, @mail, :url => { :action => "update" }, :html => { :method => :put, :id => "mailForm", :autocomplete => :off, :onsubmit => "if ($('#mailForm').valid()) $('#progress').show() && disable_forms ()" } ) do |f| %> + <% form_for(:mail, @mail, :url => { :action => "update" }, :html => { :method => :put, :id => "mailForm", :class=>"webyast_form", :autocomplete => :off, :onsubmit => "if ($('#mailForm').valid()); disable_forms ()" } ) do |f| %> <%= f.error_messages %> - <fieldset> - <p> + + <div class="plugin-header"> + <div class="left"> + <label class="plugin-icon-container"><img class="plugin-icon" src="/icons/mail.png"></label> + <label class="plugin-name"><%=_("Mail Settings")%></label> + </div> + + <div class="right" > + <span id="questionMark" style="margin:2px 5px; float:none;">?</span> + </div> + <div class="clearfix"></div> + </div> + + <div class="clearfix"> </div> + + <fieldset class="webyast_fieldset"> + <div class="fieldset_header"> + <span class="fieldset_header_title" ><%=_("Outgoing mail server settings")%></span> + </div> + + <div class="fieldset_body"> + <div class="row"> <label for="<%= :smtp_server %>"><%=_("Outgoing mail server")%></label> <%=f.text_field :smtp_server, :disabled => disabled, :class => "smtp_server" %> - <div style="clear:both"></div> - </p> - <p> + </div> + + <div class="row"> <label><%=_("Use secure connection (TLS)")%></label> <%= f.select :transport_layer_security, [ [_("Never"), "no" ], [_("If available"), "yes"], [_("Always"), "must"]], :disabled => disabled %> - </p> - <p> + </div> + + <div class="row"> <label><%=_("User name")%></label> <%= f.text_field :user, :disabled => disabled %> - </p> - <p> + </div> + + <div class="row"> <label><%=_("Password")%></label> <%= f.password_field :password, :disabled => disabled %> - </p> - <p> + </div> + + <div class="row lastrow"> <label><%=_("Confirm password")%></label> <%= f.password_field :confirm_password, :disabled => disabled, :equalTo => "#mail_password", :onkeyup => "$('#mailForm').validate().element('#mail_confirm_password');" %> - <div style="clear:both"></div> - </p> - </fieldset> - - <fieldset> - <p> - <label style="float:left"><%=_("Send test mail to")%></label> + </div> + </div> + </fieldset> + + <fieldset class="webyast_fieldset"> + <div class="fieldset_header"> + <span class="fieldset_header_title" ><%=_("Check mail server settings")%></span> + </div> + <div class="fieldset_body"> + <div class="row lastrow"> + <label id="mail_test_mail_label"><%=_("Send test mail to")%></label> <%= f.text_field :test_mail_address, :disabled => disabled, :class => "email" %> - <%= f.submit _("Send Mail"), :name => "send_mail" %> - <label for="mail_test_mail_address" generated="true" class="error"></label> - <div style="clear:both"></div> - </p> - </fieldset> - <div class="nav-buttons"> + <%= f.submit _("Send Mail"), :name => "send_mail" %> + <label for="mail_test_mail_address" generated="true" class="error"></label> + </div> + </div> + </fieldset> + + <div class="clearfix"></div> + + <div class="button_container"> + <div class="hr"> </div> + <div class="nav-buttons" style="margin:0px 0px; padding:10px 0;"> <%= form_send_buttons :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