Index: advanced/platform/designs/default_design.des.tpl =================================================================== --- advanced/platform/designs/default_design.des.tpl (revision 15256) +++ advanced/platform/designs/default_design.des.tpl (working copy) @@ -14,7 +14,7 @@ - + <inp2:m_GetConfig name="Site_Name"/> :: <inp2:m_RenderElement name="page_title" default_element="cms_page_title" no_editing="1"/> @@ -39,7 +39,7 @@ - + Index: advanced/platform/designs/form.tpl =================================================================== --- advanced/platform/designs/form.tpl (revision 15246) +++ advanced/platform/designs/form.tpl (working copy) @@ -10,12 +10,6 @@ - - - - - -
Index: advanced/platform/designs/general.tpl =================================================================== --- advanced/platform/designs/general.tpl (revision 15246) +++ advanced/platform/designs/general.tpl (working copy) @@ -3,11 +3,6 @@ General
Platform
##--> - - - - - Index: advanced/platform/elements/forms.elm.tpl =================================================================== --- advanced/platform/elements/forms.elm.tpl (revision 15246) +++ advanced/platform/elements/forms.elm.tpl (working copy) @@ -580,23 +580,23 @@ - - - + + + + - - + "> - - - - - + + + + + Index: advanced/platform/elements/navigation_bar.elm.tpl =================================================================== --- advanced/platform/elements/navigation_bar.elm.tpl (revision 15246) +++ advanced/platform/elements/navigation_bar.elm.tpl (working copy) @@ -1,38 +1,70 @@ - + - - img/icon_home.gif" width="9" height="9" alt=""/> "> + + + + + + + + - - - "> + + + + + + - - - - "> - - "> - + + + + + + "> - - + + + + + + + + + "> - - - + + + + + + + + + +
\ No newline at end of file Index: advanced/platform/elements/title_bar.elm.tpl =================================================================== --- advanced/platform/elements/title_bar.elm.tpl (revision 15246) +++ advanced/platform/elements/title_bar.elm.tpl (working copy) @@ -1,17 +1,9 @@ - - - - - - - - + + + + - - - - - \ No newline at end of file + \ No newline at end of file Index: advanced/platform/my_account/restore_email.tpl =================================================================== --- advanced/platform/my_account/restore_email.tpl (revision 15246) +++ advanced/platform/my_account/restore_email.tpl (working copy) @@ -4,12 +4,6 @@
My Account
##--> - - - - - -
Index: advanced/platform/my_account/verify_email.tpl =================================================================== --- advanced/platform/my_account/verify_email.tpl (revision 15246) +++ advanced/platform/my_account/verify_email.tpl (working copy) @@ -4,12 +4,6 @@
My Account
##--> - - - - - -
Index: default/designs/default_design.des.tpl =================================================================== --- default/designs/default_design.des.tpl (revision 15246) +++ default/designs/default_design.des.tpl (working copy) @@ -5,7 +5,7 @@ " lang=""> - <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"/>) Index: modern-store/elements/content_boxes.elm.tpl =================================================================== --- modern-store/elements/content_boxes.elm.tpl (revision 15246) +++ modern-store/elements/content_boxes.elm.tpl (working copy) @@ -7,8 +7,6 @@ - - @@ -19,7 +17,7 @@ - + Index: modern-store/elements/navigation_bar.elm.tpl =================================================================== --- modern-store/elements/navigation_bar.elm.tpl (revision 15246) +++ modern-store/elements/navigation_bar.elm.tpl (working copy) @@ -1,35 +1,60 @@ - + - - "> + + + + + + - - "> + + + + + + "> - - - - "> - - "> - + + + + + + - - "> + + "> - - + + + + + + + + + +

- + - - + category_render_as="nb_category_element" + custom_render_as="nb_custom_element" + titles="$titles" templates="$templates" + show_category="$show_category" category_title="$category_title" + /> + + + + +

\ No newline at end of file Index: modern-store/elements/title_bar.elm.tpl =================================================================== --- modern-store/elements/title_bar.elm.tpl (revision 15246) +++ modern-store/elements/title_bar.elm.tpl (working copy) @@ -1,12 +1,9 @@ - - - - + + + + + - - - - - \ No newline at end of file + \ No newline at end of file Index: modern-store/index.tpl =================================================================== --- modern-store/index.tpl (revision 15246) +++ modern-store/index.tpl (working copy) @@ -4,10 +4,6 @@
##--> - - - - Index: modern-store/products/compare.tpl =================================================================== --- modern-store/products/compare.tpl (revision 15246) +++ modern-store/products/compare.tpl (working copy) @@ -3,7 +3,6 @@ Product comparison page
Pages||Compare Products
##--> - Index: simple/designs/default_design.des.tpl =================================================================== --- simple/designs/default_design.des.tpl (revision 15246) +++ simple/designs/default_design.des.tpl (working copy) @@ -8,7 +8,7 @@ - <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"/>) Index: simple/designs/default_design_inner.des.tpl =================================================================== --- simple/designs/default_design_inner.des.tpl (revision 15246) +++ simple/designs/default_design_inner.des.tpl (working copy) @@ -8,7 +8,7 @@ - <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"/>) Index: simple/elements/navigation_bar.elm.tpl =================================================================== --- simple/elements/navigation_bar.elm.tpl (revision 15246) +++ simple/elements/navigation_bar.elm.tpl (working copy) @@ -1,33 +1,55 @@ - + - - "> + + + + + + - - - "> + + + + + + "> - - - - "> - - "> - + + + + + + - - + "> - - - + + + + + + + + + + + +

\ No newline at end of file