commit webyast-activedirectory-ui for openSUSE:Factory
Hello community, here is the log from the commit of package webyast-activedirectory-ui for openSUSE:Factory checked in at Wed May 4 11:42:09 CEST 2011. -------- --- webyast-activedirectory-ui/webyast-activedirectory-ui.changes 2010-08-31 08:56:14.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-activedirectory-ui/webyast-activedirectory-ui.changes 2011-04-12 16:12:52.000000000 +0200 @@ -1,0 +2,6 @@ +Tue Apr 12 14:12:16 UTC 2011 - schubi@novell.com + +- new caching +- 0.2.9 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-activedirectory-ui.spec ++++++ --- /var/tmp/diff_new_pack.UgZw6B/_old 2011-05-04 11:41:56.000000000 +0200 +++ /var/tmp/diff_new_pack.UgZw6B/_new 2011-05-04 11:41:56.000000000 +0200 @@ -24,7 +24,7 @@ Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.8 +Version: 0.2.9 Release: 1 Summary: WebYaST - Active Directory Source: www.tar.bz2 ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/activedirectory/index.html.erb new/www/app/views/activedirectory/index.html.erb --- old/www/app/views/activedirectory/index.html.erb 2010-08-25 11:06:17.000000000 +0200 +++ new/www/app/views/activedirectory/index.html.erb 2011-04-12 11:29:23.000000000 +0200 @@ -20,78 +20,75 @@ --> <% content_for :head do %> - + <%= javascript_include_tag "jquery.activity", "notifier" %> <%= javascript_include_tag "validation.js" %> <script type="text/javascript"> - $(document).ready(function() { + var AUTH_TOKEN = 'authenticity_token=' + encodeURIComponent("<%= escape_javascript form_authenticity_token %>"); + startNotifier({'module':'activedirectory', 'AUTH_TOKEN':AUTH_TOKEN}, 1000, 11000); $("#activedirectoryForm").validate(); // make the error message translatable - override the default messsage - $.extend($.validator.messages, { - required: <%= jss _("This field is required.") -%>, - }); - }); - $(document).ready(function() { - + $.extend($.validator.messages, { required: <%= jss _("This field is required.") -%> }); + if ($("#activedirectory_enabled:checked").length == 0) { $("#activedirectory_domain").attr("disabled","disabled"); - }; + } $("#activedirectory_enabled").click(function () { if ($("#activedirectory_enabled:checked").length == 0) { - $("#activedirectory_domain").attr("disabled","disabled"); - } - else { - $("#activedirectory_domain", "#activedirectoryForm").removeAttr("disabled"); + $("#activedirectory_domain").attr("disabled","disabled"); + } else { + $("#activedirectory_domain", "#activedirectoryForm").removeAttr("disabled"); } }); + $('#activedirectoryForm input[type="submit"]').click(function() { + if ($('#activedirectoryForm').valid()) { + var message = <%= jss _("Please wait") -%>; + $.modalDialog.wait( {message: message}); + } + }); }); </script> - <% end %> <% disabled = !@permissions[:write] %> -<div class='plugin-icon'><img src='../icons/yast-samba-client.png'/> <%= _("Active Directory") %></div> +<div class='plugin-icon'><img src='../icons/yast-samba-client.png'/> <%= _("Active Directory") %><span id="questionMark">?</span></div> <div class='plugin-content'> - -<%= render :partial => 'shared/missing_write_permissions' if disabled %> - - <% form_for(:activedirectory, @activedirectory, :url => { :action => 'update' }, - :html => { :method => :put, :id => 'activedirectoryForm', :onsubmit => "if ($('#activedirectoryForm').valid()) $('#progress').show() && disable_forms ()", :autocomplete => :off } - ) do |f| %> - - <fieldset> - <p> - <%= check_box 'activedirectory', :enabled, {:disabled => disabled, :checked => @activedirectory.enabled}, true,false -%> - <%= _("Enable Authentication of AD users") %> - </p> - <p> - <%= label_tag :activedirectory_domain, _("Active Directory Domain") %> - <%= text_field :activedirectory, :domain, :disabled => disabled, :class => 'required' %> - </p> - </fieldset> - <% if @activedirectory.respond_to? :administrator %> - <fieldset> - <p> - <%= label_tag :activedirectory_administrator, _("Adminstrator User Name") %> - <%= text_field :activedirectory, :administrator, :disabled => disabled, :class => 'required' %> - </p> - <p> - <%= label_tag :activedirectory_password, _("Password") %> - <%= password_field :activedirectory, :password, :disabled => disabled, :class => 'required' %> - </p> - <p> - <%= label_tag :activedirectory_machine, _("Machine Account") %> - <%= text_field :activedirectory, :machine, :disabled => disabled %> - </p> - </fieldset> - <% end %> - <div class="nav-buttons"> - <%= form_send_buttons :disabled => disabled, :onclick=>"Element.show('progress')"%> - </div> + <%= render :partial => 'shared/missing_write_permissions' if disabled %> + <% form_for(:activedirectory, @activedirectory, :url => { :action => 'update' }, :html => { :method => :put, :id => 'activedirectoryForm', :autocomplete => :off }) do |f| %> + <fieldset> + <p> + <%= check_box 'activedirectory', :enabled, {:disabled => disabled, :checked => @activedirectory.enabled}, true,false -%> + <%= _("Enable Authentication of AD users") %> + </p> + <p> + <%= label_tag :activedirectory_domain, _("Active Directory Domain") %> + <%= text_field :activedirectory, :domain, :disabled => disabled, :class => 'required' %> + </p> + </fieldset> + + <% if @activedirectory.respond_to? :administrator %> + <fieldset> + <p> + <%= label_tag :activedirectory_administrator, _("Adminstrator User Name") %> + <%= text_field :activedirectory, :administrator, :disabled => disabled, :class => 'required' %> + </p> + <p> + <%= label_tag :activedirectory_password, _("Password") %> + <%= password_field :activedirectory, :password, :disabled => disabled, :class => 'required' %> + </p> + <p> + <%= label_tag :activedirectory_machine, _("Machine Account") %> + <%= text_field :activedirectory, :machine, :disabled => disabled %> + </p> + </fieldset> <% end %> - + <div class="nav-buttons"> + <%= form_send_buttons :disabled => disabled %> + </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