Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F864393
in-link
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Subscribers
None
File Metadata
Details
File Info
Storage
Attached
Created
Sat, May 3, 5:22 PM
Size
9 KB
Mime Type
text/x-diff
Expires
Mon, May 5, 5:22 PM (6 h, 12 m)
Engine
blob
Format
Raw Data
Handle
614264
Attached To
rMINL Modules.In-Link
in-link
View Options
Index: branches/5.2.x/admin_templates/user_item_tab.tpl
===================================================================
--- branches/5.2.x/admin_templates/user_item_tab.tpl (revision 16612)
+++ branches/5.2.x/admin_templates/user_item_tab.tpl (revision 16613)
@@ -1,34 +1,34 @@
<inp2:m_RequireLogin permissions="in-portal:user_list.view" system="1"/>
<inp2:m_DefineElement name="catalog_tab">
<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
<div id="links_div" prefix="<inp2:m_param name="prefix"/>" view_template="in-link/user_item_tab" edit_template="in-link/links/links_edit" dep_buttons="new_link" category_id="-1" class="catalog-tab"><!-- IE minimal height problem fix --></div>
<script type="text/javascript">$Catalog.registerTab('links');</script>
</inp2:m_if>
<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
<inp2:adm_CatalogTab render_as="item_tab" prefix="$prefix" title_property="$title_property"/>
</inp2:m_if>
<inp2:m_else/>
<inp2:m_include t="incs/blocks"/>
<inp2:m_include t="incs/in-portal"/>
<inp2:m_include t="categories/ci_blocks"/>
<inp2:$prefix_InitList grid="$grid_name"/>
$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
- $Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
+ $Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="LinkId" grid="$grid_name" menu_filters="yes"/>
Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete'));
$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
#separator#
<!-- links tab: begin -->
<inp2:m_RenderElement name="kernel_form" form_name="links_form"/>
<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="LinkId" grid="$grid_name" menu_filters="yes"/>
<inp2:m_RenderElement name="kernel_form_end"/>
<!-- links tab: end -->
</inp2:m_if>
</inp2:m_DefineElement>
<inp2:l_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Index: branches/5.2.x/admin_templates/duplicate_checker.tpl
===================================================================
--- branches/5.2.x/admin_templates/duplicate_checker.tpl (revision 16612)
+++ branches/5.2.x/admin_templates/duplicate_checker.tpl (revision 16613)
@@ -1,73 +1,73 @@
<inp2:m_include t="incs/header"/>
<inp2:m_RenderElement name="combined_header" prefix="l.duplicates" section="in-link:duplicate_checker" grid="Duplicates" title_preset="duplicate_links" pagination="1"/>
<!-- 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()
{
open_popup('l.duplicates', 'OnStoreSelected', 'in-link/duplicate_checker/duplicate_link_view');
}
a_toolbar.AddButton( new ToolBarButton('edit', '<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>::<inp2:m_phrase label="la_ToolTip_Edit" escape="1"/>', edit) );
a_toolbar.AddButton( new ToolBarSeparator('sep1') );
a_toolbar.AddButton( new ToolBarButton('view', '<inp2:m_phrase label="la_ToolTip_View" escape="1"/>', function() {
show_viewmenu(a_toolbar,'view');
}
) );
a_toolbar.Render();
function set_grouping($prefix_special, $dupe_fields)
{
set_hidden_field($prefix_special + '_dupe_fields', $dupe_fields);
submit_event($prefix_special, 'OnSetGrouping');
}
Application.setHook(
'l.duplicates:OnCreateViewMenu',
function() {
// create grouping menu
$Menus['l.duplicates_grouping_menu'] = menuMgr.createMenu(rs('l.duplicates.grouping.menu'));
$Menus['l.duplicates_grouping_menu'].applyBorder(false, false, false, false);
$Menus['l.duplicates_grouping_menu'].dropShadow("none");
$Menus['l.duplicates_grouping_menu'].showIcon = true;
- <inp2:m_Get name="m_lang" no_html_escape="1" result_to_var="language"/>
+ <inp2:m_Get name="m_lang" result_to_var="language"/>
$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name'), 'Name', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language" js_escape="1"/>_Name|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|l{$language}_Name|">,['img/check_on.gif']</inp2:m_if>);
$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.url'), 'Url', 'javascript:set_grouping("l.duplicates", "|Url|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|Url|">,['img/check_on.gif']</inp2:m_if>);
$Menus['l.duplicates_grouping_menu'].addItem(rs('l.duplicates.group.name.url'), 'Name <inp2:m_phrase name="la_and"/> Url', 'javascript:set_grouping("l.duplicates", "|l<inp2:m_Param name="language" js_escape="1"/>_Name|Url|");' <inp2:m_if check="m_RecallEquals" name="l.duplicates_dupe_fields" value="|l{$language}_Name|Url|">,['img/check_on.gif']</inp2:m_if>);
// add grouping menu to view menu
$Menus['l.duplicates_view_menu'].addItem(
rs('l.duplicates.grouping.menu.item'),
'<inp2:m_phrase name="la_menu_Grouping"/>',
'javascript:void()',
null, true, null,
rs('l.duplicates.grouping.menu'),
'<inp2:m_phrase name="la_menu_Grouping"/>'
);
}
);
</script>
</td>
<inp2:m_RenderElement name="search_main_toolbar" prefix="l.duplicates" grid="Duplicates"/>
</tr>
</tbody>
</table>
<inp2:m_RenderElement name="grid" PrefixSpecial="l.duplicates" IdField="LinkId" grid="Duplicates"/>
<script type="text/javascript">
Grids['l.duplicates'].SetDependantToolbarButtons( new Array('edit') );
</script>
<inp2:m_include t="incs/footer"/>
Index: branches/5.2.x/admin_templates/catalog_tab.tpl
===================================================================
--- branches/5.2.x/admin_templates/catalog_tab.tpl (revision 16612)
+++ branches/5.2.x/admin_templates/catalog_tab.tpl (revision 16613)
@@ -1,55 +1,55 @@
<inp2:m_RequireLogin permissions="in-portal:browse.view" system="1"/>
<inp2:m_DefineElement name="catalog_tab">
<inp2:m_if check="m_ParamEquals" name="tab_init" value="" inverse="inverse">
<inp2:m_if check="m_ParamEquals" name="tab_init" value="1">
a_toolbar.AddButton(
new ToolBarButton(
'in-link:new_link',
'<inp2:m_phrase label="lu_btn_NewLink" escape="1"/>',
add_item,
true
)
);
</inp2:m_if>
<inp2:m_if check="m_ParamEquals" name="tab_init" value="2">
<div id="links_div" prefix="<inp2:m_param name='prefix'/>" view_template="in-link/catalog_tab" edit_template="in-link/links/links_edit" category_id="-1" dep_buttons="new_link" class="catalog-tab"><!-- IE minimal height problem fix --></div>
<script type="text/javascript">$Catalog.registerTab('links');</script>
</inp2:m_if>
<inp2:m_if check="m_ParamEquals" name="tab_init" value="3">
$Catalog.setItemCount('<inp2:m_Param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount grid="$grid_name"/>');
</inp2:m_if>
<inp2:m_else/>
<inp2:lang.current_SetContentType content_type="text/plain"/>
<inp2:m_include t="incs/blocks"/>
<inp2:m_include t="incs/in-portal"/>
<inp2:m_include t="categories/ci_blocks"/>
<inp2:$prefix_InitList grid="$grid_name"/>
$Catalog.setItemCount('<inp2:m_param name="prefix"/>', '<inp2:{$prefix}_CatalogItemCount/>');
- $Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" no_html_escape="1" js_escape="1"/>);
+ $Catalog.setCurrentCategory('<inp2:m_param name="prefix"/>', <inp2:m_get name="m_cat_id" js_escape="1"/>);
$Catalog.saveSearch('<inp2:m_Param name="prefix"/>', '<inp2:$prefix_SearchKeyword js_escape="1"/>', '<inp2:m_Param name="grid_name"/>');
<inp2:m_RenderElement name="grid_js" PrefixSpecial="$prefix" IdField="LinkId" grid="$grid_name" menu_filters="yes"/>
<inp2:m_RenderElement name="grid_search_buttons" PrefixSpecial="$prefix" grid="$grid_name" ajax="1"/>
<inp2:m_if check="m_ParamEquals" name="tab_dependant" value="yes">
Grids['<inp2:m_param name="prefix"/>'].AddAlternativeGrid('<inp2:m_param name="cat_prefix"/>', true);
</inp2:m_if>
Grids['<inp2:m_param name="prefix"/>'].SetDependantToolbarButtons( new Array('edit','delete','approve','decline','sep3','cut','copy','move_up','move_down','sep6'));
<inp2:m_RenderElement name="reflect_catalog_buttons"/>
$Catalog.setViewMenu('<inp2:m_param name="prefix"/>');
<inp2:m_if check="m_ParamEquals" name="tab_mode" value="single">
Grids['<inp2:m_param name="prefix"/>'].DblClick = function() {return false};
</inp2:m_if>
#separator#
<!-- links tab: begin -->
<inp2:m_RenderElement name="kernel_form" form_name="links_form"/>
<inp2:m_RenderElement name="grid" ajax="1" PrefixSpecial="$prefix" IdField="LinkId" grid="$grid_name" menu_filters="yes"/>
<inp2:m_RenderElement name="kernel_form_end"/>
<!-- links tab: end -->
</inp2:m_if>
</inp2:m_DefineElement>
<inp2:l_InitCatalogTab render_as="catalog_tab" default_grid="Default" radio_grid="Radio"/>
Event Timeline
Log In to Comment