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

skala
Patrick Cool 16 years ago
parent a7da177703
commit 39871851d4
  1. 47
      index.php
  2. 31
      user_portal.php

@ -1,26 +1,33 @@
<?php
<?php // $Id: index.php 16729 2008-11-12 15:53:07Z pcool $
/*
DOKEOS - elearning and course management software
==============================================================================
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".
For a full list of contributors, see documentation/credits.html
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.
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 "documentation/licence.html" more details.
See the GNU General Public License for more details.
Contact:
Dokeos
Rue du Corbeau, 108
B-1030 Brussels - Belgium
Contact: info@dokeos.com
Contact address: Dokeos, rue du Corbeau, 108, B-1030 Brussels, Belgium
Mail: info@dokeos.com
==============================================================================
*/
/**
* @package dokeos.main
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Refactoring
* @version $Id: index.php 16652 2008-10-31 21:37:21Z dperales $
* @version $Id: index.php 16729 2008-11-12 15:53:07Z pcool $
* @todo check the different @todos in this page and really do them
* @todo check if the news management works as expected
*/
@ -69,7 +76,7 @@ $this_section = SECTION_CAMPUS;
* this can be usefull when you are on an open course and you need to log in to edit something and you immediately want to check how anonymous users
* will see it.
*/
if (!empty($_GET['logout']))
if (isset($_GET['action']) && $_GET['action'] == 'logout')
{
logout();
}
@ -163,7 +170,7 @@ Display :: display_header('', 'dokeos');
MAIN CODE
==============================================================================
*/
echo '<div class="maincontent" id="content">';
echo '<div id="maincontent">';
// Plugins for loginpage_main AND campushomepage_main
if (!api_get_user_id())
@ -408,7 +415,7 @@ function display_anonymous_right_menu()
}
if(api_number_of_plugins('loginpage_menu') > 0)
{
echo '<div class="note" style="background: none">';
echo '<div class="note">';
api_plugin('loginpage_menu');
echo '</div>';
}
@ -434,7 +441,7 @@ function display_anonymous_right_menu()
if ($_user['user_id'] && api_number_of_plugins('campushomepage_menu') > 0)
{
echo '<div class="note" style="background: none">';
echo '<div class="note">';
api_plugin('campushomepage_menu');
echo '</div>';
}
@ -635,7 +642,7 @@ function display_anonymous_course_list()
$thereIsSubCat = false;
if (mysql_num_rows($resCats) > 0)
{
$htmlListCat = "<h4 style=\"margin-top: 0px;\">".get_lang("CatList")."</h4>"."<ul>";
$htmlListCat = "<h4>".get_lang("CatList")."</h4>"."<ul>";
while ($catLine = mysql_fetch_array($resCats))
{
if ($catLine['code'] != $category)
@ -715,7 +722,7 @@ function display_anonymous_course_list()
{
$courses_list_string .= "<hr size=\"1\" noshade=\"noshade\">\n";
}
$courses_list_string .= "<h4 style=\"margin-top: 0px;\">".get_lang("CourseList")."</h4>\n"."<ul>\n";
$courses_list_string .= "<h4>".get_lang("CourseList")."</h4>\n"."<ul>\n";
if (api_get_user_id())
{

@ -1,9 +1,10 @@
<?php // $Id: user_portal.php,v 1.10 2006/08/19 09:33:14 yannoo Exp $
/*
==============================================================================
Dokeos - elearning and course management software
Copyright (c) 2004-2005 Dokeos SPRL
Copyright (c) 2004-2008 Dokeos SPRL
Copyright (c) 2003 Ghent University (UGent)
Copyright (c) 2001 Universite catholique de Louvain (UCL)
Copyright (c) various contributors
@ -560,7 +561,8 @@ function get_logged_user_course_html($my_course)
if ((CONFVAL_showExtractInfo == SCRIPTVAL_InCourseList || CONFVAL_showExtractInfo == SCRIPTVAL_Both) && $nbDigestEntries > 0)
{
reset($digest);
$result .= '<ul>';
$result .= '
<ul>';
while (list ($key2) = each($digest[$thisCourseSysCode]))
{
$result .= '<li>';
@ -772,7 +774,7 @@ if ($maxCourse > 0)
}
echo '<div class="maincontent">'; // start of content for logged in users
echo ' <div id="maincontent">'; // start of content for logged in users
// Plugins for the my courses main area
api_plugin('mycourses_main');
@ -913,7 +915,8 @@ if ( is_array($list) ) {
if ( empty($value[2]) ) { //if out of any session
$userdefined_categories = get_user_course_categories();
echo "<ul>\n";
echo '
<ul class="courseslist">';
if ($old_user_category<>$value[0])
{
@ -921,12 +924,10 @@ if ( is_array($list) ) {
{
echo "\n</ul>";
}
echo "\n\n\t<ul class=\"user_course_category\">" .
"<li>".$userdefined_categories[$value[0]]."</li>" .
"</ul>\n";
echo "\n\n\t<ul class=\"user_course_category\"><li>".$userdefined_categories[$value[0]]."</li></ul>\n";
if ($key<>0 OR $value[0]<>0) // there are courses in the previous category
{
echo "<ul>";
echo "<ul class=\"courseslist\">";
}
$old_user_category=$value[0];
@ -948,8 +949,8 @@ if ( is_array($list) ) {
$old_user_category = 0;
$userdefined_categories = get_user_course_categories();
if ( count($listActives)>0 && $display_actives ) { //if it is worth showing a session section
echo '<ul class="sessions_list">', "\n";
if(count($listActives)>0 && $display_actives){
echo "<ul class=\"courseslist\">\n";
foreach ($listActives as $key => $value)
{
@ -1016,7 +1017,7 @@ api_session_register('status');
RIGHT MENU
==============================================================================
*/
echo '<div class="menu">';
echo ' <div class="menu">';
// tabs that are deactivated are added here
if (!empty($menu_navigation))
@ -1056,7 +1057,7 @@ echo '</div>';
// plugins for the my courses menu
if (isset($_plugins['mycourses_menu']) && is_array($_plugins['mycourses_menu'])){
echo '<div class="note" style="background: none">';
echo '<div class="note">';
api_plugin('mycourses_menu');
echo '</div>';
@ -1064,10 +1065,6 @@ if (isset($_plugins['mycourses_menu']) && is_array($_plugins['mycourses_menu']))
echo '</div>'; // end of menu
/*
==============================================================================
FOOTER
==============================================================================
*/
//footer
Display :: display_footer();
?>

Loading…
Cancel
Save