[Vtigercrm-commits] [vtiger-commits] r7011 - in /vtigercrm/branches/4.2/modules: Accounts/ Activities/ Activities/language/ Home/ Potentials/ Potentials/language/

vtigercrm-commits at vtiger.fosslabs.com vtigercrm-commits at vtiger.fosslabs.com
Tue Jun 13 02:02:26 EDT 2006 

Author: allanbush
Date: Tue Jun 13 00:02:21 2006
New Revision: 7011

Log:
Applied patch from #1263, which cleans up the html under the home tab.  Closes #1263.

Modified:
    vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html
    vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php
    vtigercrm/branches/4.2/modules/Activities/OpenListView.html
    vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php
    vtigercrm/branches/4.2/modules/Home/index.php
    vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html
    vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php
    vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php

Modified: vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html (original)
+++ vtigercrm/branches/4.2/modules/Accounts/ListViewTop.html Tue Jun 13 00:02:21 2006
@@ -22,7 +22,7 @@
 <tr><td colspan=3 bgcolor="#000000" style="height:1px;"></td></tr>
 <tr><td colspan=3>
 <div id="home_myaccount" style="display:block;">
-<table cellpadding="0" cellspacing="0" width="100%" border="0" class="FormBorder"><tbody>
+<table cellpadding="0" cellspacing="0" width="100%" border="0"><tbody>
 	<tr height="20" class="moduleListTitle">
 	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif">
 		<td width="70%" class="moduleListTitle">&nbsp;{MOD.LBL_LIST_ACCOUNT_NAME}</td>
@@ -40,13 +40,12 @@
     	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td>
 </tr>
 <!-- END: row -->
-<tr><td COLSPAN="9"></td></tr>
+<tr><td COLSPAN="9" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
 </table>
 </div>
 </td></tr>
 </table>
-<BR><BR>
 <script language='Javascript'>
         var leftpanelistarray=new Array('home_myaccount');
-  setExpandCollapse_gen()</script
+  setExpandCollapse_gen()</script>
 <!-- END: main -->

Modified: vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php (original)
+++ vtigercrm/branches/4.2/modules/Accounts/ListViewTop.php Tue Jun 13 00:02:21 2006
@@ -82,9 +82,10 @@
 }
 
 $xtpl->parse("main");
-if (count($open_accounts_list)>0) $xtpl->out("main");
-else echo "<em>".$current_module_strings['NTC_NONE_SCHEDULED']."</em>";
-echo "<BR>";
+if (count($open_accounts_list)>0) {
+	$xtpl->out("main");
+	echo "<BR>";
+}
 // Stick on the form footer
 echo get_form_footer();
 

Modified: vtigercrm/branches/4.2/modules/Activities/OpenListView.html
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/OpenListView.html (original)
+++ vtigercrm/branches/4.2/modules/Activities/OpenListView.html Tue Jun 13 00:02:21 2006
@@ -46,7 +46,7 @@
 			<td width="10%" class="moduleListTitle">&nbsp;{MOD.LBL_LIST_RECURRING_TYPE}</td>
 	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif">
 	  </tr>
-	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}/blank.gif"></td></tr>
+	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
 
 
 <!-- BEGIN: row -->
@@ -77,7 +77,7 @@
 	  	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td>
 </tr>
 <!-- END: row -->
-	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}/blank.gif"></td></tr>
+	<tr><td COLSPAN="17" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
 </table>
 </div>
 </td></tr>

Modified: vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Activities/language/en_us.lang.php Tue Jun 13 00:02:21 2006
@@ -66,7 +66,6 @@
 'LBL_LIST_RECURRING_TYPE'=>'Recurring Type',
 
 'ERR_DELETE_RECORD'=>"A record number must be specified to delete the account.",
-'NTC_NONE_SCHEDULED'=>'None scheduled.',
 
 // Added fields for Attachments in Activities/SubPanelView.php
 'LBL_ATTACHMENTS'=>'Attachments',

Modified: vtigercrm/branches/4.2/modules/Home/index.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Home/index.php (original)
+++ vtigercrm/branches/4.2/modules/Home/index.php Tue Jun 13 00:02:21 2006
@@ -68,7 +68,9 @@
 		include("modules/Accounts/ListViewTop.php");
 	}
 }
-	
+?>
+<br>
+<?php
 if($tab_per_Data[2] == 0)
 {
 	if($permissionData[2][3] == 0)

Modified: vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html (original)
+++ vtigercrm/branches/4.2/modules/Potentials/ListViewTop.html Tue Jun 13 00:02:21 2006
@@ -22,7 +22,6 @@
 <tr><td colspan=3 bgcolor="#000000" style="height:1px;"></td></tr>
 <tr><td colspan=3>
 <div id="home_mypot" style="display:block;">
-<div id="{DIVID}" style="display:block;">
 <table cellpadding="0" cellspacing="0" width="100%" border="0"><tbody>
 	<tr height="20" class="moduleListTitle">
 	<td WIDTH="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif">

Modified: vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/ListViewTop.php Tue Jun 13 00:02:21 2006
@@ -93,9 +93,10 @@
 }
 
 $xtpl->parse("main");
-if (count($open_potentials_list)>0) $xtpl->out("main");
-else echo "<em>".$current_module_strings['NTC_NONE_SCHEDULED']."</em>";
-echo "<BR>";
+if (count($open_potentials_list)>0) {
+	$xtpl->out("main");
+	echo "<BR>";
+}
 // Stick on the form footer
 echo get_form_footer();
 

Modified: vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php (original)
+++ vtigercrm/branches/4.2/modules/Potentials/language/en_us.lang.php Tue Jun 13 00:02:21 2006
@@ -57,8 +57,6 @@
 
 'NTC_REMOVE_OPP_CONFIRMATION'=>'Are you sure you want to remove this contact from this opportunity?',
 
-'NTC_NONE_SCHEDULED'=>'None scheduled.',
-
 'LBL_SELECT_OPPOPTUNITY'=>'Select Potential',
 'LBL_GENERAL_INFORMATION'=>'General Information',

More information about the vtigercrm-commits mailing list