Page MenuHomeIn-Portal Phabricator
Files F689012

in-portal
No OneTemporary
Actions

File Metadata

Created
Mon, Nov 25, 5:11 AM

in-portal
View Options

Index: branches/5.2.x/LICENSE
===================================================================
--- branches/5.2.x/LICENSE (revision 16405)
+++ branches/5.2.x/LICENSE (revision 16406)
Property changes on: branches/5.2.x/LICENSE
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /in-portal/branches/5.3.x/LICENSE:r15921
Index: branches/5.2.x/robots.txt
===================================================================
--- branches/5.2.x/robots.txt (revision 16405)
+++ branches/5.2.x/robots.txt (revision 16406)
Property changes on: branches/5.2.x/robots.txt
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /in-portal/branches/5.3.x/robots.txt:r15921
Index: branches/5.2.x/core/admin_templates/catalog/catalog_elements.tpl
===================================================================
--- branches/5.2.x/core/admin_templates/catalog/catalog_elements.tpl (revision 16405)
+++ branches/5.2.x/core/admin_templates/catalog/catalog_elements.tpl (revision 16406)
@@ -1,133 +1,139 @@
<inp2:m_DefineElement name="top_catalog_tab">
- <input type="radio" name="top_catalog_tab" id="<inp2:m_Param name='id'/>"<inp2:m_if check="m_IsActive" template="$template"> checked="checked"</inp2:m_if>/> <label for="<inp2:m_Param name='id'/>"><a href="<inp2:m_Link template='$template' pass='all'/>"><inp2:m_Phrase name="$label"/></a></label>
+ <label>
+ <input type="radio" onclick="redirect($(this).next().attr('href'));" name="top_catalog_tab"<inp2:m_if check="m_IsActive" template="$template"> checked="checked"</inp2:m_if>/>
+
+ <a href="<inp2:m_Link template='$template' pass='all'/>" onclick="$(this).prev().prop('checked', true);">
+ <inp2:m_Phrase name="$label"/>
+ </a>
+ </label>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="top_catalog_tab2" is_last="0">
<inp2:m_if check="m_IsActive" template="$template">
<td class="button-active" style="padding-right: 5px;">
</td>
<td class="button-active">
<img src="<inp2:m_TemplatesBase/>/img/top_frame/icons/<inp2:m_Param name='image'/>.png" alt="" border="0"/>&nbsp;
</td>
<td class="button-active" style="padding-right: 5px;<inp2:m_ifnot check='m_Param' name='is_last'> border-right: 1px solid #BBBBBB;</inp2:m_ifnot>">
<strong><inp2:m_Phrase name="$label"/></strong>
</td>
<inp2:m_else/>
<inp2:c_HomeCategory result_to_var="home_category"/>
<td style="padding-right: 5px; height: 22px;">
</td>
<td>
<a class="kx-header-link" href="<inp2:m_Link template='$template' m_cat_id='$home_category'/>" onclick="getFrame('main').location.href = this.href; return false;">
<img src="<inp2:m_TemplatesBase/>/img/top_frame/icons/<inp2:m_Param name='image'/>.png" alt="" border="0"/>
</a>&nbsp;
</td>
<td style="padding-right: 5px;<inp2:m_ifnot check='m_Param' name='is_last'> border-right: 1px solid #BBBBBB;</inp2:m_ifnot>">
<a class="kx-header-link" href="<inp2:m_Link template='$template' m_cat_id='$home_category'/>" onclick="getFrame('main').location.href = this.href; return false;"><inp2:m_Phrase name="$label"/></a>
</td>
</inp2:m_if>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="mode_selector_radio">
<td>
<img src="img/spacer.gif" height="8" width="1" alt=""/>
<div style="background-color: #F6F6F6; border: 1px solid #999999; padding: 5px; float: left;">
<inp2:m_RenderElement name="top_catalog_tab" id="tab2" label="la_tab_ShowAll" template="catalog/item_selector/item_selector_advanced_view"/>
<inp2:m_RenderElement name="top_catalog_tab" id="tab1" label="la_tab_ShowStructure" template="catalog/item_selector/item_selector_catalog"/>
</div>
<br clear="all"/>
<img src="img/spacer.gif" height="8" width="1" alt=""/>
</td>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="mode_selector">
<td align="right">
<div style="background-color: #F6F6F6; border: 1px solid #999999; padding: 5px; float: right;">
<inp2:m_RenderElement name="top_catalog_tab" id="tab2" label="la_tab_ShowAll" template="catalog/advanced_view"/>
<inp2:m_RenderElement name="top_catalog_tab" id="tab1" label="la_tab_ShowStructure" template="catalog/catalog"/>
</div>
</td>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="catalog_search_box">
<td style="white-space: nowrap; text-align: right; width: 310px;" align="right">
<div style="float: right">
<table cellpadding="0" cellspacing="0">
<tr>
<td>
<input type="text"
id="search_keyword"
class="filter"
name="search_keyword"
value=""
PrefixSpecial=""
Grid=""
ajax="1"
onkeydown="searchKeydown(event);" style="width:150px;"/>
<input type="text" style="display: none;"/>
</td>
<td style="white-space: nowrap;">
<script type="text/javascript">
function searchKeydown(event) {
$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
set_hidden_field($Catalog.ActivePrefix + '_search_keyword', document.getElementById('search_keyword').value);
search_keydown(event, $Catalog.ActivePrefix, $Catalog.searchInfo[$Catalog.ActivePrefix].grid, 1);
}
b_toolbar = new ToolBar();
b_toolbar.AddButton( new ToolBarButton('search', '<inp2:m_phrase label="la_ToolTip_Search" escape="1"/>',
function() {
$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
set_hidden_field($Catalog.ActivePrefix + '_search_keyword', document.getElementById('search_keyword').value);
search($Catalog.ActivePrefix, $Catalog.searchInfo[$Catalog.ActivePrefix].grid, 1);
} ) );
b_toolbar.AddButton( new ToolBarButton('search_reset_alt', '<inp2:m_phrase label="la_ToolTip_SearchReset" escape="1"/>',
function() {
$form_name = $Catalog.queryTabRegistry('prefix', $Catalog.ActivePrefix, 'tab_id') + '_form';
set_hidden_field($Catalog.ActivePrefix + '_search_keyword', document.getElementById('search_keyword').value);
search_reset($Catalog.ActivePrefix, $Catalog.searchInfo[$Catalog.ActivePrefix].grid, 1);
} ) );
b_toolbar.Render();
</script>
</td>
</tr>
</table>
</div>
</td>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="extra_toolbar">
<table cellpadding="0" cellspacing="0">
<tr>
<inp2:m_RenderElement name="top_catalog_tab2" image="show_all" label="la_tab_ShowAll" template="catalog/advanced_view" strip_nl="2"/>
<inp2:m_RenderElement name="top_catalog_tab2" image="show_structure" label="la_tab_ShowStructure" template="catalog/catalog" strip_nl="2" is_last="1"/>
</tr>
</table>
</inp2:m_DefineElement>
<inp2:m_DefineElement name="theme_selector">
<inp2:theme.enabled_InitList per_page="-1"/>
<inp2:m_ifnot check="theme.enabled_TotalRecords" equals_to="0|1">
<inp2:m_Phrase label="la_CurrentTheme"/>:
<select name="theme" id="theme" onchange="onChangeTheme();">
<inp2:m_DefineElement name="theme_elem">
<option value="<inp2:Field name="ThemeId"/>" <inp2:m_if check="SelectedTheme">selected="selected"</inp2:m_if> ><inp2:Field name="Name"/></option>
</inp2:m_DefineElement>
<inp2:theme.enabled_PrintList render_as="theme_elem"/>
</select>
<script type="text/javascript">
function onChangeTheme() {
set_hidden_field('theme', $('#theme').val());
submit_event('theme', 'OnChangeTheme');
}
</script>
</inp2:m_ifnot>
</inp2:m_DefineElement>
\ No newline at end of file
Index: branches/5.2.x/CREDITS
===================================================================
--- branches/5.2.x/CREDITS (revision 16405)
+++ branches/5.2.x/CREDITS (revision 16406)
Property changes on: branches/5.2.x/CREDITS
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /in-portal/branches/5.3.x/CREDITS:r15921
Index: branches/5.2.x/README
===================================================================
--- branches/5.2.x/README (revision 16405)
+++ branches/5.2.x/README (revision 16406)
Property changes on: branches/5.2.x/README
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /in-portal/branches/5.3.x/README:r15921
Index: branches/5.2.x/index.php
===================================================================
--- branches/5.2.x/index.php (revision 16405)
+++ branches/5.2.x/index.php (revision 16406)
Property changes on: branches/5.2.x/index.php
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /in-portal/branches/5.3.x/index.php:r15921
Index: branches/5.2.x/LICENSES
===================================================================
--- branches/5.2.x/LICENSES (revision 16405)
+++ branches/5.2.x/LICENSES (revision 16406)
Property changes on: branches/5.2.x/LICENSES
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /in-portal/branches/5.3.x/LICENSES:r15921
Index: branches/5.2.x/INSTALL
===================================================================
--- branches/5.2.x/INSTALL (revision 16405)
+++ branches/5.2.x/INSTALL (revision 16406)
Property changes on: branches/5.2.x/INSTALL
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /in-portal/branches/5.3.x/INSTALL:r15921
Index: branches/5.2.x/COPYRIGHT
===================================================================
--- branches/5.2.x/COPYRIGHT (revision 16405)
+++ branches/5.2.x/COPYRIGHT (revision 16406)
Property changes on: branches/5.2.x/COPYRIGHT
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /in-portal/branches/5.3.x/COPYRIGHT:r15921
Index: branches/5.2.x/.htaccess
===================================================================
--- branches/5.2.x/.htaccess (revision 16405)
+++ branches/5.2.x/.htaccess (revision 16406)
Property changes on: branches/5.2.x/.htaccess
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /in-portal/branches/5.3.x/.htaccess:r15921
Index: branches/5.2.x
===================================================================
--- branches/5.2.x (revision 16405)
+++ branches/5.2.x (revision 16406)
Property changes on: branches/5.2.x
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
Merged /in-portal/branches/5.3.x:r15921

Event Timeline

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