From 6b08a04a5c1c6db590709b217bf245297c979f3d Mon Sep 17 00:00:00 2001 From: Hakim Zulkufli Date: Mon, 7 Aug 2017 16:42:56 +0800 Subject: [PATCH 1/2] More Lingonberry updates. Should be fully usable now. Plugins not tested. Sitebar plugins will never work as before. (Not included in the theme.) --- bl-themes/lingonberry/css/bludit.css | 6 ++- bl-themes/lingonberry/index.php | 46 ++++++++++++------ bl-themes/lingonberry/php/head.php | 13 +++--- bl-themes/lingonberry/php/home.php | 10 ++-- bl-themes/lingonberry/php/page.php | 38 +++------------ bl-themes/lingonberry/php/post.php | 67 +++++++++++++++++++++++++++ bl-themes/lingonberry/php/sidebar.php | 6 +-- 7 files changed, 121 insertions(+), 65 deletions(-) create mode 100644 bl-themes/lingonberry/php/post.php diff --git a/bl-themes/lingonberry/css/bludit.css b/bl-themes/lingonberry/css/bludit.css index c75f085d..604b38cd 100644 --- a/bl-themes/lingonberry/css/bludit.css +++ b/bl-themes/lingonberry/css/bludit.css @@ -8,8 +8,10 @@ font-size: 80%; } - - .comment-respond { display: block; +} + +.featured-media img { + min-width: 100%; } \ No newline at end of file diff --git a/bl-themes/lingonberry/index.php b/bl-themes/lingonberry/index.php index 74911768..4b82fe58 100644 --- a/bl-themes/lingonberry/index.php +++ b/bl-themes/lingonberry/index.php @@ -6,13 +6,20 @@ '; } else { - echo ''; + if( $Page->status() == "fixed" ) + { + echo ''; + } + elseif( $Page->status() == "published" ) + { + echo ''; + } } ?> @@ -20,19 +27,21 @@ - - +
@@ -43,26 +52,33 @@ title() ?> - +
status() == "fixed" ) + { + include(THEME_DIR_PHP.'page.php'); + } + elseif( $Page->status() == "published" ) + { + include(THEME_DIR_PHP.'post.php'); + } } ?> @@ -88,9 +104,9 @@ - diff --git a/bl-themes/lingonberry/php/head.php b/bl-themes/lingonberry/php/head.php index 85cacc99..53903123 100644 --- a/bl-themes/lingonberry/php/head.php +++ b/bl-themes/lingonberry/php/head.php @@ -10,12 +10,13 @@ 'css/bludit.css' )); - // JQuery from Bludit - echo Theme::jquery(); - echo Theme::js('js/jquery-migrate-1.2.1.min.js'); + echo Theme::js(array( + 'js/jquery-1.12.0.min.js', + 'js/jquery-migrate-1.2.1.min.js' + )); - echo ''; + echo ''; - // Load plugins with the hook siteHead - Theme::plugins('siteHead'); + // Load plugins with the hook siteHead + Theme::plugins('siteHead'); ?> \ No newline at end of file diff --git a/bl-themes/lingonberry/php/home.php b/bl-themes/lingonberry/php/home.php index 34dd3089..4a3946ed 100644 --- a/bl-themes/lingonberry/php/home.php +++ b/bl-themes/lingonberry/php/home.php @@ -10,14 +10,14 @@ coverImage()) { echo '
'; - echo ''; - echo 'Cover Image'; + echo 'Cover Image'; echo '
'; - echo '

'.$Post->description().'

'; + echo ''; + echo '

'.$Post->description().'

'; + echo ''; echo '
'; - echo ''; echo '
'; - } ?> + } ?>

title() ?>

diff --git a/bl-themes/lingonberry/php/page.php b/bl-themes/lingonberry/php/page.php index 6718a2dc..676b6575 100644 --- a/bl-themes/lingonberry/php/page.php +++ b/bl-themes/lingonberry/php/page.php @@ -10,47 +10,21 @@ coverImage()) { echo '
'; - echo ''; - echo 'Cover Image'; - //echo '
'; - //echo '

'; - //echo '
'; - echo ''; + echo 'Cover Image'; + echo '
'; + echo ''; + echo '

'.$Page->description().'

'; + echo ''; + echo '
'; echo '
'; } ?>

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 new file mode 100644 index 00000000..c679b000 --- /dev/null +++ b/bl-themes/lingonberry/php/post.php @@ -0,0 +1,67 @@ +
+
+
+ + + + +
+
+ + coverImage()) { + echo '
'; + echo 'Cover Image'; + echo '
'; + echo ''; + echo '

'.$Page->description().'

'; + echo ''; + echo '
'; + echo '
'; + } ?> + +

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.''; + } + ?> +

+
+
+
+ +
+ + +
+ +
+ +
+ +
+
\ No newline at end of file diff --git a/bl-themes/lingonberry/php/sidebar.php b/bl-themes/lingonberry/php/sidebar.php index 95aa15c5..09bf19b4 100644 --- a/bl-themes/lingonberry/php/sidebar.php +++ b/bl-themes/lingonberry/php/sidebar.php @@ -6,7 +6,7 @@

Recent Posts