[Vtigercrm-commits] [vtiger-commits] r7665 - in /vtigercrm/trunk/Smarty/templates: DetailViewUI.tpl DisplayFields.tpl ShowHistoryContents.tpl UserDetailView.tpl UserEditView.tpl UserGroups.tpl UserListViewContents.tpl
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Thu Jun 29 08:33:36 EDT 2006
Author: richie
Date: Thu Jun 29 06:32:43 2006
New Revision: 7665
Log:
Changes made as the New UI for Users has been integrated
Added:
vtigercrm/trunk/Smarty/templates/ShowHistoryContents.tpl
vtigercrm/trunk/Smarty/templates/UserGroups.tpl
Modified:
vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
vtigercrm/trunk/Smarty/templates/UserEditView.tpl
vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl
Modified: vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DetailViewUI.tpl Thu Jun 29 06:32:43 2006
@@ -226,6 +226,8 @@
<a href="javascript:;" onclick="hndCancel('dtlview_{$label}','editarea_{$label}','{$label}')" class="link">{$APP.LBL_CANCEL_BUTTON_LABEL}</a>
</div>
</td>
+ {elseif $keyid eq '99'}<!-- Password Field-->
+ <td width=25% class="dvtCellInfo" align="left">{$CHANGE_PW_BUTTON}</td>
{elseif $keyid eq '56'} <!--CheckBox-->
<td width=25% class="dvtCellInfo" align="left" id="mouseArea_{$label}" onMouseOver="hndMouseOver({$keyid},'{$label}');" onmouseout="fnhide('crmspanid');"> <span id="dtlview_{$label}">{$keyval} </span>
<div id="editarea_{$label}" style="display:none;">
Modified: vtigercrm/trunk/Smarty/templates/DisplayFields.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/DisplayFields.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/DisplayFields.tpl Thu Jun 29 06:32:43 2006
@@ -489,7 +489,7 @@
{else}
<td width="30%" align=left class="dvtCellInfo">
<input name="{$fldname}" {$disable_status} tabindex="{$vt_tab}" type="checkbox">
- <input name="{$fldname}" type="hidden" value="{$fldvalue}">
+ <input name="{$fldname}" type="hidden" value="off">
</td>
{/if}
{elseif $uitype eq 98}<!-- Role Selection Popup -->
Modified: vtigercrm/trunk/Smarty/templates/UserDetailView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserDetailView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserDetailView.tpl Thu Jun 29 06:32:43 2006
@@ -47,9 +47,9 @@
<input type="hidden" name="return_id">
<input type="hidden" name="forumDisplay">
{if $CATEGORY eq 'Settings'}
- <input type="hidden" name="parenttab" value="{$PARENTTAB}">
+ <input type="hidden" name="parenttab" value="{$PARENTTAB}">
{/if}
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="settingsSelUITopLine">
<tr>
<td style="border-bottom:1px dashed #CCCCCC;">
<table width="100%" cellpadding="5" cellspacing="0" border="0">
@@ -57,35 +57,32 @@
<td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
<td>
{if $CATEGORY eq 'Settings'}
- <span class="lvtHeaderText">
- <b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
+ <span class="heading2">
+ <b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > <a href="index.php?module=Administration&action=index&parenttab=Settings"> {$MOD.LBL_USERS} </a>>"{$USERNAME}" </b></span>
{else}
- <span class="lvtHeaderText">
+ <span class="heading2">
<b>{$APP.LBL_MY_PREFERENCES}</b>
</span>
{/if}
<span id="vtbusy_info" style="display:none;" valign="bottom"><img src="{$IMAGE_PATH}vtbusy.gif" border="0"></span>
</td>
- <td rowspan="2" nowrap>
- {if $CATEGORY eq 'Settings'}
- {$DUPLICATE_BUTTON}
- {/if}
- {$EDIT_BUTTON}
+ <td rowspan="2" nowrap>
</td>
</tr>
<tr>
- <td>sssssssssss</td>
+ <td>{$UMOD.LBL_USERDETAIL_INFO} "{$USERNAME}"</td>
</tr>
</table>
</td>
</tr>
- <tr><td> </td></tr>
- <tr valign="center">
- <td class="small" align="center">
- {$CHANGE_PW_BUTTON}
- {$LOGIN_HISTORY_BUTTON}
- </td>
- </tr>
+ <tr><td colspan="2"> </td></tr>
+ <tr>
+ <td rowspan="2" nowrap align="right">
+ {if $CATEGORY eq 'Settings'}
+ {$DUPLICATE_BUTTON}
+ {/if}
+ {$EDIT_BUTTON}
+ </td> </tr>
<tr><td colspan="2"> </td></tr>
<tr>
<td colspan="2">
@@ -161,13 +158,32 @@
<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
<tr>
<td class="big">
- <strong>5.{$UMOD.LBL_LOGIN_HISTORY}</strong>
- </td>
- <td class="small" align="right"> </td>
+ <strong>5.My Groups</strong>
+ </td>
+ <td class="small" align="right">
+ {if $GROUP_COUNT > 0}
+ <img src="{$IMAGE_PATH}showDown.gif" alt="{$APP.LBL_EXPAND_COLLAPSE}" title="{$APP.LBL_EXPAND_COLLAPSE}" onClick="fetchGroups_js({$ID});">
+ {else}
+
+ {/if}
+ </td>
</tr>
</table>
<table border="0" cellpadding="5" cellspacing="0" width="100%">
- <tr><td> </td><td></td></tr>
+ <tr><td align="left"><div id="user_group_cont" style="display:none;"></div></td></tr>
+ </table>
+
+ <br>
+ <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
+ <tr>
+ <td class="big">
+ <strong>6.{$UMOD.LBL_LOGIN_HISTORY}</strong>
+ </td>
+ <td class="small" align="right"><img src="{$IMAGE_PATH}showDown.gif" alt="{$APP.LBL_EXPAND_COLLAPSE}" title="{$APP.LBL_EXPAND_COLLAPSE}" onClick="fetchlogin_js({$ID});"></td>
+ </tr>
+ </table>
+ <table border="0" cellpadding="5" cellspacing="0" width="100%">
+ <tr><td align="left"><div id="login_history_cont" style="display:none;"></div></td><td></td></tr>
</table>
</td>
@@ -209,4 +225,70 @@
else
Effect.Appear(divid);
{rdelim}
+{literal}
+function fetchlogin_js(id)
+{
+ if($('login_history_cont').style.display != 'none')
+ Effect.Fade('login_history_cont');
+ else
+ fetchLoginHistory(id);
+
+}
+function fetchLoginHistory(id)
+{
+ $("status").style.display="inline";
+ new Ajax.Request(
+ 'index.php',
+ {queue: {position: 'end', scope: 'command'},
+ method: 'post',
+ postBody: 'module=Users&action=UsersAjax&file=ShowHistory&ajax=true&record='+id,
+ onComplete: function(response) {
+ $("status").style.display="none";
+ $("login_history_cont").innerHTML= response.responseText;
+ Effect.Appear('login_history_cont');
+ }
+ }
+ );
+
+}
+function fetchGroups_js(id)
+{
+ if($('user_group_cont').style.display != 'none')
+ Effect.Fade('user_group_cont');
+ else
+ fetchUserGroups(id);
+}
+function fetchUserGroups(id)
+{
+ $("status").style.display="inline";
+ new Ajax.Request(
+ 'index.php',
+ {queue: {position: 'end', scope: 'command'},
+ method: 'post',
+ postBody: 'module=Users&action=UsersAjax&file=UserGroups&ajax=true&record='+id,
+ onComplete: function(response) {
+ $("status").style.display="none";
+ $("user_group_cont").innerHTML= response.responseText;
+ Effect.Appear('user_group_cont');
+ }
+ }
+ );
+
+}
+function getListViewEntries_js(module,url)
+{
+ $("status").style.display="inline";
+ new Ajax.Request(
+ 'index.php',
+ {queue: {position: 'end', scope: 'command'},
+ method: 'post',
+ postBody:"module="+module+"&action="+module+"Ajax&file=ShowHistory&ajax=true&"+url,
+ onComplete: function(response) {
+ $("status").style.display="none";
+ $("login_history_cont").innerHTML= response.responseText;
+ }
+ }
+ );
+}
+{/literal}
</script>
Modified: vtigercrm/trunk/Smarty/templates/UserEditView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserEditView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserEditView.tpl Thu Jun 29 06:32:43 2006
@@ -61,42 +61,6 @@
{include file='SetMenu.tpl'}
{/if}
-
- <table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr><td align="left">
- <table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
- <tr>
- <td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
- <td>
- <span class="lvtHeaderText">
- {if $PARENTTAB neq ''}
- <b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > {$MOD.LBL_USER_MANAGEMENT} > {$MOD.LBL_USERS}</b></span>
- {else}
- <span class="lvtHeaderText">
- <b>{$APP.LBL_MY_PREFERENCES}</b>
- </span>
- {/if}
- </td>
- <td rowspan="2" nowrap>
- <input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small crmbutton save" name="button" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
- <input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small crmbutton cancel" name="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " onclick="window.history.back()" style="width: 70px;" type="button" />
-
- </td>
- </tr>
- <tr>
- {if $MODE eq 'edit'}
- <td><span class="genHeaderGrayBig">{$USER_NAME}</span><br>
- <b class="small">{$UMOD.LBL_EDIT_VIEW} {$FIRST_NAME} {$LAST_NAME}</b>
- {else}
- <td><span class="genHeaderGrayBig">{$UMOD.LBL_NEW_USER_BUTTON_LABEL}</span><br>
- <b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
- {/if}
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <tr><td class="padTab" align="left">
<form name="EditView" method="POST" action="index.php" ENCTYPE="multipart/form-data">
<input type="hidden" name="module" value="Users">
<input type="hidden" name="record" value="{$ID}">
@@ -112,7 +76,52 @@
<input type="hidden" name="workdays" value="0,1,2,3,4,5,6,">
<input type="hidden" name="namedays" value="">
<input type="hidden" name="weekstart" value="1">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
+
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" class="settingsSelUITopLine">
+ <tr><td align="left">
+ <table class="settingsSelUITopLine" border="0" cellpadding="5" cellspacing="0" width="100%">
+ <tr>
+ <td rowspan="2"><img src="{$IMAGE_PATH}user.gif" align="absmiddle"></td>
+ <td>
+ <span class="lvtHeaderText">
+ {if $PARENTTAB neq ''}
+ <b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS} </a> > <a href="index.php?module=Administration&action=index&parenttab=Settings">{$MOD.LBL_USERS}</a> >
+ {if $MODE eq 'edit'}
+ {$UMOD.LBL_EDITING} "{$USERNAME}"
+ {else}
+ {$UMOD.LBL_CREATE_NEW_USER}
+ {/if}
+ </b></span>
+ {else}
+ <span class="lvtHeaderText">
+ <b>{$APP.LBL_MY_PREFERENCES}</b>
+ </span>
+ {/if}
+ </td>
+ <td rowspan="2" nowrap>
+ </td>
+ </tr>
+ <tr>
+ {if $MODE eq 'edit'}
+ <td><b class="small">{$UMOD.LBL_EDIT_VIEW} "{$USERNAME}"</b>
+ {else}
+ <td><b class="small">{$UMOD.LBL_CREATE_NEW_USER}</b>
+ {/if}
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr><td> </td></tr>
+ <tr>
+ <td nowrap align="right">
+ <input title="{$APP.LBL_SAVE_BUTTON_TITLE}" accesskey="{$APP.LBL_SAVE_BUTTON_KEY}" class="small crmbutton save" name="button" value=" {$APP.LBL_SAVE_BUTTON_LABEL} " onclick="this.form.action.value='Save'; return verify_data(EditView)" style="width: 70px;" type="button" />
+ <input title="{$APP.LBL_CANCEL_BUTTON_TITLE}" accesskey="{$APP.LBL_CANCEL_BUTTON_KEY}" class="small crmbutton cancel" name="button" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " onclick="window.history.back()" style="width: 70px;" type="button" />
+
+ </td>
+ </tr>
+ <tr><td class="padTab" align="left">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td colspan="2">
<table align="center" border="0" cellpadding="0" cellspacing="0" width="99%">
@@ -141,7 +150,7 @@
<table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
<tr>
<td class="big">
- <strong>4.sdjhfsjkhfjalkssdjhfsjkhfjalks</strong>
+ <strong>4.{$UMOD.LBL_HOME_PAGE_COMP}</strong>
</td>
<td class="small" align="right"> </td>
</tr>
@@ -164,17 +173,6 @@
{/foreach}
</table>
<br>
- <table class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%">
- <tr>
- <td class="big">
- <strong>5.kssdjhfsjkhfjalks</strong>
- </td>
- <td class="small" align="right"> </td>
- </tr>
- </table>
- <table border="0" cellpadding="5" cellspacing="0" width="100%">
- <tr><td> </td><td></td></tr>
- </table>
<tr><td colspan=4> </td></tr>
<tr>
@@ -192,10 +190,10 @@
</td></tr>
<tr><td class="small"><div align="right"><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>
</table>
- </form>
</td>
</tr>
</table>
+ </form>
</td>
</tr>
</table>
Modified: vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserListViewContents.tpl Thu Jun 29 06:32:43 2006
@@ -25,11 +25,12 @@
{foreach name=userlist item=listvalues key=userid from=$LIST_ENTRIES}
<tr>
<td class="listTableRow small" valign=top>{$smarty.foreach.userlist.iteration}</td>
- <td class="listTableRow small" valign=top><a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}"><img src="{$IMAGE_PATH}editfield.gif" alt="Edit" title="Edit" border="0"></a>
+ <td class="listTableRow small" nowrap valign=top><a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}"><img src="{$IMAGE_PATH}settingsActBtnEdit.gif" alt="{$APP.LBL_EDIT_BUTTON}" title="{$APP.LBL_EDIT_BUTTON}" border="0"></a>
{if $userid neq 1 && $userid neq 2}
- <img src="{$IMAGE_PATH}delete.gif" onclick="deleteUser('{$userid}')" border="0" alt="Delete" title="Delete"/></a>
+ <img src="{$IMAGE_PATH}settingsActBtnDelete.gif" onclick="deleteUser('{$userid}')" border="0" alt="{$APP.LBL_DELETE_BUTTON}" title="{$APP.LBL_DELETE_BUTTON}" style="cursor:pointer;"/></a>
{/if}
- </td>
+ <a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record={$userid}&isDuplicate=true"><img src="{$IMAGE_PATH}settingsActBtnDuplicate.gif" alt="{$APP.LBL_DUPLICATE_BUTTON}" title="{$APP.LBL_DUPLICATE_BUTTON}" border="0"></a>
+</td>
<td class="listTableRow small" valign=top><b><a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$userid}"> {$listvalues.3} </a></b><br><a href="index.php?module=Users&action=DetailView&parenttab=Settings&record={$userid}"> {$listvalues.1} {$listvalues.0}</a> ({$listvalues.2})</td>
<td class="listTableRow small" valign=top>{$listvalues.5}</td>
<td class="listTableRow small" valign=top>{$listvalues.7}</td>
More information about the vtigercrm-commits
mailing list