[Vtigercrm-commits] [vtiger-commits] r7433 - in /vtigercrm/trunk: Smarty/templates/FieldAccess.tpl Smarty/templates/Settings/PickListContents.tpl modules/Users/DefaultFieldPermissions.php

vtigercrm-commits at vtiger.fosslabs.com vtigercrm-commits at vtiger.fosslabs.com
Thu Jun 22 11:28:09 EDT 2006


Author: saraj
Date: Thu Jun 22 09:28:02 2006
New Revision: 7433

Log:
issue in field access and PickList has been fixed

Modified:
    vtigercrm/trunk/Smarty/templates/FieldAccess.tpl
    vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl
    vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php

Modified: vtigercrm/trunk/Smarty/templates/FieldAccess.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/FieldAccess.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/FieldAccess.tpl Thu Jun 22 09:28:02 2006
@@ -16,110 +16,106 @@
 <tbody><tr>
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopLeft.gif"></td>
         <td class="showPanelBg" style="padding: 10px;" valign="top" width="100%">
-<br>
+	<br>
 	<div align=center>
 	
-			{include file='SetMenu.tpl'}
-				<!-- DISPLAY -->
-				<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
-				<form action="index.php" method="post" name="new" id="form">
-				<input type="hidden" name="module" value="Users">
-				<input type="hidden" name="parenttab" value="Settings">
-				<input type="hidden" name="fld_module" id="fld_module">
-				{if $MODE neq 'view'}
-				<input type="hidden" name="action" value="UpdateDefaultFieldLevelAccess">
-				{else}
-				<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
-				{/if}	
-				<tr>
-					<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
-					<td colspan=2 class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_FIELDS_ACCESS} </b></td>
-					<td rowspan=2 class="small" align=right>&nbsp;</td>
-				</tr>
-				<tr>
-					<td valign=top class="small">{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
-				</tr>
-				</table>
-				<br>
-				<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
-				<tr>
-					<td class="big"><strong>{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</strong></td>
-					<td class="small" align=right>
-					{if $MODE neq 'edit'}
-						<input name="Edit" type="submit" class="crmButton small edit" value="{$APP.LBL_EDIT_BUTTON}" >									
-					{else}
-						<input title="save" accessKey="S" class="crmButton small save" type="submit" name="Save" value="{$APP.LBL_SAVE_LABEL}">
-						<input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="crmButton small cancel" type="button" onClick="window.history.back();">
-					{/if}
-					</td>
-				</tr>
-				</table>
-				<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
-                  <tr >
-                    <td  style="padding-left:5px;" class="big">{$CMOD.LBL_SELECT_SCREEN}&nbsp; 
+	{include file='SetMenu.tpl'}
+		<!-- DISPLAY -->
+		<table border=0 cellspacing=0 cellpadding=5 width=100% class="settingsSelUITopLine">
+		<form action="index.php" method="post" name="new" id="form">
+		<input type="hidden" name="module" value="Users">
+		<input type="hidden" name="parenttab" value="Settings">
+		<input type="hidden" name="fld_module" id="fld_module" value="{$DEF_MODULE}">
+		{if $MODE neq 'view'}
+			<input type="hidden" name="action" value="UpdateDefaultFieldLevelAccess">
+		{else}
+			<input type="hidden" name="action" value="EditDefOrgFieldLevelAccess">
+		{/if}	
+		<tr>
+			<td width=50 rowspan=2 valign=top><img src="{$IMAGE_PATH}orgshar.gif" alt="Users" width="48" height="48" border=0 title="Users"></td>
+			<td colspan=2 class=heading2 valign=bottom><b><a href="index.php?module=Settings&action=index&parenttab=Settings">{$MOD.LBL_SETTINGS}</a> > {$MOD.LBL_FIELDS_ACCESS} </b></td>
+			<td rowspan=2 class="small" align=right>&nbsp;</td>
+		</tr>
+		<tr>
+			<td valign=top class="small">{$MOD.LBL_SHARING_FIELDS_DESCRIPTION}</td>
+		</tr>
+		</table>
+		<br>
+		<table border=0 cellspacing=0 cellpadding=5 width=100% class="tableHeading">
+		<tr>
+			<td class="big"><strong>{$CMOD.LBL_GLOBAL_FIELDS_MANAGER}</strong></td>
+			<td class="small" align=right>
+			{if $MODE neq 'edit'}
+				<input name="Edit" type="submit" class="crmButton small edit" value="{$APP.LBL_EDIT_BUTTON}" >									
+			{else}
+				<input title="save" accessKey="S" class="crmButton small save" type="submit" name="Save" value="{$APP.LBL_SAVE_LABEL}">
+				<input name="Cancel" value=" {$APP.LBL_CANCEL_BUTTON_LABEL} " class="crmButton small cancel" type="button" onClick="window.history.back();">
+			{/if}
+			</td>
+		</tr>
+		</table>
+		<table width="100%" border="0" cellpadding="5" cellspacing="0" class="listTableTopButtons">
+                <tr>
+        		<td  style="padding-left:5px;" class="big">{$CMOD.LBL_SELECT_SCREEN}&nbsp; 
 			<select name="Screen" class="detailedViewTextBox" style="width:30%;"  onChange="changemodules(this)">
-				{foreach item=module from=$FIELD_INFO}
+			{foreach item=module from=$FIELD_INFO}
 				{if $module == $DEF_MODULE}
 					<option selected value='{$module}'>{$APP.$module}</option>
 				{else}		
 					<option value='{$module}' >{$APP.$module}</option>
 				{/if}
-				{/foreach}
+			{/foreach}
 			</select>
-		    </td>
-                    <td align="right">&nbsp;</td>
-                  </tr>
-		  </table>
-				{foreach key=module item=info name=allmodules from=$FIELD_LISTS}
-				{$module}      {$DEF_MODULE}
-				{if $module == $DEF_MODULE}
-				<div id="{$module}_fields" style="display:block">	
-				{else}
-				<div id="{$module}_fields" style="display:none">	
-				{/if}
-				 <table cellspacing=0 cellpadding=5 width=100% class="listTable small">
-                   <tr>
-				   			<td colspan="2" class="listRow" valign="top" nowrap>
-								<b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module}</b>
-							</td>
-				   </tr>
-				   <tr>
-                     <td valign=top width="25%" >
-		     <table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
-			{foreach item=elements name=groupfields from=$info}
-                         <tr>
-				{foreach item=elementinfo name=curvalue from=$elements}
-                           <td class="prvPrfTexture" style="width:20px">&nbsp;</td>
-                           <td width="5%" id="{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}">{$elementinfo.1}</td>
-                           <td width="25%" nowrap  onMouseOver="this.className='prvPrfHoverOn',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOff'">{$elementinfo.0}</td>
-				{/foreach}
-                         </tr>
+		    	</td>
+	                <td align="right">&nbsp;</td>
+                </tr>
+		</table>
+		{foreach key=module item=info name=allmodules from=$FIELD_LISTS}
+		{if $module eq $DEF_MODULE}
+			<div id="{$module}_fields" style="display:block">	
+		{else}
+			<div id="{$module}_fields" style="display:none">	
+		{/if}
+	 	<table cellspacing=0 cellpadding=5 width=100% class="listTable small">
+       		<tr>
+			<td colspan="2" class="listRow" valign="top" nowrap>
+			<b>{$CMOD.LBL_FIELDS_AVLBL} {$APP.$module}</b>
+			</td>
+		</tr>
+		<tr>
+                	<td valign=top width="25%" >
+		     	<table border=0 cellspacing=0 cellpadding=5 width=100% class=small>
+				{foreach item=elements name=groupfields from=$info}
+                        	<tr>
+					{foreach item=elementinfo name=curvalue from=$elements}
+                           		<td class="prvPrfTexture" style="width:20px">&nbsp;</td>
+                           		<td width="5%" id="{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}">{$elementinfo.1}</td>
+                           		<td width="25%" nowrap  onMouseOver="this.className='prvPrfHoverOn',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOn'" onMouseOut="this.className='prvPrfHoverOff',$('{$smarty.foreach.allmodules.iteration}_{$smarty.foreach.groupfields.iteration}_{$smarty.foreach.curvalue.iteration}').className='prvPrfHoverOff'">{$elementinfo.0}</td>
+					{/foreach}
+                         	</tr>
                          	{/foreach}
-                     </table>
-				</div>
+                     	</table>
 			</td>
-                   </tr>
-				{/foreach}
-                 </table></td>
-			</tr>
+                </tr>
                 </table>
-				<br>
-				<br>
-				<table border=0 cellspacing=0 cellpadding=5 width=100% >
-				<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>				</table>
-				
-			
-			
-			
-			</td>
-			</tr>
-			</table>
-		</td>
+		</div>
+		{/foreach}
+	</td>
 	</tr>
-	</form>
+        </table>
+	<br>
+	<br>
+	<table border=0 cellspacing=0 cellpadding=5 width=100% >
+		<tr><td class="small" ><div align=right><a href="#top">{$MOD.LBL_SCROLL}</a></div></td></tr>
 	</table>
-		
-	</div>
+</td>
+</tr>
+</table>
+</td>
+</tr>
+</form>
+</table>
+</div>
 </td>
         <td valign="top"><img src="{$IMAGE_PATH}showPanelTopRight.gif"></td>
    </tr>

Modified: vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl
==============================================================================
--- vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl (original)
+++ vtigercrm/trunk/Smarty/templates/Settings/PickListContents.tpl Thu Jun 22 09:28:02 2006
@@ -1,38 +1,40 @@
-	<strong>2. {$MOD.LBL_PICKLIST_AVAIL} {$MODULE} </strong></td>
+	<table  class="tableHeading" border="0" cellpadding="5" cellspacing="0" width="100%"><tr><td><strong>2. {$MOD.LBL_PICKLIST_AVAIL} {$MODULE} </strong></td>
 		<td class="small" align=right>&nbsp;</td>
 		</tr>
 	</table>
 	<table border=0 cellspacing=0 cellpadding=0 width=100% class="listTable">
 	<tr>
 		<td valign=top width="50%">
-		<table width="100%" class="listTable" cellpadding="5" cellspacing="0">
-		{foreach item=picklists from=$PICKLIST_VALUES}
-		<tr>
-		{foreach item=picklistfields from=$picklists}
-		{if $picklistfields neq ''}
-			<td class="listTableTopButtons small" valign="top" align="left"><b>{$picklistfields.fieldlabel}</b></td>
-			<td class="listTableTopButtons" valign="top" align="right">
-				<input type="button" value="Edit" class="crmButton small edit" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');posLay(this,'editdiv');" > 
-			</td>
-		{else}
-			<td class="listTableTopButtons small" colspan="2">&nbsp;</td>
-		{/if}
-		{/foreach}
-		</tr>
-		<tr>
-		{foreach item=picklistelements from=$picklists}
-		{if $picklistelements neq ''}
-			<td colspan="2" valign="top">
-				<ul style="list-style-type: none;">
-					{foreach item=elements from=$picklistelements.value}
-						<li>{$elements}</li>
-					{/foreach}
-				</ul>	
-			</td>
-		{else}
-			<td colspan="2">&nbsp;</td>
-		{/if}
-		{/foreach}
-		</tr>
+			<table width="100%" class="listTable" cellpadding="5" cellspacing="0">
+			{foreach item=picklists from=$PICKLIST_VALUES}
+			<tr>
+				{foreach item=picklistfields from=$picklists}
+				{if $picklistfields neq ''}
+					<td class="listTableTopButtons small" valign="top" align="left"><b>{$picklistfields.fieldlabel}</b></td>
+					<td class="listTableTopButtons" valign="top" align="right">
+					<input type="button" value="Edit" class="crmButton small edit" onclick="fetchEditPickList('{$MODULE}','{$picklistfields.fieldname}');posLay(this,'editdiv');" > 
+					</td>
+				{else}
+					<td class="listTableTopButtons small" colspan="2">&nbsp;</td>
+				{/if}
+				{/foreach}
+			</tr>
+			<tr>
+				{foreach item=picklistelements from=$picklists}
+				{if $picklistelements neq ''}
+					<td colspan="2" valign="top">
+					<ul style="list-style-type: none;">
+						{foreach item=elements from=$picklistelements.value}
+							<li>{$elements}</li>
+						{/foreach}
+					</ul>	
+					</td>
+				{else}
+					<td colspan="2">&nbsp;</td>
+			{/if}
+			{/foreach}
+			</tr>
 		{/foreach}
 		</table> 
+		</td></tr>
+		</table>

Modified: vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php
==============================================================================
--- vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php (original)
+++ vtigercrm/trunk/modules/Users/DefaultFieldPermissions.php Thu Jun 22 09:28:02 2006
@@ -58,7 +58,7 @@
 		
 		if($adb->query_result($fieldListResult,$i,"visible") == 0)
 		{
-			$visible = "<img src=".$image_path."/yes.gif>";
+			$visible = "<img src=".$image_path."/prvPrfSelectedTick.gif>";
 		}
 		else
 		{
@@ -67,7 +67,7 @@
 		$standCustFld []= $visible;
 	}
 	$standCustFld=array_chunk($standCustFld,2);	
-	$standCustFld=array_chunk($standCustFld,2);	
+	$standCustFld=array_chunk($standCustFld,4);	
 	return $standCustFld;
 }
 





More information about the vtigercrm-commits mailing list