From e2192f774d3c9ce908cb70c4e313eb07f071ae64 Mon Sep 17 00:00:00 2001 From: danpros Date: Thu, 18 Feb 2021 20:18:06 +0700 Subject: [PATCH] Cleaning up --- config/config.ini.example | 11 ----------- system/admin/views/update.html.php | 2 +- system/includes/functions.php | 4 ++-- themes/{default => readable}/404-search.html.php | 0 themes/{default => readable}/404.html.php | 0 themes/{default => readable}/css/style.css | 0 themes/{default => readable}/img/facebook.png | Bin themes/{default => readable}/img/googleplus.png | Bin themes/{default => readable}/img/rss.png | Bin themes/{default => readable}/img/share-facebook.png | Bin themes/{default => readable}/img/share-googleplus.png | Bin themes/{default => readable}/img/share-twitter.png | Bin themes/{default => readable}/img/tumblr.png | Bin themes/{default => readable}/img/twitter.png | Bin themes/{default => readable}/layout.html.php | 2 +- themes/{default => readable}/main.html.php | 0 themes/{default => readable}/no-posts.html.php | 0 themes/{default => readable}/post.html.php | 0 themes/{default => readable}/profile.html.php | 0 themes/{default => readable}/static.html.php | 0 20 files changed, 4 insertions(+), 15 deletions(-) rename themes/{default => readable}/404-search.html.php (100%) rename themes/{default => readable}/404.html.php (100%) rename themes/{default => readable}/css/style.css (100%) rename themes/{default => readable}/img/facebook.png (100%) rename themes/{default => readable}/img/googleplus.png (100%) rename themes/{default => readable}/img/rss.png (100%) rename themes/{default => readable}/img/share-facebook.png (100%) rename themes/{default => readable}/img/share-googleplus.png (100%) rename themes/{default => readable}/img/share-twitter.png (100%) rename themes/{default => readable}/img/tumblr.png (100%) rename themes/{default => readable}/img/twitter.png (100%) rename themes/{default => readable}/layout.html.php (95%) rename themes/{default => readable}/main.html.php (100%) rename themes/{default => readable}/no-posts.html.php (100%) rename themes/{default => readable}/post.html.php (100%) rename themes/{default => readable}/profile.html.php (100%) rename themes/{default => readable}/static.html.php (100%) diff --git a/config/config.ini.example b/config/config.ini.example index e8ca3f6..d96cc2f 100644 --- a/config/config.ini.example +++ b/config/config.ini.example @@ -28,7 +28,6 @@ blog.enable = "false" ; Social account social.twitter = "https://twitter.com" social.facebook = "https://www.facebook.com" -social.tumblr = "http://www.tumblr.com" ; Breadcrumb home text. Useful when installed on subfolder. breadcrumb.home = "Home" @@ -47,9 +46,6 @@ disqus.shortname = "" ; Google Web Master Tool ID verification google.wmt.id = "" -; Google+ publisher -google.publisher = "" - ; Google analytics google.analytics.id = "" @@ -82,9 +78,6 @@ recent.count = "5" ; Popular posts popular.count = "5" -; Author info on blog post. Set "true" or "false". -author.info = "true" - ; Teaser type: set "trimmed" or "full". teaser.type = "full" @@ -103,10 +96,6 @@ rss.count = "10" ; RSS feed description length. If left empty we will use full page. rss.char = "200" -; Enable image thumbnail on teaser, the options is "true" and "false". If set to "true", you can specify the default thumbnail also. -img.thumbnail = "false" -default.thumbnail = "" - ; Enable views Counter, the options is "true" and "false". If set to "true", you can see the Counts in Admin page and popular posts. views.counter = "false" diff --git a/system/admin/views/update.html.php b/system/admin/views/update.html.php index 6f2fb33..ef005c7 100644 --- a/system/admin/views/update.html.php +++ b/system/admin/views/update.html.php @@ -29,5 +29,5 @@ if ($updater->able()) { echo '
'; echo \Michelf\MarkdownExtra::defaultTransform($info['body']); echo '
'; - echo '

Read on Github.

'; + echo '

Read on Github

'; } \ No newline at end of file diff --git a/system/includes/functions.php b/system/includes/functions.php index fae9797..d10809c 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -1813,7 +1813,7 @@ function base64_encode_image($filename = string, $filetype = string) } } -// Social links +// Social links. Deprecated function social($imgDir = null) { $twitter = config('social.twitter'); @@ -1822,7 +1822,7 @@ function social($imgDir = null) $rss = site_url() . 'feed/rss'; if ($imgDir === null) { - $imgDir = "default/img/"; + $imgDir = "readable/img/"; } if (!empty($twitter)) { diff --git a/themes/default/404-search.html.php b/themes/readable/404-search.html.php similarity index 100% rename from themes/default/404-search.html.php rename to themes/readable/404-search.html.php diff --git a/themes/default/404.html.php b/themes/readable/404.html.php similarity index 100% rename from themes/default/404.html.php rename to themes/readable/404.html.php diff --git a/themes/default/css/style.css b/themes/readable/css/style.css similarity index 100% rename from themes/default/css/style.css rename to themes/readable/css/style.css diff --git a/themes/default/img/facebook.png b/themes/readable/img/facebook.png similarity index 100% rename from themes/default/img/facebook.png rename to themes/readable/img/facebook.png diff --git a/themes/default/img/googleplus.png b/themes/readable/img/googleplus.png similarity index 100% rename from themes/default/img/googleplus.png rename to themes/readable/img/googleplus.png diff --git a/themes/default/img/rss.png b/themes/readable/img/rss.png similarity index 100% rename from themes/default/img/rss.png rename to themes/readable/img/rss.png diff --git a/themes/default/img/share-facebook.png b/themes/readable/img/share-facebook.png similarity index 100% rename from themes/default/img/share-facebook.png rename to themes/readable/img/share-facebook.png diff --git a/themes/default/img/share-googleplus.png b/themes/readable/img/share-googleplus.png similarity index 100% rename from themes/default/img/share-googleplus.png rename to themes/readable/img/share-googleplus.png diff --git a/themes/default/img/share-twitter.png b/themes/readable/img/share-twitter.png similarity index 100% rename from themes/default/img/share-twitter.png rename to themes/readable/img/share-twitter.png diff --git a/themes/default/img/tumblr.png b/themes/readable/img/tumblr.png similarity index 100% rename from themes/default/img/tumblr.png rename to themes/readable/img/tumblr.png diff --git a/themes/default/img/twitter.png b/themes/readable/img/twitter.png similarity index 100% rename from themes/default/img/twitter.png rename to themes/readable/img/twitter.png diff --git a/themes/default/layout.html.php b/themes/readable/layout.html.php similarity index 95% rename from themes/default/layout.html.php rename to themes/readable/layout.html.php index fe25425..5fcb73a 100644 --- a/themes/default/layout.html.php +++ b/themes/readable/layout.html.php @@ -5,7 +5,7 @@ <?php echo $title;?> - + diff --git a/themes/default/main.html.php b/themes/readable/main.html.php similarity index 100% rename from themes/default/main.html.php rename to themes/readable/main.html.php diff --git a/themes/default/no-posts.html.php b/themes/readable/no-posts.html.php similarity index 100% rename from themes/default/no-posts.html.php rename to themes/readable/no-posts.html.php diff --git a/themes/default/post.html.php b/themes/readable/post.html.php similarity index 100% rename from themes/default/post.html.php rename to themes/readable/post.html.php diff --git a/themes/default/profile.html.php b/themes/readable/profile.html.php similarity index 100% rename from themes/default/profile.html.php rename to themes/readable/profile.html.php diff --git a/themes/default/static.html.php b/themes/readable/static.html.php similarity index 100% rename from themes/default/static.html.php rename to themes/readable/static.html.php