Merge branch 'master' of github.com:s9y/Serendipity

This commit is contained in:
Ian 2016-02-03 15:38:57 +01:00
commit 3fe8959d00
14 changed files with 50 additions and 46 deletions

View File

@ -21,6 +21,7 @@
@define('THEME_CUSTOM_FIELD_DEFINITION','Diese optionalen Felder sind nur verfügbar, wenn dieses Theme (clean blog) verwendet wird. Das Ereignis-Plugin serendipity_event_entryproperties (Erweiterte Eigenschaften für Einträge) muss installiert sein, um diese Felder zu verwenden. Der Eintrags-Untertitel wird unter dem Titel des Eintrags ausgegeben und sollte eine kurze Zusammenfassung des Eintrags enthalten. Das Header-Bild eines Eintrags überschreibt das Standard-Header-Bild für Einträge.');
@define('THEME_ENTRY_SUBTITLE','Untertitel des Eintrags');
@define('THEME_ENTRY_HEADER_IMAGE','Header-Bild der Eintrags');
@define('THEME_DEMO_AVAILBLE', 'Eine komplette englische Anleitung zur <a href="http://www.optional-necessity.com/demo/cleanblog/archives/8-Using-the-Clean-Blog-theme.html">Konfiguration und Benutzung von Clean Blog</a> findet sich in der <a href="http://www.optional-necessity.com/demo/cleanblog/">Clean Blog-Demo</a>.');
// Header Images
@define('DEFAULT_HEADER_IMAGE', 'Standard-Header-Bild');

View File

@ -29,4 +29,6 @@
{assign var="prevdepth" value=$plugin_category.catdepth}
{/foreach}
</ul>
{else}
<p class="alert alert-danger alert-error"><span class="fa-stack" aria-hidden="true"><i class="fa fa-circle-thin fa-stack-2x"></i><i class="fa fa-exclamation fa-stack-1x"></i></span> {$CONST.CATEGORIES_ON_ARCHIVE_DESC}</p>
{/if}

View File

@ -1,6 +1,10 @@
<h2>{$CONST.EDITOR_TAGS}</h2>
<div class="clean-blog_freeTag">
{foreach from=$tags key="tag_name" item="plugin_tags" name="each_tag"}
<a href="{$plugin_tags.href}">{$tag_name}</a>{if !$smarty.foreach.each_tag.last}{/if}
{/foreach}
</div>
{if $tags}
<h2>{$CONST.EDITOR_TAGS}</h2>
<div class="clean-blog_freeTag">
{foreach from=$tags key="tag_name" item="plugin_tags" name="each_tag"}
<a href="{$plugin_tags.href}">{$tag_name}</a>{if !$smarty.foreach.each_tag.last}{/if}
{/foreach}
</div>
{else}
<p class="alert alert-danger alert-error"><span class="fa-stack" aria-hidden="true"><i class="fa fa-circle-thin fa-stack-2x"></i><i class="fa fa-exclamation fa-stack-1x"></i></span>{$CONST.TAGS_ON_ARCHIVE_DESC}</p>
{/if}

View File

@ -129,24 +129,6 @@
</div>
</div>
<div class="clearfix">
{* CUSTOM TO THIS THEME - OPTION TO SHOW/HIDE AUTHOR NAME *}
<div class="entryproperties_access_groups adv_opts_box form_select">
<label class="sp_label" title="{$CONST.STATIC_SHOW_AUTHOR_TITLE}">{$CONST.STATIC_SHOW_AUTHOR_TEXT}</label><br />
<input id="author_yes" type="radio" name="serendipity[plugin][custom][show_author]" {if $form_values.custom.show_author == 'true'}checked="checked"{/if}value="true" />
<label for="author_yes">{$CONST.YES}</label>
<input id="author_no" type="radio" name="serendipity[plugin][custom][show_author]" {if $form_values.custom.show_author != 'true'}checked="checked"{/if} value="false" />
<label for="author_no">{$CONST.NO}</label>
</div>
{* CUSTOM TO THIS THEME - OPTION TO SHOW/HIDE DATE *}
<div class="entryproperties_access_groups adv_opts_box form_select">
<label class="sp_label" title="{$CONST.STATIC_SHOW_DATE_TITLE}">{$CONST.STATIC_SHOW_DATE_TEXT}</label><br />
<input id="date_yes" type="radio" name="serendipity[plugin][custom][show_date]" {if $form_values.custom.show_date == 'true'}checked="checked"{/if}value="true" />
<label for="date_yes">{$CONST.YES}</label>
<input id="date_no" type="radio" name="serendipity[plugin][custom][show_date]" {if $form_values.custom.show_date != 'true'}checked="checked"{/if}value="false" />
<label for="date_no">{$CONST.NO}</label>
</div>
</div>
<div class="clearfix">
<div class="entryoptions_customfields adv_opts_box">
<label class="sp_label" title="{staticpage_input item="pre_content" what="desc"|escape:js}">{staticpage_input item="pre_content" what="name"|escape:js}</label><br />
{staticpage_input item="pre_content"}
@ -212,6 +194,24 @@
{staticpage_input item="articleformat"}
</div>
</div>
{* CUSTOM TO THIS THEME - OPTION TO SHOW/HIDE AUTHOR NAME *}
<div class="clearfix">
<div class="entryproperties_access_groups adv_opts_box form_select">
<label class="sp_label" title="{$CONST.STATIC_SHOW_AUTHOR_TITLE}">{$CONST.STATIC_SHOW_AUTHOR_TEXT}</label><br />
<input id="author_yes" type="radio" name="serendipity[plugin][custom][show_author]" {if $form_values.custom.show_author == 'true'}checked="checked"{/if}value="true" />
<label for="author_yes">{$CONST.YES}</label>
<input id="author_no" type="radio" name="serendipity[plugin][custom][show_author]" {if $form_values.custom.show_author != 'true'}checked="checked"{/if} value="false" />
<label for="author_no">{$CONST.NO}</label>
</div>
{* CUSTOM TO THIS THEME - OPTION TO SHOW/HIDE DATE *}
<div class="entryproperties_access_groups adv_opts_box form_select">
<label class="sp_label" title="{$CONST.STATIC_SHOW_DATE_TITLE}">{$CONST.STATIC_SHOW_DATE_TEXT}</label><br />
<input id="date_yes" type="radio" name="serendipity[plugin][custom][show_date]" {if $form_values.custom.show_date == 'true'}checked="checked"{/if}value="true" />
<label for="date_yes">{$CONST.YES}</label>
<input id="date_no" type="radio" name="serendipity[plugin][custom][show_date]" {if $form_values.custom.show_date != 'true'}checked="checked"{/if}value="false" />
<label for="date_no">{$CONST.NO}</label>
</div>
</div>
</section>

View File

@ -70,7 +70,7 @@ $template_config = array(
array(
'var' => 'theme_instructions',
'type' => 'content',
'default' => $ep_msg . THEME_INSTRUCTIONS . '<p>' . CATEGORIES_ON_ARCHIVE_DESC . '</p><p>' . TAGS_ON_ARCHIVE_DESC . '<p>',
'default' => '<p>' . THEME_DEMO_AVAILABLE . '</p>' . $ep_msg . THEME_INSTRUCTIONS . '<p>' . CATEGORIES_ON_ARCHIVE_DESC . '</p><p>' . TAGS_ON_ARCHIVE_DESC . '</p>',
),
array(
'var' => 'default_header_image',

View File

@ -29,7 +29,7 @@
<link rel="pingback" href="{$serendipityBaseURL}comment.php?type=pingback&amp;entry_id={$entry_id}">
{/if}
{* CUSTOM FONTS *}
<link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href="http://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet" type="text/css">
<link href='http://fonts.googleapis.com/css?family=Open+Sans:300,600,800|Lora:400,400italic' rel='stylesheet' type='text/css'>
<!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->

View File

@ -1,5 +1,5 @@
Name: Clean Blog
Author: s9y theme by Don Chambers. Original bootstrap theme by Iron Summit Media Strategies, LLC.
Date: 2015-06-18
Date: 2016-02-02
Require Serendipity: 2.0
Backend: No

View File

@ -21,6 +21,7 @@
@define('THEME_CUSTOM_FIELD_DEFINITION','Diese optionalen Felder sind nur verfügbar, wenn dieses Theme (clean blog) verwendet wird. Das Ereignis-Plugin serendipity_event_entryproperties (Erweiterte Eigenschaften für Einträge) muss installiert sein, um diese Felder zu verwenden. Der Eintrags-Untertitel wird unter dem Titel des Eintrags ausgegeben und sollte eine kurze Zusammenfassung des Eintrags enthalten. Das Header-Bild eines Eintrags überschreibt das Standard-Header-Bild für Einträge.');
@define('THEME_ENTRY_SUBTITLE','Untertitel des Eintrags');
@define('THEME_ENTRY_HEADER_IMAGE','Header-Bild der Eintrags');
@define('THEME_DEMO_AVAILBLE', 'Eine komplette englische Anleitung zur <a href="http://www.optional-necessity.com/demo/cleanblog/archives/8-Using-the-Clean-Blog-theme.html">Konfiguration und Benutzung von Clean Blog</a> findet sich in der <a href="http://www.optional-necessity.com/demo/cleanblog/">Clean Blog-Demo</a>.');
// Header Images
@define('DEFAULT_HEADER_IMAGE', 'Standard-Header-Bild');

View File

@ -21,6 +21,8 @@
@define('THEME_CUSTOM_FIELD_DEFINITION','These optional fields are only available when using this theme (clean blog). The event plugin serendipity_event_entryproperties (extended properties for entries) must also be installed to use these fields. The Entry Subtitle field is displayed below the entry title and should be a brief post summary. The entry header image field will overide the default entry header image for this specific entry.');
@define('THEME_ENTRY_SUBTITLE','Entry Subtitle');
@define('THEME_ENTRY_HEADER_IMAGE','Entry Header Image');
@define('THEME_DEMO_AVAILABLE', 'A complete English explanation of <a href="http://www.optional-necessity.com/demo/cleanblog/archives/8-Using-the-Clean-Blog-theme.html">configuring and using Clean Blog</a> can be found on the <a href="http://www.optional-necessity.com/demo/cleanblog/">Clean Blog demo</a>.');
// Header Images
@define('DEFAULT_HEADER_IMAGE', 'Default header image');

View File

@ -43,20 +43,12 @@
{/if}
{if $staticpage_navigation AND $staticpage_shownavi}
<nav role="navigation">
<ul class="pager">
{if $footer_prev_page}<li class="previous"><a href="{$footer_prev_page}">&larr; {$CONST.PREVIOUS_PAGE}</a></li>{/if}
{if $footer_next_page}<li class="next"><a href="{$footer_next_page}">{$CONST.NEXT_PAGE} &rarr;</a></li>{/if}
<ul class="pager staticpage_navigation">
{if $staticpage_navigation.prev.link}<li class="previous"><a href="{$staticpage_navigation.prev.link}" title="prev"><i class="fa fa-arrow-left" aria-hidden="true"></i> {$staticpage_navigation.prev.name|@escape}</a></li>{/if}
{if $staticpage_navigation.next.link}<li class="next"><a href="{$staticpage_navigation.next.link}" title="next">{$staticpage_navigation.next.name|@escape} <i class="fa fa-arrow-right" aria-hidden="true"></i></a></li>{/if}
</ul>
</nav>
{/if}
{if $staticpage_navigation AND $staticpage_shownavi}
<nav role="navigation">
<ul class="pager staticpage_navigation">
{if $staticpage_navigation.prev.link}<li class="previous"><a href="{$staticpage_navigation.prev.link}" title="prev"><i class="fa fa-arrow-left" aria-hidden="true"></i> {$staticpage_navigation.prev.name|@escape}</a></li>{/if}
{if $staticpage_navigation.next.link}<li class="next"><a href="{$staticpage_navigation.next.link}" title="next">{$staticpage_navigation.next.name|@escape} <i class="fa fa-arrow-right" aria-hidden="true"></i></a></li>{/if}
</ul>
</nav>
{/if}
{/if}
{if $staticpage_custom.show_author =='true' || $staticpage_custom.show_date =='true' || ($staticpage_adminlink && $staticpage_adminlink.page_user)}
<footer class="staticpage-footer">
<p class="post-meta">

View File

@ -5,7 +5,7 @@
<div class="staticpage_breadcrumbs">
<a href="{$serendipityBaseURL}" title="{$CONST.HOMEPAGE}">{$template_option.home_link_text}</a>
{foreach name="crumbs" from=$staticpage_navigation.crumbs item="crumb"}
&raquo; {if !$smarty.foreach.crumbs.last}<a href="{$crumb.link}">{/if}{$crumb.name|@escape}</a>
&nbsp;/&nbsp; {if !$smarty.foreach.crumbs.last}<a href="{$crumb.link}">{/if}{$crumb.name|@escape}</a>
{/foreach}
</div>
{/if}

View File

@ -3,12 +3,12 @@
<h2>{if $staticpage_articleformat}{if $staticpage_articleformattitle}{$staticpage_articleformattitle|@escape}{else}{$staticpage_pagetitle}{/if}{else}{if $staticpage_headline}{$staticpage_headline|@escape}{else}{$staticpage_pagetitle}{/if}{/if}</h2>
{if $staticpage_show_breadcrumb}
<div class="staticpage_breadcrumbs">
<a href="{$serendipityBaseURL}" title="{$CONST.HOMEPAGE}">{$template_option.home_link_text}</a>
<a href="{$serendipityBaseURL}" title="{$CONST.HOMEPAGE}">{$blogTitle}</a>
{foreach name="crumbs" from=$staticpage_navigation.crumbs item="crumb"}
&raquo; {if !$smarty.foreach.crumbs.last}<a href="{$crumb.link}">{/if}{$crumb.name|@escape}</a>
&nbsp;/&nbsp; {if !$smarty.foreach.crumbs.last}<a href="{$crumb.link}">{/if}{$crumb.name|@escape}</a>
{/foreach}
</div>
{/if}
{/if}
</header>
{if $staticpage_pass AND $staticpage_form_pass != $staticpage_pass}
<form class="staticpage_password_form" action="{$staticpage_form_url}" method="post">

View File

@ -1,3 +1,4 @@
<h4>{$CONST.STATICPAGE_NEW_HEADLINES|capitalize}</h4>
{if $entries}
<dl>
{foreach from=$entries item="dategroup"}
@ -8,10 +9,10 @@
{/foreach}
</dl>
{if $staticpage_related_category_id >0}
<a href="{$serendipityBaseURL}{$serendipityRewritePrefix}{getCategoryLinkByID cid=$staticpage_related_category_id}">{$CONST.STATICPAGE_ARTICLE_OVERVIEW} &#187;</a><br />
<a class="btn btn-md btn-default btn-theme" href="{$serendipityBaseURL}{$serendipityRewritePrefix}{getCategoryLinkByID cid=$staticpage_related_category_id}">{$CONST.STATICPAGE_ARTICLE_OVERVIEW|capitalize} <i class="fa fa-arrow-right" aria-hidden="true"></i></a><br />
{else}
<a href="{$serendipityArchiveURL}/P1.html">{$CONST.STATICPAGE_ARTICLE_OVERVIEW} &#187;</a><br />
<a class="btn btn-md btn-default btn-theme" href="{$serendipityArchiveURL}/P1.html">{$CONST.STATICPAGE_ARTICLE_OVERVIEW|capitalize} <i class="fa fa-arrow-right" aria-hidden="true"></i></a><br />
{/if}
{else}
<p class="nocontent">{$CONST.NO_ENTRIES_TO_PRINT}</p>
<p class="alert alert-info noentries"><span class="fa-stack"><i class="fa fa-circle-thin fa-stack-2x"></i><i class="fa fa-info fa-stack-1x"></i></span> {$CONST.NO_ENTRIES_TO_PRINT}</p>
{/if}

View File

@ -4,6 +4,7 @@
* Copyright 2014 Start Bootstrap
* Licensed under Apache 2.0 (https://github.com/IronSummitMedia/startbootstrap/blob/gh-pages/LICENSE)
* Theme ported to Serendipity (http://s9y.org) by Don Chambers
* Last modified February 2, 2016
* Font Awesome by Dave Gandy - http://fontawesome.io
*/
body {