[Vtigercrm-commits] [vtiger-commits] r10695 - in /vtigercrm/branches/5.0.3/Smarty/templates: ActivityListView.tpl Buttons_List.tpl Buttons_List1.tpl ListView.tpl ListViewEntries.tpl

vtigercrm-commits at vtiger.fosslabs.com vtigercrm-commits at vtiger.fosslabs.com
Mon Apr 16 05:40:11 EDT 2007 

Author: richie
Date: Mon Apr 16 03:39:57 2007
New Revision: 10695

Log:
fix for activitytype is incorrectly selected while creating event from listview. Fixes #3338 --minnie

Modified:
    vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List1.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl
    vtigercrm/branches/5.0.3/Smarty/templates/ListViewEntries.tpl

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ActivityListView.tpl Mon Apr 16 03:39:57 2007
@@ -351,13 +351,8 @@
 							</tr>
 							<tr>
 							<td class="small" align="left" nowrap="nowrap">{$APP.LBL_YOU_CAN_CREATE} {$APP.$vowel_conf} {$APP.$MODULE_CREATE} {$APP.LBL_NOW}. {$APP.LBL_CLICK_THE_LINK}:<br>
-								   {if $MODULE neq 'Calendar'}	
-						  			&nbsp;&nbsp;-<a href="index.php?module={$MODULE}&action=EditView&return_action=DetailView&parenttab={$CATEGORY}">{$APP.LBL_CREATE} {$APP.$vowel_conf} {$APP.$MODULE_CREATE}</a><br>
-								   {else}
-									&nbsp;&nbsp;-<a href="index.php?module={$MODULE}&amp;action=EditView&amp;return_module=Calendar&amp;activity_mode=Events&amp;return_action=DetailView&amp;activitytype=Meeting&amp;parenttab={$CATEGORY}">{$APP.LBL_CREATE} {$APP.LBL_A} {$APP.Meeting}</a><br>
-									&nbsp;&nbsp;-<a href="index.php?module={$MODULE}&amp;action=EditView&amp;return_module=Calendar&amp;activity_mode=Events&amp;return_action=DetailView&amp;activitytype=Call&amp;parenttab={$CATEGORY}">{$APP.LBL_CREATE} {$APP.LBL_A} {$APP.Call}</a><br>
+									&nbsp;&nbsp;-<a href="index.php?module={$MODULE}&amp;action=EditView&amp;return_module=Calendar&amp;activity_mode=Events&amp;return_action=DetailView&amp;parenttab={$CATEGORY}">{$APP.LBL_CREATE} {$APP.LBL_AN} {$APP.Event}</a><br>
 									&nbsp;&nbsp;-<a href="index.php?module={$MODULE}&amp;action=EditView&amp;return_module=Calendar&amp;activity_mode=Task&amp;return_action=DetailView&amp;parenttab={$CATEGORY}">{$APP.LBL_CREATE} {$APP.LBL_A} {$APP.Todo}</a>
-								   {/if}
 								</td>
 							</tr>
 							</table> 

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List.tpl Mon Apr 16 03:39:57 2007
@@ -10,22 +10,6 @@
  ********************************************************************************/
 -->*}
 <script type="text/javascript" src="modules/{$MODULE}/{$MODULE}.js"></script>
-<!-- Activity createlink layer start  -->
-{if $MODULE eq 'Calendar'}
-<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
-        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
-                <tr>
-                        <td>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
-                        </td>
-                </tr>
-        </table>
-
-</div>
-{/if}
-<!-- Activity createlink layer end  -->
-
 
 <TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
 <tr><td style="height:2px"></td></tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List1.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List1.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/Buttons_List1.tpl Mon Apr 16 03:39:57 2007
@@ -10,22 +10,6 @@
  ********************************************************************************/
 -->*}
 <script type="text/javascript" src="modules/{$MODULE}/{$MODULE}.js"></script>
-<!-- Activity createlink layer start  -->
-{if $MODULE eq 'Calendar'}
-<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
-        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
-                <tr>
-                        <td>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
-                        </td>
-                </tr>
-        </table>
-
-</div>
-{/if}
-<!-- Activity createlink layer end  -->
-
 
 <TABLE border=0 cellspacing=0 cellpadding=0 width=100% class=small>
 <tr><td style="height:2px"></td></tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListView.tpl Mon Apr 16 03:39:57 2007
@@ -116,22 +116,6 @@
 </script>
 
 		{include file='Buttons_List.tpl'}
-<!-- Activity createlink layer start  -->
-{if $MODULE eq 'Calendar'}
-<div id="reportLay" style="width: 125px; right: 159px; top: 260px; display: none; z-index:50" onmouseout="fninvsh('reportLay')" onmouseover="fnvshNrm('reportLay')">
-        <table bgcolor="#ffffff" border="0" cellpadding="0" cellspacing="0" width="100%">
-                <tr>
-                        <td>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Events&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_EVENT}</a>
-                                <a href="index.php?module={$MODULE}&action=EditView&return_module={$MODULE}&activity_mode=Task&return_action=DetailView&parenttab={$CATEGORY}" class="calMnu">{$NEW_TASK}</a>
-                        </td>
-                </tr>
-        </table>
-
-</div>
-{/if}
-<!-- Activity createlink layer end  -->
-
                                 <div id="searchingUI" style="display:none;">
                                         <table border=0 cellspacing=0 cellpadding=0 width=100%>
                                         <tr>

Modified: vtigercrm/branches/5.0.3/Smarty/templates/ListViewEntries.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ListViewEntries.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ListViewEntries.tpl Mon Apr 16 03:39:57 2007
@@ -121,6 +121,8 @@
 					<td style="border-bottom: 1px solid rgb(204, 204, 204);" nowrap="nowrap" width="75%"><span class="genHeaderSmall">
 					{if $MODULE_CREATE eq 'SalesOrder' || $MODULE_CREATE eq 'PurchaseOrder' || $MODULE_CREATE eq 'Invoice' || $MODULE_CREATE eq 'Quotes'}
 						{$APP.LBL_NO} {$APP.$MODULE_CREATE} {$APP.LBL_FOUND} !
+					{elseif $MODULE eq 'Calendar'}
+						{$APP.LBL_NO} {$APP.ACTIVITIES} {$APP.LBL_FOUND} !
 					{else}
 						{$APP.LBL_NO} {$APP.$MODULE_CREATE}s {$APP.LBL_FOUND} !
 					{/if}

More information about the vtigercrm-commits mailing list