From 4ea96cb8d0fd1cdd7a59166b43ee47fe3f33a36a Mon Sep 17 00:00:00 2001 From: Ian Date: Thu, 9 Jan 2014 12:38:32 +0100 Subject: [PATCH] blix, glossy-white, leaf, plus9 - index.tpl - fix smarty exception --- blix/index.tpl | 124 +++++++++++---------- blix/info.txt | 4 +- glossy_white/comments.tpl | 2 +- glossy_white/entries.tpl | 18 ++-- glossy_white/index.tpl | 128 +++++++++++----------- glossy_white/info.txt | 4 +- glossy_white/sidebar.tpl | 2 +- leaf/comments.tpl | 2 +- leaf/entries.tpl | 18 ++-- leaf/index.tpl | 152 +++++++++++++------------- leaf/info.txt | 4 +- plus9/entries.tpl | 21 ++-- plus9/entries_summary.tpl | 2 +- plus9/index.tpl | 209 +++++++++++++++++------------------- plus9/info.txt | 4 +- plus9/plugin_staticpage.tpl | 16 +-- 16 files changed, 344 insertions(+), 366 deletions(-) diff --git a/blix/index.tpl b/blix/index.tpl index 688141b..9523a03 100644 --- a/blix/index.tpl +++ b/blix/index.tpl @@ -1,18 +1,18 @@ - - {$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if} - - - - - - {if $entry_id} - - {/if} - {serendipity_hookPlugin hook="frontend_header"} - + + {$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if} + + + + + + {if $entry_id} + + {/if} + {serendipity_hookPlugin hook="frontend_header"} + {if $staticpage_pagetitle} @@ -20,59 +20,57 @@ {/if}
-
- - -
-
-
-
{$CONTENT}
- {if $rightSidebarElements > 0} -
{serendipity_printSidebar side="right"}
- {/if} - {if $leftSidebarElements > 0} -
{serendipity_printSidebar side="left"}
- {/if} -
 
-
- - - - {$raw_data} - {serendipity_hookPlugin hook="frontend_footer"} + {$raw_data} + {serendipity_hookPlugin hook="frontend_footer"}
diff --git a/blix/info.txt b/blix/info.txt index 0333478..8e1d7ad 100644 --- a/blix/info.txt +++ b/blix/info.txt @@ -1,3 +1,3 @@ -Name: blix (2008-11-23) +Name: blix (2014-01-09) Author: Sebastian Schmieg (ported by Christian Hoffmann) -Date: 03/01/2006 +Date: 2014-01-09 diff --git a/glossy_white/comments.tpl b/glossy_white/comments.tpl index d05fb99..1828fbc 100644 --- a/glossy_white/comments.tpl +++ b/glossy_white/comments.tpl @@ -1,7 +1,7 @@ {foreach from=$comments item=comment}
-
+
#{$comment.trace} {if $comment.email} diff --git a/glossy_white/entries.tpl b/glossy_white/entries.tpl index d78d5ed..299d89a 100644 --- a/glossy_white/entries.tpl +++ b/glossy_white/entries.tpl @@ -50,18 +50,18 @@ {else} {$CONST.AT} {/if} {if $dategroup.is_sticky}{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY} {/if}{$entry.timestamp|@formatTime:'%H:%M'} -
+
- {if $entry.has_comments} + {if $entry.has_comments}
{if $use_popups} {$entry.label_comments} ({$entry.comments}) {else} - {if $entry.comments > 0} - {$entry.label_comments} ({$entry.comments}) - {else} - Add comment - {/if} + {if $entry.comments > 0} + {$entry.label_comments} ({$entry.comments}) + {else} + Add comment + {/if} {/if}
{/if} @@ -71,12 +71,12 @@ {if $use_popups} | {$entry.label_trackbacks} ({$entry.trackbacks}) {else} - Link to this post + Link to this post {/if}
{/if} - {if $entry.is_entry_owner and not $is_preview} + {if $entry.is_entry_owner and not $is_preview}
{$CONST.EDIT_ENTRY}
diff --git a/glossy_white/index.tpl b/glossy_white/index.tpl index 2482a46..096fa94 100644 --- a/glossy_white/index.tpl +++ b/glossy_white/index.tpl @@ -1,18 +1,18 @@ - - {$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if} - - - - - - {if $entry_id} - - {/if} - {serendipity_hookPlugin hook="frontend_header"} - + + {$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if} + + + + + + {if $entry_id} + + {/if} + {serendipity_hookPlugin hook="frontend_header"} + {if $staticpage_pagetitle} @@ -20,63 +20,63 @@ {/if}
- -
- +
+ - -
-
-
-
{$CONTENT}
- {if $rightSidebarElements > 0} -
{serendipity_printSidebar side="right"}
- {/if} - {if $leftSidebarElements > 0} -
{serendipity_printSidebar side="left"}
- {/if} -
 
-
+
+ --> + +
+
+
+
{$CONTENT}
+ {if $rightSidebarElements > 0} +
{serendipity_printSidebar side="right"}
+ {/if} + {if $leftSidebarElements > 0} +
{serendipity_printSidebar side="left"}
+ {/if} +
 
+
- + - {$raw_data} - {serendipity_hookPlugin hook="frontend_footer"} + {$raw_data} + {serendipity_hookPlugin hook="frontend_footer"}
diff --git a/glossy_white/info.txt b/glossy_white/info.txt index fecced1..6746ef1 100644 --- a/glossy_white/info.txt +++ b/glossy_white/info.txt @@ -1,3 +1,3 @@ -Name: glossy white (2008-02-14) +Name: glossy white (2014-01-09) Author: Christian Hoffmann (ported by Ziyad Saeed) -Date: 13/12/2005 +Date: 2014-01-09 diff --git a/glossy_white/sidebar.tpl b/glossy_white/sidebar.tpl index 5e33bd1..645d60c 100644 --- a/glossy_white/sidebar.tpl +++ b/glossy_white/sidebar.tpl @@ -2,6 +2,6 @@
{$item.title}
{$item.content}
-
{$item.footer}
+
{$item.footer}
{/foreach} \ No newline at end of file diff --git a/leaf/comments.tpl b/leaf/comments.tpl index 56759b3..21d789c 100644 --- a/leaf/comments.tpl +++ b/leaf/comments.tpl @@ -1,7 +1,7 @@ {foreach from=$comments item=comment}
-
+
#{$comment.trace} {if $comment.email} diff --git a/leaf/entries.tpl b/leaf/entries.tpl index a2503a0..68d97a1 100644 --- a/leaf/entries.tpl +++ b/leaf/entries.tpl @@ -50,18 +50,18 @@ {else} {$CONST.AT} {/if} {if $dategroup.is_sticky}{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY} {/if}{$entry.timestamp|@formatTime:'%H:%M'} -
+
- {if $entry.has_comments} + {if $entry.has_comments}
{if $use_popups} {$entry.label_comments} ({$entry.comments}) {else} - {if $entry.comments > 0} - {$entry.label_comments} ({$entry.comments}) - {else} - Add comment - {/if} + {if $entry.comments > 0} + {$entry.label_comments} ({$entry.comments}) + {else} + Add comment + {/if} {/if}
{/if} @@ -71,12 +71,12 @@ {if $use_popups} | {$entry.label_trackbacks} ({$entry.trackbacks}) {else} - Link to this post + Link to this post {/if}
{/if} - {if $entry.is_entry_owner and not $is_preview} + {if $entry.is_entry_owner and not $is_preview}
{$CONST.EDIT_ENTRY}
diff --git a/leaf/index.tpl b/leaf/index.tpl index 6a24b6d..dfe2a18 100644 --- a/leaf/index.tpl +++ b/leaf/index.tpl @@ -1,85 +1,85 @@ - - {$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if} - - - - - - {if $entry_id} - - {/if} - {serendipity_hookPlugin hook="frontend_header"} - + + {$head_title|@default:$blogTitle} {if $head_subtitle} - {$head_subtitle}{/if} + + + + + + {if $entry_id} + + {/if} + {serendipity_hookPlugin hook="frontend_header"} + -{if $staticpage_pagetitle} - -{else} - -{/if} +{if $staticpage_pagetitle} + +{else} + +{/if}
- -
- - -
-
-
-
{$CONTENT}
- {if $rightSidebarElements > 0} -
{serendipity_printSidebar side="right"}
- {/if} - {if $leftSidebarElements > 0} -
{serendipity_printSidebar side="left"}
- {/if} -
 
-
- - + +
+ + +
+
+
+
{$CONTENT}
+ {if $rightSidebarElements > 0} +
{serendipity_printSidebar side="right"}
+ {/if} + {if $leftSidebarElements > 0} +
{serendipity_printSidebar side="left"}
+ {/if} +
 
+
- {$raw_data} - {serendipity_hookPlugin hook="frontend_footer"} + + + {$raw_data} + {serendipity_hookPlugin hook="frontend_footer"}
diff --git a/leaf/info.txt b/leaf/info.txt index 4ce3319..93a6379 100644 --- a/leaf/info.txt +++ b/leaf/info.txt @@ -1,3 +1,3 @@ -Name: leaf (2008-02-14) +Name: leaf (2014-01-09) Author: Ivon Fong (ported by Ziyad Saeed) -Date: 01/09/2005 +Date: 2014-01-09 diff --git a/plus9/entries.tpl b/plus9/entries.tpl index 58a55fe..3378105 100644 --- a/plus9/entries.tpl +++ b/plus9/entries.tpl @@ -93,19 +93,14 @@
- {if $template_option.enable_ad== 'true' } - - - {/if} - - - - - + {if $template_option.enable_ad== 'true'} + + + {/if}

diff --git a/plus9/entries_summary.tpl b/plus9/entries_summary.tpl index 220ce8a..d8dfe30 100644 --- a/plus9/entries_summary.tpl +++ b/plus9/entries_summary.tpl @@ -9,7 +9,7 @@

{$CONST.POSTED_BY} {$entry.author}

{$entry.timestamp|@formatTime:'%x'} {$CONST.AT} {$entry.timestamp|@formatTime:'%X'}

-
+ {/foreach} {/foreach} diff --git a/plus9/index.tpl b/plus9/index.tpl index c98b623..64a505e 100644 --- a/plus9/index.tpl +++ b/plus9/index.tpl @@ -18,8 +18,6 @@ {if $entry_id} {/if} - - {serendipity_hookPlugin hook="frontend_header"} @@ -30,132 +28,120 @@ {if $is_raw_mode != true}
-
-
-
- -
+ +
+

{$blogTitle}

-
- -{if $startpage} -{$CONST.HOMEPAGE} -{else} -{$CONST.HOMEPAGE} -{/if}
-{if $head_title && !$entry.title | $head_title != $entry.title} -{if $entry.title}» {$category_info.category_name}{/if} -{elseif $head_title && $entry.title} -{if $category_info.category_name} -» {$category_info.category_name} -{/if} -{if $entry.title == $head_title} -» {$entry.title|truncate:28:" ...":true} -{/if} -{elseif $head_subtitle} -» -{/if} -{if $staticpage_pagetitle && !$entry.title} -» {$staticpage_headline} -{/if} - -
-
  - -{$head_subtitle|@default:$blogDescription} -
-
{$plugin_calendar_head.month_date|formatTime:"%B '%y":false}

- +
+ {if $startpage}{$CONST.HOMEPAGE}{else}{$CONST.HOMEPAGE}{/if}
+ {if ($head_title && !$entry.title) || ($head_title != $entry.title)} + {if $entry.title}» {$category_info.category_name}{/if} + {elseif $head_title && $entry.title} + {if $category_info.category_name} + » {$category_info.category_name} + {/if} + {if $entry.title == $head_title} + » {$entry.title|truncate:28:" ...":true} + {/if} + {elseif $head_subtitle} + » + {/if} + {if $staticpage_pagetitle && !$entry.title} + » {$staticpage_headline} + {/if} + +
+
  + {$head_subtitle|@default:$blogDescription} +
+
+ {$plugin_calendar_head.month_date|formatTime:"%B '%y":false} +

- -
-
-
+
+ +
+
-

+

-
- {$CONTENT} -
+
+ {$CONTENT} +
+ {/if} @@ -165,4 +151,3 @@ {/if} - \ No newline at end of file diff --git a/plus9/info.txt b/plus9/info.txt index dd96a83..0147e90 100644 --- a/plus9/info.txt +++ b/plus9/info.txt @@ -1,4 +1,4 @@ -Name: Plus9 (2013-10-26) +Name: Plus9 (2014-01-09) Author: Reinhard Linnemann -Date: 2013-10-26 +Date: 2014-01-09 Require Serendipity: 1.4 diff --git a/plus9/plugin_staticpage.tpl b/plus9/plugin_staticpage.tpl index cadb99d..c18e34d 100644 --- a/plus9/plugin_staticpage.tpl +++ b/plus9/plugin_staticpage.tpl @@ -11,13 +11,13 @@ {$staticpage_navigation.top.name|@escape} {$staticpage_navigation.next.name|@escape} - - - {foreach name="crumbs" from=$staticpage_navigation.crumbs item="crumb"} - {if !$smarty.foreach.crumbs.first}»{/if}{$crumb.name|@escape} - {/foreach} - - + + + {foreach name="crumbs" from=$staticpage_navigation.crumbs item="crumb"} + {if !$smarty.foreach.crumbs.first}»{/if}{$crumb.name|@escape} + {/foreach} + + {/if} @@ -52,7 +52,7 @@ {if $staticpage_lastchange}

{$staticpage_lastchange|date_format:"%x"} {$CONST.AT} {$staticpage_lastchange|date_format:"%X"}

{/if} - +
{if $staticpage_adminlink AND $staticpage_adminlink.page_user}

{$staticpage_adminlink.link_name|@escape}