1 files changed, 48 insertions, 52 deletions

diff --git a/admin/themes/default/template/group_list.tpl b/admin/themes/default/template/group_list.tpl
index c11b6369a..0d2d727d1 100644
--- a/admin/themes/default/template/group_list.tpl
+++ b/admin/themes/default/template/group_list.tpl
@@ -1,7 +1,21 @@
 {footer_script}
 {literal}
 $(document).ready(function() {
+  /**
+   * Add group
+   */
+  jQuery("#addGroup").click(function() {
+    jQuery("#addGroupForm").toggle();
+    jQuery("input[name=groupname]").focus();
+    return false;
+  });
+
+  jQuery("#addGroupClose").click(function() {
+    jQuery("#addGroupForm").hide();
+    return false;
+  });
 
+  $('.groups input').change(function () { $(this).parent('p').toggleClass('group_select'); });
   $(".grp_action").hide();
   $("input.group_selection").click(function() {
 
@@ -16,10 +30,10 @@ $(document).ready(function() {
       $("#permitAction").show();
       $("#forbidAction").hide();
     }
-    $("p[group_id="+$(this).attr("value")+"]").each(function () {
+    $("p[group_id="+$(this).prop("value")+"]").each(function () {
      $(this).toggle();
     });
-    
+
     if (nbSelected<2) {
       $("#two_to_select").show();
       $("#two_atleast").hide();
@@ -32,8 +46,8 @@ $(document).ready(function() {
   $("[id^=action_]").hide();
   $("select[name=selectAction]").change(function () {
     $("[id^=action_]").hide();
-    $("#action_"+$(this).attr("value")).show();  
-    if ($(this).val() != -1) {
+    $("#action_"+$(this).prop("value")).show();
+    if ($(this).val() != -1 ) {
       $("#applyActionBlock").show();
     }
     else {
@@ -51,38 +65,44 @@ $(document).ready(function() {
   <h2>{'Group management'|@translate}</h2>
 </div>
 
-<form method="post" name="add_user" action="{$F_ADD_ACTION}" class="properties">
+<p class="showCreateAlbum" id="showAddGroup">
+  <a class="icon-plus-circled" href="#" id="addGroup">{'Add group'|translate}</a>
+</p>
+
+<form method="post" style="display:none" id="addGroupForm" name="add_user" action="{$F_ADD_ACTION}" class="properties">
   <fieldset>
     <legend>{'Add group'|@translate}</legend>
-    <span class="property">
-      <label for="groupname">{'Group name'|@translate}</label>
-    </span>
-    <input type="text" id="groupname" name="groupname" maxlength="50" size="20">
-		<input type="submit" name="submit_add" value="{'Add'|@translate}">
-		<input type="hidden" name="pwg_token" value="{$PWG_TOKEN}"> 
+
+    <p>
+      <strong>{'Group name'|translate}</strong><br>
+      <input type="text" name="groupname" maxlength="50" size="20">
+    </p>
+
+    <p class="actionButtons">
+      <input class="submit" name="submit_add" type="submit" value="{'Add'|translate}">
+      <a href="#" id="addGroupClose">{'Cancel'|@translate}</a>
+    </p>
+
+    <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
 
   </fieldset>
 </form>
+
 <form method="post" name="add_user" action="{$F_ADD_ACTION}" class="properties">
   <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}">
-  
-  <table class="table2">
-    <tr class="throw">
-      <th></th>
-      <th>{'Group name'|@translate}</th>
-      <th>{'Members'|@translate}</th>
-    </tr>
+
+  <ul class="groups">
     {if not empty($groups)}
     {foreach from=$groups item=group name=group_loop}
-    <tr class="{if $smarty.foreach.group_loop.index is odd}row1{else}row2{/if}">
-      <td><input class="group_selection" name="group_selection[]" type="checkbox" value="{$group.ID}"></td>
-      <td>{$group.NAME}<i><small>{$group.IS_DEFAULT}</small></i></td>
-      <td>{if $group.MEMBERS>0}<a href="{$group.U_MEMBERS}" title="{'Manage the members'|@translate}">{$group.MEMBERS}</a><br>{$group.L_MEMBERS}{else}{$group.MEMBERS}{/if}</td>
-    </tr>
+    <li>
+      <label><p>{$group.NAME}<i><small>{$group.IS_DEFAULT}</small></i><input class="group_selection" name="group_selection[]" type="checkbox" value="{$group.ID}"></p></label>
+      <p class="list_user">{if $group.MEMBERS>0}{$group.MEMBERS}<br>{$group.L_MEMBERS}{else}{$group.MEMBERS}{/if}</p>
+      <a class="icon-lock group_perm" href="{$group.U_PERM}" title="{'Permissions'|@translate}">{'Permissions'|translate}</a>
+    </li>
     {/foreach}
     {/if}
-  </table>
-  
+  </ul>
+
   <fieldset id="action">
     <legend>{'Action'|@translate}</legend>
       <div id="forbidAction">{'No group selected, no action possible.'|@translate}</div>
@@ -95,8 +115,6 @@ $(document).ready(function() {
           <option value="delete">{'Delete'|@translate}</option>
           <option value="merge">{'Merge selected groups'|@translate}</option>
           <option value="duplicate">{'Duplicate'|@translate}</option>
-          <option value="manage_members">{'Manage the members'|@translate}</option>
-          <option value="manage_pemissions">{'Manage Permissions'|@translate}</option>
           <option value="toggle_default">{'Toggle \'default group\' property'|@translate}</option>
       {if !empty($element_set_groupe_plugins_actions)}
         {foreach from=$element_set_groupe_plugins_actions item=action}
@@ -142,28 +160,6 @@ $(document).ready(function() {
         {/if}
         </div>
 
-        <!-- manage_members -->
-        <div id="action_manage_members" class="bulkAction">
-        {if not empty($groups)}
-        {foreach from=$groups item=group}
-        <p group_id="{$group.ID}" class="grp_action">
-          {$group.NAME} > {if $group.NB_MEMBERS!=0}<a href="{$group.U_MEMBERS}" title="{'Manage the members'|@translate}">{'Manage the members'|@translate}</a>{else}{'No members to manage'|@translate}{/if}
-        </p>
-        {/foreach}
-        {/if}
-        </div>
-
-        <!-- manage_pemissions -->
-        <div id="action_manage_pemissions" class="bulkAction">
-        {if not empty($groups)}
-        {foreach from=$groups item=group}
-        <p group_id="{$group.ID}" class="grp_action">
-          {$group.NAME} > <a href="{$group.U_PERM}" title="{'Permissions'|@translate}">{'Manage Permissions'|@translate}</a>
-        </p>
-        {/foreach}
-        {/if}
-        </div>
-
         <!-- toggle_default -->
         <div id="action_toggle_default" class="bulkAction">
         {if not empty($groups)}
@@ -174,8 +170,8 @@ $(document).ready(function() {
         {/foreach}
         {/if}
         </div>
-    
-    
+
+
         <!-- plugins -->
     {if !empty($element_set_groupe_plugins_actions)}
       {foreach from=$element_set_groupe_plugins_actions item=action}
@@ -184,7 +180,7 @@ $(document).ready(function() {
         </div>
       {/foreach}
     {/if}
-    
+
         <p id="applyActionBlock" style="display:none" class="actionButtons">
           <input id="applyAction" class="submit" type="submit" value="{'Apply action'|@translate}" name="submit"> <span id="applyOnDetails"></span></p>
     </div> <!-- #permitAction -->