Hello community, here is the log from the commit of package webyast-roles-ui for openSUSE:Factory checked in at Thu May 19 13:25:20 CEST 2011.
-------- --- webyast-roles-ui/webyast-roles-ui.changes 2011-04-12 16:32:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/webyast-roles-ui/webyast-roles-ui.changes 2011-05-18 15:18:37.000000000 +0200 @@ -1,0 +2,20 @@ +Wed May 18 13:17:12 UTC 2011 - [email protected] + +- changed the licence to the correct name (is still gpl2 only) +- 0.2.12 + +------------------------------------------------------------------- +Wed May 18 11:15:39 UTC 2011 - [email protected] + +- polling for users cache changes too (bnc#693928) +- 0.2.11 + +------------------------------------------------------------------- +Fri May 13 10:53:28 UTC 2011 - [email protected] + +- fixed javascript bug "Node cannot be inserted at the specified point in the hierarchy" +- added "how to assign users to role" info message +- removed old warning message and increased timeout for "user exist" warning +- 0.2.10 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ webyast-roles-ui.spec ++++++ --- /var/tmp/diff_new_pack.uNNt4v/_old 2011-05-19 13:24:59.000000000 +0200 +++ /var/tmp/diff_new_pack.uNNt4v/_new 2011-05-19 13:24:59.000000000 +0200 @@ -23,11 +23,11 @@ Obsoletes: yast2-webclient-permissions < %{version} Provides: webyast-permissions-ui = %{version} Obsoletes: webyast-permissions-ui < %{version} -License: GPLv2 +License: GPL-2.0 Group: Productivity/Networking/Web/Utilities Url: http://en.opensuse.org/Portal:WebYaST AutoReqProv: on -Version: 0.2.9 +Version: 0.2.12 Release: 1 Summary: WebYaST - Roles management UI Source: www.tar.bz2 @@ -44,7 +44,7 @@ # %package testsuite -License: GPLv2 + Group: Productivity/Networking/Web/Utilities Requires: %{name} = %{version} Requires: webyast-base-ui-testsuite rubygem-mocha rubygem-test-unit ++++++ www.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/roles/index.rhtml new/www/app/views/roles/index.rhtml --- old/www/app/views/roles/index.rhtml 2011-04-12 13:05:56.000000000 +0200 +++ new/www/app/views/roles/index.rhtml 2011-05-18 13:15:16.000000000 +0200 @@ -1,21 +1,21 @@ <%# #-- # 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 #++ @@ -41,16 +41,20 @@ <div id="jqueryTab" class="fieldset-group"> <fieldset id="assignUsers"> <legend><span><%= _("Assign Users")%></span></legend> - <div id="rolesContainer"> + <div id="rolesContainer"> <div id="rolesContent" class="round5b"> + <% @roles.each do |role| %> - <div class="role"> - <span class="roleHeader" style="vertical-align:middle;"> + + <div id="<%= role.name %>" class="role"> + <span class="roleHeader"> <label><img class="role" src="../images/key-grey.png"><%= role.name%></label> + <span id="<%= role.name %>-warning" class="user-warning-message"> + <%= _("User already assigned") %> + </span> <%= link_to image_tag("../images/delete-user.png", :border=>0, :class=>"deleteRole"), {:action => 'destroy', :id => ERB::Util.html_escape( role.name ) }, { :style=>"border:0px;"} %> </span> <span class="roleBody drop"> - <span class="roles_warning" style="display:none; float:left;"> user already assigned to this role</span> <%=hidden_field_tag(RolesController.users_role_id(role.name), role.users.join(",") ) %> <% role.users.each do |user| %> <span class="user assigned" alt="<%=RolesController.users_role_id(role.name)%>"><%=user%></span> @@ -59,9 +63,23 @@ </div> <% end %> </div> - </div> + </div> - <div id="usersContainer"> + + <div id="roles_tipsy_tooltip" style="display:none;"> + <div style="float:left; width:70px;"> + <span id="infoMark" class="info">!</span> + </div> + <div id="tooltip_message_container"> + <label class="info_text"> <%= _("In order to assign the user to roles,")%></label> + <label class="info_text"> <%= _("Drag and Drop the user labels into Role containers") %></label> + <label class="info_text"><a id="dont_show" href=""><%= _("Don't show this again") %></a></label> + </div> + <span class="clearfix"></span> + </div> + + + <div id="usersContainer"> <div id="usersContent" class="users round5b"> <div class="slider-content"> <ol> @@ -82,9 +100,9 @@ <% end %> <% end %> </ol> - </div> - </div> - </div> + </div> + </div> + </div> </fieldset> <fieldset id="assign-permissions"> @@ -122,7 +140,7 @@ <% end %> </div> <% end %> - <div style="clear:both"></div> + <div style="clear:both"></div> </div> </div> <% end %> @@ -140,35 +158,34 @@ <script type="text/javascript"> var AUTH_TOKEN = 'authenticity_token=' + encodeURIComponent("<%= escape_javascript form_authenticity_token %>"); - startNotifier({'module':'roles', 'AUTH_TOKEN':AUTH_TOKEN}, 1000, 11000); + startNotifier({'module':'roles,users', 'AUTH_TOKEN':AUTH_TOKEN}, 1000, 11000); $(document).ready(function(){ function validateRoleName(name) { - jQuery.validator.addMethod(name, function(value, element) { - var regExp = new RegExp("^[a-zA-Z0-9\\_\\-\\. ]+$"); - return this.optional(element) || regExp.test(value); - }); + jQuery.validator.addMethod(name, function(value, element) { + var regExp = new RegExp("^[a-zA-Z0-9\\_\\-\\. ]+$"); + return this.optional(element) || regExp.test(value); + }); } validateRoleName("role_name"); $("#rolesForm").validate({ - onkeyup: function(element) { this.element(element); }, - rules:{ role_name: { required:true, role_name: true } }, - messages: { - role_name: { required: <%= jss _("This field is required") -%>, role_name: <%= jss _("Allowed is combination of a-z, A-Z, numbers, space, dash and underscore only.") -%> } - } + onkeyup: function(element) { this.element(element); }, + rules:{ role_name: { required:true, role_name: true } }, + messages: { + role_name: { required: <%= jss _("This field is required") -%>, role_name: <%= jss _("Allowed is combination of a-z, A-Z, numbers, space, dash and underscore only.") -%> } + } }); -// select_users_open = select_users_dialog(); $(".permissions-group-header .permission-field input").click( function() { - groupHeaderClicked($(this)); + groupHeaderClicked($(this)); }); $(".permissions-group-content .permission-field input").click( function() { - groupFieldClicked( $(this) ); + groupFieldClicked( $(this) ); }); $(".permissions-group-header .permission-field").map( function() { refreshComputed( this.getAttribute('group-role-id') ) }); $('.list-fieldset-header .permission-label').click(function() { - $(this).parent().next().toggle(); - return false; + $(this).parent().next().toggle(); + return false; }); $('.permissions-header .permission-label').click( collapseAll ); addTabsNavigation("div#jqueryTab", "span"); @@ -177,16 +194,15 @@ create_role_dialog(); $("#create_role_link").click( function (e) { - e.preventDefault(); - $("#create_role_dialog").dialog('open'); + e.preventDefault(); + $("#create_role_dialog").dialog('open'); }); $("#roles_submit_button").click( function () { blockForm(); }); $("img.deleteRole").click( function () { blockForm(); }); - $('#usersContent').sliderNav({items:[<%= @alpha %>], arrows:false }); }); - + function clearForm() { $("#role_name").val(''); $("#rolesForm label.error").val('').css("display", "none"); @@ -197,22 +213,22 @@ autoOpen: false, width: 400, modal: true, - close: clearForm, - buttons: { - 'Create Role': function() { - if ($("#rolesForm").validate().form() == true) { - $(this).children("form").first().submit(); - $(this).dialog('close'); - blockForm(); - } - }, - Cancel: function() { - $(this).dialog('close'); - } - } + close: clearForm, + buttons: { + 'Create Role': function() { + if ($("#rolesForm").validate().form() == true) { + $(this).children("form").first().submit(); + $(this).dialog('close'); + blockForm(); + } + }, + Cancel: function() { + $(this).dialog('close'); + } + } }); }; - + function blockForm() { var message = "<%= _("Please wait") -%>"; disableFormOnSubmit(message); @@ -223,6 +239,7 @@ var field_checks = $(".permissions-group-content .permission-field[group-role-id='"+group_role_id+"'] input").get(); return { header : header_check, fields : field_checks }; }; + function all(items, cond) { items_length = items.length; for (var i=0;i<items_length;i++) { @@ -264,32 +281,14 @@ function collapseAll() { $('.list-fieldset-header').next().hide(); }; -// function select_users_dialog() { -// var open_dialog = select_many_dialog({ -// kind : 'users', -// title : <%= jss _('Assign Users') %>, -// selected_title : <%= jss _('Selected Users') %>, -// unselected_title : <%= jss _('Available Users') %>, -// tooltip : <%= jss _('Click user names to assign/remove users') %>, -// loadItems : function (dialogId) { -// return $('#users_of_'+dialogId.replace(/ /g,"\\."))[0].value.split(",") -// }, -// storeItems : function (dialogId, items) { -// $('#users_of_'+dialogId.replace(/ /g,"\\."))[0].value = items.join(","); -// }, -// allItems : function (dialogId) { -// return $('#all_users_string')[0].value.split(",") -// } -// }); -// return open_dialog; -// }; + </script> <% content_for :head do %> - <% if JSMIN == true %> - <%= javascript_include_tag "users-min.js"-%> - <% else %> - <%= javascript_include_tag "select_dialog", "jquery.event.drag-2.0.min", "jquery.event.drop-2.0.min", "jquery.qsearch", "roles.helper", "slidernav" %> + <% if JSMIN != true %> + <%= javascript_include_tag "select_dialog", "jquery.event.drag-2.0.min", "jquery.event.drop-2.0.min", "jquery.qsearch", "slidernav", "webyast-roles" %> + <%= stylesheet_link_tag "webyast-roles" %> <% end %> <% end%> </div> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/shortcuts.yml new/www/shortcuts.yml --- old/www/shortcuts.yml 2011-03-04 11:20:15.000000000 +0100 +++ new/www/shortcuts.yml 2011-05-13 10:46:18.000000000 +0200 @@ -1,7 +1,7 @@ main: icon: '/icons/yast-permissions.png' url: /roles - groups: [ System ] + groups: [ Accounts ] tags: [ roles ] title: _("Roles") description: _("Set permissions in roles and assign users to roles") ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
