diff --git a/cache/installedVersion.json b/cache/installedVersion.json index 5f69bf4..3e92acf 100644 --- a/cache/installedVersion.json +++ b/cache/installedVersion.json @@ -1,4 +1,4 @@ { "id": 782014, - "tag_name": "v2.6.1" + "tag_name": "v2.6.2" } diff --git a/config/config.ini.example b/config/config.ini.example index d188df4..6b00c14 100644 --- a/config/config.ini.example +++ b/config/config.ini.example @@ -53,7 +53,7 @@ google.analytics.id = "" ; Google reCaptcha ; https://www.google.com/recaptcha/admin. Options "false" and "true" -google.reCaptcha = false +google.reCaptcha = "false" google.reCaptcha.public = "" google.reCaptcha.private = "" @@ -66,6 +66,9 @@ search.perpage = "10" profile.perpage = "10" json.count = "10" +; Category info +category.info = "true" + ; Related posts related.count = "3" @@ -111,16 +114,16 @@ sitemap.priority.archiveYear = "0.5" sitemap.priority.author = "0.5" ; Also install pre-release -prerelease = false +prerelease = "false" ; Switch on and off the file cache for development purposes. Options "false" and "true" -cache.off = false +cache.off = "false" ; Switch on and off the page generation time. Options "false" and "true" -generation.time = false +generation.time = "false" ; Switch on and off the cache timestamp. Options "false" and "true" -cache.timestamp = false +cache.timestamp = "false" ; Set the theme here views.root = "themes/blog" diff --git a/system/admin/views/update.html.php b/system/admin/views/update.html.php index 42b40a6..bbcf99c 100644 --- a/system/admin/views/update.html.php +++ b/system/admin/views/update.html.php @@ -30,13 +30,4 @@ if ($updater->able()) { echo \Michelf\MarkdownExtra::defaultTransform($info['body']); echo ''; echo '

Read on Github.

'; -} - -$files = array(); -$draft = array(); -$files = glob('content/*/blog/*.md', GLOB_NOSORT); -$draft = glob('content/*/draft/*.md', GLOB_NOSORT); - -if (!empty($files) || !empty($draft)) { - migrate_old_content(); } \ No newline at end of file diff --git a/system/htmly.php b/system/htmly.php index 01157e9..85c884a 100644 --- a/system/htmly.php +++ b/system/htmly.php @@ -1251,13 +1251,19 @@ get('/admin/update', function () { // Show the update now link get('/admin/update/now/:csrf', function ($CSRF) { - + $files = array(); + $draft = array(); + $files = glob('content/*/blog/*.md', GLOB_NOSORT); + $draft = glob('content/*/draft/*.md', GLOB_NOSORT); $proper = is_csrf_proper($CSRF); $updater = new \Kanti\HubUpdater(array( 'name' => 'danpros/htmly', 'prerelease' => !!config("prerelease"), )); if (login() && $proper && $updater->able()) { + if (!empty($files) || !empty($draft)) { + migrate_old_content(); + } $updater->update(); config('views.root', 'system/admin/views'); render('updated-to', array( diff --git a/themes/blog/main.html.php b/themes/blog/main.html.php index 7ff7604..c527015 100644 --- a/themes/blog/main.html.php +++ b/themes/blog/main.html.php @@ -1,19 +1,21 @@ - -
-
-
-
-

title;?>

-
- body; ?> -
-
-
-
-
+ + +
+
+
+
+

title;?>

+
+ body; ?> +
+
+
+
+
+ diff --git a/themes/clean/css/style.css b/themes/clean/css/style.css index bfd5bab..3cd9670 100644 --- a/themes/clean/css/style.css +++ b/themes/clean/css/style.css @@ -337,6 +337,17 @@ blockquote p { padding: 10px 0; } +.category { + background-color: #f9f9f9; + border: 1px solid #ccc; + border-radius: 4px; + color: #333; + display: block; + font-size: 13px; + margin: 20px 0; + padding: 0 1em; +} + /*------------------------- Table --------------------------*/ diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php index 3ea3d3e..86ce795 100644 --- a/themes/clean/main.html.php +++ b/themes/clean/main.html.php @@ -1,6 +1,16 @@ + + +
+

title;?>

+
+ body; ?> +
+
+ + + + +
+

title;?>

+
+ body; ?> +
+
+ + + + +
+

title;?>

+
+ body; ?> +
+
+ +