Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • vtiger/vtigercrm
  • varma/vtigercrm
  • alanbell/vtigercrm
  • mariusz.krzaczkowski/vtigercrm
  • manu.k/vtigercrm
  • adrgranado/vtigercrm
  • uma.s/vtigercrm
  • sardoj/vtigercrm
  • preexo/vtigercrm
  • david.valminos/vtigercrm
  • luca.saba/vtigercrm
  • dubwise/vtigercrm
  • valmir.ttcasolucoes/vtigercrm
  • lord_alan/vtigercrm
  • adrien.futschik/vtigercrm
  • edonit.rexhepi/vtigercrm
  • robert.heinze/vtigercrm
  • nrdimatteo/vtigercrm
  • sebastianzahan/vtigercrm
  • Miky/vtigercrm
  • germanf/vtigercrm
  • bernhardkau1/vtigercrm
  • olegtsoy/vtigercrm
  • grandel/vtigercrm
  • mario.thummler/vtigercrm
  • sutharsan/vtigercrm
  • james.douglas/vtigercrm
  • vikas/vtigercrm
  • jeffmchristensen/vtigercrm
  • lukasz.g/vtigercrm
  • nicolas.gasnier/vtigercrm
  • hamish.theitcompany/vtigercrm
  • engrbm87/vtigercrm
  • Quoc/vtigercrm
  • peter.maria.engeli/vtigercrm
  • kiranraju.j/vtigercrm
  • manuel.lozano/vtigercrm
  • dhaupin/vtigercrm
  • Ragupathyranesh/vtigercrm
  • Stefanbauer/vtigercrm
  • ruben.estrada/vtigercrm
  • sg_mwi1/vtigercrm
  • khaluk/vtigercrm
  • franzfroemel/vtigercrm
  • milan9615/vtigercrm
  • carlos.martin/vtigercrm
  • cmaggi/vtigercrm
  • Soltoon.theLeader/vtigercrm
  • alex.kaplun/vtigercrm
  • navid.hosseini/vtigercrm
  • maie/vtigercrm
  • simonetravaglini/vtigercrm
  • bertrand.wattel/vtigercrm
  • balaji.m/vtigercrm
  • mclarke4/vtigercrm
  • lajeeshk/vtigercrm
  • liam/vtigercrm
  • novikov.sergey/vtigercrm
  • johnwayne.williamson/vtigercrm
  • florian.strahberger-schramm/vtigercrm
  • daniel.schaefer/vtigercrm
  • christopher.gunther/vtigercrm
  • adrien.faveraux/vtigercrm
  • carsten.brandt/vtigercrm
  • stephane.molano/vtigercrm
  • krastan.petrov/vtigercrm
  • alfredo.bravo/vtigercrm
  • flipflop.Joe/vtigercrm
  • mirko.stagni/vtigercrm
  • remigio.ruberto/vtigercrm
  • gautam.dhudashiya/vtigercrm
  • manish.devitechnosolutions1/vtigercrm
  • matinbeigi/vtigercrm
  • devs/vtigercrm
  • happy.dev/vtigercrm
  • m.gigon/vtigercrm
  • manuelmigone/vtigercrm
  • eduardo.gqf/vtigercrm
  • elsayedEl-araby/vtigercrm
  • mirza.mehran/vtigercrm
  • maurice.courtois/vtigercrm
  • zuhri.utama/vtigercrm
  • shilpa.k/vtigercrm
  • Ignazio/vtigercrm
  • code80team/vtigercrm
  • code80/vtigercrm
  • nilay.automatesmb/cache
  • greeshma.kk/vtigercrm
  • vijay.tilak/vtigercrm
  • Paolo.Palamini/vtigercrm
  • estevan/vtigercrm
  • mobilcmcdk/vtigercrm
  • massimiliano.vessi/vtigercrm
  • daniel.voelskow/vtigercrm
  • james1/vtigercrm
  • lokesh.s/vtigercrm
  • rdb/vtigercrm
  • neftaliyagua/vtigercrm
  • angelo.paglialonga/vtigercrm
  • webmarka/vtigercrm
  • javanile/vtigercrm
  • akshath/vtigercrm
  • Hemanth/vtigercrm
  • opencrmitalia/vtigercrm
  • direzione/vtigercrm
  • umadas306/vtigercrm
  • jd-wraptec/vtigercrm
  • felipe.camacho/vtigercrm
  • Martin.allen/vtigercrm
  • amit.r/vtigercrm
  • vicus/vtigercrm
  • dev.osmi/vtigercrm
  • laurent.guillout/vtigercrm
  • christian.blaeul/vtigercrm
  • ap.js100/vtigercrm
  • yoann.mourot/vtigercrm-temp
  • christian.cruz/vtigercrm
  • zyli/vtigercrm
  • kaushik.p/vtigercrm
  • Madhuk/vtigercrm
  • cinakzm/vtigercrm
  • raquel.martinez/vtigercrm
  • tosajibadhi/vtigercrm
  • melvin.i/vtigercrm-melvin
  • ashashingadia/vtigercrm
  • stefanwarnat/vtigercrm
  • saran.s/vtigercrm
  • eduardomozart/vtigercrm
  • Daniel.Lennartz1/vtigercrm
  • juergen.fassmann/vtigercrm
  • Michel.Ram/vtigercrm
  • vincenzo.bruno/vtigercrm
132 results
Show changes
Hide whitespace changes
Inline Side-by-side
Showing
with 69 additions and 50 deletions
layouts/v7/modules/Leads/ConvertLead.tpl
View file @ e43131dd
......@@ -20,7 +20,7 @@
<input type="hidden" name="view" value="SaveConvertLead"/>
<input type="hidden" name="record" value="{$RECORD->getId()}"/>
<input type="hidden" name="modules" value=''/>
<input type="hidden" name="imageAttachmentId" value="{$IMAGE_ATTACHMENT_ID}">
<input type="hidden" name="imageAttachmentId" value="{if isset($IMAGE_ATTACHMENT_ID)}{$IMAGE_ATTACHMENT_ID}{/if}" />
{assign var=LEAD_COMPANY_NAME value=$RECORD->get('company')}
<div class="modal-body accordion container-fluid" id="leadAccordion">
{foreach item=MODULE_FIELD_MODEL key=MODULE_NAME from=$CONVERT_LEAD_FIELDS}
......
layouts/v7/modules/Mobile/simple/Header.tpl
View file @ e43131dd
......@@ -18,7 +18,7 @@
<!--link rel="stylesheet" href="https://fonts.googleapis.com/css?family=RobotoDraft:300,400,500,700,400italic"-->
{* Include desired styles injected *}
{if $_styles}
{if isset($_styles) && $_styles}
{foreach item=_style from=$_styles}
<link type="text/css" rel="stylesheet" href="../../{$TEMPLATE_WEBPATH}/{$_style}">
{/foreach}
......
layouts/v7/modules/Portal/EditView.tpl
View file @ e43131dd
......@@ -13,10 +13,10 @@
<div class="modal-dialog">
<div class="modal-content">
<form class="form-horizontal" id="saveBookmark" method="POST" action="index.php">
<input type="hidden" name="record" value="{$RECORD}" />
<input type="hidden" name="record" value="{(isset($RECORD)) ? $RECORD : ''}" />
<input type="hidden" name="module" value="{$MODULE}" />
<input type="hidden" name="action" value="SaveAjax" />
{if $RECORD}
{if isset($RECORD) && $RECORD}
{assign var="TITLE" value= {vtranslate('LBL_EDIT_BOOKMARK', $MODULE)}}
{else}
{assign var="TITLE" value={vtranslate('LBL_ADD_NEW_BOOKMARK', $MODULE)}}
......@@ -29,7 +29,7 @@
<label class="pull-right">{vtranslate('LBL_BOOKMARK_NAME', $MODULE)}&nbsp;<span class="redColor">*</span></label>
</div>
<div class="col-lg-5">
<input type="text" name="bookmarkName" id="bookmarkName" class="col-lg-6 inputElement" {if $RECORD} value="{$BOOKMARK_NAME}" {/if} placeholder="{vtranslate('LBL_ENTER_BOOKMARK_NAME', $MODULE)}" data-rule-required="true"/>
<input type="text" name="bookmarkName" id="bookmarkName" class="col-lg-6 inputElement" {if isset($RECORD)} value="{$BOOKMARK_NAME}" {else} value="" {/if} placeholder="{vtranslate('LBL_ENTER_BOOKMARK_NAME', $MODULE)}" data-rule-required="true"/>
</div>
<div class="col-lg-2"></div>
</div>
......@@ -40,7 +40,7 @@
<label class="pull-right">{vtranslate('LBL_BOOKMARK_URL', $MODULE)}&nbsp;<span class="redColor">*</span></label>
</div>
<div class="col-lg-5">
<input type="text" class="inputElement" name="bookmarkUrl" id="bookmarkUrl" {if $RECORD} value="{$BOOKMARK_URL}" {/if} placeholder="{vtranslate('LBL_ENTER_URL', $MODULE)}" data-rule-required="true" data-rule-url="true"/>
<input type="text" class="inputElement" name="bookmarkUrl" id="bookmarkUrl" {if isset($RECORD)} value="{$BOOKMARK_URL}" {else} value="" {/if} placeholder="{vtranslate('LBL_ENTER_URL', $MODULE)}" data-rule-required="true" data-rule-url="true"/>
</div>
<div class="col-lg-2"></div>
</div>
......
layouts/v7/modules/Portal/ListViewContents.tpl
View file @ e43131dd
......@@ -122,7 +122,10 @@
{/foreach}
{if $PAGING_INFO['recordCount'] eq '0'}
<tr class="emptyRecordsDiv">
{assign var=COLSPAN_WIDTH value={php7_count($LISTVIEW_HEADERS)}+1}
{assign var=COLSPAN_WIDTH value=1}
{if isset($LISTVIEW_HEADERS)}
{assign var=COLSPAN_WIDTH value=php7_count($LISTVIEW_HEADERS)+1}
{/if}
<td colspan="{$COLSPAN_WIDTH}">
<div class="emptyRecordsContent">
{assign var=SINGLE_MODULE value="SINGLE_$MODULE"}
......
layouts/v7/modules/Portal/ModuleHeader.tpl
View file @ e43131dd
......@@ -25,7 +25,7 @@
<span>
<p class="current-filter-name pull-left">&nbsp;<span class="fa fa-angle-right" aria-hidden="true"></span>&nbsp;{$VIEW}&nbsp;</p>
</span>
{if $VIEWID}
{if isset($VIEWID) && $VIEWID}
{foreach item=FILTER_TYPES from=$CUSTOM_VIEWS}
{foreach item=FILTERS from=$FILTER_TYPES}
{if $FILTERS->get('cvid') eq $VIEWID}
......
layouts/v7/modules/Reports/ChartEditStep2.tpl
View file @ e43131dd
......@@ -39,7 +39,7 @@
{foreach key=BLOCK_LABEL item=BLOCK_FIELDS from=$PRIMARY_MODULE_RECORD_STRUCTURE}
{assign var=PRIMARY_MODULE_BLOCK_LABEL value=vtranslate($BLOCK_LABEL, $PRIMARY_MODULE)}
{assign var=key value="$PRIMARY_MODULE_LABEL $PRIMARY_MODULE_BLOCK_LABEL"}
{if $LINEITEM_FIELD_IN_CALCULATION eq false && $BLOCK_LABEL eq 'LBL_ITEM_DETAILS'}
{if isset($LINEITEM_FIELD_IN_CALCULATION) && $LINEITEM_FIELD_IN_CALCULATION eq false && $BLOCK_LABEL eq 'LBL_ITEM_DETAILS'}
{* dont show the line item fields block when Inventory fields are selected for calculations *}
{else}
{$RECORD_STRUCTURE[$key] = $BLOCK_FIELDS}
......@@ -58,6 +58,9 @@
<h4><strong>{vtranslate('LBL_CHOOSE_FILTER_CONDITIONS',$MODULE)}</strong></h4>
<br>
<span class="col-lg-12">
{if !isset($SELECTED_ADVANCED_FILTER_FIELDS)}
{assign var="SELECTED_ADVANCED_FILTER_FIELDS" value=array()}
{/if}
{include file='AdvanceFilter.tpl'|@vtemplate_path RECORD_STRUCTURE=$RECORD_STRUCTURE ADVANCE_CRITERIA=$SELECTED_ADVANCED_FILTER_FIELDS COLUMNNAME_API=getReportFilterColumnName}
</span>
</div>
......
layouts/v7/modules/Reports/ChartReportContents.tpl
View file @ e43131dd
......@@ -9,7 +9,7 @@
<input type='hidden' name='charttype' value="{$CHART_TYPE}" />
<input type='hidden' name='data' value='{Vtiger_Functions::jsonEncode($DATA)}' />
<input type='hidden' name='clickthrough' value="{$CLICK_THROUGH}" />
<input type='hidden' name='clickthrough' value="{if isset($CLICK_THROUGH)}{$CLICK_THROUGH}{/if}" />
<br>
<div class="dashboardWidgetContent">
......@@ -17,10 +17,9 @@
<div class='border1px filterConditionContainer' style="padding:30px;">
<div id='chartcontent' name='chartcontent' style="min-height:500px overflowY:'auto';" data-mode='Reports'></div>
<br>
{if $CLICK_THROUGH neq 'true'}
{if !isset($CLICK_THROUGH) || $CLICK_THROUGH neq 'true'}
<div class='row-fluid alert-info'>
<span class='col-lg-4 offset4'> &nbsp;</span>
<span class='span alert-info'>
<span class='span alert-info' style="padding:10px;text-align:center">
<i class="icon-info-sign"></i>
{vtranslate('LBL_CLICK_THROUGH_NOT_AVAILABLE', $MODULE)}
</span>
......
layouts/v7/modules/Reports/ChartReportHeader.tpl
View file @ e43131dd
......@@ -21,7 +21,7 @@
<input type="hidden" name="reports_description" value="{$REPORT_MODEL->get('reports_description')}" />
<input type="hidden" name="primary_module" value="{$PRIMARY_MODULE}" />
<input type="hidden" name="secondary_modules" value={ZEND_JSON::encode($SECONDARY_MODULES)} />
<input type="hidden" name="advanced_filter" id="advanced_filter" value={ZEND_JSON::encode($ADVANCED_FILTERS)} />
<input type="hidden" name="advanced_filter" id="advanced_filter" value={if isset($ADVANCED_FILTERS)}{ZEND_JSON::encode($ADVANCED_FILTERS)}{else}''{/if} />
<input type="hidden" name='groupbyfield' value={$CHART_MODEL->getGroupByField()} />
<input type="hidden" name='datafields' value={Zend_JSON::encode($CHART_MODEL->getDataFields())} />
<input type="hidden" name='charttype' value="{$CHART_MODEL->getChartType()}" />
......@@ -31,7 +31,7 @@
{foreach key=BLOCK_LABEL item=BLOCK_FIELDS from=$PRIMARY_MODULE_RECORD_STRUCTURE}
{assign var=PRIMARY_MODULE_BLOCK_LABEL value=vtranslate($BLOCK_LABEL, $PRIMARY_MODULE)}
{assign var=key value="$PRIMARY_MODULE_LABEL $PRIMARY_MODULE_BLOCK_LABEL"}
{if $LINEITEM_FIELD_IN_CALCULATION eq false && $BLOCK_LABEL eq 'LBL_ITEM_DETAILS'}
{if isset($LINEITEM_FIELD_IN_CALCULATION) && $LINEITEM_FIELD_IN_CALCULATION eq false && $BLOCK_LABEL eq 'LBL_ITEM_DETAILS'}
{* dont show the line item fields block when Inventory fields are selected for calculations *}
{else}
{$RECORD_STRUCTURE[$key] = $BLOCK_FIELDS}
......
layouts/v7/modules/Reports/DetailViewActions.tpl
View file @ e43131dd
......@@ -71,12 +71,14 @@
<span class="pull-right">
<div class="btn-toolbar">
<div class="btn-group">
{if isset($DETAILVIEW_LINKS) && $DETAILVIEW_LINKS}
{foreach item=DETAILVIEW_LINK from=$DETAILVIEW_LINKS}
{assign var=LINKNAME value=$DETAILVIEW_LINK->getLabel()}
<button class="btn btn-default reportActions" name="{$LINKNAME}" data-href="{$DETAILVIEW_LINK->getUrl()}&source={$REPORT_MODEL->getReportType()}">
{$LINKNAME}
</button>
{/foreach}
{/if}
</div>
</div>
</span>
......
layouts/v7/modules/Reports/ListViewContents.tpl
View file @ e43131dd
......@@ -14,7 +14,7 @@
<span class="essentials-toggle-marker fa {if $LEFTPANELHIDE eq '1'}fa-chevron-right{else}fa-chevron-left{/if} cursorPointer"></span>
</div>
<input type="hidden" name="view" id="view" value="{$VIEW}" />
<input type="hidden" name="cvid" value="{$VIEWID}" />
<input type="hidden" name="cvid" value="{(isset($VIEWID)) ? $VIEWID : ''}" />
<input type="hidden" name="pageStartRange" id="pageStartRange" value="{$PAGING_MODEL->getRecordStartRange()}" />
<input type="hidden" name="pageEndRange" id="pageEndRange" value="{$PAGING_MODEL->getRecordEndRange()}" />
<input type="hidden" name="previousPageExist" id="previousPageExist" value="{$PAGING_MODEL->isPrevPageExists()}" />
......@@ -25,11 +25,11 @@
<input type='hidden' name="pageLimit" value="{$PAGING_MODEL->getPageLimit()}" id='pageLimit'>
<input type="hidden" name="noOfEntries" value="{$LISTVIEW_ENTRIES_COUNT}" id="noOfEntries">
<input type="hidden" name="currentSearchParams" value="{Vtiger_Util_Helper::toSafeHTML(Zend_JSON::encode($SEARCH_DETAILS))}" id="currentSearchParams" />
<input type="hidden" name="noFilterCache" value="{$NO_SEARCH_PARAMS_CACHE}" id="noFilterCache" >
<input type="hidden" name="noFilterCache" value="{(isset($NO_SEARCH_PARAMS_CACHE)) ? $NO_SEARCH_PARAMS_CACHE : ''}" id="noFilterCache" >
<input type="hidden" name="orderBy" value="{$ORDER_BY}" id="orderBy">
<input type="hidden" name="sortOrder" value="{$SORT_ORDER}" id="sortOrder">
<input type="hidden" name="list_headers" value='{$LIST_HEADER_FIELDS}'/>
<input type="hidden" name="tag" value="{$CURRENT_TAG}" />
<input type="hidden" name="list_headers" value='{(isset($LIST_HEADER_FIELDS)) ? $LIST_HEADER_FIELDS : ''}'/>
<input type="hidden" name="tag" value="{(isset($CURRENT_TAG)) ? $CURRENT_TAG : ''}" />
<input type="hidden" name="folder_id" value="{$FOLDER_ID}" />
<input type="hidden" name="folder_value" value="{$FOLDER_VALUE}" />
<input type="hidden" name="folder" value="{$VIEWNAME}" />
......@@ -88,13 +88,13 @@
{assign var="DATA_TYPE" value=$LISTVIEW_HEADER['type']}
{if $DATA_TYPE == 'string'}
<div class="row-fluid">
<input type="text" name="{$LISTVIEW_HEADER_KEY}" class="listSearchContributor inputElement" value="{$SEARCH_DETAILS[$LISTVIEW_HEADER_KEY]['searchValue']}" data-fieldinfo='{$FIELD_INFO|escape}'/>
<input type="text" name="{$LISTVIEW_HEADER_KEY}" class="listSearchContributor inputElement" value="{(isset($SEARCH_DETAILS[$LISTVIEW_HEADER_KEY]['searchValue'])) ? $SEARCH_DETAILS[$LISTVIEW_HEADER_KEY]['searchValue'] : ''}" data-fieldinfo='{if isset($FIELD_INFO)}{$FIELD_INFO|escape}{/if}'/>
</div>
{elseif $DATA_TYPE == 'picklist'}
{assign var=PICKLIST_VALUES value=Reports_Field_Model::getPicklistValueByField($LISTVIEW_HEADER_KEY)}
{assign var=SEARCH_VALUES value=explode(',',$SEARCH_DETAILS[$LISTVIEW_HEADER_KEY]['searchValue'])}
{assign var=SEARCH_VALUES value=explode(',',(isset($SEARCH_INFO['searchValue'])) ? $SEARCH_INFO['searchValue'] : ',')}
<div class="row-fluid">
<select class="select2 listSearchContributor report-type-select" name="{$LISTVIEW_HEADER_KEY}" multiple data-fieldinfo='{$FIELD_INFO|escape}'>
<select class="select2 listSearchContributor report-type-select" name="{$LISTVIEW_HEADER_KEY}" multiple data-fieldinfo='{if isset($FIELD_INFO)}{$FIELD_INFO|escape}{/if}'>
{foreach item=PICKLIST_LABEL key=PICKLIST_KEY from=$PICKLIST_VALUES}
{if $PICKLIST_LABEL eq 'Chart'}
{assign var="ICON_CLASS" value='fa fa-pie-chart'}
......@@ -106,7 +106,7 @@
</select>
</div>
{/if}
<input type="hidden" class="operatorValue" value="{$SEARCH_DETAILS[$LISTVIEW_HEADER_KEY]['comparator']}">
<input type="hidden" class="operatorValue" value="{(isset($SEARCH_DETAILS[$LISTVIEW_HEADER_KEY]['comparator'])) ? $SEARCH_DETAILS[$LISTVIEW_HEADER_KEY]['comparator'] : ''}">
</th>
{/foreach}
</tr>
......@@ -125,7 +125,7 @@
<td class="listViewEntryValue" data-name="{$LISTVIEW_HEADERNAME}" title="{$LISTVIEW_ENTRY_RAWVALUE}" data-rawvalue="{$LISTVIEW_ENTRY_RAWVALUE}" data-field-type="">
<span class="fieldValue">
<span class="value textOverflowEllipsis">
{if $LISTVIEW_HEADERNAME eq 'reporttype'}
{if isset($LISTVIEW_HEADERNAME) && $LISTVIEW_HEADERNAME eq 'reporttype'}
{if $LISTVIEW_ENTRY_VALUE eq 'summary' || $LISTVIEW_ENTRY_VALUE eq 'tabular'}
<center title="{vtranslate('LBL_DETAIL_REPORT', $MODULE)}"><span class='vicon-detailreport' style="font-size:17px;"></span></center>
{elseif $LISTVIEW_ENTRY_VALUE eq 'chart'}
......@@ -152,7 +152,7 @@
<div class="emptyRecordsDiv">
<div class="emptyRecordsContent">
{assign var=SINGLE_MODULE value="SINGLE_$MODULE"}
{vtranslate('LBL_NO')} {vtranslate($MODULE, $MODULE)} {vtranslate('LBL_FOUND')}.{if $IS_MODULE_EDITABLE} <a href="{$MODULE_MODEL->getCreateRecordUrl()}"> {vtranslate('LBL_CREATE')} </a> {if Users_Privileges_Model::isPermitted($MODULE, 'Import') && $LIST_VIEW_MODEL->isImportEnabled()} {vtranslate('LBL_OR', $MODULE)} <a style="color:blue" href="#" onclick="return Vtiger_Import_Js.triggerImportAction()"> {vtranslate('LBL_IMPORT', $MODULE)} </a>{vtranslate($MODULE, $MODULE)}{else}{vtranslate($SINGLE_MODULE, $MODULE)}{/if}{/if}
{vtranslate('LBL_NO')} {vtranslate($MODULE, $MODULE)} {vtranslate('LBL_FOUND')}.{if isset($IS_MODULE_EDITABLE) && $IS_MODULE_EDITABLE} <a href="{$MODULE_MODEL->getCreateRecordUrl()}"> {vtranslate('LBL_CREATE')} </a> {if Users_Privileges_Model::isPermitted($MODULE, 'Import') && $LIST_VIEW_MODEL->isImportEnabled()} {vtranslate('LBL_OR', $MODULE)} <a style="color:blue" href="#" onclick="return Vtiger_Import_Js.triggerImportAction()"> {vtranslate('LBL_IMPORT', $MODULE)} </a>{vtranslate($MODULE, $MODULE)}{else}{vtranslate($SINGLE_MODULE, $MODULE)}{/if}{/if}
</div>
</div>
</td>
......
layouts/v7/modules/Reports/ModuleHeader.tpl
View file @ e43131dd
......@@ -36,7 +36,7 @@
&nbsp;
</p>
</span>
{if $VIEWNAME}
{if isset($VIEWNAME) && $VIEWNAME}
{if $VIEWNAME neq 'All'}
{foreach item=FOLDER from=$FOLDERS}
{if $FOLDER->getId() eq $VIEWNAME}
......@@ -48,13 +48,14 @@
{assign var=FOLDERNAME value=vtranslate('LBL_ALL_REPORTS', $MODULE)}
{/if}
<span>
<p class="current-filter-name filter-name pull-left"><span class="fa fa-angle-right" aria-hidden="true"></span>&nbsp;{$FOLDERNAME}&nbsp;</p>
<p class="current-filter-name filter-name pull-left"><span class="fa fa-angle-right" aria-hidden="true"></span>&nbsp;{if isset($FOLDERNAME)}{$FOLDERNAME}{else}''{/if}&nbsp;</p>
</span>
{/if}
</span>
<span class="col-lg-5 col-md-5 pull-right">
<div id="appnav" class="navbar-right">
{if isset($LISTVIEW_LINKS['LISTVIEWBASIC'])}
{foreach item=LISTVIEW_BASICACTION from=$LISTVIEW_LINKS['LISTVIEWBASIC']}
{assign var="childLinks" value=$LISTVIEW_BASICACTION->getChildLinks()}
{if $childLinks && $LISTVIEW_BASICACTION->get('linklabel') == 'LBL_ADD_RECORD'}
......@@ -71,14 +72,16 @@
{elseif $childLink->getLabel() eq 'LBL_DETAIL_REPORT'}
{assign var="ICON_CLASS" value='vicon-detailreport'}
{/if}
<li id="{$MODULE}_listView_basicAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($childLink->getLabel())}" data-edition-disable="{$childLink->disabled}" data-edition-message="{$childLink->message}">
<a {if $childLink->disabled neq '1'} {if stripos($childLink->getUrl(), 'javascript:') === 0} onclick='{$childLink->getUrl()|substr:strlen("javascript:")};' {else} href='{$childLink->getUrl()}' {/if} {else} href="javascript:void(0);" {/if}><i class='{$ICON_CLASS}' style="font-size:13px;"></i>&nbsp; {vtranslate($childLink->getLabel(), $MODULE)}</a>
<li id="{$MODULE}_listView_basicAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($childLink->getLabel())}" data-edition-disable="{if isset($childLink->disabled)} {$childLink->disabled} {/if}"
data-edition-message="{if isset($childLink->message)} {$childLink->message} {/if}">
<a {if ($childLink) && !isset($childLink->disabled) || $childLink->disabled neq '1'} {if stripos($childLink->getUrl(), 'javascript:') === 0} onclick='{$childLink->getUrl()|substr:strlen("javascript:")};' {else} href='{$childLink->getUrl()}' {/if} {else} href="javascript:void(0);" {/if}><i class='{$ICON_CLASS}' style="font-size:13px;"></i>&nbsp; {vtranslate($childLink->getLabel(), $MODULE)}</a>
</li>
{/foreach}
</ul>
</span>
{/if}
{/foreach}
{/if}
</div>
</span>
</div>
......
layouts/v7/modules/Reports/RelatedFields.tpl
View file @ e43131dd
......@@ -18,7 +18,7 @@
{foreach key=BLOCK_LABEL item=BLOCK from=$PRIMARY_MODULE}
<optgroup label='{vtranslate($PRIMARY_MODULE_NAME,$MODULE)}-{vtranslate($BLOCK_LABEL,$PRIMARY_MODULE_NAME)}'>
{foreach key=FIELD_KEY item=FIELD_LABEL from=$BLOCK}
<option value="{$FIELD_KEY}"{if $FIELD_KEY eq $SELECTED_SORT_FIELD_KEY}selected=""{/if}>{vtranslate($FIELD_LABEL, $PRIMARY_MODULE_NAME)}</option>
<option value="{$FIELD_KEY}"{if isset($SELECTED_SORT_FIELD_KEY) && $FIELD_KEY eq $SELECTED_SORT_FIELD_KEY}selected=""{/if}>{vtranslate($FIELD_LABEL, $PRIMARY_MODULE_NAME)}</option>
{/foreach}
</optgroup>
{/foreach}
......@@ -27,7 +27,7 @@
{foreach key=BLOCK_LABEL item=BLOCK from=$SECONDARY_MODULE}
<optgroup label='{vtranslate($SECONDARY_MODULE_NAME,$MODULE)}-{vtranslate($BLOCK_LABEL,$SECONDARY_MODULE_NAME)}'>
{foreach key=FIELD_KEY item=FIELD_LABEL from=$BLOCK}
<option value="{$FIELD_KEY}"{if $FIELD_KEY eq $SELECTED_SORT_FIELD_KEY}selected=""{/if}>{vtranslate($FIELD_LABEL, $SECONDARY_MODULE_NAME)}</option>
<option value="{$FIELD_KEY}"{if isset($SELECTED_SORT_FIELD_KEY) && $FIELD_KEY eq $SELECTED_SORT_FIELD_KEY}selected=""{/if}>{vtranslate($FIELD_LABEL, $SECONDARY_MODULE_NAME)}</option>
{/foreach}
</optgroup>
{/foreach}
......@@ -39,8 +39,8 @@
<div class="row">
<span class="col-lg-6">
{assign var=ROW value='row_'|cat:$ROW_VAL}
<input type="radio" name="{$ROW}" class="sortOrder" value="Ascending" {if $SELECTED_SORT_FIELD_VALUE eq Ascending} checked="" {/if} />&nbsp;<span>{vtranslate('LBL_ASCENDING',$MODULE)}</span>&nbsp;&nbsp;
<input type="radio" name="{$ROW}" class="sortOrder" value="Descending" {if $SELECTED_SORT_FIELD_VALUE eq Descending} checked="" {/if}/>&nbsp;<span>{vtranslate('LBL_DESCENDING',$MODULE)}</span>
<input type="radio" name="{$ROW}" class="sortOrder" value="Ascending" {if isset($SELECTED_SORT_FIELD_VALUE) && $SELECTED_SORT_FIELD_VALUE eq Ascending} checked="" {/if} />&nbsp;<span>{vtranslate('LBL_ASCENDING',$MODULE)}</span>&nbsp;&nbsp;
<input type="radio" name="{$ROW}" class="sortOrder" value="Descending" {if isset($SELECTED_SORT_FIELD_VALUE) && $SELECTED_SORT_FIELD_VALUE eq Descending} checked="" {/if}/>&nbsp;<span>{vtranslate('LBL_DESCENDING',$MODULE)}</span>
</span>
</div>
</span>
......
layouts/v7/modules/Reports/ReportContents.tpl
View file @ e43131dd
......@@ -48,7 +48,7 @@
</div>
<div id="reportDetails" class="contents-bottomscroll">
<div class="bottomscroll-div">
<input type="hidden" id="updatedCount" value="{$NEW_COUNT}" />
<input type="hidden" id="updatedCount" value="{if isset($NEW_COUNT)}{$NEW_COUNT}{else}''{/if}" />
{if $DATA neq ''}
{assign var=HEADERS value=$DATA[0]}
<table class="table table-bordered">
......@@ -139,7 +139,7 @@
{/foreach}
{/if}
</table>
{if $LIMIT_EXCEEDED}
{if isset($LIMIT_EXCEEDED) && $LIMIT_EXCEEDED}
<center>{vtranslate('LBL_LIMIT_EXCEEDED',$MODULE)} <span class="pull-right"><a href="#top" >{vtranslate('LBL_TOP',$MODULE)}</a></span></center>
{/if}
{else}
......
layouts/v7/modules/Reports/ScheduleReport.tpl
View file @ e43131dd
......@@ -67,8 +67,8 @@
<div class='col-lg-2'>
<div class="input-group inputElement date" style="margin-bottom: 3px">
{assign var=specificDate value=Zend_Json::decode($SCHEDULEDREPORTS->get('schdate'))}
{if $specificDate[0] neq ''} {assign var=specificDate1 value=DateTimeField::convertToUserFormat($specificDate[0])} {/if}
<input style='width: 185px;' type="text" class="dateField form-control" id="schdate" name="schdate" value="{$specificDate1}" data-date-format="{$CURRENT_USER->date_format}" data-rule-required="true" />
{if isset($specificDate[0]) && $specificDate[0] neq ''} {assign var=specificDate1 value=DateTimeField::convertToUserFormat($specificDate[0])} {/if}
<input style='width: 185px;' type="text" class="dateField form-control" id="schdate" name="schdate" value="{if isset($specificDate1)}{$specificDate1}{else}''{/if}" data-date-format="{$CURRENT_USER->date_format}" data-rule-required="true" />
<span class="input-group-addon"><i class="fa fa-calendar "></i></span>
</div>
</div>
......
layouts/v7/modules/Reports/Step1.tpl
View file @ e43131dd
......@@ -18,7 +18,7 @@
<input type="hidden" name="module" value="{$MODULE}" />
<input type="hidden" name="view" value="{$VIEW}" />
<input type="hidden" class="step" value="1" />
<input type="hidden" name="isDuplicate" value="{$IS_DUPLICATE}" />
<input type="hidden" name="isDuplicate" value="{if isset($IS_DUPLICATE)}{$IS_DUPLICATE}{else}false{/if}" />
<input type="hidden" name="record" value="{$RECORD_ID}" />
<input type=hidden id="relatedModules" data-value='{ZEND_JSON::encode($RELATED_MODULES)}' />
<div style="border:1px solid #ccc;padding:4%;">
......@@ -51,14 +51,14 @@
<label class="col-lg-3 control-label textAlignLeft">{vtranslate('PRIMARY_MODULE',$MODULE)}<span class="redColor">*</span></label>
<div class="col-lg-4">
<select class="select2-container select2 col-lg-12 inputElement" id="primary_module" name="primary_module" data-rule-required="true"
{if $RECORD_ID and $REPORT_MODEL->getPrimaryModule() and $IS_DUPLICATE neq true and $REPORT_TYPE eq "ChartEdit"} disabled="disabled"{/if}>
{if $RECORD_ID and $REPORT_MODEL->getPrimaryModule() and isset($IS_DUPLICATE) && $IS_DUPLICATE neq true and $REPORT_TYPE eq "ChartEdit"} disabled="disabled"{/if}>
{foreach key=RELATED_MODULE_KEY item=RELATED_MODULE from=$MODULELIST}
<option value="{$RELATED_MODULE_KEY}" {if $REPORT_MODEL->getPrimaryModule() eq $RELATED_MODULE_KEY } selected="selected" {/if}>
{vtranslate($RELATED_MODULE_KEY,$RELATED_MODULE_KEY)}
</option>
{/foreach}
</select>
{if $RECORD_ID and $REPORT_MODEL->getPrimaryModule() and $IS_DUPLICATE neq true and $REPORT_TYPE eq "ChartEdit"}
{if $RECORD_ID and $REPORT_MODEL->getPrimaryModule() and isset($IS_DUPLICATE) && $IS_DUPLICATE neq true and $REPORT_TYPE eq "ChartEdit"}
<input type="hidden" name="primary_module" value="{$REPORT_MODEL->getPrimaryModule()}" />
{/if}
</div>
......@@ -68,7 +68,11 @@
<div class="form-group">
<label class="col-lg-3 control-label textAlignLeft">{vtranslate('LBL_SELECT_RELATED_MODULES',$MODULE)}&nbsp;({vtranslate('LBL_MAX',$MODULE)}&nbsp;2)</label>
<div class="col-lg-4">
{assign var=SECONDARY_MODULES_ARR value=explode(':',$REPORT_MODEL->getSecondaryModules())}
{if $REPORT_MODEL->getSecondaryModules() neq null && $REPORT_MODEL->getSecondaryModules() neq ''}
{assign var="SECONDARY_MODULES_ARR" value=explode(':', $REPORT_MODEL->getSecondaryModules())}
{else}
{assign var="SECONDARY_MODULES_ARR" value=[]}
{/if}
{assign var=PRIMARY_MODULE value=$REPORT_MODEL->getPrimaryModule()}
{if $PRIMARY_MODULE eq ''}
......
layouts/v7/modules/Reports/chartReportHiddenContents.tpl
View file @ e43131dd
......@@ -32,11 +32,11 @@
<optgroup label='{vtranslate($SECONDARY_MODULE_NAME,$MODULE)}-{vtranslate($BLOCK_LABEL,$SECONDARY_MODULE_NAME)}'>
{foreach key=FIELD_KEY item=FIELD_LABEL from=$BLOCK}
{assign var=FIELD_INFO value=explode(':', $FIELD_KEY)}
{if $FIELD_INFO[4] eq 'D' or $FIELD_INFO[4] eq 'DT'}
{if isset($FIELD_INFO[4]) && ($FIELD_INFO[4] eq 'D' or $FIELD_INFO[4] eq 'DT')}
<option value="{$FIELD_KEY}:Y">{vtranslate($SECONDARY_MODULE_NAME, $SECONDARY_MODULE_NAME)} {vtranslate($FIELD_LABEL, $SECONDARY_MODULE_NAME)} ({vtranslate('LBL_YEAR', $SECONDARY_MODULE_NAME)})</option>
<option value="{$FIELD_KEY}:MY">{vtranslate($SECONDARY_MODULE_NAME, $SECONDARY_MODULE_NAME)} {vtranslate($FIELD_LABEL, $SECONDARY_MODULE_NAME)} ({vtranslate('LBL_MONTH', $SECONDARY_MODULE_NAME)})</option>
<option value="{$FIELD_KEY}">{vtranslate($SECONDARY_MODULE_NAME, $SECONDARY_MODULE_NAME)} {vtranslate($FIELD_LABEL, $SECONDARY_MODULE_NAME)}</option>
{else if $FIELD_INFO[4] neq 'I' and $FIELD_INFO[4] neq 'N' and $FIELD_INFO[4] neq 'NN'}
{else if isset($FIELD_INFO[4]) && $FIELD_INFO[4] neq 'I' and $FIELD_INFO[4] neq 'N' and $FIELD_INFO[4] neq 'NN'}
<option value="{$FIELD_KEY}">{vtranslate($SECONDARY_MODULE_NAME, $SECONDARY_MODULE_NAME)} {vtranslate($FIELD_LABEL, $SECONDARY_MODULE_NAME)}</option>
{/if}
{/foreach}
......
layouts/v7/modules/Reports/resources/Edit2.js
View file @ e43131dd
......@@ -55,7 +55,7 @@ Reports_Edit_Js("Reports_Edit2_Js",{},{
*/
getSelectedFields : function() {
if(this.selectedFields == false) {
this.selectedFields = jQuery('#seleted_fields');
this.selectedFields = jQuery('#selected_fields');
}
return this.selectedFields;
},
......
layouts/v7/modules/Reports/step2.tpl
View file @ e43131dd
......@@ -23,7 +23,7 @@
<input type="hidden" name="description" value="{$REPORT_MODEL->get('description')}" />
<input type="hidden" name="primary_module" value="{$PRIMARY_MODULE}" />
<input type="hidden" name="secondary_modules" value={ZEND_JSON::encode($SECONDARY_MODULES)} />
<input type="hidden" name="selected_fields" id="seleted_fields" value='{ZEND_JSON::encode($SELECTED_FIELDS)}' />
<input type="hidden" name="selected_fields" id="selected_fields" value='{if isset($SELECTED_FIELDS)}{ZEND_JSON::encode($SELECTED_FIELDS)}{else}false{/if}' />
<input type="hidden" name="selected_sort_fields" id="selected_sort_fields" value="" />
<input type="hidden" name="calculation_fields" id="calculation_fields" value="" />
<input type="hidden" name="isDuplicate" value="{$IS_DUPLICATE}" />
......@@ -71,14 +71,16 @@
</div>
<div class="">
{assign var=ROW_VAL value=1}
{if isset($SELECTED_SORT_FIELDS) && is_array($SELECTED_SORT_FIELDS)}
{foreach key=SELECTED_SORT_FIELD_KEY item=SELECTED_SORT_FIELD_VALUE from=$SELECTED_SORT_FIELDS}
<div class="row sortFieldRow" style="padding-bottom:10px;">
{include file='RelatedFields.tpl'|@vtemplate_path:$MODULE ROW_VAL=$ROW_VAL}
{assign var=ROW_VAL value=($ROW_VAL+1)}
</div>
{/foreach}
{assign var=SELECTED_SORT_FEILDS_ARRAY value=$SELECTED_SORT_FIELDS}
{assign var=SELECTED_SORT_FIELDS_COUNT value=php7_count($SELECTED_SORT_FEILDS_ARRAY)}
{/if}
{assign var=SELECTED_SORT_FEILDS_ARRAY value=(isset($SELECTED_SORT_FIELDS))?$SELECTED_SORT_FIELDS:array()}
{assign var=SELECTED_SORT_FIELDS_COUNT value=(isset($SELECTED_SORT_FEILDS_ARRAY))?php7_count($SELECTED_SORT_FEILDS_ARRAY):array()}
{while $SELECTED_SORT_FIELDS_COUNT lt 3 }
<div class="row sortFieldRow" style="padding-bottom:10px;">
{include file='RelatedFields.tpl'|@vtemplate_path:$MODULE ROW_VAL=$ROW_VAL}
......@@ -136,4 +138,4 @@
</div>
<br><br>
</form>
{/strip}
\ No newline at end of file
{/strip}
layouts/v7/modules/Reports/step3.tpl
View file @ e43131dd
......@@ -22,7 +22,7 @@
<input type="hidden" name="reports_description" value="{Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('description'))}" />
<input type="hidden" name="primary_module" value="{$PRIMARY_MODULE}" />
<input type="hidden" name="secondary_modules" value={ZEND_JSON::encode($SECONDARY_MODULES)} />
<input type="hidden" name="selected_fields" id="seleted_fields" value='{Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('selected_fields'))}' />
<input type="hidden" name="selected_fields" id="selected_fields" value='{Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('selected_fields'))}' />
<input type="hidden" name="selected_sort_fields" id="selected_sort_fields" value={Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('selected_sort_fields'))} />
<input type="hidden" name="selected_calculation_fields" id="calculation_fields" value={Vtiger_Util_Helper::toSafeHTML($REPORT_MODEL->get('calculation_fields'))} />
<input type="hidden" name="advanced_filter" id="advanced_filter" value="" />
......@@ -64,6 +64,9 @@
<h4><strong>{vtranslate('LBL_CHOOSE_FILTER_CONDITIONS',$MODULE)}</strong></h4>
<br>
<span class="col-lg-12">
{if !isset($SELECTED_ADVANCED_FILTER_FIELDS)}
{assign var="SELECTED_ADVANCED_FILTER_FIELDS" value=array()}
{/if}
{include file='AdvanceFilter.tpl'|@vtemplate_path RECORD_STRUCTURE=$RECORD_STRUCTURE ADVANCE_CRITERIA=$SELECTED_ADVANCED_FILTER_FIELDS COLUMNNAME_API=getReportFilterColumnName}
</span>
</div>
......
layouts/v7/modules/Rss/ModuleHeader.tpl
View file @ e43131dd
......@@ -27,7 +27,7 @@
<span>
<p class="current-filter-name pull-left">&nbsp;<span class="fa fa-angle-right" aria-hidden="true"></span>&nbsp;{$VIEW}&nbsp;</p>
</span>
{if $VIEWID}
{if isset($VIEWID) && $VIEWID}
{foreach item=FILTER_TYPES from=$CUSTOM_VIEWS}
{foreach item=FILTERS from=$FILTER_TYPES}
{if $FILTERS->get('cvid') eq $VIEWID}
......

Copyright 2023 Vtiger. All rights reserved.