Browse Source

[svn r16728] first part of css cleanup (currently only the css/corporate style)

Patrick Cool 16 years ago
parent
commit
a7da177703

+ 9 - 11
main/forum/editpost.php

@@ -1,10 +1,13 @@
-<?php
+<?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
+ 
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2006-2008 Dokeos S.A.
-	Copyright (c) 2006 Ghent University (UGent)
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -16,7 +19,7 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, 44 rue des palais, B-1030 Brussels, Belgium
+	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
 	Mail: info@dokeos.com
 ==============================================================================
 */
@@ -186,7 +189,7 @@ if (!api_is_allowed_to_edit() AND $current_forum['allow_edit']==0)
 */
 echo "<table class=\"data_table\" width='100%'>\n";
 // the forum category
-echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"2\">";
+echo "\t<tr>\n\t\t<th align=\"left\" colspan=\"2\">";
 echo '<a href="viewforum.php?forum='.$current_forum['forum_id'].'" '.class_visible_invisible($current_forum['visibility']).'>'.prepare4display($current_forum['forum_title']).'</a><br />';
 echo '<span class="forum_description">'.prepare4display($current_forum['forum_comment']).'</span>';echo "</th>\n";
 echo "</th>\n";
@@ -212,11 +215,6 @@ if (!empty($values) and $_POST['SubmitPost'])
 	
 }
 
-/*
-==============================================================================
-		FOOTER
-==============================================================================
-*/
-
+// footer
 Display :: display_footer();
 ?>

File diff suppressed because it is too large
+ 3409 - 3407
main/forum/forumfunction.inc.php


+ 91 - 88
main/forum/forumsearch.php

@@ -1,89 +1,92 @@
-<?php //$id: $
-/*
-==============================================================================
-	Dokeos - elearning and course management software
-
-	Copyright (c) 2008 Dokeos S.A.
-	Copyright (c) 2008 Ghent University (UGent)
-
-	For a full list of contributors, see "credits.txt".
-	The full license can be read in "license.txt".
-
-	This program is free software; you can redistribute it and/or
-	modify it under the terms of the GNU General Public License
-	as published by the Free Software Foundation; either version 2
-	of the License, or (at your option) any later version.
-
-	See the GNU General Public License for more details.
-
-	Contact address: Dokeos, Rue du Corbeau, 108, B-1030 Brussels, Belgium
-	Mail: info@dokeos.com
-==============================================================================
-*/
-
-/**
-*	These files are a complete rework of the forum. The database structure is
-*	based on phpBB but all the code is rewritten. A lot of new functionalities
-*	are added:
-* 	- forum categories and forums can be sorted up or down, locked or made invisible
-*	- consistent and integrated forum administration
-* 	- forum options: 	are students allowed to edit their post?
-* 						moderation of posts (approval)
-* 						reply only forums (students cannot create new threads)
-* 						multiple forums per group
-*	- sticky messages
-* 	- new view option: nested view
-* 	- quoting a message
-*
-*	@Author Patrick Cool <patrick.cool@UGent.be>, Ghent University
-*	@Copyright Ghent University
-*	@Copyright Patrick Cool
-*
-* 	@package dokeos.forum
-*/
-
-// name of the language file that needs to be included
-$language_file = 'forum';
-
-// including the global dokeos file
-require ('../inc/global.inc.php');
-
-// the section (tabs)
-$this_section=SECTION_COURSES;
-
-// notice for unauthorized people.
-api_protect_course_script(true);
-
-// including additional library scripts
-require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
-include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
-include(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
-include('forumfunction.inc.php');
-include('forumconfig.inc.php');
-
-
-// name of the tool
-$nameTools=get_lang('Forum');
-
-// breadcrumbs
-$interbreadcrumb[]=array('url' => 'index.php','name' => $nameTools);
-$interbreadcrumb[]=array('url' => 'forumsearch.php','name' => get_lang('ForumSearch'));
-
-// Display the header
-Display :: display_header($nameTools);
-
-// Display the tool title
-api_display_tool_title($nameTools);
-
-// tool introduction
-Display::display_introduction_section(TOOL_FORUM);
-
-// tracking
-event_access_tool(TOOL_FORUM);
-
-// forum search
-forum_search();
-
-// footer
-Display::display_footer();
+<?php  // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
+ 
+/*
+==============================================================================
+	Dokeos - elearning and course management software
+
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
+
+	For a full list of contributors, see "credits.txt".
+	The full license can be read in "license.txt".
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	See the GNU General Public License for more details.
+
+	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
+	Mail: info@dokeos.com
+==============================================================================
+*/
+
+/**
+*	These files are a complete rework of the forum. The database structure is
+*	based on phpBB but all the code is rewritten. A lot of new functionalities
+*	are added:
+* 	- forum categories and forums can be sorted up or down, locked or made invisible
+*	- consistent and integrated forum administration
+* 	- forum options: 	are students allowed to edit their post?
+* 						moderation of posts (approval)
+* 						reply only forums (students cannot create new threads)
+* 						multiple forums per group
+*	- sticky messages
+* 	- new view option: nested view
+* 	- quoting a message
+*
+*	@Author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+*	@Copyright Ghent University
+*	@Copyright Patrick Cool
+*
+* 	@package dokeos.forum
+*/
+
+// name of the language file that needs to be included
+$language_file = 'forum';
+
+// including the global dokeos file
+require ('../inc/global.inc.php');
+
+// the section (tabs)
+$this_section=SECTION_COURSES;
+
+// notice for unauthorized people.
+api_protect_course_script(true);
+
+// including additional library scripts
+require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
+include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php');
+include(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
+include('forumfunction.inc.php');
+include('forumconfig.inc.php');
+
+
+// name of the tool
+$nameTools=get_lang('Forum');
+
+// breadcrumbs
+$interbreadcrumb[]=array('url' => 'index.php','name' => $nameTools);
+$interbreadcrumb[]=array('url' => 'forumsearch.php','name' => get_lang('ForumSearch'));
+
+// Display the header
+Display :: display_header($nameTools);
+
+// Display the tool title
+api_display_tool_title($nameTools);
+
+// tool introduction
+Display::display_introduction_section(TOOL_FORUM,'left');
+
+// tracking
+event_access_tool(TOOL_FORUM);
+
+// forum search
+forum_search();
+
+// footer
+Display::display_footer();
 ?>

+ 14 - 7
main/forum/index.php

@@ -1,10 +1,13 @@
-<?php
+<?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
+ 
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2006 Dokeos SPRL
-	Copyright (c) 2006 Ghent University (UGent)
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -16,7 +19,7 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, 108, rue du Corbeau, B-1030 Brussels, Belgium
+	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
 	Mail: info@dokeos.com
 ==============================================================================
 */
@@ -110,7 +113,9 @@ api_display_tool_title($nameTools);
 //echo '<link href="forumstyles.css" rel="stylesheet" type="text/css" />';
 
 // tool introduction
-Display::display_introduction_section(TOOL_FORUM);
+Display::display_introduction_section(TOOL_FORUM,'left');
+
+
 
 /*
 ------------------------------------------------------------------------------------------------------
@@ -180,6 +185,7 @@ if ($_GET['action']!='add' && $_GET['action']!='edit' ) {
 	------------------------------------------------------------------------------------------------------
 	*/
 	//if (api_is_allowed_to_edit() and !$_GET['action'])
+	echo '<div class="actions">';
 	echo '<span style="float:right;">'.search_link().'</span>';
 	if (api_is_allowed_to_edit(false,true)) {
 		echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&action=add&amp;content=forumcategory"> '.Display::return_icon('forum_category_new.gif').' '.get_lang('AddForumCategory').'</a> ';
@@ -188,13 +194,14 @@ if ($_GET['action']!='add' && $_GET['action']!='edit' ) {
 		}
 		//echo ' | <a href="forum_migration.php">'.get_lang('MigrateForum').'</a>';
 	}
+	echo '</div>';
 	
 	/*
 	------------------------------------------------------------------------------------------------------
 		Display Forum Categories and the Forums in it
 	------------------------------------------------------------------------------------------------------
 	*/
-	echo '<table class="data_table" width="100%">'."\n";
+	echo '<table class="data_table">'."\n";
 	// Step 3: we display the forum_categories first
 	if(is_array($forum_categories_list)) {
 		foreach ($forum_categories_list as $forum_category_key => $forum_category) {
@@ -212,7 +219,7 @@ if ($_GET['action']!='add' && $_GET['action']!='edit' ) {
 			}			
 			echo "</th>\n";
 			
-			echo '<th style="padding: 5px; vertical-align: top;" align="center" >';
+			echo '<th style="vertical-align: top;" align="center" >';
 			if (api_is_allowed_to_edit(false,true) && !($forum_category['session_id']==0 && intval($_SESSION['id_session'])!=0)) {
 				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=edit&amp;content=forumcategory&amp;id=".prepare4display($forum_category['cat_id'])."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
 				echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&action=delete&amp;content=forumcategory&amp;id=".prepare4display($forum_category['cat_id'])."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeleteForumCategory"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";

+ 8 - 5
main/forum/newthread.php

@@ -1,10 +1,13 @@
-<?php
+<?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
+ 
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2006-2008 Dokeos SPRL
-	Copyright (c) 2006 Ghent University (UGent)
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -16,7 +19,7 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, 108 rue du Corbeau, B-1030 Brussels, Belgium
+	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
 	Mail: info@dokeos.com
 ==============================================================================
 */
@@ -176,7 +179,7 @@ handle_forum_and_forumcategories();
 echo "<table class=\"data_table\" width='100%'>\n";
 
 if ($origin != 'learnpath') {
-	echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\"  colspan=\"2\">";
+	echo "\t<tr>\n\t\t<th align=\"left\"  colspan=\"2\">";
 	
 	echo '<span class="forum_title">'.prepare4display($current_forum['forum_title']).'</span>';
 

+ 10 - 5
main/forum/viewforum.php

@@ -1,10 +1,13 @@
-<?php
+<?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
+ 
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2006-2008 Dokeos SPRL
-	Copyright (c) 2006 Ghent University (UGent)
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -242,6 +245,7 @@ if (!empty($message)) {
 	Action Links
 -----------------------------------------------------------
 */
+echo '<div class="actions">';
 echo '<span style="float:right;">'.search_link().'</span>';
 // The link should appear when
 // 1. the course admin is here
@@ -254,17 +258,18 @@ if (api_is_allowed_to_edit(false,true) OR ($current_forum['allow_new_threads']==
 		echo get_lang('ForumLocked');
 	}
 }
+echo '</div>';
 
 /*
 -----------------------------------------------------------
 					Display
 -----------------------------------------------------------
 */
-echo "<table class=\"data_table\" width='100%'>\n";
+echo "<table class=\"data_table\" >\n";
 
 // the current forum 
 if ($origin != 'learnpath') {
-	echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"7\">";	
+	echo "\t<tr>\n\t\t<th align=\"left\" colspan=\"7\">";	
 	echo '<span class="forum_title">'.prepare4display($current_forum['forum_title']).'</span>';
 		
 	if (!empty ($current_forum['forum_comment'])) {

+ 11 - 6
main/forum/viewforumcategory.php

@@ -1,10 +1,13 @@
-<?php
+<?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
+ 
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2006-2008 Dokeos SPRL
-	Copyright (c) 2006 Ghent University (UGent)
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -16,7 +19,7 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, 108 rue du Corbeau, B-1030 Brussels, Belgium
+	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
 	Mail: info@dokeos.com
 ==============================================================================
 */
@@ -162,11 +165,13 @@ if ($_GET['action']!='add') {
 		Action Links
 	-----------------------------------------------------------
 	*/
+	echo '<div class="actions">';
 	echo '<span style="float:right;">'.search_link().'</span>';
 	if (api_is_allowed_to_edit(false,true)) {
 		//echo '<a href="'.api_get_self().'?forumcategory='.$_GET['forumcategory'].'&amp;action=add&amp;content=forumcategory">'.get_lang('AddForumCategory').'</a> | ';
 		echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&forumcategory='.Security::remove_XSS($_GET['forumcategory']).'&amp;action=add&amp;content=forum">'.Display::return_icon('forum_new.gif').' '.get_lang('AddForum').'</a>';
 	}
+	echo '</div>';
 	
 	/*
 	-----------------------------------------------------------
@@ -175,12 +180,12 @@ if ($_GET['action']!='add') {
 	*/
 	echo "<table class=\"data_table\" width='100%'>\n";
 	
-	echo "\t<tr>\n\t\t<th style=\"padding-left:5px;\" align=\"left\" colspan=\"5\">";
+	echo "\t<tr>\n\t\t<th align=\"left\" colspan=\"5\">";
 	echo '<span class="forum_title">'.prepare4display($forum_category['cat_title']).'</span><br />';
 	echo '<span class="forum_description">'.prepare4display($forum_category['cat_comment']).'</span>';
 	echo "</th>\n";
 	if (api_is_allowed_to_edit(false,true) && !($forum_category['session_id']==0 && intval($_SESSION['id_session'])!=0)) {
-		echo '<th style="padding: 5px; vertical-align: top;" align="center" >';			
+		echo '<th style="vertical-align: top;" align="center" >';			
 		echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forumcategory=".Security::remove_XSS($_GET['forumcategory'])."&amp;action=edit&amp;content=forumcategory&amp;id=".$forum_category['cat_id']."\">".icon('../img/edit.gif',get_lang('Edit'))."</a>";
 		echo "<a href=\"".api_get_self()."?".api_get_cidreq()."&forumcategory=".Security::remove_XSS($_GET['forumcategory'])."&amp;action=delete&amp;content=forumcategory&amp;amp;id=".$forum_category['cat_id']."\" onclick=\"javascript:if(!confirm('".addslashes(htmlentities(get_lang("DeleteForumCategory"),ENT_QUOTES,$charset))."')) return false;\">".icon('../img/delete.gif',get_lang('Delete'))."</a>";
 		display_visible_invisible_icon('forumcategory', $forum_category['cat_id'], $forum_category['visibility'], array("forumcategory"=>$_GET['forumcategory']));

+ 12 - 6
main/forum/viewthread.php

@@ -1,10 +1,13 @@
-<?php
+<?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
+ 
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2006-2008 Dokeos SPRL
-	Copyright (c) 2006 Ghent University (UGent)
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -16,10 +19,11 @@
 
 	See the GNU General Public License for more details.
 
-	Contact address: Dokeos, 108 rue du Corbeau, B-1030 Brussels, Belgium
+	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
 	Mail: info@dokeos.com
 ==============================================================================
 */
+
 /**
 *	@Author Patrick Cool <patrick.cool@UGent.be>, Ghent University
 *	@Copyright Ghent University
@@ -150,6 +154,7 @@ if ($message<>'PostDeletedSpecial') {
 		Action Links
 	-----------------------------------------------------------
 	*/
+	echo '<div class="actions">';
 	echo '<div style="float:right;">';
 	$my_url = '<a href="viewthread.php?'.api_get_cidreq().'&amp;forum='.Security::remove_XSS($_GET['forum']).'&amp;thread='.Security::remove_XSS($_GET['thread']).'&amp;search='.Security::remove_XSS(urlencode($_GET['search']));
 	echo $my_url.'&amp;view=flat&origin='.$origin.'">'.get_lang('FlatView').'</a> | ';
@@ -176,8 +181,9 @@ if ($message<>'PostDeletedSpecial') {
 			}
 		}
 	}
-	// note: this is to prevent that some browsers display the links over the table (FF does it but Opera doesn't)
-	echo '&nbsp;';
+	echo '</div>&nbsp;';
+
+
 	/*
 	-----------------------------------------------------------
 		Display Forum Category and the Forum information

+ 16 - 21
main/group/group.php

@@ -1,13 +1,13 @@
-<?php
+<?php // $Id: group.php 16728 2008-11-12 15:49:54Z pcool $
+ 
 /*
-===============================================================================
+==============================================================================
 	Dokeos - elearning and course management software
 
 	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
 	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Roan Embrechts (Vrije Universiteit Brussel)
-	Copyright (c) Bart Mollet
+	Copyright (c) various contributors
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -20,9 +20,10 @@
 	See the GNU General Public License for more details.
 
 	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
-	
-===============================================================================
+	Mail: info@dokeos.com
+==============================================================================
 */
+
 /**
 ==============================================================================
 *	Main page for the group module.
@@ -86,13 +87,8 @@ if (!isset ($_GET['origin']) || $_GET['origin'] != 'learnpath')
 }
 Display::display_header(get_lang('Groups'));
 
-/*
------------------------------------------------------------
-	Introduction section
-	(editable by course admins)
------------------------------------------------------------
-*/
-Display::display_introduction_section(TOOL_GROUP);
+// introduction section
+Display::display_introduction_section(TOOL_GROUP,'left');
 
 /*
  * Self-registration and unregistration
@@ -182,32 +178,31 @@ if (api_is_allowed_to_edit(false,true))
 		}
 	}
 	// Show admin-panel
-	echo '<div id="actions">';
-	echo '<ul id="groupItems">';
+	echo '<div class="actions">';
 	if (get_setting('allow_group_categories') == 'true')
 	{
-		echo '<li><a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.get_lang('AddCategory').'</a>&nbsp;</li>';
+		echo Display::return_icon('folder_new.gif') . '<a href="group_category.php?'.api_get_cidreq().'&action=add_category">'.get_lang('AddCategory').'</a>&nbsp;';
 	}
 	else
 	{
 		//echo '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.Display::return_icon('edit_group.gif').'&nbsp;'.get_lang('PropModify').'</a>&nbsp;';
-		echo '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.get_lang('PropModify').'</a>&nbsp;';
+		echo Display::return_icon('settings.gif') . '<a href="group_category.php?'.api_get_cidreq().'&id=2">'.get_lang('PropModify').'</a>&nbsp;';
 	}
 	//echo '<a href="group_creation.php?'.api_get_cidreq().'">'.Display::return_icon('group_add_big.gif').'&nbsp;'.get_lang('NewGroupCreate').'</a>&nbsp;';
-	echo '<li><a href="group_creation.php?'.api_get_cidreq().'">'.get_lang('NewGroupCreate').'</a>&nbsp;</li>';
+	echo Display::return_icon('groupadd.gif') . '<a href="group_creation.php?'.api_get_cidreq().'">'.get_lang('NewGroupCreate').'</a>&nbsp;';
 	if( Database::count_rows(Database::get_course_table(TABLE_GROUP)) > 0)
 	{
 		//echo '<a href="group_overview.php?'.api_get_cidreq().'">'.Display::return_icon('group_view.gif').'&nbsp;'.get_lang('GroupOverview').'</a>&nbsp;';
-		echo '<li><a href="group_overview.php?'.api_get_cidreq().'">'.get_lang('GroupOverview').'</a>&nbsp;</li>';
+		echo Display::return_icon('group.gif') .'<a href="group_overview.php?'.api_get_cidreq().'">'.get_lang('GroupOverview').'</a>&nbsp;';
 	}
 }
 $group_cats = GroupManager :: get_categories();
 if (get_setting('allow_group_categories') == 'true' && count($group_cats) > 1)
 {
 	//echo '<p><a href="?'.api_get_cidreq().'&show_all=1">'.get_lang('ShowAll').'</a></p>';
-	echo '<li><a href="?'.api_get_cidreq().'&show_all=1">'.get_lang('ShowAll').'</a></li>';
+	echo '<a href="?'.api_get_cidreq().'&show_all=1">'.get_lang('ShowAll').'</a>';
 }
-echo '</ul>';
+echo '</div>';
 /*
  * List all categories
  */

+ 16 - 9
main/group/group_overview.php

@@ -1,13 +1,13 @@
-<?php
+<?php // $Id: group_overview.php 16728 2008-11-12 15:49:54Z pcool $
+ 
 /*
-===============================================================================
+==============================================================================
 	Dokeos - elearning and course management software
 
-	Copyright (c) 2004 Dokeos S.A.
+	Copyright (c) 2004-2008 Dokeos SPRL
 	Copyright (c) 2003 Ghent University (UGent)
 	Copyright (c) 2001 Universite catholique de Louvain (UCL)
-	Copyright (c) Roan Embrechts (Vrije Universiteit Brussel)
-	Copyright (c) Bart Mollet
+	Copyright (c) various contributors
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -19,9 +19,11 @@
 
 	See the GNU General Public License for more details.
 
-	Contact: Dokeos, 181 rue Royale, B-1000 Brussels, Belgium, info@dokeos.com
-===============================================================================
+	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
+	Mail: info@dokeos.com
+==============================================================================
 */
+
 /**
 ============================================================================== 
 *	Main page for the group module.
@@ -105,8 +107,13 @@ else
 {
 ?> <link rel="stylesheet" type="text/css" href="<?php echo api_get_path(WEB_CODE_PATH); ?>css/default.css" /> <?php
 }
-echo '<a href="group_overview.php?'.api_get_cidreq().'&action=export&type=csv">'.get_lang('ExportAsCSV').'</a>';
-echo ' | <a href="group_overview.php?'.api_get_cidreq().'&action=export&type=xls">'.get_lang('ExportAsXLS').'</a>';
+
+// action links
+echo '<div class="actions">';
+echo Display::return_icon('csv.gif').'<a href="group_overview.php?'.api_get_cidreq().'&action=export&type=csv">'.get_lang('ExportAsCSV').'</a> ';
+echo Display::return_icon('excel.gif').' <a href="group_overview.php?'.api_get_cidreq().'&action=export&type=xls">'.get_lang('ExportAsXLS').'</a>';
+echo '</div>';
+
 $categories = GroupManager::get_categories();
 foreach($categories as $index => $category)
 {

+ 80 - 74
main/inc/banner.inc.php

@@ -1,29 +1,51 @@
-<?php
+<?php // $Id: banner.inc.php 16728 2008-11-12 15:49:54Z pcool $
+ 
+/*
+==============================================================================
+	Dokeos - elearning and course management software
+
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
+
+	For a full list of contributors, see "credits.txt".
+	The full license can be read in "license.txt".
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	See the GNU General Public License for more details.
+
+	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
+	Mail: info@dokeos.com
+==============================================================================
+*/
 /**
 ==============================================================================
-*	This script contains the actual html code to display the "header"
+*	This script contains the actual html code to display the Dokeos header
 *	or "banner" on top of every Dokeos page.
 *
 *	@package dokeos.include
 ==============================================================================
 */
 ?>
-<div id="header">  <!-- header section start -->
-<div id="header1"> <!-- top of banner with institution name/hompage link -->
-<div id="top_corner"></div> 
-<div id="institution">
-<a href="<?php echo api_get_path(WEB_PATH);?>index.php" target="_top"><?php echo api_get_setting('siteName') ?></a>
-<?php
-$iurl = api_get_setting('InstitutionUrl');
-$iname = api_get_setting('Institution');
-if (!empty($iname))
-{
+<div id="header">
+	<div id="header1">
+		<div id="institution">
+			<a href="<?php echo api_get_path(WEB_PATH);?>index.php" target="_top"><?php echo api_get_setting('siteName') ?></a>
+			<?php
+			$iurl = api_get_setting('InstitutionUrl');
+			$iname = api_get_setting('Institution');
+			if (!empty($iname))
+			{
 	echo '-&nbsp;<a href="'.$iurl.'" target="_top">'.$iname.'</a>';
-}
-
-?>
-</div>
+			}
+			?>
 
+		</div>
 <?php
 /*
 -----------------------------------------------------------------------------
@@ -33,11 +55,9 @@ if (!empty($iname))
 if (!empty($_cid) and $_cid != -1 and isset($_course))
 {
 	//Put the name of the course in the header
-	?>
-	<div id="my_courses"><a href="<?php echo api_get_path(WEB_COURSE_PATH).$_course['path']; ?>/index.php" target="_top">
-	<?php
-
-	echo $_course['name']." ";
+	echo '
+		<div id="header1right">
+			<a href="'.api_get_path(WEB_COURSE_PATH).$_course['path'].'/index.php" target="_top">'.$_course['name'].' ';
 	if (api_get_setting("display_coursecode_in_courselist") == "true")
 	{
 		echo $_course['official_code'];
@@ -55,7 +75,9 @@ if (!empty($_cid) and $_cid != -1 and isset($_course))
 	{
 		echo stripslashes($_course['titular']);
 	}
-	echo "</a></div>";
+	echo '	</a>';
+	echo '
+		</div>';
 }
 elseif (isset ($nameTools) && $language_file != 'course_home')
 {
@@ -74,7 +96,7 @@ elseif (isset ($nameTools) && $language_file != 'course_home')
 	}
 }
 //not to let the header disappear if there's nothing on the left
- echo '<div class="clear">&nbsp;</div>';
+echo '		<div class="clear">&nbsp;</div>';
 
 /*
 -----------------------------------------------------------------------------
@@ -102,18 +124,20 @@ if (isset($_course['extLink']) && $_course['extLink']['name'] != "")
 	else
 		echo $_course['extLink']['name'];
 }
-echo "</div> <!-- end of #header1 -->";
+?>
 
+	</div>
 
-echo '<div id="header2">';
-echo '<div id="Header2Right">';
-echo '<ul>';
 
+	<div id="header2">
+		<div id="header2right">
+			<ul>
+<?php 
 if ((api_get_setting('showonline','world') == "true" AND !$_user['user_id']) OR (api_get_setting('showonline','users') == "true" AND $_user['user_id']) OR (api_get_setting('showonline','course') == "true" AND $_user['user_id'] AND $_cid))
 {
 	if(api_get_setting("use_session_mode") == "true" && isset($_user['user_id']) && api_is_coach())
 	{
-		echo "<li><a href='".api_get_path(WEB_PATH)."whoisonlinesession.php?id_coach=".$_user['user_id']."&referer=".urlencode($_SERVER['REQUEST_URI'])."' target='_top'>".get_lang('UsersConnectedToMySessions')."</a></li>";
+		echo '	<li><a href="'.api_get_path(WEB_PATH).'whoisonlinesession.php?id_coach='.$_user['user_id'].'&amp;referer='.urlencode($_SERVER['REQUEST_URI']).'" target="_top">'.get_lang('UsersConnectedToMySessions').'</a></li>';
 	}
 
 	$statistics_database = Database :: get_statistic_database();
@@ -127,12 +151,12 @@ if ((api_get_setting('showonline','world') == "true" AND !$_user['user_id']) OR
 	{
 		$number_online_in_course = 0;
 	}
-	echo "<li>".get_lang('UsersOnline').": ";
+	echo '				<li>'.get_lang('UsersOnline').': ';
 
 	// Display the who's online of the platform
 	if ((api_get_setting('showonline','world') == "true" AND !$_user['user_id']) OR (api_get_setting('showonline','users') == "true" AND $_user['user_id']))
 	{
-		echo "<a href='".api_get_path(WEB_PATH)."whoisonline.php' target='_top'>".$number."</a>";
+		echo '<a href="'.api_get_path(WEB_PATH).'whoisonline.php" target="_top">'.$number.'</a>';
 	}
 
 	// Display the who's online for the course
@@ -170,15 +194,10 @@ if ( api_is_allowed_to_edit() )
 ?>
 		</ul>
 	</div>
-<!-- link to campus home (not logged in)
-	<a href="<?php echo api_get_path(WEB_PATH); ?>index.php" target="_top"><?php echo api_get_setting('siteName'); ?></a>
- -->
-<?php
-//not to let the empty header disappear and ensure help pic is inside the header
-echo "<div class=\"clear\">&nbsp;</div>";
-?>
-</div> <!-- End of header 2-->
-<div id="header3">
+		<div class="clear">&nbsp;</div>
+	</div>
+	
+	<div id="header3">
 <?php
 /*
 -----------------------------------------------------------------------------
@@ -200,20 +219,14 @@ if ($_user['user_id'])
 	?>
 	 <!-- start user section line with name, my course, my profile, scorm info, etc -->
 
-	<form method="get" action="<?php echo api_get_path(WEB_PATH); ?>index.php" class="banner_links" target="_top">
-	<input type="hidden" name="logout" value="true"/>
-	<input type="hidden" name="uid" value="<?php echo $_user['user_id']; ?>"/>
 	 <ul id="logout">
-	 <li>
-	<input type="submit" name="submit" value="<?php echo get_lang("Logout").' '.$login; ?>"
-	onmouseover="this.style.textDecoration='underline'" onmouseout="this.style.textDecoration='none'"
-	class="logout" style="	height:20px;" />
-	 </li>
+				<li><a href="<?php echo api_get_path(WEB_PATH); ?>index.php?action=logout"><span><?php echo get_lang('Logout').' '.$login; ?></span></a></li>
 	 </ul>
-	</form>
 <?php
 }
-echo "<ul>\n";
+?>
+		<ul>
+<?php
 $navigation = array();
 
 $possible_tabs = get_tabs();
@@ -322,24 +335,17 @@ foreach($navigation as $section => $navigation_info)
 	{
 		$current = '';
 	}
-	echo '<li'.$current.'>';
-	echo '<a href="'.$navigation_info['url'].'" target="_top">'.$navigation_info['title'].'</a>';
-	echo '</li>';
-	echo "\n";
+	echo '			<li'.$current.'><a href="'.$navigation_info['url'].'" target="_top"><span>'.$navigation_info['title'].'</span></a></li>'."\n";
 }
 ?>
-</ul><!-- small hack to have it look good in opera -->&nbsp;
-</div> <!-- end of header3 (user) section -->
-<?php
-/*
------------------------------------------------------------------------------
-	BREADCRUMBS
------------------------------------------------------------------------------
-*/
-?>
-<div id="header4">
-<?php
-/*
+		</ul>
+		<div style="clear: both;" class="clear"> </div>
+	</div>
+	
+
+	<div id="header4">
+			<?php
+			/*
  * if the user is a coach he can see the users who are logged in its session
  */
 $navigation = array();
@@ -386,13 +392,14 @@ foreach($navigation as $index => $navigation_info)
 {
 	if(!empty($navigation_info['title']))
 	{
-		$final_navigation[$index] = '<a href="'.$navigation_info['url'].'" target="_top">'.$navigation_info['title'].'</a>';
+		$final_navigation[$index] = '<a href="'.$navigation_info['url'].'" class="breadcrumb breadcrumb'.$index.'" target="_top">'.$navigation_info['title'].'</a>';
 	}
 }
 echo implode(' &gt; ',$final_navigation);
 ?>
 
-</div><!-- end of header4 -->
+	</div>
+
 <?php
 if(api_get_setting('show_toolshortcuts')=='true')
 {
@@ -414,7 +421,7 @@ if (isset ($dokeos_database_connection))
 }
 ?>
 
-</div> <!-- end of the whole #header section -->
+</div>
 <div class="clear">&nbsp;</div>
 <?php
 //to mask the main div, set $header_hide_main_div to true in any script just before calling Display::display_header();
@@ -426,7 +433,7 @@ if(!empty($header_hide_main_div) && $header_hide_main_div===true)
 else
 {
 ?>
-<div id="main"> <!-- start of #main wrapper for #content and #menu divs -->
+<div id="main">
 <?php
 }
 /*
@@ -465,8 +472,8 @@ if(api_get_setting('show_navigation_menu') != 'false' && api_get_setting('show_n
 			{
  				if (isset($_cid) )
                	{
-					echo '<div id="centerwrap"> <!-- start of #centerwrap -->';
-					echo '<div id="center"> <!-- start of #center -->';
+					echo '<div id="centerwrap">';
+					echo '<div id="center">';
 				}
 			}
  		}
@@ -474,8 +481,8 @@ if(api_get_setting('show_navigation_menu') != 'false' && api_get_setting('show_n
  		{
 			if (isset($_cid) )
 			{
-				echo '<div id="centerwrap"> <!-- start of #centerwrap -->';
-				echo '<div id="center"> <!-- start of #center -->';
+				echo '<div id="centerwrap">';
+				echo '<div id="center">';
 			}
  		}
  	}
@@ -571,4 +578,3 @@ function get_tabs()
 	return $navigation;
 }
 ?>
-<!--   Begin Of script Output   -->

+ 26 - 3
main/inc/footer.inc.php

@@ -1,4 +1,29 @@
-<?php
+<?php // $Id: footer.inc.php 16728 2008-11-12 15:49:54Z pcool $
+ 
+/*
+==============================================================================
+	Dokeos - elearning and course management software
+
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
+
+	For a full list of contributors, see "credits.txt".
+	The full license can be read in "license.txt".
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	See the GNU General Public License for more details.
+
+	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
+	Mail: info@dokeos.com
+==============================================================================
+*/
+
 /**
 ==============================================================================
 *	This script displays the footer that is below (almost)
@@ -55,7 +80,5 @@ api_plugin('footer');
 
 </div> <!-- end of #footer -->
 
-</div> <!-- end of #outerframe opened in header.inc.php -->
-
 </body>
 </html>

+ 26 - 4
main/inc/header.inc.php

@@ -1,4 +1,29 @@
-<?php
+<?php // $Id: header.inc.php 16728 2008-11-12 15:49:54Z pcool $
+ 
+/*
+==============================================================================
+	Dokeos - elearning and course management software
+
+	Copyright (c) 2004-2008 Dokeos SPRL
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
+
+	For a full list of contributors, see "credits.txt".
+	The full license can be read in "license.txt".
+
+	This program is free software; you can redistribute it and/or
+	modify it under the terms of the GNU General Public License
+	as published by the Free Software Foundation; either version 2
+	of the License, or (at your option) any later version.
+
+	See the GNU General Public License for more details.
+
+	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
+	Mail: info@dokeos.com
+==============================================================================
+*/
+
 /**
 ==============================================================================
 *	This script displays the Dokeos header.
@@ -189,9 +214,6 @@ include(api_get_path(LIBRARY_PATH).'/javascript/email_links.lib.js.php');
 </ul>
 </div>
 		
-<!-- #outerframe container to control some general layout of all pages -->
-<div id="outerframe">
-
 <?php						
 //  Banner
 include(api_get_path(INCLUDE_PATH)."banner.inc.php");

+ 48 - 59
main/inc/lib/blog.lib.php

@@ -1,11 +1,13 @@
-<?php
-/**
-===============================================================================
-
+<?php // $Id: document.php 16494 2008-10-10 22:07:36Z yannoo $
+ 
+/*
+==============================================================================
 	Dokeos - elearning and course management software
 
 	Copyright (c) 2004-2008 Dokeos SPRL
-	Copyright (c) Keppens Toon
+	Copyright (c) 2003 Ghent University (UGent)
+	Copyright (c) 2001 Universite catholique de Louvain (UCL)
+	Copyright (c) various contributors
 
 	For a full list of contributors, see "credits.txt".
 	The full license can be read in "license.txt".
@@ -19,12 +21,7 @@
 
 	Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
 	Mail: info@dokeos.com
-
-===============================================================================
-
-	Functions in this API file:
-
-===============================================================================
+==============================================================================
 */
 
 /**
@@ -1307,7 +1304,7 @@ class Blog
 
 
 			echo '<form name="add_post" enctype="multipart/form-data"  method="post" action="blog.php?blog_id=' . $blog_id . '">
-				 <span class="blogpost_title">' . get_lang('NewPost') . '</span> 
+				 <div class="form_header">' . get_lang('NewPost') . '</div> 
 						<table width="100%" border="0" cellspacing="2" cellpadding="0">
 							<tr>
 						   <td width="80" valign="top">' . get_lang('Title') . ':&nbsp;&nbsp;</td>
@@ -1340,7 +1337,7 @@ class Blog
 									$oFCKeditor->Create() ;
 			echo '			 <br /></td>
 							</tr> 
-							<tr><td><b>'.get_lang('AddAnAttachment').'</b><br /><br /></td></tr>	
+							<tr><td><b>'.get_lang('AddAnAttachment').'</b></td></tr>	
 							<tr><td width="80" valign="top">' . ucwords(get_lang('FileName') ). ':&nbsp;&nbsp;</td>
 						    <td><input type="file" name="user_upload"/></td><br></tr>						    
 						    <tr><td width="80" valign="top">' . get_lang('FileComment'). ':&nbsp;&nbsp;</td>
@@ -1448,8 +1445,14 @@ class Blog
 			$counter = 0;
 			global $color2;
 
+			echo '<div class="actions">';
 			echo '<a href="' .api_get_self(). '?action=manage_tasks&amp;blog_id=' . $blog_id . '&amp;do=add"><img src="../img/blog.gif" border="0" align="middle" alt="scormbuilder" />' . get_lang('AddTasks') . '</a> ';
 			echo '<a href="' .api_get_self(). '?action=manage_tasks&amp;blog_id=' . $blog_id . '&amp;do=assign"><img src="../img/blog.gif" border="0" align="middle" alt="scormbuilder" />' . get_lang('AssignTasks') . '</a>';
+			?>
+				<a href="<?php echo api_get_self(); ?>?action=manage_rights&amp;blog_id=<?php echo $blog_id ?>" title="<?php echo get_lang('ManageRights') ?>"><?php echo get_lang('RightsManager') ?></a>
+			<?php	
+			echo '</div>';
+			
 			echo '<span class="blogpost_title">' . get_lang('TaskList') . '</span><br />';
 			echo "<table class=\"data_table\">";
 			echo	"<tr bgcolor=\"$color2\" align=\"center\" valign=\"top\">",
@@ -1578,11 +1581,8 @@ class Blog
 
 		// Display
 		echo '<form name="add_task" method="post" action="blog.php?action=manage_tasks&amp;blog_id=' . $blog_id . '">
-					<table width="100%" border="0" cellspacing="2" cellpadding="0" style="background-color: #f6f6f6; border: 1px solid #dddddd">
-					  <tr>
-					  	<td width="200"></td>
-					  	<td><b>' . get_lang('AddTask') . '</b><br /><br /></td>
-					  </tr>
+					<div class="form_header">' . get_lang('AddTask') . '</div>
+					<table width="100%" border="0" cellspacing="2">
 						<tr>
 					   <td align="right">' . get_lang('Title') . ':&nbsp;&nbsp;</td>
 					   <td><input name="task_name" type="text" size="70" /></td>
@@ -1596,19 +1596,19 @@ class Blog
 						echo "\t" . '<tr>' . "\n";
 							echo "\t\t" . '<td style="text-align:right; vertical-align:top;">Task management:&nbsp;&nbsp;</td>' . "\n";
 							echo "\t\t" . '<td>' . "\n";
-								echo "\t\t\t" . '<table cellspacing="0" style="border:1px solid #808080; border-collapse:collapse; width:446px;">';
-									echo "\t\t\t\t" . '<tr style="background:#E5EDF9;">' . "\n";
-										echo "\t\t\t\t\t" . '<th colspan="2" style="border:1px solid #808080; width:223px;">' . get_lang('ArticleManager') . '</th>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="border:1px solid #808080;" width:223px;>' . get_lang('CommentManager') . '</th>' . "\n";
+								echo "\t\t\t" . '<table class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
+									echo "\t\t\t\t" . '<tr>' . "\n";
+										echo "\t\t\t\t\t" . '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>' . "\n";
+										echo "\t\t\t\t\t" . '<th width:223px;>' . get_lang('CommentManager') . '</th>' . "\n";
 									echo "\t\t\t\t" . '</tr>' . "\n";
-									echo "\t\t\t\t" . '<tr style="background:#E5EDF9;">' . "\n";
-										echo "\t\t\t\t\t" . '<th style="border:1px solid #808080; width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="border:1px solid #808080; width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="border:1px solid #808080; width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>' . "\n";
+									echo "\t\t\t\t" . '<tr>' . "\n";
+										echo "\t\t\t\t\t" . '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>' . "\n";
+										echo "\t\t\t\t\t" . '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>' . "\n";
+										echo "\t\t\t\t\t" . '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>' . "\n";
 									echo "\t\t\t\t" . '</tr>' . "\n";
 									echo "\t\t\t\t" . '<tr>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="border:1px dotted #808080; text-align:center;"><input id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="border:1px dotted #808080; text-align:center;"><input id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>' . "\n";
+										echo "\t\t\t\t\t" . '<td style="text-align:center;"><input id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>' . "\n";
+										echo "\t\t\t\t\t" . '<td style="text-align:center;"><input id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>' . "\n";
 										echo "\t\t\t\t\t" . '<td style="border:1px dotted #808080; text-align:center;"><input id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>' . "\n";
 									echo "\t\t\t\t" . '</tr>' . "\n";
 								echo "\t\t\t" . '</table>' . "\n";
@@ -1656,11 +1656,8 @@ class Blog
 
 		// Display
 		echo '<form name="edit_task" method="post" action="blog.php?action=manage_tasks&amp;blog_id=' . $blog_id . '">
-					<table width="100%" border="0" cellspacing="2" cellpadding="0" style="background-color: #f6f6f6; border: 1px solid #dddddd">
-					  <tr>
-					  	<td width="200"></td>
-					  	<td><b>' . get_lang('EditTask') . '</b><br /><br /></td>
-					  </tr>
+					<div class="form_header">' . get_lang('EditTask') . '</div>
+					<table width="100%" border="0" cellspacing="2">
 						<tr>
 					   <td align="right">' . get_lang('Title') . ':&nbsp;&nbsp;</td>
 					   <td><input name="task_name" type="text" size="70" value="'.stripslashes($task['title']) . '" /></td>
@@ -1689,20 +1686,20 @@ class Blog
 						echo "\t" . '<tr>' . "\n";
 							echo "\t\t" . '<td style="text-align:right; vertical-align:top;">Task management:&nbsp;&nbsp;</td>' . "\n";
 							echo "\t\t" . '<td>' . "\n";
-								echo "\t\t\t" . '<table cellspacing="0" style="border:1px solid #808080; border-collapse:collapse; width:446px;">';
-									echo "\t\t\t\t" . '<tr style="background:#E5EDF9;">' . "\n";
-										echo "\t\t\t\t\t" . '<th colspan="2" style="border:1px solid #808080; width:223px;">' . get_lang('ArticleManager') . '</th>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="border:1px solid #808080;" width:223px;>' . get_lang('CommentManager') . '</th>' . "\n";
+								echo "\t\t\t" . '<table  class="data_table" cellspacing="0" style="border-collapse:collapse; width:446px;">';
+									echo "\t\t\t\t" . '<tr>' . "\n";
+										echo "\t\t\t\t\t" . '<th colspan="2" style="width:223px;">' . get_lang('ArticleManager') . '</th>' . "\n";
+										echo "\t\t\t\t\t" . '<th width:223px;>' . get_lang('CommentManager') . '</th>' . "\n";
 									echo "\t\t\t\t" . '</tr>' . "\n";
-									echo "\t\t\t\t" . '<tr style="background:#E5EDF9;">' . "\n";
-										echo "\t\t\t\t\t" . '<th style="border:1px solid #808080; width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="border:1px solid #808080; width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>' . "\n";
-										echo "\t\t\t\t\t" . '<th style="border:1px solid #808080; width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>' . "\n";
+									echo "\t\t\t\t" . '<tr>' . "\n";
+										echo "\t\t\t\t\t" . '<th style="width:111px;"><label for="articleDelete">' . get_lang('Delete') . '</label></th>' . "\n";
+										echo "\t\t\t\t\t" . '<th style="width:112px;"><label for="articleEdit">' . get_lang('Edit') . '</label></th>' . "\n";
+										echo "\t\t\t\t\t" . '<th style="width:223px;"><label for="commentsDelete">' . get_lang('Delete') . '</label></th>' . "\n";
 									echo "\t\t\t\t" . '</tr>' . "\n";
 									echo "\t\t\t\t" . '<tr>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="border:1px dotted #808080; text-align:center;"><input ' . ((in_array('article_delete', $arrPermissions)) ? 'checked ' : '') . 'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="border:1px dotted #808080; text-align:center;"><input ' . ((in_array('article_edit', $arrPermissions)) ? 'checked ' : '') . 'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>' . "\n";
-										echo "\t\t\t\t\t" . '<td style="border:1px dotted #808080; text-align:center;"><input ' . ((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '') . 'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>' . "\n";
+										echo "\t\t\t\t\t" . '<td style="text-align:center;"><input ' . ((in_array('article_delete', $arrPermissions)) ? 'checked ' : '') . 'id="articleDelete" name="chkArticleDelete" type="checkbox" /></td>' . "\n";
+										echo "\t\t\t\t\t" . '<td style="text-align:center;"><input ' . ((in_array('article_edit', $arrPermissions)) ? 'checked ' : '') . 'id="articleEdit" name="chkArticleEdit" type="checkbox" /></td>' . "\n";
+										echo "\t\t\t\t\t" . '<td style="text-align:center;"><input ' . ((in_array('article_comments_delete', $arrPermissions)) ? 'checked ' : '') . 'id="commentsDelete" name="chkCommentsDelete" type="checkbox" /></td>' . "\n";
 									echo "\t\t\t\t" . '</tr>' . "\n";
 								echo "\t\t\t" . '</table>' . "\n";
 							echo "\t\t" . '</td>' . "\n";
@@ -1790,11 +1787,8 @@ class Blog
 
 		// Display
 		echo '<form name="assign_task" method="post" action="blog.php?action=manage_tasks&amp;blog_id=' . $blog_id . '">
-					<table width="100%" border="0" cellspacing="2" cellpadding="0" style="background-color: #f6f6f6; border: 1px solid #dddddd">
-					  <tr>
-					  	<td width="200"></td>
-					  	<td><b>' . get_lang('AssignTask') . '</b><br /><br /></td>
-					  </tr>
+					<div class="form_header">' . get_lang('AssignTask') . '</div>
+					<table width="100%" border="0" cellspacing="2" cellpadding="0">
 						<tr>
 					   <td align="right">' . get_lang('SelectUser') . ':&nbsp;&nbsp;</td>
 					   <td>' . $select_user_list . '</td>
@@ -2429,13 +2423,8 @@ class Blog
 	function display_new_comment_form($blog_id, $post_id, $title)
 	{
 		echo '<form name="add_post" enctype="multipart/form-data" method="post" action="blog.php?action=view_post&amp;blog_id=' . $blog_id . '&amp;post_id=' . $post_id . '">
+				<div class="form_header">'.(isset($_GET['task_id']) ? get_lang('ExecuteThisTask') : get_lang('NewComment')) . '</div>
 					<table width="100%" border="0" cellspacing="2" cellpadding="0" class="new_comment">
-						<tr>
-							<td colspan="2">
-								<span class="blogpost_title">'.(isset($_GET['task_id']) ? get_lang('ExecuteThisTask') : get_lang('NewComment')) . '</span><br />
-			 					<a name="add_comment" />
-							</td>
-						</tr>
 						<tr>
 					   <td width="100" valign="top">' . get_lang('Title') . ':&nbsp;&nbsp;</td>
 					   <td><input name="comment_title" id="comment_title" type="text" size="60" value="Re: '.stripslashes($title) . '" /><br /><br /></td>
@@ -2595,11 +2584,11 @@ class Blog
 			}
 		}
 
-		echo 	'<table id="smallcalendar">',
+		echo 	'<table id="smallcalendar" class="data_table">',
 				"<tr id=\"title\">\n",
-				"<td width=\"10%\"><a href=\"", $backwardsURL, "\">&laquo;</a></td>\n",
-				"<td align=\"center\" width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</td>\n",
-				"<td width=\"10%\" align=\"right\"><a href=\"", $forewardsURL, "\">&raquo;</a></td>\n", "</tr>\n";
+				"<th width=\"10%\"><a href=\"", $backwardsURL, "\">&laquo;</a></th>\n",
+				"<th align=\"center\" width=\"80%\" colspan=\"5\">", $monthName, " ", $year, "</th>\n",
+				"<th width=\"10%\" align=\"right\"><a href=\"", $forewardsURL, "\">&raquo;</a></th>\n", "</tr>\n";
 
 		echo "<tr>\n";
 

Some files were not shown because too many files changed in this diff