diff --git a/serendipity_event_staticpage/ChangeLog b/serendipity_event_staticpage/ChangeLog index aae13060..979c7010 100644 --- a/serendipity_event_staticpage/ChangeLog +++ b/serendipity_event_staticpage/ChangeLog @@ -1,3 +1,9 @@ +3.97: Changed breadcrumb navigation so it is an independent option. Templates that use custom + static page templates (plugin_staticpage.tpl, plugin_staticpage_aboutpage.tpl, + plugin_staticpage_related.tpl) must be modified to include the condition + {if $staticpage_show_breadcrumb}...{/if}. See included plugin_staticpage.tpl + for example. + 3.96: Added last commits missing code part for the javascript hidden boxes (Timbalu) Workaround the use of document.write() for javascript enabled browsers diff --git a/serendipity_event_staticpage/UTF-8/lang_de.inc.php b/serendipity_event_staticpage/UTF-8/lang_de.inc.php index f7ec3075..f17a86cc 100644 --- a/serendipity_event_staticpage/UTF-8/lang_de.inc.php +++ b/serendipity_event_staticpage/UTF-8/lang_de.inc.php @@ -143,4 +143,7 @@ @define('STATICPAGES_CUSTOM_META_DESC', 'HTML META Seitenbeschreibung (optional)'); @define('STATICPAGES_CUSTOM_META_KEYS', 'HTML META Seiten Schlüsselwörter (optional)'); +@define('STATICPAGE_SHOW_BREADCRUMB_DEFAULT', 'Zeige Navigationspfad (Breadcrumbs)'); +@define('STATICPAGE_SHOW_BREADCRUMB', 'Zeige Navigationspfad (Breadcrumbs)'); +@define('STATICPAGE_SHOW_BREADCRUMB_DESC', 'Zeige auf dieser Seite den Navigationspfad (Breadcrumbs) an'); ?> \ No newline at end of file diff --git a/serendipity_event_staticpage/backend_templates/default_staticpage_backend.tpl b/serendipity_event_staticpage/backend_templates/default_staticpage_backend.tpl index 218097ec..7a1be7f7 100644 --- a/serendipity_event_staticpage/backend_templates/default_staticpage_backend.tpl +++ b/serendipity_event_staticpage/backend_templates/default_staticpage_backend.tpl @@ -126,6 +126,11 @@
{staticpage_input item="shownavi"} + +
+
+ {staticpage_input item="show_breadcrumb"} +

diff --git a/serendipity_event_staticpage/lang_de.inc.php b/serendipity_event_staticpage/lang_de.inc.php index c4a4f339..14705809 100644 --- a/serendipity_event_staticpage/lang_de.inc.php +++ b/serendipity_event_staticpage/lang_de.inc.php @@ -143,4 +143,7 @@ @define('STATICPAGES_CUSTOM_META_DESC', 'HTML META Seitenbeschreibung (optional)'); @define('STATICPAGES_CUSTOM_META_KEYS', 'HTML META Seiten Schlüsselwörter (optional)'); +@define('STATICPAGE_SHOW_BREADCRUMB_DEFAULT', 'Zeige Navigationspfad (Breadcrumbs)'); +@define('STATICPAGE_SHOW_BREADCRUMB', 'Zeige Navigationspfad (Breadcrumbs)'); +@define('STATICPAGE_SHOW_BREADCRUMB_DESC', 'Zeige auf dieser Seite den Navigationspfad (Breadcrumbs) an'); ?> \ No newline at end of file diff --git a/serendipity_event_staticpage/lang_en.inc.php b/serendipity_event_staticpage/lang_en.inc.php index 2e66d2bb..87559816 100644 --- a/serendipity_event_staticpage/lang_en.inc.php +++ b/serendipity_event_staticpage/lang_en.inc.php @@ -176,4 +176,7 @@ @define('PLUGIN_STATICPAGE_PREVIEW', 'The preview of your static page has been opened in a new pop-up window. If you can not see this, please click this link: %s'); +@define('STATICPAGE_SHOW_BREADCRUMB_DEFAULT', 'Show breadcrumb'); +@define('STATICPAGE_SHOW_BREADCRUMB', 'Show breadcrumb'); +@define('STATICPAGE_SHOW_BREADCRUMB_DESC', 'Show breadcrumb navigation on this page.'); ?> \ No newline at end of file diff --git a/serendipity_event_staticpage/plugin_staticpage.tpl b/serendipity_event_staticpage/plugin_staticpage.tpl index da3dfb56..7df9918d 100644 --- a/serendipity_event_staticpage/plugin_staticpage.tpl +++ b/serendipity_event_staticpage/plugin_staticpage.tpl @@ -12,13 +12,16 @@ {$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} - - + {if $staticpage_show_breadcrumb} + + + {$CONST.HOME|lower|capitalize:true} » + {foreach name="crumbs" from=$staticpage_navigation.crumbs item="crumb"} + {if !$smarty.foreach.crumbs.first}» {/if}{if !$smarty.foreach.crumbs.last}{$crumb.name|@escape}{else}{$crumb.name|@escape}{/if} + {/foreach} + + + {/if} {/if} diff --git a/serendipity_event_staticpage/plugin_staticpage_aboutpage.tpl b/serendipity_event_staticpage/plugin_staticpage_aboutpage.tpl index ce779728..5738f40e 100644 --- a/serendipity_event_staticpage/plugin_staticpage_aboutpage.tpl +++ b/serendipity_event_staticpage/plugin_staticpage_aboutpage.tpl @@ -12,6 +12,16 @@ {$staticpage_navigation.top.name|@escape} {$staticpage_navigation.next.name|@escape} + {if $staticpage_show_breadcrumb} + + + {$CONST.HOME|lower|capitalize:true} » + {foreach name="crumbs" from=$staticpage_navigation.crumbs item="crumb"} + {if !$smarty.foreach.crumbs.first}» {/if}{if !$smarty.foreach.crumbs.last}{$crumb.name|@escape}{else}{$crumb.name|@escape}{/if} + {/foreach} + + + {/if} {/if} diff --git a/serendipity_event_staticpage/plugin_staticpage_related_category.tpl b/serendipity_event_staticpage/plugin_staticpage_related_category.tpl index af378d15..95d59e92 100644 --- a/serendipity_event_staticpage/plugin_staticpage_related_category.tpl +++ b/serendipity_event_staticpage/plugin_staticpage_related_category.tpl @@ -12,6 +12,16 @@ {$staticpage_navigation.top.name|@escape} {$staticpage_navigation.next.name|@escape} + {if $staticpage_show_breadcrumb} + + + {$CONST.HOME|lower|capitalize:true} » + {foreach name="crumbs" from=$staticpage_navigation.crumbs item="crumb"} + {if !$smarty.foreach.crumbs.first}» {/if}{if !$smarty.foreach.crumbs.last}{$crumb.name|@escape}{else}{$crumb.name|@escape}{/if} + {/foreach} + + + {/if} {/if} diff --git a/serendipity_event_staticpage/serendipity_event_staticpage.php b/serendipity_event_staticpage/serendipity_event_staticpage.php index 27de985c..50dab555 100644 --- a/serendipity_event_staticpage/serendipity_event_staticpage.php +++ b/serendipity_event_staticpage/serendipity_event_staticpage.php @@ -48,7 +48,8 @@ class serendipity_event_staticpage extends serendipity_event 'shownavi', 'showonnavi', 'showmeta', - 'timestamp' + 'timestamp', + 'show_breadcrumb' ); var $config_types = array( @@ -86,8 +87,8 @@ class serendipity_event_staticpage extends serendipity_event $propbag->add('page_configuration', $this->config); $propbag->add('type_configuration', $this->config_types); - $propbag->add('author', 'Marco Rinck, Garvin Hicking, David Rolston, Falk Doering, Stephan Manske, Pascal Uhlmann, Ian'); - $propbag->add('version', '3.96'); + $propbag->add('author', 'Marco Rinck, Garvin Hicking, David Rolston, Falk Doering, Stephan Manske, Pascal Uhlmann, Ian, Don Chambers'); + $propbag->add('version', '3.97'); $propbag->add('requirements', array( 'serendipity' => '1.3', 'smarty' => '2.6.7', @@ -103,10 +104,11 @@ class serendipity_event_staticpage extends serendipity_event 'is_startpage', 'is_404_page', 'shownavi', + 'show_breadcrumb', 'showonnavi', 'showtextorheadline', 'showmeta', - 'use_quicksearch' + 'use_quicksearch' )); $this->cachefile = $serendipity['serendipityPath'] . PATH_SMARTY_COMPILE . '/staticpage_pagelist.dat'; } @@ -144,6 +146,13 @@ class serendipity_event_staticpage extends serendipity_event $propbag->add('default', 'true'); break; + case 'show_breadcrumb': + $propbag->add('type', 'boolean'); + $propbag->add('name', STATICPAGE_SHOW_BREADCRUMB_DEFAULT); + $propbag->add('description', STATICPAGE_DEFAULT_DESC); + $propbag->add('default', '1'); + break; + case 'markup': $propbag->add('type', 'boolean'); $propbag->add('name', STATICPAGE_SHOWMARKUP_DEFAULT); @@ -325,7 +334,14 @@ class serendipity_event_staticpage extends serendipity_event $propbag->add('default', $this->get_config('showonnavi')); break; - case 'publishstatus': + case 'show_breadcrumb': + $propbag->add('type', 'boolean'); + $propbag->add('name', STATICPAGE_SHOW_BREADCRUMB); + $propbag->add('description', STATICPAGE_SHOW_BREADCRUMB_DESC); + $propbag->add('default', $this->get_config('show_breadcrumb')); + break; + + case 'publishstatus': $propbag->add('type', 'select'); $propbag->add('name', STATICPAGE_PUBLISHSTATUS); $propbag->add('description', STATICPAGE_PUBLISHSTATUS_DESC); @@ -773,6 +789,7 @@ class serendipity_event_staticpage extends serendipity_event related_category_id int(4) default 0, shownavi int(4) default '1', showonnavi int(4) default '1', + show_breadcrumb int(4) default '1', publishstatus int(4) default '1', language varchar(10) default '') {UTF_8}"); @@ -908,8 +925,12 @@ class serendipity_event_staticpage extends serendipity_event $sql .= ' AFTER is_startpage'; } serendipity_db_schema_import($sql); - - $this->set_config('db_built', 19); + case 19: + if (!$fresh) { + $q = "ALTER TABLE {$serendipity['dbPrefix']}staticpages ADD COLUMN show_breadcrumb int(4) default '1'"; + serendipity_db_schema_import($q); + } + $this->set_config('db_built', 20); break; } } @@ -1210,6 +1231,7 @@ class serendipity_event_staticpage extends serendipity_event $pagevar . 'created_on' => $this->get_static('timestamp'), $pagevar . 'lastchange' => $this->get_static('last_modified'), $pagevar . 'shownavi' => $this->get_static('shownavi'), + $pagevar . 'show_breadcrumb' => $this->get_static('show_breadcrumb'), $pagevar . 'custom' => $this->get_static('custom') // same thing as above // $pagevar . 'related_category_entries' => $related_category_entries @@ -1462,7 +1484,9 @@ class serendipity_event_staticpage extends serendipity_event if (!isset($this->staticpage['showonnavi'])) { $this->staticpage['showonnavi'] = '1'; } - + if (!isset($this->staticpage['show_breadcrumb'])) { + $this->staticpage['show_breadcrumb'] = '1'; + } if (empty($this->staticpage['markup'])) { $this->staticpage['markup'] = '0'; } @@ -1475,7 +1499,9 @@ class serendipity_event_staticpage extends serendipity_event if (empty($this->staticpage['showonnavi'])) { $this->staticpage['showonnavi'] = '0'; } - + if (empty($this->staticpage['show_breadcrumb'])) { + $this->staticpage['show_breadcrumb'] = '0'; + } if (empty($this->staticpage['articletype'])) { $this->staticpage['articletype'] = '0'; }