mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

Remove user.css reference and theme options

Browse Source 
Affected themes: bulletproof, 2k11, next

These themes will use the core method of including the user.css in
serendipity.css starting with 2.0.1. A note has been added to all
three themes' theme options to document that the possibility of a
user.css exists.

References #280
This commit is contained in:
Matthias Mees 2015-02-11 16:10:58 +01:00
parent c079c2e8b7
commit 0e66dbd79a
22 changed files with 459 additions and 480 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
templates/2k11/UTF-8/lang_de.inc.php
View File

@ -1,5 +1,6 @@
<?php
// Theme-Optionen
@define('TWOK11_INSTR', 'Um 2k11 updatesicher um eigene Styles zu erweitern kann eine Datei <code>/templates/2k11/user.css</code> angelegt werden; diese wird automagisch von s9y eingebunden.');
@define('TWOK11_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1120 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
@define('TWOK11_USE_CORENAV', 'Globale Navigation einbinden?');
@define('TWOK11_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');

1
templates/2k11/UTF-8/lang_en.inc.php
View File

@ -1,5 +1,6 @@
<?php
// Theme options
@define('TWOK11_INSTR', 'To extend 2k11 with your own styles in an update-safe way, you can add a file <code>/templates/2k11/user.css</code>; it will be included automagically by s9y.');
@define('TWOK11_HEADER_IMG','Use a banner image in the header? (1120 pixels wide; leave box empty to not use a banner)');
@define('TWOK11_USE_CORENAV', 'Use global navigation?');
@define('TWOK11_WEBFONTS', 'Use a webfont, hosted by Google?');

12
templates/2k11/config.inc.php
View File

@ -29,6 +29,12 @@ if (is_array($required_fieldlist)) {
$serendipity['smarty']->assign('is_templatechooser', $_SESSION['serendipityUseTemplate']);
$template_config = array(
array(
'var' => 'infotwok',
'name' => 'infotwok',
'type' => 'custom',
'custom' => TWOK11_INSTR,
),
array(
'var' => 'date_format',
'name' => GENERAL_PLUGIN_DATEFORMAT . " (http://php.net/strftime)",
@ -65,12 +71,6 @@ $template_config = array(
'ubuntu' => 'Ubuntu',
'dserif' => 'Droid Serif')
),
array(
'var' => 'userstyles',
'name' => TWOK11_USERSTYLES,
'type' => 'boolean',
'default' => false
),
array(
'var' => 'imgstyle',
'name' => TWOK11_IMGSTYLE,

3
templates/2k11/index.tpl
View File

@ -23,9 +23,6 @@
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic">
{/if}
<link rel="stylesheet" href="{$head_link_stylesheet}">
{if $template_option.userstyles == true}
<link rel="stylesheet" href="{serendipity_getFile file="user.css"}">
{/if}
<script src="{serendipity_getFile file="js/modernizr-2.7.1.min.js"}"></script>
<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">

1
templates/2k11/lang_de.inc.php
View File

@ -1,5 +1,6 @@
<?php
// Theme-Optionen
@define('TWOK11_INSTR', 'Um 2k11 updatesicher um eigene Styles zu erweitern kann eine Datei <code>/templates/2k11/user.css</code> angelegt werden; diese wird automagisch von s9y eingebunden.');
@define('TWOK11_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1120 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
@define('TWOK11_USE_CORENAV', 'Globale Navigation einbinden?');
@define('TWOK11_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');

1
templates/2k11/lang_en.inc.php
View File

@ -1,5 +1,6 @@
<?php
// Theme options
@define('TWOK11_INSTR', 'To extend 2k11 with your own styles in an update-safe way, you can add a file <code>/templates/2k11/user.css</code>; it will be included automagically by s9y.');
@define('TWOK11_HEADER_IMG','Use a banner image in the header? (1120 pixels wide; leave box empty to not use a banner)');
@define('TWOK11_USE_CORENAV', 'Use global navigation?');
@define('TWOK11_WEBFONTS', 'Use a webfont, hosted by Google?');

3
templates/2k11/media_showitem.tpl
View File

@ -23,9 +23,6 @@
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic">
{/if}
<link rel="stylesheet" href="{$head_link_stylesheet}">
{if $template_option.userstyles == true}
<link rel="stylesheet" href="{serendipity_getFile file="user.css"}">
{/if}
<script src="{serendipity_getFile file="js/modernizr-2.7.1.min.js"}"></script>
{serendipity_hookPlugin hook="frontend_header"}
<script src="{$head_link_script}"></script>

3
templates/2k11/preview_iframe.tpl
View File

@ -22,9 +22,6 @@
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic">
{/if}
<link rel="stylesheet" href="{$serendipityHTTPPath}{$serendipityRewritePrefix}serendipity.css">
{if $template_option.userstyles == true}
<link rel="stylesheet" href="{serendipity_getFile file="user.css"}">
{/if}
<script src="{serendipity_getFile file="admin/js/modernizr-2.8.3.min.js"}"></script>
{serendipity_hookPlugin hook="backend_header" hookAll="true"}
<script src="{serendipity_getFile file='admin/js/plugins.js'}"></script>

2
templates/bulletproof/UTF-8/lang_de.inc.php
View File

@ -1,7 +1,7 @@
<?php
// Colorsets
@define('THEME_COLORSET', 'Farbwahl');
@define('USER_STYLESHEET','Zusätzliches Benutzerstylesheet einbinden. Dieses Stylesheet muss vom Benutzer im Theme-Verzeichnis angelegt werden. Es muss user.css heißen und kann benutzt werden, um ausgewählte Styles zu überschreiben.');
@define('USER_STYLESHEET','Um Bulletproof updatesicher um eigene Styles zu erweitern kann eine Datei <code>/templates/bulletproof/user.css</code> angelegt werden; diese wird automagisch von s9y eingebunden.');
// Layout
@define('LAYOUT_TYPE','Layout des Blogs (B = Blogeinträge, S = Seitenleiste, CF = Content first)');
@define('LAYOUT_SBS','Dreispaltig S-B-S');

2
templates/bulletproof/UTF-8/lang_en.inc.php
View File

@ -1,7 +1,7 @@
<?php
// Colorsets
@define('THEME_COLORSET', 'Colorset');
@define('USER_STYLESHEET','Use additional user stylesheet. Users have to create this stylesheet in the theme directory. It has to be named user.css and can be used to override selected styles.');
@define('USER_STYLESHEET','To extend Bulletproof with your own styles in an update-safe way, you can add a file <code>/templates/bulletproof/user.css</code>; it will be included automagically by s9y.');
// Layout
@define('LAYOUT_TYPE','Blog layout (B = Blog entriee, S = Sidebar, CF = Content first)');
@define('LAYOUT_SBS','Three columns S-B-S');

14
templates/bulletproof/config.inc.php
View File

@ -37,11 +37,17 @@ if ($serendipity['GET']['adminModule'] == 'templates' || $serendipity['POST']['a
}
$template_config_groups = array(
THEME_COLORSET => array('colorset', 'userstylesheet', 'layouttype', 'jscolumns'),
THEME_COLORSET => array('colorset', 'layouttype', 'jscolumns'),
THEME_HEADER => array('custheader', 'headerimage', 'headertype')
);
$template_config = array(
array(
'var' => 'infobp',
'name' => 'infobp',
'type' => 'custom',
'custom' => USER_STYLESHEET,
),
array(
'var' => 'colorset',
'name' => THEME_COLORSET,
@ -49,12 +55,6 @@ $template_config = array(
'default' => 'default',
'select_values' => $colorsets
),
array(
'var' => 'userstylesheet',
'name' => USER_STYLESHEET,
'type' => 'boolean',
'default' => 'false',
),
array(
'var' => 'layouttype',
'name' => LAYOUT_TYPE,

2
templates/bulletproof/index.tpl
View File

@ -50,8 +50,6 @@
{if $template_option.jscolumns == 'true'}<script type="text/javascript" src="{$serendipityHTTPPath}templates/{$template}/js/p7_eqCols2_10.js"></script>{/if}
<!-- print media stylesheet -->
<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="print.css"}" media="print" />
<!-- additional user stylesheet: this can be used to override selected styles -->
{if $template_option.userstylesheet == 'true'}<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="user.css"}" media="screen" />{/if}
</head>
<body{if $template_option.jscolumns == 'true'} onload="P7_equalCols2(0,{if $template_option.layouttype != '1col'}'content','DIV',{/if}'serendipityLeftSideBar','DIV','serendipityRightSideBar','DIV')"{/if}>

2
templates/bulletproof/lang_de.inc.php
View File

@ -1,7 +1,7 @@
<?php
// Colorsets
@define('THEME_COLORSET', 'Farbwahl');
@define('USER_STYLESHEET','Zusätzliches Benutzerstylesheet einbinden. Dieses Stylesheet muss vom Benutzer im Template-Verzeichnis angelegt werden. Es muss user.css heißen und kann benutzt werden, um ausgewählte Styles zu überschreiben.');
@define('USER_STYLESHEET','Um Bulletproof updatesicher um eigene Styles zu erweitern kann eine Datei <code>/templates/bulletproof/user.css</code> angelegt werden; diese wird automagisch von s9y eingebunden.');
// Layout
@define('LAYOUT_TYPE','Layout des Blogs (B = Blogeinträge, S = Seitenleiste, CF = Content first)');
@define('LAYOUT_SBS','Dreispaltig S-B-S');

2
templates/bulletproof/lang_en.inc.php
View File

@ -3,7 +3,7 @@
@define('THEME_COLORSET', 'Colorset');
@define('THEME_HEADER', 'Header');
@define('USER_STYLESHEET','Use additional user stylesheet. Users have to create this stylesheet in the theme directory. It has to be named user.css and can be used to override selected styles.');
@define('USER_STYLESHEET','To extend Bulletproof with your own styles in an update-safe way, you can add a file <code>/templates/bulletproof/user.css</code>; it will be included automagically by s9y.');
// Layout
@define('LAYOUT_TYPE','Blog layout (B = Blog entriee, S = Sidebar, CF = Content first)');
@define('LAYOUT_SBS','Three columns S-B-S');

2
templates/bulletproof/preview_iframe.tpl
View File

@ -18,8 +18,6 @@
<![endif]-->
<!-- additional colorset stylesheet -->
<link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}templates/{$template}/{$template_option.colorset}_style.css" />
<!-- additional user stylesheet: this can be used to override selected styles -->
{if $template_option.userstylesheet == 'true'}<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="user.css"}" media="screen" />{/if}
<script type="text/javascript">
window.onload = function() {ldelim}

2
templates/next/UTF-8/lang_de.inc.php
View File

@ -1,6 +1,6 @@
<?php
// Theme-Optionen
@define('NEXT_INSTR', '<b>Hinweis:</b> Next mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.');
@define('NEXT_INSTR', '<b>Hinweis:</b> Next mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.<br>Um Next updatesicher um eigene Styles zu erweitern kann eine Datei <code>/templates/next/user.css</code> angelegt werden; diese wird automagisch von s9y eingebunden.');
@define('NEXT_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1296 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
@define('NEXT_USE_CORENAV', 'Globale Navigation einbinden?');
@define('NEXT_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');

2
templates/next/UTF-8/lang_en.inc.php
View File

@ -1,6 +1,6 @@
<?php
// Theme options
@define('NEXT_INSTR', '<b>Hinweis:</b> While Next may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.');
@define('NEXT_INSTR', '<b>Hinweis:</b> While Next may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.<br>To extend Next with your own styles in an update-safe way, you can add a file <code>/templates/next/user.css</code>; it will be included automagically by s9y.');
@define('NEXT_HEADER_IMG','Use a banner image in the header? (1296 pixels wide; leave box empty to not use a banner)');
@define('NEXT_USE_CORENAV', 'Use global navigation?');
@define('NEXT_WEBFONTS', 'Use a webfont, hosted by Google?');

6
templates/next/config.inc.php
View File

@ -82,12 +82,6 @@ $template_config = array(
'mserif' => 'Merriweather',
'dserif' => 'Droid Serif')
),
array(
'var' => 'userstyles',
'name' => NEXT_USERSTYLES,
'type' => 'boolean',
'default' => false
),
array(
'var' => 'refcomments',
'name' => NEXT_REFCOMMENTS,

3
templates/next/index.tpl
View File

@ -25,9 +25,6 @@
<!--[if lte IE 8]>
<link rel="stylesheet" href="{serendipity_getFile file="oldie.css"}">
<![endif]-->
{if $template_option.userstyles == true}
<link rel="stylesheet" href="{serendipity_getFile file="user.css"}">
{/if}
<script src="{serendipity_getFile file="scripts/modernizr/modernizr.js"}"></script>
<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">

2
templates/next/lang_de.inc.php
View File

@ -1,6 +1,6 @@
<?php
// Theme-Optionen
@define('NEXT_INSTR', '<b>Hinweis:</b> Next mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.');
@define('NEXT_INSTR', '<b>Hinweis:</b> Next mag <em>aussehen</em>, als sei es im Prinzip wie 2k11 - unter der Haube ist es (technisch gesehen) ein völlig anderes Theme. Es ist daher <strong>nicht</strong> kompatibel mit dem user.css-Generator für 2k11.<br>Um Next updatesicher um eigene Styles zu erweitern kann eine Datei <code>/templates/next/user.css</code> angelegt werden; diese wird automagisch von s9y eingebunden.');
@define('NEXT_HEADER_IMG','Bannergrafik im Kopfbereich einbinden? (1296 Pixel breit; Feld leeren um Ausgabe zu unterdrücken)');
@define('NEXT_USE_CORENAV', 'Globale Navigation einbinden?');
@define('NEXT_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');

2
templates/next/lang_en.inc.php
View File

@ -1,6 +1,6 @@
<?php
// Theme options
@define('NEXT_INSTR', '<b>Hinweis:</b> While Next may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.');
@define('NEXT_INSTR', '<b>Hinweis:</b> While Next may <em>look</em> as if it were basically the same as 2k11, it is a completely different theme from a technical point of view. Because of that, it is <strong>not</strong> compatible with the user.css generator for 2k11.<br>To extend Next with your own styles in an update-safe way, you can add a file <code>/templates/next/user.css</code>; it will be included automagically by s9y.');
@define('NEXT_HEADER_IMG','Use a banner image in the header? (1296 pixels wide; leave box empty to not use a banner)');
@define('NEXT_USE_CORENAV', 'Use global navigation?');
@define('NEXT_WEBFONTS', 'Use a webfont, hosted by Google?');

3
templates/next/preview_iframe.tpl
View File

@ -23,9 +23,6 @@
<!--[if lte IE 8]>
<link rel="stylesheet" href="{serendipity_getFile file="oldie.css"}">
<![endif]-->
{if $template_option.userstyles == true}
<link rel="stylesheet" href="{serendipity_getFile file="user.css"}">
{/if}
<script src="{serendipity_getFile file="scripts/modernizr/modernizr.js"}"></script>
{serendipity_hookPlugin hook="backend_header" hookAll="true"}
<script src="{serendipity_getFile file='admin/js/plugins.js'}"></script>