diff --git a/bl-kernel/boot/init.php b/bl-kernel/boot/init.php index 122e97fe..a0644987 100644 --- a/bl-kernel/boot/init.php +++ b/bl-kernel/boot/init.php @@ -1,10 +1,10 @@ The order of the content is taken from the advanced settings of Bludit." }, "home-link": "Home link", diff --git a/bl-plugins/navigation/plugin.php b/bl-plugins/navigation/plugin.php index 899dc7f6..a493c083 100644 --- a/bl-plugins/navigation/plugin.php +++ b/bl-plugins/navigation/plugin.php @@ -8,7 +8,9 @@ class pluginNavigation extends Plugin { $this->dbFields = array( 'label'=>'Navigation', 'homeLink'=>true, - 'amountOfItems'=>5 + 'amountOfItems'=>5, + 'staticPages'=>true, + 'pages'=>true ); } @@ -29,14 +31,31 @@ class pluginNavigation extends Plugin { $html .= ''; $html .= ''; $html .= ''; - $html .= ''.$Language->get('Show the home link on the sidebar').''; $html .= ''; $html .= '
'; - $html .= ''; - $html .= ''; + $html .= ''; + $html .= ''; $html .= '
'; + $html .= '
'; + $html .= ''; + $html .= ''; + $html .= '
'; + + if (ORDER_BY=='date') { + $html .= '
'; + $html .= ''; + $html .= ''; + $html .= '
'; + } + return $html; } @@ -47,19 +66,6 @@ class pluginNavigation extends Plugin { global $Url; global $Site; global $dbPages; - global $pagesByParent; - - // Amount of pages to show - $amountOfItems = $this->getValue('amountOfItems'); - - // Page number the first one - $pageNumber = 1; - - // Only published pages - $onlyPublished = true; - - // Get the list of pages - $pages = $dbPages->getList($pageNumber, $amountOfItems, $onlyPublished, true); // HTML for sidebar $html = '
'; @@ -73,46 +79,58 @@ class pluginNavigation extends Plugin { $html .= '
'; $html .= '
+ diff --git a/bl-themes/alternative/php/navbar.php b/bl-themes/alternative/php/navbar.php index 50ae8dfb..1aa73206 100644 --- a/bl-themes/alternative/php/navbar.php +++ b/bl-themes/alternative/php/navbar.php @@ -75,4 +75,4 @@
- \ No newline at end of file + diff --git a/bl-themes/alternative/php/page.php b/bl-themes/alternative/php/page.php index 649e22e1..f6de8b1e 100644 --- a/bl-themes/alternative/php/page.php +++ b/bl-themes/alternative/php/page.php @@ -6,7 +6,7 @@ -

title() ?>

+

title() ?>

-

title(); ?>

+

title(); ?>

-
date(); ?> - get('Reading time') . ': ' . $page->readingTime(); ?>
+
date(); ?> - get('Reading time') . ': ' . $page->readingTime(); ?>
contentBreak(); ?> @@ -35,7 +35,7 @@ 1): ?>