Page MenuHomeIn-Portal Phabricator
Files F803828

D467.id1200.diff
No OneTemporary
Actions

File Metadata

Created
Wed, Feb 26, 8:59 AM

D467.id1200.diff
View Options

Index: core/admin_templates/incs/header.tpl
===================================================================
--- core/admin_templates/incs/header.tpl
+++ core/admin_templates/incs/header.tpl
@@ -4,7 +4,7 @@
<inp2:m_DefaultParam body_properties=""/>
<html>
<head>
-<title><inp2:m_GetConfig var="Site_Name"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/></title>
+<title><inp2:m_WebsiteNameWithoutHTML html_escape="1"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/></title>
<meta http-equiv="content-type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>"/>
<meta name="keywords" content="..."/>
@@ -59,7 +59,7 @@
$use_popups = <inp2:m_if check="adm_UsePopups">true<inp2:m_else/>false</inp2:m_if>,
$modal_windows = <inp2:m_if check="adm_UsePopups" mode="modal">true<inp2:m_else/>false</inp2:m_if>,
multiple_windows = '1',
- main_title = '<inp2:m_GetConfig var="Site_Name" js_escape="1"/>',
+ main_title = '<inp2:m_WebsiteNameWithoutHTML js_escape="1"/>',
tpl_changed = 0,
base_url = '<inp2:m_BaseURL/>',
$base_path = '<inp2:m_GetConst name="BASE_PATH"/>',
Index: core/admin_templates/index.tpl
===================================================================
--- core/admin_templates/index.tpl
+++ core/admin_templates/index.tpl
@@ -7,7 +7,7 @@
<html>
<head>
<meta http-equiv="content-type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>">
- <title><inp2:m_GetConfig var="Site_Name"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/></title>
+ <title><inp2:m_WebsiteNameWithoutHTML html_escape="1"/> - <inp2:m_Phrase label="la_AdministrativeConsole"/></title>
<inp2:m_base_ref/>
<link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
Index: core/admin_templates/login.tpl
===================================================================
--- core/admin_templates/login.tpl
+++ core/admin_templates/login.tpl
@@ -105,13 +105,13 @@
<table class="head-table" style="background: none;">
<tr>
<inp2:m_if check="adm_AdminSkin" type="LogoLogin">
- <td align="center"><img src="<inp2:adm_AdminSkin type='LogoLogin'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>"></td>
+ <td align="center"><img src="<inp2:adm_AdminSkin type='LogoLogin'/>" alt="<inp2:m_WebsiteNameWithoutHTML html_escape='1'/>"></td>
<inp2:m_else/>
<inp2:m_if check="adm_AdminSkin" type="Logo">
<td>
- <img src="<inp2:adm_AdminSkin type='Logo'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>"><br/>
+ <img src="<inp2:adm_AdminSkin type='Logo'/>" alt="<inp2:m_WebsiteNameWithoutHTML html_escape='1'/>"><br/>
<inp2:m_if check="adm_AdminSkin" type="LogoBottom">
- <img src="<inp2:adm_AdminSkin type='LogoBottom'/>" alt="<inp2:m_GetConfig var='Site_Name' html_escape='1'/>">
+ <img src="<inp2:adm_AdminSkin type='LogoBottom'/>" alt="<inp2:m_WebsiteNameWithoutHTML html_escape='1'/>">
</inp2:m_if>
</td>
</inp2:m_if>
@@ -262,4 +262,4 @@
</script>
</inp2:m_if>
-<inp2:m_include t="incs/footer"/>
\ No newline at end of file
+<inp2:m_include t="incs/footer"/>
Index: core/kernel/processors/main_processor.php
===================================================================
--- core/kernel/processors/main_processor.php
+++ core/kernel/processors/main_processor.php
@@ -1292,4 +1292,17 @@
{
return $this->Application->Parser->blockFound($params['name']);
}
+
+ /**
+ * Returns website name without HTML.
+ *
+ * @param array $params Tag params.
+ *
+ * @return string
+ */
+ protected function WebsiteNameWithoutHTML(array $params)
+ {
+ return 'NEO: ' . strip_tags($this->Application->ConfigValue('Site_Name'));
+ }
+
}
Index: themes/advanced/in-news/elements/rss.xml.tpl
===================================================================
--- themes/advanced/in-news/elements/rss.xml.tpl
+++ themes/advanced/in-news/elements/rss.xml.tpl
@@ -1,9 +1,9 @@
<inp2:m_XMLTemplate xml_version="1.0"/>
<rss version="2.0">
<channel>
- <title><inp2:m_GetConfig name="Site_Name"/></title>
+ <title><inp2:m_WebsiteNameWithoutHTML html_escape="1"/></title>
<link><inp2:c_CategoryLink template="in-news/designs/section"/></link>
- <generator><inp2:m_GetConfig name="Site_Name"/></generator>
+ <generator><inp2:m_WebsiteNameWithoutHTML html_escape="1"/></generator>
<managingEditor><inp2:m_GetConfig name="DefaultEmailSender"/></managingEditor>
<webMaster><inp2:m_GetConfig name="DefaultEmailSender"/>m</webMaster>
Index: themes/advanced/platform/designs/default_design.des.tpl
===================================================================
--- themes/advanced/platform/designs/default_design.des.tpl
+++ themes/advanced/platform/designs/default_design.des.tpl
@@ -17,7 +17,7 @@
<inp2:st_PageInfo type="htmlhead_title" html_escape="1"/>
</inp2:m_DefineElement>
- <title><inp2:m_GetConfig name="Site_Name"/> :: <inp2:m_RenderElement name="page_title" default_element="cms_page_title" no_editing="1"/></title>
+ <title><inp2:m_WebsiteNameWithoutHTML html_escape="1"/> :: <inp2:m_RenderElement name="page_title" default_element="cms_page_title" no_editing="1"/></title>
<!--## Include module specific HEADER (META INFORMATION inside) template ##-->
<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
Index: themes/advanced/platform/designs/popup_design.des.tpl
===================================================================
--- themes/advanced/platform/designs/popup_design.des.tpl
+++ themes/advanced/platform/designs/popup_design.des.tpl
@@ -6,7 +6,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>
- <inp2:m_GetConfig name="Site_Name"/>
+ <inp2:m_WebsiteNameWithoutHTML html_escape="1"/>
</title>
<meta http-equiv="Content-Type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>" />
<inp2:m_ModuleInclude template="elements/html_head.elm" in-portal_template="platform/elements/html_head.elm"/>
@@ -21,4 +21,4 @@
<a href="<inp2:m_Link/>" onclick="window.close(); return false;"><inp2:m_Phrase name="lu_btn_CloseWindow"/></a>
</div>
</body>
-</html>
\ No newline at end of file
+</html>
Index: themes/advanced/platform/elements/header.elm.tpl
===================================================================
--- themes/advanced/platform/elements/header.elm.tpl
+++ themes/advanced/platform/elements/header.elm.tpl
@@ -1,7 +1,7 @@
<table class="top-background fullwidth">
<tr>
<td width="240" nowrap>
- <a href="<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>"><img src="<inp2:m_TemplatesBase module='In-Portal'/>img/globe.gif" alt="<inp2:m_GetConfig name='Site_Name' html_escape='1'/>" /><img src="<inp2:m_TemplatesBase module='In-Portal'/>img/logo.gif" alt="<inp2:m_GetConfig name='Site_Name' html_escape='1'/>" /></a><br />
+ <a href="<inp2:m_Link template='index' m_cat_id='0' m_cat_page='1'/>"><img src="<inp2:m_TemplatesBase module='In-Portal'/>img/globe.gif" alt="<inp2:m_WebsiteNameWithoutHTML html_escape='1'/>" /><img src="<inp2:m_TemplatesBase module='In-Portal'/>img/logo.gif" alt="<inp2:m_WebsiteNameWithoutHTML html_escape='1'/>" /></a><br />
</td>
<!-- TOP-BANNER -->
@@ -59,4 +59,4 @@
</td>
</tr>
-</table>
\ No newline at end of file
+</table>
Index: themes/default/designs/default_design.des.tpl
===================================================================
--- themes/default/designs/default_design.des.tpl
+++ themes/default/designs/default_design.des.tpl
@@ -5,7 +5,7 @@
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<inp2:lang.current_Field name="Locale" db="1"/>" lang="<inp2:lang.current_Field name="Locale" db="1"/>">
<head>
<title>
- <inp2:st_PageInfo type="htmlhead_title" html_escape="1"/> (<inp2:m_GetConfig name="Site_Name"/>)
+ <inp2:st_PageInfo type="htmlhead_title" html_escape="1"/> (<inp2:m_WebsiteNameWithoutHTML html_escape="1"/>)
</title>
<inp2:m_Include template="elements/html_head.elm" />
@@ -49,4 +49,4 @@
<inp2:m_Include template="elements/tracking.elm" />
</body>
-</html>
\ No newline at end of file
+</html>
Index: themes/default/elements/html_head.elm.tpl
===================================================================
--- themes/default/elements/html_head.elm.tpl
+++ themes/default/elements/html_head.elm.tpl
@@ -8,7 +8,7 @@
<inp2:m_else/>
<meta name="Description" content="<inp2:m_GetConfig name='Category_MetaDesc'/>"/>
</inp2:m_if>
-<meta name="author" content="<inp2:m_GetConfig name='Site_Name' html_escape='1'/>"/>
+<meta name="author" content="<inp2:m_WebsiteNameWithoutHTML html_escape='1'/>"/>
<meta http-equiv="content-type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>" />
<link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
@@ -30,4 +30,4 @@
$(document).ready(function() {
$('li.active').prev('li').addClass('beforeactive');
});
-</script>
\ No newline at end of file
+</script>
Index: themes/simple/designs/default_design.des.tpl
===================================================================
--- themes/simple/designs/default_design.des.tpl
+++ themes/simple/designs/default_design.des.tpl
@@ -8,7 +8,7 @@
<head>
<title>
- <inp2:st_PageInfo type="htmlhead_title" html_escape="1"/> (<inp2:m_GetConfig name="Site_Name"/>)
+ <inp2:st_PageInfo type="htmlhead_title" html_escape="1"/> (<inp2:m_WebsiteNameWithoutHTML html_escape="1"/>)
</title>
@@ -36,7 +36,7 @@
<!-- Branding -->
<h1 id="branding">
- <a href="<inp2:m_Link t='index' />" title="<inp2:m_GetConfig name='Site_Name' html_escape='1'/>"><inp2:m_GetConfig name="Site_Name"/></a>
+ <a href="<inp2:m_Link t='index' />" title="<inp2:m_WebsiteNameWithoutHTML html_escape='1'/>"><inp2:m_GetConfig name="Site_Name"/></a>
</h1>
<!-- /Branding -->
@@ -99,4 +99,4 @@
<inp2:m_Include template="elements/tracking.elm" />
</body>
-</html>
\ No newline at end of file
+</html>
Index: themes/simple/designs/default_design_inner.des.tpl
===================================================================
--- themes/simple/designs/default_design_inner.des.tpl
+++ themes/simple/designs/default_design_inner.des.tpl
@@ -8,7 +8,7 @@
<head>
<title>
- <inp2:st_PageInfo type="htmlhead_title" html_escape="1"/> (<inp2:m_GetConfig name="Site_Name"/>)
+ <inp2:st_PageInfo type="htmlhead_title" html_escape="1"/> (<inp2:m_WebsiteNameWithoutHTML html_escape="1"/>)
</title>
@@ -33,7 +33,7 @@
<!-- Branding -->
<h1 id="branding">
- <a href="<inp2:m_Link t='index' />" title="<inp2:m_GetConfig name='Site_Name' html_escape='1'/>"><inp2:m_GetConfig name="Site_Name"/></a>
+ <a href="<inp2:m_Link t='index' />" title="<inp2:m_WebsiteNameWithoutHTML html_escape='1'/>"><inp2:m_GetConfig name="Site_Name"/></a>
</h1>
<!-- /Branding -->
@@ -88,4 +88,4 @@
<inp2:m_Include template="elements/tracking.elm" />
</body>
-</html>
\ No newline at end of file
+</html>
Index: themes/simple/elements/html_head.elm.tpl
===================================================================
--- themes/simple/elements/html_head.elm.tpl
+++ themes/simple/elements/html_head.elm.tpl
@@ -8,7 +8,7 @@
<inp2:m_else/>
<meta name="Description" content="<inp2:m_GetConfig name='Category_MetaDesc'/>"/>
</inp2:m_if>
-<meta name="author" content="<inp2:m_GetConfig name='Site_Name' html_escape='1'/>"/>
+<meta name="author" content="<inp2:m_WebsiteNameWithoutHTML html_escape='1'/>"/>
<meta http-equiv="content-type" content="text/html; charset=<inp2:m_GetConst name='CHARSET'/>" />
<link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
@@ -36,4 +36,4 @@
</inp2:m_ifnot> <!--## EXCLUDE JS WHEN IN ADMIN ##-->
<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/jquery/jcookie.js"></script>
-<script type="text/javascript" src="<inp2:m_Compress files='inc/general.js'/>"></script>
\ No newline at end of file
+<script type="text/javascript" src="<inp2:m_Compress files='inc/general.js'/>"></script>

Event Timeline

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