From e2a2f176e1d2ee91270b8df8662028e93816e124 Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 15 Feb 2012 17:21:39 +0100 Subject: [PATCH] Replacing some '22' strings with the new icon constant ICON_SIZE_SMALL --- main/admin/careers.php | 6 +- main/admin/languages.php | 10 +-- main/admin/promotions.php | 8 +-- main/admin/session_list.php | 10 +-- main/admin/settings.lib.php | 4 +- main/admin/skills_gradebook.php | 4 +- main/announcements/announcements.inc.php | 6 +- main/announcements/announcements.php | 8 +-- main/calendar/agenda.inc.php | 26 ++++---- main/course_description/listing.php | 8 +-- main/course_progress/thematic.php | 22 +++---- main/document/document.inc.php | 42 ++++++------- main/document/document_lite.php | 6 +- main/dropbox/index.php | 30 ++++----- main/exercice/exercice.php | 28 ++++----- main/exercice/live_stats.php | 6 +- main/forum/viewthread_nested.inc.php | 2 +- main/inc/introductionSection.inc.php | 8 +-- main/survey/survey.lib.php | 10 +-- main/survey/survey.php | 16 ++--- main/wiki/index.php | 78 ++++++++++++------------ main/wiki/wiki.inc.php | 28 ++++----- main/work/work.lib.php | 6 +- 23 files changed, 186 insertions(+), 186 deletions(-) mode change 100755 => 100644 main/dropbox/index.php diff --git a/main/admin/careers.php b/main/admin/careers.php index e7560aeb78..d4b4686742 100644 --- a/main/admin/careers.php +++ b/main/admin/careers.php @@ -58,9 +58,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 \''.Display::return_icon('edit.png',get_lang('Edit'),'',22).''. - ' '.Display::return_icon('copy.png',get_lang('Copy'),'',22).''. - ' '.Display::return_icon('delete.png',get_lang('Delete'),'',22).''. + return \''.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('copy.png',get_lang('Copy'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).''. '\'; }'; ?> diff --git a/main/admin/languages.php b/main/admin/languages.php index bc15faeedf..0179968666 100644 --- a/main/admin/languages.php +++ b/main/admin/languages.php @@ -240,9 +240,9 @@ while ($row = Database::fetch_array($result_select)) { $row_td[] = $row['dokeos_folder']; if ($row['english_name'] == $row_lang['selected_value']){ - $setplatformlanguage = Display::return_icon('languages.png', get_lang('CurrentLanguagesPortal'),'',22); + $setplatformlanguage = Display::return_icon('languages.png', get_lang('CurrentLanguagesPortal'),'',ICON_SIZE_SMALL); } else { - $setplatformlanguage = "".Display::return_icon('languages_na.png',get_lang('SetLanguageAsDefault'),'',22).""; + $setplatformlanguage = "".Display::return_icon('languages_na.png',get_lang('SetLanguageAsDefault'),'',ICON_SIZE_SMALL).""; } if (api_get_setting('allow_use_sub_language')=='true') { @@ -250,7 +250,7 @@ while ($row = Database::fetch_array($result_select)) { if ($verified_if_is_sub_language===false) { $verified_if_is_father=SubLanguageManager::check_if_language_is_father($row['id']); - $allow_use_sub_language = " ".Display::return_icon('new_language.png', get_lang('CreateSubLanguage'),array(),22).""; + $allow_use_sub_language = " ".Display::return_icon('new_language.png', get_lang('CreateSubLanguage'),array(),ICON_SIZE_SMALL).""; if ($verified_if_is_father===true) { //$allow_add_term_sub_language = " ".Display::return_icon('2rightarrow.gif', get_lang('AddWordForTheSubLanguage'),array('width'=>ICON_SIZE_SMALL,'height'=>ICON_SIZE_SMALL)).""; $allow_add_term_sub_language=''; @@ -269,10 +269,10 @@ while ($row = Database::fetch_array($result_select)) { $allow_add_term_sub_language=''; } if ($row['available'] == 1) { - $row_td[] = "".Display::return_icon('visible.png', get_lang('MakeUnavailable'),array('id'=>'imglinktool_'.$row['id']),22)." ".Display::return_icon('edit.png', get_lang('Edit'),'',22)." ".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language; + $row_td[] = "".Display::return_icon('visible.png', get_lang('MakeUnavailable'),array('id'=>'imglinktool_'.$row['id']),ICON_SIZE_SMALL)." ".Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)." ".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language; //$row_td[] = "".Display::return_icon('visible.gif', get_lang('MakeUnavailable'),array('id'=>'imglinktool_'.$row['id']))." ".Display::return_icon('edit.gif', get_lang('Edit'))." ".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language; } else { - $row_td[] = "".Display::return_icon('invisible.png', get_lang('MakeAvailable'),array('id'=>'imglinktool_'.$row['id']),22)." ".Display::return_icon('edit.png', get_lang('Edit'),'',22)." ".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language; + $row_td[] = "".Display::return_icon('invisible.png', get_lang('MakeAvailable'),array('id'=>'imglinktool_'.$row['id']),ICON_SIZE_SMALL)." ".Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL)." ".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language.$allow_delete_sub_language; //$row_td[] = "".Display::return_icon('invisible.gif', get_lang('MakeAvailable'),array('id'=>'imglinktool_'.$row['id']))." ".Display::return_icon('edit.gif', get_lang('Edit'))." ".$setplatformlanguage.$allow_use_sub_language.$allow_add_term_sub_language; } diff --git a/main/admin/promotions.php b/main/admin/promotions.php index 02a4e34d77..fb33ffae3c 100644 --- a/main/admin/promotions.php +++ b/main/admin/promotions.php @@ -62,10 +62,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 \''.Display::return_icon('session_to_promotion.png',get_lang('SubscribeSessionsToPromotions'),'',22).''. - ' '.Display::return_icon('edit.png',get_lang('Edit'),'',22).''. - ' '.Display::return_icon('copy.png',get_lang('Copy'),'',22).''. - ' '.Display::return_icon('delete.png',get_lang('Delete'),'',22).' \'; + return \''.Display::return_icon('session_to_promotion.png',get_lang('SubscribeSessionsToPromotions'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('copy.png',get_lang('Copy'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).' \'; }'; ?> diff --git a/main/admin/session_list.php b/main/admin/session_list.php index b5e92f7ea0..957d83cb7c 100644 --- a/main/admin/session_list.php +++ b/main/admin/session_list.php @@ -72,11 +72,11 @@ $extra_params['rowList'] = array(10, 20 ,30); //With this function we can add actions to the jgrid (edit, delete, etc) $action_links = 'function action_formatter(cellvalue, options, rowObject) { - return \''.Display::return_icon('edit.png',get_lang('Edit'),'',22).''. - ' '.Display::return_icon('user_subscribe_session.png',get_lang('SubscribeUsersToSession'),'',22).''. - ' '.Display::return_icon('courses_to_session.png',get_lang('SubscribeCoursesToSession'),'',22).''. - ' '.Display::return_icon('copy.png',get_lang('Copy'),'',22).''. - ' '.Display::return_icon('delete.png',get_lang('Delete'),'',22).''. + return \''.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('user_subscribe_session.png',get_lang('SubscribeUsersToSession'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('courses_to_session.png',get_lang('SubscribeCoursesToSession'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('copy.png',get_lang('Copy'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).''. '\'; }'; ?> diff --git a/main/admin/settings.lib.php b/main/admin/settings.lib.php index 4af481e10d..82e7d9452a 100644 --- a/main/admin/settings.lib.php +++ b/main/admin/settings.lib.php @@ -776,8 +776,8 @@ function get_template_data($from, $number_of_items, $column, $direction) { * @since Dokeos 1.8.6 */ function actions_filter($id) { - $return = ''.Display::return_icon('edit.png', get_lang('Edit'),'',22).''; - $return .= ''.Display::return_icon('delete.png', get_lang('Delete'),'',22).''; + $return = ''.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).''; + $return .= ''.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).''; return $return; } diff --git a/main/admin/skills_gradebook.php b/main/admin/skills_gradebook.php index fddf3f0ee5..5aca445683 100644 --- a/main/admin/skills_gradebook.php +++ b/main/admin/skills_gradebook.php @@ -60,9 +60,9 @@ $extra_params['height'] = 'auto'; $action_links = 'function action_formatter(cellvalue, options, rowObject) { //certificates if (rowObject[4] == 1) { - return \''.Display::return_icon('add.png', get_lang('AddSkill'),'',22).''.'\'; + return \''.Display::return_icon('add.png', get_lang('AddSkill'),'',ICON_SIZE_SMALL).''.'\'; } else { - return \''.Display::return_icon('add_na.png', get_lang('YourGradebookFirstNeedsACertificateInOrderToBeLinkedToASkill'),'',22).''.'\'; + return \''.Display::return_icon('add_na.png', get_lang('YourGradebookFirstNeedsACertificateInOrderToBeLinkedToASkill'),'',ICON_SIZE_SMALL).''.'\'; } }'; ?> diff --git a/main/announcements/announcements.inc.php b/main/announcements/announcements.inc.php index f91a907f68..b723685067 100644 --- a/main/announcements/announcements.inc.php +++ b/main/announcements/announcements.inc.php @@ -180,7 +180,7 @@ class AnnouncementManager { echo "

".$title."

"; if (api_is_allowed_to_edit(false,true) || (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) { - $modify_icons = "".Display::return_icon('edit.png', get_lang('Edit'),'',22).""; + $modify_icons = "".Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).""; if ($result['visibility'] == 1) { $image_visibility = "visible"; $alt_visibility = get_lang('Hide'); @@ -191,11 +191,11 @@ class AnnouncementManager { global $stok; $modify_icons .= "". - Display::return_icon($image_visibility.'.png', $alt_visibility,'',22).""; + Display::return_icon($image_visibility.'.png', $alt_visibility,'',ICON_SIZE_SMALL).""; if (api_is_allowed_to_edit(false,true)) { $modify_icons .= "". - Display::return_icon('delete.png', get_lang('Delete'),'',22). + Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL). ""; } echo "$modify_icons"; diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php index 4ef4b5b81f..557cc2b56e 100644 --- a/main/announcements/announcements.php +++ b/main/announcements/announcements.php @@ -727,7 +727,7 @@ if ($display_form) { if (empty($_SESSION['toolgroup'])) { echo '
'. - Display::return_icon('group.png', get_lang('ModifyRecipientList'), array ('align' => 'absmiddle'),22).''.get_lang('SentTo').' + Display::return_icon('group.png', get_lang('ModifyRecipientList'), array ('align' => 'absmiddle'),ICON_SIZE_SMALL).''.get_lang('SentTo').'
'; if (isset($_GET['id']) && is_array($to)) { @@ -1147,7 +1147,7 @@ if ($display_announcement_list) { if (api_is_allowed_to_edit(false,true) OR (api_is_course_coach() && api_is_element_in_the_session(TOOL_ANNOUNCEMENT, $myrow['id'])) OR (api_get_course_setting('allow_user_edit_announcement') && !api_is_anonymous())) { - $modify_icons = "".Display::return_icon('edit.png', get_lang('Edit'),'',22).""; + $modify_icons = "".Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).""; if ($myrow['visibility']==1) { $image_visibility="visible"; $alt_visibility=get_lang('Hide'); @@ -1156,7 +1156,7 @@ if ($display_announcement_list) { $alt_visibility=get_lang('Visible'); } $modify_icons .= "". - Display::return_icon($image_visibility.'.png', $alt_visibility,'',22).""; + Display::return_icon($image_visibility.'.png', $alt_visibility,'',ICON_SIZE_SMALL).""; // DISPLAY MOVE UP COMMAND only if it is not the top announcement if ($iterator != 1) { @@ -1171,7 +1171,7 @@ if ($display_announcement_list) { } if (api_is_allowed_to_edit(false,true)) { $modify_icons .= "". - Display::return_icon('delete.png', get_lang('Delete'),'',22). + Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL). ""; } $iterator ++; diff --git a/main/calendar/agenda.inc.php b/main/calendar/agenda.inc.php index 9ec8490149..9a1fb71dbd 100644 --- a/main/calendar/agenda.inc.php +++ b/main/calendar/agenda.inc.php @@ -1932,10 +1932,10 @@ function display_agenda_items($agenda_items, $day = false) { // edit echo ''; - echo Display::return_icon('edit.png', get_lang('ModifyCalendarItem'),'',22).""; + echo Display::return_icon('edit.png', get_lang('ModifyCalendarItem'),'',ICON_SIZE_SMALL).""; echo ''; - echo Display::return_icon('new_announce.png', get_lang('AddAnnouncement'), array (),22)." "; + echo Display::return_icon('new_announce.png', get_lang('AddAnnouncement'), array (),ICON_SIZE_SMALL)." "; if ($myrow['visibility'] == 1) { $image_visibility = "visible"; @@ -1946,16 +1946,16 @@ function display_agenda_items($agenda_items, $day = false) { $text_visibility = get_lang("Show"); $next_action = 1; } - echo ''.Display::return_icon($image_visibility.'.png', $text_visibility,'',22).' '; + echo ''.Display::return_icon($image_visibility.'.png', $text_visibility,'',ICON_SIZE_SMALL).' '; echo " "; - echo Display::return_icon('delete.png', get_lang('Delete'),'',22)." "; + echo Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL)." "; } $mylink = 'ical_export.php?'.api_get_cidreq().'&type=course&id='.$myrow['id']; //echo ''.Display::return_icon($export_icon_high, get_lang('ExportiCalConfidential')).' '; //echo ''.Display::return_icon($export_icon_low, get_lang('ExportiCalPrivate')).' '; //echo ''.Display::return_icon($export_icon, get_lang('ExportiCalPublic')).' '; - echo ''.Display::return_icon('printer.png', get_lang('Print'),'',22).' '; + echo ''.Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_SMALL).' '; echo ''; } else { if ($is_repeated && (api_is_allowed_to_edit(false,true) || api_get_course_setting('allow_user_edit_agenda') && !api_is_anonymous() )) { @@ -2110,19 +2110,19 @@ function display_one_agenda_item($agenda_id) { $next_action = 1; } - echo ''.Display::return_icon($image_visibility.'.png', get_lang('Visible'),'',22).''; + echo ''.Display::return_icon($image_visibility.'.png', get_lang('Visible'),'',ICON_SIZE_SMALL).''; echo "", - Display::return_icon('edit.png', get_lang('ModifyCalendarItem'),'',22), "", + Display::return_icon('edit.png', get_lang('ModifyCalendarItem'),'',ICON_SIZE_SMALL), "", "", - Display::return_icon('delete.png', get_lang('Delete'),'',22),""; + Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL),""; } $mylink = 'ical_export.php?'.api_get_cidreq().'&type=course&id='.$myrow['id']; //echo ''.Display::return_icon($export_icon_high, get_lang('ExportiCalConfidential')).' '; //echo ''.Display::return_icon($export_icon_low, get_lang('ExportiCalPrivate')).' '; //echo ''.Display::return_icon($export_icon, get_lang('ExportiCalPublic')).' '; - echo ''.Display::return_icon('printer.png', get_lang('Print'),'',22).' '; + echo ''.Display::return_icon('printer.png', get_lang('Print'),'',ICON_SIZE_SMALL).' '; echo ""; } } @@ -2161,7 +2161,7 @@ function display_one_agenda_item($agenda_id) { echo Display::return_icon('attachment.gif',get_lang('Attachment')); echo ' '.$user_filename.''; if (api_is_allowed_to_edit()) { - echo '  '.Display::return_icon('delete.png',get_lang('Delete'),'',22).'
'; + echo '  '.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).'
'; } echo '
'.$attachment_list['comment'].''; echo ''; @@ -2356,7 +2356,7 @@ function show_add_form($id = '') { } else { echo '
- '.Display::return_icon('group.png', get_lang('To'), array ('align' => 'absmiddle'),22).' '.get_lang('To').' + '.Display::return_icon('group.png', get_lang('To'), array ('align' => 'absmiddle'),ICON_SIZE_SMALL).' '.get_lang('To').'
'; /*if ((isset($_GET['id']) && $to=='everyone') || !isset($_GET['id'])) { @@ -3180,7 +3180,7 @@ function get_day_agendaitems($courses_dbs, $month, $year, $day) { $title=$array_course_info['title']; $agenda_link = cut($title,14,true); } else { - $agenda_link = Display::return_icon('course_home.png',' ','',22); + $agenda_link = Display::return_icon('course_home.png',' ','',ICON_SIZE_SMALL); } $URL = api_get_path(WEB_CODE_PATH).'calendar/agenda.php?cidReq='.urlencode($array_course_info["code"])."&day=$day&month=$month&year=$year#$day"; // RH //Patrick Cool: to highlight the relevant agenda item @@ -3291,7 +3291,7 @@ function get_week_agendaitems($courses_dbs, $month, $year, $week = '') { $title=$array_course_info['title']; $agenda_link = cut($title, 14, true); } else { - $agenda_link = Display::return_icon('course_home.png',' ','',22); + $agenda_link = Display::return_icon('course_home.png',' ','',ICON_SIZE_SMALL); } $URL = api_get_path(WEB_CODE_PATH)."calendar/agenda.php?cidReq=".urlencode($array_course_info["code"])."&day=$agendaday&month=$month&year=$year#$agendaday"; // RH //Patrick Cool: to highlight the relevant agenda item diff --git a/main/course_description/listing.php b/main/course_description/listing.php index cdd49a60d0..32c72899ab 100644 --- a/main/course_description/listing.php +++ b/main/course_description/listing.php @@ -42,7 +42,7 @@ if (api_is_allowed_to_edit(null,true)) { // display course description list if ($history) { - echo ''; + echo ''; } $user_info = api_get_user_info(); @@ -56,15 +56,15 @@ if (isset($descriptions) && count($descriptions) > 0) { //delete echo ''; - echo Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),22); + echo Display::return_icon('delete.png', get_lang('Delete'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL); echo ' '; //edit echo ''; - echo Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'),22); + echo Display::return_icon('edit.png', get_lang('Edit'), array('style' => 'vertical-align:middle;float:right; padding-right:4px;'),ICON_SIZE_SMALL); echo ' '; } else { - echo Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'),22); + echo Display::return_icon('edit_na.png', get_lang('EditionNotAvailableFromSession'), array('style' => 'vertical-align:middle;float:right;'),ICON_SIZE_SMALL); } } diff --git a/main/course_progress/thematic.php b/main/course_progress/thematic.php index 0cdbd3aa32..ca07d7de9b 100644 --- a/main/course_progress/thematic.php +++ b/main/course_progress/thematic.php @@ -50,8 +50,8 @@ if ($action == 'thematic_list') { } elseif ($action == 'thematic_details') { if ($last_id) { - $link_to_thematic_plan = ''.Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style'=>'vertical-align:middle'),22).''; - $link_to_thematic_advance = ''.Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style'=>'vertical-align:middle'),22).''; + $link_to_thematic_plan = ''.Display::return_icon('lesson_plan.png', get_lang('ThematicPlan'), array('style'=>'vertical-align:middle'),ICON_SIZE_SMALL).''; + $link_to_thematic_advance = ''.Display::return_icon('lesson_plan_calendar.png', get_lang('ThematicAdvance'), array('style'=>'vertical-align:middle'),ICON_SIZE_SMALL).''; Display::display_confirmation_message(get_lang('ThematicSectionHasBeenCreatedSuccessfull').'
'.sprintf(get_lang('NowYouShouldAddThematicPlanXAndThematicAdvanceX'),$link_to_thematic_plan, $link_to_thematic_advance), false); } @@ -99,20 +99,20 @@ if ($action == 'thematic_list') { if (api_get_session_id() == 0 ) { if ($thematic['display_order'] > 1) { - $actions_first_col .= ' '.Display::return_icon('up.png', get_lang('Up'),'',22).''; + $actions_first_col .= ' '.Display::return_icon('up.png', get_lang('Up'),'',ICON_SIZE_SMALL).''; } else { - $actions_first_col .= ' '.Display::return_icon('up_na.png',' ','',22); + $actions_first_col .= ' '.Display::return_icon('up_na.png',' ','',ICON_SIZE_SMALL); } if ($thematic['display_order'] < $thematic['max_thematic_item']) { - $actions_first_col .= ' '.Display::return_icon('down.png',get_lang('Down'),'',22).''; + $actions_first_col .= ' '.Display::return_icon('down.png',get_lang('Down'),'',ICON_SIZE_SMALL).''; } else { - $actions_first_col .= ' '.Display::return_icon('down_na.png',' ','',22); + $actions_first_col .= ' '.Display::return_icon('down_na.png',' ','',ICON_SIZE_SMALL); } } if (api_get_session_id() == $thematic['session_id']) { - $actions_first_col .= ''.Display::return_icon('edit.png',get_lang('Edit'),'',22).''; - $actions_first_col .= ''.Display::return_icon('delete.png',get_lang('Delete'),'',22).''; + $actions_first_col .= ''.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).''; + $actions_first_col .= ''.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).''; } $actions_first_col = Display::div($actions_first_col, array('id'=>'thematic_id_content_'.$thematic['id'], 'class'=>'thematic_tools')); @@ -144,7 +144,7 @@ if ($action == 'thematic_list') { //if (api_is_allowed_to_edit(null, true) && api_get_session_id() == $thematic['session_id']) { if (api_is_allowed_to_edit(null, true)) { - //echo '
'; + //echo '
'; echo ''; } @@ -160,8 +160,8 @@ if ($action == 'thematic_list') { $edit_link = ''; if (api_is_allowed_to_edit(null, true)) { - $edit_link = ''.Display::return_icon('edit.png',get_lang('EditThematicAdvance'),array(),22).''; - $edit_link .= ''.Display::return_icon('delete.png',get_lang('Delete'),'',22).''; + $edit_link = ''.Display::return_icon('edit.png',get_lang('EditThematicAdvance'),array(),ICON_SIZE_SMALL).''; + $edit_link .= ''.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).''; //Links $edit_link = Display::div(Display::div($edit_link , array('id'=>'thematic_advance_tools_'.$thematic_advance['id'], 'class'=>'thematic_advance_actions')), array('style'=>'height:20px;')); diff --git a/main/document/document.inc.php b/main/document/document.inc.php index 368c88f2cf..a059034abb 100644 --- a/main/document/document.inc.php +++ b/main/document/document.inc.php @@ -210,14 +210,14 @@ function create_document_link($document_data, $show_as_icon = false, $counter = //filter when I am into shared folder, I can show for donwload only my shared folder if (is_shared_folder($curdirpath, $current_session_id)) { if (preg_match('/shared_folder\/sf_user_'.api_get_user_id().'$/', urldecode($forcedownload_link))|| preg_match('/shared_folder_session_'.$current_session_id.'\/sf_user_'.api_get_user_id().'$/', urldecode($forcedownload_link)) || api_is_allowed_to_edit() || api_is_platform_admin()) { - $force_download_html = ($size == 0) ? '' : ''.Display::return_icon($forcedownload_icon, get_lang('Download'), array(),22).''; + $force_download_html = ($size == 0) ? '' : ''.Display::return_icon($forcedownload_icon, get_lang('Download'), array(),ICON_SIZE_SMALL).''; } } elseif(!preg_match('/shared_folder/', urldecode($forcedownload_link)) || api_is_allowed_to_edit() || api_is_platform_admin()) { - $force_download_html = ($size == 0) ? '' : ''.Display::return_icon($forcedownload_icon, get_lang('Download'), array(),22).''; + $force_download_html = ($size == 0) ? '' : ''.Display::return_icon($forcedownload_icon, get_lang('Download'), array(),ICON_SIZE_SMALL).''; } } } else { - $force_download_html = ($size==0)?'':''.Display::return_icon($forcedownload_icon, get_lang('Download'), array(),22).''; + $force_download_html = ($size==0)?'':''.Display::return_icon($forcedownload_icon, get_lang('Download'), array(),ICON_SIZE_SMALL).''; } //copy files to users myfiles @@ -226,7 +226,7 @@ function create_document_link($document_data, $show_as_icon = false, $counter = $copy_myfiles_link = ($filetype == 'file') ? api_get_self().'?'.api_get_cidreq().'&action=copytomyfiles&id='.$document_data['id'].$req_gid :api_get_self().'?'.api_get_cidreq(); if ($filetype == 'file') { - $copy_to_myfiles = ''.Display::return_icon('briefcase.png', get_lang('CopyToMyFiles'), array(),22).'  '; + $copy_to_myfiles = ''.Display::return_icon('briefcase.png', get_lang('CopyToMyFiles'), array(),ICON_SIZE_SMALL).'  '; } } @@ -237,7 +237,7 @@ function create_document_link($document_data, $show_as_icon = false, $counter = } if ($is_browser_viewable_file) { - $open_in_new_window_link = ''.Display::return_icon('open_in_new_window.png', get_lang('OpenInANewWindow'), array(),22).'  '; + $open_in_new_window_link = ''.Display::return_icon('open_in_new_window.png', get_lang('OpenInANewWindow'), array(),ICON_SIZE_SMALL).'  '; } //target="'.$target.'" if ($filetype == 'file') { @@ -485,45 +485,45 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0, if ($is_read_only /*or ($session_id!=api_get_session_id())*/) { if (api_is_course_admin() || api_is_platform_admin()) { if($extension=='svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') { - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } elseif($extension=='png' || $extension=='jpg' || $extension=='jpeg' || $extension=='bmp' || $extension=='gif' ||$extension=='pxd' && api_get_setting('enabled_support_pixlr') == 'true'){ - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } else { - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } } else { - $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'),'',22); + $modify_icons = Display::return_icon('edit_na.png', get_lang('Modify'),'',ICON_SIZE_SMALL); } $modify_icons .= ' '.Display::return_icon('move_na.png', get_lang('Move'),array(), 22); if (api_is_allowed_to_edit() || api_is_platform_admin()) { - $modify_icons .= ' '.Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'),'',22); + $modify_icons .= ' '.Display::return_icon($visibility_icon.'.png', get_lang('VisibilityCannotBeChanged'),'',ICON_SIZE_SMALL); } $modify_icons .= ' '.Display::return_icon('delete_na.png', get_lang('Delete'),array(), 22); } else { if ($is_certificate_mode) { // gradebook category doesn't seem to be taken into account - //$modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + //$modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } else { if (api_get_session_id()) { if ($document_data['session_id'] == api_get_session_id()) { if ($extension=='svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') { - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } elseif($extension=='png' || $extension=='jpg' || $extension=='jpeg' || $extension=='bmp' || $extension=='gif' ||$extension=='pxd' && api_get_setting('enabled_support_pixlr') == 'true'){ - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } else { - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } } else { $modify_icons .= ' '.Display::return_icon('edit_na.png', get_lang('Edit'),array(), 22).''; } } else { if ($extension=='svg' && api_browser_support('svg') && api_get_setting('enabled_support_svg') == 'true') { - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } elseif($extension=='png' || $extension=='jpg' || $extension=='jpeg' || $extension=='bmp' || $extension=='gif' ||$extension=='pxd' && api_get_setting('enabled_support_pixlr') == 'true'){ - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } else { - $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',22).''; + $modify_icons = ''.Display::return_icon('edit.png', get_lang('Modify'),'',ICON_SIZE_SMALL).''; } } } @@ -548,7 +548,7 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0, }else{ $tip_visibility=get_lang('Hide'); } - $modify_icons .= ' '.Display::return_icon($visibility_icon.'.png', $tip_visibility,'',22).''; + $modify_icons .= ' '.Display::return_icon($visibility_icon.'.png', $tip_visibility,'',ICON_SIZE_SMALL).''; } } @@ -597,13 +597,13 @@ function build_edit_icons($document_data, $id, $is_template, $is_read_only = 0, $modify_icons .= ' '; if ($is_preview) { $modify_icons .= ' '. - Display::return_icon('preview_view.png', $preview,'',22).''; + Display::return_icon('preview_view.png', $preview,'',ICON_SIZE_SMALL).''; } } } } else { $modify_icons .= ' '. - Display::return_icon('wizard_na.png', get_lang('RemoveAsTemplate'),'',22).''; + Display::return_icon('wizard_na.png', get_lang('RemoveAsTemplate'),'',ICON_SIZE_SMALL).''; } $modify_icons .= ' '.Display::return_icon('pdf.png', get_lang('Export2PDF'),array(), 22).''; } diff --git a/main/document/document_lite.php b/main/document/document_lite.php index 21e3806823..d49b2d42ce 100644 --- a/main/document/document_lite.php +++ b/main/document/document_lite.php @@ -860,9 +860,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 \''.Display::return_icon('edit.png',get_lang('Edit'),'',22).''. - ' '.Display::return_icon('copy.png',get_lang('Copy'),'',22).''. - ' '.Display::return_icon('delete.png',get_lang('Delete'),'',22).''. + return \''.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('copy.png',get_lang('Copy'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).''. '\'; }'; $js_content = Display::grid_js('documents', '' ,$columns,$column_model, $extra_params, $sortable_data, $action_links,true); diff --git a/main/dropbox/index.php b/main/dropbox/index.php old mode 100755 new mode 100644 index 212b003d08..2405d3d7a1 --- a/main/dropbox/index.php +++ b/main/dropbox/index.php @@ -439,12 +439,12 @@ if ($action != 'add') { // New icon $new_icon = ''; if ($dropbox_file->last_upload_date > $last_access AND !in_array($dropbox_file->id, $_SESSION['_seen'][$_course['id']][TOOL_DROPBOX])) { - $new_icon = ' '.Display::return_icon('new_dropbox_message.png', get_lang('New'),'',22); + $new_icon = ' '.Display::return_icon('new_dropbox_message.png', get_lang('New'),'',ICON_SIZE_SMALL); } $link_open = ''; $dropbox_file_data[] = $link_open.build_document_icon_tag('file', $dropbox_file->title).''; - $dropbox_file_data[] = ''.Display::return_icon('save.png', get_lang('Download'), array('style' => 'float:right;'),22).''.$link_open.$dropbox_file->title.''.$new_icon.'
'.$dropbox_file->description; + $dropbox_file_data[] = ''.Display::return_icon('save.png', get_lang('Download'), array('style' => 'float:right;'),ICON_SIZE_SMALL).''.$link_open.$dropbox_file->title.''.$new_icon.'
'.$dropbox_file->description; $file_size = $dropbox_file->filesize; $dropbox_file_data[] = format_file_size($file_size); $dropbox_file_data[] = $dropbox_file->author; @@ -454,9 +454,9 @@ if ($action != 'add') { $dropbox_file_data[] = date_to_str_ago($last_upload_date).'
'.api_format_date($last_upload_date).''; $action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').' - '.Display::return_icon('discuss.png', get_lang('Comment'),'',22).' - '.Display::return_icon('move.png', get_lang('Move'),'',22).' - '.Display::return_icon('delete.png', get_lang('Delete'),'',22).''; + '.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).' + '.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).' + '.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).''; //$action_icons=' '.Display::return_icon('deplacer.gif',get_lang('Move')).' // '.Display::return_icon('delete.gif', get_lang('Delete')).''; // This is a hack to have an additional row in a sortable table @@ -487,12 +487,12 @@ if ($action != 'add') { // The icon of the category $link_open = ''; $dropbox_category_data[] = $link_open.build_document_icon_tag('folder', $category['cat_name']).''; - $dropbox_category_data[] = ''.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),22).''.$link_open.$category['cat_name'].''; + $dropbox_category_data[] = ''.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).''.$link_open.$category['cat_name'].''; $dropbox_category_data[] = ''; $dropbox_category_data[] = ''; $dropbox_category_data[] = ''; - $dropbox_category_data[] = ''.Display::return_icon('edit.png',get_lang('Edit'),'',22).' - '.Display::return_icon('delete.png', get_lang('Delete'),'',22).''; + $dropbox_category_data[] = ''.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).' + '.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).''; } if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) { $dropbox_data_recieved[] = $dropbox_category_data; @@ -588,7 +588,7 @@ if ($action != 'add') { $dropbox_file_data[] = $dropbox_file->id; $link_open = ''; $dropbox_file_data[] = $link_open.build_document_icon_tag('file', $dropbox_file->title).''; - $dropbox_file_data[] = ''.Display::return_icon('save.png', get_lang('Save'), array('style' => 'float:right;'),22).''.$link_open.$dropbox_file->title.'
'.$dropbox_file->description; + $dropbox_file_data[] = ''.Display::return_icon('save.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).''.$link_open.$dropbox_file->title.'
'.$dropbox_file->description; $file_size = $dropbox_file->filesize; $dropbox_file_data[] = format_file_size($file_size); foreach ($dropbox_file->recipients as $recipient) { @@ -604,9 +604,9 @@ if ($action != 'add') { $action_icons = check_number_feedback($dropbox_file->id, $number_feedback).' '.get_lang('Feedback').' - '.Display::return_icon('discuss.png', get_lang('Comment'),'',22).' - '.Display::return_icon('move.png', get_lang('Move'),'',22).' - '.Display::return_icon('delete.png', get_lang('Delete'),'',22).''; + '.Display::return_icon('discuss.png', get_lang('Comment'),'',ICON_SIZE_SMALL).' + '.Display::return_icon('move.png', get_lang('Move'),'',ICON_SIZE_SMALL).' + '.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).''; // This is a hack to have an additional row in a sortable table if ($action == 'viewfeedback' && isset($_GET['id']) && is_numeric($_GET['id']) && $dropbox_file->id == $_GET['id']) { $action_icons .= "\n"; // ending the normal row of the sortable table @@ -630,14 +630,14 @@ if ($action != 'add') { $dropbox_category_data[] = $category['cat_id']; // This is where the checkbox icon for the files appear. $link_open = ''; $dropbox_category_data[] = $link_open.build_document_icon_tag('folder', $category['cat_name']).''; - $dropbox_category_data[] = ''.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),22).''.$link_open.$category['cat_name'].''; + $dropbox_category_data[] = ''.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'),ICON_SIZE_SMALL).''.$link_open.$category['cat_name'].''; //$dropbox_category_data[] = ''; $dropbox_category_data[] = ''; //$dropbox_category_data[] = ''; $dropbox_category_data[] = ''; $dropbox_category_data[] = ''; - $dropbox_category_data[] = ''.Display::return_icon('edit.png', get_lang('Edit'),'',22).' - '.Display::return_icon('delete.png', get_lang('Delete'),'',22).''; + $dropbox_category_data[] = ''.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).' + '.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).''; } if (is_array($dropbox_category_data) && count($dropbox_category_data) > 0) { $dropbox_data_sent[] = $dropbox_category_data; diff --git a/main/exercice/exercice.php b/main/exercice/exercice.php index d327e98ff3..a8af21fa7c 100644 --- a/main/exercice/exercice.php +++ b/main/exercice/exercice.php @@ -561,33 +561,33 @@ if (!empty($exercise_list)) { if ($session_id == $row['session_id']) { //Settings - $actions = Display::url(Display::return_icon('edit.png',get_lang('Edit'),'',22), 'admin.php?'.api_get_cidreq().'&exerciseId='.$row['id']); + $actions = Display::url(Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL), 'admin.php?'.api_get_cidreq().'&exerciseId='.$row['id']); //Exercise results - $actions .=''.Display :: return_icon('test_results.png', get_lang('Results'),'',22).''; + $actions .=''.Display :: return_icon('test_results.png', get_lang('Results'),'',ICON_SIZE_SMALL).''; //Export $actions .= Display::url(Display::return_icon('cd.gif', get_lang('CopyExercise')), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id'])); //Clean exercise - $actions .= Display::url(Display::return_icon('clean.png', get_lang('CleanStudentResults'),'',22),'', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDeleteResults'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=clean_results&sec_token='.$token.'&exerciseId='.$row['id'])); + $actions .= Display::url(Display::return_icon('clean.png', get_lang('CleanStudentResults'),'',ICON_SIZE_SMALL),'', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDeleteResults'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=clean_results&sec_token='.$token.'&exerciseId='.$row['id'])); //Visible / invisible if ($row['active']) { - $actions .= Display::url(Display::return_icon('visible.png', get_lang('Deactivate'),'',22) , 'exercice.php?'.api_get_cidreq().'&choice=disable&sec_token='.$token.'&page='.$page.'&exerciseId='.$row['id']); + $actions .= Display::url(Display::return_icon('visible.png', get_lang('Deactivate'),'',ICON_SIZE_SMALL) , 'exercice.php?'.api_get_cidreq().'&choice=disable&sec_token='.$token.'&page='.$page.'&exerciseId='.$row['id']); } else { // else if not active - $actions .= Display::url(Display::return_icon('invisible.png', get_lang('Activate'),'',22) , 'exercice.php?'.api_get_cidreq().'&choice=enable&sec_token='.$token.'&page='.$page.'&exerciseId='.$row['id']); + $actions .= Display::url(Display::return_icon('invisible.png', get_lang('Activate'),'',ICON_SIZE_SMALL) , 'exercice.php?'.api_get_cidreq().'&choice=enable&sec_token='.$token.'&page='.$page.'&exerciseId='.$row['id']); } // Export qti ... $actions .= Display::url(Display::return_icon('export_qti2.png','IMS/QTI','',ICON_SIZE_SMALL), 'exercice.php?choice=exportqti2&exerciseId='.$row['id']); } else { // not session $actions = Display::return_icon('edit_na.png', get_lang('ExerciseEditionNotAvailableInSession')); - $actions .=''.Display :: return_icon('test_results.png', get_lang('Results'),'',22).''; + $actions .=''.Display :: return_icon('test_results.png', get_lang('Results'),'',ICON_SIZE_SMALL).''; $actions .= Display::url(Display::return_icon('cd.gif', get_lang('CopyExercise')), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToCopy'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=copy_exercise&sec_token='.$token.'&exerciseId='.$row['id'])); } //Delete if ($session_id == $row['session_id']) { - $actions .= Display::url(Display::return_icon('delete.png', get_lang('Delete'),'',22), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDelete'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=delete&sec_token='.$token.'&exerciseId='.$row['id'])); + $actions .= Display::url(Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL), '', array('onclick'=>"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang('AreYouSureToDelete'),ENT_QUOTES,$charset))." ".addslashes($row['title'])."?"."')) return false;",'href'=>'exercice.php?'.api_get_cidreq().'&choice=delete&sec_token='.$token.'&exerciseId='.$row['id'])); } // Number of questions @@ -738,7 +738,7 @@ if (!empty($exercise_list)) { $item .= Display::tag('td', $attempt_text); //See results - //$actions = ''.$num.Display::return_icon('test_results.png', get_lang('Results'),'',22).' '; + //$actions = ''.$num.Display::return_icon('test_results.png', get_lang('Results'),'',ICON_SIZE_SMALL).' '; } $class = 'row_even'; if ($count % 2) { @@ -823,17 +823,17 @@ if (isset($attribute['path']) && is_array($attribute['path'])) { $item = Display::tag('td','HotPotatoes '.$title.' '); $item .= Display::tag('td','-'); - $actions = Display::url(Display::return_icon('edit.png',get_lang('Edit'),'',22), 'adminhp.php?'.api_get_cidreq().'&hotpotatoesName='.$path); - $actions .='' . Display :: return_icon('test_results.png', get_lang('Results'),'',22).''; + $actions = Display::url(Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL), 'adminhp.php?'.api_get_cidreq().'&hotpotatoesName='.$path); + $actions .='' . Display :: return_icon('test_results.png', get_lang('Results'),'',ICON_SIZE_SMALL).''; // if active if ($active) { $nbrActiveTests = $nbrActiveTests +1; - $actions .= ' '.Display::return_icon('visible.png', get_lang('Deactivate'),'',22).''; + $actions .= ' '.Display::return_icon('visible.png', get_lang('Deactivate'),'',ICON_SIZE_SMALL).''; } else { // else if not active - $actions .=' '.Display::return_icon('invisible.png', get_lang('Activate'),'',22).''; + $actions .=' '.Display::return_icon('invisible.png', get_lang('Activate'),'',ICON_SIZE_SMALL).''; } - $actions .= ''.Display::return_icon('delete.png', get_lang('Delete'),'',22).''; + $actions .= ''.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).''; //$actions .=''; $item .= Display::tag('td', $actions); @@ -843,7 +843,7 @@ if (isset($attribute['path']) && is_array($attribute['path'])) { $nbrActiveTests = $nbrActiveTests +1; $item .= Display::tag('td', ''.$title.''); $item .= Display::tag('td', ''); - $actions ='' . Display :: return_icon('test_results.png', get_lang('Results'),'',22).''; + $actions ='' . Display :: return_icon('test_results.png', get_lang('Results'),'',ICON_SIZE_SMALL).''; $item .= Display::tag('td', $actions); echo Display::tag('tr',$item, array('class'=>$class)); } diff --git a/main/exercice/live_stats.php b/main/exercice/live_stats.php index 7bc597e6f5..9510a4d8d7 100644 --- a/main/exercice/live_stats.php +++ b/main/exercice/live_stats.php @@ -56,9 +56,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 \''.Display::return_icon('edit.png',get_lang('Edit'),'',22).''. - ' '.Display::return_icon('copy.png',get_lang('Copy'),'',22).''. - ' '.Display::return_icon('delete.png',get_lang('Delete'),'',22).''. + return \''.Display::return_icon('edit.png',get_lang('Edit'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('copy.png',get_lang('Copy'),'',ICON_SIZE_SMALL).''. + ' '.Display::return_icon('delete.png',get_lang('Delete'),'',ICON_SIZE_SMALL).''. '\'; }'; */ diff --git a/main/forum/viewthread_nested.inc.php b/main/forum/viewthread_nested.inc.php index a2fa55a412..29bb414843 100644 --- a/main/forum/viewthread_nested.inc.php +++ b/main/forum/viewthread_nested.inc.php @@ -78,7 +78,7 @@ foreach ($rows as $post) { display_visible_invisible_icon('post', $post['post_id'], $post['visible'],array('forum'=>$clean_forum_id,'thread'=>$clean_thread_id )); echo ""; if ($count>0) { - echo "".Display::return_icon('move.png',get_lang('MovePost'), array(),22).""; + echo "".Display::return_icon('move.png',get_lang('MovePost'), array(),ICON_SIZE_SMALL).""; } } $userinf=api_get_user_info($post['user_id']); diff --git a/main/inc/introductionSection.inc.php b/main/inc/introductionSection.inc.php index 48fec2c602..642f9e9bcf 100644 --- a/main/inc/introductionSection.inc.php +++ b/main/inc/introductionSection.inc.php @@ -253,11 +253,11 @@ if ($intro_dispCommand) { // Displays "edit intro && delete intro" commands $introduction_section .= ""; } diff --git a/main/survey/survey.lib.php b/main/survey/survey.lib.php index 4d7c098ebb..7a5eb81213 100644 --- a/main/survey/survey.lib.php +++ b/main/survey/survey.lib.php @@ -4141,7 +4141,7 @@ class SurveyUtil { // Coach can see that only if the survey is in his session if (api_is_allowed_to_edit() || api_is_element_in_the_session(TOOL_SURVEY, $survey_id)) { - $return .= ''.Display::return_icon('edit.png', get_lang('Edit'),'',22).''; + $return .= ''.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).''; $return .= ''.Display::return_icon('clean.png', get_lang('EmptySurvey'),'',ICON_SIZE_SMALL).' '; } //$return .= ''.Display::return_icon('copy.gif', get_lang('Copy')).''; @@ -4150,7 +4150,7 @@ class SurveyUtil { $return .= ''.Display::return_icon('mail_send.png', get_lang('Publish'),'',ICON_SIZE_SMALL).' '; $return .= ''.Display::return_icon('stats.png', get_lang('Reporting'),'',ICON_SIZE_SMALL).''; if (api_is_allowed_to_edit() || api_is_element_in_the_session(TOOL_SURVEY, $survey_id)) { - $return .= ''.Display::return_icon('delete.png', get_lang('Delete'),'',22).' '; + $return .= ''.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).' '; } return $return; } @@ -4162,9 +4162,9 @@ class SurveyUtil { //$return .= ''.Display::return_icon('delete.gif', get_lang('Delete')).''; //$return .= ''.Display::return_icon('copy.gif', get_lang('Copy')).''; //$return .= ''.Display::return_icon('add.gif', get_lang('Add')).''; - $return .= ''.Display::return_icon('preview_view.png', get_lang('Preview'),'',22).' '; - $return .= ''.Display::return_icon('mail_send.png', get_lang('Publish'),'',22).' '; - $return .= ''.Display::return_icon('clean.png', get_lang('EmptySurvey'),'',22).' '; + $return .= ''.Display::return_icon('preview_view.png', get_lang('Preview'),'',ICON_SIZE_SMALL).' '; + $return .= ''.Display::return_icon('mail_send.png', get_lang('Publish'),'',ICON_SIZE_SMALL).' '; + $return .= ''.Display::return_icon('clean.png', get_lang('EmptySurvey'),'',ICON_SIZE_SMALL).' '; //$return .= ''.Display::return_icon('statistics.gif', get_lang('Reporting')).''; return $return; } diff --git a/main/survey/survey.php b/main/survey/survey.php index bcd9492e92..8549837634 100644 --- a/main/survey/survey.php +++ b/main/survey/survey.php @@ -217,17 +217,17 @@ while ($row = Database::fetch_array($result, 'ASSOC')) { echo ' '.$tool_name.''; echo ' '.$row['number_of_options'].''; echo ' '; - echo ' '.Display::return_icon('edit.png', get_lang('Edit'),'',22).''; - echo ' '.Display::return_icon('delete.png', get_lang('Delete'),'',22).''; + echo ' '.Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).''; + echo ' '.Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).''; if ($question_counter > 1) { - echo ' '.Display::return_icon('up.png', get_lang('MoveUp'),'',22).''; + echo ' '.Display::return_icon('up.png', get_lang('MoveUp'),'',ICON_SIZE_SMALL).''; } else { - Display::display_icon('up_na.png',' ','',22); + Display::display_icon('up_na.png',' ','',ICON_SIZE_SMALL); } if ($question_counter < $question_counter_max) { - echo ' '.Display::return_icon('down.png', get_lang('MoveDown'),'',22).''; + echo ' '.Display::return_icon('down.png', get_lang('MoveDown'),'',ICON_SIZE_SMALL).''; } else { - Display::display_icon('down_na.png',' ','',22); + Display::display_icon('down_na.png',' ','',ICON_SIZE_SMALL); } echo ' '; $question_counter++; @@ -282,9 +282,9 @@ if ($is_survey_type_1) { while($row = Database::fetch_array($rs,ASSOC)){ $grouplist .= ''.$row['name'].''.$row['description'].''. ''. - Display::return_icon('edit.png', get_lang('Edit'),'',22).' '. + Display::return_icon('edit.png', get_lang('Edit'),'',ICON_SIZE_SMALL).' '. ''. - Display::return_icon('delete.png', get_lang('Delete'),'',22).''. + Display::return_icon('delete.png', get_lang('Delete'),'',ICON_SIZE_SMALL).''. ''; } echo $grouplist.''; diff --git a/main/wiki/index.php b/main/wiki/index.php index 810af3d328..aed669f139 100644 --- a/main/wiki/index.php +++ b/main/wiki/index.php @@ -252,9 +252,9 @@ if ($_GET['view']) { // check if is an assignment if ($current_row['assignment']==1) { Display::display_normal_message(get_lang('EditAssignmentWarning')); - $icon_assignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',22); + $icon_assignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL); } elseif($current_row['assignment']==2) { - $icon_assignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',22); + $icon_assignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL); if ((api_get_user_id()==$current_row['user_id'])==false) { if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { $PassEdit=true; @@ -1070,9 +1070,9 @@ if ($_GET['action']=='usercontrib') { //get type assignment icon if ($obj->assignment==1) { - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',22); + $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL); } elseif ($obj->assignment==2) { - $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',22); + $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); } elseif ($obj->assignment==0) { $ShowAssignment=''; } @@ -1134,9 +1134,9 @@ if ($_GET['action']=='mostchanged') { while ($obj = Database::fetch_object($allpages)) { //get type assignment icon if ($obj->assignment==1) { - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',22); + $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); } elseif ($obj->assignment==2) { - $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',22); + $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); } elseif ($obj->assignment==0) { $ShowAssignment=''; } @@ -1176,9 +1176,9 @@ if ($_GET['action']=='mvisited') { while ($obj = Database::fetch_object($allpages)) { //get type assignment icon if ($obj->assignment==1) { - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',22); + $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); } elseif ($obj->assignment==2) { - $ShowAssignment=$ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',22); + $ShowAssignment=$ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); } elseif ($obj->assignment==0) { $ShowAssignment=''; } @@ -1307,9 +1307,9 @@ if ($_GET['action']=='orphaned') { $orphaned_title=$row['title']; $orphaned_visibility=$row['visibility']; if ($row['assignment']==1) { - $ShowAssignment=Display::return_icon('wiki_assignment.png','','',22); + $ShowAssignment=Display::return_icon('wiki_assignment.png','','',ICON_SIZE_SMALL); } elseif ($row['assignment']==2) { - $ShowAssignment=Display::return_icon('wiki_work.png','','',22); + $ShowAssignment=Display::return_icon('wiki_work.png','','',ICON_SIZE_SMALL); } elseif ($row['assignment']==0) { $ShowAssignment=''; } @@ -1515,9 +1515,9 @@ if ($_GET['action']=='links') { //get type assignment icon if ($row['assignment']==1) { - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',22); + $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); } elseif ($row['assignment']==2) { - $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',22); + $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); } elseif ($row['assignment']==0) { $ShowAssignment=''; } @@ -1565,9 +1565,9 @@ if ($_GET['action']=='links') { //get type assignment icon if ($obj->assignment==1) { - $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',22); + $ShowAssignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDesc'),'',ICON_SIZE_SMALL); } elseif ($obj->assignment==2) { - $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',22); + $ShowAssignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWork'),'',ICON_SIZE_SMALL); } elseif ($obj->assignment==0) { $ShowAssignment=''; } @@ -1707,9 +1707,9 @@ if ($_GET['action']=='edit') { // check if is a assignment if ($row['assignment']==1) { Display::display_normal_message(get_lang('EditAssignmentWarning')); - $icon_assignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',22); + $icon_assignment=Display::return_icon('wiki_assignment.png', get_lang('AssignmentDescExtra'),'',ICON_SIZE_SMALL); } elseif ($row['assignment']==2) { - $icon_assignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',22); + $icon_assignment=Display::return_icon('wiki_work.png', get_lang('AssignmentWorkExtra'),'',ICON_SIZE_SMALL); if ((api_get_user_id()==$row['user_id'])==false) { if (api_is_allowed_to_edit(false,true) || api_is_platform_admin()) { $PassEdit=true; @@ -1856,7 +1856,7 @@ if ($_GET['action']=='edit') { echo '