diff --git a/bl-themes/bootstrapTheme/css/01-style.css b/bl-themes/bootstrapTheme/css/01-style.css new file mode 100755 index 00000000..9129899e --- /dev/null +++ b/bl-themes/bootstrapTheme/css/01-style.css @@ -0,0 +1,4 @@ +.site-logo { + max-width: 100%; + height: auto; +} \ No newline at end of file diff --git a/bl-themes/bootstrapTheme/css/02-helpers.css b/bl-themes/bootstrapTheme/css/02-helpers.css new file mode 100644 index 00000000..e69de29b diff --git a/bl-themes/popeye/img/favicon.png b/bl-themes/bootstrapTheme/img/favicon.png similarity index 100% rename from bl-themes/popeye/img/favicon.png rename to bl-themes/bootstrapTheme/img/favicon.png diff --git a/bl-themes/popeye/img/popeye.png b/bl-themes/bootstrapTheme/img/popeye.png similarity index 100% rename from bl-themes/popeye/img/popeye.png rename to bl-themes/bootstrapTheme/img/popeye.png diff --git a/bl-themes/popeye/index.php b/bl-themes/bootstrapTheme/index.php similarity index 83% rename from bl-themes/popeye/index.php rename to bl-themes/bootstrapTheme/index.php index 51e4caed..c83b00ea 100755 --- a/bl-themes/popeye/index.php +++ b/bl-themes/bootstrapTheme/index.php @@ -27,29 +27,13 @@ 'css/01-style.css', 'css/02-helpers.css' )); - - # Apply the following CSS only for Dark Mode - if ($themePlugin->darkMode()) { - echo Theme::css( - 'css/99-darkmode.css' - ); - } ?> - googleFonts()) : ?> - - - - - + @@ -82,6 +66,16 @@ + diff --git a/bl-themes/popeye/init.php b/bl-themes/bootstrapTheme/init.php similarity index 100% rename from bl-themes/popeye/init.php rename to bl-themes/bootstrapTheme/init.php diff --git a/bl-themes/popeye/languages/de_AT.json b/bl-themes/bootstrapTheme/languages/de_AT.json similarity index 59% rename from bl-themes/popeye/languages/de_AT.json rename to bl-themes/bootstrapTheme/languages/de_AT.json index ae0c2dce..8d725a79 100644 --- a/bl-themes/popeye/languages/de_AT.json +++ b/bl-themes/bootstrapTheme/languages/de_AT.json @@ -1,8 +1,8 @@ { "theme-data": { - "name": "Popeye", - "description": "" + "name": "Bootstrap", + "description": "A simple bootstrap-based theme" }, "related-pages": "Verwandte Seiten", "minutes": "Minuten", diff --git a/bl-themes/popeye/languages/de_CH.json b/bl-themes/bootstrapTheme/languages/de_CH.json similarity index 59% rename from bl-themes/popeye/languages/de_CH.json rename to bl-themes/bootstrapTheme/languages/de_CH.json index 81fdac91..7a9b2369 100644 --- a/bl-themes/popeye/languages/de_CH.json +++ b/bl-themes/bootstrapTheme/languages/de_CH.json @@ -1,8 +1,8 @@ { "theme-data": { - "name": "Popeye", - "description": "" + "name": "Bootstrap", + "description": "A simple bootstrap-based theme" }, "related-pages": "Verwandte Seiten", "minutes": "Minuten", diff --git a/bl-themes/popeye/languages/de_DE.json b/bl-themes/bootstrapTheme/languages/de_DE.json similarity index 59% rename from bl-themes/popeye/languages/de_DE.json rename to bl-themes/bootstrapTheme/languages/de_DE.json index ae0c2dce..8d725a79 100644 --- a/bl-themes/popeye/languages/de_DE.json +++ b/bl-themes/bootstrapTheme/languages/de_DE.json @@ -1,8 +1,8 @@ { "theme-data": { - "name": "Popeye", - "description": "" + "name": "Bootstrap", + "description": "A simple bootstrap-based theme" }, "related-pages": "Verwandte Seiten", "minutes": "Minuten", diff --git a/bl-themes/popeye/languages/en.json b/bl-themes/bootstrapTheme/languages/en.json similarity index 87% rename from bl-themes/popeye/languages/en.json rename to bl-themes/bootstrapTheme/languages/en.json index 3e6be8ce..023119f1 100644 --- a/bl-themes/popeye/languages/en.json +++ b/bl-themes/bootstrapTheme/languages/en.json @@ -1,8 +1,8 @@ { "theme-data": { - "name": "Popeye", - "description": "" + "name": "Bootstrap", + "description": "A simple bootstrap-based theme" }, "related-pages": "Related pages", "minutes": "minutes", diff --git a/bl-themes/popeye/languages/ja_JP.json b/bl-themes/bootstrapTheme/languages/ja_JP.json similarity index 59% rename from bl-themes/popeye/languages/ja_JP.json rename to bl-themes/bootstrapTheme/languages/ja_JP.json index a5cb0dcf..d19e0b25 100644 --- a/bl-themes/popeye/languages/ja_JP.json +++ b/bl-themes/bootstrapTheme/languages/ja_JP.json @@ -1,8 +1,8 @@ { "theme-data": { - "name": "Popeye", - "description": "" + "name": "Bootstrap", + "description": "A simple bootstrap-based theme" }, "related-pages": "関連ページ", "minutes": "分", diff --git a/bl-themes/popeye/metadata.json b/bl-themes/bootstrapTheme/metadata.json similarity index 100% rename from bl-themes/popeye/metadata.json rename to bl-themes/bootstrapTheme/metadata.json diff --git a/bl-themes/bootstrapTheme/php/footer.php b/bl-themes/bootstrapTheme/php/footer.php new file mode 100644 index 00000000..d39e7392 --- /dev/null +++ b/bl-themes/bootstrapTheme/php/footer.php @@ -0,0 +1,8 @@ + diff --git a/bl-themes/popeye/php/home.php b/bl-themes/bootstrapTheme/php/home.php similarity index 55% rename from bl-themes/popeye/php/home.php rename to bl-themes/bootstrapTheme/php/home.php index ac51274c..d7f8b23b 100644 --- a/bl-themes/popeye/php/home.php +++ b/bl-themes/bootstrapTheme/php/home.php @@ -1,20 +1,30 @@
-
+
+ logo()) : ?> + description()) : ?> -
-

description(); ?>

+
+

description(); ?>

+ + homepagePresentation() && ($WHERE_AM_I == 'home')) : ?> +
+

+
+ + +
@@ -23,30 +33,6 @@
- - - -
- - -
- - - -

@@ -60,7 +46,7 @@ -
+
@@ -106,11 +92,9 @@ if ($themePlugin->showTags()) { $tagsList = $pageTmp->tags(true); if (!empty($tagsList)) { - echo ''; foreach ($tagsList as $tagKey => $tagName) { - echo '' . $tagName . ''; + echo '' . $tagName . ''; } - echo ''; } } ?> @@ -122,29 +106,9 @@ - 1) : ?> - - +
+ +
diff --git a/bl-themes/bootstrapTheme/php/navbar.php b/bl-themes/bootstrapTheme/php/navbar.php new file mode 100644 index 00000000..9bcd413f --- /dev/null +++ b/bl-themes/bootstrapTheme/php/navbar.php @@ -0,0 +1,34 @@ + diff --git a/bl-themes/bootstrapTheme/php/page.php b/bl-themes/bootstrapTheme/php/page.php new file mode 100644 index 00000000..de5eda9f --- /dev/null +++ b/bl-themes/bootstrapTheme/php/page.php @@ -0,0 +1,40 @@ +
+
+
+
+ + + + isStatic() && !$url->notFound()) : ?> +
+ + date() ?> + + + readingTime() . ' ' . $L->get('minutes') . ' ' . $L->g('read') ?> + + + user('displayName') ?> +
+ + + +

title(); ?>

+ + + description()) : ?> +

description(); ?>

+
+ + + +
+ content(); ?> +
+ + + +
+
+
+
\ No newline at end of file diff --git a/bl-themes/popeye/plugin.php b/bl-themes/bootstrapTheme/plugin.php similarity index 53% rename from bl-themes/popeye/plugin.php rename to bl-themes/bootstrapTheme/plugin.php index 6f9e8ce0..465a5e7f 100644 --- a/bl-themes/popeye/plugin.php +++ b/bl-themes/bootstrapTheme/plugin.php @@ -6,8 +6,6 @@ class popeye extends Plugin public function init() { $this->dbFields = array( - 'googleFonts' => true, - 'darkMode' => true, 'dateFormat' => 'relative', 'showTags' => true ); @@ -17,24 +15,6 @@ class popeye extends Plugin { global $L; - $html = '
'; - $html .= ''; - $html .= ''; - $html .= '
' . $L->get('Enable or disable dark mode.') . '
'; - $html .= '
'; - - $html .= '
'; - $html .= ''; - $html .= ''; - $html .= '
' . $L->get('Enable or disable Google fonts.') . '
'; - $html .= '
'; - $html .= '
'; $html .= ''; $html .= '