From 860235e37192cb0b2ad43ad94c346c08420a591b Mon Sep 17 00:00:00 2001 From: Don Chambers Date: Thu, 6 Sep 2007 15:16:46 +0000 Subject: [PATCH] Bulletproof additions/modifications: Added new class of serendipity_Sticky_Entry in entries.tpl. Added template option to suppress entry footer for sticky posts. Added template option to suppress entry heading for sticky posts. Added template option to include or exclude icons in previous/next page links. Added default rules for class counter_code to style.css. --- templates/bulletproof/UTF-8/lang_bg.inc.php | 117 ++++---- templates/bulletproof/UTF-8/lang_de.inc.php | 44 ++-- templates/bulletproof/UTF-8/lang_en.inc.php | 8 +- templates/bulletproof/config.inc.php | 25 ++ templates/bulletproof/entries.tpl | 278 +++++++++++--------- templates/bulletproof/info.txt | 2 +- templates/bulletproof/lang_bg.inc.php | 7 + templates/bulletproof/lang_de.inc.php | 7 + templates/bulletproof/lang_en.inc.php | 7 + templates/bulletproof/style.css | 11 +- 10 files changed, 308 insertions(+), 198 deletions(-) diff --git a/templates/bulletproof/UTF-8/lang_bg.inc.php b/templates/bulletproof/UTF-8/lang_bg.inc.php index 678d9aa3..c40e3212 100644 --- a/templates/bulletproof/UTF-8/lang_bg.inc.php +++ b/templates/bulletproof/UTF-8/lang_bg.inc.php @@ -5,67 +5,74 @@ Translator: Ivan Cenov (jwalker@hotmail.bg) */ // Colorsets -@define('THEME_COLORSET', 'Цветова схема'); -@define('BP_COLORSET_DEF', 'Прозрачна'); -@define('BP_COLORSET_OPT1', 'Виолетова'); -@define('BP_COLORSET_OPT2', 'Синя'); -@define('BP_COLORSET_OPT3', 'Зелена'); +@define('THEME_COLORSET', ' '); +@define('BP_COLORSET_DEF', ''); +@define('BP_COLORSET_OPT1', ''); +@define('BP_COLORSET_OPT2', ''); +@define('BP_COLORSET_OPT3', ''); // Layout -@define('LAYOUT_TYPE','Общо оформление (B = Статия, S = Странична приставка, CF = Първо съдържанието)'); -@define('LAYOUT_SBS','Три колони S-B-S'); -@define('LAYOUT_BSS','Три колони, B-S-S, CF'); -@define('LAYOUT_SSB','Три колони, S-S-B'); -@define('LAYOUT_SB','Две колони, S-B'); -@define('LAYOUT_BS','Две колони, B-S, CF'); -@define('LAYOUT_SC','Една колона, приставките отдолу, CF'); -@define('JAVASCRIPT_COLUMNS','Генериране на колони с еднаква височина (използва се Javascript, а това може да забави малко появата на страницата'); +@define('LAYOUT_TYPE',' (B = , S = , CF = )'); +@define('LAYOUT_SBS',' S-B-S'); +@define('LAYOUT_BSS',' , B-S-S, CF'); +@define('LAYOUT_SSB',' , S-S-B'); +@define('LAYOUT_SB',' , S-B'); +@define('LAYOUT_BS',' , B-S, CF'); +@define('LAYOUT_SC',' , , CF'); +@define('JAVASCRIPT_COLUMNS',' ( Javascript, '); // Custom header -@define('BP_CUSTOM_HEADER','Изображение по избор на базата данни за хедъра на блога'); -@define('BP_HEADER_IMAGE','Избор на изображение'); -@define('BP_HEADER_TYPE','Мащабиране на изображението'); -@define('BP_HEADER_BANNER', 'Банер (без мащабиране)'); -@define('BP_HEADER_HTILED', 'Хоризонтално мащабиране'); -@define('BP_HEADER_VTILED', 'Вертикално мащабиране'); -@define('BP_HEADER_BTILED', 'Хоризонтално и вертикално мащабиране'); -@define('BP_HEADER_POSHOR', 'Хоризонтално подравняване'); -@define('BP_HEADER_POSVER', 'Вертикално подравняване'); -@define('BP_CENTER', 'центрирано'); -@define('BP_TOP', 'горе'); -@define('BP_BOTTOM', 'долу'); +@define('BP_CUSTOM_HEADER',' '); +@define('BP_HEADER_IMAGE',' '); +@define('BP_HEADER_TYPE',' '); +@define('BP_HEADER_BANNER', ' ( )'); +@define('BP_HEADER_HTILED', ' '); +@define('BP_HEADER_VTILED', ' '); +@define('BP_HEADER_BTILED', ' '); +@define('BP_HEADER_POSHOR', ' '); +@define('BP_HEADER_POSVER', ' '); +@define('BP_CENTER', ''); +@define('BP_TOP', ''); +@define('BP_BOTTOM', ''); // Fahrner Image Replacement -@define('FIR_BTITLE','Показване на заглавието на блога в хедъра'); -@define('FIR_BDESCR','Показване на описанието на блога в хедъра'); +@define('FIR_BTITLE',' '); +@define('FIR_BDESCR',' '); // Date format -@define('BP_DATE_FORMAT', 'Формат на датата'); +@define('BP_DATE_FORMAT', ' '); // Entry footer -@define('ENTRY_FOOTER_POS','Позиция на основата на статиите'); -@define('BELOW_ENTRY','Под статията'); -@define('BELOW_TITLE','Под заглавието на статията'); -@define('SPLIT_FOOTER','Разделена основа'); -@define('FOOTER_AUTHOR','Показване на автора в основата на статията'); -@define('FOOTER_CATEGORIES','Показване на категориите в основата на статията'); -@define('FOOTER_TIMESTAMP','Показване на дата/час в основата на статията'); -@define('FOOTER_COMMENTS','Показване на броя на коментарите в основата на статията'); -@define('FOOTER_TRACKBACKS','Показване на броя на проследяванията в основата на статията'); +@define('ENTRY_FOOTER_POS',' '); +@define('BELOW_ENTRY',' '); +@define('BELOW_TITLE',' '); +@define('SPLIT_FOOTER',' '); +@define('FOOTER_AUTHOR',' '); +@define('FOOTER_CATEGORIES',' '); +@define('FOOTER_TIMESTAMP',' / '); +@define('FOOTER_COMMENTS',' '); +@define('FOOTER_TRACKBACKS',' '); +@define('SHOW_STICKY_ENTRY_FOOTER','Show entry footer for sticky postings (requires plugin "Extended properties for entries")'); +@define('SHOW_STICKY_ENTRY_HEADING','Show entry heading for sticky postings (requires plugin "Extended properties for entries")'); +// Page footer next page and previous page links +@define('PREV_NEXT_STYLE','Show page footer previous page/next page links as'); +@define('PREV_NEXT_TEXT','Text only'); +@define('PREV_NEXT_TEXT_ICON','Text and icon'); +@define('PREV_NEXT_ICON','Icon only'); // coComment support -@define('COCOMMENT_ACTIVE','Интегриране на coComment (http://www.cocomment.com) във формата на коментарите'); +@define('COCOMMENT_ACTIVE',' coComment (http://www.cocomment.com) '); // Counter code -@define('COUNTER_CODE', 'Код за WEB брояч и/или статистика'); -@define('USE_COUNTER', 'Използване на брояча, определен в горното поле'); +@define('COUNTER_CODE', ' WEB / '); +@define('USE_COUNTER', ' , '); // Additional footer text -@define('FOOTER_TEXT', 'Допълнителен текст в основата на страницата'); -@define('USE_FOOTER_TEXT', 'Използване на допълнителния текст, въведен в горното поле'); +@define('FOOTER_TEXT', ' '); +@define('USE_FOOTER_TEXT', ' , '); //Sitenav -@define('SITENAV_POSITION','Позиция на навигационния ред'); -@define('SITENAV_NONE','Няма'); -@define('SITENAV_ABOVE','Над банера'); -@define('SITENAV_BELOW','Под банера'); -@define('SITENAV_LEFT','Над левите странични приставки'); -@define('SITENAV_RIGHT','Над десните странични приставки'); -@define('SITENAV_FOOTER','Показване на навигационните връзки в основата (не се показват в случай, че е навигационният ред е забранен)'); -@define('SITENAV_QUICKSEARCH','Показване на поле за бързо търсене в навигационния ред (работи, само ако навигационният ред е над или под банера; бързото търсене се забранява автоматично ако навигационният ред е поставен над страничните приставки)'); -@define('SITENAV_TITLE','Име на навигационното меню (показва се само ако е поставено над страничните приставки)'); -@define('SITENAV_TITLE_TEXT','Главно меню'); -@define('NAVLINK_AMOUNT', 'брой на връзките в навигационния ред (необходимо е презареждане на страница "Промяна на оформлението - тази страница от менюто на административния панел)'); -@define('NAV_LINK_TEXT', 'Текст на връзка'); -@define('NAV_LINK_URL', 'Пълен URL на връзка'); +@define('SITENAV_POSITION',' '); +@define('SITENAV_NONE',''); +@define('SITENAV_ABOVE',' '); +@define('SITENAV_BELOW',' '); +@define('SITENAV_LEFT',' '); +@define('SITENAV_RIGHT',' '); +@define('SITENAV_FOOTER',' ( , )'); +@define('SITENAV_QUICKSEARCH',' (, ; )'); +@define('SITENAV_TITLE',' ( )'); +@define('SITENAV_TITLE_TEXT',' '); +@define('NAVLINK_AMOUNT', ' ( " - )'); +@define('NAV_LINK_TEXT', ' '); +@define('NAV_LINK_URL', ' URL '); diff --git a/templates/bulletproof/UTF-8/lang_de.inc.php b/templates/bulletproof/UTF-8/lang_de.inc.php index 9555734e..0d98ef1f 100644 --- a/templates/bulletproof/UTF-8/lang_de.inc.php +++ b/templates/bulletproof/UTF-8/lang_de.inc.php @@ -4,16 +4,16 @@ @define('BP_COLORSET_DEF', 'leer'); @define('BP_COLORSET_OPT1', 'violett'); @define('BP_COLORSET_OPT2', 'blau'); -@define('BP_COLORSET_OPT3', 'grün'); +@define('BP_COLORSET_OPT3', 'grn'); // Layout -@define('LAYOUT_TYPE','Layout des Blogs (B = Blogeinträge, S = Seitenleiste, CF = Content first)'); +@define('LAYOUT_TYPE','Layout des Blogs (B = Blogeintrge, S = Seitenleiste, CF = Content first)'); @define('LAYOUT_SBS','Dreispaltig S-B-S'); @define('LAYOUT_BSS','Dreispaltig, B-S-S, CF'); @define('LAYOUT_SSB','Dreispaltig, S-S-B'); @define('LAYOUT_SB','Zweispaltig, Seitenleiste links'); @define('LAYOUT_BS','Zweispaltig, Seitenleiste rechts, CF'); @define('LAYOUT_SC','Einspaltig, Seitenleiste(n) 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 verzgern.)'); // Custom header @define('BP_CUSTOM_HEADER','Eigene Header-Grafik aus der Mediendatenbank verwenden'); @define('BP_HEADER_IMAGE','Auswahl der Header-Grafik'); @@ -30,36 +30,44 @@ // Fahrner Image Replacement @define('FIR_BTITLE','Blogtitel im Header anzeigen'); @define('FIR_BDESCR','Blogbeschreibung im Header anzeigen'); +// Date format +@define('BP_DATE_FORMAT', 'Datumsformat'); // Entry footer -@define('ENTRY_FOOTER_POS','Position des Eintragsfußes'); +@define('ENTRY_FOOTER_POS','Position des Eintragsfues'); @define('BELOW_ENTRY','Unter dem Eintrag'); @define('BELOW_TITLE','Unter dem Titel des Eintrags'); -@define('SPLIT_FOOTER','Aufgeteilter Eintragsfuß'); -@define('FOOTER_AUTHOR','Verfasser im Eintragsfuß anzeigen'); -@define('FOOTER_CATEGORIES','Kategorie(n) im Eintragsfuß anzeigen'); -@define('FOOTER_TIMESTAMP','Zeitstempel im Eintragsfuß anzeigen'); -@define('FOOTER_COMMENTS','Anzahl der Kommentare im Eintragsfuß anzeigen'); -@define('FOOTER_TRACKBACKS','Anzahl der Trackbacks im Eintragsfuß anzeigen'); +@define('SPLIT_FOOTER','Aufgeteilter Eintragsfu'); +@define('FOOTER_AUTHOR','Verfasser im Eintragsfu anzeigen'); +@define('FOOTER_CATEGORIES','Kategorie(n) im Eintragsfu anzeigen'); +@define('FOOTER_TIMESTAMP','Zeitstempel im Eintragsfu anzeigen'); +@define('FOOTER_COMMENTS','Anzahl der Kommentare im Eintragsfu anzeigen'); +@define('FOOTER_TRACKBACKS','Anzahl der Trackbacks im Eintragsfu anzeigen'); +@define('SHOW_STICKY_ENTRY_FOOTER','Show entry footer for sticky postings (requires plugin "Extended properties for entries")'); +@define('SHOW_STICKY_ENTRY_HEADING','Show entry heading for sticky postings (requires plugin "Extended properties for entries")'); +// Page footer next page and previous page links +@define('PREV_NEXT_STYLE','Show page footer previous page/next page links as'); +@define('PREV_NEXT_TEXT','Text only'); +@define('PREV_NEXT_TEXT_ICON','Text and icon'); +@define('PREV_NEXT_ICON','Icon only'); // coComment support @define('COCOMMENT_ACTIVE','coComment (http://www.cocomment.com) in Kommentarformulare einbinden'); // Counter code -@define('COUNTER_CODE', 'Code für Counter und/oder Statistik-Tools einfügen'); +@define('COUNTER_CODE', 'Code fr Counter und/oder Statistik-Tools einfgen'); @define('USE_COUNTER', 'Oben eingegeben Counter-Code in das Blog einbinden'); // Additional footer text -@define('FOOTER_TEXT', 'Hier zusätzlichen Text, der im Seitenfuss erscheinen soll, einfügen.'); +@define('FOOTER_TEXT', 'Hier zustzlichen Text, der im Seitenfuss erscheinen soll, einfgen.'); @define('USE_FOOTER_TEXT', 'Oben eingegebenen Text einbinden'); //Sitenav @define('SITENAV_POSITION','Darstellung der 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_LEFT','Oben in der linken 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_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_TEXT','Hauptmenü'); +@define('SITENAV_FOOTER','Links der Navigationleiste zustzlich im Seitenfuss anzeigen (werden nicht angezeigt, wenn oben "Keine Navigationsleiste" ausgewhlt wurde)'); +@define('SITENAV_QUICKSEARCH','Suchfeld in der Navigationsleiste anzeigen (funktioniert nur, wenn Navigationsleiste ber oder unter dem Kopfbereich; Anzeige des entsprechenden Seitenleistenplugins wird automatisch unterdrckt)'); +@define('SITENAV_TITLE','Titel des Navigations-Mens (nur bei Anzeige in der Seitenleiste'); +@define('SITENAV_TITLE_TEXT','Hauptmen'); @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_URL', 'URL des Navigationsleisten-Links'); -?> \ No newline at end of file diff --git a/templates/bulletproof/UTF-8/lang_en.inc.php b/templates/bulletproof/UTF-8/lang_en.inc.php index 17fc34db..87381214 100644 --- a/templates/bulletproof/UTF-8/lang_en.inc.php +++ b/templates/bulletproof/UTF-8/lang_en.inc.php @@ -42,6 +42,13 @@ @define('FOOTER_TIMESTAMP','Show timestamp in the entry footer'); @define('FOOTER_COMMENTS','Show number of comments in the entry footer'); @define('FOOTER_TRACKBACKS','Show number of trackback in the entry footer'); +@define('SHOW_STICKY_ENTRY_FOOTER','Show entry footer for sticky postings (requires plugin "Extended properties for entries")'); +@define('SHOW_STICKY_ENTRY_HEADING','Show entry heading for sticky postings (requires plugin "Extended properties for entries")'); +// Page footer next page and previous page links +@define('PREV_NEXT_STYLE','Show page footer previous page/next page links as'); +@define('PREV_NEXT_TEXT','Text only'); +@define('PREV_NEXT_TEXT_ICON','Text and icon'); +@define('PREV_NEXT_ICON','Icon only'); // coComment support @define('COCOMMENT_ACTIVE','Integrate coComment (http://www.cocomment.com) into comment form'); // Counter code @@ -64,4 +71,3 @@ @define('NAVLINK_AMOUNT', 'Enter number of links in the navbar (needs reload of the Manage Styles page)'); @define('NAV_LINK_TEXT', 'Enter the navbar link text'); @define('NAV_LINK_URL', 'Enter the full URL of your link'); -?> \ No newline at end of file diff --git a/templates/bulletproof/config.inc.php b/templates/bulletproof/config.inc.php index 706b2b9f..c1fbb5f5 100644 --- a/templates/bulletproof/config.inc.php +++ b/templates/bulletproof/config.inc.php @@ -178,6 +178,22 @@ $template_config = array( 'radio' => array('value' => array('true', 'false'), 'desc' => array(YES, NO)), 'default' => 'true', + ), + array( + 'var' => 'show_sticky_entry_footer', + 'name' => SHOW_STICKY_ENTRY_FOOTER, + 'type' => 'radio', + 'radio' => array('value' => array('true', 'false'), + 'desc' => array(YES, NO)), + 'default' => 'true', + ), + array( + 'var' => 'show_sticky_entry_heading', + 'name' => SHOW_STICKY_ENTRY_HEADING, + 'type' => 'radio', + 'radio' => array('value' => array('true', 'false'), + 'desc' => array(YES, NO)), + 'default' => 'true', ), array( 'var' => 'cocommentactive', @@ -186,6 +202,15 @@ $template_config = array( 'radio' => array('value' => array('active', 'inactive'), 'desc' => array(YES, NO)), 'default' => 'inactive', + ), + array( + 'var' => 'prev_next_style', + 'name' => PREV_NEXT_STYLE, + 'type' => 'select', + 'default' => 'text', + 'select_values' => array('text' => PREV_NEXT_TEXT, + 'texticon' => PREV_NEXT_TEXT_ICON, + 'icon' => PREV_NEXT_ICON) ), array( 'var' => 'counter_code', diff --git a/templates/bulletproof/entries.tpl b/templates/bulletproof/entries.tpl index 4312a6cf..922121d4 100644 --- a/templates/bulletproof/entries.tpl +++ b/templates/bulletproof/entries.tpl @@ -2,9 +2,11 @@ {serendipity_hookPlugin hook="entries_header" addData="$entry_id"} {foreach from=$entries item="dategroup"} -
+
{if $dategroup.is_sticky} -

{$CONST.STICKY_POSTINGS}

+ {if $template_option.show_sticky_entry_heading == 'true'} +

{$CONST.STICKY_POSTINGS}

+ {/if} {else}

{$dategroup.date|@formatTime:$template_option.date_format}

{/if} @@ -14,76 +16,78 @@
- {if $template_option.entryfooterpos == 'belowtitle'} -
- {if $template_option.footerauthor == 'true'} - {$CONST.POSTED_BY} {$entry.author} - {/if} - - {if $template_option.footercategories == 'true'} - {if $entry.categories} - {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}{$entry_category.category_name|@escape}{if not $smarty.foreach.categories.last}, {/if}{/foreach} + {if (not $dategroup.is_sticky or ($dategroup.is_sticky and $template_option.show_sticky_entry_footer == 'true'))} + {if $template_option.entryfooterpos == 'belowtitle'} +
+ {if $template_option.footerauthor == 'true'} + {$CONST.POSTED_BY} {$entry.author} {/if} - {/if} - {if $template_option.footertimestamp == 'true'} - {if $dategroup.is_sticky} - {$CONST.ON} - {else} - {$CONST.AT} - {/if} - {if $dategroup.is_sticky}{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY} {/if}{$entry.timestamp|@formatTime:'%H:%M'} - {/if} - - {if $template_option.footercomments == 'true'} - {if $entry.has_comments} - {if $use_popups} - | {$entry.label_comments} ({$entry.comments}) - {else} - | {$entry.label_comments} ({$entry.comments}) + {if $template_option.footercategories == 'true'} + {if $entry.categories} + {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}{$entry_category.category_name|@escape}{if not $smarty.foreach.categories.last}, {/if}{/foreach} {/if} {/if} - {/if} - {if $template_option.footertrackbacks == 'true'} - {if $entry.has_trackbacks} - {if $use_popups} - | {$entry.label_trackbacks} ({$entry.trackbacks}) + {if $template_option.footertimestamp == 'true'} + {if $dategroup.is_sticky} + {$CONST.ON} {else} - | {$entry.label_trackbacks} ({$entry.trackbacks}) + {$CONST.AT} + {/if} + {if $dategroup.is_sticky}{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY} {/if}{$entry.timestamp|@formatTime:'%H:%M'} + {/if} + + {if $template_option.footercomments == 'true'} + {if $entry.has_comments} + {if $use_popups} + | {$entry.label_comments} ({$entry.comments}) + {else} + | {$entry.label_comments} ({$entry.comments}) + {/if} {/if} {/if} - {/if} - {if $entry.is_entry_owner and not $is_preview} + {if $template_option.footertrackbacks == 'true'} + {if $entry.has_trackbacks} + {if $use_popups} + | {$entry.label_trackbacks} ({$entry.trackbacks}) + {else} + | {$entry.label_trackbacks} ({$entry.trackbacks}) + {/if} + {/if} + {/if} + + {if $entry.is_entry_owner and not $is_preview}
{$CONST.EDIT_ENTRY}
- {/if} - - {$entry.add_footer} -
- {/if} - - {if $template_option.entryfooterpos == 'splitfoot'} -
- {if $template_option.footerauthor == 'true'} - {$CONST.POSTED_BY} {$entry.author} - {/if} - - {if $template_option.footercategories == 'true'} - {if $entry.categories} - {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}{$entry_category.category_name|@escape}{if not $smarty.foreach.categories.last}, {/if}{/foreach} {/if} - {/if} - {if $template_option.footertimestamp == 'true'} - {if $dategroup.is_sticky} - {$CONST.ON} - {else} - {$CONST.AT} + {$entry.add_footer} +
+ {/if} + + {if $template_option.entryfooterpos == 'splitfoot'} +
+ {if $template_option.footerauthor == 'true'} + {$CONST.POSTED_BY} {$entry.author} {/if} - {if $dategroup.is_sticky}{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY} {/if}{$entry.timestamp|@formatTime:'%H:%M'} - {/if} -
+ + {if $template_option.footercategories == 'true'} + {if $entry.categories} + {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}{$entry_category.category_name|@escape}{if not $smarty.foreach.categories.last}, {/if}{/foreach} + {/if} + {/if} + + {if $template_option.footertimestamp == 'true'} + {if $dategroup.is_sticky} + {$CONST.ON} + {else} + {$CONST.AT} + {/if} + {if $dategroup.is_sticky}{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY} {/if}{$entry.timestamp|@formatTime:'%H:%M'} + {/if} +
+ {/if} {/if} {if $entry.categories} @@ -107,83 +111,85 @@
{$entry.extended}
{/if} - {if $template_option.entryfooterpos == 'belowentry'} -
- {if $template_option.footerauthor == 'true'} - {$CONST.POSTED_BY} {$entry.author} - {/if} - - {if $template_option.footercategories == 'true'} - {if $entry.categories} - {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}{$entry_category.category_name|@escape}{if not $smarty.foreach.categories.last}, {/if}{/foreach} + {if (not $dategroup.is_sticky or ($dategroup.is_sticky and $template_option.show_sticky_entry_footer == 'true'))} + {if $template_option.entryfooterpos == 'belowentry'} +
+ {if $template_option.footerauthor == 'true'} + {$CONST.POSTED_BY} {$entry.author} {/if} - {/if} - {if $template_option.footertimestamp == 'true'} - {if $dategroup.is_sticky} - {$CONST.ON} - {else} - {$CONST.AT} - {/if} - {if $dategroup.is_sticky}{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY} {/if}{$entry.timestamp|@formatTime:'%H:%M'} - {/if} - - {if $template_option.footercomments == 'true'} - {if $entry.has_comments} - {if $use_popups} - | {$entry.label_comments} ({$entry.comments}) - {else} - | {$entry.label_comments} ({$entry.comments}) + {if $template_option.footercategories == 'true'} + {if $entry.categories} + {$CONST.IN} {foreach from=$entry.categories item="entry_category" name="categories"}{$entry_category.category_name|@escape}{if not $smarty.foreach.categories.last}, {/if}{/foreach} {/if} {/if} - {/if} - {if $template_option.footertrackbacks == 'true'} - {if $entry.has_trackbacks} - {if $use_popups} - | {$entry.label_trackbacks} ({$entry.trackbacks}) + {if $template_option.footertimestamp == 'true'} + {if $dategroup.is_sticky} + {$CONST.ON} {else} - | {$entry.label_trackbacks} ({$entry.trackbacks}) + {$CONST.AT} + {/if} + {if $dategroup.is_sticky}{$entry.timestamp|@formatTime:DATE_FORMAT_ENTRY} {/if}{$entry.timestamp|@formatTime:'%H:%M'} + {/if} + + {if $template_option.footercomments == 'true'} + {if $entry.has_comments} + {if $use_popups} + | {$entry.label_comments} ({$entry.comments}) + {else} + | {$entry.label_comments} ({$entry.comments}) + {/if} {/if} {/if} - {/if} - {if $entry.is_entry_owner and not $is_preview} -
{$CONST.EDIT_ENTRY}
- {/if} - - {$entry.add_footer} -
- {/if} - - {if $template_option.entryfooterpos == 'splitfoot'} -
- {if $template_option.footercomments == 'true'} - {if $entry.has_comments} - {if $use_popups} - {$entry.label_comments} ({$entry.comments}) - {else} - {$entry.label_comments} ({$entry.comments}) + {if $template_option.footertrackbacks == 'true'} + {if $entry.has_trackbacks} + {if $use_popups} + | {$entry.label_trackbacks} ({$entry.trackbacks}) + {else} + | {$entry.label_trackbacks} ({$entry.trackbacks}) + {/if} {/if} {/if} - {/if} - {if $template_option.footertrackbacks == 'true'} - {if $entry.has_trackbacks} - {if $use_popups} - | {$entry.label_trackbacks} ({$entry.trackbacks}) - {else} - | {$entry.label_trackbacks} ({$entry.trackbacks}) + {if $entry.is_entry_owner and not $is_preview} +
{$CONST.EDIT_ENTRY}
+ {/if} + + {$entry.add_footer} +
+ {/if} + + {if $template_option.entryfooterpos == 'splitfoot'} +
+ {if $template_option.footercomments == 'true'} + {if $entry.has_comments} + {if $use_popups} + {$entry.label_comments} ({$entry.comments}) + {else} + {$entry.label_comments} ({$entry.comments}) + {/if} {/if} {/if} - {/if} - {if $entry.is_entry_owner and not $is_preview} -
{$CONST.EDIT_ENTRY}
- {/if} + {if $template_option.footertrackbacks == 'true'} + {if $entry.has_trackbacks} + {if $use_popups} + | {$entry.label_trackbacks} ({$entry.trackbacks}) + {else} + | {$entry.label_trackbacks} ({$entry.trackbacks}) + {/if} + {/if} + {/if} - {$entry.add_footer} -
+ {if $entry.is_entry_owner and not $is_preview} +
{$CONST.EDIT_ENTRY}
+ {/if} + + {$entry.add_footer} +
+ {/if} {/if}
@@ -286,7 +292,21 @@
{if $footer_prev_page} - « {$CONST.PREVIOUS_PAGE}   + {if $template_option.prev_next_style == 'texticon'} + {if $template_option.colorset == 'blank'} + {$CONST.PREVIOUS_PAGE}{$CONST.PREVIOUS_PAGE} + {else} + {$CONST.PREVIOUS_PAGE}{$CONST.PREVIOUS_PAGE} + {/if} + {elseif $template_option.prev_next_style == 'icon'} + {if $template_option.colorset == 'blank'} + {$CONST.PREVIOUS_PAGE}{$CONST.PREVIOUS_PAGE} + {else} + {$CONST.PREVIOUS_PAGE} + {/if} + {else} + « {$CONST.PREVIOUS_PAGE}   + {/if} {/if} {if $footer_info} @@ -294,7 +314,21 @@ {/if} {if $footer_next_page} - {$CONST.NEXT_PAGE} » + {if $template_option.prev_next_style == 'texticon'} + {if $template_option.colorset == 'blank'} + {$CONST.NEXT_PAGE}{$CONST.NEXT_PAGE} + {else} + {$CONST.NEXT_PAGE}{$CONST.NEXT_PAGE} + {/if} + {elseif $template_option.prev_next_style == 'icon'} + {if $template_option.colorset == 'blank'} + {$CONST.NEXT_PAGE} + {else} + {$CONST.NEXT_PAGE} + {/if} + {else} + {$CONST.NEXT_PAGE} » + {/if} {/if} {serendipity_hookPlugin hook="entries_footer"} diff --git a/templates/bulletproof/info.txt b/templates/bulletproof/info.txt index d94db081..ca415821 100644 --- a/templates/bulletproof/info.txt +++ b/templates/bulletproof/info.txt @@ -1,4 +1,4 @@ Name: Bulletproof v1.0 (s9y-bulletproof.com) Author: Bulletproof development team -Date: 2007-09-04 +Date: 2007-09-06 Require Serendipity: 1.2 diff --git a/templates/bulletproof/lang_bg.inc.php b/templates/bulletproof/lang_bg.inc.php index fad7b919..c40e3212 100644 --- a/templates/bulletproof/lang_bg.inc.php +++ b/templates/bulletproof/lang_bg.inc.php @@ -47,6 +47,13 @@ Translator: Ivan Cenov (jwalker@hotmail.bg) @define('FOOTER_TIMESTAMP',' / '); @define('FOOTER_COMMENTS',' '); @define('FOOTER_TRACKBACKS',' '); +@define('SHOW_STICKY_ENTRY_FOOTER','Show entry footer for sticky postings (requires plugin "Extended properties for entries")'); +@define('SHOW_STICKY_ENTRY_HEADING','Show entry heading for sticky postings (requires plugin "Extended properties for entries")'); +// Page footer next page and previous page links +@define('PREV_NEXT_STYLE','Show page footer previous page/next page links as'); +@define('PREV_NEXT_TEXT','Text only'); +@define('PREV_NEXT_TEXT_ICON','Text and icon'); +@define('PREV_NEXT_ICON','Icon only'); // coComment support @define('COCOMMENT_ACTIVE',' coComment (http://www.cocomment.com) '); // Counter code diff --git a/templates/bulletproof/lang_de.inc.php b/templates/bulletproof/lang_de.inc.php index bf0b24c6..0d98ef1f 100644 --- a/templates/bulletproof/lang_de.inc.php +++ b/templates/bulletproof/lang_de.inc.php @@ -42,6 +42,13 @@ @define('FOOTER_TIMESTAMP','Zeitstempel im Eintragsfu anzeigen'); @define('FOOTER_COMMENTS','Anzahl der Kommentare im Eintragsfu anzeigen'); @define('FOOTER_TRACKBACKS','Anzahl der Trackbacks im Eintragsfu anzeigen'); +@define('SHOW_STICKY_ENTRY_FOOTER','Show entry footer for sticky postings (requires plugin "Extended properties for entries")'); +@define('SHOW_STICKY_ENTRY_HEADING','Show entry heading for sticky postings (requires plugin "Extended properties for entries")'); +// Page footer next page and previous page links +@define('PREV_NEXT_STYLE','Show page footer previous page/next page links as'); +@define('PREV_NEXT_TEXT','Text only'); +@define('PREV_NEXT_TEXT_ICON','Text and icon'); +@define('PREV_NEXT_ICON','Icon only'); // coComment support @define('COCOMMENT_ACTIVE','coComment (http://www.cocomment.com) in Kommentarformulare einbinden'); // Counter code diff --git a/templates/bulletproof/lang_en.inc.php b/templates/bulletproof/lang_en.inc.php index 701cba20..87381214 100644 --- a/templates/bulletproof/lang_en.inc.php +++ b/templates/bulletproof/lang_en.inc.php @@ -42,6 +42,13 @@ @define('FOOTER_TIMESTAMP','Show timestamp in the entry footer'); @define('FOOTER_COMMENTS','Show number of comments in the entry footer'); @define('FOOTER_TRACKBACKS','Show number of trackback in the entry footer'); +@define('SHOW_STICKY_ENTRY_FOOTER','Show entry footer for sticky postings (requires plugin "Extended properties for entries")'); +@define('SHOW_STICKY_ENTRY_HEADING','Show entry heading for sticky postings (requires plugin "Extended properties for entries")'); +// Page footer next page and previous page links +@define('PREV_NEXT_STYLE','Show page footer previous page/next page links as'); +@define('PREV_NEXT_TEXT','Text only'); +@define('PREV_NEXT_TEXT_ICON','Text and icon'); +@define('PREV_NEXT_ICON','Icon only'); // coComment support @define('COCOMMENT_ACTIVE','Integrate coComment (http://www.cocomment.com) into comment form'); // Counter code diff --git a/templates/bulletproof/style.css b/templates/bulletproof/style.css index 2c00e6ee..530a30ad 100644 --- a/templates/bulletproof/style.css +++ b/templates/bulletproof/style.css @@ -80,9 +80,11 @@ p { /*** Footer styles ***/ -#footer p { +#footer p, +.counter_code { margin-left: 10px; padding: 0; + clear: both; } #serendipity_credit_line { @@ -97,6 +99,13 @@ p { display: inline; } +.serendipity_pageFooter img{ + vertical-align: middle; + margin: 0 2px; + height: 12px; + width: 12px; + border: 0 none; +} /*** Entry styles ***/ .serendipity_Entry_Date {