System news UI changes

main/css/chamilo/default.css

@@ -1636,7 +1636,6 @@ div.system_announcement {
 	font-weight: bold;
 	font-size: 120%;
 	float:left;	
-	
 }
 
 .system_announcement_date {

main/inc/lib/system_announcements.lib.php

@@ -22,8 +22,7 @@ class SystemAnnouncementManager
 		$user_selected_language = api_get_interface_language();
 		$db_table = Database :: get_main_table(TABLE_MAIN_SYSTEM_ANNOUNCEMENTS);
 		$sql = "SELECT *, DATE_FORMAT(date_start,'%d-%m-%Y') AS display_date FROM ".$db_table." WHERE (lang='$user_selected_language' OR lang IS NULL) AND ((NOW() BETWEEN date_start AND date_end) OR date_end='0000-00-00') ";
-		switch ($visible)
+		switch ($visible) {
-		{
 			case VISIBLE_GUEST :
 				$sql .= " AND visible_guest = 1 ";
 				break;
@@ -36,40 +35,32 @@ class SystemAnnouncementManager
 		}
 		$sql .= " ORDER BY date_start DESC LIMIT 0,7";
 		$announcements = Database::query($sql);
-		if (Database::num_rows($announcements))
+		if (Database::num_rows($announcements) > 0) {
-		{
 			$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
 			$query_string = ereg_replace('&$', '', $query_string);
 			$url = api_get_self();
 			echo '<div class="system_announcements">';
 			echo '<h3>'.get_lang('SystemAnnouncements').'</h3>';
 			echo '<table border="0">';
-			while ($announcement = Database::fetch_object($announcements))
+			while ($announcement = Database::fetch_object($announcements)) {
-			{
 
-				if ($id != $announcement->id)
+				if ($id != $announcement->id) {
-				{
+					if (strlen($query_string) > 0) {
-					if (strlen($query_string) > 0)
-					{
 						$show_url = 'news_list.php#'.$announcement->id;
 						//$show_url = $url.'?'.$query_string.'&announcement='.$announcement->id;
-					}
+					} else {
-					else
-					{
 						$show_url = 'news_list.php#'.$announcement->id;
 						//$show_url = $url.'?announcement='.$announcement->id;
 					}
 					echo '<tr class="system_announcement">
-							<td width="80px" valign="top" class="system_announcement_title">'
+							<td valign="top" class="system_announcement_title">
-								.$announcement->display_date.'
+								<a name="ann'.$announcement->id.'" href="'.$show_url.'">'.$announcement->title.'</a>
 							</td>
 							<td valign="top">
-								<a name="ann'.$announcement->id.'" href="'.$show_url.'">'.$announcement->title.'</a>
+								'.$announcement->display_date.'
 							</td>
 						</tr>';
-				}
+				} else {
-				else
-				{
 					echo '<div class="system_announcement">
 							<div class="system_announcement_title">'
 								.$announcement->display_date.'
@@ -84,7 +75,7 @@ class SystemAnnouncementManager
 
 			/*echo '<tr><td height="15px"></td></tr>';*/
 			echo '<tr><td colspan="2">';
-			echo '<a href="news_list.php">'.get_lang("More").'</a>';
+			echo '<a href="news_list.php">'.get_lang('More').'</a>';
 			echo '</td></tr>';
 			echo '</table>';
 			echo '</div>';
@@ -120,7 +111,7 @@ class SystemAnnouncementManager
 		}
 		$announcements = Database::query($sql);
 
-		if (Database::num_rows($announcements)) {
+		if (Database::num_rows($announcements) > 0) {
 			$query_string = ereg_replace('announcement=[1-9]+', '', $_SERVER['QUERY_STRING']);
 			$query_string = ereg_replace('&$', '', $query_string);
 			$url = api_get_self();
@@ -138,9 +129,7 @@ class SystemAnnouncementManager
 					echo '<tr><td>';
 					echo '<a name="'.$announcement->id.'"></a>
 							<div class="system_announcement">
-							<div class="system_announcement_title">'
+							<div class="system_announcement_title">'.$announcement->title.'</div><div class="system_announcement_date">'.$announcement->display_date.'</div>
-								.$announcement->display_date.' <strong>'.$announcement->title.'</strong>
-							</div>
 							<br />
 						  	<div class="system_announcement_content">'
 						  			.$announcement->content.'
@@ -160,7 +149,6 @@ class SystemAnnouncementManager
 			echo '</table>';
 			echo '</div>';
 		}		
-		return;
 	}
 
 	public static function display_fleche($user_id)

news_list.php

@@ -1,17 +1,14 @@
 <?php
-// @todo Add dokeos header here
+/* For licensing terms, see /license.txt */
-/*
- * Created on 30 mai 2006 by Elixir Interactive http://www.elixir-interactive.com
- */
 
 // name of the language file that needs to be included
 $language_file = array ('courses', 'index');
 
 // including necessary files
-include_once 'main/inc/global.inc.php';
+require_once 'main/inc/global.inc.php';
-include_once api_get_path(LIBRARY_PATH).'system_announcements.lib.php';
+require_once api_get_path(LIBRARY_PATH).'system_announcements.lib.php';
 
-$tool_name = get_lang("SystemAnnouncements");
+$tool_name = get_lang('SystemAnnouncements');
 Display::display_header($tool_name);
 
 $start = isset($_GET['start']) ? (int)$_GET['start'] : $start = 0;

user_portal.php

@@ -1,6 +1,6 @@
 <?php // $Id: user_portal.php 22375 2009-07-26 18:54:59Z herodoto $
 
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 ==============================================================================
 *	This is the index file displayed when a user is logged in on Dokeos.