From 70df90e884bf2b5a217eb896afcc4c41f30a9d9f Mon Sep 17 00:00:00 2001 From: Julio Montoya Date: Mon, 19 Jan 2009 22:56:57 +0100 Subject: [PATCH] [svn r17844] Minor - lang variables changed FS#821 --- main/reservation/m_item.php | 19 ++++++++++--------- main/reservation/m_reservation.php | 8 ++++---- main/reservation/mysubscriptions.php | 19 ++++++++----------- main/reservation/rsys.php | 1 + 4 files changed, 23 insertions(+), 24 deletions(-) diff --git a/main/reservation/m_item.php b/main/reservation/m_item.php index 48e4cbd146..9b4d5d8989 100644 --- a/main/reservation/m_item.php +++ b/main/reservation/m_item.php @@ -45,22 +45,23 @@ $tool_name = get_lang('ResourceList'); */ function modify_filter($id) { $str=''; - $outtt=false; - if(Rsys::item_allow($id,'edit')){ - $str.=''; - } - //if(Rsys::item_allow($id,'m_rights')) $str.='  '; - if(Rsys::item_allow($id,'delete')) $str.=' '; - if(Rsys::item_allow($id,'edit')){ + $outtt=false; + if(Rsys::item_allow($id,'edit')){ $number = Rsys :: get_item($id); //checking the status if ($number[5]==1) { $str.= ' '; - } - else { + } else { $str.= ' '; } } + + if(Rsys::item_allow($id,'edit')){ + $str.=''; + } + //if(Rsys::item_allow($id,'m_rights')) $str.='  '; + if(Rsys::item_allow($id,'delete')) $str.=' '; + return $str; } diff --git a/main/reservation/m_reservation.php b/main/reservation/m_reservation.php index 47a68e0439..bcfc3fb2e1 100644 --- a/main/reservation/m_reservation.php +++ b/main/reservation/m_reservation.php @@ -111,7 +111,7 @@ switch ($_GET['action']) { $table->set_header(1, get_lang('ResourceTypeName'), true); $table->set_header(2, get_lang('StartDate'), true); $table->set_header(3, get_lang('EndDate'), true); - $table->set_header(4, get_lang('Name'), true); + $table->set_header(4, get_lang('SubscribedPerson'), true); $table->set_header(5, get_lang('SubscribedStartDate'), true); $table->set_header(6, get_lang('SubscribedEndDate'), true); $table->set_header(7, get_lang('Accept'), true); @@ -139,7 +139,7 @@ switch ($_GET['action']) { $table = new SortableTable('accepting', array ('Rsys', 'get_num_waiting_users'), array ('Rsys', 'get_table_waiting_users'), 1); $table->set_additional_parameters(array ('rid' => $_GET['rid'], 'action' => 'accept')); $table->set_header(0, '', false, array ('style' => 'width:10px')); - $table->set_header(1, get_lang('Name'), true); + $table->set_header(1, get_lang('SubscribedPerson'), true); $table->set_header(2, get_lang('Class'), true); $table->set_header(3, get_lang('SubscribedStartDate'), true); $table->set_header(4, get_lang('SubscribedEndDate'), true); @@ -221,8 +221,8 @@ switch ($_GET['action']) { $form->addElement('html', '
'.get_lang('TimePickerMinMaxNull').'

'); $form->addElement('html', ''); - $recurrence[] = $form->createElement('radio', 'recurrence_c', '', get_lang('NoRecurence'), 0, array ('onclick' => 'javascript:window_hide(\'recurrence_timewindow\')')); - $recurrence[] = $form->createElement('radio', 'recurrence_c', '', get_lang('UntilRecurence'), 1 , array ('onclick' => 'javascript:window_show(\'recurrence_timewindow\')')); + $recurrence[] = $form->createElement('radio', 'recurrence_c', '', get_lang('NoRecurrence'), 0, array ('onclick' => 'javascript:window_hide(\'recurrence_timewindow\')')); + $recurrence[] = $form->createElement('radio', 'recurrence_c', '', get_lang('UntilRecurrence'), 1 , array ('onclick' => 'javascript:window_show(\'recurrence_timewindow\')')); $form->addGroup($recurrence, null, get_lang('Recurrence'), '
', false); $form->addElement('html', '
'); $list_time = Rsys:: recurrence_list(); diff --git a/main/reservation/mysubscriptions.php b/main/reservation/mysubscriptions.php index 77ec5a6e09..d6dee286da 100644 --- a/main/reservation/mysubscriptions.php +++ b/main/reservation/mysubscriptions.php @@ -62,28 +62,25 @@ switch ($_GET['action']) { $NoSearchResults=get_lang('noSubscriptions'); Display :: display_header($tool_name); api_display_tool_title($tool_name); - if (api_is_allowed_to_create_course()) - { - echo '
'; - /// echo ''.get_lang('AddNewBookingPeriod').''; - //echo '   '.get_lang('OverviewReservedPeriods').''; + + if (api_is_allowed_to_create_course()) { + echo '
'; echo '
'.Display::return_icon('sessions.gif',get_lang('BookingCalendarView')).' '.get_lang('GoToCalendarView').'
'; echo ''.Display::return_icon('cube.png',get_lang('Resources')).' '.get_lang('Resources').''; echo '  '.Display::return_icon('calendar_day.gif',get_lang('BookingPeriods')).' '.get_lang('BookingPeriods').''; echo '  '.Display::return_icon('calendar_add.gif',get_lang('BookIt')).' '.get_lang('BookIt').''; - if (api_is_platform_admin()) - { + if (api_is_platform_admin()) { //echo '  '.Display::return_icon('settings.gif',get_lang('Configuration')).' '.get_lang('Configuration').''; } echo '

'; } - if (isset ($_POST['action'])){ - switch ($_POST['action']){ + if (isset ($_POST['action'])) { + switch ($_POST['action']) { case 'delete_subscriptions' : $ids = $_POST['subscriptions']; - if (count($ids) > 0){ + if (count($ids) > 0) { foreach ($ids as $id) Rsys :: delete_subscription(substr($id,0,strpos($id,'-')),substr($id,strrpos($id,'-')+1)); } @@ -97,7 +94,7 @@ switch ($_GET['action']) { $table->set_header(2, get_lang('StartAt'), true); $table->set_header(3, get_lang('EndAt'), true); $table->set_header(4, get_lang('Accept'), true); - $table->set_header(5, '', false,array('style'=>'width:20px;')); + $table->set_header(5, get_lang('Modify'), false,array('style'=>'width:50px;')); $table->set_column_filter(5, 'modify_filter'); $table->set_form_actions(array ('delete_subscriptions' => get_lang('DeleteSelectedSubscriptions')),'subscriptions'); $table->display(); diff --git a/main/reservation/rsys.php b/main/reservation/rsys.php index 591741345c..dabceb9be3 100644 --- a/main/reservation/rsys.php +++ b/main/reservation/rsys.php @@ -7,6 +7,7 @@ Copyright (c) 2004-2008 Dokeos SPRL Copyright (c) Sebastien Jacobs (www.spiritual-coder.com) Copyright (c) Kristof Van Steenkiste + Copyright (c) Julio Montoya Armas For a full list of contributors, see "credits.txt". The full license can be read in "license.txt".