merge

main/admin/settings.php

@@ -357,7 +357,7 @@ Display :: display_header($tool_name);
 // displaying the message that the settings have been stored
 if (!empty($_GET['action']) && $_GET['action'] == "stored")
 {
-	Display :: display_normal_message(get_lang('SettingsStored'));
+	Display :: display_confirmation_message(get_lang('SettingsStored'));
 }
 
 // the action images
@@ -467,7 +467,7 @@ function handle_plugins()
 		$category = $_GET['category'];
 		event_system(LOG_CONFIGURATION_SETTINGS_CHANGE, LOG_CONFIGURATION_SETTINGS_CATEGORY, $category, $time, $user_id);
 
-		Display :: display_normal_message(get_lang('SettingsStored'));
+		Display :: display_confirmation_message(get_lang('SettingsStored'));
 	}
 
 	echo get_lang('AvailablePlugins')."<br/><br/>";
@@ -928,7 +928,7 @@ function handle_search() {
                 $result = api_set_setting($key,$value,null,null);
         }
 
-        Display :: display_normal_message($SettingsStored);
+        Display :: display_confirmation_message($SettingsStored);
     } else {
         echo '<div id="search-options-form">';
         $form->display();

main/document/edit_document.php

@@ -599,7 +599,7 @@ if(isset($msgError))
 
 if( isset($info_message))
 {
-	Display::display_normal_message($info_message); //main API
+	Display::display_confirmation_message($info_message); //main API
 }
 
 

main/document/slideshow.php

@@ -286,7 +286,8 @@ if ($slide_id !== "all") {
 			echo '<tr>';
 			echo '<td align="center">';
 		
-			echo '<a href="edit_document.php?'.api_get_cidreq().'&curdirpath='.$pathurl.'&amp;file='.urlencode($path).$image_files_only[$slide].'"><img src="../img/edit.gif" border="0" title="'.get_lang('Modify').'" alt="'.get_lang('Modify').'" /></a><br />';
+		
+			echo '<a href="edit_document.php?'.api_get_cidreq().'&curdirpath='.$pathurl.'&amp;file='.urlencode($path).'/'.$image_files_only[$slide].'"><img src="../img/edit.gif" border="0" title="'.get_lang('Modify').'" alt="'.get_lang('Modify').'" /></a><br />';
 		
 			list($width, $high) = getimagesize($image);
 			echo $width.' x '.$high.' <br />';

main/user/user.php

@@ -604,7 +604,7 @@ if (api_is_allowed_to_edit()) {
 	$table->set_header($header_nr++, get_lang('Active'), false);
 	$table->set_column_filter(9, 'active_filter');
 	//actions column
-	$table->set_header($header_nr++, get_lang('Modify'), false);
+	$table->set_header($header_nr++, get_lang('Action'), false);
 	$table->set_column_filter($header_nr-1, 'modify_filter');
  	if (api_is_allowed_to_edit()) {
 		$table->set_form_actions(array('unsubscribe' => get_lang('Unreg')), 'user');