Page MenuHomeIn-Portal Phabricator
Files F1207076

in-portal
No OneTemporary
Actions

File Metadata

Created
Sat, Nov 8, 7:25 AM

in-portal
View Options

Index: trunk/kernel/admin_templates/visits/visits_list.tpl
===================================================================
--- trunk/kernel/admin_templates/visits/visits_list.tpl (revision 2682)
+++ trunk/kernel/admin_templates/visits/visits_list.tpl (revision 2683)
@@ -1,121 +1,119 @@
<inp2:m_set nobody="yes"/>
<inp2:m_include t="incs/header"/>
<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
<inp2:m_ParseBlock name="section_header" icon="icon46_visits" title="!la_title_Visits!"/>
<inp2:m_ParseBlock name="blue_bar" prefix="visits" title_preset="visits_list" module="in-portal" icon="icon46_visits"/>
<!-- ToolBar --->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
function edit()
{
}
a_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search"/>',
function() {
+ set_hidden_field('grid_name', 'Default');
submit_event('visits','OnSearch');
} ) );
a_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset"/>',
function() {
+ set_hidden_field('grid_name', 'Default');
submit_event('visits','OnSearchReset');
} ) );
a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_Refresh"/>', function() {
window.location.href = window.location.href;
}
) );
a_toolbar.AddButton( new ToolBarButton('reset', '<inp2:m_phrase label="la_ToolTip_Reset"/>', function() {
std_delete_items('visits');
}
) );
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View"/>', function() {
show_viewmenu(a_toolbar,'view');
}
) );
a_toolbar.Render();
</script>
</td>
</tr>
</tbody>
</table>
<script type="text/javascript" src="incs/calendar.js"></script>
-
-<inp2:m_block name="search_calendar_td" />
+<inp2:m_DefineElement name="search_calendar_td" class="">
+ <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+ <inp2:m_inc param="tab_index" by="1"/>
+ <td class="text"><inp2:m_phrase label="la_from_date"/>:</td>
- <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
- <inp2:m_inc param="tab_index" by="1"/>
- <td class="text"><inp2:m_phrase label="la_date_from"/>:</td>
-
- <td>
- <input type="text" name="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" id="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangefrom"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
- <span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
- <script type="text/javascript">
- initCalendar("<inp2:$prefix_InputName field="{$field}_rangefrom"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
- </script>
-
- </td>
- <td class="error"><inp2:m_get name="{$prefix}_{$field}_rangefrom_error"/>&nbsp;</td>
+ <td>
+ <input type="text" name="<inp2:SearchInputName field="$field" type="datefrom"/>" id="<inp2:SearchInputName field="$field" type="datefrom"/>" value="<inp2:SearchField field="$field" type="datefrom"/>" size="<inp2:SearchFormat field="{$field}_date" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+ <span class="small">(<inp2:SearchFormat field="{$field}_date" human="true"/>)</span>
+ <script type="text/javascript">
+ initCalendar("<inp2:SearchInputName field="$field" type="datefrom"/>", "<inp2:SearchFormat field="{$field}_date"/>");
+ </script>
+
+ </td>
+ <td class="error"><inp2:SearchError field="$field" type="datefrom"/>&nbsp;</td>
+
+ <td class="text"><inp2:m_phrase label="la_to_date"/>:</td>
- <inp2:m_inc param="tab_index" by="1"/>
- <td class="text"><inp2:m_phrase label="la_date_to"/>:</td>
-
- <td>
- <input type="text" name="<inp2:$prefix_InputName field="{$field}_rangeto"/>" id="<inp2:$prefix_InputName field="{$field}_rangeto"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangeto"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
- <span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
- <script type="text/javascript">
- initCalendar("<inp2:$prefix_InputName field="{$field}_rangeto"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
- </script>
-
- </td>
- <td class="error"><inp2:m_get name="{$prefix}_{$field}_rangeto_error"/>&nbsp;</td>
- </tr>
-
-<inp2:m_blockend />
+ <td>
+ <input type="text" name="<inp2:SearchInputName field="$field" type="dateto"/>" id="<inp2:SearchInputName field="$field" type="dateto"/>" value="<inp2:SearchField field="$field" type="dateto"/>" size="<inp2:SearchFormat field="{$field}_date" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+ <span class="small">(<inp2:SearchFormat field="{$field}_date" human="true"/>)</span>
+ <script type="text/javascript">
+ initCalendar("<inp2:SearchInputName field="$field" type="dateto"/>", "<inp2:SearchFormat field="{$field}_date"/>");
+ </script>
+
+ </td>
+ <td class="error"><inp2:SearchError field="$field" type="dateto"/>&nbsp;</td>
+ </tr>
+</inp2:m_DefineElement>
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-bottom: 0px;">
<inp2:m_ParseBlock name="search_calendar_td" prefix="visits" field="VisitDate"/>
</table>
<inp2:m_block name="grid_userlink_td" />
<td valign="top" class="text">
<inp2:m_if check="UserFound" user_field="$user_field">
<a href="<inp2:$PrefixSpecial_UserLink user_field="$user_field"/>" title="<inp2:m_phrase name="la_Edit_User"/>"><inp2:$PrefixSpecial_field field="$field" grid="$grid"/></a>
<inp2:m_else/>
<inp2:$PrefixSpecial_field field="$field" grid="$grid"/>
</inp2:m_if>
</td>
<inp2:m_blockend />
<inp2:m_block name="grid_referer_td" />
<td valign="top" class="text">
<inp2:m_if check="FieldEquals" field="$field" value="">
<inp2:m_Phrase label="la_visit_DirectReferer"/>
<inp2:m_else/>
<div style="overflow: hidden"><a href="<inp2:Field field="$field" grid="$grid"/>"><inp2:Field field="$field" grid="$grid" /></a></div>
</inp2:m_if>
</td>
<inp2:m_blockend />
<inp2:m_SaveReturnScript/>
<inp2:m_ParseBlock name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: trunk/kernel/admin_templates/visits/visits_list.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property
Index: trunk/core/kernel/parser/template_parser.php
===================================================================
--- trunk/core/kernel/parser/template_parser.php (revision 2682)
+++ trunk/core/kernel/parser/template_parser.php (revision 2683)
@@ -1,537 +1,537 @@
<?php
k4_include_once(KERNEL_PATH.'/parser/tags.php');
k4_include_once(KERNEL_PATH.'/parser/construct_tags.php');
class TemplateParser extends kBase {
var $Template;
var $Output = '';
var $Position = 0;
var $LastPosition = 0;
var $Ses;
var $Recursion = Array();
var $RecursionIndex = 0;
var $SkipMode = 0;
var $Params = Array();
var $Pattern = Array();
var $ForSort = Array();
var $Values = Array();
var $Buffers = Array();
var $Args;
var $ParamsRecursionIndex = 0;
var $ParamsStack = Array();
var $CompiledBuffer;
var $DataExists = false;
function TemplateParser()
{
parent::kBase();
$this->Ses =& $this->Application->recallObject('Session');
}
function AddParam($pattern, $value, $dont_sort=0)
{
$this->ForSort[] = Array($pattern, $value);
if (!$dont_sort) //used when mass-adding params, to escape sorting after every new param
$this->SortParams(); //but do sort by default!
}
//We need to sort params by its name length desc, so that params starting with same word get parsed correctly
function SortParams()
{
uasort($this->ForSort, array ("TemplateParser", "CmpParams"));
$this->Pattern = Array();
$this->Values = Array();
foreach($this->ForSort as $pair)
{
$this->Pattern[] = $pair[0];
$this->Values[] = $pair[1];
}
}
function CmpParams($a, $b)
{
$a_len = strlen($a[0]);
$b_len = strlen($b[0]);
if ($a_len == $b_len) return 0;
return $a_len > $b_len ? -1 : 1;
}
function SetParams($params)
{
if (!is_array($params)) $params = Array();
$this->Params = $params;
foreach ($params as $key => $val) {
$this->AddParam('/[{]{0,1}\$'.$key.'[}]{0,1}/i', $val, 1); //Do not sort every time
}
$this->SortParams(); //Sort once after adding is done
}
function GetParam($name)
{
//return isset($this->Params[strtolower($name)]) ? $this->Params[strtolower($name)] : false;
return isset($this->Params[$name]) ? $this->Params[$name] : false;
}
function SetParam($name, $value)
{
$this->Params[strtolower($name)] = $value;
}
function SetBuffer($body)
{
$this->Buffers[$this->RecursionIndex] = $body;
}
function GetBuffer()
{
return $this->Buffers[$this->RecursionIndex];
}
function GetCode()
{
return $this->Code[$this->RecursionIndex];
}
function AppendBuffer($append)
{
$this->Buffers[$this->RecursionIndex] .= $append;
$this->AppendCode( $this->ConvertToCode($append) );
}
function AppendOutput($append, $append_code=false)
{
if ($this->SkipMode == parse) {
$this->Output .= $append; //append to Ouput only if we are parsing
if ($append_code) $this->AppendCompiledHTML($append);
}
elseif ($this->SkipMode == skip) {
if ($append_code) $this->AppendCompiledHTML($append);
}
elseif ($this->SkipMode == skip_tags) {
$this->AppendBuffer($append); //append to buffer if we are skipping tags
}
}
function ConvertToCode($data)
{
$code = '$o .= \''. str_replace("'", "\'", $data) .'\';';
$code = explode("\n", $code);
return $code;
}
function AppendCode($code)
{
if (defined('EXPERIMENTAL_PRE_PARSE')) {
if (!isset($this->Code[$this->RecursionIndex])) {
$this->Code[$this->RecursionIndex] = Array();
}
if (is_array($code)) {
foreach ($code as $line) {
$this->Code[$this->RecursionIndex][] = rtrim($line, "\n")."\n";
}
}
else {
$this->Code[$this->RecursionIndex][] .= rtrim($code, "\n")."\n";
}
}
}
function AppendCompiledFunction($f_name, $f_body)
{
$real_name = 'f_'.abs(crc32($this->TemplateName)).'_'.$f_name;
if (defined('EXPERIMENTAL_PRE_PARSE')) {
// if such function already compiled
if ( isset($this->Application->CompiledFunctions[$f_name]) ||
function_exists($real_name)
)
{
if (!isset($this->Application->CompiledFunctions[$f_name])) {
$real_name = $real_name.'_';
}
else {
$real_name = $this->Application->CompiledFunctions[$f_name].'_';
}
}
$this->CompiledBuffer .= 'if (!function_exists(\''.$real_name.'\')) {'."\n";
$this->CompiledBuffer .= "\t".'$application->PreParsedBlocks[\''.$f_name.'\'] = \''.$real_name.'\';';
$this->CompiledBuffer .= "\n\t".'function '.$real_name.'($params)'."\n\t{\n";
$this->CompiledBuffer .= $f_body;
$this->CompiledBuffer .= "\t}\n\n";
$this->CompiledBuffer .= '}'."\n";
$this->Application->CompiledFunctions[$f_name] = $real_name;
}
}
function AppendCompiledCode($code)
{
if (defined('EXPERIMENTAL_PRE_PARSE')) {
if (is_array($code)) {
foreach ($code as $line) {
$this->CompiledBuffer .= "\t".rtrim($line, "\n")."\n";
}
}
else {
$this->CompiledBuffer .= $code;
}
$this->CompiledBuffer .= "\t".'echo $o;'."\n\t".'$o = \'\';'."\n";
}
}
function AppendCompiledHTML($append)
{
if (defined('EXPERIMENTAL_PRE_PARSE')) {
$this->CompiledBuffer .= '?'.'>'."\n";
$this->CompiledBuffer .= rtrim($append, "\t");
$this->CompiledBuffer .= '<'.'?php'."\n";
}
}
function ResetCode()
{
$this->Code[$this->RecursionIndex] = Array();
}
function FindTag2()
{
$openings = Array('<%' => '%>', '<inp2:' => Array('>', '/>'), '</inp2:' => '>', '</inp2>' => '');
$tag_open_pos = false;
foreach ($openings as $an_opening => $closings) {
$pos = strpos($this->Template, $an_opening, $this->Position);
if ($pos !== false && ($tag_open_pos === false || (int) $pos <= (int) $tag_open_pos)) {
$tag_open_pos = $pos;
$open_len = strlen($an_opening);
$opening_tag = $an_opening;
$tag_closings = $closings;
}
}
if ($tag_open_pos === false) { //If no tags left - adding all other data
$this->AppendOutput(substr($this->Template, $this->Position), true);
return false;
}
//Adding all data before tag open
$this->AppendOutput(substr($this->Template, $this->Position, $tag_open_pos - $this->Position), true);
if (is_array($tag_closings)) {
$tag_close_pos = false;
foreach ($tag_closings as $a_closing) {
$pos = strpos($this->Template, $a_closing, $tag_open_pos);
if ($pos !== false && ($tag_close_pos === false || (int) $pos <= (int) $tag_close_pos)) {
$tag_close_pos = $pos;
$closing_tag = $a_closing;
}
}
}
elseif ($opening_tag == '</inp2>') {
$closing_tag = '';
$tag_close_pos = $tag_open_pos + $open_len;
}
else {
$closing_tag = $tag_closings;
$tag_close_pos = strpos($this->Template, $closing_tag, $tag_open_pos);
}
$close_len = strlen($closing_tag);
//Cutting out the tag itself
$tag = substr($this->Template, $tag_open_pos + $open_len, $tag_close_pos - $tag_open_pos - $open_len);
if ($opening_tag == '<inp2:') {
//getting prefix_tag upto first space, tab or line break into regs[1]
preg_match("/^([^ \t\n]*)(.*)/", $tag, $regs);
$tag_part = $regs[1];
if (strpos($tag_part, '_') !== false) {
list($prefix, $the_tag) = explode('_', $tag, 2);
$tag = $prefix.':'.$the_tag;
}
else {
$the_tag = $tag;
$tag = ':'.$tag;
}
}
if ($opening_tag == '</inp2>') { //empty closing means old style in-portal if <inp2:tag>....</inp2>
$tag = 'm:endif';
}
if ($opening_tag == '</inp2:') {
preg_match("/^([^ \t\n]*)(.*)/", $tag, $regs);
$tag_part = $regs[1];
if (strpos($tag_part, '_') !== false) {
list($prefix, $the_tag) = explode('_', $tag, 2);
$tag = $prefix.':'.$the_tag;
}
$tag .= ' _closing_tag_="1"';
}
// if there is no prefix for the tag
if (strpos($tag, ':') === 0) {
$prefix = getArrayValue($this->Params, 'PrefixSpecial');
$tag = $prefix.$tag;
}
// temporary - for backward compatability with in-portal style if
if ($opening_tag == '<inp2:' && $closing_tag == '>' && $tag_part != 'm_if' && $tag_part != 'm_DefineElement') {
if (strpos($the_tag, ' ') !== false) {
list($function, $params) = explode(' ', $the_tag, 2);
}
else {
$function = $the_tag;
$params = '';
}
$tag = 'm:if prefix="'.$prefix.'" function="'.$function.'" '.$params;
}
$this->Position = $tag_close_pos + $close_len;
return $tag;
}
function CurrentLineNumber()
{
return substr_count(substr($this->Template, 0, $this->Position), "\n")+1;
}
function SkipModeName()
{
switch ($this->SkipMode) {
case skip: return 'skip';
case skip_tags: return 'skip_tags';
case parse: return 'parse';
}
}
function CheckDir($dir)
{
if (file_exists($dir)) {
return;
}
else {
$segments = explode('/', $dir);
$cur_path = '';
foreach ($segments as $segment) {
$cur_path .= '/'.$segment;
if (!file_exists($cur_path)) {
mkdir($cur_path);
}
}
}
}
function Parse($template, $name='unknown', $pre_parse = 1)
{
$this->Template = $template;
$this->TemplateName = $name;
$this->Position = 0;
$this->Output = '';
$this->TagHolder = new MyTagHolder();
$has_inp_tags = false;
if ($this->GetParam('from_inportal')) $pre_parse = 0;
if (defined('EXPERIMENTAL_PRE_PARSE') && $pre_parse) {
$template_cache =& $this->Application->recallObject('TemplatesCache');
$fname = $template_cache->GetRealFilename($this->TemplateName).'.php';
$fname = str_replace(FULL_PATH, FULL_PATH.'/kernel/cache', $fname);
if (!defined('SAFE_MODE') || !SAFE_MODE) {
$this->CheckDir(dirname($fname));
}
$tname = $template_cache->GetRealFilename($this->TemplateName).'.tpl';
$output = '';
$is_cached = false;
ob_start();
if (defined('SAFE_MODE') && SAFE_MODE) {
$conn =& $this->Application->GetADODBConnection();
$cached = $conn->GetRow('SELECT * FROM '.TABLE_PREFIX.'Cache WHERE VarName = "'.$fname.'"');
if ($cached !== false && $cached['Cached'] > filemtime($tname)) {
eval('?'.'>'.$cached['Data'].'<'.'?');
$is_cached = true;
}
}
else {
if (file_exists($fname) && filemtime($fname) > filemtime($tname)) {
include($fname);
$is_cached = true;
}
}
$output = ob_get_contents();
ob_end_clean();
if ( $is_cached && !$this->GetParam('from_inportal') ) {
if ( strpos($output, '<inp:') !== false) {
$inp1_parser =& $this->Application->recallObject('Inp1Parser');
$output = $inp1_parser->Parse($name, $output);
}
return $output;
}
$this->CompiledBuffer .= '<'.'?php'."\n";
$this->CompiledBuffer .= 'global $application;'."\n";
$this->CompiledBuffer .= '$o = \'\';'."\n";
}
if (!getArrayValue($this->Params, 'PrefixSpecial')) {
$this->Params['PrefixSpecial'] = '$PrefixSpecial';
}
//While we have more tags
while ($tag_data = $this->FindTag2())
{
//Create tag object from passed tag data
if( $this->Application->isDebugMode() && dbg_ConstOn('DBG_SHOW_TAGS') )
{
global $debugger;
$debugger->appendHTML('mode: '.$this->SkipModeName().' tag '.$debugger->highlightString($tag_data).' in '.$debugger->getFileLink($debugger->getLocalFile(FULL_PATH.THEMES_PATH.'/'.$this->TemplateName).'.tpl', $this->CurrentLineNumber(), '', true));
}
// $tag =& new MyTag($tag_data, $this);
$tag =& $this->TagHolder->GetTag($tag_data, $this);
if (!$this->CheckRecursion($tag)) //we do NOT process closing tags
{
$tag->Process();
}
}
if ( !$this->GetParam('from_inportal') ) {
if ( strpos($this->Output, '<inp:') !== false) {
$inp1_parser =& $this->Application->recallObject('Inp1Parser');
$this->Output = $inp1_parser->Parse($name, $this->Output);
$has_inp_tags = true;
}
}
if (defined('EXPERIMENTAL_PRE_PARSE') && $pre_parse && !$has_inp_tags) {
// $this->CompiledBuffer .= 'echo $o;'."\n";
$this->CompiledBuffer .= '?'.'>'."\n";
if (defined('SAFE_MODE') && SAFE_MODE) {
if (!isset($conn)) $conn =& $this->Application->GetADODBConnection();
$conn->Query('REPLACE INTO '.TABLE_PREFIX.'Cache (VarName, Data, Cached) VALUES ('.$conn->qstr($fname).','.$conn->qstr(str_replace('<'.'?php','<'.'?',$this->CompiledBuffer)).','.mktime().')');
}
else {
$compiled = fopen($fname, 'w');
fwrite($compiled, $this->CompiledBuffer);
fclose($compiled);
}
}
return $this->Output;
}
function ParseBlock($params, $force_pass_params=0, $as_template=false)
{
if( $this->Application->isDebugMode() && dbg_ConstOn('DBG_SHOW_TAGS') )
{
global $debugger;
$debugger->appendHTML('ParseBlock '.$params['name'].' pass_params is '.$params['pass_params'].' force is '.$force_pass_params.' in '.$debugger->getFileLink($debugger->getLocalFile(FULL_PATH.THEMES_PATH.'/'.$this->TemplateName).'.tpl', $this->CurrentLineNumber(), '', true));
}
/*if ( $this->Application->isDebugMode() && dbg_ConstOn('DBG_PRE_PARSE') ) {
global $debugger;
$debugger->CurrentPreParsedBlock = $params['name'];
}*/
if (defined('EXPERIMENTAL_PRE_PARSE')) {
$this->MainParser = false;
if (isset($this->Application->PreParsedBlocks[$params['name']]) ) {
if ($this->ParamsRecursionIndex == 0) {
$this->ParamsStack[$this->ParamsRecursionIndex] = $this->Params;
}
if (isset($params['pass_params']) || $force_pass_params) {
$pass_params = array_merge($this->ParamsStack[$this->ParamsRecursionIndex], $params);
}
else {
$pass_params = $params;
}
$this->ParamsStack[++$this->ParamsRecursionIndex] = $pass_params;
$this->Params = $pass_params;
$f = $this->Application->PreParsedBlocks[$params['name']];
// $this->ParamsRecursionIndex--;
//$this->SetParams($params);
- if( !isset($pass_params['PrefixSpecial']) ) $pass_params['PrefixSpecial'] = $pass_params['prefix'];
+ if( !isset($pass_params['PrefixSpecial']) && isset($pass_params['prefix']) ) $pass_params['PrefixSpecial'] = $pass_params['prefix'];
$ret = $f($pass_params);
unset($this->ParamsStack[$this->ParamsRecursionIndex--]);
$this->Params = $this->ParamsStack[$this->ParamsRecursionIndex];
$this->MainParser = true;
return $ret;
}
}
$BlockParser =& $this->Application->makeClass('TemplateParser');
if (isset($params['pass_params']) || $force_pass_params) {
$BlockParser->SetParams(array_merge($this->Params, $params));
}
else
$BlockParser->SetParams($params);
$this->Application->Parser =& $BlockParser;
if (!isset($params['name'])) trigger_error('<b>***Error: Block name not passed to ParseBlock</b>', E_USER_ERROR);
$templates_cache =& $this->Application->recallObject('TemplatesCache');
$template_name = $as_template ? $params['name'] : $templates_cache->GetTemplateFileName($params['name']) . '-block:'.$params['name'];
$silent = getArrayValue($params, 'from_inportal') && !defined('DBG_TEMPLATE_FAILURE');
$o = $BlockParser->Parse(
$templates_cache->GetTemplateBody($params['name'], $silent),
$template_name
);
if (getArrayValue($params, 'BlockNoData') && !$BlockParser->DataExists) {
$template_name = $as_template ? $params['BlockNoData'] : $templates_cache->GetTemplateFileName($params['BlockNoData']) . '-block:'.$params['BlockNoData'];
$o = $BlockParser->Parse(
$templates_cache->GetTemplateBody($params['BlockNoData'], $silent),
$template_name
);
}
$this->Application->Parser =& $this;
$this->Application->Parser->DataExists = $this->Application->Parser->DataExists || $BlockParser->DataExists;
return $o;
}
function Recurve(&$tag)
{
$this->Recursion[++$this->RecursionIndex] =& $tag;
}
function CheckRecursion(&$tag)
{
if ($this->RecursionIndex > 0) { //If we are inside the recursion
if ($this->Recursion[$this->RecursionIndex]->CheckRecursion($tag)) { //If we can close this recursion
unset($this->Recursion[$this->RecursionIndex--]); //unsetting current recursion level and decreasing it at the same time
return true; //we should inform not to process closing tag
}
}
return false;
}
function SetSkipMode($mode)
{
$this->SkipMode = $mode;
}
}
?>
\ No newline at end of file
Property changes on: trunk/core/kernel/parser/template_parser.php
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.13
\ No newline at end of property
+1.14
\ No newline at end of property
Index: trunk/core/admin_templates/logs/visits/visits_list.tpl
===================================================================
--- trunk/core/admin_templates/logs/visits/visits_list.tpl (revision 2682)
+++ trunk/core/admin_templates/logs/visits/visits_list.tpl (revision 2683)
@@ -1,121 +1,119 @@
<inp2:m_set nobody="yes"/>
<inp2:m_include t="incs/header"/>
<body topmargin="0" leftmargin="8" marginheight="0" marginwidth="8" bgcolor="#FFFFFF">
<inp2:m_ParseBlock name="section_header" icon="icon46_visits" title="!la_title_Visits!"/>
<inp2:m_ParseBlock name="blue_bar" prefix="visits" title_preset="visits_list" module="in-portal" icon="icon46_visits"/>
<!-- ToolBar --->
<table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
<tbody>
<tr>
<td>
<script type="text/javascript">
a_toolbar = new ToolBar();
function edit()
{
}
a_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search"/>',
function() {
+ set_hidden_field('grid_name', 'Default');
submit_event('visits','OnSearch');
} ) );
a_toolbar.AddButton( new ToolBarButton('search_reset', '<inp2:m_phrase label="la_ToolTip_SearchReset"/>',
function() {
+ set_hidden_field('grid_name', 'Default');
submit_event('visits','OnSearchReset');
} ) );
a_toolbar.AddButton( new ToolBarButton('refresh', '<inp2:m_phrase label="la_ToolTip_Refresh"/>', function() {
window.location.href = window.location.href;
}
) );
a_toolbar.AddButton( new ToolBarButton('reset', '<inp2:m_phrase label="la_ToolTip_Reset"/>', function() {
std_delete_items('visits');
}
) );
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View"/>', function() {
show_viewmenu(a_toolbar,'view');
}
) );
a_toolbar.Render();
</script>
</td>
</tr>
</tbody>
</table>
<script type="text/javascript" src="incs/calendar.js"></script>
-
-<inp2:m_block name="search_calendar_td" />
+<inp2:m_DefineElement name="search_calendar_td" class="">
+ <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+ <inp2:m_inc param="tab_index" by="1"/>
+ <td class="text"><inp2:m_phrase label="la_from_date"/>:</td>
- <tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
- <inp2:m_inc param="tab_index" by="1"/>
- <td class="text"><inp2:m_phrase label="la_date_from"/>:</td>
-
- <td>
- <input type="text" name="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" id="<inp2:$prefix_InputName field="{$field}_rangefrom"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangefrom"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
- <span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
- <script type="text/javascript">
- initCalendar("<inp2:$prefix_InputName field="{$field}_rangefrom"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
- </script>
-
- </td>
- <td class="error"><inp2:m_get name="{$prefix}_{$field}_rangefrom_error"/>&nbsp;</td>
+ <td>
+ <input type="text" name="<inp2:SearchInputName field="$field" type="datefrom"/>" id="<inp2:SearchInputName field="$field" type="datefrom"/>" value="<inp2:SearchField field="$field" type="datefrom"/>" size="<inp2:SearchFormat field="{$field}_date" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+ <span class="small">(<inp2:SearchFormat field="{$field}_date" human="true"/>)</span>
+ <script type="text/javascript">
+ initCalendar("<inp2:SearchInputName field="$field" type="datefrom"/>", "<inp2:SearchFormat field="{$field}_date"/>");
+ </script>
+
+ </td>
+ <td class="error"><inp2:SearchError field="$field" type="datefrom"/>&nbsp;</td>
+
+ <td class="text"><inp2:m_phrase label="la_to_date"/>:</td>
- <inp2:m_inc param="tab_index" by="1"/>
- <td class="text"><inp2:m_phrase label="la_date_to"/>:</td>
-
- <td>
- <input type="text" name="<inp2:$prefix_InputName field="{$field}_rangeto"/>" id="<inp2:$prefix_InputName field="{$field}_rangeto"/>" value="<inp2:m_get name="{$prefix}_{$field}_rangeto"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
- <span class="small">(<inp2:$prefix_Format field="{$field}_date" human="true"/>)</span>
- <script type="text/javascript">
- initCalendar("<inp2:$prefix_InputName field="{$field}_rangeto"/>", "<inp2:$prefix_Format field="{$field}_date"/>");
- </script>
-
- </td>
- <td class="error"><inp2:m_get name="{$prefix}_{$field}_rangeto_error"/>&nbsp;</td>
- </tr>
-
-<inp2:m_blockend />
+ <td>
+ <input type="text" name="<inp2:SearchInputName field="$field" type="dateto"/>" id="<inp2:SearchInputName field="$field" type="dateto"/>" value="<inp2:SearchField field="$field" type="dateto"/>" size="<inp2:SearchFormat field="{$field}_date" edit_size="1"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">
+ <span class="small">(<inp2:SearchFormat field="{$field}_date" human="true"/>)</span>
+ <script type="text/javascript">
+ initCalendar("<inp2:SearchInputName field="$field" type="dateto"/>", "<inp2:SearchFormat field="{$field}_date"/>");
+ </script>
+
+ </td>
+ <td class="error"><inp2:SearchError field="$field" type="dateto"/>&nbsp;</td>
+ </tr>
+</inp2:m_DefineElement>
<table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder" style="border-bottom: 0px;">
<inp2:m_ParseBlock name="search_calendar_td" prefix="visits" field="VisitDate"/>
</table>
<inp2:m_block name="grid_userlink_td" />
<td valign="top" class="text">
<inp2:m_if check="UserFound" user_field="$user_field">
<a href="<inp2:$PrefixSpecial_UserLink user_field="$user_field"/>" title="<inp2:m_phrase name="la_Edit_User"/>"><inp2:$PrefixSpecial_field field="$field" grid="$grid"/></a>
<inp2:m_else/>
<inp2:$PrefixSpecial_field field="$field" grid="$grid"/>
</inp2:m_if>
</td>
<inp2:m_blockend />
<inp2:m_block name="grid_referer_td" />
<td valign="top" class="text">
<inp2:m_if check="FieldEquals" field="$field" value="">
<inp2:m_Phrase label="la_visit_DirectReferer"/>
<inp2:m_else/>
<div style="overflow: hidden"><a href="<inp2:Field field="$field" grid="$grid"/>"><inp2:Field field="$field" grid="$grid" /></a></div>
</inp2:m_if>
</td>
<inp2:m_blockend />
<inp2:m_SaveReturnScript/>
<inp2:m_ParseBlock name="grid" PrefixSpecial="visits" IdField="VisitId" grid="Default" header_block="grid_column_title" data_block="grid_data_td" search="on"/>
<inp2:m_include t="incs/footer"/>
\ No newline at end of file
Property changes on: trunk/core/admin_templates/logs/visits/visits_list.tpl
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.6
\ No newline at end of property
+1.7
\ No newline at end of property

Event Timeline

In-Portal CMS · In-Portal Community Pages · In-Portal Issue Tracker · In-Portal Repository Browser · Quality Assurance · In-Portal CI Server