Hello community,
here is the log from the commit of package webyast-users-ui for openSUSE:Factory
checked in at Fri May 27 10:56:38 CEST 2011.
--------
--- webyast-users-ui/webyast-users-ui.changes 2011-05-18 14:31:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/webyast-users-ui/webyast-users-ui.changes 2011-05-26 11:45:17.000000000 +0200
@@ -1,0 +2,6 @@
+Wed May 25 10:51:11 UTC 2011 - vgorobets@suse.de
+
+- uniform look & feel for users and groups module
+- 0.2.15
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ webyast-users-ui.spec ++++++
--- /var/tmp/diff_new_pack.u2Fnth/_old 2011-05-27 10:55:08.000000000 +0200
+++ /var/tmp/diff_new_pack.u2Fnth/_new 2011-05-27 10:55:08.000000000 +0200
@@ -29,7 +29,7 @@
Group: Productivity/Networking/Web/Utilities
Url: http://en.opensuse.org/Portal:WebYaST
AutoReqProv: on
-Version: 0.2.14
+Version: 0.2.15
Release: 1
Summary: WebYaST - users management UI
Source: www.tar.bz2
++++++ www.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/groups/index.html.erb new/www/app/views/groups/index.html.erb
--- old/www/app/views/groups/index.html.erb 2011-04-12 13:05:56.000000000 +0200
+++ new/www/app/views/groups/index.html.erb 2011-05-25 12:58:42.000000000 +0200
@@ -23,6 +23,9 @@
<% if JSMIN == true %>
<%= javascript_include_tag "min/users-min.js"-%>
<% else %>
+ <%= stylesheet_link_tag "webyast-users" %>
+ <%= stylesheet_link_tag "webyast-plugin-toolbar" %>
+
<%= javascript_include_tag "jquery.quicksearch.js"-%>
<%= javascript_include_tag "select_dialog.js" %>
<%= javascript_include_tag "users.js" %>
@@ -41,14 +44,10 @@
tr {
border: solid 1px #ddd;
}
- label, .qs_input {
+ .qs_input {
width: auto !important;
}
- .label {
- min-width: 10em;
- float: left;
- margin-left: 1em
- }
+
label.error {display: none; float:left; color: #990000; font-weight:bold; margin-left:10px;}
</style>
@@ -107,108 +106,104 @@
<% end %>
<% end %>
-<div class='plugin-icon'><img alt="yast-groups" src='/icons/yast-groups.png' width="48px" height="48px"><%=_("Groups")%><span id="questionMark">?</span></div>
-<div class="plugin-content">
+<!--<div class='plugin-icon'><img alt="yast-groups" src='/icons/yast-groups.png' width="48px" height="48px"><%=_("Groups")%><span id="questionMark">?</span></div>
+<div class="plugin-content">-->
-<div id="search-userbar">
- <div id="home-container">
- <div id="home">
- <%=link_to image_tag("home.png", :id=>"home_image"), :controller=>"controlpanel", :action => :index %>
+<div id="groups_index" class="plugin-content plugin-border">
+ <div class="plugin-header">
+ <div class="left">
+ <label class="plugin-icon-container"><img class="plugin-icon" src="/icons/groups.png"></label>
+ <label class="plugin-name"><%=_("Groups")%></label>
+ <span id="questionMark" class="right" style="float:right; margin:0px 5px;">?</span>
</div>
</div>
- <span style="clear:both; overflow:hidden;"></span>
- <div id="search-container">
- <form action="#" id="quicksearch" >
+
+ <div class="clearfix"> </div>
+
+ <div id="webyast-toolbar-container">
+ <%=link_to image_tag("home.png", :class=>"home-icon"), :controller=>"controlpanel", :action => :index %>
+
+ <form action="#" id="quicksearch">
<label><%= _("Filter:") %></label>
- <input type="text" id="groups_search" style="padding:3px;"/>
+ <input type="text" id="groups_search"/>
</form>
- </div>
- <span style="clear:both; overflow:hidden;"></span>
- <div id="link-container">
- <div id="action_links" class="action_links">
+
+ <span id="action_link_container">
<% if @permissions[:groupadd] %>
- <%=link_to image_tag("/icons/yast-groups_16.png", :class=>"icons") + _("New Group"), :action => :new %>
- <label>|</label>
+ <%=link_to image_tag("/icons/groups.png", :class=>"action_link_icon") + _("New Group"), :action => :new %>
<% end %>
- <%=link_to image_tag("/icons/yast-users_16.png", :class=>"icons") + _("Manage Users"), "controller" => "users" %>
- </div>
+ <%=link_to image_tag("/icons/users.png", :class=>"action_link_icon") + _("Manage Users"), :controller => "users" %>
+ </span>
</div>
-</div>
-<div style="clear:both; overflow:hidden;"></div>
-
-<div class='pad1_2em'>
- <!--<% if @permissions[:groupadd] %>
- <%= link_to _("Add New Group"), :action => :new -%>
- <% end %>-->
- <div id="groups" class="accordion">
-
- <% for group in @groups %>
- <div class="list-fieldset">
- <div class="list-fieldset-header">
- <span class="quicksearch_content">
- <%= h group.cn || "-none-" %>
- </span>
- </div>
- <div class='group-content' style="display:none">
-<% form_for group, :url => { :action => @adding ? "create" : "update"}, :html => { :id => "form_"+group.old_cn, :autocomplete => :off, :onsubmit => "form_handler('#{group.old_cn}')"} do |f| %>
- <%= f.error_messages %>
- <%= f.hidden_field :old_cn %>
- <p>
- <div class="label"><%=_("Group Name")%></div>
- <%= f.text_field :cn, :disabled => false, :class => "required" %>
- </p>
- <p>
- <div class="label"><%=_("Group ID")%></div>
- <%= f.text_field :gid, :disabled => false %>
- </p>
- <p>
- <div class="label"><%=_("Members")%></div>
- <%= f.text_field :members_string, :disabled => false, :onkeyup => "members_validation(this);", :class => "members-string"%>
- <% if @permissions[:usersget] == true %>
- <a href="#" id="manage_members" class="button" onClick="select_users_open('<%= group.old_cn %>');return false;"><%= _("Manage Members") %></a>
- <% end %>
- </p>
- <p><%= f.hidden_field :group_type %><label id="users-error" class="error"></label></p>
-
- <div class="nav-buttons">
- <div id="progress_<%= group.cn -%>" style="display: none; margin-bottom: 10px"><img src="/images/working.gif" alt="Working"/><span style="vertical-align: 50%; margin-left: 5px">...Wait...</span></div>
- <% message = _('Please wait')%>
- <%= submit_tag _("Save"),
- :onclick=>"return $('#form_" + group.old_cn + "').validate({
- submitHandler: function(form) {
- var message = '#{message}';
- disableFormOnSubmit(message);
- form.submit();
- }
+ <div style="clear:both; overflow:hidden;"></div>
- });" %>
+ <div class='pad1_2em'>
+ <div id="groups" class="accordion">
+ <% for group in @groups %>
+ <div class="list-fieldset">
+ <div class="list-fieldset-header">
+ <span class="quicksearch_content">
+ <%= h group.cn || "-none-" %>
+ </span>
+ </div>
+ <div class='group-content' style="display:none">
+ <% form_for group, :url => { :action => @adding ? "create" : "update"}, :html => { :id => "form_"+group.old_cn, :autocomplete => :off, :onsubmit => "form_handler('#{group.old_cn}')"} do |f| %>
+ <%= f.error_messages %>
+ <%= f.hidden_field :old_cn %>
+ <p>
+ <div class="label"><%=_("Group Name")%></div>
+ <%= f.text_field :cn, :disabled => false, :class => "required" %>
+ </p>
+ <p>
+ <div class="label"><%=_("Group ID")%></div>
+ <%= f.text_field :gid, :disabled => false %>
+ </p>
+ <p>
+ <div class="label"><%=_("Members")%></div>
+ <%= f.text_field :members_string, :disabled => false, :onkeyup => "members_validation(this);", :class => "members-string"%>
+ <% if @permissions[:usersget] == true %>
+ <a href="#" id="manage_members" class="button" onClick="select_users_open('<%= group.old_cn %>');return false;"><%= _("Manage Members") %></a>
+ <% end %>
+ <%= f.hidden_field :group_type %><label id="users-error" class="error"></label>
+ </p>
-
-
-
- <% if @permissions[:groupdelete] %>
- ');">
- <%= link_to _("Delete"),
- {:action => 'destroy', :id => group.cn},
- {:confirm => _("Are you sure to delete group '%s'?") % group.cn, :method => :destroy, :class => :button} %>
- </span>
+ <div class="nav-buttons">
+ <div class="hr"> </div>
+ <div id="progress_<%= group.cn -%>" style="display: none; margin-bottom: 10px"><img src="/images/working.gif" alt="Working"/><span style="vertical-align: 50%; margin-left: 5px">...Wait...</span></div>
+ <% message = _('Please wait')%>
+ <%= submit_tag _("Save"),
+ :onclick=>"return $('#form_" + group.old_cn + "').validate({
+ submitHandler: function(form) {
+ var message = '#{message}';
+ disableFormOnSubmit(message);
+ form.submit();
+ }
+ });" %>
+
+ <% if @permissions[:groupdelete] %>
+ ');">
+ <%= link_to _("Delete"),
+ {:action => 'destroy', :id => group.cn},
+ {:confirm => _("Are you sure to delete group '%s'?") % group.cn, :method => :destroy, :class => :button} %>
+ </span>
+ <% end %>
+ </div>
+ <% end %>
+ </div>
+ </div>
<% end %>
</div>
- <% end %>
- </div>
- </div>
- <% end %>
-
- </div>
-</div>
- <div><input type="hidden" id="all_users_string" value="<%= @all_users_string %>" /></div>
- <div><input type="hidden" id="system_users_string" value="<%= @all_sys_users_string %>" /></div>
+ </div>
+ <div><input type="hidden" id="all_users_string" value="<%= @all_users_string %>" /></div>
+ <div><input type="hidden" id="system_users_string" value="<%= @all_sys_users_string %>" /></div>
- <div class="nav-buttons">
- <%= form_back_button -%>
- <%= form_str_spacer %>
- <%= link_to _("Manage Users"), "controller" => "users" %>
+ <div class="button_container">
+ <div class="nav-buttons">
+ <div class="hr"> </div>
+ <p><%= link_to _("Manage Users"), "controller" => "users" %></p>
+ <%= form_back_button -%>
+ </div>
</div>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/groups/new.html.erb new/www/app/views/groups/new.html.erb
--- old/www/app/views/groups/new.html.erb 2011-04-12 11:29:23.000000000 +0200
+++ new/www/app/views/groups/new.html.erb 2011-05-25 12:58:42.000000000 +0200
@@ -22,6 +22,7 @@
<% if JSMIN == true %>
<%= javascript_include_tag "min/users-min.js"-%>
<% else %>
+ <%= stylesheet_link_tag "webyast-users" %>
<%= javascript_include_tag "users.js" %>
<%= javascript_include_tag "select_dialog.js" %>
<% end %>
@@ -33,10 +34,6 @@
<% end %>
<style type="text/css">
- label.error {
- display: none; float:left; color: #990000; font-weight:bold; margin-left:10px;
- }
-
.GContainerUser, .GContainerGroups {
float: left;
margin: 3px;
@@ -46,8 +43,8 @@
.GBox {
border: #000 1px solid;
cursor: pointer;
- display: block;
- float: left;
+ display: block;
+ float: left;
font-family: verdana, tahoma, arial;
font-size: 10px;
margin-bottom: 5px;
@@ -87,54 +84,75 @@
</script>
<%
disabled = ! ((@permissions[:groupadd] && @adding) || (@permissions[:groupmodify] && !@adding)) %>
-<div class='plugin-icon'><img alt="yast-groups" src='/icons/yast-groups.png' alt="groups module"/>
+
+
- <%= form_str_spacer %>
- <%= form_cancel_button :action => :index %>
+<!--<div class="plugin-content"> -->
+<div id="new_group" class="plugin-content plugin-border">
+ <%= render :partial => 'shared/missing_write_permissions' if disabled %>
+
+ <div class="plugin-header">
+ <div class="left">
+ <label class="plugin-icon-container"><img class="plugin-icon" src="/icons/groups.png"></label>
+ <label class="plugin-name"><%= _("Groups") + header_spacer + _("Add new group")%></label>
+ </div>
</div>
+
+ <div class="clearfix"> </div>
+ <% form_for :group, :url => { :action => "create" }, :html => { :id => "form_", :class=>"webyast_form", :autocomplete => :off, :onsubmit => "form_handler('')"} do |f| %>
+ <%= f.error_messages %>
+ <%= f.hidden_field :old_cn %>
+
+ <fieldset class="webyast_fieldset">
+ <div class="fieldset_header">
+ <span class="fieldset_header_title" >
+ <%= _("Add new group") %>
+ <!--<span style="float:none; color:#777777; font-size:10px; margin-left:2px;">(manual)</span>-->
+ </span>
+ </div>
+
+ <div class="fieldset_body">
+ <div class="row manual">
+ <label><%=_("Group Name")%></label>
+ <%= f.text_field :cn, :disabled => false, :class => "required" %>
+ </div>
+ <div class="row manual">
+ <label><%=_("Members")%></label>
+ <%= f.text_field :members_string, :disabled => false, :onkeyup => "members_validation(this);" %>
+ <% if @permissions[:usersget] == true %>
+ <a href="#" id="manage_members" class="button" onClick="select_users_open('');return false;"><%= _("Manage Members") -%></a>
+ <%= f.hidden_field :group_type %><label class="error"></label>
+ <div class="clearfix"> </div>
+ <% end %>
+ </div>
+ </div>
+ </fieldset>
+
+ <div style="padding:5px 5px;">
+ <div class="nav-buttons">
+ <div class="hr"> </div>
+ <div class="clearfix"> </div>
+
+ <!--<div id="progress_" style="display: none; margin-bottom: 10px"><img src="/images/working.gif" alt="Working"/><span style="vertical-align: 50%; margin-left: 5px">...Wait...</span></div>-->
+
+ <% message = _('Please wait')%>
+ <%= submit_tag _("Save"),
+ :onclick=>"return $('#form_').validate({
+ submitHandler: function(form) {
+ var message = '#{message}';
+ $.modalDialog.wait( {message: message});
+ form.submit();
+ }
+ });" %>
+
+ <%= form_str_spacer %>
+ <%= form_cancel_button :action => :index %>
+ </div>
+ <% end %>
-<% end %>
<div><input type="hidden" id="all_users_string" value="<%= @all_users_string %>" /></div>
<div><input type="hidden" id="system_users_string" value="<%= @all_sys_users_string %>" /></div>
</div>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/www/app/views/users/_user_form.erb new/www/app/views/users/_user_form.erb
--- old/www/app/views/users/_user_form.erb 2011-05-13 10:46:18.000000000 +0200
+++ new/www/app/views/users/_user_form.erb 2011-05-25 12:58:42.000000000 +0200
@@ -144,7 +144,9 @@
</fieldset>
</div>
+ <div style="padding:0px 0px;">
<div class="nav-buttons">
+ <div class="hr"> </div>