Skeleton: add theme option to disable Google webfonts.

Cherry-picked from master.
This commit is contained in:
Matthias Mees 2018-04-09 20:47:46 +02:00 committed by Thomas Hochstein
parent e24c9ddc13
commit f6f8bd8617
8 changed files with 18 additions and 4 deletions

View File

@ -1,2 +1,3 @@
<?php
@define('USE_CORENAV', 'Globale Navigation einbinden?');
@define('USE_GOOGLEFONTS', 'Google Webfonts einbinden?');

View File

@ -1,2 +1,3 @@
<?php
@define('USE_CORENAV', 'Use global navigation?');
@define('USE_GOOGLEFONTS', 'Use Google webfonts?');

View File

@ -44,6 +44,12 @@ $template_config = array(
'%m/%d/%Y' => '%m/%d/%Y',
'%Y-%m-%d' => '%Y-%m-%d')
),
array(
'var' => 'use_googlefonts',
'name' => USE_GOOGLEFONTS,
'type' => 'boolean',
'default' => false
),
array(
'var' => 'use_corenav',
'name' => USE_CORENAV,
@ -58,4 +64,4 @@ serendipity_loadGlobalThemeOptions($template_config, $template_loaded_config, $t
if ($_SESSION['serendipityUseTemplate']) {
$template_loaded_config['use_corenav'] = false;
}
}

View File

@ -17,7 +17,9 @@
{if ($view == "start")}
<link rel="canonical" href="{$serendipityBaseURL}">
{/if}
{if $template_option.use_googlefonts}
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:400,300,600">
{/if}
<link rel="stylesheet" href="{$head_link_stylesheet}">
<link rel="alternate" type="application/rss+xml" title="{$blogTitle} RSS feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/index.rss2">
<link rel="alternate" type="application/x.atom+xml" title="{$blogTitle} Atom feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml">
@ -83,4 +85,4 @@
{if $is_embedded != true}
</body>
</html>
{/if}
{/if}

View File

@ -1,5 +1,5 @@
Name: Skeleton
Author: Matthias Mees, based on http://getskeleton.com
Date: 2016-09-19
Date: 2018-04-10
Require Serendipity: 2.0
Recommended: Yes
Recommended: Yes

View File

@ -1,2 +1,3 @@
<?php
@define('USE_CORENAV', 'Globale Navigation einbinden?');
@define('USE_GOOGLEFONTS', 'Google Webfonts einbinden?');

View File

@ -1,2 +1,3 @@
<?php
@define('USE_CORENAV', 'Use global navigation?');
@define('USE_GOOGLEFONTS', 'Use Google webfonts?');

View File

@ -4,7 +4,9 @@
<meta charset="{$head_charset}">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title>
{if $template_option.use_googlefonts}
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Raleway:400,300,600">
{/if}
<link rel="stylesheet" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}serendipity.css">
{serendipity_hookPlugin hook="backend_header" hookAll="true"}
<script src="{serendipity_getFile file='admin/js/plugins.js'}"></script>