iSharkFly-Open/sourceforge-ossez
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

根据最新的用户意见，修改了表述不完整的 3 处。

Browse Source 
针对首页 Dashboard 显示内容进行优化

删除 4 个多余字段

根据最新版本，增加了3 个 LBL 记录。

+YUCHENG HU+


git-svn-id: https://svn.code.sf.net/p/hawebs/svn@514 a2543c7e-f6e9-4f8a-8bff-1ffc34733512
This commit is contained in:
YuCheng Hu
2010-07-15 19:05:57 +00:00
parent ce064338c2
commit e2ec7fae81
44 changed files with 286683 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oss/vtiger/trunk/.settings/org.eclipse.core.resources.prefs
+2 -1
View File
@@ -1,3 +1,4 @@
#Wed Jun 09 19:21:10 EDT 2010
#Fri Jul 09 09:17:24 EDT 2010
eclipse.preferences.version=1
encoding//modules/Utilities/Currencies.php=UTF-8
encoding/<project>=UTF-8
oss/vtiger/trunk/Image/Canvas/Fonts/DroidSansFallback.ttf
BIN
View File
Binary file not shown.
oss/vtiger/trunk/Image/Canvas/Fonts/fontmap.txt
+2 -1
View File
@@ -32,4 +32,5 @@ Vera Serif Bold,VeraSeBd.ttf
Verdana,verdana.ttf
Verdana Bold,verdanab.ttf
Verdana Bold Italic,verdanaz.ttf
Verdana Italic,verdanai.ttf
Verdana Italic,verdanai.ttf
Droid Sans Fallback,DroidSansFallback.ttf
oss/vtiger/trunk/Image/Canvas/GD.php
+1
View File
@@ -1354,6 +1354,7 @@ class Image_Canvas_GD extends Image_Canvas_WithMap
$alignment = (isset($params['alignment']) ? $params['alignment'] : false);
$text = str_replace("\r", '', $text);
if (!is_array($alignment)) {
$alignment = array('vertical' => 'top', 'horizontal' => 'left');
oss/vtiger/trunk/Releases/vTiger_zh_cn_5.1_20100618.zip
BIN
View File
Binary file not shown.
oss/vtiger/trunk/Smarty/templates_c/%%00^008^0081DCD6%%GroupEditView.tpl.php
+436
View File
File diff suppressed because it is too large Load Diff
oss/vtiger/trunk/Smarty/templates_c/%%02^02E^02EA6348%%FindDuplicateDisplay.tpl.php
+61
View File
@@ -0,0 +1,61 @@
<?php /* Smarty version 2.6.18, created on 2010-07-14 06:35:23
compiled from FindDuplicateDisplay.tpl */ ?>
<?php require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
smarty_core_load_plugins(array('plugins' => array(array('modifier', 'vtiger_imageurl', 'FindDuplicateDisplay.tpl', 23, false),array('modifier', 'vtlib_purify', 'FindDuplicateDisplay.tpl', 51, false),)), $this); ?>
<script language="JavaScript" type="text/javascript" src="include/js/ListView.js"></script>
<?php if ($this->_tpl_vars['MODULE'] == $_REQUEST['module']): ?>
<?php $_smarty_tpl_vars = $this->_tpl_vars;
$this->_smarty_include(array('smarty_include_tpl_file' => 'Buttons_List.tpl', 'smarty_include_vars' => array()));
$this->_tpl_vars = $_smarty_tpl_vars;
unset($_smarty_tpl_vars);
?>
<div id="searchingUI" style="display:none;">
<table border=0 cellspacing=0 cellpadding=0 width=100%>
<tr>
<td align=center>
<img src="<?php echo vtiger_imageurl('searching.gif', $this->_tpl_vars['THEME']); ?>
" alt="<?php echo $this->_tpl_vars['APP']['LBL_SEARCHING']; ?>
" title="<?php echo $this->_tpl_vars['APP']['LBL_SEARCHING']; ?>
">
</td>
</tr>
</table>
</div>
</td>
</tr>
</table>
</td>
</tr>
</table>
<?php endif; ?>
<?php if ($this->_tpl_vars['MODULE'] == $_REQUEST['module']): ?>
<table border=0 cellspacing=0 cellpadding=0 width=98% align=center>
<tr>
<td valign=top><img src="<?php echo vtiger_imageurl('showPanelTopLeft.gif', $this->_tpl_vars['THEME']); ?>
"></td>
<td class="showPanelBg" valign="top" width=100% style="padding:10px;">
<?php endif; ?>
<div id="duplicate_ajax" style='margin: 0 10px;'>
<?php $_smarty_tpl_vars = $this->_tpl_vars;
$this->_smarty_include(array('smarty_include_tpl_file' => 'FindDuplicateAjax.tpl', 'smarty_include_vars' => array()));
$this->_tpl_vars = $_smarty_tpl_vars;
unset($_smarty_tpl_vars);
?>
</div>
<div id="current_action" style="display:none"><?php echo vtlib_purify($_REQUEST['action']); ?>
</div>
<?php if ($this->_tpl_vars['MODULE'] == $_REQUEST['module']): ?>
</td>
<td valign=top><img src="<?php echo vtiger_imageurl('showPanelTopRight.gif', $this->_tpl_vars['THEME']); ?>
"></td>
</tr>
</table>
<?php endif; ?>
oss/vtiger/trunk/Smarty/templates_c/%%3A^3AE^3AE650D3%%DeletePickList.tpl.php
+82
View File
@@ -0,0 +1,82 @@
<?php /* Smarty version 2.6.18, created on 2010-07-13 14:46:34
compiled from modules/PickList/DeletePickList.tpl */ ?>
<div style="position:relative;display: block;" class="layerPopup">
<table border="0" cellpadding="5" cellspacing="0" class="layerHeadingULine">
<tr>
<td class="layerPopupHeading" align="left" nowrap>
<?php echo $this->_tpl_vars['MOD']['DELETE_PICKLIST_VALUES']; ?>
- <?php echo $this->_tpl_vars['FIELDLABEL']; ?>
</td>
</tr>
</table>
<table border=0 cellspacing=0 cellpadding=5 >
<tr><td valign=top align=left>
<select id="delete_availPickList" multiple="multiple" wrap size="20" name="availList" style="width:250px;border:1px solid #666666;font-family:Arial, Helvetica, sans-serif;font-size:11px;">
<?php $_from = $this->_tpl_vars['PICKVAL']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['pick_val']):
?>
<option value="<?php echo $this->_tpl_vars['pick_val']; ?>
"><?php echo $this->_tpl_vars['pick_val']; ?>
</option>
<?php endforeach; endif; unset($_from); ?>
</select>
</td>
</tr>
<tr>
<td nowrap>
<b><?php echo $this->_tpl_vars['MOD']['LBL_REPLACE_WITH']; ?>
</b>&nbsp;
<select id="replace_picklistval" name="replaceList" style="border:1px solid #666666;font-family:Arial, Helvetica, sans-serif;font-size:11px;">
<option value=""></option>
<?php $_from = $this->_tpl_vars['PICKVAL']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['pick_val']):
?>
<option value="<?php echo $this->_tpl_vars['pick_val']; ?>
"><?php echo $this->_tpl_vars['pick_val']; ?>
</option>
<?php endforeach; endif; unset($_from); ?>
<?php $_from = $this->_tpl_vars['NONEDITPICKLIST']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['nonedit']):
?>
<option value="<?php echo $this->_tpl_vars['nonedit']; ?>
"><?php echo $this->_tpl_vars['nonedit']; ?>
</option>
<?php endforeach; endif; unset($_from); ?>
</select>
</td>
</tr>
<tr>
<td valign=top align=left>
<input type="button" value="<?php echo $this->_tpl_vars['APP']['LBL_DELETE_BUTTON_LABEL']; ?>
" name="del" class="crmButton small delete" onclick="validateDelete('<?php echo $this->_tpl_vars['FIELDNAME']; ?>
','<?php echo $this->_tpl_vars['MODULE']; ?>
');">
<input type="button" value="<?php echo $this->_tpl_vars['APP']['LBL_CANCEL_BUTTON_LABEL']; ?>
" name="cancel" class="crmButton small cancel" onclick="fnhide('actiondiv');">
</td>
</tr>
<?php if (is_array ( $this->_tpl_vars['NONEDITPICKLIST'] )): ?>
<tr>
<td colspan=3>
<table border=0 cellspacing=0 cellpadding=0 width=100%>
<tr><td><b><?php echo $this->_tpl_vars['MOD']['LBL_NON_EDITABLE_PICKLIST_ENTRIES']; ?>
:</b></td></tr>
<tr><td>
<select id="nonEditablePicklistVal" name="nonEditablePicklistVal" multiple="multiple" wrap size="5" style="width: 100%">
<?php $_from = $this->_tpl_vars['NONEDITPICKLIST']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['nonedit']):
?>
<option value="<?php echo $this->_tpl_vars['nonedit']; ?>
" disabled><?php echo $this->_tpl_vars['nonedit']; ?>
</option>
<?php endforeach; endif; unset($_from); ?>
</select>
</table>
</td>
</tr>
<?php endif; ?>
</table>
</div>
oss/vtiger/trunk/Smarty/templates_c/%%AC^ACF^ACF9CEE1%%MergeFields.tpl.php
+223
View File
@@ -0,0 +1,223 @@
<?php /* Smarty version 2.6.18, created on 2010-07-14 06:36:52
compiled from MergeFields.tpl */ ?>
<?php require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
smarty_core_load_plugins(array('plugins' => array(array('modifier', 'getTranslatedString', 'MergeFields.tpl', 111, false),array('modifier', 'truncate', 'MergeFields.tpl', 116, false),array('modifier', 'vtiger_imageurl', 'MergeFields.tpl', 151, false),)), $this); ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<title><?php echo $this->_tpl_vars['APP'][$this->_tpl_vars['MODULE_NAME']]; ?>
- <?php echo $this->_tpl_vars['APP']['LBL_BROWSER_TITLE']; ?>
</title>
<link REL="SHORTCUT ICON" HREF="themes/images/vtigercrm_icon.ico">
<style type="text/css">@import url("themes/<?php echo $this->_tpl_vars['THEME']; ?>
/style.css");</style>
<!-- ActivityReminder customization for callback -->
<?php echo '
<style type="text/css">div.fixedLay1 { position:fixed; }</style>
<!--[if lte IE 6]>
<style type="text/css">div.fixedLay { position:absolute; }</style>
<![endif]-->
'; ?>
<!-- End -->
</head>
<body leftmargin=0 topmargin=0 marginheight=0 marginwidth=0 class=small>
<?php if ($this->_tpl_vars['EDIT_DUPLICATE'] == 'permitted'): ?>
<script language="JAVASCRIPT" type="text/javascript" src="include/js/smoothscroll.js"></script>
<script language="JavaScript" type="text/javascript" src="include/js/menu.js"></script>
<script src="include/scriptaculous/prototype.js" type="text/javascript"></script>
<script src="include/js/general.js" type="text/javascript"></script>
<script src="include/js/en_us.lang.js" type="text/javascript"></script>
<script src="include/scriptaculous/scriptaculous.js" type="text/javascript"></script>
<form name="merge" method="POST" action="index.php" id="form" onsubmit="if(validate_merge('<?php echo $this->_tpl_vars['MODULENAME']; ?>
')){VtigerJS_DialogBox.block(); return true;} else { return false; };">
<input type=hidden name="module" value="<?php echo $this->_tpl_vars['MODULENAME']; ?>
">
<input type=hidden name="return_module" value="<?php echo $this->_tpl_vars['MODULENAME']; ?>
">
<input type="hidden" name="action" value="ProcessDuplicates">
<input type="hidden" name="mergemode" value="mergesave">
<input type="hidden" name="parent" value="<?php echo $this->_tpl_vars['PARENT_TAB']; ?>
">
<input type="hidden" name="pass_rec" value="<?php echo $this->_tpl_vars['IDSTRING']; ?>
">
<input type="hidden" name="return_action" value="FindDuplicateRecords">
<div style='margin: 0 5px;'>
<table class="small" border="0" cellspacing=0 cellpadding=4 width="98%">
<tr>
<td align="left" colspan="2" class="moduleName" nowrap="nowrap">
<?php $this->assign('MODULELABEL', $this->_tpl_vars['MODULENAME']); ?>
<?php if ($this->_tpl_vars['APP'][$this->_tpl_vars['MODULENAME']] != ''): ?>
<?php $this->assign('MODULELABEL', $this->_tpl_vars['APP'][$this->_tpl_vars['MODULENAME']]); ?>
<?php endif; ?>
<?php echo $this->_tpl_vars['APP']['LBL_MERGE_DATA_IN']; ?>
&gt; <span class="hdrLink"><?php echo $this->_tpl_vars['MODULELABEL']; ?>
</span>
</td>
</tr>
<tr>
<td class="small"><?php echo $this->_tpl_vars['APP']['LBL_DESC_FOR_MERGE_FIELDS']; ?>
</td>
</tr>
</table>
</div>
<div style='margin: 0 5px;'>
<table class="lvt small" border="0" cellpadding="3" cellspacing="1" width="98%">
<tr >
<td class="lvtCol"><b><?php echo $this->_tpl_vars['APP']['LBL_FIELDLISTS']; ?>
</b></td>
<?php $this->assign('count', 1); ?>
<?php $this->assign('cnt_rec', 0); ?>
<?php if ($this->_tpl_vars['NO_EXISTING'] == 1): ?>
<?php $_from = $this->_tpl_vars['ID_ARRAY']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['cnt'] => $this->_tpl_vars['record']):
?>
<td class="lvtCol" >
<b><?php echo $this->_tpl_vars['APP']['LBL_RECORD']; ?>
<?php echo $this->_tpl_vars['count']; ?>
</b>
<?php if ($this->_tpl_vars['count'] == 1): ?>
<input name="record" value="<?php echo $this->_tpl_vars['record']; ?>
" onclick="select_All('<?php echo $this->_tpl_vars['JS_ARRAY']; ?>
','<?php echo $this->_tpl_vars['cnt']; ?>
','<?php echo $this->_tpl_vars['MODULENAME']; ?>
');" type="radio" checked> <span style="font-size:11px"><?php echo $this->_tpl_vars['APP']['LBL_SELECT_AS_PARENT']; ?>
</span>
<?php else: ?>
<input name="record" value="<?php echo $this->_tpl_vars['record']; ?>
" onclick="select_All('<?php echo $this->_tpl_vars['JS_ARRAY']; ?>
','<?php echo $this->_tpl_vars['cnt']; ?>
','<?php echo $this->_tpl_vars['MODULENAME']; ?>
');" type="radio"> <span style="font-size:11px"><?php echo $this->_tpl_vars['APP']['LBL_SELECT_AS_PARENT']; ?>
</span>
<?php endif; ?>
</td>
<?php $this->assign('cnt_rec', $this->_tpl_vars['cnt_rec']+1); ?>
<?php $this->assign('count', $this->_tpl_vars['count']+1); ?>
<?php endforeach; endif; unset($_from); ?>
<?php else: ?>
<?php $_from = $this->_tpl_vars['ID_ARRAY']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['cnt'] => $this->_tpl_vars['record']):
?>
<td class="lvtCol" >
<b><?php echo $this->_tpl_vars['APP']['LBL_RECORD']; ?>
<?php echo $this->_tpl_vars['count']; ?>
</b>
<?php $this->assign('found', 0); ?>
<?php $_from = $this->_tpl_vars['IMPORTED_RECORDS']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['k'] => $this->_tpl_vars['child']):
?>
<?php if ($this->_tpl_vars['record'] == $this->_tpl_vars['child']): ?>
<?php $this->assign('found', 1); ?>
<?php endif; ?>
<?php endforeach; endif; unset($_from); ?>
<?php if ($this->_tpl_vars['found'] == 0): ?>
<?php if ($this->_tpl_vars['count'] == 1): ?>
<input name="record" value="<?php echo $this->_tpl_vars['record']; ?>
" onclick="select_All('<?php echo $this->_tpl_vars['JS_ARRAY']; ?>
','<?php echo $this->_tpl_vars['cnt']; ?>
','<?php echo $this->_tpl_vars['MODULENAME']; ?>
');" type="radio" checked> <span style="font-size:11px"><?php echo $this->_tpl_vars['APP']['LBL_SELECT_AS_PARENT']; ?>
</span>
<?php else: ?>
<input name="record" value="<?php echo $this->_tpl_vars['record']; ?>
" onclick="select_All('<?php echo $this->_tpl_vars['JS_ARRAY']; ?>
','<?php echo $this->_tpl_vars['cnt']; ?>
','<?php echo $this->_tpl_vars['MODULENAME']; ?>
');" type="radio"> <span style="font-size:11px"><?php echo $this->_tpl_vars['APP']['LBL_SELECT_AS_PARENT']; ?>
</span>
<?php endif; ?>
<?php endif; ?>
</td>
<?php $this->assign('cnt_rec', $this->_tpl_vars['cnt_rec']+1); ?>
<?php $this->assign('count', $this->_tpl_vars['count']+1); ?>
<?php endforeach; endif; unset($_from); ?>
<?php endif; ?>
</tr>
<?php $_from = $this->_tpl_vars['ALLVALUES']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['cnt'] => $this->_tpl_vars['data']):
?>
<?php $_from = $this->_tpl_vars['data']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['label'] => $this->_tpl_vars['fld_array']):
?>
<tr class="IvtColdata" onmouseover="this.className='lvtColDataHover';" onmouseout="this.className='lvtColData';" bgcolor="white">
<td ><b><?php echo getTranslatedString($this->_tpl_vars['label'], $this->_tpl_vars['MODULE']); ?>
</b>
</td>
<?php $_from = $this->_tpl_vars['fld_array']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['cnt2'] => $this->_tpl_vars['fld_value']):
?>
<?php if ($this->_tpl_vars['fld_value']['disp_value'] != ''): ?>
<?php if ($this->_tpl_vars['cnt2'] == 0): ?>
<td nowrap><input name='<?php echo $this->_tpl_vars['FIELD_ARRAY'][$this->_tpl_vars['cnt']]; ?>
' value='<?php echo $this->_tpl_vars['fld_value']['org_value']; ?>
' type="radio" checked><?php echo ((is_array($_tmp=$this->_tpl_vars['fld_value']['disp_value'])) ? $this->_run_mod_handler('truncate', true, $_tmp, 30) : smarty_modifier_truncate($_tmp, 30)); ?>
</td>
<?php else: ?>
<td nowrap><input name='<?php echo $this->_tpl_vars['FIELD_ARRAY'][$this->_tpl_vars['cnt']]; ?>
' value='<?php echo $this->_tpl_vars['fld_value']['org_value']; ?>
' type="radio"><?php echo ((is_array($_tmp=$this->_tpl_vars['fld_value']['disp_value'])) ? $this->_run_mod_handler('truncate', true, $_tmp, 30) : smarty_modifier_truncate($_tmp, 30)); ?>
</td>
<?php endif; ?>
<?php else: ?>
<?php if ($this->_tpl_vars['cnt2'] == 0): ?>
<td><input name='<?php echo $this->_tpl_vars['FIELD_ARRAY'][$this->_tpl_vars['cnt']]; ?>
' value='' type="radio" checked><?php echo $this->_tpl_vars['APP']['LBL_NONE']; ?>
</td>
<?php else: ?>
<td><input name='<?php echo $this->_tpl_vars['FIELD_ARRAY'][$this->_tpl_vars['cnt']]; ?>
' value='' type="radio"><?php echo $this->_tpl_vars['APP']['LBL_NONE']; ?>
</td>
<?php endif; ?>
<?php endif; ?>
<?php endforeach; endif; unset($_from); ?>
</tr>
<?php endforeach; endif; unset($_from); ?>
<?php endforeach; endif; unset($_from); ?>
</table>
</div>
<div style='margin: 0 5px;'>
<table border=0 class="lvtColData" width="100%" cellspacing=0 cellpadding="0px">
<tr>
<td align="center" >
<input title="<?php echo $this->_tpl_vars['APP']['LBL_MERGE_BUTTON_TITLE']; ?>
" class="crmbutton small save" type="submit" name="button" value=" <?php echo $this->_tpl_vars['APP']['LBL_MERGE_BUTTON_LABEL']; ?>
" >
</td>
</tr>
</table>
</div>
</form>
<?php else: ?>
<table border='0' cellpadding='5' cellspacing='0' width='100%' height='450px'><tr><td align='center'>
<div style='border: 3px solid rgb(153, 153, 153); background-color: rgb(255, 255, 255); width: 55%; position: relative; z-index: 10000000;'>
<table border='0' cellpadding='5' cellspacing='0' width='98%'>
<tbody><tr>
<td rowspan='2' width='11%'><img src='<?php echo vtiger_imageurl('denied.gif', $this->_tpl_vars['THEME']); ?>
' ></td>
<td style='border-bottom: 1px solid rgb(204, 204, 204);' nowrap='nowrap' width='70%'>
<span class='genHeaderSmall'><?php echo $this->_tpl_vars['APP']['LBL_PERMISSION']; ?>
</span></td>
</tr>
<tr>
<td class='small' align='right' nowrap='nowrap'>
<a href='javascript:self.close();'><?php echo $this->_tpl_vars['APP']['LBL_GO_BACK']; ?>
</a><br>
</td>
</tr>
</tbody></table>
</div>
</td></tr></table>
<?php endif; ?>
</body>
</html>
oss/vtiger/trunk/Smarty/templates_c/%%BA^BA8^BA84C7A7%%FindDuplicateAjax.tpl.php
+128
View File
@@ -0,0 +1,128 @@
<?php /* Smarty version 2.6.18, created on 2010-07-14 06:35:24
compiled from FindDuplicateAjax.tpl */ ?>
<?php require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
smarty_core_load_plugins(array('plugins' => array(array('modifier', 'getTranslatedString', 'FindDuplicateAjax.tpl', 31, false),array('modifier', 'sizeof', 'FindDuplicateAjax.tpl', 43, false),)), $this); ?>
<table width='100%' border='0' cellpadding='5' cellspacing='0' class='tableHeading'>
<tr>
<td class='big' align='left'>
<b><?php echo $this->_tpl_vars['APP']['LBL_DUPLICATE_DATA_IN']; ?>
<?php echo $this->_tpl_vars['MOD']['LBL_MODULE_NAME']; ?>
</b>
</td>
</tr>
</table>
<br>
<table border="0" align ="center" width ="95%">
<tr>
<td >
<?php if ($this->_tpl_vars['DELETE'] == 'Delete'): ?>
<input class="crmbutton small delete" type="button" value="<?php echo $this->_tpl_vars['APP']['LBL_DELETE']; ?>
" onclick="return delete_fields('<?php echo $this->_tpl_vars['MODULE']; ?>
')"/>
<?php endif; ?>
</td>
<td nowrap >
<table border=0 cellspacing=0 cellpadding=0 class="small">
<tr><?php echo $this->_tpl_vars['NAVIGATION']; ?>
</tr>
</table>
</td>
</tr>
</table>
<table class="lvt small" border="0" cellpadding="3" align="center" cellspacing="1" width="95%" >
<tr>
<td class="lvtCol" width="40px">
<input type="checkbox" name="CheckAll" onclick='selectAllDel(this.checked,"del");' >
</td>
<?php $_from = $this->_tpl_vars['FIELD_NAMES']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['key'] => $this->_tpl_vars['field_values']):
?>
<td class="lvtCol big">
<b><?php echo getTranslatedString($this->_tpl_vars['key'], $this->_tpl_vars['MODULE']); ?>
</b>
</td>
<?php endforeach; endif; unset($_from); ?>
<td class="lvtCol big" cellpadding="3">
<?php echo $this->_tpl_vars['APP']['LBL_MERGE_SELECT']; ?>
</td>
<td class="lvtCol big" cellpadding="2" width="120px">
<?php echo $this->_tpl_vars['APP']['LBL_ACTION']; ?>
</td>
</tr>
<?php $this->assign('tdclass', 'IvtColdata'); ?>
<?php $_from = $this->_tpl_vars['ALL_VALUES']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['key1'] => $this->_tpl_vars['data']):
?>
<?php $this->assign('cnt', sizeof($this->_tpl_vars['data'])); ?>
<?php $this->assign('cnt2', 0); ?>
<?php if ($this->_tpl_vars['tdclass'] == 'IvtColdata'): ?>
<?php $this->assign('tdclass', 'sep1'); ?>
<?php else: ?>
<?php $this->assign('tdclass', 'IvtColdata'); ?>
<?php endif; ?>
<?php $_from = $this->_tpl_vars['data']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['key3'] => $this->_tpl_vars['newdata1']):
?>
<tr class="<?php echo $this->_tpl_vars['tdclass']; ?>
" nowrap="nowrap" >
<td>
<input type="checkbox" name="del" value="<?php echo $this->_tpl_vars['data'][$this->_tpl_vars['key3']]['recordid']; ?>
" onclick='selectDel(this.name,"CheckAll");' >
</td>
<?php $_from = $this->_tpl_vars['newdata1']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }if (count($_from)):
foreach ($_from as $this->_tpl_vars['key'] => $this->_tpl_vars['newdata2']):
?>
<td >
<?php if ($this->_tpl_vars['key'] == 'recordid'): ?>
<a href="index.php?module=<?php echo $this->_tpl_vars['MODULE']; ?>
&action=DetailView&record=<?php echo $this->_tpl_vars['data'][$this->_tpl_vars['key3']]['recordid']; ?>
&parenttab=<?php echo $this->_tpl_vars['CATEGORY']; ?>
" target ="blank"><?php echo $this->_tpl_vars['newdata2']; ?>
</a>
<?php else: ?>
<?php if ($this->_tpl_vars['key'] == 'Entity Type'): ?>
<?php if ($this->_tpl_vars['newdata2'] == 0 && $this->_tpl_vars['newdata2'] != NULL): ?>
<?php if ($this->_tpl_vars['VIEW'] == true): ?>
<?php echo $this->_tpl_vars['APP']['LBL_LAST_IMPORTED']; ?>
<?php else: ?>
<?php echo $this->_tpl_vars['APP']['LBL_NOW_IMPORTED']; ?>
<?php endif; ?>
<?php else: ?>
<?php echo $this->_tpl_vars['APP']['LBL_EXISTING']; ?>
<?php endif; ?>
<?php else: ?>
<?php echo $this->_tpl_vars['newdata2']; ?>
<?php endif; ?>
<?php endif; ?>
</td>
<?php endforeach; endif; unset($_from); ?>
<td cellpadding="3" nowrap width="80px">
<input name="<?php echo $this->_tpl_vars['key1']; ?>
" id="<?php echo $this->_tpl_vars['key1']; ?>
" value="<?php echo $this->_tpl_vars['data'][$this->_tpl_vars['key3']]['recordid']; ?>
" type="checkbox">
</td>
<?php if ($this->_tpl_vars['cnt2'] == 0): ?>
<td align="center" rowspan='<?php echo $this->_tpl_vars['cnt']; ?>
'><input class="crmbutton small edit" name="merge" value="<?php echo $this->_tpl_vars['APP']['LBL_MERGE']; ?>
" onclick="merge_fields('<?php echo $this->_tpl_vars['key1']; ?>
','<?php echo $this->_tpl_vars['MODULE']; ?>
','<?php echo $this->_tpl_vars['CATEGORY']; ?>
');" type="button"></td>
<?php endif; ?>
<?php $this->assign('cnt2', $this->_tpl_vars['cnt2']+1); ?>
</tr>
<?php endforeach; endif; unset($_from); ?>
<?php endforeach; endif; unset($_from); ?>
</table>
<div name="group_count" id="group_count" style="display :none">
<?php echo $this->_tpl_vars['NUM_GROUP']; ?>
</div>
oss/vtiger/trunk/Smarty/templates_c/%%D2^D23^D2308305%%UnifiedSearchModules.tpl.php
+57
View File
@@ -0,0 +1,57 @@
<?php /* Smarty version 2.6.18, created on 2010-07-13 03:58:46
compiled from UnifiedSearchModules.tpl */ ?>
<?php require_once(SMARTY_CORE_DIR . 'core.load_plugins.php');
smarty_core_load_plugins(array('plugins' => array(array('modifier', 'vtiger_imageurl', 'UnifiedSearchModules.tpl', 21, false),)), $this); ?>
<form id="UnifiedSearch_moduleform" name="UnifiedSearch_moduleform">
<table width="90%" cellspacing="0" cellpadding="0" border="0" align="center" class="mailClient mailClientBg">
<tr>
<td>
<table width="100%" cellspacing="0" cellpadding="0" border="0" class="small">
<tr>
<td height="30px" background="<?php echo vtiger_imageurl('qcBg.gif', $this->_tpl_vars['THEME']); ?>
" class="mailSubHeader"><b><?php echo $this->_tpl_vars['APP']['LBL_SELECT_MODULES_FOR_SEARCH']; ?>
</b></td>
<td align=right background="<?php echo vtiger_imageurl('qcBg.gif', $this->_tpl_vars['THEME']); ?>
" class="mailSubHeader">
<a href='javascript:void(0);' onclick="UnifiedSearch_SelectModuleToggle(true);"><?php echo $this->_tpl_vars['APP']['LBL_SELECT_ALL']; ?>
</a> |
<a href='javascript:void(0);' onclick="UnifiedSearch_SelectModuleToggle(false);"><?php echo $this->_tpl_vars['APP']['LBL_UNSELECT_ALL']; ?>
</a>
<a href='javascript:void(0)' onclick="UnifiedSearch_SelectModuleCancel();"><img src="<?php echo vtiger_imageurl('close.gif', $this->_tpl_vars['THEME']); ?>
" border=0></a>
</td>
</tr>
</table>
<table width="100%" cellspacing="0" cellpadding="5" border="0" class="small">
<?php $_from = $this->_tpl_vars['ALLOWED_MODULES']; if (!is_array($_from) && !is_object($_from)) { settype($_from, 'array'); }$this->_foreach['allowed_modulesloop'] = array('total' => count($_from), 'iteration' => 0);
if ($this->_foreach['allowed_modulesloop']['total'] > 0):
foreach ($_from as $this->_tpl_vars['SEARCH_MODULENAME'] => $this->_tpl_vars['SEARCH_MODULEINFO']):
$this->_foreach['allowed_modulesloop']['iteration']++;
?>
<?php if (($this->_foreach['allowed_modulesloop']['iteration']-1) % 3 == 0): ?>
<tr valign=top>
<?php endif; ?>
<td class="dvtCellLabel"><input type='checkbox' name='search_onlyin' class='small' value='<?php echo $this->_tpl_vars['SEARCH_MODULENAME']; ?>
'
<?php if ($this->_tpl_vars['SEARCH_MODULEINFO']['selected']): ?>checked=true<?php endif; ?>><?php echo $this->_tpl_vars['SEARCH_MODULEINFO']['label']; ?>
</td>
<?php if (($this->_foreach['allowed_modulesloop']['iteration']-1) % 3 == 2): ?>
</tr>
<?php endif; ?>
<?php endforeach; endif; unset($_from); ?>
</table>
</td>
</tr>
<tr>
<td align="right" height="30px" class="mailSubHeader">
<input type='button' class='crmbutton small cancel' value='<?php echo $this->_tpl_vars['APP']['LBL_CANCEL_BUTTON_LABEL']; ?>
' onclick='UnifiedSearch_SelectModuleCancel();'>
<input type='button' class='crmbutton small create' value='<?php echo $this->_tpl_vars['APP']['LBL_APPLY_BUTTON_LABEL']; ?>
' onclick='UnifiedSearch_SelectModuleSave();'>
</td>
</tr>
</table>
</form>
oss/vtiger/trunk/cache/513d62bd4346d3dc095da948ef81b9a1
Vendored
-307
View File
File diff suppressed because it is too large Load Diff
oss/vtiger/trunk/cache/images/656574030_outcome_by_month_zh_cn_957285009.png
Vendored
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 14 KiB

oss/vtiger/trunk/cache/images/656574030_outcome_by_month_zh_cn_957285009.png.map
Vendored
+7
View File
@@ -0,0 +1,7 @@
<img src="cache/images/656574030_outcome_by_month_zh_cn_957285009.png" border="0" usemap="#cache/images/656574030_outcome_by_month_zh_cn_957285009.png">
<map name="cache/images/656574030_outcome_by_month_zh_cn_957285009.png">
<area shape="rect" coords="72,61,160,438" href="index.php?module=Potentials&action=ListView&date_closed=2006-03&sales_stage=%E5%85%B6%E5%AE%83&query=true&type=dbrd&owner=admin&viewname=10" alt="admin - 2 该潜在案件的处理结果 其它" title="admin - 2 该潜在案件的处理结果 其它">
<area shape="rect" coords="264,61,352,438" href="index.php?module=Potentials&action=ListView&date_closed=2006-06&sales_stage=%E5%85%B6%E5%AE%83&query=true&type=dbrd&owner=admin&viewname=10" alt="admin - 3 该潜在案件的处理结果 其它" title="admin - 3 该潜在案件的处理结果 其它">
<area shape="rect" coords="457,118,545,438" href="index.php?module=Potentials&action=ListView&date_closed=2006-07&sales_stage=%E5%85%B6%E5%AE%83&query=true&type=dbrd&owner=admin&viewname=10" alt="admin - 2 该潜在案件的处理结果 其它" title="admin - 2 该潜在案件的处理结果 其它">
<area shape="rect" coords="649,344,737,438" href="index.php?module=Potentials&action=ListView&date_closed=2006-09&sales_stage=%E5%85%B6%E5%AE%83&query=true&type=dbrd&owner=admin&viewname=10" alt="admin - 1 该潜在案件的处理结果 其它" title="admin - 1 该潜在案件的处理结果 其它">
</map>
oss/vtiger/trunk/cache/images/656574030_pipeline_zh_cn_11401618562001-01-012100-01-01.png
Vendored
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

oss/vtiger/trunk/cache/images/656574030_pipeline_zh_cn_11401618562001-01-012100-01-01.png.map
Vendored
+7
View File
@@ -0,0 +1,7 @@
<img src="cache/images/656574030_pipeline_zh_cn_11401618562001-01-012100-01-01.png" border="0" usemap="#cache/images/656574030_pipeline_zh_cn_11401618562001-01-012100-01-01.png">
<map name="cache/images/656574030_pipeline_zh_cn_11401618562001-01-012100-01-01.png">
<area shape="rect" coords="81,39,115,69" href="index.php?module=Potentials&action=ListView&sales_stage=Prospecting&closingdate_start=2001-01-01&closingdate_end=2100-01-01&query=true&type=dbrd&owner=admin&viewname=10" alt="admin - 1 潜在案件的客服场地 勘察" title="admin - 1 潜在案件的客服场地 勘察">
<area shape="rect" coords="81,79,167,109" href="index.php?module=Potentials&action=ListView&sales_stage=Qualification&closingdate_start=2001-01-01&closingdate_end=2100-01-01&query=true&type=dbrd&owner=admin&viewname=10" alt="admin - 1 潜在案件的客服场地 资格" title="admin - 1 潜在案件的客服场地 资格">
<area shape="rect" coords="81,158,339,188" href="index.php?module=Potentials&action=ListView&sales_stage=Value+Proposition&closingdate_start=2001-01-01&closingdate_end=2100-01-01&query=true&type=dbrd&owner=admin&viewname=10" alt="admin - 1 潜在案件的客服场地 已提价" title="admin - 1 潜在案件的客服场地 已提价">
<area shape="rect" coords="81,197,771,227" href="index.php?module=Potentials&action=ListView&sales_stage=Id.+Decision+Makers&closingdate_start=2001-01-01&closingdate_end=2100-01-01&query=true&type=dbrd&owner=admin&viewname=10" alt="admin - 5 潜在案件的客服场地 Id. 决策者" title="admin - 5 潜在案件的客服场地 Id. 决策者">
</map>
oss/vtiger/trunk/cache/images/vert_
Vendored
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 6.2 KiB

oss/vtiger/trunk/cache/images/vert_.map
Vendored
+3 -1
View File
@@ -1,4 +1,6 @@
<img src="cache/images/vert_" border="0" usemap="#cache/images/vert_">
<map name="cache/images/vert_">
<area shape="rect" coords="166,126,416,180" href="index.php?module=Calendar&action=ListView&from_homepagedb=true&type=dbrd&query=true&owner=huyucheng&viewname=19" alt="&aelig;—&yen;&ccedil;&uml;‹&aring;&reg;‰&aelig;Ž’=%d" title="&aelig;—&yen;&ccedil;&uml;‹&aring;&reg;‰&aelig;Ž’=%d">
<area shape="rect" coords="78,119,156,169" href="index.php?module=Accounts&action=ListView&from_homepagedb=true&type=dbrd&query=true&owner=huyucheng&viewname=4" alt="客户=%d" title="客户=%d">
<area shape="rect" coords="251,119,329,169" href="index.php?module=Contacts&action=ListView&from_homepagedb=true&type=dbrd&query=true&owner=huyucheng&viewname=7" alt="联系人=%d" title="联系人=%d">
<area shape="rect" coords="424,119,502,169" href="index.php?module=Calendar&action=ListView&from_homepagedb=true&type=dbrd&query=true&owner=huyucheng&viewname=19" alt="日程安排=%d" title="日程安排=%d">
</map>
oss/vtiger/trunk/cache/index.html
Vendored
-1
View File
@@ -1 +0,0 @@
This directory must be writable by the webserver user.
oss/vtiger/trunk/config.performance.php
+1 -1
View File
@@ -10,7 +10,7 @@
/* Performance paramters can be configured to fine tune vtiger CRM runtime */
$PERFORMANCE_CONFIG = Array(
// Enable log4php debugging only if requried
'LOG4PHP_DEBUG' => false,
'LOG4PHP_DEBUG' => true,
// Should the caller information be captured in SQL Logging?
// It adds little overhead for performance but will be useful to debug
oss/vtiger/trunk/include/utils/GraphUtils.php
+3 -2
View File
@@ -18,6 +18,7 @@ DEFINE("FF_COMIC",'Comic');
DEFINE("FF_ARIAL",'Arial');
DEFINE("FF_GEORGIA",'Georgia');
DEFINE("FF_TREBUCHE",'Trebuc');
DEFINE("FF_DROIDSANSFALLBACK",'Droid Sans Fallback');
// Chinese font
DEFINE("FF_SIMSUN",'Simsun');
@@ -38,9 +39,9 @@ function calculate_font_name($locale)
switch($locale)
{
case 'cn_zh':
case 'zh_cn':
$log->debug("Exiting calculate_font_name method ...");
return FF_SIMSUN;
return FF_DROIDSANSFALLBACK;
case 'tw_zh':
if(!function_exists('iconv')){
echo " Unable to display traditional Chinese on the graphs.<BR>The function iconv does not exists please read more about <a href='http://us4.php.net/iconv'>iconv here</a><BR>";
oss/vtiger/trunk/log4php.properties
+1 -1
View File
@@ -52,7 +52,7 @@ log4php.appender.A6.layout.ContextPrinting="true"
log4php.appender.A6.layout.DateFormat="%c"
log4php.appender.A6.File=logs/platform.log
log4php.logger.SQLTIME=INFO,A7
log4php.logger.SQLTIME=DEBUG,A7
log4php.appender.A7=LoggerAppenderRollingFile
log4php.appender.A7.MaxFileSize=3MB
log4php.appender.A7.MaxBackupIndex=10
oss/vtiger/trunk/logs/Copy of vtigercrm.log
+409
View File
File diff suppressed because it is too large Load Diff
oss/vtiger/trunk/logs/installation.log
View File
oss/vtiger/trunk/logs/migration.log
View File
oss/vtiger/trunk/logs/platform.log
View File
oss/vtiger/trunk/logs/security.log
View File
oss/vtiger/trunk/logs/soap.log
View File
oss/vtiger/trunk/logs/sqltime.log
+8729
View File
File diff suppressed because it is too large Load Diff
oss/vtiger/trunk/logs/sqltime.log.1
+25697
View File
File diff suppressed because one or more lines are too long

Some files were not shown because too many files have changed in this diff Show More