diff --git a/bl-themes/lingonberry/index.php b/bl-themes/lingonberry/index.php index d02347ed..74911768 100644 --- a/bl-themes/lingonberry/index.php +++ b/bl-themes/lingonberry/index.php @@ -2,19 +2,15 @@ - + whereAmI()=='home') || ($Url->whereAmI()=='tag') || ($Url->whereAmI()=='blog') ) + if( $WHERE_AM_I=='home' ) { echo ''; } - elseif($Url->whereAmI()=='post') - { - echo ''; - } - elseif($Url->whereAmI()=='page') + else { echo ''; } @@ -24,19 +20,19 @@ -
+ -
+
@@ -47,35 +43,31 @@ title() ?> -
+
whereAmI()=='home') || ($Url->whereAmI()=='tag') || ($Url->whereAmI()=='blog') ) + if( $WHERE_AM_I=='home' ) { - include(PATH_THEME_PHP.'home.php'); + include(THEME_DIR_PHP.'home.php'); } - elseif($Url->whereAmI()=='post') + else { - include(PATH_THEME_PHP.'post.php'); - } - elseif($Url->whereAmI()=='page') - { - include(PATH_THEME_PHP.'page.php'); + include(THEME_DIR_PHP.'page.php'); } ?> - +
diff --git a/bl-themes/lingonberry/php/head.php b/bl-themes/lingonberry/php/head.php index dfdae7a6..de9de03f 100644 --- a/bl-themes/lingonberry/php/head.php +++ b/bl-themes/lingonberry/php/head.php @@ -1,31 +1,26 @@ + <?php echo $Site->title() ?> - if($Url->whereAmI() == 'post') { - Theme::keywords($Post->tags()); - Theme::description($Post->description()); - } elseif($Url->whereAmI() == 'page') { + + if($WHERE_AM_I == 'page') { Theme::keywords($Page->tags()); Theme::description($Page->description()); - } else { - Theme::description($Site->description()); - } + } ?> diff --git a/bl-themes/lingonberry/php/home.php b/bl-themes/lingonberry/php/home.php index 195b3de9..34dd3089 100644 --- a/bl-themes/lingonberry/php/home.php +++ b/bl-themes/lingonberry/php/home.php @@ -1,6 +1,6 @@
- +
diff --git a/bl-themes/lingonberry/php/page.php b/bl-themes/lingonberry/php/page.php index 88209a00..6718a2dc 100644 --- a/bl-themes/lingonberry/php/page.php +++ b/bl-themes/lingonberry/php/page.php @@ -21,10 +21,36 @@

title() ?>

+
+ + date() ?> + / + user('firstName')) || Text::isNotEmpty($Page->user('lastName')) ) { + echo $Page->user('firstName').' '.$Page->user('lastName'); + } + else { + echo $Page->user('username'); + } + ?> + +
content() ?> + +
+

Tags: + tags(true); + + foreach($tags as $tagKey=>$tagName) { + echo ''.$tagName.''; + } + ?> +

+
diff --git a/bl-themes/lingonberry/php/post.php b/bl-themes/lingonberry/php/post.php deleted file mode 100644 index 5fa8886e..00000000 --- a/bl-themes/lingonberry/php/post.php +++ /dev/null @@ -1,67 +0,0 @@ -
-
-
- - - - -
-
- - coverImage()) { - echo '
'; - echo ''; - echo 'Cover Image'; - //echo '
'; - //echo '

'; - //echo '
'; - echo ''; - echo '
'; - } ?> - -

title() ?>

- -
- - date() ?> - / - user('firstName')) || Text::isNotEmpty($Post->user('lastName')) ) { - echo $Post->user('firstName').' '.$Post->user('lastName'); - } - else { - echo $Post->user('username'); - } - ?> - -
-
- -
- content() ?> - -
-

Tags: - tags(true); - - foreach($tags as $tagKey=>$tagName) { - echo ''.$tagName.''; - } - ?> -

-
-
-
- -
- - -
- -
- -
- -
-
\ No newline at end of file diff --git a/bl-themes/lingonberry/php/sidebar.php b/bl-themes/lingonberry/php/sidebar.php index 5783b1c2..95aa15c5 100644 --- a/bl-themes/lingonberry/php/sidebar.php +++ b/bl-themes/lingonberry/php/sidebar.php @@ -6,10 +6,12 @@

Recent Posts

    getList(1, 5, true, false); + $keys = array_keys($pages); - foreach($posts as $Post) { - echo '
  • '.$Post->title().'
    • '; + foreach($keys as $pageKey) { + $page = buildPage($pageKey); + echo '
  • '.$page->title().'
    • '; } ?>
@@ -29,7 +31,7 @@ global $dbTags; global $Url; - $db = $dbTags->db['postsIndex']; + $db = $dbTags->db; $filter = $Url->filters('tag'); $tagArray = array();