Selaa lähdekoodia

[svn r17844] Minor - lang variables changed FS#821

Julio Montoya 16 vuotta sitten
vanhempi
commit
70df90e884

+ 10 - 9
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.='<a href="m_item.php?action=edit&amp;id='.$id.'" title="'.get_lang("EditItem2").'"><img alt="" src="../img/edit.gif" /></a>';
-    }
-    //if(Rsys::item_allow($id,'m_rights')) $str.=' &nbsp;<a href="m_item.php?action=m_rights&amp;item_id='.$id.'" title="'.get_lang("MRights").'"><img alt="" src="../img/info_small.gif" /></a>';
-    if(Rsys::item_allow($id,'delete')) $str.=' <a href="m_item.php?action=delete&amp;id='.$id.'" title="'.get_lang("DeleteItem").'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmDeleteItem")))."'".')) return false;"><img alt="" src="../img/delete.gif" /></a>';
-    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.= ' <a href="m_item.php?action=blackout&amp;id='.$id.'" title="'.get_lang('Inactive').'"><img alt="" src="../img/wrong.gif" /></a>';
-        }
-        else { 
+        } else { 
         	$str.= ' <a href="m_item.php?action=blackout&amp;id='.$id.'" title="'.get_lang('Active').'"><img alt="" src="../img/right.gif" /></a>';
         }
     }
+    
+    if(Rsys::item_allow($id,'edit')){
+        $str.='<a href="m_item.php?action=edit&amp;id='.$id.'" title="'.get_lang("EditItem2").'"><img alt="" src="../img/edit.gif" /></a>';
+    }
+    //if(Rsys::item_allow($id,'m_rights')) $str.=' &nbsp;<a href="m_item.php?action=m_rights&amp;item_id='.$id.'" title="'.get_lang("MRights").'"><img alt="" src="../img/info_small.gif" /></a>';
+    if(Rsys::item_allow($id,'delete')) $str.=' <a href="m_item.php?action=delete&amp;id='.$id.'" title="'.get_lang("DeleteItem").'" onclick="javascript:if(!confirm('."'".addslashes(htmlentities(get_lang("ConfirmDeleteItem")))."'".')) return false;"><img alt="" src="../img/delete.gif" /></a>';
+ 
     return $str;
 }
 

+ 4 - 4
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', '<div class="row"><div class="label"></div><div class="formw">'.get_lang('TimePickerMinMaxNull').'</div></div><br />');				
 		$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('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'), '<br />', false);
 		$form->addElement('html', '<div style="margin-left:25px;display:block;" id="recurrence_timewindow">');
 		$list_time = Rsys:: recurrence_list();

+ 8 - 11
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 '<div class="actions">';
-	///		echo '<a href="m_reservation.php?action=add"><img src="../img/view_more_stats.gif" border="0" alt="" title="'.get_lang('AddNewBookingPeriod').'"/>'.get_lang('AddNewBookingPeriod').'</a>';
-			//echo '&nbsp;&nbsp;&nbsp;<a href="m_reservation.php?action=overviewsubscriptions">'.get_lang('OverviewReservedPeriods').'</a>';		
+        
+        if (api_is_allowed_to_create_course()) {
+	        echo '<div class="actions">';	
 			echo '<div style="float: right;"><a href="reservation.php">'.Display::return_icon('sessions.gif',get_lang('BookingCalendarView')).'&nbsp;'.get_lang('GoToCalendarView').'</a></div>';
 			echo '<a href="m_item.php?view=list">'.Display::return_icon('cube.png',get_lang('Resources')).'&nbsp;'.get_lang('Resources').'</a>';		
 			echo '&nbsp;&nbsp;<a href="m_reservation.php?view=list">'.Display::return_icon('calendar_day.gif',get_lang('BookingPeriods')).'&nbsp;'.get_lang('BookingPeriods').'</a>';
 			echo '&nbsp;&nbsp;<a href="m_reservation.php?action=add&view=list">'.Display::return_icon('calendar_add.gif',get_lang('BookIt')).'&nbsp;'.get_lang('BookIt').'</a>';
 			
-			if (api_is_platform_admin()) 
-			{
+			if (api_is_platform_admin()) {
 				//echo '&nbsp;&nbsp;<a href="m_category.php">'.Display::return_icon('settings.gif',get_lang('Configuration')).'&nbsp;'.get_lang('Configuration').'</a>';
 			}
 			echo '</div><br />';
         }
         
-        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();

+ 1 - 0
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".