[svn r19694] FS#4008 - Removing the extra-comments. Visual compacting the code for all introduction settings.

skala
Ivan Tcholakov 17 years ago
parent 508d22fdbb
commit b5d160a14d
  1. 10
      main/announcements/announcements.php
  2. 6
      main/blog/blog.php
  3. 9
      main/calendar/agenda.php
  4. 10
      main/course_description/index.php
  5. 8
      main/course_home/course_home.php
  6. 7
      main/document/document.php
  7. 7
      main/dropbox/index.php
  8. 7
      main/exercice/exercice.php
  9. 7
      main/exercice/export/exercise_import.php
  10. 7
      main/forum/forumsearch.php
  11. 7
      main/forum/index.php
  12. 8
      main/glossary/index.php
  13. 7
      main/gradebook/index.php
  14. 9
      main/group/group.php
  15. 7
      main/group/group_space.php
  16. 11
      main/inc/lib/search/search_widget.php
  17. 8
      main/link/link.php
  18. 6
      main/newscorm/document.php
  19. 6
      main/newscorm/lp_list.php
  20. 11
      main/notebook/index.php
  21. 11
      main/survey/survey_list.php
  22. 11
      main/user/user.php
  23. 8
      main/wiki/index.php
  24. 11
      main/work/work.php

@ -1,4 +1,4 @@
<?php //$Id: announcements.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php //$Id: announcements.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -847,24 +847,22 @@ if($_REQUEST['publish_survey'])
}
/*====================================================
Tool Title
Tool introduction
====================================================*/
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
if (empty($_GET['origin']) || $_GET['origin'] !== 'learnpath')
{
//api_display_tool_title($nameTools);
Display::display_introduction_section(TOOL_ANNOUNCEMENT);
}
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*
==============================================================================
MAIN SECTION

@ -239,6 +239,7 @@ switch ($current_page)
$nameTools = Blog :: get_blog_title($blog_id);
Display :: display_header($nameTools, 'Blogs');
}
/*
-----------------------------------------------------------
Introduction section
@ -254,14 +255,11 @@ echo '<div class=actions>';
<?php
echo '</div>';
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_BLOG);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
//Display::display_header($nameTools,'Blogs');

@ -1,4 +1,4 @@
<?php //$Id: agenda.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php //$Id: agenda.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -232,16 +232,11 @@ $is_allowed_to_edit = api_is_allowed_to_edit(false,true) OR (api_get_course_sett
// Displaying the title of the tool
//api_display_tool_title($nameTools);
// tool introduction
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_CALENDAR_EVENT);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// insert an anchor (top) so one can jump back to the top of the page

@ -1,4 +1,4 @@
<?php // $Id: index.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php // $Id: index.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
@ -81,22 +81,20 @@ Display :: display_header('');
*/
$nameTools = get_lang(TOOL_COURSE_DESCRIPTION);
/*
-----------------------------------------------------------
Introduction section
-----------------------------------------------------------
*/
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_COURSE_DESCRIPTION);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// These settings are for the other instances of the online editor.
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'CourseDescription';

@ -1,4 +1,4 @@
<?php // $Id: course_home.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php // $Id: course_home.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
@ -172,15 +172,13 @@ $reqdate="&reqdate=$temps";
*/
//display course title for course home page (similar to toolname for tool pages)
//echo '<h3>'.api_display_tool_title($nameTools) . '</h3>';
/*
-----------------------------------------------------------
Introduction section
(editable by course admins)
-----------------------------------------------------------
*/
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
@ -188,9 +186,7 @@ $fck_attribute['ToolbarSet'] = 'Introduction';
$fck_attribute['Config']['CreateDocumentWebDir'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/document/';
$fck_attribute['Config']['CreateDocumentDir'] = 'document/';
$fck_attribute['Config']['BaseHref'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/';
Display::display_introduction_section(TOOL_COURSE_HOMEPAGE);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*

@ -1,4 +1,4 @@
<?php // $Id: document.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php // $Id: document.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -348,13 +348,9 @@ if($to_group_id !=0) //add group name after for group documents
(editable by course admins)
-----------------------------------------------------------
*/
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
if(!empty($_SESSION['_gid']))
{
Display::display_introduction_section(TOOL_DOCUMENT.$_SESSION['_gid'],'left');
@ -363,7 +359,6 @@ else
{
Display::display_introduction_section(TOOL_DOCUMENT,'left');
}
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*============================================================================*/

@ -120,16 +120,11 @@ $dropbox_unid = md5( uniqid( rand( ), true));
==============================================================================
*/
// introduction section
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_DROPBOX,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*

@ -1,4 +1,4 @@
<?php // $Id: exercice.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php // $Id: exercice.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
@ -388,14 +388,11 @@ include_once(api_get_path(LIBRARY_PATH).'events.lib.inc.php');
event_access_tool(TOOL_QUIZ);
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_QUIZ);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// selects $limitExPage exercises at the same time

@ -100,8 +100,8 @@ include api_get_path(INCLUDE_PATH) . '/header.inc.php';
//display title
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
@ -109,11 +109,10 @@ $fck_attribute['ToolbarSet'] = 'Introduction';
$fck_attribute['Config']['CreateDocumentWebDir'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/document/';
$fck_attribute['Config']['CreateDocumentDir'] = '../../../courses/'.api_get_course_path().'/document/';
$fck_attribute['Config']['BaseHref'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/';
Display::display_introduction_section(TOOL_QUIZ);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
//Display Forms or dialog box(if needed)
if ( isset($dialogBox) ) echo Display::display_normal_message($dialogBox,false);

@ -105,16 +105,11 @@ if ($origin=='learnpath') {
// Display the tool title
api_display_tool_title($nameTools);
// tool introduction
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_FORUM,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// tracking

@ -131,16 +131,11 @@ Display :: display_header('');
api_display_tool_title($nameTools);
//echo '<link href="forumstyles.css" rel="stylesheet" type="text/css" />';
// tool introduction
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_FORUM,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
$form_count=0;

@ -34,20 +34,14 @@ event_access_tool(TOOL_GLOSSARY);
// displaying the header
Display::display_header(get_lang(ucfirst($tool)));
// tool introduction
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_GLOSSARY,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// Glossary FckEditor setting
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '400';
$fck_attribute['ToolbarSet'] = 'Glossary';

@ -71,8 +71,6 @@ if (isset($_GET['isStudentView'])) {
if ( (isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['studentview']) && $_SESSION['studentview']=='studentview') ) {
Display :: display_header(get_lang('Details'));
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
//Introduction tool: student view
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
@ -98,8 +96,6 @@ if ( (isset($_GET['selectcat']) && $_GET['selectcat']>0) && (isset($_SESSION['st
// if ( !isset($_GET['selectcat']) && ($_SESSION['studentview']=='studentview') && ($status<>1 && !api_is_platform_admin()) || (isset($_GET['isStudentView']) && $_GET['isStudentView']=='true' && $status<>1 && !api_is_platform_admin()) ) {
Display :: display_header(get_lang('Gradebook'));
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
//Introduction tool: student view
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
@ -750,8 +746,7 @@ if (api_is_platform_admin() || api_is_allowed_to_create_course() || $status==1)
-----------------------------------------------------------
*/
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Gradebook';

@ -1,4 +1,4 @@
<?php // $Id: group.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php // $Id: group.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
@ -87,16 +87,11 @@ if (!isset ($_GET['origin']) || $_GET['origin'] != 'learnpath')
}
Display::display_header(get_lang('Groups'));
// introduction section
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_GROUP,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*

@ -1,4 +1,4 @@
<?php //$Id: group_space.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php //$Id: group_space.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -97,15 +97,10 @@ Display::display_header($nameTools,"Group");
(editable by course admin)
-----------------------------------------------------------
*/
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(group_space_.$_SESSION['_gid']);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*

@ -314,11 +314,9 @@ function search_widget_show($action='index.php') {
echo '<h2>'.get_lang('Search').'</h2>';
// introduction section
// The settings here for the online editor are needed and they are specific for the introduction section.
// You may test and modify them, but please, don't delete them.
$fck_attribute['Width'] = '100%';
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
// TODO: Settings for the FCKEditor to be checked (insert an image for example). Probably this is a special case here.
@ -329,7 +327,8 @@ function search_widget_show($action='index.php') {
Display::display_introduction_section(TOOL_SEARCH,'left');
}
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
$op = 'or';
if (!empty($_REQUEST['operator']) && in_array($op,array('or','and'))) {
$op = $_REQUEST['operator'];

@ -1,4 +1,4 @@
<?php // $Id: link.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php // $Id: link.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -182,17 +182,13 @@ if(isset($_GET['action']))
Introduction section
-----------------------------------------------------------
*/
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_LINK,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
if (is_allowed_to_edit() and isset($_GET['action']))
{
// Displaying the correct title and the form for adding a category or link. This is only shown when nothing

@ -192,9 +192,6 @@ api_display_tool_title($nameTools);
(editable by course admins)
-----------------------------------------------------------
*/
// The settings here for the online editor are needed and they are specific for the introduction section.
// You may ajust them if it is needed, but please, don't delete them.
//TODO: check see if we need, it seems not working here
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '400';
@ -204,15 +201,14 @@ $fck_attribute['Config']['InDocument'] = false;
$fck_attribute['Config']['CreateDocumentWebDir'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/document/';
$fck_attribute['Config']['CreateDocumentDir'] = '../../courses/'.api_get_course_path().'/document/';
$fck_attribute['Config']['BaseHref'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/';
if($my_version=='1.8'){
Display::display_introduction_section(TOOL_LEARNPATH);
}else{
api_introductionsection(TOOL_LEARNPATH);
}
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
if(api_is_allowed_to_edit())
{
/*--------------------------------------

@ -87,9 +87,6 @@ Display::display_header($nameTools,"Path");
(editable by course admins)
-----------------------------------------------------------
*/
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
@ -97,11 +94,10 @@ $fck_attribute['ToolbarSet'] = 'Introduction';
$fck_attribute['Config']['CreateDocumentWebDir'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/document/';
$fck_attribute['Config']['CreateDocumentDir'] = '../../courses/'.api_get_course_path().'/document/';
$fck_attribute['Config']['BaseHref'] = api_get_path('WEB_COURSE_PATH').api_get_course_path().'/';
Display::display_introduction_section(TOOL_LEARNPATH);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
if(api_is_allowed_to_edit())
{

@ -37,24 +37,17 @@ event_access_tool(TOOL_NOTEBOOK);
// displaying the header
Display::display_header(get_lang(ucfirst($tool)));
// tool introduction
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_NOTEBOOK,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// config notebook FckEditor buttons bar
// Config notebook FckEditor buttons bar
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '400';
if(!api_is_allowed_to_edit())
{
$fck_attribute['Config']['UserStatus'] = 'student';

@ -1,4 +1,4 @@
<?php // $Id: survey_list.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php // $Id: survey_list.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -27,7 +27,7 @@
* @author unknown, the initial survey that did not make it in 1.8 because of bad code
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University: cleanup, refactoring and rewriting large parts of the code
* @author Julio Montoya Armas <gugli100@gmail.com>, Dokeos: Personality Test modification and rewriting large parts of the code
* @version $Id: survey_list.php 19693 2009-04-09 19:55:28Z ivantcholakov $
* @version $Id: survey_list.php 19694 2009-04-09 21:45:33Z ivantcholakov $
*
* @todo use quickforms for the forms
*/
@ -79,16 +79,11 @@ else
Display :: display_header($tool_name,'Survey');
//api_display_tool_title($tool_name);
// introduction section
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section('survey', 'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
// Action handling: searching

@ -1,4 +1,4 @@
<?php // $Id: user.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php // $Id: user.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/*
==============================================================================
Dokeos - elearning and course management software
@ -325,19 +325,14 @@ event_access_tool(TOOL_USER);
$is_allowed_to_track = ($is_courseAdmin || $is_courseTutor) && $_configuration['tracking_enabled'];
// introduction section
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_USER, 'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
if ( api_is_allowed_to_edit()) {
echo "<div class=\"actions\">";

@ -165,16 +165,11 @@ MAIN CODE
==============================================================================
*/
// introduction section
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display::display_introduction_section(TOOL_WIKI);
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*
@ -185,7 +180,6 @@ Wiki configuration settings
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '400';
if(!api_is_allowed_to_edit())
{
$fck_attribute['Config']['UserStatus'] = 'student';

@ -1,4 +1,4 @@
<?php //$Id: work.php 19693 2009-04-09 19:55:28Z ivantcholakov $
<?php //$Id: work.php 19694 2009-04-09 21:45:33Z ivantcholakov $
/* For licensing terms, see /dokeos_license.txt */
/**
* @package dokeos.work
@ -6,7 +6,7 @@
* @author Patrick Cool <patrick.cool@UGent.be>, Ghent University - ability for course admins to specify wether uploaded documents are visible or invisible by default.
* @author Roan Embrechts, code refactoring and virtual course support
* @author Frederic Vauthier, directories management
* @version $Id: work.php 19693 2009-04-09 19:55:28Z ivantcholakov $
* @version $Id: work.php 19694 2009-04-09 21:45:33Z ivantcholakov $
*
* @todo refactor more code into functions, use quickforms, coding standards, ...
*/
@ -380,16 +380,11 @@ if (!empty ($_POST['changeProperties'])) {
$uploadvisibledisabled = $row["show_score"];
}
// introduction section
// The settings here for the online editor are needed and they are specific for the introduction section.
// Please, preserve them.
// Tool introduction
$fck_attribute['Width'] = '100%';
$fck_attribute['Height'] = '300';
$fck_attribute['ToolbarSet'] = 'Introduction';
Display :: display_introduction_section(TOOL_STUDENTPUBLICATION,'left');
$fck_attribute = null; // Clearing this global variable immediatelly after it has been used.
/*

Loading…
Cancel
Save