[Vtigercrm-commits] [vtiger-commits] r6867 - in /vtigercrm/trunk: Smarty/templates/ Smarty/templates/Settings/ include/images/ modules/Products/ modules/Settings/language/ modules/Users/ themes/blue/images/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Wed May 31 09:46:39 EDT 2006
Author: don
Date: Wed May 31 07:46:20 2006
New Revision: 6867
Log:
ui fixes and tax congiguration added,about us page has been changed
Added:
vtigercrm/trunk/themes/blue/images/aboutUS.jpg (with props)
vtigercrm/trunk/themes/blue/images/about_btm.jpg (with props)
vtigercrm/trunk/themes/blue/images/taxConfig_btm.gif (with props)
vtigercrm/trunk/themes/blue/images/taxConfig_top.gif (with props)
vtigercrm/trunk/themes/blue/images/taxConfiguration.gif (with props)
Modified:
vtigercrm/trunk/Smarty/templates/Settings.tpl
vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl
vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl
vtigercrm/trunk/include/images/loginAlpha.gif
vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html
vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php
vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html
vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php
vtigercrm/trunk/modules/Settings/language/en_us.lang.php
vtigercrm/trunk/modules/Users/about_us.php
Modified: vtigercrm/trunk/Smarty/templates/Settings.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings.tpl Wed May 31 07:46:20 2006
@@ -1,173 +1,175 @@
-{*<!--
-/*********************************************************************************
- ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is: vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
- *
- ********************************************************************************/
--->*}
-<style type="text/css">@import url(themes/blue/style.css);</style>
-<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
-<tr>
- {include file='SettingsMenu.tpl'}
-<td width="75%" valign="top">
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">
-<tr>
-
-<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_USER_MANAGEMENT}</b></td>
-</tr>
-
-<tr>
-<td class="padTab">
-
-<table class="controlTab" cellspacing="0" cellpadding="0">
-<tr>
-
-<td width="25%"><a href="index.php?module=Administration&action=index&parenttab=Settings"><img src="{$IMAGE_PATH}user.gif" border="0" alt="{$MOD.LBL_CREATE_AND_MANAGE_USERS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USERS}"/></a><br>
-<a href="index.php?module=Administration&action=index&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USERS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USERS}">{$MOD.LBL_USERS}</a></td>
-
-<td width="25%"><a href="index.php?module=Users&action=listroles&parenttab=Settings"><img src="{$IMAGE_PATH}roles.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" border="0"/></a><br>
-<a href="index.php?module=Users&action=listroles&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}">{$MOD.LBL_ROLES}</a>
-</td>
-
-<td width="25%"><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}profile.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}" border="0" /></a><br>
-<a href="index.php?module=Users&action=ListProfiles&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}">{$MOD.LBL_PROFILES}</a>
-</td>
-
-<td width="25%"><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}groups.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" border="0" /></a><br>
-<a href="index.php?module=Users&action=listgroups&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}">{$MOD.USERGROUPLIST}</a></td>
-
-</tr>
-
-<tr><td colspan="4" height="30px;"> </td></tr>
-
-<tr>
-
-<td><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" title="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" border="0"/></a><br>
-<a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings" alt="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" title="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}">{$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS}</a>
-</td>
-
-<td><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" title="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" border="0"/></a><br>
-<a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings" alt="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" title="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}">{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}</a></td>
-
-<td><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}">{$MOD.LBL_ASSIGN_MODULE_OWNERS}</a>
-
-<td><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_SETTING_ANNOUNCEMENT}" title="{$MOD.LBL_SETTING_ANNOUNCEMENT}" border="0" /></a><br>
-<a href="index.php?module=Users&action=Announcements&parenttab=Settings" alt="{$MOD.LBL_SETTING_ANNOUNCEMENT}" title="{$MOD.LBL_SETTING_ANNOUNCEMENT}">{$MOD.LBL_ANNOUNCEMENT}</a></td>
-<td> </td>
-
-</tr>
-
-</table>
-</td>
-</tr>
-
-<tr><td> </td></tr>
-
-<tr>
-<td class="detailedViewHeader" align="left" ><b>{$MOD.LBL_STUDIO}</b></td>
-</tr>
-
-<tr>
-<td class="padTab">
-
-<table class="controlTab" cellspacing="0" cellpadding="0">
-
-<tr>
-<td width="25%"><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings"><img src="{$IMAGE_PATH}custom.gif" border="0" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}"/></a><br />
-<a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}">{$MOD.LBL_CUSTOM_FIELD_SETTINGS}</a></td>
-
-<td width="25%"><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_EDIT_PICKLIST_VALUES}" title="{$MOD.LBL_EDIT_PICKLIST_VALUES}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=PickList&parenttab=Settings" alt="{$MOD.LBL_EDIT_PICKLIST_VALUES}" title="{$MOD.LBL_EDIT_PICKLIST_VALUES}">{$MOD.LBL_PICKLIST_SETTINGS}</a> </td>
-
-<td width="25%"> </td>
-<td width="25%"> </td>
-</tr>
-
-<tr>
-<td colspan="4" height="30px;"> </td>
-</tr>
-
-</table>
-</td>
-</tr>
-
-<tr><td> </td></tr>
-
-<tr>
-<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_COMMUNICATION_TEMPLATES}</b></td>
-</tr>
-
-<tr><td class="padTab">
-<table class="controlTab" cellspacing="0" cellpadding="0">
-<tr>
-
-<td width="25%"><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img src="{$IMAGE_PATH}ViewTemplate.gif" border="0" alt="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}" title="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}"/></a><br />
-<a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings" alt="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}" title="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}">{$MOD.EMAILTEMPLATES}</a></td>
-
-<td width="25%"><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" title="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" border="0"/></a><br />
-<a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings" alt="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" title="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}">{$MOD.WORDINTEGRATION}</a> </td>
-
-<td width="25%"><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img src="{$IMAGE_PATH}notification.gif" alt="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}" title="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}" border="0" /></a><br />
-<a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings" alt="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}" title="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}">{$MOD.NOTIFICATIONSCHEDULERS}</a> </td>
-<td width="25%"><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img src="{$IMAGE_PATH}inventory.gif" alt="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" title="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" border="0" /></a><br />
-<a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" title="{$MOD.LBL_INVENTORY_NOTIFICATIONS}">{$MOD.INVENTORYNOTIFICATION}</a></td>
-</tr>
-<tr><td colspan="4" height="30px;"> </td></tr>
-<tr>
-<td width="25%"><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img src="{$IMAGE_PATH}terms.gif" alt="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" title="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" border="0"/></a><br />
-<a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" title="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}">{$MOD.INVENTORYTERMSANDCONDITIONS}</a> </td>
-<td width="25%"> </td><td width="25%"> </td><td width="25%"> </td>
-</tr>
-
-<td> </td>
-</tr>
-
-</table>
-</td></tr>
-
-<tr><td> </td></tr>
-<tr>
-<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_CONFIGURATION}</b></td>
-</tr>
-<tr><td class="padTab">
-<table class="controlTab" cellspacing="0" cellpadding="0">
-<tr>
-
-<td width="25%"><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img src="{$IMAGE_PATH}company.gif" border="0" alt="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}" title="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}"/></a><br />
-<a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings" alt="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}" title="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}">{$MOD.LBL_ORGANIZATION_DETAILS}</a></td>
-
-<td width="25%"><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" title="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings" alt="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" title="{$MOD.LBL_CONFIGURE_MAIL_SERVER}">{$MOD.LBL_EMAIL_CONFIG}</a></td>
-
-<td width="25%"><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}" title="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}" border="0" /></a><br />
-<a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings" alt="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}" title="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}">{$MOD.LBL_BACKUP_SERVER_CONFIGURATION}</a> </td>
-
-<td width="25%"><a href="index.php?module=System&action=systemconfig&parenttab=Settings"><img src="{$IMAGE_PATH}system.gif" alt="{$MOD.LBL_SYSTEM_CONFIGURATION}" title="{$MOD.LBL_SYSTEM_CONFIGURATION}" border="0" /></a><br />
-<a href="index.php?module=System&action=systemconfig&parenttab=Settings" alt="{$MOD.LBL_SYSTEM_CONFIGURATION}" title="{$MOD.LBL_SYSTEM_CONFIGURATION}">{$MOD.LBL_SYSTEM_CONFIG}</a></td>
-
-</tr>
-
-<tr><td colspan="4" height="30px;"> </td></tr>
-
-<tr>
-
-<td><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_CONFIGURATION}" title="{$MOD.LBL_CURRENCY_CONFIGURATION}" border="0"/></a><br />
-<a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings" alt="{$MOD.LBL_CURRENCY_CONFIGURATION}" title="{$MOD.LBL_CURRENCY_CONFIGURATION}">{$MOD.LBL_CURRENCY_CONFIG}</a> </td>
-
-
-<td><a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings"><img src="{$IMAGE_PATH}migrate.gif" alt="{$MOD.LBL_MIGRATION_INFO}" title="{$MOD.LBL_MIGRATION_INFO}" border="0"/></a><br />
-<a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings" alt="{$MOD.LBL_MIGRATION_INFO}" title="{$MOD.LBL_MIGRATION_INFO}">{$MOD.LBL_MIGRATION}</a></td>
-
-</tr>
-<tr><td colspan="4" height="30px;"> </td></tr>
-</table></td></tr>
-</table>
-</td>
-</tr>
-</table>
- {include file='SettingsSubMenu.tpl'}
+{*<!--
+/*********************************************************************************
+ ** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+ * ("License"); You may not use this file except in compliance with the License
+ * The Original Code is: vtiger CRM Open Source
+ * The Initial Developer of the Original Code is vtiger.
+ * Portions created by vtiger are Copyright (C) vtiger.
+ * All Rights Reserved.
+ *
+ ********************************************************************************/
+-->*}
+<style type="text/css">@import url(themes/blue/style.css);</style>
+<table width="100%" border="0" cellpadding="0" cellspacing="0" class="small">
+<tr>
+ {include file='SettingsMenu.tpl'}
+<td width="75%" valign="top">
+<table width="100%" border="0" cellspacing="0" cellpadding="0" class="small">
+<tr>
+
+<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_USER_MANAGEMENT}</b></td>
+</tr>
+
+<tr>
+<td class="padTab">
+
+<table class="controlTab" cellspacing="0" cellpadding="0">
+<tr>
+
+<td width="25%"><a href="index.php?module=Administration&action=index&parenttab=Settings"><img src="{$IMAGE_PATH}user.gif" border="0" alt="{$MOD.LBL_CREATE_AND_MANAGE_USERS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USERS}"/></a><br>
+<a href="index.php?module=Administration&action=index&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USERS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USERS}">{$MOD.LBL_USERS}</a></td>
+
+<td width="25%"><a href="index.php?module=Users&action=listroles&parenttab=Settings"><img src="{$IMAGE_PATH}roles.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" border="0"/></a><br>
+<a href="index.php?module=Users&action=listroles&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_ROLES}">{$MOD.LBL_ROLES}</a>
+</td>
+
+<td width="25%"><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings"><img src="{$IMAGE_PATH}profile.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}" border="0" /></a><br>
+<a href="index.php?module=Users&action=ListProfiles&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_PROFILES}">{$MOD.LBL_PROFILES}</a>
+</td>
+
+<td width="25%"><a href="index.php?module=Users&action=listgroups&parenttab=Settings"><img src="{$IMAGE_PATH}groups.gif" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" border="0" /></a><br>
+<a href="index.php?module=Users&action=listgroups&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_GROUPS}">{$MOD.USERGROUPLIST}</a></td>
+
+</tr>
+
+<tr><td colspan="4" height="30px;"> </td></tr>
+
+<tr>
+
+<td><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings"><img src="{$IMAGE_PATH}shareaccess.gif" alt="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" title="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" border="0"/></a><br>
+<a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings" alt="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}" title="{$MOD.LBL_SETTING_DEFAULT_SHARING_ACCESS}">{$MOD.LBL_DEFAULT_ORGANIZATION_SHARING_ACCESS}</a>
+</td>
+
+<td><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings"><img src="{$IMAGE_PATH}orgshar.gif" alt="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" title="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" border="0"/></a><br>
+<a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings" alt="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}" title="{$MOD.LBL_SETTING_DEFAULT_ORGANIZATION_FIELDS}">{$MOD.LBL_DEFAULT_ORGANIZATION_FIELDS}</a></td>
+
+<td><a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings"><img src="{$IMAGE_PATH}assign.gif" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" border="0"/></a><br />
+<a href="index.php?module=Settings&action=ListModuleOwners&parenttab=Settings" alt="{$MOD.LBL_ASSIGN_MODULE_OWNERS}" title="{$MOD.LBL_ASSIGN_MODULE_OWNERS}">{$MOD.LBL_ASSIGN_MODULE_OWNERS}</a>
+
+<td><a href="index.php?module=Users&action=Announcements&parenttab=Settings"><img src="{$IMAGE_PATH}announ.gif" alt="{$MOD.LBL_SETTING_ANNOUNCEMENT}" title="{$MOD.LBL_SETTING_ANNOUNCEMENT}" border="0" /></a><br>
+<a href="index.php?module=Users&action=Announcements&parenttab=Settings" alt="{$MOD.LBL_SETTING_ANNOUNCEMENT}" title="{$MOD.LBL_SETTING_ANNOUNCEMENT}">{$MOD.LBL_ANNOUNCEMENT}</a></td>
+<td> </td>
+
+</tr>
+
+</table>
+</td>
+</tr>
+
+<tr><td> </td></tr>
+
+<tr>
+<td class="detailedViewHeader" align="left" ><b>{$MOD.LBL_STUDIO}</b></td>
+</tr>
+
+<tr>
+<td class="padTab">
+
+<table class="controlTab" cellspacing="0" cellpadding="0">
+
+<tr>
+<td width="25%"><a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings"><img src="{$IMAGE_PATH}custom.gif" border="0" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}"/></a><br />
+<a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings" alt="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}" title="{$MOD.LBL_CREATE_AND_MANAGE_USER_DEFINED_FIELDS}">{$MOD.LBL_CUSTOM_FIELD_SETTINGS}</a></td>
+
+<td width="25%"><a href="index.php?module=Settings&action=PickList&parenttab=Settings"><img src="{$IMAGE_PATH}picklist.gif" alt="{$MOD.LBL_EDIT_PICKLIST_VALUES}" title="{$MOD.LBL_EDIT_PICKLIST_VALUES}" border="0"/></a><br />
+<a href="index.php?module=Settings&action=PickList&parenttab=Settings" alt="{$MOD.LBL_EDIT_PICKLIST_VALUES}" title="{$MOD.LBL_EDIT_PICKLIST_VALUES}">{$MOD.LBL_PICKLIST_SETTINGS}</a> </td>
+
+<td width="25%"> </td>
+<td width="25%"> </td>
+</tr>
+
+<tr>
+<td colspan="4" height="30px;"> </td>
+</tr>
+
+</table>
+</td>
+</tr>
+
+<tr><td> </td></tr>
+
+<tr>
+<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_COMMUNICATION_TEMPLATES}</b></td>
+</tr>
+
+<tr><td class="padTab">
+<table class="controlTab" cellspacing="0" cellpadding="0">
+<tr>
+
+<td width="25%"><a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings"><img src="{$IMAGE_PATH}ViewTemplate.gif" border="0" alt="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}" title="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}"/></a><br />
+<a href="index.php?module=Users&action=listemailtemplates&parenttab=Settings" alt="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}" title="{$MOD.LBL_CREATE_EMAIL_TEMPLATES}">{$MOD.EMAILTEMPLATES}</a></td>
+
+<td width="25%"><a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings"><img src="{$IMAGE_PATH}mailmarge.gif" alt="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" title="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" border="0"/></a><br />
+<a href="index.php?module=Users&action=listwordtemplates&parenttab=Settings" alt="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}" title="{$MOD.LBL_UPLOAD_MSWORD_TEMPLATES}">{$MOD.WORDINTEGRATION}</a> </td>
+
+<td width="25%"><a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings"><img src="{$IMAGE_PATH}notification.gif" alt="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}" title="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}" border="0" /></a><br />
+<a href="index.php?module=Users&action=listnotificationschedulers&parenttab=Settings" alt="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}" title="{$MOD.LBL_SCHEDULE_EMAIL_NOTIFICATION}">{$MOD.NOTIFICATIONSCHEDULERS}</a> </td>
+<td width="25%"><a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings"><img src="{$IMAGE_PATH}inventory.gif" alt="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" title="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" border="0" /></a><br />
+<a href="index.php?module=Users&action=listinventorynotifications&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_NOTIFICATIONS}" title="{$MOD.LBL_INVENTORY_NOTIFICATIONS}">{$MOD.INVENTORYNOTIFICATION}</a></td>
+</tr>
+<tr><td colspan="4" height="30px;"> </td></tr>
+<tr>
+<td width="25%"><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings"><img src="{$IMAGE_PATH}terms.gif" alt="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" title="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" border="0"/></a><br />
+<a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}" title="{$MOD.LBL_INVENTORY_TERMSANDCONDITIONS}">{$MOD.INVENTORYTERMSANDCONDITIONS}</a> </td>
+<td width="25%"> </td><td width="25%"> </td><td width="25%"> </td>
+</tr>
+
+<td> </td>
+</tr>
+
+</table>
+</td></tr>
+
+<tr><td> </td></tr>
+<tr>
+<td class="detailedViewHeader" align="left"><b>{$MOD.LBL_CONFIGURATION}</b></td>
+</tr>
+<tr><td class="padTab">
+<table class="controlTab" cellspacing="0" cellpadding="0">
+<tr>
+
+<td width="25%"><a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings"><img src="{$IMAGE_PATH}company.gif" border="0" alt="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}" title="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}"/></a><br />
+<a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings" alt="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}" title="{$MOD.LBL_SPECIFY_COMPANY_DETAILS}">{$MOD.LBL_ORGANIZATION_DETAILS}</a></td>
+
+<td width="25%"><a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings"><img src="{$IMAGE_PATH}ogmailserver.gif" alt="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" title="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" border="0"/></a><br />
+<a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings" alt="{$MOD.LBL_CONFIGURE_MAIL_SERVER}" title="{$MOD.LBL_CONFIGURE_MAIL_SERVER}">{$MOD.LBL_EMAIL_CONFIG}</a></td>
+
+<td width="25%"><a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings"><img src="{$IMAGE_PATH}backupserver.gif" alt="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}" title="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}" border="0" /></a><br />
+<a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings" alt="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}" title="{$MOD.LBL_CONFIGURE_BACKUP_SERVER}">{$MOD.LBL_BACKUP_SERVER_CONFIGURATION}</a> </td>
+
+<td width="25%"><a href="index.php?module=System&action=systemconfig&parenttab=Settings"><img src="{$IMAGE_PATH}system.gif" alt="{$MOD.LBL_SYSTEM_CONFIGURATION}" title="{$MOD.LBL_SYSTEM_CONFIGURATION}" border="0" /></a><br />
+<a href="index.php?module=System&action=systemconfig&parenttab=Settings" alt="{$MOD.LBL_SYSTEM_CONFIGURATION}" title="{$MOD.LBL_SYSTEM_CONFIGURATION}">{$MOD.LBL_SYSTEM_CONFIG}</a></td>
+
+</tr>
+
+<tr><td colspan="4" height="30px;"> </td></tr>
+
+<tr>
+
+<td><a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings"><img src="{$IMAGE_PATH}currency.gif" alt="{$MOD.LBL_CURRENCY_CONFIGURATION}" title="{$MOD.LBL_CURRENCY_CONFIGURATION}" border="0"/></a><br />
+<a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings" alt="{$MOD.LBL_CURRENCY_CONFIGURATION}" title="{$MOD.LBL_CURRENCY_CONFIGURATION}">{$MOD.LBL_CURRENCY_CONFIG}</a> </td>
+
+<td><a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings"><img src="{$IMAGE_PATH}taxConfiguration.gif" alt="{$MOD.LBL_INVENTORY_TAX_CONFIG}" title="{$MOD.LBL_INVENTORY_TAX_CONFIG}" border="0"/></a><br />
+<a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings" alt="{$MOD.LBL_INVENTORY_TAX_CONFIG}" title="{$MOD.LBL_INVENTORY_TAX_CONFIG}">{$MOD.LBL_INVENTORY_TAX_CONFIG}</a> </td>
+
+<td><a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings"><img src="{$IMAGE_PATH}migrate.gif" alt="{$MOD.LBL_MIGRATION_INFO}" title="{$MOD.LBL_MIGRATION_INFO}" border="0"/></a><br />
+<a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings" alt="{$MOD.LBL_MIGRATION_INFO}" title="{$MOD.LBL_MIGRATION_INFO}">{$MOD.LBL_MIGRATION}</a></td>
+
+</tr>
+<tr><td colspan="4" height="30px;"> </td></tr>
+</table></td></tr>
+</table>
+</td>
+</tr>
+</table>
+ {include file='SettingsSubMenu.tpl'}
Modified: vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/TaxConfig.tpl Wed May 31 07:46:20 2006
@@ -55,13 +55,18 @@
<td style="padding-left: 10px; padding-top: 10px; vertical-align: top;" bgcolor="#ececec">
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
- <td width="30%" bgcolor="#FFFFFF"> </td>
+ <td height="250" width="30%" bgcolor="#FFFFFF" valign="bottom" background="{$IMAGE_PATH}taxConfig_top.gif" style="background-position:top right;background-repeat:no-repeat;padding:5px;">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td background="{$IMAGE_PATH}taxConfig_btm.gif" style="background-position:bottom right;background-repeat:no-repeat; " height="150"> </td>
+ </tr>
+ </table></td>
<td>
<table width="100%" border="0" cellpadding="5" cellspacing="0" height="100%">
<tr>
<td colspan="2" align="left" class="genHeaderBig">{$APP.LBL_TAX} {$MOD.LBL_CONFIGURATION}<br><hr></td>
</tr>
- <tr><td colspan="2"> </td></tr>
+ <tr><td colspan="2" > </td></tr>
<tr>
<td align="right" width="50%"><b>{$APP.LBL_VAT} : </b></td>
<td align="left">
Modified: vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/SettingsMenu.tpl Wed May 31 07:46:20 2006
@@ -27,7 +27,7 @@
</table>
<div id="top">
-<div id="user" style="height:185px;">
+<div id="user" style="height:180px;">
<a href="index.php?module=Administration&action=index&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_USERS}</a>
<a href="index.php?module=Users&action=listroles&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_ROLES}</a>
<a href="index.php?module=Users&action=ListProfiles&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_PROFILES}</a>
@@ -44,10 +44,9 @@
</tr></table>
<div id="top2">
-<div id="studio" style="height:45px;">
+<div id="studio" style="height:50px;">
<a href="index.php?module=Settings&action=SettingsSubMenu&type=CustomField&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_CUSTOM_FIELD_SETTINGS}</a>
<a href="index.php?module=Settings&action=PickList&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_PICKLIST_SETTINGS}</a>
- <!--a href="index.php?module=Settings&action=SettingsSubMenu&type=FieldOrder&parenttab=Settings" class="lftSubMnu" >{$MOD.LBL_FIELD_ORDERING}</a-->
</div></div>
<table class="lftMnuHdr" cellpadding="0" cellspacing="0" onclick="fnWipe('top3','communication');" >
@@ -69,12 +68,13 @@
<td width="5%"><a href="javascript:;" class="lftMnuHdr"><img src="{$IMAGE_PATH}downArrow.gif" border="0" /></a></td>
</tr></table>
<div id="top4">
-<div id="config" style="height:135px;">
+<div id="config" style="height:160px;">
<a href="index.php?module=Settings&action=OrganizationConfig&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_ORGANIZATION_DETAILS}</a>
<a href="index.php?module=Settings&action=EmailConfig&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_EMAIL_CONFIG}</a>
<a href="index.php?module=Settings&action=BackupServerConfig&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_BACKUP_SERVER_CONFIGURATION}</a>
<a href="index.php?module=System&action=systemconfig&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_SYSTEM_CONFIG}</a>
<a href="index.php?module=Settings&action=CurrencyListView&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_CURRENCY_CONFIG}</a>
+<a href="index.php?module=Settings&action=TaxConfig&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_INVENTORY_TAX_CONFIG}</a>
<a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings" class="lftSubMnu">{$MOD.LBL_MIGRATION}</a>
</div></div>
</td>
Modified: vtigercrm/trunk/include/images/loginAlpha.gif
==============================================================================
Binary files - no diff available.
Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html
==============================================================================
--- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html (original)
+++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.html Wed May 31 07:46:20 2006
@@ -117,12 +117,15 @@
</script>
<script language="javascript" src="modules/Products/Product.js"></script>
-<BR>
-<BR>
+<table width="95%" border="0" cellpadding="0" cellspacing="0">
+<tr><td colspan="3"> </td></tr>
+<tr>
+ <td> </td>
+ <td class="showPanelBg">
{PRICEBOOKLISTHEADER}
-<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr height="20">
- <td COLSPAN="18" class="listFormHeaderLinks">
+ <td class="listFormHeaderLinks">
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td> {RECORD_COUNTS}</td>
@@ -131,14 +134,23 @@
</table>
</td>
</tr>
- <tr><td colspan="18" height="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
- {LISTHEADER}
- <tr><td colspan="18" height="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
- {LISTENTITY}
+ <tr>
+ <td>
+ <table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="3" cellspacing="1" width="90%" align="center">
+ {LISTHEADER}
+ {LISTENTITY}
+ </table>
+ </td>
+ </tr>
+ <tr><td> </td></tr>
</form>
</table>
<!-- END: main -->
</form>
</table>
+</td>
+<td> </td>
+</tr>
+</table>
Modified: vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php
==============================================================================
--- vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php (original)
+++ vtigercrm/trunk/modules/Products/AddProductToPriceBooks.php Wed May 31 07:46:20 2006
@@ -23,8 +23,6 @@
$image_path=$theme_path."images/";
require_once($theme_path.'layout_utils.php');
$productname = getProductName($productid);
-echo get_module_title($current_module_strings['LBL_MODULE_NAME'], $current_module_strings['LBL_ADD_PRODUCT_PRICEBOOKS'].": ".$productname, true);
-echo "<br>";
$xtpl=new XTemplate ('modules/Products/AddProductToPriceBooks.html');
$xtpl->assign("MOD", $mod_strings);
@@ -33,18 +31,18 @@
$focus = new PriceBook();
-echo get_form_footer();
-$other_text = '<table border="0" cellpadding="1" cellspacing="0">
+
+$other_text = '<table border="0" cellpadding="1" cellspacing="0" width="90%" align="center">
<form name="addToPB" method="POST">
<tr>
<input name="product_id" type="hidden" value="'.$productid.'">
<input name="idlist" type="hidden">
<input name="viewname" type="hidden">';
- $other_text .='<td><input class="button" type="submit" value="Add To PriceBook" onclick="return addtopricebook()"/></td>';
- $other_text .='<td> <input title="'.$app_strings[LBL_CANCEL_BUTTON_TITLE].'" accessKey="'.$app_strings[LBL_CANCEL_BUTTON_KEY].'" class="button" onclick="window.history.back()" type="button" name="button" value="'.$app_strings[LBL_CANCEL_BUTTON_LABEL].'"></td>';
+ $other_text .='<td align="center"><input class="classBtn" type="submit" value="Add To PriceBook" onclick="return addtopricebook()"/> ';
+ $other_text .='<input title="'.$app_strings[LBL_CANCEL_BUTTON_TITLE].'" accessKey="'.$app_strings[LBL_CANCEL_BUTTON_KEY].'" class="classBtn" onclick="window.history.back()" type="button" name="button" value="'.$app_strings[LBL_CANCEL_BUTTON_LABEL].'"></td>';
$other_text .='</tr></table>';
//Retreive the list from Database
@@ -91,16 +89,11 @@
$list_header = '';
-$list_header .= '<tr class="moduleListTitle" height=20>';
-$list_header .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
-$list_header .='<td WIDTH="1" class="moduleListTitle" style="padding:0px 3px 0px 3px;"><input type="checkbox" name="selectall" onClick=\'toggleSelect(this.checked,"selected_id");updateAllListPrice("'.$unit_price.'") \'></td>';
-$list_header .= '<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRICEBOOK'].'</td>';
-$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].'</td>';
-$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PB_LIST_PRICE'].'</td>';
-$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+$list_header .= '<tr>';
+$list_header .='<td class="lvtCol" width="9%"><input type="checkbox" name="selectall" onClick=\'toggleSelect(this.checked,"selected_id");updateAllListPrice("'.$unit_price.'") \'></td>';
+$list_header .= '<td class="lvtCol" width="45%">'.$mod_strings['LBL_PRICEBOOK'].'</td>';
+$list_header .= '<td class="lvtCol" width="23%">'.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].'</td>';
+$list_header .= '<td class="lvtCol" width="23%">'.$mod_strings['LBL_PB_LIST_PRICE'].'</td>';
$list_header .= '</tr>';
$xtpl->assign("LISTHEADER", $list_header);
@@ -113,22 +106,13 @@
$entity_id = $adb->query_result($list_result,$i,"crmid");
if(! array_key_exists($entity_id, $pbk_array))
{
- if (($i%2)==0)
- $list_body .= '<tr height=20 class=evenListRow>';
- else
- $list_body .= '<tr height=20 class=oddListRow>';
-
+ $list_body .= '<tr class="lvtColData" onmouseover="this.className=\'lvtColDataHover\'" onmouseout="this.className=\'lvtColData\'" bgcolor="white">';
$field_name=$entity_id."_listprice";
-
- $list_body .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
- $list_body .= '<td valign=TOP style="padding:0px 3px 0px 3px;"><INPUT type=checkbox NAME="selected_id" value= '.$entity_id.' onClick=\'toggleSelectAll(this.name,"selectall");updateListPrice("'.$unit_price.'","'.$field_name.'")\'></td>';
- $list_body .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
- $list_body .= '<td height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"bookname").'</td>';
- $list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
- $list_body .= '<td height="21" style="padding:0px 3px 0px 3px;">'.$unit_price.'</td>';
- $list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
- $list_body .= '<td height="21" style="padding:0px 3px 0px 3px;"><input type="text" name="'.$field_name.'"></td>';
- $list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+ $list_body .= '<td><INPUT type=checkbox NAME="selected_id" value= '.$entity_id.' onClick=\'toggleSelectAll(this.name,"selectall");updateListPrice("'.$unit_price.'","'.$field_name.'")\'></td>';
+ $list_body .= '<td>'.$adb->query_result($list_result,$i,"bookname").'</td>';
+ $list_body .= '<td>'.$unit_price.'</td>';
+ $list_body .= '<td><input type="text" name="'.$field_name.'"></td>';
+ $list_body .= '</tr>';
}
}
Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html
==============================================================================
--- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html (original)
+++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.html Wed May 31 07:46:20 2006
@@ -33,7 +33,7 @@
{PRODUCTLISTHEADER}
<table border="0" cellpadding="0" cellspacing="0" class="FormBorder" width="100%">
<tr height="20">
- <td COLSPAN="18" class="listFormHeaderLinks">
+ <td >
<table border="0" cellpadding="0" cellspacing="0" width="100%">
<tr>
<td> {RECORD_COUNTS}</td>
@@ -42,10 +42,13 @@
</table>
</td>
</tr>
- <tr><td colspan="18" height="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
+ <tr><td >
+ <table style="background-color: rgb(204, 204, 204);" class="small" border="0" cellpadding="3" cellspacing="1" width="90%" align="center">
{LISTHEADER}
- <tr><td colspan="18" height="1" class="blackLine"><IMG SRC="{IMAGE_PATH}blank.gif"></td></tr>
{LISTENTITY}
+ </table>
+ </td></tr>
+ <tr><td> </td></tr>
</form>
</table>
Modified: vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php
==============================================================================
--- vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php (original)
+++ vtigercrm/trunk/modules/Products/AddProductsToPriceBook.php Wed May 31 07:46:20 2006
@@ -23,8 +23,6 @@
$image_path=$theme_path."images/";
require_once($theme_path.'layout_utils.php');
$pricebookname = getPriceBookName($pricebook_id);
-echo get_module_title($current_module_strings['LBL_MODULE_NAME'], $current_module_strings['LBL_ADD_PRODUCTS_PRICEBOOK'].": ".$pricebookname, true);
-echo "<br>";
$xtpl=new XTemplate ('modules/Products/AddProductsToPriceBook.html');
$xtpl->assign("MOD", $mod_strings);
@@ -149,14 +147,14 @@
}
-$other_text = '<table width="100%" border="0" cellpadding="1" cellspacing="0">
+$other_text = '<table width="95%" border="0" cellpadding="1" cellspacing="0" align="center">
<form name="addToPB" method="POST">
<tr>
<input name="pricebook_id" type="hidden" value="'.$pricebook_id.'">
<input name="idlist" type="hidden">
<input name="viewname" type="hidden">';
- $other_text .='<td><input class="button" type="submit" value="Add To PriceBook" onclick="return addtopricebook()"/></td>';
- $other_text .='<td> <input title="'.$app_strings[LBL_CANCEL_BUTTON_TITLE].'" accessKey="'.$app_strings[LBL_CANCEL_BUTTON_KEY].'" class="button" onclick="window.history.back()" type="button" name="button" value="'.$app_strings[LBL_CANCEL_BUTTON_LABEL].'"></td>';
+ $other_text .='<td align="center"><input class="classBtn" type="submit" value="Add To PriceBook" onclick="return addtopricebook()"/>';
+ $other_text .=' <input title="'.$app_strings[LBL_CANCEL_BUTTON_TITLE].'" accessKey="'.$app_strings[LBL_CANCEL_BUTTON_KEY].'" class="classBtn" onclick="window.history.back()" type="button" name="button" value="'.$app_strings[LBL_CANCEL_BUTTON_LABEL].'"></td>';
$other_text .='</tr></table>';
@@ -212,18 +210,12 @@
$xtpl->assign("FIELD_NAME_ARRAY",implode(",",$field_name_array));
$list_header = '';
-$list_header .= '<tr class="moduleListTitle" height=20>';
-$list_header .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
-$list_header .='<td WIDTH="1" class="moduleListTitle" style="padding:0px 3px 0px 3px;"><input type="checkbox" name="selectall" onClick=\'toggleSelect(this.checked,"selected_id");updateAllListPrice()\'></td>';
-$list_header .= '<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_LIST_PRODUCT_NAME'].'</td>';
-$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_CODE'].'</td>';
-$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].'</td>';
-$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
-$list_header .= '<td class="moduleListTitle" height="21" style="padding:0px 3px 0px 3px;">'.$mod_strings['LBL_PB_LIST_PRICE'].'</td>';
-$list_header .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="{IMAGE_PATH}blank.gif"></td>';
+$list_header .= '<tr>';
+$list_header .='<td class="lvtCol"><input type="checkbox" name="selectall" onClick=\'toggleSelect(this.checked,"selected_id");updateAllListPrice()\'></td>';
+$list_header .= '<td class="lvtCol">'.$mod_strings['LBL_LIST_PRODUCT_NAME'].'</td>';
+$list_header .= '<td class="lvtCol">'.$mod_strings['LBL_PRODUCT_CODE'].'</td>';
+$list_header .= '<td class="lvtCol">'.$mod_strings['LBL_PRODUCT_UNIT_PRICE'].'</td>';
+$list_header .= '<td class="lvtCol">'.$mod_strings['LBL_PB_LIST_PRICE'].'</td>';
$list_header .= '</tr>';
$xtpl->assign("LISTHEADER", $list_header);
@@ -236,25 +228,15 @@
$entity_id = $adb->query_result($list_result,$i,"crmid");
if(! array_key_exists($entity_id, $prod_array))
{
- if (($i%2)==0)
- $list_body .= '<tr height=20 class=evenListRow>';
- else
- $list_body .= '<tr height=20 class=oddListRow>';
-
+ $list_body .= '<tr class="lvtColData" onmouseover="this.className=\'lvtColDataHover\'" onmouseout="this.className=\'lvtColData\'" bgcolor="white">';
$unit_price = $adb->query_result($list_result,$i,"unit_price");
$field_name=$entity_id."_listprice";
- $list_body .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
- $list_body .= '<td valign=TOP style="padding:0px 3px 0px 3px;"><INPUT type=checkbox NAME="selected_id" value= '.$entity_id.' onClick=\'toggleSelectAll(this.name,"selectall");updateListPrice("'.$unit_price.'","'.$field_name.'")\'></td>';
- $list_body .= '<td WIDTH="1" class="blackLine"><IMG SRC="'.$image_path.'blank.gif"></td>';
- $list_body .= '<td height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"productname").'</td>';
- $list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
- $list_body .= '<td height="21" style="padding:0px 3px 0px 3px;">'.$adb->query_result($list_result,$i,"productcode").'</td>';
- $list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
- $list_body .= '<td height="21" style="padding:0px 3px 0px 3px;">'.$unit_price.'</td>';
- $list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
- $list_body .= '<td height="21" style="padding:0px 3px 0px 3px;"><input type="text" name="'.$field_name.'"></td>';
- $list_body .='<td WIDTH="1" class="blackLine" NOWRAP><IMG SRC="'.$image_path.'blank.gif"></td>';
+ $list_body .= '<td><INPUT type=checkbox NAME="selected_id" value= '.$entity_id.' onClick=\'toggleSelectAll(this.name,"selectall");updateListPrice("'.$unit_price.'","'.$field_name.'")\'></td>';
+ $list_body .= '<td>'.$adb->query_result($list_result,$i,"productname").'</td>';
+ $list_body .= '<td>'.$adb->query_result($list_result,$i,"productcode").'</td>';
+ $list_body .= '<td>'.$unit_price.'</td>';
+ $list_body .= '<td><input type="text" name="'.$field_name.'"></td></tr>';
}
}
Modified: vtigercrm/trunk/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/trunk/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/trunk/modules/Settings/language/en_us.lang.php Wed May 31 07:46:20 2006
@@ -596,6 +596,7 @@
'LBL_EDIT_PICKLIST'=>'Edit Pick List',
'LBL_PICKLIST_SAVEINFO'=>'Type the entries one - by - one below and click the Save button to save the list.',
'LBL_SELECT_CRM_MODULE'=>'Select crm module',
+'LBL_INVENTORY_TAX_CONFIG'=>'Inventory Tax Configuration',
);
Modified: vtigercrm/trunk/modules/Users/about_us.php
==============================================================================
--- vtigercrm/trunk/modules/Users/about_us.php (original)
+++ vtigercrm/trunk/modules/Users/about_us.php Wed May 31 07:46:20 2006
@@ -1,14 +1,4 @@
<?php
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
- * ("License"); You may not use this file except in compliance with the License
- * The Original Code is: vtiger CRM Open Source
- * The Initial Developer of the Original Code is vtiger.
- * Portions created by vtiger are Copyright (C) vtiger.
- * All Rights Reserved.
-*
- ********************************************************************************/
-
global $theme;
$theme_path="themes/".$theme."/";
$image_path=$theme_path."images/";
@@ -17,68 +7,126 @@
require_once('vtigerversion.php');
if($patch_version !='')
{
- $patch_string = $vtiger_version . " Patch " . $patch_version;
+ $patch_string = $vtiger_version . " Patch " . $patch_version;
}
else
{
- $patch_string = "--None--";
+ $patch_string = "--None--";
}
global $app_strings;
global $app_list_strings;
global $mod_strings;
?>
-<title><?php echo $app_strings['LBL_ABOUTUS_TITLE']?></title>
-<style type="text/css">@import url("<?php echo $theme_path?>style.css");</style>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+"http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+<title>vtiger CRM 5 - Free, Commercial grade Open Source CRM</title>
+<link href="<? echo $theme_path;?>style.css" rel="stylesheet" type="text/css">
+</head>
+<style>
+ .rollOver{
+ font-family:Verdana, Arial, Helvetica, sans-serif;
+ font-size:12px;
+ border:0px solid white;
+ width:100%;
+ padding:0px;
+ }
+
+ .rollOver tr th{
+ font-family:Verdana, Arial, Helvetica, sans-serif;
+ font-size:12px;
+ border:0px solid white;
+ padding-left:10px;
+ padding-bottom:5px;
+ font-weight:bold;
+ text-decoration:underline;
+ color:#000000;
+ text-align:left;
+ }
+
+ .rollOver tr td{
+ font-family:Verdana, Arial, Helvetica, sans-serif;
+ font-size:11px;
+ border:0px solid white;
+ padding-left:30px;
+ font-weight:normal;
+ text-decoration:none;
+ color:#000000;
+ text-align:left;
+ padding-bottom:1px;
+ }
+
+
+
+</style>
<body>
-<table width="100%" border="0" style="border:1px solid #CCC;">
-<tr>
-<td><img src="<?php echo $image_path?>vtiger-crm.gif" alt="vigercrm" border="0"></td>
-<td> </td>
-</tr>
-</table><br>
-<table width="100%" style="border:1px solid #CCC;">
-<tr>
-<td class="dataLabel" height="30 px" width="40%"><font face="Helvetica, sans-serif"><b>Version: </b></font></td>
-<td class="dataField" height="30 px"> <?php echo $vtiger_version; ?></td>
-</tr>
-<tr>
-<td class="dataLabel" height="30 px" width="40%"><font face="Helvetica, sans-serif"><b>Applied Patch Version: </b></font></td>
-<td class="dataField" height="30 px"> <?php echo $patch_string; ?></td>
-</tr>
-
-<tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.2 Release Date: </b></td>
-<td class="dataField" height="30 px"> <?php echo $release_date; ?><span class="gensmall"> (Current version)</span></td>
- </tr>
-
-<tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.0.1 Release Date: </b></td>
-<td class="dataField" height="30 px"> 04-29-2005</font></td>
- </tr>
-
-
-<tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>4.0 Release Date: </b></td>
-<td class="dataField" height="30 px"> 03-29-2005</font></td>
- </tr>
+<table border="0" cellpadding="0" cellspacing="0" width="500">
<tr>
- <td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>3.2 Release Date: </b></td>
- <td class="dataField" height="30 px"> 12-13-2004</font></td>
- </tr>
-
-<tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>Toll Free Number: </b></font></td>
-<td class="dataField" height="30 px"> +1-877-788-4473</td>
-</tr>
-<tr>
-<td class="dataLabel" height="30 px"><font face="Helvetica, sans-serif"><b>vtiger Discussions: </a></b></font></td>
-<td class="dataField" height="30 px"> <a href="http://www.vtiger.com/discussions/index.php?c=3" target=_blank><?php echo $app_strings['LBL_DISCUSS']?></a></td>
-</tr>
-</table><br>
-<table cellpadding="5" width="100%" cellspacing="0" style="border: 1px solid #888888">
-<tr>
-<td ><p align="justify"><font face="Helvetica, sans-serif">vtiger offers an Open Source CRM solution for managing your organization's sales force automation, inventory management, and customer support & service requirements.<br><br>vtiger also provides Open Source business productivity enhancement add-ons, such as Outlook Plug-in, Office Plug-in, and Thunderbird extension that can be used with vtiger CRM.</font>
-</td>
-</tr>
+ <td colspan="3"><img src="<? echo $image_path;?>aboutUS.jpg" width="500" height="301"></td>
+ </tr>
+ <tr>
+ <td width="15%" style="border-left:2px solid #7F7F7F;"> </td>
+ <td width="70%" style="border:3px solid #CCCCCC;" height="100" >
+ <marquee behavior="scroll" direction="up" width="100%" scrollamount="1" scrolldelay="50" height="100" onMouseOut="javascript:start();" onMouseOver="javascript:stop();">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="rollOver">
+ <tr><th>Team</th></tr>
+ <tr><td>Ahmed</td></tr>
+ <tr><td>Don</td></tr>
+ <tr><td>Ela</td></tr>
+ <tr><td>Gopal</td></tr>
+ <tr><td>Jeri</td></tr>
+ <tr><td>Mani</td></tr>
+ <tr><td>Mickie</td></tr>
+ <tr><td>Minnie</td></tr>
+ <tr><td>Philip</td></tr>
+ <tr><td>Richie</td></tr>
+ <tr><td>Saint</td></tr>
+ <tr><td>SRaj</td></tr>
+ <tr><td> </td></tr>
+ <tr><th>Credits</th></tr>
+ <tr><td>Matthew Brichacek</td></tr>
+ <tr><td>Michel JACQUEMES </td></tr>
+ <tr><td>Mike Crowe </td></tr>
+ <tr><td>Allan Bush</td></tr>
+ <tr><td>Frank Piepiorra</td></tr>
+ <tr><td>Dino Eberle and Jamie Jackson</td></tr>
+ <tr><td>Bélaïd Aïssa</td></tr>
+ <tr><td>Sergio A. Kessler</td></tr>
+ <tr><td>Jeff Kowalczyk</td></tr>
+ <tr><td>Brian Devendorf</td></tr>
+ <tr><td>Brian Laughlin</td></tr>
+ <tr><td>Dennis Grant</td></tr>
+ <tr><td>Fathi Boudra</td></tr>
+ <tr><td>Jamie Jackson</td></tr>
+ <tr><td>Joel Rydbeck</td></tr>
+ <tr><td>Josh Lee</td></tr>
+ <tr><td>Mike Fedyk</td></tr>
+ <tr><td> </td></tr>
+ <tr><td><b>And vtiger Community</b></td></tr>
+ </table>
+ </marquee>
+ </td>
+ <td width="15%" style="border-right:2px solid #7F7F7F;"> </td>
+ </tr>
+ <tr><td colspan="3" style="border-left:2px solid #7F7F7F;border-right:2px solid #7F7F7F"> </td></tr>
+ <tr>
+ <td colspan="3" background="<? echo $image_path;?>about_btm.jpg" height="75">
+ <table width="100%" border="0" cellpadding="5" cellspacing="0">
+ <tr>
+ <td width="70%" align="left">
+ <span class="small" style="color:#999999;">Version : 5.0.0 Beta</span> |
+ <a href="http://www.vtiger.com/copyrights/LICENSE_AGREEMENT.txt" class="webMnu" target="_blank">Read License</a> |
+ <a href="http://www.vtiger.com/index.php?option=com_content&task=view&id=26&Itemid=54" class="webMnu" target="_blank">Contact Us</a>
+ </td>
+ <td align="right">
+ <input type="button" name="close" value=" Close " onClick="window.close();" class="classBtn">
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
</table>
-
+</body>
+</html>
More information about the vtigercrm-commits
mailing list