Selaa lähdekoodia

[svn r20611] style changes - improvements in group tool - (partial FS#3385)

Isaac Flores 16 vuotta sitten
vanhempi
commit
5e42e3cf57
4 muutettua tiedostoa jossa 28 lisäystä ja 29 poistoa
  1. 3 4
      main/forum/index.php
  2. 6 7
      main/group/group.php
  3. 14 17
      main/group/group_space.php
  4. 5 1
      main/inc/lib/groupmanager.lib.php

+ 3 - 4
main/forum/index.php

@@ -266,7 +266,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 				$session_displayed = '';
 			}
 			
-			echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"6\">";
+			echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"5\">";
 			echo '<a href="viewforumcategory.php?'.api_get_cidreq().'&forumcategory='.prepare4display($forum_category['cat_id']).'" '.class_visible_invisible(prepare4display($forum_category['visibility'])).'>'.prepare4display($forum_category['cat_title']).$session_displayed.'</a><br />';
 			
 			if ($forum_category['cat_comment']<>'' AND trim($forum_category['cat_comment'])<>'&nbsp;') {  
@@ -287,7 +287,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 		
 			// step 4: the interim headers (for the forum)
 			echo "\t<tr class=\"forum_header\">\n";
-			echo "\t\t<td colspan=\"3\">".get_lang('Forum')."</td>\n";
+			echo "\t\t<td colspan=\"2\">".get_lang('Forum')."</td>\n";
 			echo "\t\t<td>".get_lang('Topics')."</td>\n";
 			echo "\t\t<td>".get_lang('Posts')."</td>\n";
 			echo "\t\t<td>".get_lang('LastPosts')."</td>\n";
@@ -370,8 +370,7 @@ if (isset($_GET['action']) && $_GET['action'] == 'notify' AND isset($_GET['conte
 						$mywhatsnew_post_info=isset($whatsnew_post_info[$forum['forum_id']]) ? $whatsnew_post_info[$forum['forum_id']]: null;
 						echo "\t<tr class=\"forum\">\n";
 						
-						// Showing the image
-						echo "\t\t<td width=\"50\">";	
+						// Showing the image	
 						if(!empty($forum['forum_image'])) {
 							$image_path = api_get_path(WEB_COURSE_PATH).api_get_course_path().'/upload/forum/images/'.$forum['forum_image'];												
 

+ 6 - 7
main/group/group.php

@@ -1,4 +1,4 @@
-<?php // $Id: group.php 20455 2009-05-10 16:31:12Z ivantcholakov $
+<?php // $Id: group.php 20611 2009-05-13 22:21:08Z iflorespaz $
  
 /*
 ==============================================================================
@@ -236,7 +236,7 @@ foreach ($group_cats as $index => $category)
 		else
 		{
 			echo '<img src="../img/folder_document.gif" alt=""/>';
-			echo ' <a href="group.php?'.api_get_cidreq().'&origin='.$_GET['origin'].'&amp;category='.$category['id'].'">'.$category['title'].'</a>';
+			echo ' <a href="group.php?'.api_get_cidreq().'&origin='.Security::remove_XSS($_GET['origin']).'&amp;category='.$category['id'].'">'.$category['title'].'</a>';
 		}
 		$group_list = GroupManager :: get_group_list($category['id']);
 		echo ' ('.count($group_list).' '.get_lang('ExistingGroups').')';
@@ -255,11 +255,10 @@ foreach ($group_cats as $index => $category)
 		}
 		echo '<p style="margin: 0px;margin-left: 50px;">'.$category['description'].'</p><p/>';
 	}
-	else
-	{
-		$group_list = GroupManager :: get_group_list();
-		$in_category = true;
-	}
+	else {
+			$group_list = GroupManager :: get_group_list();
+			$in_category = true;
+		}
 
 	//if (count($group_list) > 0 && $in_category)
 	if ($in_category)

+ 14 - 17
main/group/group_space.php

@@ -1,4 +1,4 @@
-<?php //$Id: group_space.php 20455 2009-05-10 16:31:12Z ivantcholakov $
+<?php //$Id: group_space.php 20611 2009-05-13 22:21:08Z iflorespaz $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -218,11 +218,10 @@ if (api_is_allowed_to_edit(false,true) OR GroupManager :: is_user_in_group($_SES
 		//link to the wiki area of this group
 		$tools .= "<div style='margin-bottom: 5px;'><a href=\"../wiki/index.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\">".Display::return_icon('wiki.gif', get_lang("GroupWiki"))."&nbsp;".get_lang("GroupWiki")."</a></div>"; 
 	}
-
-	echo '<b>'.get_lang("Tools").':</b>';
+	echo '<div class="actions-message" style="margin-bottom:4px;"><b>'.get_lang("Tools").':</b></div>';
 	if (!empty($tools))
 	{
-		echo '<blockquote>'.$tools.'</blockquote>';
+		echo '<div style="margin-left:5px;">'.$tools.'</div>';
 	}
 
 } else {
@@ -268,12 +267,12 @@ if (api_is_allowed_to_edit(false,true) OR GroupManager :: is_user_in_group($_SES
 		$tools .= "<a href=\"../wiki/index.php?".api_get_cidreq()."&amp;toolgroup=".$current_group['id']."\">".Display::return_icon('wiki.gif', get_lang('GroupWiki'))."&nbsp;".get_lang('GroupWiki')."</a><br/>";
 	}
 		
-	
-	echo '<b>'.get_lang("Tools").':</b>';
-	if (!empty($tools))
-	{
-		echo '<blockquote>'.$tools.'</blockquote>';
-	}
+	echo '<br/>';
+		
+	echo '<div class="actions-message" style="margin-bottom:4px;"><b>'.get_lang("Tools").':</b></div>';
+	if (!empty($tools)) {
+		echo '<div style="margin-left:5px;">'.$tools.'</div>';
+	}	
 }
 
 /*
@@ -297,14 +296,12 @@ else
 		$tutor_info .= "<div style='margin-bottom: 5px;'><a href='../user/userInfo.php?origin=".$my_origin."&amp;uInfo=".$tutor['user_id']."'>".$photo."&nbsp;".$tutor['firstname']." ".$tutor['lastname']."</a></div>";
 	}
 }
-echo '<b>'.get_lang("GroupTutors").':</b>';
-if (!empty($tutor_info))
-{
-	echo '<blockquote>'.$tutor_info.'</blockquote>';
-}
-
-
 
+echo '<div class="actions-message" style="margin-bottom:4px;"><b>'.get_lang("GroupTutors").':</b></div>';
+if (!empty($tutor_info)) {
+	echo '<div style="margin-left:5px;">'.$tutor_info.'</div>';
+}
+echo '<br/>';
 
 /*
  * list all the members of the current group

+ 5 - 1
main/inc/lib/groupmanager.lib.php

@@ -170,8 +170,12 @@ class GroupManager
 		else if(!empty($session_condition))
 			$sql .= 'WHERE '.$session_condition;
 		$sql .= " GROUP BY `g`.`id` ORDER BY UPPER(g.name)";
+		if (!api_is_anonymous()) {
+			$groupList = api_sql_query($sql,__FILE__,__LINE__);
+		} else {
+			return array();
+		}
 
-		$groupList = api_sql_query($sql,__FILE__,__LINE__);
 		$groups = array ();
 		while ($thisGroup = Database::fetch_array($groupList))
 		{