Feature #2785 add and update some icons, and fix documents, links and work (partial)

main/document/document.inc.php

@@ -369,23 +369,23 @@ function build_edit_icons($curdirpath, $type, $path, $visibility, $id, $is_templ
     // If document is read only *or* we're in a session and the document
     // is from a non-session context, hide the edition capabilities
     if ($is_read_only /*or ($session_id!=$cur_ses)*/) {
-        $modify_icons = Display::return_icon('edit_na.gif', get_lang('Modify'));
+        $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'),'',22);
         $modify_icons .= ' '.Display::return_icon('delete_na.png', get_lang('Delete'),array(), 22);
         $modify_icons .= ' '.Display::return_icon('move.png', get_lang('Move'),array(), 22);
         if(api_is_allowed_to_edit() || api_is_platform_admin()){
-            $modify_icons .= ' '.Display::return_icon($visibility_icon.'_na.gif', get_lang('VisibilityCannotBeChanged'));
+            $modify_icons .= ' '.Display::return_icon($visibility_icon.'_na.png', get_lang('VisibilityCannotBeChanged'),'',22);
         }
     } else {
         if ($is_certificate_mode) {
-            $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'&selectcat='.$gradebook_category.'"><img src="../img/edit.png" border="0" title="'.get_lang('Modify').'" alt="" /></a>';
+            $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'&selectcat='.$gradebook_category.'">'.Display::return_icon('edit.png', get_lang('Modify'),'',22).'</a>';
         } else {
             if($extension=='svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true'){
-                $modify_icons = '<a href="edit_draw.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'"><img src="../img/edit.png" border="0" title="'.get_lang('Modify').'" alt="" /></a>';
+                $modify_icons = '<a href="edit_draw.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'">'.Display::return_icon('edit.png', get_lang('Modify'),'',22).'</a>';
 			}
 			elseif($extension=='png' || $extension=='jpg' || $extension=='jpeg' || $extension=='bmp' || $extension=='gif' ||$extension=='pxd' && api_get_setting('enabled_support_pixlr') == 'true'){
-                $modify_icons = '<a href="edit_paint.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'"><img src="../img/edit.png" border="0" title="'.get_lang('Modify').'" alt="" /></a>';			
+                $modify_icons = '<a href="edit_paint.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'">'.Display::return_icon('edit.png', get_lang('Modify'),'',22).'</a>';		
             }else{
-                $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'"><img src="../img/edit.png" border="0" title="'.get_lang('Modify').'" alt="" /></a>';
+                $modify_icons = '<a href="edit_document.php?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;file='.urlencode($path).$req_gid.'">'.Display::return_icon('edit.png', get_lang('Modify'),'',22).'</a>';
             }
         }
 
@@ -410,7 +410,7 @@ function build_edit_icons($curdirpath, $type, $path, $visibility, $id, $is_templ
         } else {
             $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;move='.urlencode($path).$req_gid.'">'.Display::return_icon('move.png', get_lang('Move'),array(), 22).'</a>';
             if(api_is_allowed_to_edit() || api_is_platform_admin()){
-                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;'.$visibility_command.'='.$id.$req_gid.'&amp;'.$sort_params.'"><img src="../img/'.$visibility_icon.'.gif" border="0" title="'.get_lang('Visible').'" alt="" /></a>';
+                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;'.$visibility_command.'='.$id.$req_gid.'&amp;'.$sort_params.'">'.Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'),'',22).'</a>';
             }
         }
     }
@@ -419,7 +419,7 @@ function build_edit_icons($curdirpath, $type, $path, $visibility, $id, $is_templ
     if ($type == 'file' && ($extension == 'html' || $extension == 'htm')) {
         if ($is_template == 0) {
             if ((isset($_GET['curdirpath']) && $_GET['curdirpath'] != '/certificates') || !isset($_GET['curdirpath'])) {
-                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;add_as_template='.$id.$req_gid.'&amp;'.$sort_params.'">'.Display::return_icon('wizard.gif', get_lang('AddAsTemplate'),array(), 22).'</a>';
+                $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;add_as_template='.$id.$req_gid.'&amp;'.$sort_params.'">'.Display::return_icon('wizard.png', get_lang('AddAsTemplate'),array(), 22).'</a>';
             }
             if (isset($_GET['curdirpath']) && $_GET['curdirpath']=='/certificates') {//allow attach certificate to course
                 $visibility_icon_certificate='nocertificate';
@@ -435,14 +435,17 @@ function build_edit_icons($curdirpath, $type, $path, $visibility, $id, $is_templ
                 if (isset($_GET['selectcat'])) {
                     $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;selectcat='.Security::remove_XSS($_GET['selectcat']).'&amp;set_certificate='.$id.$req_gid.'&amp;'.$sort_params.'"><img src="../img/'.$visibility_icon_certificate.'.png" border="0" title="'.$certificate.'" alt="" /></a>';
                     if ($is_preview) {
-                        $modify_icons .= '&nbsp;<a target="_blank"  href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;set_preview='.$id.$req_gid.'&amp;'.$sort_params.'" ><img src="../img/search.gif" border="0" title="'.$preview.'" alt="" /></a>';
+                        $modify_icons .= '&nbsp;<a target="_blank"  href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;set_preview='.$id.$req_gid.'&amp;'.$sort_params.'" >'.
+						Display::return_icon('preview_view.png', $preview,'',22).'</a>';
                     }
                 }
             }
-        } else {
-            $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;remove_as_template='.$id.$req_gid.'&amp;'.$sort_params.'"><img src="../img/wizard_gray_small.gif" border="0" title="'.get_lang('RemoveAsTemplate').'" alt=""'.get_lang('RemoveAsTemplate').'" /></a>';
         }
-        $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=export_to_pdf&id='.$id.'">'.Display::return_icon('file_pdf.gif', get_lang('Export2PDF'),array(), 22).'</a>';
+		else{
+            $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.$curdirpath.'&amp;remove_as_template='.$id.$req_gid.'&amp;'.$sort_params.'">'.
+			Display::return_icon('preview_view_na.png', get_lang('RemoveAsTemplate'),'',22).'</a>';
+		}
+        $modify_icons .= '&nbsp;<a href="'.api_get_self().'?'.api_get_cidreq().'&action=export_to_pdf&id='.$id.'">'.Display::return_icon('pdf.png', get_lang('Export2PDF'),array(), 22).'</a>';
     }
 
     return $modify_icons;

main/img/icons/48/_sum.txt

@@ -1,4 +1,4 @@
-Pack and modif 48, 32, 22, 16 px by Juan Carlos Raña Trabado
+Pack and modif icons 48, 32, 22, 16 px by Juan Carlos Raña Trabado
 
 new_document 		modif mix nuvola crystal
 new_folder 		modif nuvola
@@ -236,17 +236,13 @@ html_editor			gnome
 --
 platform_event			modif nuvola
 agenda				nuvola
+--
+up				crystal (only 22 px)
+down				crystal (only 22 px)
+up_na				modif crystal (only 22 px)
+down_na				modif crystal (only 22 px)
+wizard_na			modif nuvola
 
 --julio
 star				
 star_green
-
-==================
-CONVENTIONS:
--transparent
--type: png
--When some icons are embedded on other icons on the left side, half the size of the largest.
-
-
-
-

main/link/linkfunctions.php

@@ -566,16 +566,16 @@ function showlinksofcategory($catid) {
                 echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=editlink&amp;category='.(!empty($category) ? $category : '').'&amp;id='.$myrow[0].'&amp;urlview='.$urlview.'" title="'.get_lang('Modify').'">'.Display::return_icon('edit.png', get_lang('Modify'),array(), 22).'</a>';
                 // DISPLAY MOVE UP COMMAND only if it is not the top link.
                 if ($i != 1) {
-                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;urlview='.$urlview.'&amp;up=', $myrow[0], '" title="'.get_lang('Up').'">'.Display::return_icon('up.gif', get_lang('Up'),array(), 22).'', "</a>\n";
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;urlview='.$urlview.'&amp;up=', $myrow[0], '" title="'.get_lang('Up').'">'.Display::return_icon('up.png', get_lang('Up'),array(), 22).'', "</a>\n";
                 } else {
-                    echo '<img src="'.api_get_path(WEB_IMG_PATH).'up_na.gif" border="0" alt="'.get_lang('Up').'"/>';
+                    echo Display::return_icon('up.png', get_lang('Up'),array(), 22).'</a>';
                 }
 
                 // DISPLAY MOVE DOWN COMMAND only if it is not the bottom link.
                 if ($i < $numberoflinks) {
-                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;urlview='.$urlview.'&amp;down='.$myrow[0].'" title="'.get_lang('Down').'">'.Display::return_icon('down.gif', get_lang('Down'),array(), 22).'', "</a>\n";
+                    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;urlview='.$urlview.'&amp;down='.$myrow[0].'" title="'.get_lang('Down').'">'.Display::return_icon('down.png', get_lang('Down'),array(), 22).'', "</a>\n";
                 } else {
-                    echo '<img src="'.api_get_path(WEB_IMG_PATH).'down_na.gif" border="0" alt="'.get_lang('Down').'"/>';
+                    echo Display::return_icon('down_na.png', get_lang('Down'),array(), 22).'', "</a>\n";
                 }
 
                 if ($myrow['visibility'] == '1') {
@@ -605,21 +605,23 @@ function showcategoryadmintools($categoryid) {
     global $urlview;
     global $aantalcategories;
     global $catcounter;
-    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=editcategory&amp;id='.$categoryid.'&amp;urlview='.$urlview.'" title='.get_lang('Modify').'"><img src="../img/edit.gif" border="0" alt="'.get_lang('Modify').'"/></a>';
-    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=deletecategory&amp;id=', $categoryid, "&amp;urlview=$urlview\" onclick=\"javascript: if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;\">", '<img src="../img/delete.gif" border="0" alt="', get_lang('Delete'), '"/></a>';
+    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=editcategory&amp;id='.$categoryid.'&amp;urlview='.$urlview.'" title='.get_lang('Modify').'">'.Display::return_icon('edit.png', get_lang('Modify'),array(), 22).'</a>';
+    echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;action=deletecategory&amp;id=', $categoryid, "&amp;urlview=$urlview\" onclick=\"javascript: if(!confirm('".get_lang('CategoryDelconfirm')."')) return false;\">",
+	Display::return_icon('delete.png', get_lang('Delete'),array(), 22).'</a>';
 
     // DISPLAY MOVE UP COMMAND only if it is not the top link.
     if ($catcounter != 1) {
-        echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;catmove=true&amp;up=', $categoryid, '&amp;urlview='.$urlview.'" title="'.get_lang('Up').'"><img src="../img/up.gif" border="0" alt="'.get_lang('Up').'"/>', "</a>\n";
+        echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;catmove=true&amp;up=', $categoryid, '&amp;urlview='.$urlview.'" title="'.get_lang('Up').'">'.Display::return_icon('up.png', get_lang('Up'),array(), 22).'</a>';
     } else {
-        echo '<img src="'.api_get_path(WEB_IMG_PATH).'up_na.gif" border="0" alt="'.get_lang('Up').'"/>';
+        echo Display::return_icon('up_na.png', get_lang('Up'),array(), 22).'</a>';
     }
 
     // DISPLAY MOVE DOWN COMMAND only if it is not the bottom link.
     if ($catcounter < $aantalcategories) {
-        echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;catmove=true&amp;down='.$categoryid.'&amp;urlview='.$urlview.'"><img src="../img/down.gif" border="0" alt="'.get_lang('Down').'"/>', "</a>\n";
+        echo '<a href="'.api_get_self().'?'.api_get_cidreq().'&amp;catmove=true&amp;down='.$categoryid.'&amp;urlview='.$urlview.'">
+		'.Display::return_icon('down.png', get_lang('Down'),array(), 22).'</a>';
     } else {
-        echo '<img src="'.api_get_path(WEB_IMG_PATH).'down_na.gif" border="0" alt="'.get_lang('Down').'"/>';
+        echo Display::return_icon('down_na.png', get_lang('Down'),array(), 22).'</a>';
     }
     $catcounter ++;
 }

main/work/work.lib.php

@@ -753,7 +753,7 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 				if ($is_allowed_to_edit) {
 					$action .= '<a href="'.api_get_self().'?cidReq='.api_get_course_id().
 						'&curdirpath='.$my_sub_dir.'&origin='.$origin.'&gradebook='.$gradebook.'&edit_dir='.$mydir.'">'.Display::return_icon('edit.png', get_lang('Modify'),array(), 22).'</a>';
-					$action .= ' <a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.$origin.'&gradebook='.$gradebook.'&delete_dir='.$mydir.'&delete2='.$id2.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;" title="'.get_lang('DirDelete').'"  >'.Display::return_icon('delete.png',get_lang('DirDelete')).'</a>';
+					$action .= ' <a href="'.api_get_self().'?'.api_get_cidreq().'&origin='.$origin.'&gradebook='.$gradebook.'&delete_dir='.$mydir.'&delete2='.$id2.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'), ENT_QUOTES))."'".')) return false;" title="'.get_lang('DirDelete').'"  >'.Display::return_icon('delete.png',get_lang('DirDelete'),'',22).'</a>';
 					$row[] = $action;
 				} else {
 					$row[] = '';
@@ -818,7 +818,7 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 				if ($is_allowed_to_edit) {
 					$action = '';
 					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;edit='.$work->id.'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&amp;parent_id='.$work->parent_id.'" title="'.get_lang('Modify').'"  ><img src="../img/edit.gif" alt="'.get_lang('Modify').'" title="'.get_lang('Modify').'"></a>';
-					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;delete='.$work->id.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES))."'".')) return false;" title="'.get_lang('WorkDelete').'" >'.Display::return_icon('delete.gif', get_lang('WorkDelete')).'</a>';
+					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;delete='.$work->id.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES))."'".')) return false;" title="'.get_lang('WorkDelete').'" >'.Display::return_icon('delete.png', get_lang('WorkDelete'),'',22).'</a>';
 					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;move='.$work->id.'" title="'.get_lang('Move').'"><img src="../img/deplacer_fichier.gif" border="0" title="'.get_lang('Move').'" alt="'.get_lang('Move').'" /></a>';
 					if ($work->accepted == '1') {
 						$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;make_invisible='.$work->id.'&amp;'.$sort_params.'" title="'.get_lang('Invisible').'" ><img src="../img/visible.gif" alt="'.get_lang('Invisible').'" title="'.get_lang('Invisible').'"></a>';
@@ -831,7 +831,7 @@ function display_student_publications_list($work_dir, $sub_course_dir, $currentC
 					$action = '';
 					$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&gradebook='.Security::remove_XSS($_GET['gradebook']).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;edit='.$work->id.'" title="'.get_lang('Modify').'"  ><img src="../img/edit.gif"  alt="'.get_lang('Modify').'" title="'.get_lang('Modify').'"></a>';
 					if (api_get_course_setting('student_delete_own_publication') == 1) {
-						$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;delete='.$work->id.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES))."'".')) return false;" title="'.get_lang('WorkDelete').'"  >'.Display::return_icon('delete.gif',get_lang('WorkDelete')).'</a>';
+						$action .= '<a href="'.api_get_self().'?'.api_get_cidreq().'&curdirpath='.urlencode($my_sub_dir).'&amp;origin='.$origin.'&gradebook='.$gradebook.'&amp;delete='.$work->id.'" onclick="javascript:if(!confirm('."'".addslashes(api_htmlentities(get_lang('ConfirmYourChoice'),ENT_QUOTES))."'".')) return false;" title="'.get_lang('WorkDelete').'"  >'.Display::return_icon('delete.png',get_lang('WorkDelete'),'',22).'</a>';
 					}
 					$row[] = $action;
 				} else {