Browse Source

[svn r18062] returns to work properly ajaxfilemanager in course description tool

Juan Carlos Raña 16 years ago
parent
commit
4a65d9d50c
2 changed files with 35 additions and 17 deletions
  1. 24 17
      main/course_description/index.php
  2. 11 0
      main/inc/lib/fckeditor/myconfig_afm.js

+ 24 - 17
main/course_description/index.php

@@ -1,4 +1,4 @@
-<?php // $Id: index.php 17838 2009-01-19 20:10:21Z iflorespaz $
+<?php // $Id: index.php 18062 2009-01-28 23:13:34Z herodoto $
 
 /*
 ==============================================================================
@@ -148,22 +148,29 @@ if (api_is_allowed_to_edit() && !is_null($description_id) || $action =='add') {
 		if (!empty($description_id)) {
 		$sql = "SELECT * FROM $tbl_course_description WHERE id='$description_id'";
 		$result = api_sql_query($sql, __FILE__, __LINE__);
-		if ($description = mysql_fetch_array($result)) {
-			$default_description_titles[$description_id] = $description['title'];
-			$description_content = $description['content'];
-
-		} else {
-			$current_title = $default_description_titles[$description_id];				
-		}
-		
-		$fck_attribute['Width'] = '100%';
-		$fck_attribute['Height'] = '225';
-		$fck_attribute['ToolbarSet'] = 'Middle';  
-		
+			if ($description = mysql_fetch_array($result)) {
+				$default_description_titles[$description_id] = $description['title'];
+				$description_content = $description['content'];
+	
+			} else {
+				$current_title = $default_description_titles[$description_id];				
+			}
 		
-		$fck_attribute['Config']['InDocument'] = false;
-		$fck_attribute['Config']['CreateDocumentDir'] = '../../'; 
-		$fck_attribute['Config']['CreateDocumentWebDir'] = api_get_path('WEB_COURSE_PATH').$_course['path'].'/document/';
+			if (api_get_setting('advanced_filemanager'))
+			{
+				$fck_attribute['Width'] = '100%';
+				$fck_attribute['Height'] = '225';		
+				$fck_attribute['ToolbarSet'] = 'CourseDescription';
+			}
+			else
+			{
+				$fck_attribute['Width'] = '100%';
+				$fck_attribute['Height'] = '225';		
+				$fck_attribute['ToolbarSet'] = 'Middle';		
+				$fck_attribute['Config']['InDocument'] = false;
+				$fck_attribute['Config']['CreateDocumentDir'] = '../../'; 
+				$fck_attribute['Config']['CreateDocumentWebDir'] = api_get_path('WEB_COURSE_PATH').$_course['path'].'/document/';
+			}
 
 		} else {
 			$sql = "SELECT MAX(id) as MAX FROM $tbl_course_description ";
@@ -209,7 +216,7 @@ if (api_is_allowed_to_edit() && !is_null($description_id) || $action =='add') {
 		} else {
 			$form->add_html_editor('contentDescription', get_lang('Content'));
 		}
-		$form->addElement('submit', null, get_lang('Ok'));
+		$form->addElement('submit', null, get_lang('Save'));
 		// Set some default values
 		$default['title'] = $default_description_titles[$description_id];
 		$default['contentDescription'] = $description_content;

+ 11 - 0
main/inc/lib/fckeditor/myconfig_afm.js

@@ -72,6 +72,17 @@ FCKConfig.ToolbarSets["Survey"] = [
 	['FontSize','Bold','Italic','TextColor','-','OrderedList','UnorderedList','-','Rule','Link','Unlink','Table','-','Image','Source']
 ] ;
 
+FCKConfig.ToolbarSets["CourseDescription"] = [
+	['NewPage','Templates','Save','PageBreak','Preview','FitWindow','-','PasteText','PasteWord','-','Undo','Redo','-','SelectAll','RemoveFormat','-','Find'],
+	['Link','Unlink','Anchor'],
+	['Image','imgmapPopup','flvPlayer','Flash','EmbedMovies','YouTube','MP3'],
+	['Table','CreateDiv','Rule','Smiley','SpecialChar','googlemaps'],
+	['FontFormat','FontName','FontSize'],
+	['Bold','Italic','Underline','StrikeThrough'],
+	['Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyFull','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'],
+	['Source']
+] ;
+
 FCKConfig.ToolbarSets["Wiki"] = [
 	['NewPage','Templates','Save','PageBreak','Preview','FitWindow','-','PasteText','PasteWord','-','Undo','Redo','-','SelectAll','RemoveFormat','-','Find'],
 	['Wikilink','Link','Unlink','Anchor'],