#2785 fix bad return into description tool and added new icons

main/course_description/add.php

@@ -21,13 +21,14 @@ $categories[ADD_BLOCK] = get_lang('NewBloc');
 
 $i=1;
 echo '<div class="actions" style="margin-bottom:30px">';
+echo '<a href="index.php?'.api_get_cidreq().'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'','32').'</a>';
 ksort($categories);
 foreach ($categories as $id => $title) {
 	if ($i==ADD_BLOCK) {
-		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.Display::return_icon($default_description_icon[$id], $title, array('height'=>'22')).' '.$title.'</a>';
+		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.Display::return_icon($default_description_icon[$id], $title, '','32').'</a>';
 		break;
 	} else {
-		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.Display::return_icon($default_description_icon[$id], $title, array('height'=>'22')).' '.$title.'</a>&nbsp;&nbsp;';
+		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.Display::return_icon($default_description_icon[$id], $title,'','32').'</a>';
 		$i++;
 	}
 }

main/course_description/edit.php

@@ -22,13 +22,15 @@ $categories[ADD_BLOCK] = get_lang('NewBloc');
 
 $i=1;
 echo '<div class="actions" style="margin-bottom:30px">';
+echo '<a href="index.php?'.api_get_cidreq().'">'.Display::return_icon('back.png',get_lang('BackTo').' '.get_lang('ToolCourseDescription'),'','32').'</a>';
+
 ksort($categories);
 foreach ($categories as $id => $title) {
 	if ($i==ADD_BLOCK) {
-		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.Display::return_icon($default_description_icon[$id], $title, array('height'=>'22')).' '.$title.'</a>';
+		echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.Display::return_icon($default_description_icon[$id], $title,'','32').'</a>';
 		break;
 	} else {
-		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.Display::return_icon($default_description_icon[$id], $title, array('height'=>'22')).' '.$title.'</a>&nbsp;&nbsp;';
+		echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.Display::return_icon($default_description_icon[$id], $title,'','32').'</a>';
 		$i++;
 	}
 }

main/course_description/listing.php

@@ -30,10 +30,10 @@ if (api_is_allowed_to_edit(null,true)) {
 	ksort($categories);
 	foreach ($categories as $id => $title) {
 		if ($i==ADD_BLOCK) {
-			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.Display::return_icon($default_description_icon[$id], $title, array('height'=>'22')).' '.$title.'</a>';
+			echo '<a href="index.php?'.api_get_cidreq().'&action=add">'.Display::return_icon($default_description_icon[$id], $title,'','32').'</a>';
 			break;
 		} else {
-			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.Display::return_icon($default_description_icon[$id], $title, array('height'=>'22')).' '.$title.'</a>&nbsp;&nbsp;';
+			echo '<a href="index.php?action=edit&'.api_get_cidreq().'&description_type='.$id.'">'.Display::return_icon($default_description_icon[$id], $title,'','32').'</a>';
 			$i++;
 		}
 	}

main/img/icons/48/sum.txt

@@ -1,3 +1,4 @@
+
 new_document 		modif mix nuvola crystal
 new_folder 		modif nuvola
 new_paint	 	modif nuvola
@@ -16,4 +17,12 @@ save_pack		nuvola
 settings		nuvola
 edit			nuvola
 draw			nuvola
-paint			nuvola
+paint			nuvola
+--
+course			nuvola
+wizard			nuvola
+strategy		nuvola
+objective		nuvola
+laptop			nuvola
+teacher			nuvola
+assessment		nuvola

main/inc/lib/course_description.lib.php

@@ -327,15 +327,15 @@ class CourseDescription
 	 */
 	public function get_default_description_icon() {
 		$default_description_icon = array();
-		$default_description_icon[1]= 'edu_miscellaneous.gif';
-		$default_description_icon[2]= 'spire.gif';
-		$default_description_icon[3]= 'kcmdf_big.gif';
-		$default_description_icon[4]= 'misc.gif';
-		$default_description_icon[5]= 'laptop.gif';
-		$default_description_icon[6]= 'personal.gif';
-		$default_description_icon[7]= 'korganizer.gif';
+		$default_description_icon[1]= 'course.png';
+		$default_description_icon[2]= 'objective.png';
+		$default_description_icon[3]= 'topics.png';
+		$default_description_icon[4]= 'strategy.png';
+		$default_description_icon[5]= 'laptop.png';
+		$default_description_icon[6]= 'teacher.png';
+		$default_description_icon[7]= 'assessment.png';
 		//$default_description_icon[8]= 'porcent.png';
-		$default_description_icon[8]= 'ktip.gif';
+		$default_description_icon[8]= 'wizard.png';
 		return $default_description_icon;
 	}