[Vtigercrm-commits] [vtiger-commits] r5959 - in /vtigercrm/branches/5.0_postgresql_integration: Smarty/templates/ include/language/ modules/Calendar/ modules/CustomView/ themes/blue/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Sun May 14 10:51:39 EDT 2006
Author: jeffk
Date: Sun May 14 08:51:34 2006
New Revision: 5959
Log:
refs #752. merge trunk changesets [5942] through [5958]
Modified:
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/FieldAccess.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl
vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListViewEntries.tpl
vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Appointment.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Date.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/addEventUI.php
vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php
vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php
vtigercrm/branches/5.0_postgresql_integration/themes/blue/header.php
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/FieldAccess.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/FieldAccess.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/FieldAccess.tpl Sun May 14 08:51:34 2006
@@ -61,9 +61,9 @@
<select name="selectmodule" style="width: 200px; font-size: 10px;" onChange="changemodules(this)">
{foreach item=module from=$FIELD_INFO}
{if $module == $DEF_MODULE}
- <option selected>{$module}</option>
+ <option selected value='{$module}'>{$APP.$module}</option>
{else}
- <option>{$module}</option>
+ <option value='{$module}' >{$APP.$module}</option>
{/if}
{/foreach}
</select>
@@ -88,7 +88,7 @@
{/if}
<table class="small" border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody><tr><td colspan="4" style="border-bottom: 1px dashed rgb(204, 204, 204);">
- <b>{$CMOD.LBL_FIELDS_AVLBL} {$module} </b><br>
+ <b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module} </b><br>
{$CMOD.LBL_FIELDS_SELECT_DESELECT}
</td></tr>
<tr><td colspan="4"> </td></tr>
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/Header.tpl Sun May 14 08:51:34 2006
@@ -57,10 +57,10 @@
<tr>
{foreach key=maintabs item=detail from=$HEADERS}
{if $maintabs ne $CATEGORY}
- <td class=tabUnSelected align=center><a href="index.php?module={$detail[0]}&action=index&parenttab={$maintabs}">{$maintabs}</a><img src="{$IMAGEPATH}/menuDnArrow.gif" border=0 style="padding-left:5px"></td>
+ <td class=tabUnSelected align=center><a href="index.php?module={$detail[0]}&action=index&parenttab={$maintabs}">{$APP[$maintabs]}</a><img src="{$IMAGEPATH}/menuDnArrow.gif" border=0 style="padding-left:5px"></td>
<td class=tabSeperator><img src="{$IMAGEPATH}/tabSeperatorBg.gif"></td>
{else}
- <td class=tabSelected align=center><a href="index.php?module={$detail[0]}&action=index&parenttab={$maintabs}">{$maintabs}</a><img src="{$IMAGEPATH}/menuDnArrow.gif" border=0 style="padding-left:5px"></td>
+ <td class=tabSelected align=center><a href="index.php?module={$detail[0]}&action=index&parenttab={$maintabs}">{$APP[$maintabs]}</a><img src="{$IMAGEPATH}/menuDnArrow.gif" border=0 style="padding-left:5px"></td>
<td class=tabSeperator><img src="{$IMAGEPATH}/tabSeperatorBg.gif"></td>
{/if}
{/foreach}
@@ -107,9 +107,9 @@
{if $maintabs eq $CATEGORY}
{foreach key=number item=module from=$detail}
{if $module eq $MODULE_NAME}
- <td class="level2textSel"><a href="index.php?module={$module}&action=index&parenttab={$maintabs}">{$module}</a></td>
+ <td class="level2textSel"><a href="index.php?module={$module}&action=index&parenttab={$maintabs}">{$APP[$module]}</a></td>
{else}
- <td class="level2text"> <a href="index.php?module={$module}&action=index&parenttab={$maintabs}">{$module}</a> </td>
+ <td class="level2text"> <a href="index.php?module={$module}&action=index&parenttab={$maintabs}">{$APP[$module]}</a> </td>
{/if}
{/foreach}
{/if}
Modified: vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListViewEntries.tpl
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListViewEntries.tpl (original)
+++ vtigercrm/branches/5.0_postgresql_integration/Smarty/templates/ListViewEntries.tpl Sun May 14 08:51:34 2006
@@ -33,7 +33,7 @@
{/if}
{/foreach}
- <input class="small" type="button" value="Change Owner" onclick="return change(this,'changeowner')"/>
+ <input class="small" type="button" value="{$APP.LBL_CHANGE_OWNER}" onclick="return change(this,'changeowner')"/>
</td>
<td style="padding-right:20px" class="small" nowrap>{$RECORD_COUNTS}</td>
<td nowrap >
@@ -105,7 +105,7 @@
{/if}
{/foreach}
- <input class="small" type="button" value="Change Owner" onclick="return change(this,'changeowner')"/>
+ <input class="small" type="button" value="{$APP.LBL_CHANGE_OWNER}" onclick="return change(this,'changeowner')"/>
</td>
<td style="padding-right:20px" class="small" nowrap>{$RECORD_COUNTS}</td>
<td nowrap >
Modified: vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/include/language/en_us.lang.php Sun May 14 08:51:34 2006
@@ -443,6 +443,9 @@
'LBL_SEARCH_TITLE'=>'Search in ',
'LBL_SEARCH_ALT'=>'Search in ',
+'LBL_SEARCH_STRING'=>'Search...',
+
+'COMBO_ALL'=>'All',
// Added fields for Related Field Display Informations in Detail View of All Modules
@@ -697,11 +700,34 @@
'Emails'=>'Emails',
'HelpDesk'=>'HelpDesk',
'Activities'=>'Activities',
+'Events'=>'Events',
'Quotes'=>'Quotes',
'PriceBook'=>'Price Books',
'PurchaseOrder'=>'Purchase Orders',
'SalesOrder'=> 'Sales Orders',
'Invoice'=>'Invoice',
+'Calendar'=>'Calendar',
+'Home'=>'Home',
+'Campaigns'=>'Campaigns',
+'PriceBooks'=>'PriceBooks',
+'Notes'=>'Notes',
+'Faq'=>'Faq',
+'Dashboard'=>'Dashboard',
+'Reports'=>'Reports',
+'Vendors'=>'Vendors',
+'Rss'=>'Rss',
+'Portal'=>'Portal',
+
+//Added language for Parent Tab
+
+'My Home Page'=>'My Home Page',
+'Marketing'=>'Marketing',
+'Sales'=>'Sales',
+'Support'=>'Support',
+'Analytics'=>'Analytics',
+'Inventory'=>'Inventory',
+'Tools'=>'Tools',
+'Settings'=>'Settings',
'LBL_SELECT_TEMPLATE_TO_MAIL_MERGE'=>'Select template to Mail Merge:',
'LBL_TITLE_OR_DESCRIPTION'=>'Title / Description',
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Appointment.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Appointment.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Appointment.php Sun May 14 08:51:34 2006
@@ -66,7 +66,7 @@
{
$obj = &new Appointment();
$result = $adb->fetchByAssoc($r);
- //echo '<pre>' print_r($result);echo '</pre>';
+ //echo '<pre>'; print_r($result);echo '</pre>';
$obj->readResult($result, $view);
//$list_arr[$obj->record] = $obj;
$a++;
@@ -180,7 +180,7 @@
$this->image_name = 'Meetings.gif';
}
$this->record = $act_array["activityid"];
- if($view == 'day')
+ if($view == 'day' || $view == 'week')
$this->formatted_datetime= $act_array["date_start"].":".$st_hour;
else
$this->formatted_datetime= $act_array["date_start"];
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Calendar.php Sun May 14 08:51:34 2006
@@ -12,10 +12,11 @@
var $week_slice;
var $week_array;
var $month_array;
+ var $week_hour_slices = Array();
var $slices = Array();
/* for dayview */
- var $day_start_hour=0;
- var $day_end_hour=23;
+ var $day_start_hour=8;
+ var $day_end_hour=18;
var $sharedusers=Array();
/*
constructor
@@ -51,31 +52,26 @@
switch($this->view)
{
case 'day':
- $day_start_hour = $this->day_start_hour;
- $day_end_hour = $this->day_end_hour;
- //$dayview_hours = $day_end_hour - $day_start_hour;
- for($i=$day_start_hour;$i<=$day_end_hour;$i++)
+ for($i=0;$i<=23;$i++)
{
$layout = new Layout('hour',$this->date_time->getTodayDatetimebyIndex($i));
$this->day_slice[$layout->start_time->get_formatted_date().':'.$layout->start_time->hour] = $layout;
array_push($this->slices, $layout->start_time->get_formatted_date().":".$layout->start_time->hour);
}
+ //echo '<pre>';print_r($this);echo'</pre>';
break;
case 'week':
$weekview_days = 7;
- $day_start_hour = $this->day_start_hour;
- $day_end_hour = $this->day_end_hour;
- $dayview_hours = $day_end_hour - $day_start_hour;
for($i=0;$i<$weekview_days;$i++)
{
$layout = new Layout('day',$this->date_time->getThisweekDaysbyIndex($i));
$this->week_array[$layout->start_time->get_formatted_date()] = $layout;
- /*for($h=0;$h<$dayview_hours;$h++)
+ for($h=0;$h<=23;$h++)
{
- $hour_list = new Layout('hour',$this->date_time->getTodayDatetimebyIndex($h));
- $this->day_slice[$layout->start_time->hour] = $layout;
- array_push($this->slices, $layout->start_time->get_formatted_date().":".$layout->start_time->hour);
- }*/
+ $hour_list = new Layout('hour',$this->date_time->getTodayDatetimebyIndex($h,$layout->start_time->z_day,$layout->start_time->z_month,$layout->start_time->z_year));
+ $this->week_slice[$layout->start_time->get_formatted_date().':'.$hour_list->start_time->hour] = $hour_list;
+ array_push($this->week_hour_slices, $layout->start_time->get_formatted_date().":".$hour_list->start_time->hour);
+ }
array_push($this->slices, $layout->start_time->get_formatted_date());
}
@@ -139,7 +135,6 @@
$activities = Array();
$activities = Appointment::readAppointment($current_user->id,$start_datetime,$end_datetime,$this->view);
-
if(!empty($activities))
{
foreach($activities as $key=>$value)
@@ -150,7 +145,7 @@
}
elseif($this->view == 'week')
{
-
+ array_push($this->week_slice[$value->formatted_datetime]->activities, $value);
}
elseif($this->view == 'month')
{
@@ -164,7 +159,7 @@
}
}
- //echo '<pre>';print_r($this->month_array);echo'</pre>';
+ //echo '<pre>';print_r($this->week_slice);echo'</pre>';
}
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Date.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Date.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/Date.php Sun May 14 08:51:34 2006
@@ -77,8 +77,14 @@
}
- function getTodayDatetimebyIndex($index)
- {
+ function getTodayDatetimebyIndex($index,$day='', $month='', $year='')
+ {
+ if($day == '')
+ {
+ $day = $this->day;
+ $month = $this->month;
+ $year = $this->year;
+ }
$day_array = array();
if($index < 0 || $index > 23)
{
@@ -86,9 +92,9 @@
}
$day_array['hour'] = $index;
$day_array['min'] = 0;
- $day_array['day'] = $this->day;
- $day_array['month'] = $this->month;
- $day_array['year'] = $this->year;
+ $day_array['day'] = $day;
+ $day_array['month'] = $month;
+ $day_array['year'] = $year;
$datetimevalue = new DateTime($day_array,true);
return $datetimevalue;
}
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/addEventUI.php Sun May 14 08:51:34 2006
@@ -85,11 +85,11 @@
<table border=0 cellspacing=0 cellpadding=3 width=100%>
<tr>
<td class="dvtTabCache" style="width:10px" nowrap> </td>
- <td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="#" onClick="switchClass('cellTabInvite','on');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');ghide('addEventAlarmUI');gshow('addEventInviteUI');ghide('addEventRepeatUI');">Invite</a></td>
+ <td id="cellTabInvite" class="dvtSelectedCell" align=center nowrap><a href="#" onClick="switchClass('cellTabInvite','on');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','off');ghide('addEventAlarmUI');gshow('addEventInviteUI',document.appSave.date_start.value,document.appSave.due_date.value,document.appSave.time_start.value,document.appSave.time_end.value);ghide('addEventRepeatUI');">Invite</a></td>
<td class="dvtTabCache" style="width:10px"> </td>
- <td id="cellTabAlarm" class="dvtUnSelectedCell" align=center nowrap><a href="#" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','on');switchClass('cellTabRepeat','off');gshow('addEventAlarmUI');ghide('addEventInviteUI');ghide('addEventRepeatUI');">Reminder</a></td>
+ <td id="cellTabAlarm" class="dvtUnSelectedCell" align=center nowrap><a href="#" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','on');switchClass('cellTabRepeat','off');gshow('addEventAlarmUI',document.appSave.date_start.value,document.appSave.due_date.value,document.appSave.time_start.value,document.appSave.time_end.value);ghide('addEventInviteUI');ghide('addEventRepeatUI');">Reminder</a></td>
<td class="dvtTabCache" style="width:10px"> </td>
- <td id="cellTabRepeat" class="dvtUnSelectedCell" align=center nowrap><a href="#" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','on');ghide('addEventAlarmUI');ghide('addEventInviteUI');gshow('addEventRepeatUI');">Repeat</a></td>
+ <td id="cellTabRepeat" class="dvtUnSelectedCell" align=center nowrap><a href="#" onClick="switchClass('cellTabInvite','off');switchClass('cellTabAlarm','off');switchClass('cellTabRepeat','on');ghide('addEventAlarmUI');ghide('addEventInviteUI');gshow('addEventRepeatUI',document.appSave.date_start.value,document.appSave.due_date.value,document.appSave.time_start.value,document.appSave.time_end.value);">Repeat</a></td>
<td class="dvtTabCache" style="width:100%"> </td>
</tr>
</table>
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/Calendar/calendarLayout.php Sun May 14 08:51:34 2006
@@ -293,6 +293,8 @@
else
{
$hour = $i;
+ if($hour <= 9 && strlen(trim($hour)) < 2)
+ $hour = "0".$hour;
$sub_str = ':00';
}
$y = $i+1;
@@ -326,9 +328,9 @@
function getWeekViewLayout(& $cal,$type)
{
- $day_start_hour = $cal['calendar']->day_start_hour;
- $day_end_hour = $cal['calendar']->day_end_hour;
- $dayview_hours = $day_end_hour - $day_start_hour;
+ $day_start_hour = $cal['calendar']->day_start_hour;
+ $day_end_hour = $cal['calendar']->day_end_hour;
+ $format = $cal['calendar']->hour_format;
$weekview_layout = '';
$weekview_layout .= '<br><!-- HOUR VIEW LAYER STARTS HERE -->
<div id="hrView_'.$type.'" style = "padding:5px">
@@ -356,6 +358,8 @@
$weekview_layout .= '<table border="0" cellpadding="10" cellspacing="1" width="98%" class="calDayHour" style="background-color: #dadada">';
for($i=$day_start_hour;$i<=$day_end_hour;$i++)
{
+ $hour_startat = convertTime2UserSelectedFmt($format,$i);
+ $hour_endat = convertTime2UserSelectedFmt($format,($i+1));
$weekview_layout .= '<tr>';
for ($column=1;$column<=1;$column++)
{
@@ -381,6 +385,8 @@
else
{
$hour = $i;
+ if($hour <= 9 && strlen(trim($hour)) < 2)
+ $hour = "0".$hour;
$sub_str = ':00';
}
@@ -390,7 +396,9 @@
}
for ($column=0;$column<=6;$column++)
{
- $weekview_layout .= '<td class="cellNormal" onclick="gshow(\'addEvent\')" onmouseover="this.className=\'cellNormalHover\'" onmouseout="this.className=\'cellNormal\'" style="height: 40px;" bgcolor="white" valign="top" width="12%">';
+ $temp_date = $cal['calendar']->week_array[$cal['calendar']->slices[$column]]->start_time->get_formatted_date();
+
+ $weekview_layout .= '<td class="cellNormal" onclick="gshow(\'addEvent\',\''.$temp_date.'\',\''.$temp_date.'\',\''.$hour_startat.'\',\''.$hour_endat.'\')" onmouseover="this.className=\'cellNormalHover\'" onmouseout="this.className=\'cellNormal\'" style="height: 40px;" bgcolor="white" valign="top" width="12%">';
$weekview_layout .= '</td>';
}
$weekview_layout .= '</tr>';
@@ -733,7 +741,7 @@
{
$hour = $time;
if($hour <= 9 && strlen(trim($hour)) < 2)
- $hour = "0".$start_hour;
+ $hour = "0".$hour;
$hour = $hour.":00";
return $hour;
}
Modified: vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/modules/CustomView/CustomView.php Sun May 14 08:51:34 2006
@@ -154,12 +154,18 @@
function getCustomViewCombo($viewid='')
{
global $adb;
+ global $app_strings;
$tabid = getTabid($this->customviewmodule);
$ssql = "select customview.* from customview inner join tab on tab.name = customview.entitytype";
$ssql .= " where tab.tabid=".$tabid;
$result = $adb->query($ssql);
while($cvrow=$adb->fetch_array($result))
{
+ if($cvrow['viewname'] == 'All')
+ {
+ $cvrow['viewname'] = $app_strings['COMBO_ALL'];
+ }
+
if($cvrow['cvid'] == $viewid)
{
$shtml .= "<option selected value=\"".$cvrow['cvid']."\">".$cvrow['viewname']."</option>";
Modified: vtigercrm/branches/5.0_postgresql_integration/themes/blue/header.php
==============================================================================
--- vtigercrm/branches/5.0_postgresql_integration/themes/blue/header.php (original)
+++ vtigercrm/branches/5.0_postgresql_integration/themes/blue/header.php Sun May 14 08:51:34 2006
@@ -96,7 +96,7 @@
if($_REQUEST['query_string'] != '')
$smarty->assign("QUERY_STRING",$_REQUEST['query_string']);
else
- $smarty->assign("QUERY_STRING","Search...");
+ $smarty->assign("QUERY_STRING","$app_strings[LBL_SEARCH_STRING]");
global $module_menu;
$smarty->display("Header.tpl");
More information about the vtigercrm-commits
mailing list