chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

[svn r17778] Minor - some fixes FS#821

Browse Source
skala
Julio Montoya 17 years ago
parent cf3698686b
commit 640d218d17
3 changed files with 18 additions and 7 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      main/reservation/m_item.php
  2. 16
      main/reservation/m_reservation.php
  3. 5
      main/reservation/subscribe.php

2
main/reservation/m_item.php
Unescape View File

@ -462,7 +462,7 @@ switch ($_GET['action']) {
$table->set_header(1, get_lang('ItemName'), true); $table->set_header(1, get_lang('ItemName'), true);
$table->set_header(2, get_lang('ItemDescription'), true); $table->set_header(2, get_lang('ItemDescription'), true);
$table->set_header(3, get_lang('ResourceType'), true); $table->set_header(3, get_lang('ResourceType'), true);
$table->set_header(4, get_lang('ItemCreator'), true); $table->set_header(4, get_lang('Owner'), true);
$table->set_header(5, '', false, array ('style' => 'width:100px;')); $table->set_header(5, '', false, array ('style' => 'width:100px;'));
$table->set_column_filter(5, 'modify_filter'); $table->set_column_filter(5, 'modify_filter');
$table->set_form_actions(array ('delete_items' => get_lang('DeleteSelectedItems')), 'items'); $table->set_form_actions(array ('delete_items' => get_lang('DeleteSelectedItems')), 'items');

16
main/reservation/m_reservation.php
Unescape View File

@ -199,16 +199,26 @@ switch ($_GET['action']) {
$timepicker_arr[] = $form->createElement('radio', 'timepicker', '', get_lang('TimePicker'), 1 , array ('onclick' => 'javascript:window_show(\'timepicker_timewindow\')')); $timepicker_arr[] = $form->createElement('radio', 'timepicker', '', get_lang('TimePicker'), 1 , array ('onclick' => 'javascript:window_show(\'timepicker_timewindow\')'));
$form->addGroup($timepicker_arr, null, get_lang('TimePicker'), '<br />', false); $form->addGroup($timepicker_arr, null, get_lang('TimePicker'), '<br />', false);
$form->addElement('html', '<div style="margin-left:25px;display:block;" id="timepicker_timewindow">'); $form->addElement('html', '<div style="margin-left:25px;display:block;" id="timepicker_timewindow">');
$min_arr = array(); $min_arr = array();
//todo this will be fixed
$min_arr[10] = 10;
$min_arr[20] = 20;
$min_arr[30] = 30;
$min_arr[40] = 40;
$min_arr[50] = 50;
$min_arr[60] = 60;
for ($i = 0; $i < 1441; $i++) { for ($i = 0; $i < 1441; $i++) {
$min_arr[$i] = $i; //$min_arr[$i] = $i;
} }
$max_arr = $min_arr; $max_arr = $min_arr;
$form->addElement('select',min,get_lang('Minimum'),$min_arr); $form->addElement('select',min,get_lang('Minimum'),$min_arr);
$form->addElement('select',max,get_lang('Maximum'),$max_arr); $form->addElement('select',max,get_lang('Maximum'),$max_arr);
$form->addElement('html', '<div class="row"><div class="label"></div><div class="formw">'.get_lang('TimePickerMinMaxNull').'</div></div><br />');
$form->addElement('html', '<div class="row"><div class="label"></div><div class="formw">'.get_lang('TimePickerMinMaxNull').'</div></div><br />');
$form->addElement('html', '</div>'); $form->addElement('html', '</div>');
$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('NoRecurence'), 0, array ('onclick' => 'javascript:window_hide(\'recurrence_timewindow\')'));
@ -393,7 +403,7 @@ switch ($_GET['action']) {
$interbreadcrumb[] = array ("url" => "m_reservation.php", "name" => get_lang('ManageBookingPeriods')); $interbreadcrumb[] = array ("url" => "m_reservation.php", "name" => get_lang('ManageBookingPeriods'));
Display :: display_header(''); Display :: display_header('');
api_display_tool_title($tool_name); api_display_tool_title($tool_name);
Display :: display_normal_message(Rsys :: get_return_msg(str_replace('#NUM#', $result, get_lang('BookingPeriodHasSubscriptions')),"m_reservation.php",get_lang('BookingPeriodManagerHeader')),false); Display :: display_normal_message(Rsys :: get_return_msg(str_replace('#NUM#', $result, get_lang('BookingPeriodHasSubscriptions')),"m_reservation.php",get_lang('BookingPeriodList')),false);
} }
else else
{ {

5
main/reservation/subscribe.php
Unescape View File

@ -139,8 +139,9 @@ if ($reservation[0][9] < $reservation[0][4]) {
//$defaultvalues['endpicker'] = Rsys :: timestamp_to_datetime($datum +900); //$defaultvalues['endpicker'] = Rsys :: timestamp_to_datetime($datum +900);
$defaultvalues['endpicker'] = Rsys :: timestamp_to_datetime($datum +($min_timepicker*60)); $defaultvalues['endpicker'] = Rsys :: timestamp_to_datetime($datum +($min_timepicker*60));
$form->setDefaults($defaultvalues); $form->setDefaults($defaultvalues);
} else { }
$form->addElement('html', "<p> **** ".str_replace('#name#', "<b>".$item[3]."</b>",str_replace('#start#', "<b>".$reservation[0][5]."</b>", str_replace('#end#', "<b>".$reservation[0][6]."</b>", get_lang('SubscribeInformation'))))." ****</p>"); else {
$form->addElement('html', "<p> * ".str_replace('#name#', "<b>".$item[3]."</b>",str_replace('#start#', "<b>".$reservation[0][5]."</b>", str_replace('#end#', "<b>".$reservation[0][6]."</b>", get_lang('SubscribeInformation'))))." *</p>");
} }
$buttons[] = $form->createElement('submit', 'submit', get_lang('Ok')); $buttons[] = $form->createElement('submit', 'submit', get_lang('Ok'));
$buttons[] = $form->createElement('button', 'cancel', get_lang('Cancel'), array ('onclick' => 'location.href="reservation.php?cat='.$item[1].'&item='.$item[0].'"')); $buttons[] = $form->createElement('button', 'cancel', get_lang('Cancel'), array ('onclick' => 'location.href="reservation.php?cat='.$item[1].'&item='.$item[0].'"'));

Write Preview
Loading…
Cancel
Save