Page MenuHomeIn-Portal Phabricator

default
No OneTemporary

File Metadata

Created
Wed, Feb 12, 5:17 AM
Index: branches/5.2.x/elements/html_head.elm.tpl
===================================================================
--- branches/5.2.x/elements/html_head.elm.tpl (revision 14562)
+++ branches/5.2.x/elements/html_head.elm.tpl (revision 14563)
@@ -1,30 +1,33 @@
<inp2:m_if check="c.current_Field" name="MetaKeywords">
<meta name="Keywords" content="<inp2:c.current_Field name='MetaKeywords'/>"/>
<inp2:m_else/>
<meta name="Keywords" content="<inp2:m_GetConfig name='Category_MetaKey'/>"/>
</inp2:m_if>
<inp2:m_if check="c.current_Field" name="MetaDescription">
<meta name="Description" content="<inp2:c.current_Field name='MetaDescription'/>"/>
<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'/>"/>
<meta http-equiv="content-type" content="text/html; charset=<inp2:lang.current_Field name='Charset'/>" />
+<link rel="icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
+<link rel="shortcut icon" href="<inp2:m_BaseURL/>favicon.ico" type="image/x-icon" />
+
<!-- CSS -->
<link rel="stylesheet" type="text/css" href="<inp2:m_Compress files='inc/reset.css|inc/styles.css'/>" media="screen" charset="<inp2:lang.current_Field name='Charset'/>"/>
<!-- JS FOR ADMIN -->
<inp2:st_EditingScripts/>
<!-- JS FOR FRONT -->
<inp2:m_ifnot check="m_GetConst" name="EDITING_MODE"> <!--## EXCLUDE THIS JS WHEN IN ADMIN ##-->
<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/js/jquery.pack.js"></script>
<script type="text/javascript" src="<inp2:m_TemplatesBase />inc/js/jcookie.js"></script>
</inp2:m_ifnot> <!--## //EXCLUDE THIS JS WHEN IN ADMIN ##-->
<script type="text/javascript">
$(document).ready(function() {
$('li.active').prev('li').addClass('beforeactive');
});
</script>
\ No newline at end of file
Index: branches/5.2.x
===================================================================
--- branches/5.2.x (revision 14562)
+++ branches/5.2.x (revision 14563)
Property changes on: branches/5.2.x
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,2 ##
Merged /themes/default/releases/5.1.2:r14304-14562
Merged /themes/default/branches/5.1.x:r14069-14303

Event Timeline