From 42e1f192eefe66fb035950cc1705212f61834fda Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Wed, 15 Feb 2012 17:36:33 +0100 Subject: [PATCH] Replacing some '22' strings with the new icon constant ICON_SIZE_SMALL --- main/admin/configure_homepage.php | 2 +- main/admin/course_list.php | 4 ++-- main/admin/dashboard_add_courses_to_user.php | 2 +- main/admin/dashboard_add_sessions_to_user.php | 2 +- main/admin/dashboard_add_users_to_user.php | 2 +- main/admin/group_list.php | 4 ++-- main/admin/index.php | 2 +- main/admin/legal_add.php | 2 +- main/admin/legal_list.php | 2 +- main/admin/resume_session.php | 14 ++++++------ main/admin/session_category_list.php | 4 ++-- main/admin/session_course_user_list.php | 2 +- main/admin/system_announcements.php | 2 +- main/group/group_edit.php | 16 +++++++------- main/inc/ajax/model.ajax.php | 4 ++-- main/inc/lib/notebook.lib.php | 4 ++-- main/work/work.lib.php | 22 +++++++++---------- 17 files changed, 45 insertions(+), 45 deletions(-) mode change 100755 => 100644 main/admin/dashboard_add_courses_to_user.php mode change 100755 => 100644 main/admin/dashboard_add_sessions_to_user.php mode change 100755 => 100644 main/admin/dashboard_add_users_to_user.php diff --git a/main/admin/configure_homepage.php b/main/admin/configure_homepage.php index 2d5698b0f9..a2b4a899eb 100644 --- a/main/admin/configure_homepage.php +++ b/main/admin/configure_homepage.php @@ -938,7 +938,7 @@ switch ($action) { - + '.Display::return_icon('course_home.gif', get_lang('CourseHomepage')).' '. // This is not the preferable way to go to the homepage. ''.Display::return_icon('course_home.gif', get_lang('CourseHomepage')).' '. ''.Display::return_icon('statistics.gif', get_lang('Tracking')).' '. - ''.Display::return_icon('edit.png', get_lang('Edit'), array(), 22).' '. + ''.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).' '. ''.Display::return_icon('backup.gif', get_lang('CreateBackup')).' '. - ''.Display::return_icon('delete.png', get_lang('Delete'), array(), 22).''; + ''.Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).''; } /** diff --git a/main/admin/dashboard_add_courses_to_user.php b/main/admin/dashboard_add_courses_to_user.php old mode 100755 new mode 100644 index bc436f01f1..b270afbedb --- a/main/admin/dashboard_add_courses_to_user.php +++ b/main/admin/dashboard_add_courses_to_user.php @@ -179,7 +179,7 @@ if (intval($_POST['formSent']) == 1) { Display::display_header($tool_name); // actions -echo '
+echo '
'.Display::return_icon('add_user_big.gif', get_lang('AssignUsers'), array('style'=>'vertical-align:middle')).' '.get_lang('AssignUsers').' '.Display::return_icon('view_more_stats.gif', get_lang('AssignSessions'), array('style'=>'vertical-align:middle')).' '.get_lang('AssignSessions').' diff --git a/main/admin/dashboard_add_sessions_to_user.php b/main/admin/dashboard_add_sessions_to_user.php old mode 100755 new mode 100644 index 3c84b8debd..a99c6b39f0 --- a/main/admin/dashboard_add_sessions_to_user.php +++ b/main/admin/dashboard_add_sessions_to_user.php @@ -174,7 +174,7 @@ if (intval($_POST['formSent']) == 1) { Display::display_header($tool_name); // actions -echo '
'; +echo '
'; if ($user_info['status'] != SESSIONADMIN) { echo ' '.Display::return_icon('add_user_big.gif', get_lang('AssignUsers'), array('style'=>'vertical-align:middle')).' '.get_lang('AssignUsers').' diff --git a/main/admin/dashboard_add_users_to_user.php b/main/admin/dashboard_add_users_to_user.php old mode 100755 new mode 100644 index bee3abb87b..62ec59cc45 --- a/main/admin/dashboard_add_users_to_user.php +++ b/main/admin/dashboard_add_users_to_user.php @@ -177,7 +177,7 @@ if (intval($_POST['formSent']) == 1) { Display::display_header($tool_name); // actions -echo '
+echo '
'.Display::return_icon('course_add.gif', get_lang('AssignCourses'), array('style'=>'vertical-align:middle')).' '.get_lang('AssignCourses').' '.Display::return_icon('view_more_stats.gif', get_lang('AssignSessions'), array('style'=>'vertical-align:middle')).' '.get_lang('AssignSessions').' diff --git a/main/admin/group_list.php b/main/admin/group_list.php index 35c34e9a7c..196e774574 100644 --- a/main/admin/group_list.php +++ b/main/admin/group_list.php @@ -180,8 +180,8 @@ function modify_filter($group_id,$url_params,$row) global $_admins_list; if (api_is_platform_admin()) { $result .= ''.Display::return_icon('subscribe_users_social_network.png',get_lang('AddUsersToGroup'),'',ICON_SIZE_SMALL).''; - $result .= ''.Display::return_icon('edit.png', get_lang('Edit'), array(), 22).'  '; - $result .= ''.Display::return_icon('delete.png', get_lang('Delete'), array(), 22).''; + $result .= ''.Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL).'  '; + $result .= ''.Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).''; } return $result; } diff --git a/main/admin/index.php b/main/admin/index.php index 165552e786..42955a2749 100644 --- a/main/admin/index.php +++ b/main/admin/index.php @@ -157,7 +157,7 @@ if (api_is_platform_admin()) { if (api_get_setting('use_session_mode') == 'true') { - $blocks['sessions']['icon'] = Display::return_icon('session.png', get_lang('Sessions'), array(), 22); + $blocks['sessions']['icon'] = Display::return_icon('session.png', get_lang('Sessions'), array(), ICON_SIZE_SMALL); $blocks['sessions']['label'] = api_ucfirst(get_lang('Sessions')); $search_form = '
diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php index c526605895..08231afdd0 100644 --- a/main/admin/legal_add.php +++ b/main/admin/legal_add.php @@ -183,7 +183,7 @@ function sendlang(){ '; // action menu -echo '
'; +echo '
'; echo '
'; diff --git a/main/admin/legal_list.php b/main/admin/legal_list.php index a4da42c61f..6ef6a28310 100644 --- a/main/admin/legal_list.php +++ b/main/admin/legal_list.php @@ -15,7 +15,7 @@ require_once api_get_path(LIBRARY_PATH).'legal.lib.php'; $parameters['sec_token'] = Security::get_token(); // action menu -echo '
'; +echo '
'; echo '
'; diff --git a/main/admin/resume_session.php b/main/admin/resume_session.php index 160b1c68f8..86ce979cdb 100644 --- a/main/admin/resume_session.php +++ b/main/admin/resume_session.php @@ -130,7 +130,7 @@ echo Display::tag('h1', Display::return_icon('session.png', get_lang('Session')) - + @@ -217,7 +217,7 @@ if ($multiple_url_is_on) { - + @@ -281,9 +281,9 @@ if ($session['nbr_courses'] == 0){ '.$course['nbr_users'].' '.Display::return_icon('course_home.gif', get_lang('Course')).' - '.Display::return_icon('user.png', get_lang('Edit'), '', 22).' + '.Display::return_icon('user.png', get_lang('Edit'), '', ICON_SIZE_SMALL).' '.Display::return_icon('statistics.gif', get_lang('Tracking')).'  - '.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')).' '; @@ -297,7 +297,7 @@ if ($session['nbr_courses'] == 0){ - + @@ -340,8 +340,8 @@ if ($session['nbr_users']==0) { if ($multiple_url_is_on) { if ($user['access_url_id'] != $url_id) { - $user_link .= ' '.Display::return_icon('warning.png', get_lang('UserNotAddedInURL'), array(), 22); - $add = Display::return_icon('add.png', get_lang('AddUsersToURL'), array(), 22); + $user_link .= ' '.Display::return_icon('warning.png', get_lang('UserNotAddedInURL'), array(), ICON_SIZE_SMALL); + $add = Display::return_icon('add.png', get_lang('AddUsersToURL'), array(), ICON_SIZE_SMALL); $link_to_add_user_in_url = ''.$add.''; } } diff --git a/main/admin/session_category_list.php b/main/admin/session_category_list.php index c99c44d371..64119d1bbd 100644 --- a/main/admin/session_category_list.php +++ b/main/admin/session_category_list.php @@ -171,10 +171,10 @@ if (isset ($_GET['search']) && $_GET['search'] == 'advanced') { - + - + diff --git a/main/admin/session_course_user_list.php b/main/admin/session_course_user_list.php index 25c05ea4eb..55d79f15fe 100644 --- a/main/admin/session_course_user_list.php +++ b/main/admin/session_course_user_list.php @@ -165,7 +165,7 @@ foreach ($Users as $key=>$enreg) { - + diff --git a/main/admin/system_announcements.php b/main/admin/system_announcements.php index 3513353451..de7008d8c3 100644 --- a/main/admin/system_announcements.php +++ b/main/admin/system_announcements.php @@ -253,7 +253,7 @@ if ($show_announcement_list) { $row[] = "id."&person=".VISIBLE_GUEST."&action=". ($announcement->visible_guest ? 'make_invisible' : 'make_visible')."\">".Display::return_icon(($announcement->visible_guest ? 'visible.gif' : 'invisible.gif'), get_lang('ShowOrHide')).""; $row[] = $announcement->lang; - $row[] = "id."\">".Display::return_icon('edit.png', get_lang('Edit'), array(), 22)." id."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."')) return false;\">".Display::return_icon('delete.png', get_lang('Delete'), array(), 22).""; + $row[] = "id."\">".Display::return_icon('edit.png', get_lang('Edit'), array(), ICON_SIZE_SMALL)." id."\" onclick=\"javascript:if(!confirm('".addslashes(api_htmlentities(get_lang("ConfirmYourChoice"), ENT_QUOTES))."')) return false;\">".Display::return_icon('delete.png', get_lang('Delete'), array(), ICON_SIZE_SMALL).""; $announcement_data[] = $row; } $table = new SortableTableFromArray($announcement_data); diff --git a/main/group/group_edit.php b/main/group/group_edit.php index 9dfd3bfdad..8ffc2531e4 100644 --- a/main/group/group_edit.php +++ b/main/group/group_edit.php @@ -249,21 +249,21 @@ $form->addRule('max_member_group', get_lang('InvalidMaxNumberOfMembers'), 'callb $group = array(); $group[] = $form->createElement('checkbox', 'self_registration_allowed', get_lang('GroupSelfRegistration'), get_lang('GroupAllowStudentRegistration'), 1); $group[] = $form->createElement('checkbox', 'self_unregistration_allowed', null, get_lang('GroupAllowStudentUnregistration'), 1); -$form->addGroup($group, '', Display::return_icon('user.png', get_lang('GroupSelfRegistration') , array(), 22).' '.get_lang('GroupSelfRegistration'), '
', false); +$form->addGroup($group, '', Display::return_icon('user.png', get_lang('GroupSelfRegistration') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupSelfRegistration'), '
', false); // Documents settings $group = array(); $group[] = $form->createElement('radio', 'doc_state', get_lang('GroupDocument'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE); $group[] = $form->createElement('radio', 'doc_state', null, get_lang('Public'), TOOL_PUBLIC); $group[] = $form->createElement('radio', 'doc_state', null, get_lang('Private'), TOOL_PRIVATE); -$form->addGroup($group, '', Display::return_icon('folder.png', get_lang('GroupDocument') , array(), 22).' '.get_lang('GroupDocument'), '
', false); +$form->addGroup($group, '', Display::return_icon('folder.png', get_lang('GroupDocument') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupDocument'), '
', false); // Work settings $group = array(); $group[] = $form->createElement('radio', 'work_state', get_lang('GroupWork'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE); $group[] = $form->createElement('radio', 'work_state', null, get_lang('Public'), TOOL_PUBLIC); $group[] = $form->createElement('radio', 'work_state', null, get_lang('Private'), TOOL_PRIVATE); -$form->addGroup($group, '', Display::return_icon('work.png', get_lang('GroupWork') , array(), 22).' '.get_lang('GroupWork'), '
', false); +$form->addGroup($group, '', Display::return_icon('work.png', get_lang('GroupWork') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupWork'), '
', false); // Calendar settings @@ -271,35 +271,35 @@ $group = array(); $group[] = $form->createElement('radio', 'calendar_state', get_lang('GroupCalendar'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE); $group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Public'), TOOL_PUBLIC); $group[] = $form->createElement('radio', 'calendar_state', null, get_lang('Private'), TOOL_PRIVATE); -$form->addGroup($group, '', Display::return_icon('agenda.png', get_lang('GroupCalendar') , array(), 22).' '.get_lang('GroupCalendar'), '
', false); +$form->addGroup($group, '', Display::return_icon('agenda.png', get_lang('GroupCalendar') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupCalendar'), '
', false); // Announcements settings $group = array(); $group[] = $form->createElement('radio', 'announcements_state', get_lang('GroupAnnouncements'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE); $group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Public'), TOOL_PUBLIC); $group[] = $form->createElement('radio', 'announcements_state', null, get_lang('Private'), TOOL_PRIVATE); -$form->addGroup($group, '', Display::return_icon('announce.png', get_lang('GroupAnnouncements') , array(), 22).' '.get_lang('GroupAnnouncements'), '
', false); +$form->addGroup($group, '', Display::return_icon('announce.png', get_lang('GroupAnnouncements') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupAnnouncements'), '
', false); //Forum settings $group = array(); $group[] = $form->createElement('radio', 'forum_state', get_lang('GroupForum'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE); $group[] = $form->createElement('radio', 'forum_state', null, get_lang('Public'), TOOL_PUBLIC); $group[] = $form->createElement('radio', 'forum_state', null, get_lang('Private'), TOOL_PRIVATE); -$form->addGroup($group, '', Display::return_icon('forum.png', get_lang('GroupForum') , array(), 22).' '.get_lang('GroupForum'), '
', false); +$form->addGroup($group, '', Display::return_icon('forum.png', get_lang('GroupForum') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupForum'), '
', false); // Wiki settings $group = array(); $group[] = $form->createElement('radio', 'wiki_state', get_lang('GroupWiki'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE); $group[] = $form->createElement('radio', 'wiki_state', null, get_lang('Public'), TOOL_PUBLIC); $group[] = $form->createElement('radio', 'wiki_state', null, get_lang('Private'), TOOL_PRIVATE); -$form->addGroup($group, '', Display::return_icon('wiki.png', get_lang('GroupWiki') , array(), 22).' '.get_lang('GroupWiki'), '
', false); +$form->addGroup($group, '', Display::return_icon('wiki.png', get_lang('GroupWiki') , array(), ICON_SIZE_SMALL).' '.get_lang('GroupWiki'), '
', false); // Chat settings $group = array(); $group[] = $form->createElement('radio', 'chat_state', get_lang('Chat'), get_lang('NotAvailable'), TOOL_NOT_AVAILABLE); $group[] = $form->createElement('radio', 'chat_state', null, get_lang('Public'), TOOL_PUBLIC); $group[] = $form->createElement('radio', 'chat_state', null, get_lang('Private'), TOOL_PRIVATE); -$form->addGroup($group, '', Display::return_icon('chat.png', get_lang('Chat') , array(), 22).' '.get_lang('Chat'), '
', false); +$form->addGroup($group, '', Display::return_icon('chat.png', get_lang('Chat') , array(), ICON_SIZE_SMALL).' '.get_lang('Chat'), '
', false); // submit button $form->addElement('style_submit_button', 'submit', get_lang('PropModify'), 'class="save"'); diff --git a/main/inc/ajax/model.ajax.php b/main/inc/ajax/model.ajax.php index 59d059cddd..22925cae1a 100644 --- a/main/inc/ajax/model.ajax.php +++ b/main/inc/ajax/model.ajax.php @@ -194,10 +194,10 @@ switch ($action) { $item['name'] = Display::url($item['name'], api_get_path(WEB_CODE_PATH).'gradebook/index.php?id_session=0&cidReq='.$item['course_code']); if (!empty($item['certif_min_score']) && !empty($item['document_id'])) { - $item['certificates'] = Display::return_icon('accept.png', get_lang('WithCertificate'), array(), 22); + $item['certificates'] = Display::return_icon('accept.png', get_lang('WithCertificate'), array(), ICON_SIZE_SMALL); $item['has_certificates'] = '1'; } else { - $item['certificates'] = Display::return_icon('warning.png', get_lang('NoCertificate'), array(), 22); + $item['certificates'] = Display::return_icon('warning.png', get_lang('NoCertificate'), array(), ICON_SIZE_SMALL); $item['has_certificates'] = '0'; } diff --git a/main/inc/lib/notebook.lib.php b/main/inc/lib/notebook.lib.php index 929e0dff9a..7ffa969772 100644 --- a/main/inc/lib/notebook.lib.php +++ b/main/inc/lib/notebook.lib.php @@ -219,8 +219,8 @@ class NotebookManager echo '
'; echo '
'.$row['description'].'
'; echo ''; } //return $return; diff --git a/main/work/work.lib.php b/main/work/work.lib.php index 1198c0e00e..5aad11268d 100644 --- a/main/work/work.lib.php +++ b/main/work/work.lib.php @@ -774,7 +774,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor $text_file = api_strtolower(get_lang('FileUpload')); } - $icon = Display::return_icon('work.png', get_lang('Assignment'), array(), 22); + $icon = Display::return_icon('work.png', get_lang('Assignment'), array(), ICON_SIZE_SMALL); if (!empty($display_edit_form) && !empty($edit_dir) && $edit_dir == $id2) { $row[] = $icon; @@ -801,7 +801,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor //Work name //if (api_is_allowed_to_edit()) { if ($cant_files > 0 ) { - $zip = ''.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), 22).''; + $zip = ''.Display::return_icon('save_pack.png', get_lang('Save'), array('style' => 'float:right;'), ICON_SIZE_SMALL).''; } //} $url = $zip.''. @@ -823,7 +823,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor if ($origin != 'learnpath') { if ($is_allowed_to_edit) { - $action .= ''.Display::return_icon('edit.png', get_lang('Modify'), array(), 22).''; + $action .= ''.Display::return_icon('edit.png', get_lang('Modify'), array(), ICON_SIZE_SMALL).''; $action .= ' '.Display::return_icon('delete.png',get_lang('DirDelete'),'',ICON_SIZE_SMALL).''; $row[] = $action; } else { @@ -881,7 +881,7 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor $row[] = ''.build_document_icon_tag('file', substr(basename($work->url), 13)).''; if ($work->contains_file) { - $row[] = ''.Display::return_icon('save.png', get_lang('Save'),array('style' => 'float:right;'), 22).' '.$work->title.'
'.$work->description; + $row[] = ''.Display::return_icon('save.png', get_lang('Save'),array('style' => 'float:right;'), ICON_SIZE_SMALL).' '.$work->title.'
'.$work->description; } else { $row[] = ''.$work->title.'
'.$work->description; } @@ -899,18 +899,18 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor $action = ''; if ($qualification_exists) { $action .= ''. - Display::return_icon('rate_work.png', get_lang('CorrectAndRate'),array(), 22).''; + Display::return_icon('rate_work.png', get_lang('CorrectAndRate'),array(), ICON_SIZE_SMALL).''; } else { $action .= ''. - Display::return_icon('edit.png', get_lang('Comment'),array(), 22).''; + Display::return_icon('edit.png', get_lang('Comment'),array(), ICON_SIZE_SMALL).''; } if ($work->contains_file) { - $action .= ''.Display::return_icon('move.png', get_lang('Move'),array(), 22).''; + $action .= ''.Display::return_icon('move.png', get_lang('Move'),array(), ICON_SIZE_SMALL).''; } if ($work->accepted == '1') { - $action .= ''.Display::return_icon('visible.png', get_lang('Invisible'),array(), 22).''; + $action .= ''.Display::return_icon('visible.png', get_lang('Invisible'),array(), ICON_SIZE_SMALL).''; } else { - $action .= ''.Display::return_icon('invisible.png', get_lang('Visible'),array(), 22).' '; + $action .= ''.Display::return_icon('invisible.png', get_lang('Visible'),array(), ICON_SIZE_SMALL).' '; } $action .= ''.Display::return_icon('delete.png', get_lang('WorkDelete'),'',ICON_SIZE_SMALL).''; $row[] = $action; @@ -923,9 +923,9 @@ function display_student_publications_list($id, $link_target_parameter, $dateFor } $action = ''; if (api_is_allowed_to_session_edit(false, true)) { - $action .= ''.Display::return_icon('edit.png', get_lang('Modify'),array(), 22).''; + $action .= ''.Display::return_icon('edit.png', get_lang('Modify'),array(), ICON_SIZE_SMALL).''; } else { - $action .= Display::return_icon('edit_na.png', get_lang('Modify'),array(), 22); + $action .= Display::return_icon('edit_na.png', get_lang('Modify'),array(), ICON_SIZE_SMALL); } if (api_get_course_setting('student_delete_own_publication') == 1) { $action .= ''.Display::return_icon('delete.png',get_lang('WorkDelete'),'',ICON_SIZE_SMALL).'';