Remove user.css reference and theme options

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

View File

@ -1,5 +1,6 @@
<?php <?php
// Theme-Optionen // 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_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_USE_CORENAV', 'Globale Navigation einbinden?');
@define('TWOK11_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?'); @define('TWOK11_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');

View File

@ -1,5 +1,6 @@
<?php <?php
// Theme options // 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_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_USE_CORENAV', 'Use global navigation?');
@define('TWOK11_WEBFONTS', 'Use a webfont, hosted by Google?'); @define('TWOK11_WEBFONTS', 'Use a webfont, hosted by Google?');

View File

@ -29,6 +29,12 @@ if (is_array($required_fieldlist)) {
$serendipity['smarty']->assign('is_templatechooser', $_SESSION['serendipityUseTemplate']); $serendipity['smarty']->assign('is_templatechooser', $_SESSION['serendipityUseTemplate']);
$template_config = array( $template_config = array(
array(
'var' => 'infotwok',
'name' => 'infotwok',
'type' => 'custom',
'custom' => TWOK11_INSTR,
),
array( array(
'var' => 'date_format', 'var' => 'date_format',
'name' => GENERAL_PLUGIN_DATEFORMAT . " (http://php.net/strftime)", 'name' => GENERAL_PLUGIN_DATEFORMAT . " (http://php.net/strftime)",
@ -65,12 +71,6 @@ $template_config = array(
'ubuntu' => 'Ubuntu', 'ubuntu' => 'Ubuntu',
'dserif' => 'Droid Serif') 'dserif' => 'Droid Serif')
), ),
array(
'var' => 'userstyles',
'name' => TWOK11_USERSTYLES,
'type' => 'boolean',
'default' => false
),
array( array(
'var' => 'imgstyle', 'var' => 'imgstyle',
'name' => TWOK11_IMGSTYLE, 'name' => TWOK11_IMGSTYLE,
@ -100,7 +100,7 @@ $template_loaded_config = serendipity_loadThemeOptions($template_config, $serend
serendipity_loadGlobalThemeOptions($template_config, $template_loaded_config, $template_global_config); serendipity_loadGlobalThemeOptions($template_config, $template_loaded_config, $template_global_config);
// 2k11 shall be a re-usable frontend theme that other templates can inherit (through "Engine: 2k11" in their info.txt) // 2k11 shall be a re-usable frontend theme that other templates can inherit (through "Engine: 2k11" in their info.txt)
// If those themes use a custom config.inc.php file, they may need to declare their own pre-event-hooks. // If those themes use a custom config.inc.php file, they may need to declare their own pre-event-hooks.
// Since serendipity_plugin_api_pre_event_hook() is the advertised method for template authors to hook into // Since serendipity_plugin_api_pre_event_hook() is the advertised method for template authors to hook into
// 2k11 cannot declare this on its own. We rather use per-event hook functions now, which templates other than 2k11 // 2k11 cannot declare this on its own. We rather use per-event hook functions now, which templates other than 2k11
// (or other custom engines) should not use. // (or other custom engines) should not use.
@ -108,7 +108,7 @@ function serendipity_plugin_api_pre_event_hook_js($event, &$bag, &$eventData, &$
// always add newlines to the end of last element, in case of other plugins using this hook and // always add newlines to the end of last element, in case of other plugins using this hook and
// always start at line Col 1, to populate the (virtual) serendipity.js file // always start at line Col 1, to populate the (virtual) serendipity.js file
echo " echo "
jQuery(function() { jQuery(function() {
jQuery('input[type=\"url\"]').change(function() { jQuery('input[type=\"url\"]').change(function() {
if (this.value != '' && ! (this.value.substr(0,7) == 'http://' || this.value.substr(0,8) == 'https://')) { if (this.value != '' && ! (this.value.substr(0,7) == 'http://' || this.value.substr(0,8) == 'https://')) {
this.value = 'http://' + this.value; this.value = 'http://' + this.value;

View File

@ -23,9 +23,6 @@
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic"> <link rel="stylesheet" href="//fonts.googleapis.com/css?family=Droid+Serif:400,400italic,700,700italic">
{/if} {/if}
<link rel="stylesheet" href="{$head_link_stylesheet}"> <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> <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/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"> <link rel="alternate" type="application/x.atom+xml" title="{$blogTitle} Atom feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml">

View File

@ -1,5 +1,6 @@
<?php <?php
// Theme-Optionen // 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_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_USE_CORENAV', 'Globale Navigation einbinden?');
@define('TWOK11_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?'); @define('TWOK11_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');

View File

@ -1,5 +1,6 @@
<?php <?php
// Theme options // 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_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_USE_CORENAV', 'Use global navigation?');
@define('TWOK11_WEBFONTS', 'Use a webfont, hosted by Google?'); @define('TWOK11_WEBFONTS', 'Use a webfont, hosted by Google?');

View File

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

View File

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

View File

@ -1,7 +1,7 @@
<?php <?php
// Colorsets // Colorsets
@define('THEME_COLORSET', 'Farbwahl'); @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 // Layout
@define('LAYOUT_TYPE','Layout des Blogs (B = Blogeinträge, S = Seitenleiste, CF = Content first)'); @define('LAYOUT_TYPE','Layout des Blogs (B = Blogeinträge, S = Seitenleiste, CF = Content first)');
@define('LAYOUT_SBS','Dreispaltig S-B-S'); @define('LAYOUT_SBS','Dreispaltig S-B-S');

View File

@ -1,7 +1,7 @@
<?php <?php
// Colorsets // Colorsets
@define('THEME_COLORSET', 'Colorset'); @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 // Layout
@define('LAYOUT_TYPE','Blog layout (B = Blog entriee, S = Sidebar, CF = Content first)'); @define('LAYOUT_TYPE','Blog layout (B = Blog entriee, S = Sidebar, CF = Content first)');
@define('LAYOUT_SBS','Three columns S-B-S'); @define('LAYOUT_SBS','Three columns S-B-S');

View File

@ -1,320 +1,320 @@
<?php <?php
if (IN_serendipity !== true) { if (IN_serendipity !== true) {
die ("Don't hack!"); die ("Don't hack!");
} }
$probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php'; $probelang = dirname(__FILE__) . '/' . $serendipity['charset'] . 'lang_' . $serendipity['lang'] . '.inc.php';
if (file_exists($probelang)) { if (file_exists($probelang)) {
include $probelang; include $probelang;
} }
include dirname(__FILE__) . '/lang_en.inc.php'; include dirname(__FILE__) . '/lang_en.inc.php';
$serendipity['smarty']->assign(array('currpage'=> "http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'])); $serendipity['smarty']->assign(array('currpage'=> "http://".$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI']));
$serendipity['smarty']->assign(array('currpage2'=> $_SERVER['REQUEST_URI'])); $serendipity['smarty']->assign(array('currpage2'=> $_SERVER['REQUEST_URI']));
function serendipity_plugin_api_event_hook($event, &$bag, &$eventData, $addData = null) { function serendipity_plugin_api_event_hook($event, &$bag, &$eventData, $addData = null) {
global $serendipity; global $serendipity;
switch($event) { switch($event) {
case 'frontend_footer': case 'frontend_footer':
echo '<!--PLUGIN API-->'; echo '<!--PLUGIN API-->';
} }
return true; return true;
} }
if ($serendipity['GET']['adminModule'] == 'templates' || $serendipity['POST']['adminModule'] == 'templates' || $serendipity['GET']['adminAction'] == 'cattemplate') { if ($serendipity['GET']['adminModule'] == 'templates' || $serendipity['POST']['adminModule'] == 'templates' || $serendipity['GET']['adminAction'] == 'cattemplate') {
$css_files = glob(dirname(__FILE__) . '/*_style.css'); $css_files = glob(dirname(__FILE__) . '/*_style.css');
foreach($css_files AS $css_file) { foreach($css_files AS $css_file) {
$css_file = str_replace('_style.css', '', basename($css_file)); $css_file = str_replace('_style.css', '', basename($css_file));
if (!isset($colorsets[$css_file])) { if (!isset($colorsets[$css_file])) {
$colorsets[$css_file] = $css_file; $colorsets[$css_file] = $css_file;
} }
} }
} }
$template_config_groups = array( $template_config_groups = array(
THEME_COLORSET => array('colorset', 'userstylesheet', 'layouttype', 'jscolumns'), THEME_COLORSET => array('colorset', 'layouttype', 'jscolumns'),
THEME_HEADER => array('custheader', 'headerimage', 'headertype') THEME_HEADER => array('custheader', 'headerimage', 'headertype')
); );
$template_config = array( $template_config = array(
array( array(
'var' => 'colorset', 'var' => 'infobp',
'name' => THEME_COLORSET, 'name' => 'infobp',
'type' => 'select', 'type' => 'custom',
'default' => 'default', 'custom' => USER_STYLESHEET,
'select_values' => $colorsets ),
), array(
array( 'var' => 'colorset',
'var' => 'userstylesheet', 'name' => THEME_COLORSET,
'name' => USER_STYLESHEET, 'type' => 'select',
'type' => 'boolean', 'default' => 'default',
'default' => 'false', 'select_values' => $colorsets
), ),
array( array(
'var' => 'layouttype', 'var' => 'layouttype',
'name' => LAYOUT_TYPE, 'name' => LAYOUT_TYPE,
'type' => 'select', 'type' => 'select',
'default' => '3sbs', 'default' => '3sbs',
'select_values' => array('3sbs' => LAYOUT_SBS, 'select_values' => array('3sbs' => LAYOUT_SBS,
'3bss' => LAYOUT_BSS, '3bss' => LAYOUT_BSS,
'3ssb' => LAYOUT_SSB, '3ssb' => LAYOUT_SSB,
'2sb' => LAYOUT_SB, '2sb' => LAYOUT_SB,
'2bs' => LAYOUT_BS, '2bs' => LAYOUT_BS,
'1col' => LAYOUT_SC, '1col' => LAYOUT_SC,
'2sbf' => LAYOUT_SBF, '2sbf' => LAYOUT_SBF,
'2bsf' => LAYOUT_BSF) '2bsf' => LAYOUT_BSF)
), ),
array( array(
'var' => 'jscolumns', 'var' => 'jscolumns',
'name' => JAVASCRIPT_COLUMNS, 'name' => JAVASCRIPT_COLUMNS,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'false', 'default' => 'false',
), ),
array( array(
'var' => 'custheader', 'var' => 'custheader',
'name' => BP_CUSTOM_HEADER, 'name' => BP_CUSTOM_HEADER,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'false', 'default' => 'false',
), ),
array( array(
'var' => 'headerimage', 'var' => 'headerimage',
'name' => BP_HEADER_IMAGE, 'name' => BP_HEADER_IMAGE,
'type' => 'media', 'type' => 'media',
'default' => serendipity_getTemplateFile('header.png') 'default' => serendipity_getTemplateFile('header.png')
), ),
array( array(
'var' => 'headertype', 'var' => 'headertype',
'name' => BP_HEADER_TYPE, 'name' => BP_HEADER_TYPE,
'type' => 'select', 'type' => 'select',
'default' => 'banner', 'default' => 'banner',
'select_values' => array('banner' => BP_HEADER_BANNER, 'select_values' => array('banner' => BP_HEADER_BANNER,
'htiled' => BP_HEADER_HTILED, 'htiled' => BP_HEADER_HTILED,
'vtiled' => BP_HEADER_VTILED, 'vtiled' => BP_HEADER_VTILED,
'btiled' => BP_HEADER_BTILED) 'btiled' => BP_HEADER_BTILED)
), ),
array( array(
'var' => 'headerposhor', 'var' => 'headerposhor',
'name' => BP_HEADER_POSHOR, 'name' => BP_HEADER_POSHOR,
'type' => 'select', 'type' => 'select',
'default' => 'left', 'default' => 'left',
'select_values' => array('left' => LEFT, 'select_values' => array('left' => LEFT,
'center' => BP_CENTER, 'center' => BP_CENTER,
'right' => RIGHT) 'right' => RIGHT)
), ),
array( array(
'var' => 'headerposver', 'var' => 'headerposver',
'name' => BP_HEADER_POSVER, 'name' => BP_HEADER_POSVER,
'type' => 'select', 'type' => 'select',
'default' => 'top', 'default' => 'top',
'select_values' => array('top' => BP_TOP, 'select_values' => array('top' => BP_TOP,
'center' => BP_CENTER, 'center' => BP_CENTER,
'bottom' => BP_BOTTOM) 'bottom' => BP_BOTTOM)
), ),
array( array(
'var' => 'firbtitle', 'var' => 'firbtitle',
'name' => FIR_BTITLE, 'name' => FIR_BTITLE,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true', 'default' => 'true',
), ),
array( array(
'var' => 'firbdescr', 'var' => 'firbdescr',
'name' => FIR_BDESCR, 'name' => FIR_BDESCR,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true', 'default' => 'true',
), ),
array( array(
'var' => 'date_format', 'var' => 'date_format',
'name' => GENERAL_PLUGIN_DATEFORMAT . " (http://php.net/strftime)", 'name' => GENERAL_PLUGIN_DATEFORMAT . " (http://php.net/strftime)",
'type' => 'select', 'type' => 'select',
'default' => DATE_FORMAT_ENTRY, 'default' => DATE_FORMAT_ENTRY,
'select_values' => array(DATE_FORMAT_ENTRY => DATE_FORMAT_ENTRY, 'select_values' => array(DATE_FORMAT_ENTRY => DATE_FORMAT_ENTRY,
'%a, %e. %B %Y' => '%a, %e. %B %Y', '%a, %e. %B %Y' => '%a, %e. %B %Y',
'%d-%m-%y' => '%d-%m-%y', '%d-%m-%y' => '%d-%m-%y',
'%m-%d-%y' => '%m-%d-%y', '%m-%d-%y' => '%m-%d-%y',
'%a %d-%m-%y' => '%a %d-%m-%y', '%a %d-%m-%y' => '%a %d-%m-%y',
'%a %m-%d-%y' => '%a %m-%d-%y', '%a %m-%d-%y' => '%a %m-%d-%y',
'%b %d' => '%b %d', '%b %d' => '%b %d',
"%b %d '%y" => "%b %d '%y") "%b %d '%y" => "%b %d '%y")
), ),
array( array(
'var' => 'entryfooterpos', 'var' => 'entryfooterpos',
'name' => ENTRY_FOOTER_POS, 'name' => ENTRY_FOOTER_POS,
'type' => 'select', 'type' => 'select',
'default' => 'belowentry', 'default' => 'belowentry',
'select_values' => array('belowentry' => BELOW_ENTRY, 'select_values' => array('belowentry' => BELOW_ENTRY,
'belowtitle' => BELOW_TITLE, 'belowtitle' => BELOW_TITLE,
'splitfoot' => SPLIT_FOOTER) 'splitfoot' => SPLIT_FOOTER)
), ),
array( array(
'var' => 'footerauthor', 'var' => 'footerauthor',
'name' => FOOTER_AUTHOR, 'name' => FOOTER_AUTHOR,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true', 'default' => 'true',
), ),
array( array(
'var' => 'footercategories', 'var' => 'footercategories',
'name' => FOOTER_CATEGORIES, 'name' => FOOTER_CATEGORIES,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true', 'default' => 'true',
), ),
array( array(
'var' => 'footertimestamp', 'var' => 'footertimestamp',
'name' => FOOTER_TIMESTAMP, 'name' => FOOTER_TIMESTAMP,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true', 'default' => 'true',
), ),
array( array(
'var' => 'footercomments', 'var' => 'footercomments',
'name' => FOOTER_COMMENTS, 'name' => FOOTER_COMMENTS,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true', 'default' => 'true',
), ),
array( array(
'var' => 'footertrackbacks', 'var' => 'footertrackbacks',
'name' => FOOTER_TRACKBACKS, 'name' => FOOTER_TRACKBACKS,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true', 'default' => 'true',
), ),
array( array(
'var' => 'altcommtrack', 'var' => 'altcommtrack',
'name' => ALT_COMMTRACK, 'name' => ALT_COMMTRACK,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'false', 'default' => 'false',
), ),
array( array(
'var' => 'addthiswidget', 'var' => 'addthiswidget',
'name' => SHOW_ADDTHIS_WIDGET, 'name' => SHOW_ADDTHIS_WIDGET,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'false', 'default' => 'false',
), ),
array( array(
'var' => 'addthisaccount', 'var' => 'addthisaccount',
'name' => ADDTHIS_ACCOUNT, 'name' => ADDTHIS_ACCOUNT,
'type' => 'string', 'type' => 'string',
'default' => '', 'default' => '',
), ),
array( array(
'var' => 'show_sticky_entry_footer', 'var' => 'show_sticky_entry_footer',
'name' => SHOW_STICKY_ENTRY_FOOTER, 'name' => SHOW_STICKY_ENTRY_FOOTER,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true', 'default' => 'true',
), ),
array( array(
'var' => 'show_sticky_entry_heading', 'var' => 'show_sticky_entry_heading',
'name' => SHOW_STICKY_ENTRY_HEADING, 'name' => SHOW_STICKY_ENTRY_HEADING,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true', 'default' => 'true',
), ),
array( array(
'var' => 'cocommentactive', 'var' => 'cocommentactive',
'name' => COCOMMENT_ACTIVE, 'name' => COCOMMENT_ACTIVE,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'false', 'default' => 'false',
), ),
array( array(
'var' => 'prev_next_style', 'var' => 'prev_next_style',
'name' => PREV_NEXT_STYLE, 'name' => PREV_NEXT_STYLE,
'type' => 'select', 'type' => 'select',
'default' => 'text', 'default' => 'text',
'select_values' => array('text' => PREV_NEXT_TEXT, 'select_values' => array('text' => PREV_NEXT_TEXT,
'texticon' => PREV_NEXT_TEXT_ICON, 'texticon' => PREV_NEXT_TEXT_ICON,
'icon' => PREV_NEXT_ICON, 'icon' => PREV_NEXT_ICON,
'none' => NONE) 'none' => NONE)
), ),
array( array(
'var' => 'show_pagination', 'var' => 'show_pagination',
'name' => SHOW_PAGINATION, 'name' => SHOW_PAGINATION,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'false', 'default' => 'false',
), ),
array( array(
'var' => 'counter_code', 'var' => 'counter_code',
'name' => COUNTER_CODE, 'name' => COUNTER_CODE,
'type' => 'text', 'type' => 'text',
'default' => '', 'default' => '',
), ),
array( array(
'var' => 'counter_code_toggle', 'var' => 'counter_code_toggle',
'name' => USE_COUNTER, 'name' => USE_COUNTER,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'false' 'default' => 'false'
), ),
array( array(
'var' => 'footer_text', 'var' => 'footer_text',
'name' => FOOTER_TEXT, 'name' => FOOTER_TEXT,
'type' => 'text', 'type' => 'text',
'default' => '', 'default' => '',
), ),
array( array(
'var' => 'footer_text_toggle', 'var' => 'footer_text_toggle',
'name' => USE_FOOTER_TEXT, 'name' => USE_FOOTER_TEXT,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'false' 'default' => 'false'
), ),
array( array(
'var' => 'sitenavpos', 'var' => 'sitenavpos',
'name' => SITENAV_POSITION, 'name' => SITENAV_POSITION,
'type' => 'select', 'type' => 'select',
'default' => 'none', 'default' => 'none',
'select_values' => array('none' => SITENAV_NONE, 'select_values' => array('none' => SITENAV_NONE,
'above' => SITENAV_ABOVE, 'above' => SITENAV_ABOVE,
'below' => SITENAV_BELOW, 'below' => SITENAV_BELOW,
'left' => SITENAV_LEFT, 'left' => SITENAV_LEFT,
'right' => SITENAV_RIGHT) 'right' => SITENAV_RIGHT)
), ),
array( array(
'var' => 'sitenav_footer', 'var' => 'sitenav_footer',
'name' => SITENAV_FOOTER, 'name' => SITENAV_FOOTER,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true' 'default' => 'true'
), ),
array( array(
'var' => 'sitenav_quicksearch', 'var' => 'sitenav_quicksearch',
'name' => SITENAV_QUICKSEARCH, 'name' => SITENAV_QUICKSEARCH,
'type' => 'boolean', 'type' => 'boolean',
'default' => 'true', 'default' => 'true',
), ),
array( array(
'var' => 'sitenav_sidebar_title', 'var' => 'sitenav_sidebar_title',
'name' => SITENAV_TITLE, 'name' => SITENAV_TITLE,
'type' => 'string', 'type' => 'string',
'default' => SITENAV_TITLE_TEXT, 'default' => SITENAV_TITLE_TEXT,
), ),
); );
$template_global_config = array('navigation' => true); $template_global_config = array('navigation' => true);
$template_loaded_config = serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option']); $template_loaded_config = serendipity_loadThemeOptions($template_config, $serendipity['smarty_vars']['template_option']);
serendipity_loadGlobalThemeOptions($template_config, $template_loaded_config, $template_global_config); serendipity_loadGlobalThemeOptions($template_config, $template_loaded_config, $template_global_config);
if ($template_loaded_config['headerimage'] != '' && is_dir($_SERVER['DOCUMENT_ROOT'] . '/' . $template_loaded_config['headerimage'])) { if ($template_loaded_config['headerimage'] != '' && is_dir($_SERVER['DOCUMENT_ROOT'] . '/' . $template_loaded_config['headerimage'])) {
$files = array(); $files = array();
if ($d = opendir($_SERVER['DOCUMENT_ROOT'] . '/' . $template_loaded_config['headerimage'])) { if ($d = opendir($_SERVER['DOCUMENT_ROOT'] . '/' . $template_loaded_config['headerimage'])) {
while (($file = readdir($d)) !== false) { while (($file = readdir($d)) !== false) {
if (preg_match('@(\.jpe?g|\.png|\.gif)$@i', $file) && !preg_match('@' . preg_quote($serendipity['thumbSuffix']) . '@i', $file)) { if (preg_match('@(\.jpe?g|\.png|\.gif)$@i', $file) && !preg_match('@' . preg_quote($serendipity['thumbSuffix']) . '@i', $file)) {
$files[] = $file; $files[] = $file;
} }
} }
} }
if (count($files) > 0) { if (count($files) > 0) {
shuffle($files); shuffle($files);
$serendipity['smarty']->assign('random_headerimage', $template_loaded_config['headerimage'] . '/' . $files[0]); $serendipity['smarty']->assign('random_headerimage', $template_loaded_config['headerimage'] . '/' . $files[0]);
} }
} }
// Allow colorset authors to include license and attribution data // Allow colorset authors to include license and attribution data
$colorset_data = array(); // Maybe we'll want more data later... $colorset_data = array(); // Maybe we'll want more data later...
$colorset_data['attribution'] = ''; $colorset_data['attribution'] = '';
$attribution_file = dirname(__FILE__) . '/' . $template_loaded_config['colorset'] . '_license.txt'; $attribution_file = dirname(__FILE__) . '/' . $template_loaded_config['colorset'] . '_license.txt';
if (is_readable($attribution_file)) { if (is_readable($attribution_file)) {
$attribution = file_get_contents($attribution_file); $attribution = file_get_contents($attribution_file);
if (!empty($attribution)) { if (!empty($attribution)) {
$colorset_data['attribution'] = $attribution; $colorset_data['attribution'] = $attribution;
} }
} }
$template_loaded_config['colorset_data'] = $colorset_data; $template_loaded_config['colorset_data'] = $colorset_data;

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} {if $template_option.jscolumns == 'true'}<script type="text/javascript" src="{$serendipityHTTPPath}templates/{$template}/js/p7_eqCols2_10.js"></script>{/if}
<!-- print media stylesheet --> <!-- print media stylesheet -->
<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="print.css"}" media="print" /> <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> </head>
<body{if $template_option.jscolumns == 'true'} onload="P7_equalCols2(0,{if $template_option.layouttype != '1col'}'content','DIV',{/if}'serendipityLeftSideBar','DIV','serendipityRightSideBar','DIV')"{/if}> <body{if $template_option.jscolumns == 'true'} onload="P7_equalCols2(0,{if $template_option.layouttype != '1col'}'content','DIV',{/if}'serendipityLeftSideBar','DIV','serendipityRightSideBar','DIV')"{/if}>
@ -163,7 +161,7 @@
<div class="serendipitySideBarContent"> <div class="serendipitySideBarContent">
<!-- the line below must remain as a single uninterrupted line to display correctly in ie6 --> <!-- the line below must remain as a single uninterrupted line to display correctly in ie6 -->
<ul>{foreach from=$navlinks item="navlink" name="sbnav"}<li class="{if $currpage==$navlink.href or $currpage2==$navlink.href}currentpage{/if}{if $smarty.foreach.sbnav.first} sbnavlink_first{/if}{if $smarty.foreach.sbnav.last} sbnavlink_last{/if}"><a href="{$navlink.href}" title="{$navlink.title}">{$navlink.title}</a></li>{/foreach}</ul> <ul>{foreach from=$navlinks item="navlink" name="sbnav"}<li class="{if $currpage==$navlink.href or $currpage2==$navlink.href}currentpage{/if}{if $smarty.foreach.sbnav.first} sbnavlink_first{/if}{if $smarty.foreach.sbnav.last} sbnavlink_last{/if}"><a href="{$navlink.href}" title="{$navlink.title}">{$navlink.title}</a></li>{/foreach}</ul>
</div> </div>
<div class="serendipitySideBarFooter"></div> <div class="serendipitySideBarFooter"></div>
</div> </div>
{/if} {/if}
@ -184,7 +182,7 @@
<div class="serendipitySideBarContent"> <div class="serendipitySideBarContent">
<!-- the line below must remain as a single uninterrupted line to display correctly in ie6 --> <!-- the line below must remain as a single uninterrupted line to display correctly in ie6 -->
<ul>{foreach from=$navlinks item="navlink" name="sbnav"}<li class="{if $currpage==$navlink.href or $currpage2==$navlink.href}currentpage{/if}{if $smarty.foreach.sbnav.first} sbnavlink_first{/if}{if $smarty.foreach.sbnav.last} sbnavlink_last{/if}"><a href="{$navlink.href}" title="{$navlink.title}">{$navlink.title}</a></li>{/foreach}</ul> <ul>{foreach from=$navlinks item="navlink" name="sbnav"}<li class="{if $currpage==$navlink.href or $currpage2==$navlink.href}currentpage{/if}{if $smarty.foreach.sbnav.first} sbnavlink_first{/if}{if $smarty.foreach.sbnav.last} sbnavlink_last{/if}"><a href="{$navlink.href}" title="{$navlink.title}">{$navlink.title}</a></li>{/foreach}</ul>
</div> </div>
<div class="serendipitySideBarFooter"></div> <div class="serendipitySideBarFooter"></div>
</div> </div>
{/if} {/if}
@ -397,7 +395,7 @@
<!-- ************************************************************** --> <!-- ************************************************************** -->
<div id="serendipity_credit_line">{$CONST.POWERED_BY} <a href="http://www.s9y.org">s9y</a> &ndash; Template by <a href="http://s9y-bulletproof.com">Bulletproof development team</a>.<br />{$template_option.colorset_data.attribution|escape}</div> <div id="serendipity_credit_line">{$CONST.POWERED_BY} <a href="http://www.s9y.org">s9y</a> &ndash; Template by <a href="http://s9y-bulletproof.com">Bulletproof development team</a>.<br />{$template_option.colorset_data.attribution|escape}</div>
{if $template_option.counter_code_toggle == 'true'} {if $template_option.counter_code_toggle == 'true'}
<div class="counter_code">{$template_option.counter_code}</div> <div class="counter_code">{$template_option.counter_code}</div>
{/if} {/if}

View File

@ -1,76 +1,76 @@
<?php <?php
// Colorsets // Colorsets
@define('THEME_COLORSET', 'Farbwahl'); @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 // Layout
@define('LAYOUT_TYPE','Layout des Blogs (B = Blogeinträge, S = Seitenleiste, CF = Content first)'); @define('LAYOUT_TYPE','Layout des Blogs (B = Blogeinträge, S = Seitenleiste, CF = Content first)');
@define('LAYOUT_SBS','Dreispaltig S-B-S'); @define('LAYOUT_SBS','Dreispaltig S-B-S');
@define('LAYOUT_BSS','Dreispaltig, B-S-S, CF'); @define('LAYOUT_BSS','Dreispaltig, B-S-S, CF');
@define('LAYOUT_SSB','Dreispaltig, S-S-B'); @define('LAYOUT_SSB','Dreispaltig, S-S-B');
@define('LAYOUT_SB','Zweispaltig, Seitenleiste links'); @define('LAYOUT_SB','Zweispaltig, Seitenleiste links');
@define('LAYOUT_BS','Zweispaltig, Seitenleiste rechts, CF'); @define('LAYOUT_BS','Zweispaltig, Seitenleiste rechts, CF');
@define('LAYOUT_SC','Einspaltig, Seitenleiste(n) unten, CF'); @define('LAYOUT_SC','Einspaltig, Seitenleiste(n) unten, CF');
@define('LAYOUT_SBF','Zweispaltig, Seitenleisten links + unten'); @define('LAYOUT_SBF','Zweispaltig, Seitenleisten links + unten');
@define('LAYOUT_BSF','Zweispaltig, Seitenleisten rechts + unten, CF'); @define('LAYOUT_BSF','Zweispaltig, Seitenleisten rechts + unten, CF');
@define('JAVASCRIPT_COLUMNS','Gleich lange Spalten über Javascript erzeugen (Kann den Seitenaufbau verzögern.)'); @define('JAVASCRIPT_COLUMNS','Gleich lange Spalten über Javascript erzeugen (Kann den Seitenaufbau verzögern.)');
// Custom header // Custom header
@define('BP_CUSTOM_HEADER','Eigene Header-Grafik aus der Mediendatenbank verwenden'); @define('BP_CUSTOM_HEADER','Eigene Header-Grafik aus der Mediendatenbank verwenden');
@define('BP_HEADER_IMAGE','Auswahl der Header-Grafik'); @define('BP_HEADER_IMAGE','Auswahl der Header-Grafik');
@define('BP_HEADER_TYPE','Kachelung der Header-Grafik'); @define('BP_HEADER_TYPE','Kachelung der Header-Grafik');
@define('BP_HEADER_BANNER', 'Banner (nicht gekachelt)'); @define('BP_HEADER_BANNER', 'Banner (nicht gekachelt)');
@define('BP_HEADER_HTILED', 'Horizontal gekachelt'); @define('BP_HEADER_HTILED', 'Horizontal gekachelt');
@define('BP_HEADER_VTILED', 'Vertikal gekachelt'); @define('BP_HEADER_VTILED', 'Vertikal gekachelt');
@define('BP_HEADER_BTILED', 'Horizontal und vertikal gekachelt'); @define('BP_HEADER_BTILED', 'Horizontal und vertikal gekachelt');
@define('BP_HEADER_POSHOR', 'Horizontale Ausrichtung'); @define('BP_HEADER_POSHOR', 'Horizontale Ausrichtung');
@define('BP_HEADER_POSVER', 'Vertikale Ausrichtung'); @define('BP_HEADER_POSVER', 'Vertikale Ausrichtung');
@define('BP_CENTER', 'zentriert'); @define('BP_CENTER', 'zentriert');
@define('BP_TOP', 'oben'); @define('BP_TOP', 'oben');
@define('BP_BOTTOM', 'unten'); @define('BP_BOTTOM', 'unten');
// Fahrner Image Replacement // Fahrner Image Replacement
@define('FIR_BTITLE','Blogtitel im Header anzeigen'); @define('FIR_BTITLE','Blogtitel im Header anzeigen');
@define('FIR_BDESCR','Blogbeschreibung im Header anzeigen'); @define('FIR_BDESCR','Blogbeschreibung im Header anzeigen');
// Date format // Date format
@define('BP_DATE_FORMAT', 'Datumsformat'); @define('BP_DATE_FORMAT', 'Datumsformat');
// Entry footer // Entry footer
@define('ENTRY_FOOTER_POS','Position des Eintragsfußes'); @define('ENTRY_FOOTER_POS','Position des Eintragsfußes');
@define('BELOW_ENTRY','Unter dem Eintrag'); @define('BELOW_ENTRY','Unter dem Eintrag');
@define('BELOW_TITLE','Unter dem Titel des Eintrags'); @define('BELOW_TITLE','Unter dem Titel des Eintrags');
@define('SPLIT_FOOTER','Aufgeteilter Eintragsfuß'); @define('SPLIT_FOOTER','Aufgeteilter Eintragsfuß');
@define('FOOTER_AUTHOR','Verfasser im Eintragsfuß anzeigen'); @define('FOOTER_AUTHOR','Verfasser im Eintragsfuß anzeigen');
@define('FOOTER_CATEGORIES','Kategorie(n) im Eintragsfuß anzeigen'); @define('FOOTER_CATEGORIES','Kategorie(n) im Eintragsfuß anzeigen');
@define('FOOTER_TIMESTAMP','Zeitstempel im Eintragsfuß anzeigen'); @define('FOOTER_TIMESTAMP','Zeitstempel im Eintragsfuß anzeigen');
@define('FOOTER_COMMENTS','Anzahl der Kommentare im Eintragsfuß anzeigen'); @define('FOOTER_COMMENTS','Anzahl der Kommentare im Eintragsfuß anzeigen');
@define('FOOTER_TRACKBACKS','Anzahl der Trackbacks im Eintragsfuß anzeigen'); @define('FOOTER_TRACKBACKS','Anzahl der Trackbacks im Eintragsfuß anzeigen');
@define('ALT_COMMTRACK','Alternative Darstellung der Anzahl der Kommentare und Trackbacks benutzen (z.B. "Keine Kommentare" bzw. "1 Kommentar" statt "Kommentare (0)" bzw. "Kommentare(1)")'); @define('ALT_COMMTRACK','Alternative Darstellung der Anzahl der Kommentare und Trackbacks benutzen (z.B. "Keine Kommentare" bzw. "1 Kommentar" statt "Kommentare (0)" bzw. "Kommentare(1)")');
@define('SHOW_ADDTHIS_WIDGET','AddThis (http://www.addthis.com) Bookmark-Widget im Eintragsfuß anzeigen'); @define('SHOW_ADDTHIS_WIDGET','AddThis (http://www.addthis.com) Bookmark-Widget im Eintragsfuß anzeigen');
@define('ADDTHIS_ACCOUNT','AddThis.com Account-Nummer. Nicht erforderlich, aber falls angegeben, werden Statistiken darüber ermittelt, wie Besucher Seiten bookmarken und die Bookmarks mit anderen teilen.'); @define('ADDTHIS_ACCOUNT','AddThis.com Account-Nummer. Nicht erforderlich, aber falls angegeben, werden Statistiken darüber ermittelt, wie Besucher Seiten bookmarken und die Bookmarks mit anderen teilen.');
@define('SHOW_STICKY_ENTRY_FOOTER','Eintragsfuß für klebrige Einträge anzeigen (benötigt das Plugin "Erweiterte Eigenschaften von Artikeln")'); @define('SHOW_STICKY_ENTRY_FOOTER','Eintragsfuß für klebrige Einträge anzeigen (benötigt das Plugin "Erweiterte Eigenschaften von Artikeln")');
@define('SHOW_STICKY_ENTRY_HEADING','Eintragstitel für klebrige Einträge anzeigen (benötigt das Plugin "Erweiterte Eigenschaften von Artikeln")'); @define('SHOW_STICKY_ENTRY_HEADING','Eintragstitel für klebrige Einträge anzeigen (benötigt das Plugin "Erweiterte Eigenschaften von Artikeln")');
// Page footer next page and previous page links // Page footer next page and previous page links
@define('PREV_NEXT_STYLE','Links zur vorigen/nächsten Seite im Seitenfuß anzeigen als'); @define('PREV_NEXT_STYLE','Links zur vorigen/nächsten Seite im Seitenfuß anzeigen als');
@define('PREV_NEXT_TEXT','Nur Text'); @define('PREV_NEXT_TEXT','Nur Text');
@define('PREV_NEXT_TEXT_ICON','Text und Icon'); @define('PREV_NEXT_TEXT_ICON','Text und Icon');
@define('PREV_NEXT_ICON','Nur Icon'); @define('PREV_NEXT_ICON','Nur Icon');
@define('SHOW_PAGINATION','Zusätzliche Seitennummerierung (Pagination) anzeigen'); @define('SHOW_PAGINATION','Zusätzliche Seitennummerierung (Pagination) anzeigen');
// coComment support // coComment support
@define('COCOMMENT_ACTIVE','coComment (http://www.cocomment.com) in Kommentarformulare einbinden'); @define('COCOMMENT_ACTIVE','coComment (http://www.cocomment.com) in Kommentarformulare einbinden');
// Counter code // Counter code
@define('COUNTER_CODE', 'Code für Counter und/oder Statistik-Tools einfügen'); @define('COUNTER_CODE', 'Code für Counter und/oder Statistik-Tools einfügen');
@define('USE_COUNTER', 'Oben eingegeben Counter-Code in das Blog einbinden'); @define('USE_COUNTER', 'Oben eingegeben Counter-Code in das Blog einbinden');
// Additional footer text // Additional footer text
@define('FOOTER_TEXT', 'Hier zusätzlichen Text, der im Seitenfuss erscheinen soll, einfügen.'); @define('FOOTER_TEXT', 'Hier zusätzlichen Text, der im Seitenfuss erscheinen soll, einfügen.');
@define('USE_FOOTER_TEXT', 'Oben eingegebenen Text einbinden'); @define('USE_FOOTER_TEXT', 'Oben eingegebenen Text einbinden');
//Sitenav //Sitenav
@define('SITENAV_POSITION','Darstellung der Navigationsleiste'); @define('SITENAV_POSITION','Darstellung der Navigationsleiste');
@define('SITENAV_NONE','Keine Navigationsleiste'); @define('SITENAV_NONE','Keine Navigationsleiste');
@define('SITENAV_ABOVE','Über dem Kopfbereich'); @define('SITENAV_ABOVE','Über dem Kopfbereich');
@define('SITENAV_BELOW','Unter dem Kopfbereich'); @define('SITENAV_BELOW','Unter dem Kopfbereich');
@define('SITENAV_LEFT','Oben in der linken Seitenleiste'); @define('SITENAV_LEFT','Oben in der linken Seitenleiste');
@define('SITENAV_RIGHT','Oben in der rechten Seitenleiste'); @define('SITENAV_RIGHT','Oben in der rechten Seitenleiste');
@define('SITENAV_FOOTER','Links der Navigationleiste zusätzlich im Seitenfuss anzeigen (werden nicht angezeigt, wenn oben "Keine Navigationsleiste" ausgewählt wurde)'); @define('SITENAV_FOOTER','Links der Navigationleiste zusätzlich im Seitenfuss anzeigen (werden nicht angezeigt, wenn oben "Keine Navigationsleiste" ausgewählt wurde)');
@define('SITENAV_QUICKSEARCH','Suchfeld in der Navigationsleiste anzeigen (funktioniert nur, wenn Navigationsleiste über oder unter dem Kopfbereich; Anzeige des entsprechenden Seitenleistenplugins wird automatisch unterdrückt)'); @define('SITENAV_QUICKSEARCH','Suchfeld in der Navigationsleiste anzeigen (funktioniert nur, wenn Navigationsleiste über oder unter dem Kopfbereich; Anzeige des entsprechenden Seitenleistenplugins wird automatisch unterdrückt)');
@define('SITENAV_TITLE','Titel des Navigations-Menüs (nur bei Anzeige in der Seitenleiste'); @define('SITENAV_TITLE','Titel des Navigations-Menüs (nur bei Anzeige in der Seitenleiste');
@define('SITENAV_TITLE_TEXT','Hauptmenü'); @define('SITENAV_TITLE_TEXT','Hauptmenü');
@define('NAVLINK_AMOUNT', 'Anzahl der Links in der Navigationsleiste (Styles verwalten-Seite muss danach neu geladen werden)'); @define('NAVLINK_AMOUNT', 'Anzahl der Links in der Navigationsleiste (Styles verwalten-Seite muss danach neu geladen werden)');
@define('NAV_LINK_TEXT', 'Text des Navigationsleisten-Links'); @define('NAV_LINK_TEXT', 'Text des Navigationsleisten-Links');
@define('NAV_LINK_URL', 'URL des Navigationsleisten-Links'); @define('NAV_LINK_URL', 'URL des Navigationsleisten-Links');

View File

@ -3,7 +3,7 @@
@define('THEME_COLORSET', 'Colorset'); @define('THEME_COLORSET', 'Colorset');
@define('THEME_HEADER', 'Header'); @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 // Layout
@define('LAYOUT_TYPE','Blog layout (B = Blog entriee, S = Sidebar, CF = Content first)'); @define('LAYOUT_TYPE','Blog layout (B = Blog entriee, S = Sidebar, CF = Content first)');
@define('LAYOUT_SBS','Three columns S-B-S'); @define('LAYOUT_SBS','Three columns S-B-S');

View File

@ -1,43 +1,41 @@
{if $is_xhtml} {if $is_xhtml}
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
{else} {else}
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
{/if} {/if}
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang}" lang="{$lang}"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$lang}" lang="{$lang}">
<head> <head>
<title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title> <title>{$CONST.SERENDIPITY_ADMIN_SUITE}</title>
<meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" /> <meta http-equiv="Content-Type" content="text/html; charset={$head_charset}" />
<meta name="generator" content="Serendipity v.{$serendipityVersion}" /> <meta name="generator" content="Serendipity v.{$serendipityVersion}" />
<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="base.css"}" /> <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="base.css"}" />
<link rel="stylesheet" type="text/css" href="{$head_link_stylesheet}" /> <link rel="stylesheet" type="text/css" href="{$head_link_stylesheet}" />
<!--[if IE 6]> <!--[if IE 6]>
<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie6.css"}" /> <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie6.css"}" />
<![endif]--> <![endif]-->
<!--[if IE 7]> <!--[if IE 7]>
<link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie7.css"}" /> <link rel="stylesheet" type="text/css" href="{serendipity_getFile file="ie7.css"}" />
<![endif]--> <![endif]-->
<!-- additional colorset stylesheet --> <!-- additional colorset stylesheet -->
<link rel="stylesheet" type="text/css" href="{$serendipityHTTPPath}templates/{$template}/{$template_option.colorset}_style.css" /> <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}
<script type="text/javascript"> parent.document.getElementById('serendipity_iframe').style.height = document.getElementById('content').offsetHeight
window.onload = function() {ldelim} + parseInt(document.getElementById('content').style.marginTop)
parent.document.getElementById('serendipity_iframe').style.height = document.getElementById('content').offsetHeight + parseInt(document.getElementById('content').style.marginBottom)
+ parseInt(document.getElementById('content').style.marginTop) + 'px';
+ parseInt(document.getElementById('content').style.marginBottom) parent.document.getElementById('serendipity_iframe').scrolling = 'no';
+ 'px'; parent.document.getElementById('serendipity_iframe').style.border = 0;
parent.document.getElementById('serendipity_iframe').scrolling = 'no'; {rdelim}
parent.document.getElementById('serendipity_iframe').style.border = 0; </script>
{rdelim} </head>
</script>
</head> <body style="padding: 0px; margin: 0px;">
<div id="wrapper" style="width: 100%; border: 0;">
<body style="padding: 0px; margin: 0px;"> <div id="content" style="padding: 5px; margin: 0px;">
<div id="wrapper" style="width: 100%; border: 0;"> {$preview}
<div id="content" style="padding: 5px; margin: 0px;"> </div>
{$preview} </div>
</div> </body>
</div> </html>
</body>
</html>

View File

@ -1,6 +1,6 @@
<?php <?php
// Theme-Optionen // 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_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_USE_CORENAV', 'Globale Navigation einbinden?');
@define('NEXT_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?'); @define('NEXT_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');

View File

@ -1,6 +1,6 @@
<?php <?php
// Theme options // 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_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_USE_CORENAV', 'Use global navigation?');
@define('NEXT_WEBFONTS', 'Use a webfont, hosted by Google?'); @define('NEXT_WEBFONTS', 'Use a webfont, hosted by Google?');

View File

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

View File

@ -25,9 +25,6 @@
<!--[if lte IE 8]> <!--[if lte IE 8]>
<link rel="stylesheet" href="{serendipity_getFile file="oldie.css"}"> <link rel="stylesheet" href="{serendipity_getFile file="oldie.css"}">
<![endif]--> <![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> <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/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"> <link rel="alternate" type="application/x.atom+xml" title="{$blogTitle} Atom feed" href="{$serendipityBaseURL}{$serendipityRewritePrefix}feeds/atom.xml">

View File

@ -1,6 +1,6 @@
<?php <?php
// Theme-Optionen // 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_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_USE_CORENAV', 'Globale Navigation einbinden?');
@define('NEXT_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?'); @define('NEXT_WEBFONTS', 'Einen von Google gehosteten Webfont nutzen?');

View File

@ -1,6 +1,6 @@
<?php <?php
// Theme options // 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_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_USE_CORENAV', 'Use global navigation?');
@define('NEXT_WEBFONTS', 'Use a webfont, hosted by Google?'); @define('NEXT_WEBFONTS', 'Use a webfont, hosted by Google?');

View File

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