From 62691ea612449149ca0763bda8d31f79c471ac18 Mon Sep 17 00:00:00 2001 From: Carlos Vargas Date: Tue, 7 Apr 2009 20:04:42 +0200 Subject: [PATCH] [svn r19608] partial, buttons styles and others see FS#3991 --- main/admin/configure_extensions.php | 15 ++++++++------- main/admin/course_add.php | 4 ++-- main/admin/course_edit.php | 4 ++-- main/announcements/announcements.php | 14 +++++++++++--- main/inc/lib/blog.lib.php | 4 ++-- main/reservation/m_category.php | 4 ++-- main/reservation/m_item.php | 6 +++--- main/reservation/m_reservation.php | 8 ++++---- 8 files changed, 34 insertions(+), 25 deletions(-) diff --git a/main/admin/configure_extensions.php b/main/admin/configure_extensions.php index d01a1fb49c..4cb4f28767 100644 --- a/main/admin/configure_extensions.php +++ b/main/admin/configure_extensions.php @@ -320,10 +320,10 @@ Display::display_header($nameTool); { $defaults[$row['subkey']] = $row['selected_value']; } - $form -> addElement('submit', 'activeExtension', get_lang('ReconfigureExtension')); + $form -> addElement('style_submit_button', 'activeExtension', get_lang('ReconfigureExtension'),'class="save"'); } else { - $form -> addElement('submit', 'activeExtension', get_lang('ActivateExtension')); + $form -> addElement('style_submit_button', 'activeExtension', get_lang('ActivateExtension'),'class="save"'); } $form -> setDefaults($defaults); $form -> display(); @@ -387,13 +387,13 @@ Display::display_header($nameTool); { $defaults[$row['subkey']] = $row['selected_value']; } - $form -> addElement('submit', 'activeExtension', get_lang('ReconfigureExtension')); + $form -> addElement('style_submit_button', 'activeExtension', get_lang('ReconfigureExtension'),'class="save"'); } else { $defaults['host'] = 'localhost'; $defaults['port'] = '2002'; $defaults['size'] = '720x540'; - $form -> addElement('submit', 'activeExtension', get_lang('ActivateExtension')); + $form -> addElement('style_submit_button', 'activeExtension', get_lang('ActivateExtension'),'class="save"'); } $form -> setDefaults($defaults); @@ -490,7 +490,7 @@ Display::display_header($nameTool);
- +
@@ -513,7 +513,7 @@ Display::display_header($nameTool);
- +
@@ -536,8 +536,9 @@ Display::display_header($nameTool);
- +
+ diff --git a/main/admin/course_add.php b/main/admin/course_add.php index 14bdd4586d..433cad93c9 100644 --- a/main/admin/course_add.php +++ b/main/admin/course_add.php @@ -1,5 +1,5 @@ addElement('radio', 'unsubscribe', null, get_lang('NotAllowedToUnsubscrib $form->add_textfield('disk_quota',get_lang('CourseQuota')); $form->addRule('disk_quota',get_lang('ThisFieldShouldBeNumeric'),'numeric'); $form->add_progress_bar(); -$form->addElement('submit', null, get_lang('Ok')); +$form->addElement('style_submit_button','submit', get_lang('CreateCourse'),'class="add"'); // Set some default values $values['course_language'] = get_setting('platformLanguage'); $values['disk_quota'] = get_setting('default_document_quotum'); diff --git a/main/admin/course_edit.php b/main/admin/course_edit.php index 3120c2d8c6..0cdd9696a5 100644 --- a/main/admin/course_edit.php +++ b/main/admin/course_edit.php @@ -1,4 +1,4 @@ -addElement('radio', 'unsubscribe', null, get_lang('NotAllowedToUnsubscrib $form->addElement('text','disk_quota',get_lang('CourseQuota')); $form->addRule('disk_quota', get_lang('ThisFieldIsRequired'),'required'); $form->addRule('disk_quota',get_lang('ThisFieldShouldBeNumeric'),'numeric'); -$form->addElement('style_submit_button', 'button', get_lang('ModifyCourseInfo'),'onclick="valide()"; class="search"'); +$form->addElement('style_submit_button', 'button', get_lang('ModifyCourseInfo'),'onclick="valide()"; class="save"'); // Set some default values $course_db_name = $course['db_name']; diff --git a/main/announcements/announcements.php b/main/announcements/announcements.php index 43d17a97b4..ccbdf7064b 100644 --- a/main/announcements/announcements.php +++ b/main/announcements/announcements.php @@ -1,4 +1,4 @@ -ToolbarSet = "Announcements"; } + if ($_GET['action']=='add') { + $class='add'; + $text=get_lang('SendAnnouncement'); + } elseif ($_GET['action']=='modify') { + $class='save'; + $text=get_lang('ModifyAnnouncement'); + } + $oFCKeditor->Value = $content_to_modify; echo $oFCKeditor->CreateHtml(); echo'
'; if(empty($_SESSION['toolgroup'])) { echo ''; //echo '


'; - echo '


'; + echo '


'; } else { echo ''; //echo '


'; - echo '


'; + echo '


'; } echo '
'; diff --git a/main/inc/lib/blog.lib.php b/main/inc/lib/blog.lib.php index 849f45aaec..bcc1336554 100644 --- a/main/inc/lib/blog.lib.php +++ b/main/inc/lib/blog.lib.php @@ -1589,7 +1589,7 @@ class Blog /* edit by Kevin Van Den Haute (kevin@develop-it.be) */ echo "\t" . '' . "\n"; - echo "\t\t" . 'Task management:  ' . "\n"; + echo "\t\t" . '' . get_lang('TaskManager') . ':  ' . "\n"; echo "\t\t" . '' . "\n"; echo "\t\t\t" . ''; echo "\t\t\t\t" . '' . "\n"; @@ -1679,7 +1679,7 @@ class Blog $arrPermissions[] = $row['action']; echo "\t" . '' . "\n"; - echo "\t\t" . '' . "\n"; + echo "\t\t" . '' . "\n"; echo "\t\t" . '
Task management:  ' . get_lang('TaskManager') . ':  ' . "\n"; echo "\t\t\t" . ''; echo "\t\t\t\t" . '' . "\n"; diff --git a/main/reservation/m_category.php b/main/reservation/m_category.php index 08c7b0370e..46241a09f2 100644 --- a/main/reservation/m_category.php +++ b/main/reservation/m_category.php @@ -65,7 +65,7 @@ switch ($_GET['action']) { api_display_tool_title(get_lang('AddNewResourceType')); $form = new FormValidator('category', 'post', 'm_category.php?action=add'); $form->add_textfield('name', get_lang('ResourceTypeName'), true, array ('maxlength' => '128')); - $form->addElement('submit', 'submit', get_lang('Ok')); + $form->addElement('style_submit_button', 'submit', get_lang('CreateResourceType'),'class="add"'); if ($form->validate()) { $values = $form->exportValues(); if (Rsys :: add_category($values['name'])) @@ -82,7 +82,7 @@ switch ($_GET['action']) { $form = new FormValidator('category', 'post', 'm_category.php?action=edit'); $form->add_textfield('name', get_lang('ResourceTypeName'), true, array ('maxlength' => '128')); $form->addElement('hidden', 'id', $_GET['id']); - $form->addElement('submit', 'submit', get_lang('Ok')); + $form->addElement('style_submit_button', 'submit', get_lang('ModifyResourceType'),'class="save"'); $form->setDefaults(Rsys :: get_category($_GET['id'])); if ($form->validate()) { $values = $form->exportValues(); diff --git a/main/reservation/m_item.php b/main/reservation/m_item.php index ba48394eae..68af7352cd 100644 --- a/main/reservation/m_item.php +++ b/main/reservation/m_item.php @@ -279,7 +279,7 @@ switch ($_GET['action']) { $item_right['m_reservation'] = $item_rights[0]['m_reservation']; $form->setDefaults($item_right); - $form->addElement('submit', 'submit', get_lang('Ok')); + $form->addElement('style_submit_button', 'submit', get_lang('Ok'),'class="save"'); if ($form->validate()) { $values = $form->exportValues(); Rsys :: edit_item_right($values['item_id'], $values['class_id'], $values['edit_right'], $values['delete_right'], $values['m_reservation']); @@ -373,7 +373,7 @@ switch ($_GET['action']) { //$form->addElement('select', 'course_code', get_lang('ItemCourse'),array(''=>'','value'=>'tag')); //$form->addRule('course', get_lang('ThisFieldIsRequired'), 'required'); - $form->addElement('submit', 'submit', get_lang('Ok')); + $form->addElement('style_submit_button', 'submit', get_lang('AddNewResource'),'class="add"'); if ($form->validate()) { $values = $form->exportValues(); if (Rsys :: add_item($values['name'], $values['description'], $values['category'], $values['course_code'])) @@ -405,7 +405,7 @@ switch ($_GET['action']) { $form->addElement('textarea', 'description', get_lang('Description'), array ('rows' => '3', 'cols' => '40')); $form->addRule('category_id', get_lang('ThisFieldIsRequired'), 'required'); $form->addElement('hidden', 'id', $item['id']); - $form->addElement('submit', 'submit', get_lang('Ok')); + $form->addElement('style_submit_button', 'submit', get_lang('EditResource'),'class="save"'); $form->setDefaults($item); if ($form->validate()) { $values = $form->exportValues(); diff --git a/main/reservation/m_reservation.php b/main/reservation/m_reservation.php index e1c0a35ed2..c0bd61d29e 100644 --- a/main/reservation/m_reservation.php +++ b/main/reservation/m_reservation.php @@ -103,7 +103,7 @@ switch ($_GET['action']) { echo '
'; echo '
'; echo ''; - echo ''; + echo ''; echo '

'; $table = new SortableTable('reservation', array ('Rsys', 'get_num_subscriptions_overview'), array ('Rsys', 'get_table_subcribed_reservations'), 1); @@ -234,7 +234,7 @@ switch ($_GET['action']) { $form->add_datepicker('recurrence_until',get_lang('RepeatUntil')); $form->addElement('html', ''); $form->addElement('textarea', 'notes', get_lang('Notes'), array ('cols' => 40, 'rows' => 4)); - $form->addElement('submit', 'submit', get_lang('Ok')); + $form->addElement('style_submit_button', 'submit', get_lang('AddNewBookingPeriod'),'class="add"'); $str=''; if(!$_POST['forever']) $str.="window_hide('forever_timewindow');"; @@ -469,7 +469,7 @@ switch ($_GET['action']) { $form->addElement('checkbox', 'auto_accept', get_lang('AutoAccept')); $form->addElement('checkbox', 'timepicker', get_lang('TimePicker'),'',array('disabled'=>'disabled')); $form->addElement('textarea', 'notes', get_lang('Notes'), array ('cols' => 40, 'rows' => 4)); - $form->addElement('submit', 'submit', get_lang('Ok')); + $form->addElement('style_submit_button', 'submit', get_lang('EditNewBookingPeriod'),'class="save"'); $form->addElement('hidden', 'id', $Reservation_id); $form->addElement('hidden', 'timepicker2'); $form->addElement('hidden', 'period', ($reservation[0][7] == '0000-00-00 00:00:00' && $reservation[0][8] == '0000-00-00 00:00:00' ? 0 : 1)); @@ -568,7 +568,7 @@ switch ($_GET['action']) { echo ''.get_lang('AddNewBookingPeriod').''; echo '   '.get_lang('OverviewReservedPeriods').''; echo ''; - echo '
'; + echo '
'; echo '
'; if (isset ($_POST['action'])) {