From efebf62155c33e6a1fed5d6f8100f8d8e2e3b52b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Carlos=20Ra=C3=B1a?= Date: Mon, 9 Feb 2009 23:01:25 +0100 Subject: [PATCH] [svn r18386] configure forum button bar --- main/forum/editpost.php | 147 +++++++++++++------------ main/forum/forumsearch.php | 4 +- main/forum/iframe_thread.php | 7 +- main/forum/index.php | 9 +- main/forum/newthread.php | 14 ++- main/forum/reply.php | 9 +- main/forum/viewforumcategory.php | 9 +- main/inc/lib/fckeditor/myconfig.js | 29 ++++- main/inc/lib/fckeditor/myconfig_afm.js | 11 ++ 9 files changed, 151 insertions(+), 88 deletions(-) diff --git a/main/forum/editpost.php b/main/forum/editpost.php index 9e162c3b3b..7b911ac2bd 100644 --- a/main/forum/editpost.php +++ b/main/forum/editpost.php @@ -1,4 +1,4 @@ - - - function advanced_parameters() { - if(document.getElementById(\'id_qualify\').style.display == \'none\') { - document.getElementById(\'id_qualify\').style.display = \'block\'; - document.getElementById(\'img_plus_and_minus\').innerHTML=\'  '.get_lang('AdvancedParameters').'\'; - } else { - document.getElementById(\'id_qualify\').style.display = \'none\'; - document.getElementById(\'img_plus_and_minus\').innerHTML=\'  '.get_lang('AdvancedParameters').'\'; - } - } -'; + +// javascript +$htmlHeadXtra[] = ''; /* ============================================================================== MAIN DISPLAY SECTION ============================================================================== -*/ +*/ /* ----------------------------------------------------------- Retrieving forum and forum categorie information @@ -138,18 +143,18 @@ $current_post=get_post_information($_GET['post']); ----------------------------------------------------------- Header and Breadcrumbs ----------------------------------------------------------- -*/ - - -if (!empty($_SESSION['toolgroup'])) { - - $_clean['toolgroup']=(int)$_SESSION['toolgroup']; - $group_properties = GroupManager :: get_group_properties($_clean['toolgroup']); - $interbreadcrumb[] = array ("url" => "../group/group.php", "name" => get_lang('Groups')); - $interbreadcrumb[] = array ("url"=>"../group/group_space.php?gidReq=".$_SESSION['toolgroup'], "name"=> get_lang('GroupSpace').' ('.$group_properties['name'].')'); - $interbreadcrumb[] = array("url" => "viewforum.php?origin=".$origin."&gidReq=".$_SESSION['toolgroup']."&forum=".Security::remove_XSS($_GET['forum']),"name" => prepare4display($current_forum['forum_title'])); - $interbreadcrumb[] = array("url" => "#","name" => get_lang('EditPost')); - +*/ + + +if (!empty($_SESSION['toolgroup'])) { + + $_clean['toolgroup']=(int)$_SESSION['toolgroup']; + $group_properties = GroupManager :: get_group_properties($_clean['toolgroup']); + $interbreadcrumb[] = array ("url" => "../group/group.php", "name" => get_lang('Groups')); + $interbreadcrumb[] = array ("url"=>"../group/group_space.php?gidReq=".$_SESSION['toolgroup'], "name"=> get_lang('GroupSpace').' ('.$group_properties['name'].')'); + $interbreadcrumb[] = array("url" => "viewforum.php?origin=".$origin."&gidReq=".$_SESSION['toolgroup']."&forum=".Security::remove_XSS($_GET['forum']),"name" => prepare4display($current_forum['forum_title'])); + $interbreadcrumb[] = array("url" => "#","name" => get_lang('EditPost')); + } else { $interbreadcrumb[]=array("url" => "index.php","name" => $nameTools); $interbreadcrumb[]=array("url" => "viewforumcategory.php?forumcategory=".$current_forum_category['cat_id'],"name" => prepare4display($current_forum_category['cat_title'])); @@ -173,18 +178,18 @@ $table_link = Database :: get_main_table(TABLE_MAIN_GRADEBOOK_LINK); ----------------------------------------------------------- Header ----------------------------------------------------------- -*/ -//are we in a lp ? -$origin = ''; -if (isset($_GET['origin'])) { - $origin = Security::remove_XSS($_GET['origin']); -} - -if ($origin=='learnpath') { - include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php'); -} else { +*/ +//are we in a lp ? +$origin = ''; +if (isset($_GET['origin'])) { + $origin = Security::remove_XSS($_GET['origin']); +} + +if ($origin=='learnpath') { + include(api_get_path(INCLUDE_PATH).'reduced_header.inc.php'); +} else { Display :: display_header(null); - api_display_tool_title($nameTools); + api_display_tool_title($nameTools); } //echo ''; /* @@ -205,11 +210,11 @@ if (!api_is_allowed_to_edit() AND (($current_forum_category['visibility']==0 OR } if (!api_is_allowed_to_edit() AND ($current_forum_category['locked']<>0 OR $current_forum['locked']<>0 OR $current_thread['locked']<>0)) { forum_not_allowed_here(); -} +} if (!$_user['user_id'] AND $current_forum['allow_anonymous']==0) { - forum_not_allowed_here(); + forum_not_allowed_here(); } -if (!api_is_allowed_to_edit() AND $current_forum['allow_edit']==0) { +if (!api_is_allowed_to_edit() AND $current_forum['allow_edit']==0) { forum_not_allowed_here(); } @@ -229,28 +234,28 @@ echo ''; // the form for the reply $values=show_edit_post_form($current_post, $current_thread, $current_forum, isset($_SESSION['formelements'])?$_SESSION['formelements']:''); -if (!empty($values) and $_POST['SubmitPost']) { - store_edit_post($values); - - $option_chek=isset($values['thread_qualify_gradebook'])?$values['thread_qualify_gradebook']:null;// values 1 or 0 - if ( 1== $option_chek ) { - $id=$values['thread_id']; - $title_gradebook=$values['calification_notebook_title']; - $value_calification=$values['numeric_calification']; - $weight_calification=$values['weight_calification']; - $description=""; - $session_id=api_get_session_id(); - $link_id=is_resource_in_course_gradebook(api_get_course_id(),5,$id,$session_id); - if ( $link_id==false ) { - add_resource_to_course_gradebook(api_get_course_id(), 5, $id, $title_gradebook,$weight_calification,$value_calification,$description,time(),1,api_get_session_id()); - } else { - api_sql_query('UPDATE '.$table_link.' SET weight='.$weight_calification.' WHERE id='.$link_id.''); - } - - } - +if (!empty($values) and $_POST['SubmitPost']) { + store_edit_post($values); + + $option_chek=isset($values['thread_qualify_gradebook'])?$values['thread_qualify_gradebook']:null;// values 1 or 0 + if ( 1== $option_chek ) { + $id=$values['thread_id']; + $title_gradebook=$values['calification_notebook_title']; + $value_calification=$values['numeric_calification']; + $weight_calification=$values['weight_calification']; + $description=""; + $session_id=api_get_session_id(); + $link_id=is_resource_in_course_gradebook(api_get_course_id(),5,$id,$session_id); + if ( $link_id==false ) { + add_resource_to_course_gradebook(api_get_course_id(), 5, $id, $title_gradebook,$weight_calification,$value_calification,$description,time(),1,api_get_session_id()); + } else { + api_sql_query('UPDATE '.$table_link.' SET weight='.$weight_calification.' WHERE id='.$link_id.''); + } + + } + } // footer -if ($origin!='learnpath') { - Display :: display_footer(); +if ($origin!='learnpath') { + Display :: display_footer(); } \ No newline at end of file diff --git a/main/forum/forumsearch.php b/main/forum/forumsearch.php index 51adaa5fc7..783be736b4 100644 --- a/main/forum/forumsearch.php +++ b/main/forum/forumsearch.php @@ -108,8 +108,8 @@ api_display_tool_title($nameTools); // tool introduction $fck_attribute['Width'] = '100%'; -$fck_attribute['Height'] = '400'; -$fck_attribute['ToolbarSet'] = 'Full'; +$fck_attribute['Height'] = '300'; +$fck_attribute['ToolbarSet'] = 'Introduction'; Display::display_introduction_section(TOOL_FORUM,'left'); diff --git a/main/forum/iframe_thread.php b/main/forum/iframe_thread.php index 420c844986..c7213e09cf 100644 --- a/main/forum/iframe_thread.php +++ b/main/forum/iframe_thread.php @@ -76,11 +76,16 @@ include_once (api_get_path(LIBRARY_PATH).'groupmanager.lib.php'); $fck_attribute['Width'] = '100%'; $fck_attribute['Height'] = '400'; -$fck_attribute['ToolbarSet'] = 'Middle'; + $fck_attribute['Config']['IMUploadPath'] = 'upload/forum/'; $fck_attribute['Config']['FlashUploadPath'] = 'upload/forum/'; if (!api_is_allowed_to_edit(false,true)) { $fck_attribute['Config']['UserStatus'] = 'student'; + $fck_attribute['ToolbarSet'] = 'Forum_Student'; +} +else +{ + $fck_attribute['ToolbarSet'] = 'Forum'; } $nameTools=get_lang('Forum'); diff --git a/main/forum/index.php b/main/forum/index.php index 4acd088250..ce32f05288 100644 --- a/main/forum/index.php +++ b/main/forum/index.php @@ -88,8 +88,8 @@ require 'forumconfig.inc.php'; require_once 'forumfunction.inc.php'; $fck_attribute['Width'] = '100%'; -$fck_attribute['Height'] = '175'; -$fck_attribute['ToolbarSet'] = 'Middle'; +$fck_attribute['Height'] = '400'; + $fck_attribute['Config']['IMUploadPath'] = 'upload/forum/'; $fck_attribute['Config']['FlashUploadPath'] = 'upload/forum/'; $fck_attribute['Config']['InDocument'] = false; @@ -97,6 +97,11 @@ $fck_attribute['Config']['CreateDocumentDir'] = '../../courses/'.api_get_course_ if(!api_is_allowed_to_edit(false,true)) { $fck_attribute['Config']['UserStatus'] = 'student'; + $fck_attribute['ToolbarSet'] = 'Forum_Student'; +} +else +{ + $fck_attribute['ToolbarSet'] = 'Forum'; } /* diff --git a/main/forum/newthread.php b/main/forum/newthread.php index b86bd1b5c5..a42c9b67ab 100644 --- a/main/forum/newthread.php +++ b/main/forum/newthread.php @@ -50,7 +50,7 @@ $language_file = array('forum','document'); // including the global dokeos file require_once '../inc/global.inc.php'; -require_once '../gradebook/lib/gradebook_functions.inc.php'; +require_once '../gradebook/lib/gradebook_functions.inc.php'; // the section (tabs) $this_section=SECTION_COURSES; @@ -64,8 +64,8 @@ $nameTools=get_lang('Forum'); // configuration for FCKeditor $fck_attribute['Width'] = '100%'; -$fck_attribute['Height'] = '300'; -$fck_attribute['ToolbarSet'] = 'Middle'; +$fck_attribute['Height'] = '400'; + $fck_attribute['Config']['IMUploadPath'] = 'upload/forum/'; $fck_attribute['Config']['FlashUploadPath'] = 'upload/forum/'; @@ -75,7 +75,13 @@ $fck_attribute['Config']['CreateDocumentDir'] = '../../courses/'.api_get_course_ if(!api_is_allowed_to_edit(false,true)) { $fck_attribute['Config']['UserStatus'] = 'student'; + $fck_attribute['ToolbarSet'] = 'Forum_Student'; +} +else +{ + $fck_attribute['ToolbarSet'] = 'Forum'; } + /* ----------------------------------------------------------- Including necessary files @@ -183,7 +189,7 @@ if($origin=='learnpath') { // 4. anonymous posts are not allowed and the user is not logged in // I have split this is several pieces for clarity. -if (!api_is_allowed_to_edit(false,true) && (($current_forum_category['visibility']==0 || $current_forum['visibility']==0))) { +if (!api_is_allowed_to_edit(false,true) && (($current_forum_category['visibility']==0 || $current_forum['visibility']==0))) { forum_not_allowed_here(); } // 2. the forumcategory or forum is locked (locked <>0) and the user is not a course manager diff --git a/main/forum/reply.php b/main/forum/reply.php index 151438fd10..e80750f6cb 100644 --- a/main/forum/reply.php +++ b/main/forum/reply.php @@ -56,8 +56,8 @@ api_protect_course_script(true); // configuration for FCKeditor $fck_attribute['Width'] = '100%'; -$fck_attribute['Height'] = '300'; -$fck_attribute['ToolbarSet'] = 'Middle'; +$fck_attribute['Height'] = '400'; + $fck_attribute['Config']['IMUploadPath'] = 'upload/forum/'; $fck_attribute['Config']['FlashUploadPath'] = 'upload/forum/'; @@ -66,6 +66,11 @@ $fck_attribute['Config']['CreateDocumentDir'] = '../../courses/'.api_get_course_ if(!api_is_allowed_to_edit(false,true)) { $fck_attribute['Config']['UserStatus'] = 'student'; + $fck_attribute['ToolbarSet'] = 'Forum_Student'; +} +else +{ + $fck_attribute['ToolbarSet'] = 'Forum'; } // including additional library scripts diff --git a/main/forum/viewforumcategory.php b/main/forum/viewforumcategory.php index fb849e4a03..eabed049da 100644 --- a/main/forum/viewforumcategory.php +++ b/main/forum/viewforumcategory.php @@ -98,12 +98,17 @@ require_once 'forumfunction.inc.php'; */ $fck_attribute['Width'] = '100%'; -$fck_attribute['Height'] = '300'; -$fck_attribute['ToolbarSet'] = 'Middle'; +$fck_attribute['Height'] = '400'; + $fck_attribute['Config']['IMUploadPath'] = 'upload/forum/'; $fck_attribute['Config']['FlashUploadPath'] = 'upload/forum/'; if(!api_is_allowed_to_edit(false,true)) { $fck_attribute['Config']['UserStatus'] = 'student'; + $fck_attribute['ToolbarSet'] = 'Forum_Student'; +} +else +{ + $fck_attribute['ToolbarSet'] = 'Forum'; } /* diff --git a/main/inc/lib/fckeditor/myconfig.js b/main/inc/lib/fckeditor/myconfig.js index f5965844db..64b29886a2 100644 --- a/main/inc/lib/fckeditor/myconfig.js +++ b/main/inc/lib/fckeditor/myconfig.js @@ -72,10 +72,6 @@ FCKConfig.ToolbarSets["Comment"] = [ ['Bold','Italic','Underline','StrikeThrough'] ] ; -FCKConfig.ToolbarSets["ForumLight"] = [ - ['Bold','Italic','Underline','StrikeThrough'] -] ; - FCKConfig.ToolbarSets["NewTest"] = [ ['Bold','Italic','Underline','StrikeThrough','Link','Unlink','Image','Flash','MP3','OrderedList','UnorderedList','Table','Source'] ] ; @@ -113,6 +109,31 @@ FCKConfig.ToolbarSets["CourseDescription"] = [ ['Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'], ['Source'] ] ; +FCKConfig.ToolbarSets["ForumLight"] = [ + ['Bold','Italic','Underline','StrikeThrough'] +] ; + +FCKConfig.ToolbarSets["Forum"] = [ + ['NewPage','FitWindow','-','PasteWord','-','Undo','Redo','-','SelectAll','RemoveFormat','-','Find'], + ['Link','Unlink','Anchor'], + ['Image','imgmapPopup','flvPlayer','Flash','EmbedMovies','YouTube','MP3'], + ['Table','Rule','Smiley','SpecialChar','googlemaps'], + ['FontName','FontSize'], + ['Bold','Italic','Underline','StrikeThrough'], + ['Subscript','Superscript','-','OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','-','TextColor','BGColor'], + ['Source'] +] ; + +FCKConfig.ToolbarSets["Forum_Student"] = [ + ['NewPage','FitWindow','-','PasteWord','-','Undo','Redo','-','SelectAll','RemoveFormat','-','Find'], + ['Link','Unlink','Anchor'], + ['Image','imgmapPopup','flvPlayer','Flash','EmbedMovies','YouTube','MP3'], + ['Table','Rule','Smiley','SpecialChar','googlemaps'], + ['FontName','FontSize'], + ['Bold','Italic','Underline','StrikeThrough'], + ['Subscript','Superscript','-','OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','-','TextColor','BGColor'], + ['ShowBlocks'] +] ; FCKConfig.ToolbarSets["Wiki"] = [ ['NewPage','Templates','Save','PageBreak','Preview','FitWindow','-','PasteText','PasteWord','-','Undo','Redo','-','SelectAll','RemoveFormat','-','Find'], diff --git a/main/inc/lib/fckeditor/myconfig_afm.js b/main/inc/lib/fckeditor/myconfig_afm.js index ddca2f9206..0b92e5db6b 100644 --- a/main/inc/lib/fckeditor/myconfig_afm.js +++ b/main/inc/lib/fckeditor/myconfig_afm.js @@ -112,6 +112,17 @@ FCKConfig.ToolbarSets["Forum"] = [ ['Source'] ] ; +FCKConfig.ToolbarSets["Forum_Student"] = [ + ['NewPage','FitWindow','-','PasteWord','-','Undo','Redo','-','SelectAll','RemoveFormat','-','Find'], + ['Link','Unlink','Anchor'], + ['Image','imgmapPopup','flvPlayer','Flash','EmbedMovies','YouTube','MP3'], + ['Table','Rule','Smiley','SpecialChar','googlemaps'], + ['FontName','FontSize'], + ['Bold','Italic','Underline','StrikeThrough'], + ['Subscript','Superscript','-','OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','-','TextColor','BGColor'], + ['ShowBlocks'] +] ; + FCKConfig.ToolbarSets["Wiki"] = [ ['NewPage','Templates','Save','PageBreak','Preview','FitWindow','-','PasteText','PasteWord','-','Undo','Redo','-','SelectAll','RemoveFormat','-','Find'], ['Wikilink','Link','Unlink','Anchor'],