Merge

main/admin/add_sessions_to_usergroup.php

@@ -179,7 +179,7 @@ if ($add_type == 'multiple') {
 }
 
 echo '<div class="actions">';
-echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back')).get_lang('Back').'</a>';       
+echo '<a href="usergroups.php">'.Display::return_icon('back.png',get_lang('Back'),'','32').'</a>';       
 echo '</div>';
 
 echo '<div class="row"><div class="form_header">'.$tool_name.' '.$data['name'].'</div></div><br/>'; ?>

main/admin/usergroups.php

@@ -69,9 +69,9 @@ $extra_params['height'] = 'auto';
 
 //With this function we can add actions to the jgrid
 $action_links = 'function action_formatter (cellvalue, options, rowObject) {
-                    return \'<a href="add_sessions_to_usergroup.php?id=\'+options.rowId+\'"><img width="22px" src="../img/session_add.png" title="'.get_lang('SubscribeGroupToSessions').'"></a>'
+                    return \'<a href="add_sessions_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/sessions_to_class.png" title="'.get_lang('SubscribeSessionsToGroup').'"></a>'
-                    .' <a href="add_courses_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/course_add.gif" title="'.get_lang('SubscribeGroupToCourses').'"></a>' 
+                    .' <a href="add_courses_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/course_to_class.png" title="'.get_lang('SubscribeCoursesToGroup').'"></a>' 
-                    .' <a href="add_users_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/add_user_big.gif" title="'.get_lang('AddUsers').'"></a>' 
+                    .' <a href="add_users_to_usergroup.php?id=\'+options.rowId+\'"><img src="../img/icons/22/user_to_class.png" title="'.get_lang('SubscribeUsersToGroup').'"></a>' 
                     .' <a href="?action=edit&id=\'+options.rowId+\'"><img width="20px" src="../img/edit.png" title="'.get_lang('Edit').'" ></a>'                                       
                     .' <a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=delete&id=\'+options.rowId+\'"><img title="'.get_lang('Delete').'" src="../img/delete.png"></a>\'; 
                  }';

main/img/icons/48/_sum.txt

@@ -210,6 +210,11 @@ new_career			modif gnome
 career				gnome
 session_to_promotion		modif nuvola
 courses_to_session		modif nuvola
+class				modif mix gnome nuvola
+new_class			modif mix gnome nuvola
+user_to_class			modif mix gnome nuvola
+session_to_class		modif mix gnome nuvola
+course_to_class			modif mix gnome nuvola
 
 --julio
 star				

main/inc/lib/usergroup.lib.php

@@ -29,7 +29,7 @@ class UserGroup extends Model {
         echo '<div class="actions">';
        	echo  '<a href="../admin/index.php">'.Display::return_icon('back.png', get_lang('BackTo').' '.get_lang('PlatformAdmin'),'','32').'</a>';
 	   //echo '<a href="career_dashboard.php">'.Display::return_icon('back.png',get_lang('Back')).get_lang('Back').'</a>';       
-        echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('filenew.gif',get_lang('Add')).get_lang('Add').'</a>';                     
+        echo '<a href="'.api_get_self().'?action=add">'.Display::return_icon('new_class.png',get_lang('langAddClasses'),'','32').'</a>';   
         echo '</div>';   
         echo Display::grid_html('usergroups');  
     }