Page Menu
Home
In-Portal Phabricator
Search
Configure Global Search
Log In
Files
F1110507
simple
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
Wed, Aug 27, 4:18 PM
Size
8 KB
Mime Type
text/x-diff
Expires
Fri, Aug 29, 4:18 PM (7 h, 2 m)
Engine
blob
Format
Raw Data
Handle
716964
Attached To
rTSIM Themes.Simple
simple
View Options
Index: branches/1.2.x/designs/default_design_inner.des.tpl
===================================================================
--- branches/1.2.x/designs/default_design_inner.des.tpl (revision 15271)
+++ branches/1.2.x/designs/default_design_inner.des.tpl (revision 15272)
@@ -1,91 +1,91 @@
<inp2:m_CheckSSL/>
<inp2:m_Include template="elements/side_boxes.elm" strip_nl="1"/> <!--## includes system elements ##-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>
- <inp2:st_PageInfo type="title"/> (<inp2:m_GetConfig name="Site_Name"/>)
+ <inp2:st_PageInfo type="htmlhead_title" html_escape="1"/> (<inp2:m_GetConfig name="Site_Name"/>)
</title>
<inp2:m_Include template="elements/html_head.elm" />
</head>
<body>
<inp2:st_EditPage mode="start"/><!--## System tag please do not remove ##-->
<!-- Wrapper -->
<div id="wrapper">
<!-- Accessibility Navigation -->
<ol id="nav-accessibility">
<li><a href="#nav">Skip to navigation</a></li>
<li><a href="#content">Skip to content</a></li>
</ol>
<!-- /Accessibility Navigation -->
<!-- Masthead -->
<div id="masthead">
<!-- Branding -->
<h1 id="branding">
<a href="<inp2:m_Link t="index" />" title="<inp2:m_GetConfig name="Site_Name"/>"><inp2:m_GetConfig name="Site_Name"/></a>
</h1>
<!-- /Branding -->
<!-- Navigation -->
<inp2:m_include template="elements/navigation_menu.elm" />
<!-- /Navigation -->
<!-- Search -->
<inp2:m_include template="elements/search.elm" />
<!-- /Search -->
</div>
<!-- /Masthead -->
<!-- Breadcrumb -->
<inp2:m_Include template="elements/navigation_bar.elm" />
<!-- /Breadcrumb -->
<!-- Content Tools -->
<inp2:m_Include template="elements/content_tools.elm" />
<!-- /Content Tools -->
<!-- Content -->
<div id="content">
<div id="content-sec">
<div class="movable-area">
<inp2:m_RenderElement name="left_sidebar" default_element="default_left_sidebar" /> <!--## defined in each data template or default one used ##-->
</div>
</div>
<!-- Main Content -->
<div id="content-main" class="inner">
<div class="movable-area">
<inp2:m_RenderElement name="content"/>
</div>
</div>
<!-- /Main Content -->
</div><!-- /Content -->
<inp2:m_Include template="elements/footer.elm" />
</div><!-- /Wrapper -->
<inp2:st_EditPage mode="end"/> <!--## /System tag please do not remove ##-->
<inp2:m_Include template="elements/tracking.elm" />
</body>
</html>
\ No newline at end of file
Index: branches/1.2.x/designs/default_design.des.tpl
===================================================================
--- branches/1.2.x/designs/default_design.des.tpl (revision 15271)
+++ branches/1.2.x/designs/default_design.des.tpl (revision 15272)
@@ -1,102 +1,102 @@
<inp2:m_CheckSSL/>
<inp2:m_Include template="elements/side_boxes.elm" strip_nl="1"/> <!--## includes system elements ##-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
<title>
- <inp2:st_PageInfo type="title"/> (<inp2:m_GetConfig name="Site_Name"/>)
+ <inp2:st_PageInfo type="htmlhead_title" html_escape="1"/> (<inp2:m_GetConfig name="Site_Name"/>)
</title>
<inp2:m_Include template="elements/html_head.elm" />
<inp2:m_DefineElement name="default_add_to_head"></inp2:m_DefineElement>
<inp2:m_RenderElement name="add_to_head" default_element="default_add_to_head"/>
</head>
<body>
<inp2:st_EditPage mode="start"/><!--## System tag please do not remove ##-->
<!-- Wrapper -->
<div id="wrapper">
<!-- Accessibility Navigation -->
<ol id="nav-accessibility">
<li><a href="#nav">Skip to navigation</a></li>
<li><a href="#content">Skip to content</a></li>
</ol>
<!-- /Accessibility Navigation -->
<!-- Masthead -->
<div id="masthead">
<!-- Branding -->
<h1 id="branding">
<a href="<inp2:m_Link t="index" />" title="<inp2:m_GetConfig name="Site_Name"/>"><inp2:m_GetConfig name="Site_Name"/></a>
</h1>
<!-- /Branding -->
<!-- Navigation -->
<inp2:m_include template="elements/navigation_menu.elm" />
<!-- /Navigation -->
<!-- Search -->
<inp2:m_include template="elements/search.elm" />
<!-- /Search -->
</div>
<!-- /Masthead -->
<!-- Breadcrumb -->
<inp2:m_Include template="elements/navigation_bar.elm" />
<!-- /Breadcrumb -->
<!-- Content Tools -->
<inp2:m_Include template="elements/content_tools.elm" />
<!-- /Content Tools -->
<!-- Content -->
<div id="content">
<div id="content-sec">
<div class="movable-area">
<inp2:m_RenderElement name="left_sidebar" default_element="default_left_sidebar" /> <!--## defined in each data template or default one used ##-->
</div>
</div>
<!-- Main Content -->
<div id="content-main">
<div class="movable-area">
<inp2:m_RenderElement name="content"/>
</div>
</div>
<!-- /Main Content -->
<div id="content-ter">
<div class="movable-area">
<inp2:m_Include template="elements/side_boxes/news.elm" />
</div>
</div>
</div><!-- /Content -->
<inp2:m_Include template="elements/footer.elm" />
</div><!-- /Wrapper -->
<inp2:st_EditPage mode="end"/> <!--## /System tag please do not remove ##-->
<inp2:m_Include template="elements/tracking.elm" />
</body>
</html>
\ No newline at end of file
Index: branches/1.2.x/elements/navigation_bar.elm.tpl
===================================================================
--- branches/1.2.x/elements/navigation_bar.elm.tpl (revision 15271)
+++ branches/1.2.x/elements/navigation_bar.elm.tpl (revision 15272)
@@ -1,33 +1,55 @@
-<inp2:m_DefaultParam titles="" templates="" show_category="0"/>
+<inp2:m_DefaultParam titles="" templates="" show_category="0" category_title="MenuTitle"/>
-<inp2:m_DefineElement name="root_category">
- <a href="<inp2:c_CategoryLink template="__default__" />"><inp2:m_Phrase name="lu_rootcategory_name"/></a>
+<inp2:m_DefineElement name="nb_current_element">
+ <inp2:m_ifnot check="m_Param" name="is_first">
+ <inp2:m_param name="separator"/>
+ </inp2:m_ifnot>
+
+ <inp2:m_param name="title"/>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="module_root">
- <inp2:m_param name="separator"/>
- <a href="<inp2:c_CategoryLink template="$module_index" cat_id="$cat_id"/>"><inp2:m_param name="title"/></a>
+<inp2:m_DefineElement name="nb_element">
+ <inp2:m_ifnot check="m_Param" name="is_first">
+ <inp2:m_param name="separator"/>
+ </inp2:m_ifnot>
+
+ <a href="<inp2:m_Link template='$template' m_cat_id='0" m_cat_page='1'/>"><inp2:m_param name="title"/></a>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="nav_link">
- <inp2:m_param name="separator"/>
- <inp2:m_if check="m_Param" name="category">
- <a href="<inp2:c_CategoryLink template="__default__" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
- <inp2:m_else/>
- <a href="<inp2:m_Link template="$template" m_cat_id="0" m_cat_page="1"/>"><inp2:m_param name="title"/></a>
- </inp2:m_if>
+<inp2:m_DefineElement name="nb_category_element">
+ <inp2:m_ifnot check="m_Param" name="is_first">
+ <inp2:m_param name="separator"/>
+ </inp2:m_ifnot>
+
+ <a href="<inp2:c_CategoryLink template='__default__' m_cat_page='1'/>"><inp2:m_param name="title"/></a>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="module_item">
- <inp2:m_param name="separator"/>
+<inp2:m_DefineElement name="nb_module_item_element">
<a href="<inp2:{$prefix}_ItemLink template="$template" />"><inp2:m_param name="title"/></a>
</inp2:m_DefineElement>
-<inp2:m_DefineElement name="current_item">
- <inp2:m_param name="separator"/>
- <inp2:m_param name="title"/>
+<inp2:m_DefineElement name="nb_custom_element">
+ <inp2:m_ifnot check="m_Param" name="is_first">
+ <inp2:m_param name="separator"/>
+ </inp2:m_ifnot>
+
+ <inp2:m_if check="m_Param" name="title" equals_to="__page__">
+ <a href="<inp2:m_Link template='$template' m_cat_id='0' m_cat_page='1'/>"><inp2:st_PageInfo type="title"/></a>
+ <inp2:m_elseif check="m_Param" name="title" equals_to="__item__"/>
+ <inp2:c_CategoryItemElement render_as="nb_module_item_element" pass_params="1"/>
+ </inp2:m_if>
</inp2:m_DefineElement>
<p id="breadcrumb">
- <inp2:c_CategoryPath separator=">" render_as="nav_link" current_render_as="current_item" module_item_render_as="module_item" root_cat_render_as="root_category" titles="$titles" templates="$templates" show_category="$show_category"/>
-</p>
+ <inp2:c_CategoryPath
+ separator=">"
+ render_as="nb_element"
+ current_render_as="nb_current_element"
+
+ category_render_as="nb_category_element"
+ custom_render_as="nb_custom_element"
+
+ titles="$titles" templates="$templates"
+ show_category="$show_category" category_title="$category_title"
+ />
+</p>
\ No newline at end of file
Event Timeline
Log In to Comment