[Vtigercrm-commits] [vtiger-commits] r6616 - in /vtigercrm/trunk/modules/Calendar: addEventUI.php calendarLayout.php
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Sun May 28 09:04:58 EDT 2006
Author: saraj
Date: Sun May 28 07:04:54 2006
New Revision: 6616
Log:
changes made for ToDo
Modified:
vtigercrm/trunk/modules/Calendar/addEventUI.php
vtigercrm/trunk/modules/Calendar/calendarLayout.php
Modified: vtigercrm/trunk/modules/Calendar/addEventUI.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/addEventUI.php (original)
+++ vtigercrm/trunk/modules/Calendar/addEventUI.php Sun May 28 07:04:54 2006
@@ -143,7 +143,7 @@
else $hrvalue = $i;
$combo .= '<option value="'.$hrvalue.'" '.$selected.'>'.$i.'</option>';
}
- $combo .= '</select> ';
+ $combo .= '</select>Hr ';
$combo .= '<select name="'.$bimode.'min" id="'.$bimode.'min" class=small>';
for($i=0;$i<12;$i++)
{
@@ -160,7 +160,7 @@
else $value=$value;
$combo .= '<option value="'.$value.'" '.$minselected.'>'.$value.'</option>';
}
- $combo .= '</select> Hr<input type="hidden" name="'.$bimode.'fmt" id="'.$bimode.'fmt">';
+ $combo .= '</select> min<input type="hidden" name="'.$bimode.'fmt" id="'.$bimode.'fmt">';
}
return $combo;
@@ -388,7 +388,7 @@
<?
}
?>
- </select><?echo $mod_strings['LBL_BEFORE']?>
+ </select><?echo $mod_strings['LBL_BEFOREEVENT']?>
</td>
</tr>
</table>
@@ -424,53 +424,15 @@
<table border=0 cellspacing=0 cellpadding=2>
<tr>
<td><?echo $mod_strings['LBL_REPEATEVENT']?></td>
- <!--td><input type="text" class="textbox" style="width:20px" value="2" ></td-->
<td><select class=small name="repeat_option">
<option value="Daily">Daily</option>
<option value="Weekly">Weekly</option>
<option value="Monthly">Monthly</option>
<option value="Yearly">Yearly</option>
- <!--option onClick="ghide('repeatWeekUI');ghide('repeatMonthUI');">Day(s)</option>
- <option onClick="gshow('repeatWeekUI',document.appSave.date_start.value,document.appSave.due_date.value,document.appSave.starthr.value,document.appSave.startmin.value,document.appSave.startfmt.value,document.appSave.endhr.value,document.appSave.endmin.value,document.appSave.endfmt.value);ghide('repeatMonthUI');">Week(s)</option>
- <option onClick="gshow('repeatMonthUI',document.appSave.date_start.value,document.appSave.due_date.value,document.appSave.starthr.value,document.appSave.startmin.value,document.appSave.startfmt.value,document.appSave.endhr.value,document.appSave.endmin.value,document.appSave.endfmt.value);ghide('repeatWeekUI');">Month(s)</option>
- <option onClick="ghide('repeatWeekUI');ghide('repeatMonthUI');";>Year</option-->
</select></td>
</tr>
</table>
- <!--div id="repeatWeekUI" style="display:none;">
- <table border=0 cellspacing=0 cellpadding=2>
- <tr>
- <td><input type="checkbox"></td><td>Sun</td>
- <td><input type="checkbox"></td><td>Mon</td>
- <td><input type="checkbox"></td><td>Tue</td>
- <td><input type="checkbox"></td><td>Wed</td>
- <td><input type="checkbox"></td><td>Thu</td>
- <td><input type="checkbox"></td><td>Fri</td>
- <td><input type="checkbox"></td><td>Sat</td>
- </tr>
- </table>
- </div>
- <div id="repeatMonthUI" style="display:none;">
- <table border=0 cellspacing=0 cellpadding=2>
- <tr>
- <td>
- <table border=0 cellspacing=0 cellpadding=2>
- <tr>
- <td><input type="radio" checked name="repeatMonth"></td><td>on</td><td><input type="text" class=textbox style="width:20px" value="2"></td><td>day of the month</td></tr>
- </table>
- </td>
- </tr>
- <tr>
- <td>
- <table border=0 cellspacing=0 cellpadding=2>
- <tr>
- <td><input type="radio" name="repeatMonth"></td><td>on</td><td><select class=small><option>First</option><option>Last</option></td><td><select class=small><option>Monday</option><option>Tuesday</option><option>Wednesday</option><option>Thursday</option><option>Friday</option><option>Saturday</option></select></td></tr>
- </table>
- </td>
- </tr>
- </table>
- </div-->
</div>
</td>
@@ -487,41 +449,7 @@
</table>
<!-- Alarm, Repeat, Invite stops-->
-<br>
-
-
-
- <div id="addEventAdvanced" style="display:none">
- <!-- more options-->
- <table border=0 cellspacing=0 cellpadding=5 width=90% align=center style="border-top:1px dotted silver">
- <tr>
- <td valign=top>
- <table border=0 cellspacing=0 cellpadding=2>
- <tr>
- <td><input type="checkbox" id="cboxRepeatEvent" name="repeatEvent" onClick="showhideRepeat('cboxRepeatEvent','repeatOptions');showhideRepeat('cboxRepeatEvent','stopRepeatOptions')"></td>
- <td>Repeat this event </td>
- <td><select id="repeatOptions" style="display:none" class=small><option><? echo $mod_strings['LBL_EVERYDAY']?></option><option><? echo $mod_strings['LBL_EVERYWEEK']?></option><option><? echo $mod_strings['LBL_EVERYMON']?></option></select></td>
- </tr>
- </table>
- <table border=0 cellspacing=0 cellpadding=2 id="stopRepeatOptions" style="display:none">
- <tr>
- <td width=40 align=right><input type="checkbox" name="stopRepeat" ></td>
- <td>Stop repeat on </td>
- <td>
- <table border=0 cellspacing=0 cellpadding=0 >
- <tr>
- <td><input type="text" class="textbox" style="width:70px"></td>
- <td><img src="../images/btnL3Calendar.gif" alt="Select date" title="Select date"></td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
-
- </div>
+ <br>
<table border=0 cellspacing=0 cellpadding=5 width=100% class="addEventFooter">
<tr>
@@ -548,7 +476,7 @@
<a href="" id="pending" class="calMnu">- <?php echo $mod_strings['LBL_EPENDING']?></a>
<span style="border-top:1px dashed #CCCCCC;width:99%;display:block;"></span>
<a href="" id="postpone" class="calMnu">- <?php echo $mod_strings['LBL_POSTPONE']?></a>
- <a href="#" id="changeowner" onClick="calchangeowner();" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
+ <a href="" id="changeowner" class="calMnu">- <?php echo $mod_strings['LBL_CHANGEOWNER']?></a>
<a href="" id="actdelete" class="calMnu">- <?php echo $mod_strings['LBL_DEL']?></a>
</td>
</tr>
@@ -557,7 +485,186 @@
<!-- Dropdown for Add Event -->
<div id='addEventDropDown' onmouseover='fnShowEvent()' onmouseout='fnRemoveEvent()'>
- <a href='' id="addcall" class='submenu'>Add Call</a>
- <a href='' id="addmeeting" class='submenu'>Add Meeting</a>
- <a href='' id="addtodo" class='submenu'>Add Todo</a>
+ <a href='' id="addcall" class='submenu'><?php echo $mod_strings['LBL_ADDCALL']?></a>
+ <a href='' id="addmeeting" class='submenu'><?php echo $mod_strings['LBL_ADDMEETING']?></a>
+ <a href='' id="addtodo" class='submenu'><?php echo $mod_strings['LBL_ADDTODO']?></a>
</div>
+
+<div class="calAddEvent" style="display:none" id="createTodo" align=center>
+<form name="createTodo" onSubmit="return check_form();" method="POST" action="index.php">
+ <input type="hidden" name="module" value="Activities">
+ <input type="hidden" name="activity_mode" value="Task">
+ <input type="hidden" name="action" value="Save">
+ <input type="hidden" name="return_action" value="index">
+ <input type="hidden" name="return_module" value="Calendar">
+ <input type="hidden" name="view" value="<? echo $calendar_arr['view'] ?>">
+ <input type="hidden" name="hour" value="<? echo $calendar_arr['calendar']->date_time->hour ?>">
+ <input type="hidden" name="day" value="<? echo $calendar_arr['calendar']->date_time->day ?>">
+ <input type="hidden" name="month" value="<? echo $calendar_arr['calendar']->date_time->month ?>">
+ <input type="hidden" name="year" value="<? echo $calendar_arr['calendar']->date_time->year ?>">
+ <input type="hidden" name="record" value="">
+ <input type="hidden" name="assigned_user_id" value="<? echo $current_user->id ?>">
+ <input type="hidden" name="assigntype" value="U">
+ <input type="hidden" name="time_start" id="time_start">
+ <input type="hidden" name="takstatus" value="Planned">
+ <input type="hidden" name="set_reminder" value="">
+ <table border=0 cellspacing=0 cellpadding=5 width=100% class="addEventHeader">
+ <tr>
+ <td class="lvtHeaderText"><? echo $mod_strings['LBL_ADD_TODO']?></b></td>
+ <td align=right>
+ <a href="javascript:ghide('createTodo');"><img src="<?echo $image_path?>close.gif" border="0" align="absmiddle" /></a></td>
+ </tr>
+ </table>
+ <table border=0 cellspacing=0 cellpadding=5 width=90% >
+ <tr>
+ <td width=20%><b><?echo $mod_strings['LBL_TODONAME']?> :</b></td>
+ <td width=80%><input name="subject" type="text" class="textbox" style="width:90%"></td>
+ </tr>
+ <tr>
+ <td><b><?echo $mod_strings['LBL_TODODATETIME']?> :</b></td>
+ <td>
+ <? echo getTimeCombo($calendar_arr['calendar']->hour_format,'start');?>
+ </td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>
+ <input type="text" name="date_start" id="task_jscal_field_date_start" class="textbox" style="width:90px"> <img border=0 src="<?echo $image_path?>btnL3Calendar.gif" alt="Set date.." title="Set date.." id="jscal_trigger_date_start" align="absmiddle">
+ <script type="text/javascript">
+ Calendar.setup ({
+ inputField : "task_jscal_field_date_start", ifFormat : "<?php echo $date_format; ?>", showsTime : false, button : "jscal_trigger_date_start", singleClick : true, step : 1
+ })
+ </script>
+ </td>
+
+ </tr>
+
+
+ </table>
+ <br>
+ <table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
+ <tr>
+ <td>
+ <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><?php echo $mod_strings['LBL_REMINDER']?></td>
+ <td class="dvtTabCache" style="width: 100%;"> </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td width=100% valign=top align=left class="dvtContentSpace" style="padding:10px;height:120px">
+ <!-- Reminder UI -->
+ <DIV id="addTaskAlarmUI" style="display:block;width:100%">
+ <table>
+ <tr><td><?echo $mod_strings['LBL_SENDREMINDER']?></td><td><input name="remindercheck" type="checkbox" onClick="showhide('taskreminderOptions')">
+ </td></tr>
+ </table>
+ <DIV id="taskreminderOptions" style="display:none;width:100%">
+ <table border=0 cellspacing=0 cellpadding=2 width=100%>
+ <tr>
+ <td nowrap align=right width=20% valign=top>
+ <b><?echo $mod_strings['LBL_RMD_ON']?> : </b>
+ </td>
+ <td width=80%>
+ <table border=0>
+ <tr>
+ <td colspan=2>
+ <select class=small name="remdays">
+ <?php
+ for($m=0;$m<=31;$m++)
+ {
+ ?>
+ <option value="<?echo $m?>"><?echo $m?></option>
+ <?
+ }
+ ?>
+ </select>days
+ <select class=small name="remhrs">
+ <?php
+ for($h=0;$h<=23;$h++)
+ {
+ ?>
+ <option value="<?echo $h?>"><?echo $h?></option>
+ <?
+ }
+ ?>
+ </select>hours
+ <select class=small name="remmin">
+ <?php
+ for($min=1;$min<=59;$min++)
+ {
+ ?>
+ <option value="<?echo $min?>"><?echo $min?></option>
+ <?
+ }
+ ?>
+ </select><?echo $mod_strings['LBL_BEFORETASK']?>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td nowrap align=right>
+ <?echo $mod_strings['LBL_SDRMD']?> :
+ </td>
+ <td >
+ <input type=text class=textbox style="width:90%" value="<? echo $to_email ?>">
+ </td>
+ </tr>
+ </table>
+ </DIV>
+ </DIV>
+ </td></tr>
+ <!-- Repeat UI -->
+ </table>
+ <br>
+
+ <table border=0 cellspacing=0 cellpadding=5 width=100% class="addEventFooter">
+ <tr>
+ <td valign=top></td>
+ <td align=right>
+ <input title='Save [Alt+S]' accessKey='S' type="submit" class=small style="width:90px" value="<?echo $mod_strings['LBL_SAVE']?>">
+ <input type="button" class=small style="width:90px" value="<?echo $mod_strings['LBL_RESET']?>" onClick="ghide('createTodo')">
+ </td>
+ </tr>
+ </table>
+</form>
+
+
+</div>
+
+
+<div id="act_changeowner" class="statechange">
+ <table width="100%" border="0" cellpadding="3" cellspacing="0">
+ <tr>
+ <td class="genHeaderSmall" align="left" style="border-bottom:1px solid #CCCCCC;" width="60%">Change Owner</td>
+ <td style="border-bottom: 1px solid rgb(204, 204, 204);"> </td>
+ <td align="right" style="border-bottom:1px solid #CCCCCC;" width="40%"><a href="javascript:fninvsh('act_changeowner')">Close</a></td>
+ </tr>
+ <tr>
+ <td colspan="3"> </td>
+ </tr>
+ <tr>
+ <td width="50%"><b>Transfer Ownership to</b></td>
+ <td width="2%"><b>:</b></td>
+ <td width="48%">
+ <select name="activity_owner" id="activity_owner" class="detailedViewTextBox">
+ <?echo getUserslist();?>
+ </select>
+ </td>
+ </tr>
+ <tr><td colspan="3" style="border-bottom:1px dashed #CCCCCC;"> </td></tr>
+ <tr>
+ <td colspan="3" align="center">
+
+ <input type="button" name="button" class="small" value="Update Owner" onClick="ajaxChangeStatus('owner')">
+ <input type="button" name="button" class="small" value="Cancel" onClick="fninvsh('act_changeowner')">
+ </td>
+ </tr>
+ </table>
+</div>
+
Modified: vtigercrm/trunk/modules/Calendar/calendarLayout.php
==============================================================================
--- vtigercrm/trunk/modules/Calendar/calendarLayout.php (original)
+++ vtigercrm/trunk/modules/Calendar/calendarLayout.php Sun May 28 07:04:54 2006
@@ -196,7 +196,7 @@
$headerdata .="<table align='center' border='0' cellpadding='5' cellspacing='0' width='98%'>
<tr><td colspan='3'> </td></tr>
<tr>
- <td class='tabSelected' style='border: 1px solid #666666;' align='center' width='10%' onClick='fnAddEvent(this,\"addEventDropDown\",\"".$temp_date."\",\"".$temp_date."\",\"".$time_arr['starthour']."\",\"".$time_arr['startmin']."\",\"".$time_arr['startfmt']."\",\"".$time_arr['endhour']."\",\"".$time_arr['endmin']."\",\"".$time_arr['endfmt']."\");'>
+ <td class='tabSelected' style='border: 1px solid #666666;cursor:pointer;' align='center' width='10%' onMouseOver='fnAddEvent(this,\"addEventDropDown\",\"".$temp_date."\",\"".$temp_date."\",\"".$time_arr['starthour']."\",\"".$time_arr['startmin']."\",\"".$time_arr['startfmt']."\",\"".$time_arr['endhour']."\",\"".$time_arr['endmin']."\",\"".$time_arr['endfmt']."\");'>
".$mod_strings['LBL_ADD_EVENT']."
<img src='".$cal_arr['IMAGE_PATH']."menuDnArrow.gif' style='padding-left: 5px;' border='0'>
</td>
@@ -474,10 +474,10 @@
//echo '<pre>';print_r($time_arr);echo '</pre>';
$temp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$temp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$temp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $temp_ts)):(''))));
$dayview_layout .= '<tr>
- <td style="border-right: 1px solid rgb(102, 102, 102);" align="right" width="10%" onMouseOver="show(\''.$hour.''.$sub_str.'\')" onMouseOut="hide(\''.$hour.''.$sub_str.'\')">
+ <td style="border-right: 1px solid rgb(102, 102, 102);" align="right" width="10%" onMouseOver="show(\'create_'.$hour.''.$sub_str.'\')" onMouseOut="fnHide_Event(\'create_'.$hour.''.$sub_str.'\')" valign=top>
<span class="genHeaderBig">'.$hour.'</span>
<span class="genHeaderGray">'.$sub_str.'</span><br>
- <div id="'.$hour.''.$sub_str.'" style="display: none;">
+ <div id="create_'.$hour.''.$sub_str.'" style="display: none;">
<a onClick="gshow(\'addEvent\',\'call\',\''.$temp_date.'\',\''.$temp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\')" href="javascript:void(0)"><img src="'.$cal['IMAGE_PATH'].'cal_add.jpg" border="0"></a>
</div>
</td>
@@ -577,9 +577,9 @@
$temp_ts = $cal['calendar']->week_array[$cal['calendar']->slices[$column]]->start_time->ts;
$temp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$temp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$temp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $temp_ts)):(''))));
- $weekview_layout .= '<td class="cellNormal" onMouseOver="show(\''.$temp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'\')" onMouseOut="hide(\''.$temp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'\')" style="height: 40px;" bgcolor="white" valign="top" width="12%" align=right>';
- $weekview_layout .= '<div id="'.$temp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'" style="display: none;">
- <a onClick="gshow(\'addEvent\',\'call\',\''.$temp_date.'\',\''.$temp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\')" href="javascript:void(0)"><img src="'.$cal['IMAGE_PATH'].'cal_add.jpg" border="0"></a>
+ $weekview_layout .= '<td class="cellNormal" onMouseOver="show(\'create_'.$temp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'\')" onMouseOut="fnHide_Event(\'create_'.$temp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'\')" style="height: 40px;" bgcolor="white" valign="top" width="12%" align=right vlign=top>';
+ $weekview_layout .= '<div id="create_'.$temp_date.''.$time_arr['starthour'].''.$time_arr['startfmt'].'" style="display: none;">
+ <img onClick="gshow(\'addEvent\',\'call\',\''.$temp_date.'\',\''.$temp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\')" src="'.$cal['IMAGE_PATH'].'cal_add.jpg" border="0">
</div>';
$weekview_layout .=getweekEventLayer($cal,$cal['calendar']->week_hour_slices[$count]);
$weekview_layout .= '</td>';
@@ -646,8 +646,8 @@
{
$temp_ts = $cal['calendar']->month_array[$cal['calendar']->slices[$cnt]]->start_time->ts;
$temp_date = (($date_format == 'dd-mm-yyyy')?(date('d-m-Y',$temp_ts)):(($date_format== 'mm-dd-yyyy')?(date('m-d-Y',$temp_ts)):(($date_format == 'yyyy-mm-dd')?(date('Y-m-d', $temp_ts)):(''))));
- $monthview_layout .= '<td onMouseOver="show(\''.$temp_date.''.$time_arr['starthour'].'\')" onMouseOut="hide(\''.$temp_date.''.$time_arr['starthour'].'\')" bgcolor="white" height="90" valign="top" width="200" align=right>';
- $monthview_layout .= '<div id="'.$temp_date.''.$time_arr['starthour'].'" style="display: none;">
+ $monthview_layout .= '<td onMouseOver="show(\'create_'.$temp_date.''.$time_arr['starthour'].'\')" onMouseOut="fnHide_Event(\'create_'.$temp_date.''.$time_arr['starthour'].'\')" bgcolor="white" height="90" valign="top" width="200" align=right>';
+ $monthview_layout .= '<div id="create_'.$temp_date.''.$time_arr['starthour'].'" style="display: none;">
<a onClick="gshow(\'addEvent\',\'call\',\''.$temp_date.'\',\''.$temp_date.'\',\''.$time_arr['starthour'].'\',\''.$time_arr['startmin'].'\',\''.$time_arr['startfmt'].'\',\''.$time_arr['endhour'].'\',\''.$time_arr['endmin'].'\',\''.$time_arr['endfmt'].'\')" href="javascript:void(0)"><img src="'.$cal['IMAGE_PATH'].'cal_add.jpg" border="0"></a>
</div>';
$monthview_layout .= getmonthEventLayer($cal,$cal['calendar']->slices[$cnt]);
@@ -671,6 +671,7 @@
function getYearViewLayout(& $cal,$type)
{
global $mod_strings;
+ $class = '';
$yearview_layout = '';
$yearview_layout .= '<br><!-- HOUR VIEW LAYER STARTS HERE -->
<div id="hrView_'.$type.'" style = "padding:5px">
@@ -722,7 +723,8 @@
$event_class = 'class="eventDay"';
else
$event_class = '';
- $class = dateCheck($cal['calendar']->month_day_slices[$count][$cnt]);
+ if($_1stmonth == $_2ndmonth)
+ $class = dateCheck($cal['calendar']->month_day_slices[$count][$cnt]);
if($class != '')
{
$class = 'class="'.$class.'"';
@@ -796,9 +798,9 @@
$account_name = $act[$i]->accountname;
$color = $act[$i]->color;
$image = $cal['IMAGE_PATH'].''.$act[$i]->image_name;
- $eventlayer .='<div class ="eventLay" id="'.$cal['calendar']->day_slice[$slice]->start_time->hour.'_'.$i.'">
+ $eventlayer .='<div class ="eventLay" id="event_'.$cal['calendar']->day_slice[$slice]->start_time->hour.'_'.$i.'">
<table border="0" cellpadding="0" cellspacing="0" width="95%">
- <tr onMouseOver="show(\''.$arrow_img_name.'\');" onMouseOut="hide(\''.$arrow_img_name.'\');">
+ <tr onMouseOver="show(\''.$arrow_img_name.'\');" onMouseOut="fnHide_Event(\''.$arrow_img_name.'\');">
<td align="left" width="5%"><img src="'.$image.'" align="right top"></td>
<td align="left" width="85%"><span class="fontBold">'.$account_name.'</span><br>
<b>'.$start_hour.'</b> ,<span class="orgTab">'.$subject.'</span>
@@ -842,8 +844,8 @@
$account_name = $act[$i]->accountname;
$image = $cal['IMAGE_PATH'].''.$act[$i]->image_name;
$color = $act[$i]->color;
- $eventlayer .='<div id="'.$cal['calendar']->week_slice[$slice]->start_time->hour.'_'.$i.'">
- <img src="'.$image.'" valign="absmiddle"><a href="index.php?action=DetailView&module=Activities&record='.$id.'&activity_mode=Events" style="color:#DBF3FD;"> <b>'.$start_hour.'</b> '.$subject.'</a>
+ $eventlayer .='<div class ="eventLay" id="event_'.$cal['calendar']->week_slice[$slice]->start_time->hour.'_'.$i.'">
+ <img src="'.$image.'" valign="left"><a href="index.php?action=DetailView&module=Activities&record='.$id.'&activity_mode=Events"> <b>'.$start_hour.'</b> <span class="orgTab">'.$subject.'</span></a>
</div><br>';
}
return $eventlayer;
@@ -887,8 +889,8 @@
$account_name = $act[$i]->accountname;
$image = $cal['IMAGE_PATH'].''.$act[$i]->image_name;
$color = $act[$i]->color;
- $eventlayer .='<div id="'.$cal['calendar']->month_array[$slice]->start_time->hour.'_'.$i.'">
- <img src="'.$image.'" valign="absmiddle"><a href="index.php?action=DetailView&module=Activities&record='.$id.'&activity_mode=Events" style="color:#DBF3FD;"> <b>'.$start_hour.'</b> '.$subject.'</a>
+ $eventlayer .='<div class ="eventLay" id="event_'.$cal['calendar']->month_array[$slice]->start_time->hour.'_'.$i.'">
+ <img src="'.$image.'" valign="absmiddle"><a href="index.php?action=DetailView&module=Activities&record='.$id.'&activity_mode=Events"> <b>'.$start_hour.'</b> <span class="orgTab">'.$subject.'</span></a>
</div><br>';
}
if($remin_list != null)
@@ -969,7 +971,7 @@
$image_tag = "<img src='".$calendar['IMAGE_PATH']."Meetings.gif' align='middle'> ".$type;
$element['eventtype'] = $image_tag;
$element['eventdetail'] = $contact_data." ".$subject." ".$more_link;
- $element['action'] = "<img onClick='getcalAction(this,\"calAction\");' onMouseout='fninvsh(\"calAction\")' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>";
+ $element['action'] ="<img onClick='getcalAction(this,\"calAction\",".$id.",\"".$calendar['view']."\",\"".$calendar['calendar']->date_time->hour."\",\"".$calendar['calendar']->date_time->day."\",\"".$calendar['calendar']->date_time->month."\",\"".$calendar['calendar']->date_time->year."\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>";
$element['status'] = $adb->query_result($result,$i,"eventstatus");
$Entries[] = $element;
}
@@ -1021,7 +1023,7 @@
$more_link = "<a href='index.php?action=DetailView&module=Activities&record=".$id."&activity_mode=Task' class='webMnu'>".$subject."</a>";
$element['tododetail'] = $more_link;
$element['status'] = $adb->query_result($result,$i,"status");
- $element['action'] = "<img onClick='getcalAction(this,\"calAction\");' onMouseout='fninvsh(\"calAction\")' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>";
+ $element['action'] = "<img onClick='getcalAction(this,\"calAction\");' src='".$calendar['IMAGE_PATH']."cal_event.jpg' border='0'>";
$Entries[] = $element;
}
return $Entries;
@@ -1124,7 +1126,7 @@
<table align='center' border='0' cellpadding='5' cellspacing='0' width='98%'>
<tr><td colspan='3'> </td></tr>
<tr>
- <td class='tabSelected' onClick='fnAddEvent(this,\"addEventDropDown\",\"".$temp_date."\",\"".$temp_date."\",\"".$time_arr['starthour']."\",\"".$time_arr['startmin']."\",\"".$time_arr['startfmt']."\",\"".$time_arr['endhour']."\",\"".$time_arr['endmin']."\",\"".$time_arr['endfmt']."\");'style='border: 1px solid #666666;' align='center' width='10%'>
+ <td class='tabSelected' onMouseOver='fnAddEvent(this,\"addEventDropDown\",\"".$temp_date."\",\"".$temp_date."\",\"".$time_arr['starthour']."\",\"".$time_arr['startmin']."\",\"".$time_arr['startfmt']."\",\"".$time_arr['endhour']."\",\"".$time_arr['endmin']."\",\"".$time_arr['endfmt']."\");'style='border: 1px solid #666666;cursor:pointer;' align='center' width='10%'>
".$mod_strings['LBL_ADD_EVENT']."
<img src='".$cal['IMAGE_PATH']."menuDnArrow.gif' style='padding-left: 5px;' border='0'> </td>
<td align='center' width='65%'> </td>
More information about the vtigercrm-commits
mailing list