Julio Montoya 14 years ago
parent
commit
f0a81757bf

+ 103 - 10
main/inc/lib/fckeditor/fcktemplates.xml.php

@@ -46,18 +46,27 @@ if (api_get_setting('show_glossary_in_documents') != 'none') {
 $img_dir = api_get_path(REL_CODE_PATH).'img/';
 $default_course_dir = api_get_path(REL_CODE_PATH).'default_course_document/';
 
+// Setting templates for teachers or for students
+$is_allowed_to_edit = api_is_allowed_to_edit(false,true);
+
 // Start the templates node.
 echo '<Templates imagesBasePath="">';
-
-// Load empty template.
-load_empty_template();
-
-// Load the templates that were defined by the platform admin.
-load_platform_templates();
-
-// Load the personal templates.
-load_personal_templates(api_get_user_id());
-
+if($is_allowed_to_edit){
+		
+	// Load empty template.
+	load_empty_template();
+	
+	// Load the templates that were defined by the platform admin.
+	load_platform_templates();
+	
+	// Load the personal templates.
+	load_personal_templates(api_get_user_id());
+	
+}
+else{
+	load_student_templates();
+	
+}
 // End the templates node.
 echo '</Templates>';
 
@@ -213,3 +222,87 @@ function load_empty_template() {
 </Template>
 <?php
 }
+
+/**
+ * Loads the student templates
+ */
+function load_student_templates() {
+	$fckeditor_template_path='/main/inc/lib/fckeditor/editor/dialog/fck_template/images/';
+	?>
+    <Template title="Image and Title" image="<?php echo api_get_path(WEB_PATH).$fckeditor_template_path.'template1.gif';?>">
+        <Description>One main image with a title and text that surround the image.</Description>
+        <Html>
+            <![CDATA[
+                <img style="MARGIN-RIGHT: 10px" height="100" alt="" width="100" align="left"/>
+                <h3>Type the title here</h3>
+                Type the text here
+            ]]>
+        </Html>
+    </Template>
+    <Template title="Strange Template" image="<?php echo api_get_path(WEB_PATH).$fckeditor_template_path.'template2.gif';?>">
+        <Description>A template that defines two colums, each one with a title, and some text.</Description>
+        <Html>
+            <![CDATA[
+                <table cellspacing="0" cellpadding="0" width="100%" border="0">
+                    <tbody>
+                        <tr>
+                            <td width="50%">
+                            <h3>Title 1</h3>
+                            </td>
+                            <td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </td>
+                            <td width="50%">
+                            <h3>Title 2</h3>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td>Text 1</td>
+                            <td>&nbsp;</td>
+                            <td>Text 2</td>
+                        </tr>
+                    </tbody>
+                </table>
+                More text goes here.
+            ]]>
+        </Html>
+    </Template>
+    <Template title="Text and Table" image="<?php echo api_get_path(WEB_PATH).$fckeditor_template_path.'template3.gif';?>">
+        <Description>A title with some text and a table.</Description>
+        <Html>
+            <![CDATA[
+                <table align="left" width="80%" border="0" cellspacing="0" cellpadding="0"><tr><td>
+                    <h3>Title goes here</h3>
+                    <p>
+                    <table style="FLOAT: right" cellspacing="0" cellpadding="0" width="150" border="1">
+                        <tbody>
+                            <tr>
+                                <td align="center" colspan="3"><strong>Table title</strong></td>
+                            </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>
+                            <tr>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                                <td>&nbsp;</td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    Type the text here</p>
+                </td></tr></table>
+            ]]>
+        </Html>
+    </Template>
+    <?php
+}

+ 1 - 0
main/inc/lib/fckeditor/toolbars/extended/wiki.php

@@ -8,6 +8,7 @@
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
 //NOTE: Does not include Replace because it is redundant, being in the same tab to Find
+
 //TODO: DocProps, asciimath don't run ok here. 
 
 // Hide/show SpellCheck buttom

+ 26 - 15
main/inc/lib/fckeditor/toolbars/extended/wiki_feedback.php

@@ -7,6 +7,17 @@
 
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
+//NOTE: Does not include Replace because it is redundant, being in the same tab to Find.
+
+//TODO: DocProps, asciimath don't run ok here. 
+
+// Hide/show SpellCheck buttom
+if ((api_get_setting('allow_spellcheck') == 'true')) {
+	$VSpellCheck='SpellCheck';
+}
+else{
+	$VSpellCheck='';	
+}
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
 	array('Link','Unlink','Bold','Italic','TextColor','BGColor','mimetex')
@@ -15,21 +26,21 @@ $config['ToolbarSets']['Normal'] = array(
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.
 $config['ToolbarSets']['Maximized'] = array(
-	array('FitWindow','DocProps','-','Save','NewPage','Preview','-','Templates'),
-	array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor','Wikilink','Glossary'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar','PageBreak'),
-	array('mimetex','asciimath','Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','YouTube','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'),
-	array('ShowBlocks','Source')
+	array('Save','NewPage','Templates','-','Preview','Print'),
+	array('Cut','Copy','Paste','PasteText','PasteWord'),
+	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
+	array('Link','Unlink','Anchor','Glossary'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+'/',
+	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),	
+	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'),
+	array($VSpellCheck),	
+	array('Style','FontFormat','FontName','FontSize'),	
+	array('PageBreak','ShowBlocks','Source'),
+	array('FitWindow')
+	
 );
 
 // Sets whether the toolbar can be collapsed/expanded or not.

+ 34 - 22
main/inc/lib/fckeditor/toolbars/extended/wiki_student.php

@@ -7,36 +7,48 @@
 
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
+//NOTE: Does not include Replace because it is redundant, being in the same tab to Find. 
+//NOTE: ONLY FOR TEACHERS: source, insert html
+
+//TODO: DocProps, asciimath don't run ok here.
+
+// Hide/show SpellCheck buttom
+if ((api_get_setting('allow_spellcheck') == 'true')) {
+	$VSpellCheck='SpellCheck';
+}
+else{
+	$VSpellCheck='';	
+}
+
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('FitWindow','Save','NewPage','PageBreak','Preview','-','PasteText','-','Undo','Redo','-','SelectAll','-','Find'),
-	array('Wikilink','Link','Unlink','Anchor'),
-	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex','asciimath'),
-	array('Table','Rule','Smiley','SpecialChar','googlemaps'),
-	array('FontFormat','FontName','FontSize'),
-	array('Bold','Italic','Underline'),
-	array('Subscript','Superscript','-','JustifyLeft','JustifyCenter','JustifyRight','-','OrderedList','UnorderedList','-','Outdent','Indent','-','TextColor','BGColor'),
-	array('ShowBlocks')
+array('Save','NewPage','Templates','-','PasteText'),
+	array('Undo','Redo'),
+	array('Wikilink','Link','Image','flvPlayer','Table','mimetex'),
+	array('UnorderedList','OrderedList','Rule'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
+	array('FontFormat','FontName','FontSize','Bold','Italic','Underline','TextColor','BGColor'),
+	array('FitWindow')
 );
 
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.
 $config['ToolbarSets']['Maximized'] = array(
-	array('FitWindow','DocProps','-','Save','NewPage','Preview','-','Templates'),
+	array('Save','NewPage','-','Preview','Print'),
 	array('Cut','Copy','Paste','PasteText','PasteWord'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor','Wikilink','Glossary'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar','PageBreak'),
-	array('mimetex','asciimath','Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'),
-	array('ShowBlocks')
+	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
+	array('Wikilink','Link','Unlink','Anchor','Glossary'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+'/',
+	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),	
+	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'),
+	array($VSpellCheck),	
+	array('Style','FontFormat','FontName','FontSize'),	
+	array('PageBreak','ShowBlocks'),
+	array('FitWindow')
+	
 );
 
 // Sets whether the toolbar can be collapsed/expanded or not.

+ 37 - 22
main/inc/lib/fckeditor/toolbars/extended/wiki_task.php

@@ -7,35 +7,50 @@
 
 // For more information: http://docs.fckeditor.net/FCKeditor_2.x/Developers_Guide/Configuration/Configuration_Options
 
+//NOTE: Does not include Replace because it is redundant, being in the same tab to Find.
+
+//TODO: DocProps, asciimath don't run ok here. 
+
+// Hide/show SpellCheck buttom
+if ((api_get_setting('allow_spellcheck') == 'true')) {
+	$VSpellCheck='SpellCheck';
+}
+else{
+	$VSpellCheck='';	
+}
+
 // This is the visible toolbar set when the editor has "normal" size.
 $config['ToolbarSets']['Normal'] = array(
-	array('FitWindow','-','PasteWord','-','Undo','Redo'),
-	array('Link','Unlink'),
-	array('Image','flvPlayer','Flash','EmbedMovies','YouTube','MP3','mimetex'),
-	array('Table'),
-	array('Bold','Italic','Underline'),
-	array('JustifyLeft','JustifyCenter','-','OrderedList','UnorderedList','-','TextColor','BGColor'),
-	array('Source')
+	array('NewPage','Templates','-','PasteText'),
+	array('Undo','Redo'),
+	array('Link','Image','flvPlayer','Table','mimetex'),
+	array('UnorderedList','OrderedList','Rule'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
+	array('FontFormat','FontName','Bold','Italic','Underline','TextColor','BGColor'),
+	array('FitWindow')
 );
 
 // This is the visible toolbar set when the editor is maximized.
 // If it has not been defined, then the toolbar set for the "normal" size is used.
+// This is the visible toolbar set when the editor is maximized.
+// If it has not been defined, then the toolbar set for the "normal" size is used.
+
 $config['ToolbarSets']['Maximized'] = array(
-	array('FitWindow','DocProps','-','Save','NewPage','Preview','-','Templates'),
-	array('Cut','Copy','Paste','PasteText','PasteWord','-','Print'),
-	array('Undo','Redo','-','Find','Replace','-','SelectAll','RemoveFormat'),
-	array('Link','Unlink','Anchor','Wikilink','Glossary'),
-	'/',
-	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript'),
-	array('OrderedList','UnorderedList','-','Outdent','Indent','Blockquote','CreateDiv'),
-	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),
-	array('Rule','SpecialChar','PageBreak'),
-	array('mimetex','asciimath','Image','imgmapPopup','Flash','MP3','EmbedMovies','flvPlayer','YouTube','googlemaps','Smiley'),
-	'/',
-	array('Style','FontFormat','FontName','FontSize'),
-	array('TextColor','BGColor'),
-	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp'),
-	array('ShowBlocks','Source')
+	array('NewPage','Templates','-','Preview','Print'),
+	array('Cut','Copy','Paste','PasteText','PasteWord'),
+	array('Undo','Redo','-','SelectAll','Find','-','RemoveFormat'),
+	array('Link','Unlink','Anchor','Glossary'),
+	array('Image','imgmapPopup','flvPlayer','EmbedMovies','YouTube','Flash','MP3','googlemaps','Smiley','SpecialChar','insertHtml','mimetex','fckeditor_wiris_openFormulaEditor','fckeditor_wiris_openCAS'),
+'/',
+	array('Table','TableInsertRowAfter','TableDeleteRows','TableInsertColumnAfter','TableDeleteColumns','TableInsertCellAfter','TableDeleteCells','TableMergeCells','TableHorizontalSplitCell','TableVerticalSplitCell','TableCellProp','-','CreateDiv'),
+	array('UnorderedList','OrderedList','Rule','-','Outdent','Indent','Blockquote'),
+	array('JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'),	
+	array('Bold','Italic','Underline','StrikeThrough','-','Subscript','Superscript','-','TextColor','BGColor'),
+	array($VSpellCheck),	
+	array('Style','FontFormat','FontName','FontSize'),	
+	array('PageBreak','ShowBlocks','Source'),
+	array('FitWindow')
+	
 );
 
 // Sets whether the toolbar can be collapsed/expanded or not.

+ 0 - 68
main/wiki/export_mpdf.php

@@ -1,68 +0,0 @@
-<?php
-/* For licensing terms, see /chamilo_license.txt */
-
-/**
- * Export html to pdf
- * @author Juan Carlos Raña <herodoto@telefonica.net>, initial code, 2009
- * @author Ivan Tcholakov <ivantcholakov@gmail.com>, 2010
- * @deprecated now we use the pdf.lib.php library for all pdf export issues
- */
-
-require '../inc/global.inc.php';
-
-api_protect_course_script();
-api_block_anonymous_users();
-
-define('_MPDF_PATH', api_get_path(LIBRARY_PATH).'mpdf/');
-require_once _MPDF_PATH.'mpdf.php';
-
-$content_pdf = api_html_entity_decode($_POST['contentPDF'], ENT_QUOTES, api_get_system_encoding());
-$title_pdf = api_html_entity_decode($_POST['titlePDF'], ENT_QUOTES, api_get_system_encoding());
-
-$title_pdf = api_utf8_encode($title_pdf, api_get_system_encoding());
-$content_pdf = api_utf8_encode($content_pdf, api_get_system_encoding());
-
-$html='
-<!-- defines the headers/footers - this must occur before the headers/footers are set -->
-
-<!--mpdf
-<pageheader name="odds" content-left="'.$title_pdf.'"  header-style-left="color: #880000; font-style: italic;"  line="1" />
-<pagefooter name="odds" content-right="{PAGENO}/{nb}" line="1" />
-
-<!-- set the headers/footers - they will occur from here on in the document -->
-<!--mpdf
-<setpageheader name="odds" page="odd" value="on" show-this-page="1" />
-<setpagefooter name="odds" page="O" value="on" />
-
-mpdf-->'.$content_pdf;
-
-
-$css_file = api_get_path(TO_SYS, WEB_CSS_PATH).api_get_setting('stylesheets').'/print.css';
-if (file_exists($css_file)) {
-	$css = @file_get_contents($css_file);
-} else {
-	$css = '';
-}
-
-$pdf = new mPDF('UTF-8', 'A4', '', '', 30, 20, 27, 25, 16, 13, 'P');
-
-$pdf->directionality = api_get_text_direction();
-
-$pdf->useOnlyCoreFonts = true;
-
-$pdf->SetAuthor('Wiki Chamilo');
-$pdf->SetTitle($title_pdf);
-$pdf->SetSubject('Exported from Chamilo Wiki');
-$pdf->SetKeywords('Chamilo Wiki');
-
-if (!empty($css)) {
-	$pdf->WriteHTML($css, 1);
-	$pdf->WriteHTML($html, 2);
-} else {
-	$pdf->WriteHTML($html);
-}
-
-if (empty($title_pdf)) {
-	$title_pdf = 'Exported from Chamilo Wiki';
-}
-$pdf->Output(replace_dangerous_char($title_pdf.'.pdf'), 'D');

+ 4 - 4
main/wiki/index.php

@@ -1392,7 +1392,7 @@ if ($_GET['action']=='edit')
 					}
 
 					//comp message
-					$message_task='<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.api_htmlentities($row['task']).'</p><hr>';
+					$message_task='<b>'.get_lang('DescriptionOfTheTask').'</b><p>'.$row['task'].'</p><hr>';
 					$message_task.='<p>'.get_lang('StartDate').': '.$message_task_startdate.'</p>';
 					$message_task.='<p>'.get_lang('EndDate').': '.$message_task_enddate;
 					$message_task.=' ('.get_lang('AllowLaterSends').') '.$message_task_delayedsubmit.'</p>';
@@ -1483,9 +1483,9 @@ if ($_GET['action']=='edit')
 					echo '<td colspan="2">'.get_lang('Feedback3').'</td>';
 					echo '</tr>';
 					echo '<tr>';
-					echo '<td colspan="2"><textarea name="feedback1" cols="23" rows="4" >'.api_htmlentities($row['feedback1']).'</textarea></td>';
-					echo '<td colspan="2"><textarea name="feedback2" cols="23" rows="4" >'.api_htmlentities($row['feedback2']).'</textarea></td>';
-					echo '<td colspan="2"><textarea name="feedback3" cols="23" rows="4" >'.api_htmlentities($row['feedback3']).'</textarea></td>';
+					echo '<td colspan="2"><textarea name="feedback1" cols="21" rows="4" >'.api_htmlentities($row['feedback1']).'</textarea></td>';
+					echo '<td colspan="2"><textarea name="feedback2" cols="21" rows="4" >'.api_htmlentities($row['feedback2']).'</textarea></td>';
+					echo '<td colspan="2"><textarea name="feedback3" cols="21" rows="4" >'.api_htmlentities($row['feedback3']).'</textarea></td>';
 					echo '</tr>';
 					echo '<tr>';
 					echo '<td>'.get_lang('FProgress').':</td>';

+ 9 - 6
main/wiki/wiki.inc.php

@@ -583,6 +583,8 @@ return true;
 		echo '<div id="options" style="display:none; margin: 20px;" >';
 
 		//task
+		echo '<div>&nbsp;</div>';
+		echo '<div style= "border : 1px dotted; padding:4px; margin-top:20px;">';
 		echo '<input type="checkbox" value="1" name="checktask" onclick="javascript: if(this.checked){document.getElementById(\'option4\').style.display=\'block\';}else{document.getElementById(\'option4\').style.display=\'none\';}"/>&nbsp;<img src="../img/wiki/task.gif" title="'.get_lang('DefineTask').'" alt="'.get_lang('DefineTask').'"/>'.get_lang('DescriptionOfTheTask').'';
 		echo '&nbsp;&nbsp;&nbsp;<span id="msg_error4" style="display:none;color:red"></span>';
 		echo '<div id="option4" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
@@ -593,12 +595,13 @@ return true;
 		echo '</tr>';
 		echo '<tr>';
 		//echo '<td><textarea name="task" cols="60" rows="4" >'.stripslashes($row['task']).'</textarea></td>';	// TODO: ¿delete?
-		echo '<td>'.api_disp_html_area('task', $row['task'], '', '', null, array('ToolbarSet' => 'wiki_task', 'Width' => '600', 'Height' => '200')).'</td>';
+		echo '<td>'.api_disp_html_area('task', $row['task'], '', '', null, array('ToolbarSet' => 'wiki_task', 'Width' => '580', 'Height' => '200')).'</td>';
 		echo '</tr>';
 		echo '</table>';
 		echo '</div>';
 
 		//feedback
+		
 		echo '<div>&nbsp;</div><input type="checkbox" value="1" name="checkfeedback" onclick="javascript: if(this.checked){document.getElementById(\'option2\').style.display=\'block\';}else{document.getElementById(\'option2\').style.display=\'none\';}"/>&nbsp;'.get_lang('AddFeedback').'';
 		echo '&nbsp;&nbsp;&nbsp;<span id="msg_error2" style="display:none;color:red"></span>';
 		echo '<div id="option2" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
@@ -610,9 +613,9 @@ return true;
 		echo '<td colspan="2">'.get_lang('Feedback3').'</td>';
 	  	echo '</tr>';
 	 	echo '<tr>';
-		echo '<td colspan="2"><textarea name="feedback1" cols="23" rows="4"></textarea></td>';
-		echo '<td colspan="2"><textarea name="feedback2" cols="23" rows="4"></textarea></td>';
-		echo '<td colspan="2"><textarea name="feedback3" cols="23" rows="4"></textarea></td>';
+		echo '<td colspan="2"><textarea name="feedback1" cols="21" rows="4"></textarea></td>';
+		echo '<td colspan="2"><textarea name="feedback2" cols="21" rows="4"></textarea></td>';
+		echo '<td colspan="2"><textarea name="feedback3" cols="21" rows="4"></textarea></td>';
 	 	echo '</tr>';
 		echo '<tr>';
 		echo '<td>'.get_lang('FProgress').':</td>';
@@ -691,9 +694,9 @@ return true;
 		echo '<div id="option3" style="padding:4px; margin:5px; border:1px dotted; display:none;">';
 		echo '<div style="font-weight:normal"; align="center">'.get_lang('NMaxWords').':&nbsp;<input type="text" name="max_text" size="3">&nbsp;&nbsp;'.get_lang('NMaxVersion').':&nbsp;<input type="text" name="max_version" size="3"></div>';
 		echo '</div>';
-
+		echo '</div>';
 		//to define as an individual assignment
-		echo '<div style= "border : 1px dotted; padding:4px; margin-top:20px;"><img src="../img/wiki/assignment.png" />&nbsp;'.get_lang('DefineAssignmentPage').': <input type="checkbox" name="assignment" value="1"></div>'; // 1= teacher 2 =student
+		echo '<div style= "border : 1px dotted; padding:4px; margin-top:20px;"><img src="../img/wiki/assignment.png" title="'.get_lang('CreateAssignmentPage').'" alt="'.get_lang('CreateAssignmentPage').'"/>&nbsp;'.get_lang('DefineAssignmentPage').': <input type="checkbox" name="assignment" value="1"></div>'; // 1= teacher 2 =student
 		//
 		echo'</div>';