[ticket/13955] Fix javascript to conform to Google and add simple_header

Fix the javascript code to conform to Google Fonts standard
Add code to fix simple_header

PHPBB3-13955
This commit is contained in:
Kailey Truscott 2015-07-06 00:43:29 -04:00
parent b346f216c2
commit 886ca1dbb9
2 changed files with 20 additions and 20 deletions

View file

@ -28,19 +28,19 @@
--> -->
<!-- IF S_ALLOW_CDN --> <!-- IF S_ALLOW_CDN -->
<script> <script type="text/javascript">
WebFontConfig = { WebFontConfig = {
google: { google: { families: [ 'Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic' ] }
families: ['Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic']
}
}; };
(function() {
(function(d) { var wf = document.createElement('script');
var wf = d.createElement('script'), s = d.scripts[0]; wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js'; '://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
wf.async = true; wf.type = 'text/javascript';
wf.async = 'true';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(wf, s); s.parentNode.insertBefore(wf, s);
})(document); })();
</script> </script>
<!-- ENDIF --> <!-- ENDIF -->
<link href="{T_STYLESHEET_LINK}" rel="stylesheet"> <link href="{T_STYLESHEET_LINK}" rel="stylesheet">

View file

@ -7,19 +7,19 @@
<title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title> <title>{SITENAME} &bull; <!-- IF S_IN_MCP -->{L_MCP} &bull; <!-- ELSEIF S_IN_UCP -->{L_UCP} &bull; <!-- ENDIF -->{PAGE_TITLE}</title>
<!-- IF S_ALLOW_CDN --> <!-- IF S_ALLOW_CDN -->
<script> <script type="text/javascript">
WebFontConfig = { WebFontConfig = {
google: { google: { families: [ 'Open+Sans:600:cyrillic-ext,latin,greek-ext,greek,vietnamese,latin-ext,cyrillic' ] }
families: ['Open Sans:n6']
}
}; };
(function() {
(function(d) { var wf = document.createElement('script');
var wf = d.createElement('script'), s = d.scripts[0]; wf.src = ('https:' == document.location.protocol ? 'https' : 'http') +
wf.src = 'https://ajax.googleapis.com/ajax/libs/webfont/1.5.18/webfont.js'; '://ajax.googleapis.com/ajax/libs/webfont/1/webfont.js';
wf.async = true; wf.type = 'text/javascript';
wf.async = 'true';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(wf, s); s.parentNode.insertBefore(wf, s);
})(document); })();
</script> </script>
<!-- ENDIF --> <!-- ENDIF -->
<link href="{T_STYLESHEET_LINK}" rel="stylesheet"> <link href="{T_STYLESHEET_LINK}" rel="stylesheet">