[Vtigercrm-commits] [vtiger-commits] r9960 - in /vtigercrm/branches/5.0.3: Smarty/templates/ modules/Settings/language/ modules/Users/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Tue Dec 12 11:00:50 EST 2006
Author: richie
Date: Tue Dec 12 09:00:39 2006
New Revision: 9960
Log:
Profiles moved to settings module
Modified:
vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl
vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl
vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl
vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl
vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php
vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php
vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php
Modified: vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/CreateProfile.tpl Tue Dec 12 09:00:39 2006
@@ -21,7 +21,7 @@
<div align=center>
{include file='SetMenu.tpl'}
<form action="index.php" method="post" name="profileform" id="form">
- <input type="hidden" name="module" value="Users">
+ <input type="hidden" name="module" value="Settings">
<input type="hidden" name="mode" value="{$MODE}">
<input type="hidden" name="action" value="profilePrivileges">
<input type="hidden" name="parenttab" value="Settings">
@@ -32,7 +32,7 @@
<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
<tr>
<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" width="48" height="48" border=0 title="{$MOD.LBL_PROFILES}"></td>
- <td class=heading2 valign=bottom><b> <a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a></b></td>
+ <td class=heading2 valign=bottom><b> <a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a></b></td>
</tr>
<tr>
<td valign=top class="small">{$MOD.LBL_PROFILE_DESCRIPTION}</td>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/EditProfile.tpl Tue Dec 12 09:00:39 2006
@@ -45,7 +45,7 @@
<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody><tr>
<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" title="{$MOD.LBL_PROFILES}" border="0" height="48" width="48"></td>
- <td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> > {$CMOD.LBL_VIEWING} "{$PROFILE_NAME}"</b></td>
+ <td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> > {$CMOD.LBL_VIEWING} "{$PROFILE_NAME}"</b></td>
</tr>
<tr>
<td class="small" valign="top">{$CMOD.LBL_PROFILE_MESG} "{$PROFILE_NAME}" </td>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/ProfileDetailView.tpl Tue Dec 12 09:00:39 2006
@@ -70,7 +70,7 @@
{include file='SetMenu.tpl'}
<form method="post" name="new" id="form">
- <input type="hidden" name="module" value="Users">
+ <input type="hidden" name="module" value="Settings">
<input type="hidden" name="action" value="profilePrivileges">
<input type="hidden" name="parenttab" value="Settings">
<input type="hidden" name="return_action" value="profilePrivileges">
@@ -81,7 +81,7 @@
<table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
<tbody><tr>
<td rowspan="2" valign="top" width="50"><img src="{$IMAGE_PATH}ico-profile.gif" alt="{$MOD.LBL_PROFILES}" title="{$MOD.LBL_PROFILES}" border="0" height="48" width="48"></td>
- <td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> > {$CMOD.LBL_VIEWING} "{$PROFILE_NAME}"</b></td>
+ <td class="heading2" valign="bottom"><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > <a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$CMOD.LBL_PROFILE_PRIVILEGES}</a> > {$CMOD.LBL_VIEWING} "{$PROFILE_NAME}"</b></td>
</tr>
<tr>
<td class="small" valign="top">{$CMOD.LBL_PROFILE_MESG} "{$PROFILE_NAME}" </td>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/SetMenu.tpl Tue Dec 12 09:00:39 2006
@@ -36,39 +36,39 @@
{/if}
{if $smarty.request.action eq 'ListProfiles' || $smarty.request.action eq 'profilePrivileges' || $smarty.request.action eq 'CreateProfile' || $smarty.request.action eq 'SaveProfile' || $smarty.request.action eq 'UpdateProfileChanges' }
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListProfiles&parenttab=Settings">{$MOD.LBL_PROFILES}</a></td></tr>
{/if}
{if $smarty.request.action eq 'listgroups' || $smarty.request.action eq 'GroupDetailView' || $smarty.request.action eq 'createnewgroup' || $smarty.request.action eq 'SaveGroup'}
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=listgroups&parenttab=Settings">{$MOD.USERGROUPLIST}</a></td></tr>
{/if}
{if $smarty.request.action eq 'OrgSharingEditView' || $smarty.request.action eq 'OrgSharingDetailView' || $smarty.request.action eq 'SaveOrgSharing'}
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrgSharingDetailView&parenttab=Settings">{$MOD.LBL_SHARING_ACCESS}</a></td></tr>
{/if}
{if $smarty.request.action eq 'DefaultFieldPermissions' || $smarty.request.action eq 'UpdateDefaultFieldLevelAccess' || $smarty.request.action eq 'EditDefOrgFieldLevelAccess' }
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=DefaultFieldPermissions&parenttab=Settings">{$MOD.LBL_FIELDS_ACCESS}</a></td></tr>
{/if}
{if $smarty.request.action eq 'AuditTrailList'}
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=AuditTrailList&parenttab=Settings">{$MOD.LBL_AUDIT_TRAIL}</a></td></tr>
{/if}
{if $smarty.request.action eq 'ListLoginHistory'}
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=ListLoginHistory&parenttab=Settings">{$MOD.LBL_LOGIN_HISTORY_DETAILS}</a></td></tr>
{/if}
@@ -168,17 +168,17 @@
{/if}
{if $smarty.request.action eq 'DefModuleView'}
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=DefModuleView&parenttab=Settings">{$MOD.LBL_DEFAULT_MODULE_VIEW}</a></td></tr>
{/if}
<tr><td class="settingsTabList" nowrap><a href="index.php?module=Migration&action=MigrationStep1&parenttab=Settings">{$MOD.LBL_MIGRATION}</a></td></tr>
{if $smarty.request.action eq 'OrganizationTermsandConditions' || $smarty.request.action eq 'savetermsandconditions'}
- <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
+ <tr><td class="settingsTabSelected" nowrap><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
{else}
- <tr><td class="settingsTabList" nowrap><a href="index.php?module=Users&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
+ <tr><td class="settingsTabList" nowrap><a href="index.php?module=Settings&action=OrganizationTermsandConditions&parenttab=Settings">{$MOD.LBL_INVENTORY_TANDC}</a></td></tr>
{/if}
</table>
Modified: vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl
==============================================================================
--- vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl (original)
+++ vtigercrm/branches/5.0.3/Smarty/templates/UserProfileList.tpl Tue Dec 12 09:00:39 2006
@@ -69,7 +69,7 @@
<tr>
<td class="listTableRow small" valign=top>{$smarty.foreach.profilelist.iteration}</td>
<td class="listTableRow small" valign=top nowrap>
- <a href="index.php?module=Users&action=profilePrivileges&return_action=ListProfiles&parenttab=Settings&mode=edit&profileid={$listvalues.profileid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0" align="absmiddle"></a>
+ <a href="index.php?module=Settings&action=profilePrivileges&return_action=ListProfiles&parenttab=Settings&mode=edit&profileid={$listvalues.profileid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0" align="absmiddle"></a>
{if $listvalues.del_permission eq 'yes'}
|
<a href="#"><img src="{$IMAGE_PATH}delete.gif" border="0" height="15" width="15" onclick="DeleteProfile(this,'{$listvalues.profileid}')" align="absmiddle"></a>
@@ -77,7 +77,7 @@
{/if}
</td>
- <td class="listTableRow small" valign=top><a href="index.php?module=Users&action=profilePrivileges&mode=view&parenttab=Settings&profileid={$listvalues.profileid}"><b>{$listvalues.profilename}</b></a></td>
+ <td class="listTableRow small" valign=top><a href="index.php?module=Settings&action=profilePrivileges&mode=view&parenttab=Settings&profileid={$listvalues.profileid}"><b>{$listvalues.profilename}</b></a></td>
<td class="listTableRow small" valign=top>{$listvalues.description}</td>
</tr>
{/foreach}
Modified: vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php (original)
+++ vtigercrm/branches/5.0.3/modules/Settings/language/en_us.lang.php Tue Dec 12 09:00:39 2006
@@ -788,6 +788,35 @@
'QuoteNotification'=>'Product Stock Notification during Quote Generation',
'SalesOrderNotification'=>'Product Stock Notification during Sales Order Generation',
'LBL_NOTE_DO_NOT_REMOVE_INFO'=>'Note: Donot remove or alter the values within { }',
+
+//Added while moving Profile file from User to Setting Module
+'LBL_TOTAL'=>'Total :',
+'LBL_NEW_PROFILE'=>'New Profile',
+'LBL_LIST_NO'=>'#',
+'LBL_NEW_PROFILE_NAME'=>'Profile Name',
+'LBL_LIST_TOOLS'=>'Tools',
+'LBL_PROFILE_MESG'=>'Viewing access privileges for',
+'LBL_PROFILE_PRIVILEGES'=>'Profile Privileges',
+'LBL_DEFINE_PRIV_FOR'=>' Define Privileges for ',
+'LBL_USE_OPTION_TO_SET_PRIV'=>'Use the options below to set privileges',
+'LBL_SUPER_USER_PRIV'=>'Global Privileges',
+'LBL_SET_PRIV_FOR_EACH_MODULE'=>'Set Privileges for each Module ',
+'LBL_FIELDS_AND_TOOLS_SETTINGS'=>'Fields & Tools Settings',
+'LBL_VIEW_ALL'=>'View all',
+'LBL_EDIT_ALL'=>'Edit all',
+'LBL_ALLOW'=>'Allows',
+'LBL_MESG_VIEW'=>'to view all information / modules of vtiger CRM',
+'LBL_MESG_EDIT'=>'to edit all information / modules of vtiger CRM',
+'LBL_TAB_MESG_OPTION'=>'modules to be shown',
+'LBL_EDIT_PERMISSIONS'=>'Edit Permissions',
+'LBL_CREATE_EDIT'=>'Create/Edit',
+'LBL_VIEW'=>'View',
+'LBL_MANDATORY_MSG'=>'Mandatory Fields',
+'LBL_DISABLE_FIELD_MSG'=>'Fields Disabled from Global Field Access Settings',
+'LBL_DELETE'=>'Delete',
+
+'LBL_STEP_2_2'=>'Step 2 of 2',
+'LBL_FINISH_BUTTON'=>'Finish',
);
Modified: vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/DeleteProfile.php Tue Dec 12 09:00:39 2006
@@ -14,5 +14,5 @@
$tran_id = $_REQUEST['transfer_prof_id'];
//Deleting the Profile
deleteProfile($del_id,$tran_id);
-header("Location: index.php?module=Users&action=ListProfiles&parenttab=Settings");
+header("Location: index.php?module=Settings&action=ListProfiles&parenttab=Settings");
?>
Modified: vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/SaveProfile.php Tue Dec 12 09:00:39 2006
@@ -180,7 +180,7 @@
$adb->query($sql11);
}
}
- $loc = "Location: index.php?action=ListProfiles&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+ $loc = "Location: index.php?action=ListProfiles&module=Settings&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
header($loc);
Modified: vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php
==============================================================================
--- vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php (original)
+++ vtigercrm/branches/5.0.3/modules/Users/UpdateProfileChanges.php Tue Dec 12 09:00:39 2006
@@ -172,7 +172,14 @@
}
}
- $loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+ if($return_action == 'profilePrivileges' || $return_action == 'ListProfiles')
+ {
+ $loc = "Location: index.php?action=".$return_action."&module=Settings&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+ }
+ else
+ {
+ $loc = "Location: index.php?action=".$return_action."&module=Users&mode=view&parenttab=Settings&profileid=".$profileid."&selected_tab=".$def_tab."&selected_module=".$def_module;
+ }
header($loc);
/** returns value 0 if request permission is on else returns value 1
More information about the vtigercrm-commits
mailing list