Merge

main/admin/calendar.lib.php

@@ -1279,7 +1279,7 @@ function show_add_form($id = '')
 	<!-- START date and time -->
 <tr>
 <div>
-<table border="0" width="80%">
+<table border="0" width="100%">
 				<tr><td colspan="4">
 					<div id="err_date" style="display:none;color:red"></div>
 					<div id="err_start_date" style="display:none;color:red"></div>

main/admin/careers.php

@@ -59,9 +59,9 @@ $extra_params['height'] = 'auto';
 
 //With this function we can add actions to the jgrid (edit, delete, etc)
 $action_links = 'function action_formatter(cellvalue, options, rowObject) {
-                         return \'<a href="?action=edit&id=\'+options.rowId+\'"><img width="20px" src="../img/edit.png" title="'.get_lang('Edit').'"></a> '.
-                         '<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=copy&id=\'+options.rowId+\'"><img title="'.get_lang('Copy').'" src="../img/copy.gif"></a>'.
-                         '<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=delete&id=\'+options.rowId+\'"><img title="'.get_lang('Delete').'" src="../img/delete.png"></a>'. 
+                         return \'<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>'.
+                         '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=copy&id=\'+options.rowId+\'">'.Display::return_icon('copy.png',get_lang('Copy'),'',22).'</a>'.
+                         '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',22).'</a>'.
                          '\'; 
                  }';
 ?>

main/admin/promotions.php

@@ -63,10 +63,10 @@ $extra_params['autowidth'] = 'true'; //use the width of the parent
 $extra_params['height'] = 'auto'; //use the width of the parent
 //With this function we can add actions to the jgrid
 $action_links = 'function action_formatter (cellvalue, options, rowObject) {
-                    return \'<a href="add_sessions_to_promotion.php?id=\'+options.rowId+\'"><img title="'.get_lang('SubscribeSessionsToPromotions').'" width="22px" src="../img/icons/22/session_to_promotion.png"></a> '. 
-                    '<a href="?action=edit&id=\'+options.rowId+\'"><img width="20px" src="../img/edit.png" title="'.get_lang('Edit').'"></a> '.
-                    '<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=copy&id=\'+options.rowId+\'"><img title="'.get_lang('Copy').'" src="../img/copy.gif" alt="'.get_lang('Copy').'"></a> '. 
-                    '<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=delete&id=\'+options.rowId+\'"><img title="'.get_lang('Delete').'" src="../img/delete.png"></a> \'; 
+                    return \'<a href="add_sessions_to_promotion.php?id=\'+options.rowId+\'">'.Display::return_icon('session_to_promotion.png',get_lang('SubscribeSessionsToPromotions'),'',22).'</a>'.
+                    '&nbsp;<a href="?action=edit&id=\'+options.rowId+\'">'.Display::return_icon('edit.png',get_lang('Edit'),'',22).'</a>'.
+					'&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=copy&id=\'+options.rowId+\'">'.Display::return_icon('copy.png',get_lang('Copy'),'',22).'</a>'.
+                    '&nbsp;<a onclick="javascript:if(!confirm('."\'".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"),ENT_QUOTES))."\'".')) return false;"  href="?action=delete&id=\'+options.rowId+\'">'.Display::return_icon('delete.png',get_lang('Delete'),'',22).'</a> \'; 
                  }';
 
 ?>

main/auth/sso/sso.class.php

@@ -25,7 +25,8 @@ class sso {
         $this->domain     = api_get_setting('sso_authentication_domain');
         $this->auth_uri   = api_get_setting('sso_authentication_auth_uri');
         $this->deauth_uri = api_get_setting('sso_authentication_unauth_uri');
-        $this->referer    = $this->protocol.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+        //cut the string to avoid recursive URL construction in case of failure
+        $this->referer    = $this->protocol.$_SERVER['HTTP_HOST'].substr($_SERVER['REQUEST_URI'],0,strpos($_SERVER['REQUEST_URI'],'sso'));
         $this->deauth_url = $this->protocol.$this->domain.$this->deauth_uri;
         $this->master_url = $this->protocol.$this->domain.$this->auth_uri;
         $this->target     = api_get_path(WEB_PATH);
@@ -154,12 +155,14 @@ class sso {
                                 api_session_register('_user');
                                 event_login();
                                 // Redirect to homepage
+                                /* Login was successfull, stay on Chamilo 
                                 $protocol = api_get_setting('sso_authentication_protocol');
                                 $master_url = api_get_setting('sso_authentication_domain');
                                 $target = $protocol.$master_url;
                                 $sso_target = isset($target) ? $target : api_get_path(WEB_PATH) .'.index.php';
                                 header('Location: '. $sso_target);
                                 exit;
+                                */
                             }
                         } else {
                             // user account expired

main/course_progress/thematic.php

@@ -99,7 +99,7 @@ if ($action == 'thematic_list') {
 			echo '<td>';					
             
 			if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
-				echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_plan_list&thematic_id='.$thematic['id'].'">'.Display::return_icon('lp_quiz.png',get_lang('EditThematicPlan'),array('style'=>'vertical-align:middle')).'</a></div><br />';
+				echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_plan_list&thematic_id='.$thematic['id'].'">'.Display::return_icon('edit.png',get_lang('EditThematicPlan'),array('style'=>'vertical-align:middle'),22).'</a></div><br />';
 			}  
                     
             $new_thematic_plan_data = array();
@@ -140,7 +140,7 @@ if ($action == 'thematic_list') {
 			// display thematic advance data
 			echo '<td>';					
 			if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {
-				echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_advance_list&thematic_id='.$thematic['id'].'">'.Display::return_icon('lp_quiz.png',get_lang('EditThematicAdvance'),array('style'=>'vertical-align:middle')).'</a></div><br />';
+				echo '<div style="text-align:right"><a href="index.php?'.api_get_cidreq().'&origin=thematic_details&action=thematic_advance_list&thematic_id='.$thematic['id'].'">'.Display::return_icon('edit.png',get_lang('EditThematicAdvance'),array('style'=>'vertical-align:middle'),22).'</a></div><br />';
 			}					
 			
 			//if (api_is_allowed_to_edit(null, true) &&  api_get_session_id() == $thematic['session_id']) {

main/course_progress/thematic_plan.php

@@ -32,7 +32,7 @@ if ($action == 'thematic_plan_edit') {
     echo '<a href="index.php?action=thematic_plan_list&'.api_get_cidreq().'&thematic_id='.$thematic_id.'">'.Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>&nbsp;&nbsp;';
 } else {    
     echo '<a href="index.php?action=thematic_plan_list&'.api_get_cidreq().'&action=thematic_details&'.api_get_cidreq().'">'.Display::return_icon('back.png', get_lang('Back'), array(), 32).'</a>&nbsp;&nbsp;';
-    echo '<a href="index.php?action=thematic_plan_edit&'.api_get_cidreq().'&description_type='.$new_id.'&thematic_id='.$thematic_id.'">'.Display::return_icon('new_document.png', get_lang('NewBloc'), array(), 32).'</a>';    
+    echo '<a href="index.php?action=thematic_plan_edit&'.api_get_cidreq().'&description_type='.$new_id.'&thematic_id='.$thematic_id.'">'.Display::return_icon('wizard.png', get_lang('NewBloc'), array(), 32).'</a>';    
 }
 echo '</div>';
 

main/css/academica/default.css

@@ -1309,6 +1309,7 @@ span.radio {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 .blogpost_comment_title {
 	display: block;
@@ -1342,6 +1343,7 @@ span.radio {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 /* tabbed menu */
 #tabbed_menu {

main/css/baby_orange/default.css

@@ -1299,6 +1299,7 @@ span.radio {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 .blogpost_comment_title {
 	display: block;
@@ -1332,6 +1333,7 @@ span.radio {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 /* tabbed menu */
 #tabbed_menu {

main/css/blue_lagoon/default.css

@@ -1774,6 +1774,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1808,6 +1809,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
 	color: #737780;

main/css/chamilo/default.css

@@ -2023,6 +2023,7 @@ div.blogpost_comment {
     margin-bottom: 10px;
     padding: 10px;
     background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
     display: block;
@@ -2057,6 +2058,7 @@ div.comments {
     margin-top: 10px;
     padding: 10px;
     background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
     color: #737780;

main/css/chamilo_electric_blue/default.css

@@ -2073,6 +2073,7 @@ div.blogpost_comment {
     margin-bottom: 10px;
     padding: 10px;
     background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
     display: block;
@@ -2107,6 +2108,7 @@ div.comments {
     margin-top: 10px;
     padding: 10px;
     background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
     color: #737780;

main/css/chamilo_green/default.css

@@ -2079,6 +2079,7 @@ div.blogpost_comment {
     margin-bottom: 10px;
     padding: 10px;
     background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
     display: block;
@@ -2113,6 +2114,7 @@ div.comments {
     margin-top: 10px;
     padding: 10px;
     background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
     color: #737780;

main/css/chamilo_orange/default.css

@@ -2057,6 +2057,7 @@ div.blogpost_comment {
     margin-bottom: 10px;
     padding: 10px;
     background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
     display: block;
@@ -2091,6 +2092,7 @@ div.comments {
     margin-top: 10px;
     padding: 10px;
     background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
     color: #737780;

main/css/chamilo_red/default.css

@@ -2063,7 +2063,7 @@ table.new_comment {
     margin-top: 10px;
     padding: 10px;
     background-color: #F4F4F4;
-}
+	}
 div.blogpost_comment {
     border-top: 1px dashed #dddddd;
     border-right: 1px dashed #dddddd;
@@ -2072,6 +2072,7 @@ div.blogpost_comment {
     margin-bottom: 10px;
     padding: 10px;
     background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
     display: block;
@@ -2106,6 +2107,7 @@ div.comments {
     margin-top: 10px;
     padding: 10px;
     background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
     color: #737780;

main/css/cool_blue/default.css

@@ -1743,6 +1743,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1777,6 +1778,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
 	color: #737780;

main/css/corporate/default.css

@@ -1335,6 +1335,7 @@ span.radio {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 .blogpost_comment_title {
 	display: block;
@@ -1368,6 +1369,7 @@ span.radio {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 /* tabbed menu */
 #tabbed_menu {

main/css/cosmic_campus/default.css

@@ -1394,6 +1394,7 @@ span.radio {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 .blogpost_comment_title {
 	display: block;
@@ -1427,6 +1428,7 @@ span.radio {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 /* tabbed menu */
 #tabbed_menu {

main/css/delicious_bordeaux/default.css

@@ -1739,6 +1739,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1773,6 +1774,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
 	color: #737780;

main/css/dokeos_blue/default.css

@@ -1755,6 +1755,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1789,6 +1790,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
 	color: #737780;

main/css/dokeos_classic/default.css

@@ -1835,6 +1835,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1869,6 +1870,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
 	color: #737780;

main/css/dokeos_classic_2D/default.css

@@ -1843,6 +1843,7 @@ div.blogpost_comment {
 	border: 1px dashed #dddddd;
 	margin-bottom: 10px;
 	padding: 10px;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	color: #1657A9;
@@ -1877,6 +1878,7 @@ div.comments {
 	margin-bottom: 10px;
 	margin-top: 10px;
 	padding: 10px;
+	margin-left:50px;
 }
 .link {
 	color : #1657A9;

main/css/empire_green/default.css

@@ -1764,6 +1764,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1798,6 +1799,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
 	color: #737780;

main/css/fruity_orange/default.css

@@ -1763,6 +1763,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1797,6 +1798,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
 	color: #737780;

main/css/medical/default.css

@@ -1817,6 +1817,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1851,6 +1852,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
 	color: #737780;

main/css/public_admin/default.css

@@ -1832,6 +1832,7 @@ div.blogpost_comment {
     margin-bottom: 10px;
     padding: 10px;
     background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
     display: block;
@@ -1866,6 +1867,7 @@ div.comments {
     margin-top: 10px;
     padding: 10px;
     background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
     color: #737780;

main/css/royal_purple/default.css

@@ -1758,6 +1758,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1792,6 +1793,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;	
 }
 .attachment_comment {
 	color: #737780;

main/css/sober_brown/default.css

@@ -1775,6 +1775,7 @@ div.blogpost_comment {
     margin-bottom: 10px;
     padding: 10px;
     background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
     display: block;
@@ -1809,6 +1810,7 @@ div.comments {
     margin-top: 10px;
     padding: 10px;
     background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
     color: #737780;

main/css/steel_grey/default.css

@@ -1766,6 +1766,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1800,6 +1801,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
 	color: #737780;

main/css/tasty_olive/default.css

@@ -1764,6 +1764,7 @@ div.blogpost_comment {
 	margin-bottom: 10px;
 	padding: 10px;
 	background-color: white;
+	z-index: -1;
 }
 span.blogpost_comment_title {
 	display: block;
@@ -1798,6 +1799,7 @@ div.comments {
 	margin-top: 10px;
 	padding: 10px;
 	background-color: #F4F4F4;
+	margin-left:50px;
 }
 .attachment_comment {
 	color: #737780;

main/exercice/unique_answer.class.php

@@ -84,7 +84,7 @@ class UniqueAnswer extends Question {
 						<th width="10px" >
 							'.get_lang('True').'
 						</th>
-						<th width="45%">
+						<th width="38%">
 							'.get_lang('Answer').'
 						</th>
 							'.$comment_title.'

main/img/icons/48/_sum.txt

@@ -29,7 +29,7 @@ certificate_na		modif gnome
 new_recording		exquisite + nuvola
 microphone		exquisite
 --
-info			nuvola
+info	(except 64 px)  nuvola
 wizard			nuvola
 strategy		nuvola
 objective		nuvola
@@ -37,7 +37,7 @@ laptop			nuvola
 teacher			nuvola
 assessment		nuvola
 --
-link			nuvola
+link	(=links 64px)	nuvola
 new_link		modif nuvola
 view_tree		nuvola
 view_none		nuvola
@@ -113,7 +113,7 @@ calendar_inverse	modif crystal (only 32 px)
 --
 forum				nuvola
 group				nuvola
-user				modif nuvola
+user	(=members 64 px)	modif nuvola
 new_user			modif nuvola
 new_group			modif nuvola
 new_forum			modif nuvola
@@ -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
@@ -282,4 +282,6 @@ wiki_work			modif nuvola
 wiki_assignment			modif nuvola
 star				crystal			
 star_green			modif crystal
-menu				nuvola
+menu				nuvola
+starthere (=info.png 64 px)	crystal
+copy				crystal