From 0be75f22c4f9bb666945416daea0eca2e7fa29cd Mon Sep 17 00:00:00 2001 From: Diego Najar Date: Sat, 15 Jul 2017 21:28:54 +0200 Subject: [PATCH] Fixed installer, kernel panic theme, fixed content pages --- bl-kernel/functions.php | 4 +-- bl-plugins/about/languages/en_US.json | 2 +- bl-plugins/about/metadata.json | 2 +- bl-plugins/api/metadata.json | 4 +-- bl-plugins/categories/metadata.json | 2 +- bl-plugins/disqus/metadata.json | 2 +- bl-plugins/fixed-pages/languages/en_US.json | 2 +- bl-plugins/fixed-pages/metadata.json | 2 +- bl-plugins/links/plugin.php | 2 +- bl-plugins/sitemap/plugin.php | 1 + bl-themes/kernel-panic/css/bludit.css | 33 ++++++++++++++++++++- bl-themes/kernel-panic/php/home.php | 10 +++++-- install.php | 7 +++-- 13 files changed, 55 insertions(+), 18 deletions(-) diff --git a/bl-kernel/functions.php b/bl-kernel/functions.php index a33efce4..3d71a6ed 100644 --- a/bl-kernel/functions.php +++ b/bl-kernel/functions.php @@ -203,9 +203,7 @@ function buildAllpages($onlyPublished=true) { foreach($keys as $pageKey) { $page = buildPage($pageKey); if($page!==false) { - if($allPages || $page->published()) { - $tmp[$page->key()] = $page; - } + $tmp[$page->key()] = $page; } } return $tmp; diff --git a/bl-plugins/about/languages/en_US.json b/bl-plugins/about/languages/en_US.json index 1bcab5c5..1c429171 100644 --- a/bl-plugins/about/languages/en_US.json +++ b/bl-plugins/about/languages/en_US.json @@ -2,6 +2,6 @@ "plugin-data": { "name": "About", - "description": "Little description about your site or yourself." + "description": "Shows a little description about your site or yourself." } } \ No newline at end of file diff --git a/bl-plugins/about/metadata.json b/bl-plugins/about/metadata.json index a5c64fc0..0a1ec2d2 100644 --- a/bl-plugins/about/metadata.json +++ b/bl-plugins/about/metadata.json @@ -3,7 +3,7 @@ "email": "", "website": "https://plugins.bludit.com", "version": "2.0", - "releaseDate": "2017-05-26", + "releaseDate": "2017-06-15", "license": "MIT", "compatible": "2.0", "notes": "" diff --git a/bl-plugins/api/metadata.json b/bl-plugins/api/metadata.json index 9198c3fd..0a1ec2d2 100644 --- a/bl-plugins/api/metadata.json +++ b/bl-plugins/api/metadata.json @@ -3,8 +3,8 @@ "email": "", "website": "https://plugins.bludit.com", "version": "2.0", - "releaseDate": "2017-07-07", + "releaseDate": "2017-06-15", "license": "MIT", "compatible": "2.0", "notes": "" -} +} \ No newline at end of file diff --git a/bl-plugins/categories/metadata.json b/bl-plugins/categories/metadata.json index a5c64fc0..0a1ec2d2 100644 --- a/bl-plugins/categories/metadata.json +++ b/bl-plugins/categories/metadata.json @@ -3,7 +3,7 @@ "email": "", "website": "https://plugins.bludit.com", "version": "2.0", - "releaseDate": "2017-05-26", + "releaseDate": "2017-06-15", "license": "MIT", "compatible": "2.0", "notes": "" diff --git a/bl-plugins/disqus/metadata.json b/bl-plugins/disqus/metadata.json index a5c64fc0..0a1ec2d2 100644 --- a/bl-plugins/disqus/metadata.json +++ b/bl-plugins/disqus/metadata.json @@ -3,7 +3,7 @@ "email": "", "website": "https://plugins.bludit.com", "version": "2.0", - "releaseDate": "2017-05-26", + "releaseDate": "2017-06-15", "license": "MIT", "compatible": "2.0", "notes": "" diff --git a/bl-plugins/fixed-pages/languages/en_US.json b/bl-plugins/fixed-pages/languages/en_US.json index 29bf1c9f..12830ff0 100644 --- a/bl-plugins/fixed-pages/languages/en_US.json +++ b/bl-plugins/fixed-pages/languages/en_US.json @@ -8,4 +8,4 @@ "home-page": "Home page", "show-home-link": "Show home link", "amount-of-items": "Amount of items" -} +} \ No newline at end of file diff --git a/bl-plugins/fixed-pages/metadata.json b/bl-plugins/fixed-pages/metadata.json index a5c64fc0..0a1ec2d2 100644 --- a/bl-plugins/fixed-pages/metadata.json +++ b/bl-plugins/fixed-pages/metadata.json @@ -3,7 +3,7 @@ "email": "", "website": "https://plugins.bludit.com", "version": "2.0", - "releaseDate": "2017-05-26", + "releaseDate": "2017-06-15", "license": "MIT", "compatible": "2.0", "notes": "" diff --git a/bl-plugins/links/plugin.php b/bl-plugins/links/plugin.php index f35a01ff..cc86d1e3 100644 --- a/bl-plugins/links/plugin.php +++ b/bl-plugins/links/plugin.php @@ -6,7 +6,7 @@ class pluginLinks extends Plugin { { // JSON database $jsondb = json_encode(array( - 'Bludit'=>'https://bludit.com', + 'Bludit'=>'https://www.bludit.com', 'Donate'=>'https://paypal.me/bludit' )); diff --git a/bl-plugins/sitemap/plugin.php b/bl-plugins/sitemap/plugin.php index a8125901..c5546e60 100644 --- a/bl-plugins/sitemap/plugin.php +++ b/bl-plugins/sitemap/plugin.php @@ -17,6 +17,7 @@ class pluginSitemap extends Plugin { // Get DB $pageNumber = 1; $amountOfItems = -1; + $onlyPublished = true; $db = $dbPages->getList($pageNumber, $amountOfItems, $onlyPublished); $keys = array_keys($db); diff --git a/bl-themes/kernel-panic/css/bludit.css b/bl-themes/kernel-panic/css/bludit.css index e37c8ba6..ffaa10b1 100755 --- a/bl-themes/kernel-panic/css/bludit.css +++ b/bl-themes/kernel-panic/css/bludit.css @@ -8,6 +8,33 @@ a.home-title { color: #222; } +ul, ol { + margin-bottom: 1.5em; +} + +ul li { + padding-bottom: 6px; +} + +table { + width: 100%; + margin-bottom: 1.5em; +} + +table thead { + background: #555555; + color: #FFF; +} + +table td, +table th { + padding-left: 5px; +} + +h1, +h2 { + font-weight: bold; +} /* PAGES */ article.page:not(:last-child) { @@ -32,7 +59,11 @@ div.plugin:not(:last-child) { margin-bottom: 40px; } -div.plugin > h1,h2,h3,h4 { +div.plugin > h1, +div.plugin > h2, +div.plugin > h3, +div.plugin > h4, +div.plugin > h5 { font-size: 1em; } diff --git a/bl-themes/kernel-panic/php/home.php b/bl-themes/kernel-panic/php/home.php index 28fbb245..c40920e3 100644 --- a/bl-themes/kernel-panic/php/home.php +++ b/bl-themes/kernel-panic/php/home.php @@ -11,9 +11,15 @@ <?php echo $page->slug() ?> - content() ?> + contentBreak() ?> diff --git a/install.php b/install.php index db022f71..dba61526 100644 --- a/install.php +++ b/install.php @@ -342,7 +342,7 @@ function install($adminPassword, $email, $timezone) 'position'=>1, 'coverImage'=>'', 'md5file'=>'', - 'category'=>'', + 'category'=>'general', 'uuid'=>md5(uniqid()) ) ); @@ -431,8 +431,9 @@ function install($adminPassword, $email, $timezone) // File categories.php $data = array( - 'videos'=>array('name'=>'Videos', 'list'=>array()), - 'music'=>array('name'=>'Music', 'list'=>array()) + 'general'=>array('name'=>'General', 'list'=>array()), + 'music'=>array('name'=>'Music', 'list'=>array()), + 'videos'=>array('name'=>'Videos', 'list'=>array()) ); file_put_contents(PATH_DATABASES.'categories.php', $dataHead.json_encode($data, JSON_PRETTY_PRINT), LOCK_EX);