[Vtigercrm-commits] [vtiger-commits] r4284 - in /vtigercrm/trunk: Smarty/templates/ modules/Users/ themes/blue/
vtigercrm-commits at vtiger.fosslabs.com
vtigercrm-commits at vtiger.fosslabs.com
Fri Mar 17 13:19:58 EST 2006
Author: saraj
Date: Fri Mar 17 11:19:45 2006
New Revision: 4284
Log:
delete users roles profiles ajaxified and new UI has been integrated
Modified:
vtigercrm/trunk/Smarty/templates/UserListView.tpl
vtigercrm/trunk/Smarty/templates/UserProfile.tpl
vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php
vtigercrm/trunk/modules/Users/RoleDeleteStep1.php
vtigercrm/trunk/modules/Users/User.php
vtigercrm/trunk/modules/Users/UserDeleteStep1.php
vtigercrm/trunk/modules/Users/UsersAjax.php
vtigercrm/trunk/modules/Users/listroles.html
vtigercrm/trunk/modules/Users/listroles.php
vtigercrm/trunk/themes/blue/style.css
Modified: vtigercrm/trunk/Smarty/templates/UserListView.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserListView.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserListView.tpl Fri Mar 17 11:19:45 2006
@@ -79,5 +79,21 @@
</td>
</tr>
</table>
+<div id="tempdiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
+<script>
+function ajaxSaveResponse(response)
+{ldelim}
+ document.getElementById("tempdiv").innerHTML=response.responseText;
+{rdelim}
+
+function DeleteProfile(userid)
+{ldelim}
+ //show("an_busy");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring = "module=Users&action=UsersAjax&file=UserDeleteStep1&record="+userid;
+ ajaxObj.process("index.php?",urlstring);
+{rdelim}
+</script>
+
{include file='SettingsSubMenu.tpl'}
Modified: vtigercrm/trunk/Smarty/templates/UserProfile.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/UserProfile.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/UserProfile.tpl Fri Mar 17 11:19:45 2006
@@ -37,7 +37,7 @@
<tr class="{cycle values="dvtCellInfo,dvtCellLabel"}">
<td nowrap>
{if $LIST_ENTRIES[entries].del_permission eq 'yes'}
- <a href="index.php?module=Users&action=ProfileDeleteStep1&profileid={$LIST_ENTRIES[entries].profileid}"><img src="{$IMAGE_PATH}del.gif" border="0" height="15" width="15"></a>
+ <a href="#"><img src="{$IMAGE_PATH}del.gif" border="0" height="15" width="15" onclick="DeleteProfile('{$LIST_ENTRIES[entries].profileid}')"></a>
{else}
{/if}
@@ -62,5 +62,20 @@
</td>
</tr>
</table>
- {include file='SettingsSubMenu.tpl'}
+<div id="tempdiv" style="display:block;position:absolute;left:350px;top:200px;"></div>
+<script>
+function ajaxSaveResponse(response)
+{ldelim}
+ document.getElementById("tempdiv").innerHTML=response.responseText;
+{rdelim}
+function DeleteProfile(profileid)
+{ldelim}
+ //show("an_busy");
+ var ajaxObj = new Ajax(ajaxSaveResponse);
+ var urlstring = "module=Users&action=UsersAjax&file=ProfileDeleteStep1&profileid="+profileid;
+ ajaxObj.process("index.php?",urlstring);
+{rdelim}
+</script>
+{include file='SettingsSubMenu.tpl'}
+
Modified: vtigercrm/trunk/modules/Users/ProfileDeleteStep1.php
==============================================================================
Binary files - no diff available.
Modified: vtigercrm/trunk/modules/Users/RoleDeleteStep1.php
==============================================================================
Binary files - no diff available.
Modified: vtigercrm/trunk/modules/Users/User.php
==============================================================================
--- vtigercrm/trunk/modules/Users/User.php (original)
+++ vtigercrm/trunk/modules/Users/User.php Fri Mar 17 11:19:45 2006
@@ -587,7 +587,7 @@
{
$entries=array();
$id=$this->db->query_result($result,$i-1,'id');
- $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'edit.gif" border="0" alt="Edit" title="Edit"/></a> <a href="index.php?return_module=Users&return_action=ListView&module=Users&action=UserDeleteStep1&record='.$id.'"><img src="'.$image_path.'del.gif" border="0" alt="Delete" title="Delete"/></a>';
+ $entries[]='<a href="index.php?action=EditView&return_action=ListView&return_module=Users&module=Users&parenttab=Settings&record='.$id.'"><img src="'.$image_path.'edit.gif" border="0" alt="Edit" title="Edit"/></a> <a href="#" onClick=DeleteProfile("'.$id.'");><img src="'.$image_path.'del.gif" border="0" alt="Delete" title="Delete"/></a>';
$entries[]=$this->db->query_result($result,$i-1,'first_name').' '.$this->db->query_result($result,$i-1,'last_name');
$entries[]='<a href="index.php?action=DetailView&module=Users&parenttab=Settings&record='.$id.'">'.$this->db->query_result($result,$i-1,'user_name').'</a>';
$entries[]=$this->db->query_result($result,$i-1,'department');
Modified: vtigercrm/trunk/modules/Users/UserDeleteStep1.php
==============================================================================
Binary files - no diff available.
Modified: vtigercrm/trunk/modules/Users/UsersAjax.php
==============================================================================
--- vtigercrm/trunk/modules/Users/UsersAjax.php (original)
+++ vtigercrm/trunk/modules/Users/UsersAjax.php Fri Mar 17 11:19:45 2006
@@ -11,6 +11,11 @@
global $current_user;
global $adb;
+
+if(isset($_REQUEST['file']) && ($_REQUEST['file'] !=''))
+{
+ require_once('modules/Users/'.$_REQUEST['file'].'.php');
+}
if(isset($_REQUEST['orgajax']) && ($_REQUEST['orgajax'] !=''))
{
require_once('modules/Users/CreateSharingRule.php');
Modified: vtigercrm/trunk/modules/Users/listroles.html
==============================================================================
Binary files - no diff available.
Modified: vtigercrm/trunk/modules/Users/listroles.php
==============================================================================
--- vtigercrm/trunk/modules/Users/listroles.php (original)
+++ vtigercrm/trunk/modules/Users/listroles.php Fri Mar 17 11:19:45 2006
@@ -130,7 +130,7 @@
echo '<td style="width:5px"></td>';
if(! $roledepth == 0)
{
- echo '<td valign=top><span id="'.$roleid.'tools" style="display:block"> <a href="index.php?module=Users&action=createrole&parent='.$roleid.'">Add</a> | <a href="index.php?module=Users&action=createrole&roleid='.$roleid.'&mode=edit">Edit</a> | <a href="index.php?module=Users&action=RoleDeleteStep1&roleid='.$roleid.'">Delete</a> | <a href="index.php?module=Users&action=RoleDetailView&roleid='.$roleid.'">View</a></span></td>';
+ echo '<td valign=top><span id="'.$roleid.'tools" style="display:block"> <a href="index.php?module=Users&action=createrole&parent='.$roleid.'">Add</a> | <a href="index.php?module=Users&action=createrole&roleid='.$roleid.'&mode=edit">Edit</a> | <a href="#" onclick="DeleteRole(\''.$roleid.'\')">Delete</a> | <a href="index.php?module=Users&action=RoleDetailView&roleid='.$roleid.'">View</a></span></td>';
}
else
{
Modified: vtigercrm/trunk/themes/blue/style.css
==============================================================================
--- vtigercrm/trunk/themes/blue/style.css (original)
+++ vtigercrm/trunk/themes/blue/style.css Fri Mar 17 11:19:45 2006
@@ -1473,16 +1473,8 @@
background-color:#FFFFFF;
padding:5px;
}
-/*#tempdiv{
- font-family:Arial, Helvetica, sans-serif;
- font-size:11px;
- text-align:left;
-width:500px;
-border:3px solid #CCCCCC;
- background-color:#FFFFFF;
-padding:5px;
-}
-*/
+
+
/* Groups */
.groupul{
@@ -1505,3 +1497,24 @@
list-style-type:none;
text-align:left;
}
+
+#DeleteLay{
+ font-family:Arial, Helvetica, sans-serif;
+ font-size:11px;
+ text-align:left;
+width:300px;
+border:3px solid #CCCCCC;
+ background-color:#FFFFFF;
+padding:5px;
+}
+
+.classBtn{
+ font-family:Arial, Helvetica, sans-serif;
+ text-decoration:none;
+ font-weight:normal;
+ font-size:11px;
+ background-color:#999999;
+border:1px solid #666666;
+ text-align:center;
+}
+
More information about the vtigercrm-commits
mailing list