Merge

main/img/icons/48/_sum.txt

@@ -169,7 +169,8 @@ blog_admin_users		modif nuvola
 blog_admin			modif nuvola (and 22 px gif version for home page)
 blog_admin_na			modif nuvola (and 22 px gif version for home page)
 --
-course_progress			modif mix gnome crystal
+course_progress	(=lessons_plans)gnome
+course_progress_na		modif gnome
 --
 mail				crystal
 --
@@ -179,7 +180,7 @@ notes_order_by_date_modif	modif crystal (only 32 px)
 notes_order_by_date_new	modif 	modif crystal (only 32 px)
 notes_order_by_title		modif crystal (only 32 px)
 --
-attendance			modif mix nuvola crystal
+attendance			modif crystal
 new_attendance_list		modif crystal
 attendance_list			modif crystal
 attendance_calendar		modif crystal (only 32 px)
@@ -187,10 +188,9 @@ add_calendar			modif crystal (only 32 px)
 add_event_calendar		modif crystal (only 32 px)
 clean_calendar			modif mix crystal tango (only 32 px)
 --
-lessons_plans			modif mix crystal gnome
-lesson_plan			modif mix crystal gnome
+lesson_plan			modif mix gnome crystal
 new_lesson_plan			modif mix nuvola gnome
-calendar_lesson_plans		modif mix crystal gnome (only 32 px)
+lesson_plan_calendar		modif mix gnome crystal
 skills				nuvola
 --
 new_user_event			modif crystal nuvola

main/inc/lib/blog.lib.php

@@ -1196,7 +1196,7 @@ class Blog {
 			echo '<div class="row"><div class="form_header">' . get_lang('NewPost') . '</div></div>';
 
 			// article title
-			echo '<div><span class="form_required">*</span>'.get_lang('Title') . ': <input name="post_title" id="post_title" type="text" size="60" onblur="check_if_still_empty()" /></div></br>';
+			echo '<div><span class="form_required">*</span>'.get_lang('Title') . ': <input name="post_title" id="post_title" type="text" size="60" onblur="check_if_still_empty()" /></div><br />';
 
 			// article text
 			$oFCKeditor = new FCKeditor('post_full_text') ;
@@ -1282,7 +1282,7 @@ class Blog {
 		echo '<div class="row"><div class="form_header">' . get_lang('EditPost') . '</div></div>';
 
 		// article title
-		echo '<div><span class="form_required">*</span>' . get_lang('Title') . ': <input name="post_title" id="post_title" type="text" size="60" value="'.stripslashes($blog_post['title']) . '" /></br></div>';
+		echo '<div><span class="form_required">*</span>' . get_lang('Title') . ': <input name="post_title" id="post_title" type="text" size="60" value="'.stripslashes($blog_post['title']) . '" /><br /></div>';
 
 		// article text
 								$oFCKeditor = new FCKeditor('post_full_text') ;
@@ -2366,7 +2366,7 @@ class Blog {
 		echo '</div></div>';
 
 		// comment title
-		echo '<div><span class="form_required">*</span>' . get_lang('Title') . ': <input name="comment_title" id="comment_title" type="text" size="60" value="Re: '.stripslashes($title) . '" /></div></br>';
+		echo '<div><span class="form_required">*</span>' . get_lang('Title') . ': <input name="comment_title" id="comment_title" type="text" size="60" value="Re: '.stripslashes($title) . '" /></div><br />';
 
 		// comment text
 		$oFCKeditor = new FCKeditor('comment_text') ;

main/work/work.lib.php

@@ -392,7 +392,7 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 	$table_header[] = array(get_lang('Date'), true, 'style="width:70px"');
 
 	if ($origin != 'learnpath') {
-		$table_header[] = array(get_lang('Actions'), false, 'style="width:40px"');
+		$table_header[] = array(get_lang('Actions'), false, 'style="width:80px"');
 		$table_header[] = array('RealDate', true);
 	}