';
+ echo '
';
echo ' '.$category['title'].'';
$in_category = true;
}
else
{
- echo '
';
+ echo '
';
echo ' '.$category['title'].'';
}
$group_list = GroupManager :: get_group_list($category['id']);
diff --git a/main/group/group_category.php b/main/group/group_category.php
index e67003bb61..5c0dce6cb0 100644
--- a/main/group/group_category.php
+++ b/main/group/group_category.php
@@ -1,5 +1,5 @@
"group.php", "name" => get_lang('GroupManagement'));
+$interbreadcrumb[] = array ("url" => "group.php", "name" => get_lang('Groups'));
// Build the form
if (isset ($_GET['id']))
{
@@ -112,6 +112,8 @@ else
$action = 'add_category';
$form = new FormValidator('group_category');
}
+$form->addElement('header', '', $nameTools);
+
// If categories allowed, show title & description field
if (get_setting('allow_group_categories') == 'true')
{
@@ -139,7 +141,7 @@ $group[] = & $form->createElement('static', null, null, get_lang('QtyOfUserCanSu
$form->addGroup($group, 'limit_group', get_lang('GroupLimit'), ' ', false);
$form->addRule('limit_group',get_lang('MaxGroupsPerUserInvalid'),'callback','check_groups_per_user');
// Default settings for new groups
-$form->addElement('header', null, get_lang('DefaultSettingsForNewGroups'));
+$form->addElement('static', null, ''.get_lang('DefaultSettingsForNewGroups').'');
// Members per group
$form->addElement('radio', 'max_member_no_limit', get_lang('GroupLimit'), get_lang('NoLimit'),MEMBER_PER_GROUP_NO_LIMIT);
$group = array ();
@@ -214,9 +216,6 @@ if ($form->validate())
}
// Else display the form
Display :: display_header($nameTools, "Group");
-echo ''; + //echo ''; /* * Show form to generate groups from virtual courses */ diff --git a/main/group/group_edit.php b/main/group/group_edit.php index 33f4cb3f19..f4489e6c2c 100644 --- a/main/group/group_edit.php +++ b/main/group/group_edit.php @@ -63,7 +63,7 @@ $current_group = GroupManager :: get_group_properties($_SESSION['_gid']); ----------------------------------------------------------- */ $nameTools = get_lang('EditGroup'); -$interbreadcrumb[] = array ("url" => "group.php", "name" => get_lang('GroupManagement')); +$interbreadcrumb[] = array ("url" => "group.php", "name" => get_lang('Groups')); if (!api_is_allowed_to_edit(false,true)) { api_not_allowed(true); @@ -123,6 +123,7 @@ function check_group_members($value) { // Build form $form = new FormValidator('group_edit'); +$form->addElement('header', '', $nameTools); $form->addElement('hidden', 'action'); $form->addElement('hidden', 'referer'); // Group name @@ -307,11 +308,11 @@ if (isset($_POST['group_members'])) { } } Display :: display_header($nameTools, "Group"); -echo ''; if (count($categories) > 1 || isset ($categories[0]) && $categories[0]['id'] != VIRTUAL_COURSE_CATEGORY) { $create_groups_form = new FormValidator('create_groups'); + $create_groups_form->addElement('header', '', $nameTools); $group_el = array (); $group_el[] = & $create_groups_form->createElement('static', null, null, get_lang('Create')); $group_el[] = & $create_groups_form->createElement('text', 'number_of_groups', null, array ('size' => 3)); @@ -292,7 +290,7 @@ else { echo get_lang('NoCategoriesDefined'); } - echo ''; + //echo '
'.get_lang("StudentUnsubscribe").'
'; + echo ''.Display::return_icon('group_delete.gif').get_lang("StudentUnsubscribe").''; } +echo ' '; if( isset($_GET['action'])) { switch( $_GET['action']) { @@ -163,7 +166,8 @@ $is_course_member = CourseManager :: is_user_subscribed_in_real_or_linked_course /* * Group title and comment */ -api_display_tool_title($nameTools.' '.stripslashes($current_group['name'])); +//api_display_tool_title($nameTools.' '.stripslashes($current_group['name'])); + if (!empty($current_group['description'])) { echo ''.stripslashes($current_group['description']).''; }