[Vtigercrm-commits] [vtiger-commits] r9188 - /vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl

vtigercrm-commits at vtiger.fosslabs.com vtigercrm-commits at vtiger.fosslabs.com
Tue Aug 29 09:56:35 EDT 2006


Author: saraj
Date: Tue Aug 29 07:56:31 2006
New Revision: 9188

Log:
changes made to fix the calendar related issue  --Minnie

Modified:
    vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl

Modified: vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/ActivityDetailView.tpl Tue Aug 29 07:56:31 2006
@@ -106,58 +106,77 @@
 						     </table>
 						     {/foreach}
 						     {if $ACTIVITYDATA.activitytype neq 'Task'}	
-						     <table border=0 cellspacing=0 cellpadding=5 width=90% >
+						     <table border=0 cellspacing=0 cellpadding=5 width=100% >
                						 <tr>
-					                        <td nowrap  width=20% align="right"><b>{$MOD.LBL_EVENTTYPE} :</b></td>
-								<td width=80%>{$ACTIVITYDATA.activitytype}</td>
+					                        <td width="20%" align="right"><b>{$MOD.LBL_EVENTTYPE}</b></td>
+								<td width="30%"align="left">{$ACTIVITYDATA.activitytype}</td>
+								<td width="20%" align="right">&nbsp;</td>
+								<td width="30%" align="left">&nbsp;</td>
 							 </tr>
 							 <tr>
-                        					<td nowrap align="right"><b>{$MOD.LBL_EVENTNAME} :</b></td>
-					                        <td>{$ACTIVITYDATA.subject}</td>
+                        					<td width="20%" align="right"><b>{$MOD.LBL_EVENTNAME}</b></td>
+					                        <td width="30%" align="left" >{$ACTIVITYDATA.subject}</td>
+								<td width="20%" align="right"><b>{$LABEL.visibility}</b></td>
+                                                                <td width="30%" align="left" >{$ACTIVITYDATA.visibility}</td>
              						 </tr>
 							 <tr>
-                                                                <td nowrap align="right"><b>{$LABEL.visibility} :</b></td>
-                                                                <td>{$ACTIVITYDATA.visibility}</td>
-                                                         </tr>
-						     </table>
-						     <table border=0 cellspacing=0 cellpadding=5 width=90% >
-                                                         <tr>
-                                                                <td align="right"><b>{$LABEL.createdtime} :</b></td>
-                                                                <td >{$ACTIVITYDATA.createdtime}</td>
-                                                                <td align="right"><b>{$LABEL.modifiedtime} :</b></td>
-                                                                <td>{$ACTIVITYDATA.modifiedtime}</td>
-                                                         </tr>
+								<td align="right" width="20%" nowrap valign="top"><b>{$LABEL.description}</b></td>
+								<td valign="top" align="left" colspan="3" height="60px">{$ACTIVITYDATA.description}</td>
+							 </tr>
+							 <tr>
+								<td colspan=2 width=80% align="center">
+								<table border=0 cellspacing=0 cellpadding=3 width=80%>
+									<tr>
+										<td ><b>{$LABEL.eventstatus}</b></td>
+										<td ><b>{$LABEL.assigned_user_id}</b></td>
+									</tr>
+									<tr>
+										<td>{$ACTIVITYDATA.eventstatus}</td>
+										<td>{$ACTIVITYDATA.assigned_user_id}</td>
+									</tr>
+									<tr>
+										<td ><b>{$LABEL.taskpriority}</b></td>
+										<td ><b>{$LABEL.sendnotification}</b></td>
+									</tr>
+									<tr>
+										<td >{$ACTIVITYDATA.taskpriority}</td>
+										<td >{$ACTIVITYDATA.sendnotification}</td>
+									</tr>
+								</table>
+								</td>
+							</tr>
+                                                        <tr>
+                                                                <td width="20%" align="right"><b>{$LABEL.createdtime}</b></td>
+                                                                <td width="30%" align="left">{$ACTIVITYDATA.createdtime}</td>
+                                                                <td width="20%" align="right"><b>{$LABEL.modifiedtime}</b></td>
+                                                                <td width="30%" align="left">{$ACTIVITYDATA.modifiedtime}</td>
+                                                        </tr>
                                                      </table>
-						     <br>
-					             <table border=0 cellspacing=0 cellpadding=5 width=90% align=center style="border-top:1px dotted silver">
-							 <tr>
-                       						<td >
+						     <hr noshade size=1>
+						     <table border=0 cellspacing=0 cellpadding=5 width=90% align=center bgcolor="#FFFFFF">
+							<tr>
+								<td >
 									<table border=0 cellspacing=0 cellpadding=2 width=100%>
-									<tr>
-                                						<td width=50% valign=top >
-					                                        <table border=0 cellspacing=0 cellpadding=2 width=90%>
-                                        						<tr><td colspan=3 ><b>{$MOD.LBL_EVENTSTAT}</b></td></tr>
-											<tr><td colspan=3>{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
+									<tr><td width=50% valign=top style="border-right:1p
+x solid #dddddd">
+										 <table border=0 cellspacing=0 cellpadding=2 width=90%>
+											<tr><td><b>{$MOD.LBL_EVENTSTAT}</b></td></tr>
+											<tr><td>{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
 											<tr><td>{$ACTIVITYDATA.date_start}</td></tr>
-										 </table>
-							                         </td>
-									         <td width=50% valign=top >
-                					                         <table border=0 cellspacing=0 cellpadding=2 width=90%>
-                                        						<tr><td colspan=3><b>{$MOD.LBL_EVENTEDAT}</b></td></tr>
-											<tr><td colspan=3>{$ACTIVITYDATA.endhr}:{$ACTIVITYDATA.endmin}{$ACTIVITYDATA.endfmt}</td></tr>
+										</table></td>
+									<td width=50% valign=top >
+										<table border=0 cellspacing=0 cellpadding=2 width=90%>
+											<tr><td><b>{$MOD.LBL_EVENTEDAT}</b></td></tr>
+											<tr><td>{$ACTIVITYDATA.endhr}:{$ACTIVITYDATA.endmin}{$ACTIVITYDATA.endfmt}</td></tr>
 											<tr><td>{$ACTIVITYDATA.due_date}</td></tr>
-										 </table>
-										 </td>
-									</tr>
-									</table>
-								</td>
-                					 </tr>
-                					 <tr>
-                        					<td><b>{$MOD.Priority}</b>&nbsp;:&nbsp;{$ACTIVITYDATA.priority}</td>
-							 </tr>
+										</table>
+									</td></tr>
+									</table>
+								</td>
+							</tr>
 						     </table>
 						     <br>
-					             <table border=0 cellspacing=0 cellpadding=0 width=95% align=center>
+					             <table border=0 cellspacing=0 cellpadding=0 width=100% align=center>
                 					 <tr>
                         					<td>
                          				        	<table border=0 cellspacing=0 cellpadding=3 width=100%>
@@ -182,8 +201,8 @@
 									<DIV id="addEventInviteUI" style="display:block;width:100%">
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
 										<tr>
-                                                                                        <td width="30%" align=right><b>{$MOD.LBL_USERS} :</b></td>
-                                                                                        <td width="70%" align=left>
+                                                                                        <td width="30%" valign="top" align=right><b>{$MOD.LBL_USERS}</b></td>
+                                                                                        <td width="70%" align=left valign="top" >
 												{foreach item=username key=userid from=$INVITEDUSERS}
                                                                                         	        {$username.3}<br>
                                                                                                 {/foreach}
@@ -195,12 +214,12 @@
 					                                <DIV id="addEventAlarmUI" style="display:none;width:100%">
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
                                                                                 <tr>
-                                                                                        <td width="30%" align=right><b>{$MOD.LBL_SENDREMINDER} :</b></td>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_SENDREMINDER}</b></td>
                                                                                         <td width="70%" align=left>{$ACTIVITYDATA.set_reminder}</td>
                                                                                 </tr>
 										{if $ACTIVITYDATA.set_reminder != 'No'}
 										<tr>
-                                                                                        <td width="30%" align=right><b>{$MOD.LBL_RMD_ON} :</b></td>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_RMD_ON}</b></td>
 											<td width="70%" align=left>{$ACTIVITYDATA.reminder_str}</td>
 										</tr>
 										{/if}
@@ -210,7 +229,7 @@
                                 					<div id="addEventRepeatUI" style="display:none;width:100%">
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
 										<tr>
-                                                                                        <td width="30%" align=right><b>{$MOD.LBL_ENABLE_REPEAT} :</b></td>
+                                                                                        <td width="30%" align=right><b>{$MOD.LBL_ENABLE_REPEAT}</b></td>
                                                                                         <td width="70%" align=left>{$ACTIVITYDATA.recurringcheck}</td>
                                                                                 </tr>
 										{if $ACTIVITYDATA.recurringcheck != 'No'}
@@ -229,12 +248,12 @@
 									<div id="addEventRelatedtoUI" style="display:none;width:100%">
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
 										<tr>
-											<td width="30%" align=right><b>{$LABEL.parent_id} :</b></td>
-											<td width="70%" align=left>{$ACTIVITYDATA.parent_name}</td>
-										</tr>
-										<tr>
-											<td width="30%" align=right><b>{$MOD.LBL_CONTACT_NAME} :</b></td>	
-											<td width="70%" align=left>
+											<td width="30%" align=right valign="top"><b>{$LABEL.parent_id}</b></td>
+											<td width="70%" align=left valign="top">{$ACTIVITYDATA.parent_name}</td>
+										</tr>
+										<tr>
+											<td width="30%" valign="top" align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>	
+											<td width="70%" valign="top" align=left>
 											{foreach item=contactname key=cntid from=$CONTACTS}
 	                                                                                {$contactname.0}&nbsp;{$contactname.1}<br>
                                                                                         {/foreach}
@@ -245,34 +264,64 @@
                 					 </tr>
 						     </table>
 						    {else}
-					 	     <table border="0" cellpadding="5" cellspacing="0" width="90%">
-							<tr>
-								<td width="20%"><b>{$MOD.LBL_TODO} :</b></td>
-								<td width="80%">{$ACTIVITYDATA.task_subject}</td>
-							</tr>
-							<tr>
-								<td><b>{$MOD.LBL_TIMEDATE} :</b></td>
-								<td>{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td>
-							</tr>
-							<tr>
-								<td>&nbsp;</td>
-								<td>{$ACTIVITYDATA.task_date_start}</td>
-							</tr>
-							<tr>
-								<td><b>{$LABEL.taskpriority}&nbsp;:&nbsp;</b></td>
-								<td>{$ACTIVITYDATA.priority}</td>
+					 	     <table border="0" cellpadding="5" cellspacing="0" width="95%">
+							<tr>
+								<td width="20%" align="right"><b>{$MOD.LBL_TODO}</b></td>
+								<td width="80%" align="left">{$ACTIVITYDATA.subject}</td>
+							</tr>
+							<tr>
+								<td align="right" valign="top"><b>{$LABEL.description}</b></td>
+                                                                <td align="left" colspan="3" valign="top" height="60px">{$ACTIVITYDATA.description}</td>
+                					</tr>
+							<tr>
+                        					<td colspan="2" align="center" width="80%">
+                                					<table border="0" cellpadding="3" cellspacing="0" width="80%">
+                                        					<tr>
+                                                				<td align="left"><b>{$LABEL.taskstatus}</b></td>
+										<td align="left"><b>{$LABEL.taskpriority}</b></td>
+										<td align="left"><b>{$LABEL.assigned_user_id}</b></td>
+										</tr>
+										<tr>
+                                                				<td align="left" valign="top">{$ACTIVITYDATA.taskstatus}</td>
+										<td align="left" valign="top">{$ACTIVITYDATA.taskpriority}</td>
+										<td align="left" valign="top">{$ACTIVITYDATA.assigned_user_id}</td>
+										</tr>
+									</table>
+								</td>
+							</tr>
+						</table>
+						<br>
+						<table border=0 cellspacing=0 cellpadding=5 width=95% >
+							<tr>
+								<td ><b>{$LABEL.createdtime}</b></td>
+								<td >{$ACTIVITYDATA.createdtime}</td>
+								<td ><b>{$LABEL.modifiedtime}</b></td>
+								<td>{$ACTIVITYDATA.modifiedtime}</td>
+                                                        </tr>
+                                                </table>
+						<hr noshade="noshade" size="1">
+						<table bgcolor="#ffffff" border="0" cellpadding="5" cellspacing="0" width="95%" align=center>
+							<tr><td>
+								<table border="0" cellpadding="2" cellspacing="0" width="100%" align=center>
+									<tr><td width=50% valign=top style="border-right:1px solid #dddddd">
+										<table border=0 cellspacing=0 cellpadding=2 width=95% align=center>
+											<tr><td><b>{$MOD.LBL_TIMEDATE}</b></td></tr>
+											<tr><td>{$ACTIVITYDATA.starthr}:{$ACTIVITYDATA.startmin}{$ACTIVITYDATA.startfmt}</td></tr>
+											<tr><td>{$ACTIVITYDATA.date_start}</td></tr>
+										</table>
+									</td>
+									<td width=50% valign="top">
+										<table border=0 cellspacing=0 cellpadding=2 width=95% align=center>
+											<tr><td><b>{$LABEL.due_date}</b></td></tr>
+											<tr><td>{$ACTIVITYDATA.due_date}</td></tr>
+											<tr><td>&nbsp;</td></tr>
+										</table>
+									</td>
+								</table>	
 							</tr>
 						    </table>
-						    <table border=0 cellspacing=0 cellpadding=5 width=90% >
-                                                         <tr>
-                                                                <td ><b>{$LABEL.createdtime} :</b></td>
-                                                                <td >{$ACTIVITYDATA.createdtime}</td>
-                                                                <td ><b>{$LABEL.modifiedtime} :</b></td>
-                                                                <td>{$ACTIVITYDATA.modifiedtime}</td>
-                                                         </tr>
-                                                     </table>
 						    <br>
-						    <table align="center" border="0" cellpadding="0" cellspacing="0" width="95%">
+						    <table align="center" border="0" cellpadding="0" cellspacing="0" width="100%">
 							<tr>
 								<td>
 									<table border="0" cellpadding="3" cellspacing="0" width="100%">
@@ -293,7 +342,7 @@
 th:100%">
 									<table width="100%" cellpadding="5" cellspacing="0" border="0">
 										<tr>
-											<td width="30%" align=right><b>{$MOD.LBL_SENDNOTIFICATION} :</b></td>
+											<td width="30%" align=right><b>{$MOD.LBL_SENDNOTIFICATION}</b></td>
 											<td width="70%" align=left>{$ACTIVITYDATA.sendnotification}</td>
 										</tr>
                                                                         </table>
@@ -301,11 +350,11 @@
 									<div id="addTaskRelatedtoUI" style="display:none;width:100%">
                                                                         <table width="100%" cellpadding="5" cellspacing="0" border="0">
                                                                                 <tr>
-                                                                                        <td width="30%" align=right><b>{$LABEL.parent_id} :</b></td>
+                                                                                        <td width="30%" align=right><b>{$LABEL.parent_id}</b></td>
                                                                                         <td width="70%" align=left>{$ACTIVITYDATA.parent_name}</td>
                                                                                 </tr>
                                                                                 <tr>
-                                                                                        <td align=right><b>{$MOD.LBL_CONTACT_NAME} :</b></td>
+                                                                                        <td align=right><b>{$MOD.LBL_CONTACT_NAME}</b></td>
                                                                                         <td align=left>{$ACTIVITYDATA.contact_id}</td>
                                                                                 </tr>
 									</table>





More information about the vtigercrm-commits mailing list