[Vtigercrm-commits] [vtiger-commits] r10180 - in /vtigercrm/branches/5.0.3/modules/Calendar: calendarLayout.php language/en_us.lang.php

[vtigercrm-commits at vtiger.fosslabs.com]

Author: saraj
Date: Mon Feb 12 22:53:33 2007
New Revision: 10180

Log:
fix for Calendar>List View related issue --Minnie

Modified:
    vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php
    vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php

Modified: vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/calendarLayout.php Mon Feb 12 22:53:33 2007
@@ -1304,8 +1304,8 @@
 		{
 			$date_start = $adb->query_result($result,$i,"date_start");
 			$due_date = $adb->query_result($result,$i,"due_date");
-			$element['starttime'] = getDisplayDate($date_start);
-			$element['endtime'] = getDisplayDate($due_date);
+			$element['starttime'] = getDisplayDate($date_start).' '.$start_hour;
+			$element['endtime'] = getDisplayDate($due_date).' '.$end_hour;
 		}
 		$contact_id = $adb->query_result($result,$i,"contactid");
 		$id = $adb->query_result($result,$i,"activityid");
@@ -1504,13 +1504,13 @@
 	$list_view = "";
 	if($cal['view'] == 'day')
 	{
-		$start_datetime = $mod_strings['LBL_APP_START_TIME'];
-		$end_datetime = $mod_strings['LBL_APP_END_TIME'];
+		$start_datetime = $mod_strings['LBL_START_TIME'];
+		$end_datetime = $mod_strings['LBL_END_TIME'];
 	}
 	else
 	{
-		 $start_datetime = $mod_strings['LBL_APP_START_DATE'];
-		 $end_datetime = $mod_strings['LBL_APP_END_DATE'];
+		 $start_datetime = $app_strings['LBL_START_DATE_TIME'];
+		 $end_datetime = $app_strings['LBL_END_DATE_TIME'];
 				 
 	}
 	//Events listview header labels
@@ -1518,7 +1518,7 @@
                         '1'=>$start_datetime,
                         '2'=>$end_datetime,
                         '3'=>$mod_strings['LBL_EVENTTYPE'],
-                        '4'=>$mod_strings['LBL_EVTDTL'],
+                        '4'=>$mod_strings['LBL_EVENTDETAILS'],
 			'5'=>$mod_strings['LBL_RELATEDTO'],
                         );
                                 if(isPermitted("Calendar","EditView") == "yes" || isPermitted("Calendar","Delete") == "yes")
@@ -1647,8 +1647,8 @@
 		$colspan = 10;
 	        $header = Array('0'=>'#',
                         '1'=>$mod_strings['LBL_TIME'],
-			'2'=>$mod_strings['LBL_APP_START_DATE'],
-			'3'=>$mod_strings['LBL_LIST_DUE_DATE'],
+			'2'=>$mod_strings['LBL_START_DATE'],
+			'3'=>$mod_strings['LBL_DUE_DATE'],
                         '4'=>$mod_strings['LBL_TODO'],
 			'5'=>$mod_strings['LBL_RELATEDTO'],
 			'6'=>$mod_strings['LBL_LIST_CONTACT'],

Modified: vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Calendar/language/en_us.lang.php Mon Feb 12 22:53:33 2007
@@ -38,7 +38,6 @@
 'LBL_USE24'=>'Use 24 hours format',
 'LBL_CALSTART'=>'Start my calendar time at',
 'LBL_TIMESETTINGS'=>'Time Settings',
-'LBL_OPENCAL'=>'Open Calendar',
 'LBL_HOLDFOLLOWUP'=>'Hold followup on',
 'LBL_CALL' => 'Call',
 'LBL_MEET' => 'Meeting',
@@ -81,10 +80,6 @@
 
 
 'LBL_APPCREATED_BY' => 'Created by',
-'LBL_APP_START_DATE' => 'Start Date',
-'LBL_APP_START_TIME' => 'Start Time',
-'LBL_APP_END_DATE' => 'End Date',
-'LBL_APP_END_TIME' => 'End Time',
 'LBL_AT_DATE_TIME' => 'at',
 
 'LBL_MON' => 'Month',
@@ -171,33 +166,43 @@
 "Dec",
 ),
 
+'LBL_TIME'=>'Time',
+'LBL_START_TIME' => 'Start Time',
+'LBL_END_TIME' => 'End Time',
+'LBL_START_DATE'=>'Start Date',
+'LBL_DUE_DATE'=>'Due Date',
+'LBL_START_DATE_TIME'=>'Start Date & Time',
+'LBL_END_DATE_TIME'=>'End Date & Time',
+'LBL_TODO'=>'To Do',
+'LBL_TODOS'=>'To Dos',
 'LBL_EVENTS'=>'Events',
-'LBL_TODOS'=>'To Dos',
-'LBL_TIME'=>'Time',
+'LBL_TOTALEVENTS'=>'Total Events :',
+'LBL_TOTALTODOS'=>'Total To Dos :',
+'LBL_VIEW'=>'View',
+'LBL_LISTVIEW'=>'List View',
+'LBL_HRVIEW'=>'Hour View',
+'LBL_WEEKVIEW'=>'Weekly Calendar View',
+'LBL_MONTHVIEW'=>'Monthly Calendar View',
+'LBL_YEARVIEW'=>'Yearly Calendar View',
+'LBL_STATUS'=>'Status',
+'LBL_ACTION'=>'Actions',
+'LBL_ADD'=>'Add',
+'LBL_OPENCAL'=>'Open Calendar',
+
+
 'LBL_ADD_EVENT'=>'Add Event',
-'LBL_ADD'=>'Add',
 'LBL_ADDCALL'=>'Call',
 'LBL_ADDMEETING'=>'Meeting',
 'LBL_ADDTODO'=>'To Do',
 'LBL_BEFOREEVENT'=>'before the event starts',
 'LBL_BEFORETASK'=>'before the task starts',
-'LBL_HRVIEW'=>'Hour View',
-'LBL_LISTVIEW'=>'List View',
-'LBL_WEEKVIEW'=>'Weekly Calendar View',
-'LBL_MONTHVIEW'=>'Monthly Calendar View',
-'LBL_YEARVIEW'=>'Yearly Calendar View',
-'LBL_TOTALEVENTS'=>'Total Events :',
-'LBL_TOTALTODOS'=>'Total To Dos :',
-'LBL_EVTDTL'=>'Event Details',
-'LBL_ACTION'=>'Actions',
+'LBL_EVENTDETAILS'=>'Event Details',
 'LBL_CURSTATUS'=>'Current Status',
 'LBL_ASSINGEDTO'=>'Assigned To',
 'LBL_RELATEDTO'=>'Related To',
-'LBL_STATUS'=>'Status',
 'LBL_PENDING'=>'Pending',
 'LBL_PUBLIC'=>'Mark Public',
 'LBL_MORE'=>'More',
-'LBL_VIEW'=>'View',
 'LBL_EDIT'=>'Edit',
 'LBL_EVERYDAY'=>'Every Day',
 'LBL_EVERYWEEK'=>'Every Week',
@@ -359,7 +364,6 @@
 'LBL_RMD_ON'=>'Remind on',
 'LBL_REPEATEVENT'=>'Repeat once in every',
 'LBL_TIMEDATE'=>'Time & Date',
-'LBL_TODO'=>'To Do',
 'LBL_EVENT'=>'Event',
 'Daily'=>'Day(s)',
 'Weekly'=>'Week(s)',