From b0960c6871f17467b509e23a49949fb0bb094aa8 Mon Sep 17 00:00:00 2001 From: danpros Date: Wed, 3 Jan 2024 12:09:03 +0700 Subject: [PATCH] Cleanup themes --- system/htmly.php | 163 ++++++++++++++++++++++++++++++++-- system/includes/functions.php | 4 +- themes/blog/main.html.php | 53 +++++------ themes/blog/post.html.php | 16 ++-- themes/blog/profile.html.php | 8 +- themes/blog/static.html.php | 2 +- themes/clean/main.html.php | 34 ++++--- themes/clean/post.html.php | 16 ++-- themes/clean/profile.html.php | 10 +-- themes/logs/main.html.php | 34 ++++--- themes/logs/post.html.php | 16 ++-- themes/logs/profile.html.php | 10 +-- themes/readable/main.html.php | 34 ++++--- themes/readable/post.html.php | 16 ++-- themes/readable/profile.html.php | 10 +-- themes/readable/static.html.php | 2 +- themes/twentyfifteen/main.html.php | 28 +++--- themes/twentyfifteen/post.html.php | 14 +-- themes/twentyfifteen/profile.html.php | 10 +-- themes/twentysixteen/main.html.php | 26 +++--- themes/twentysixteen/post.html.php | 14 +-- themes/twentysixteen/profile.html.php | 10 +-- 22 files changed, 333 insertions(+), 197 deletions(-) diff --git a/system/htmly.php b/system/htmly.php index bcf1f8d..b05fc90 100644 --- a/system/htmly.php +++ b/system/htmly.php @@ -68,6 +68,16 @@ get('/index', function () { 'static' => $front, 'type' => 'is_frontpage', 'is_front' => true, + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); @@ -103,9 +113,20 @@ get('/index', function () { 'title' => blog_title() . $tagline, 'description' => strip_tags(blog_description()), 'canonical' => site_url(), + 'breadcrumb' => '', 'bodyclass' => 'no-posts', 'type' => 'is_frontpage', 'is_front' => true, + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); die; @@ -122,6 +143,16 @@ get('/index', function () { 'pagination' => has_pagination($total, $perpage, $page), 'type' => 'is_frontpage', 'is_front' => true, + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); } @@ -253,7 +284,17 @@ get('/author/:name', function ($name) { 'bodyclass' => 'in-profile author-' . $name, 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . i18n('Profile_for') . ' ' . $author->name, 'pagination' => has_pagination($total, $perpage, $page), + 'is_front' => '', + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', 'is_profile' => true, + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); die; } @@ -270,7 +311,17 @@ get('/author/:name', function ($name) { 'bodyclass' => 'in-profile author-' . $name, 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . i18n('Profile_for') . ' ' . $author->name, 'pagination' => has_pagination($total, $perpage, $page), + 'is_front' => '', + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', 'is_profile' => true, + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); }); @@ -278,7 +329,7 @@ get('/author/:name', function ($name) { get('/author/:name/feed', function ($name) { header('Content-Type: application/rss+xml'); - + $posts = get_profile_posts($name, 1, config('rss.count')); $author = get_author($name); @@ -1878,7 +1929,17 @@ get('/category/:category', function ($category) { 'bodyclass' => 'in-category category-' . strtolower($category), 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . $desc->title, 'pagination' => has_pagination($total, $perpage, $page), + 'is_front' => '', + 'is_blog' => '', 'is_category' => true, + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); }); @@ -2095,7 +2156,17 @@ get('/type/:type', function ($type) { 'bodyclass' => 'in-type type-' . strtolower($type), 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . ucfirst($type), 'pagination' => has_pagination($total, $perpage, $page), + 'is_front' => '', + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', 'is_type' => true, + 'is_tag' => '', + 'is_profile' => '', + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); }); @@ -2103,7 +2174,7 @@ get('/type/:type', function ($type) { get('/type/:type/feed', function ($type) { header('Content-Type: application/rss+xml'); - + $posts = get_type($type, 1, config('rss.count')); $data = new stdClass; $data->title = ucfirst($type); @@ -2178,7 +2249,17 @@ get('/tag/:tag', function ($tag) { 'bodyclass' => 'in-tag tag-' . strtolower($tag), 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . i18n('Posts_tagged') . ' ' . tag_i18n($tag), 'pagination' => has_pagination($total, $perpage, $page), + 'is_front' => '', + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', 'is_tag' => true, + 'is_profile' => '', + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); }); @@ -2186,7 +2267,7 @@ get('/tag/:tag', function ($tag) { get('/tag/:tag/feed', function ($tag) { header('Content-Type: application/rss+xml'); - + $posts = get_tag($tag, 1, config('rss.count')); $data = new stdClass; $data->title = tag_i18n($tag); @@ -2271,7 +2352,17 @@ get('/archive/:req', function ($req) { 'bodyclass' => 'in-archive archive-' . strtolower($req), 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . i18n('Archive_for') . ' ' . $timestamp, 'pagination' => has_pagination($total, $perpage, $page), + 'is_front' => '', + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', 'is_archive' => true, + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); }); @@ -2279,9 +2370,9 @@ get('/archive/:req', function ($req) { get('/archive/:req/feed', function ($req) { header('Content-Type: application/rss+xml'); - + $posts = get_archive($req, 1, config('rss.count')); - + $time = explode('-', $req); $date = strtotime($req); @@ -2368,7 +2459,17 @@ get('/search/:keyword', function ($keyword) { 'bodyclass' => 'in-search search-' . strtolower($keyword), 'breadcrumb' => '' . config('breadcrumb.home') . ' » ' . i18n('Search_results_for') . ' ' . $keyword, 'pagination' => has_pagination($total, $perpage, $page), + 'is_front' => '', + 'is_blog' => '', + 'is_category' => '', 'is_search' => true, + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); }); @@ -2376,7 +2477,7 @@ get('/search/:keyword', function ($keyword) { get('/search/:keyword/feed', function ($keyword) { header('Content-Type: application/rss+xml'); - + $posts = get_keyword($keyword, 1, config('rss.count')); $data = new stdClass; @@ -2534,7 +2635,17 @@ get('/post/:name', function ($name) { 'prev' => has_prev($prev), 'next' => has_next($next), 'type' => $var, + 'is_front' => '', + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', 'is_post' => true, + 'is_page' => '', + 'is_subpage' => '', ), $layout); }); @@ -2960,7 +3071,17 @@ get('/:static', function ($static) { 'bodyclass' => 'in-blog', 'breadcrumb' => '' . config('breadcrumb.home') . ' » Blog', 'pagination' => has_pagination($total, $perpage, $page), + 'is_front' => '', 'is_blog' => true, + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', + 'is_post' => '', + 'is_page' => '', + 'is_subpage' => '', ), $layout); } elseif ($static === 'front') { @@ -3032,7 +3153,17 @@ get('/:static', function ($static) { 'type' => 'staticPage', 'prev' => static_prev($prev), 'next' => static_next($next), + 'is_front' => '', + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', + 'is_post' => '', 'is_page' => true, + 'is_subpage' => '', ), $layout); } }); @@ -3329,6 +3460,16 @@ get('/:static/:sub', function ($static, $sub) { 'prev' => static_prev($prev), 'next' => static_next($next), 'type' => 'subPage', + 'is_front' => '', + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', + 'is_post' => '', + 'is_page' => '', 'is_subpage' => true, ), $layout); }); @@ -3600,7 +3741,17 @@ get('/:year/:month/:name', function ($year, $month, $name) { 'prev' => has_prev($prev), 'next' => has_next($next), 'type' => $var, + 'is_front' => '', + 'is_blog' => '', + 'is_category' => '', + 'is_search' => '', + 'is_archive' => '', + 'is_type' => '', + 'is_tag' => '', + 'is_profile' => '', 'is_post' => true, + 'is_page' => '', + 'is_subpage' => '', ), $layout); }); diff --git a/system/includes/functions.php b/system/includes/functions.php index 8489859..0648c55 100644 --- a/system/includes/functions.php +++ b/system/includes/functions.php @@ -2098,7 +2098,9 @@ function tab($p) echo '
'; } } else { - echo '
'; + if ($p->url) { + echo '
'; + } } } diff --git a/themes/blog/main.html.php b/themes/blog/main.html.php index ffefce6..7ea3c7b 100644 --- a/themes/blog/main.html.php +++ b/themes/blog/main.html.php @@ -1,59 +1,48 @@ - +
- - -
-
-
-
-

title;?>

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

title;?>

+
+ body; ?> +
+
+
- +
- - -
+
- image)) { ?> + image) { ?>
<?php echo $p->title ?>
- video)) { ?> + video) { ?>
- audio)) { ?> + audio) { ?>
- quote)) { ?> + quote) { ?>
quote ?>
- link)) { ?> + link) { ?>

title;?>

title;?>

@@ -67,7 +56,7 @@ - url ?>> - Edit'; } ?> + Edit'; } ?>

@@ -88,7 +77,7 @@
- + diff --git a/themes/blog/post.html.php b/themes/blog/post.html.php index e24d3c1..c4e9567 100644 --- a/themes/blog/post.html.php +++ b/themes/blog/post.html.php @@ -1,5 +1,5 @@ - +
@@ -7,28 +7,28 @@
- image)) { ?> + image) { ?>
<?php echo $p->title ?>
- video)) { ?> + video) { ?>
- audio)) { ?> + audio) { ?>
- quote)) { ?> + quote) { ?>
quote ?>
- link)) { ?> + link) { ?>

title;?>

title;?>

@@ -57,10 +57,10 @@
- + - +
diff --git a/themes/blog/profile.html.php b/themes/blog/profile.html.php index d05b574..e684b95 100644 --- a/themes/blog/profile.html.php +++ b/themes/blog/profile.html.php @@ -1,5 +1,5 @@ - +
@@ -11,7 +11,7 @@

- +
  • @@ -27,8 +27,8 @@
- - + + \ No newline at end of file diff --git a/themes/blog/static.html.php b/themes/blog/static.html.php index 95afb61..27fe66f 100644 --- a/themes/blog/static.html.php +++ b/themes/blog/static.html.php @@ -1,5 +1,5 @@ - +
diff --git a/themes/clean/main.html.php b/themes/clean/main.html.php index 030e780..cbd9eae 100644 --- a/themes/clean/main.html.php +++ b/themes/clean/main.html.php @@ -1,16 +1,14 @@ - +
- - -
-

title;?>

-
- body; ?> -
+ +
+

title;?>

+
+ body; ?>
- +
@@ -24,7 +22,7 @@ $i++; ?>
- link)) { ?> + link) { ?>

title ?> →

title ?>

@@ -38,24 +36,24 @@ - url ?>> - Edit'; } ?> + Edit'; } ?>
- image)) { ?> + image) { ?>
<?php echo $p->title ?>
- video)) { ?> + video) { ?>
- audio)) { ?> + audio) { ?>
- quote)) { ?> + quote) { ?>
quote ?>
@@ -68,13 +66,13 @@
- +
- + - +
diff --git a/themes/clean/post.html.php b/themes/clean/post.html.php index 7d2721f..80f97c7 100644 --- a/themes/clean/post.html.php +++ b/themes/clean/post.html.php @@ -1,12 +1,12 @@ - +
- link)) { ?> + link) { ?>

title ?> →

title ?>

@@ -18,22 +18,22 @@ - Permalink
- image)) { ?> + image) { ?>
<?php echo $p->title ?>
- video)) { ?> + video) { ?>
- audio)) { ?> + audio) { ?>
- quote)) { ?> + quote) { ?>
quote ?>
@@ -70,10 +70,10 @@
- + - +
diff --git a/themes/clean/profile.html.php b/themes/clean/profile.html.php index 63c0238..591a58f 100644 --- a/themes/clean/profile.html.php +++ b/themes/clean/profile.html.php @@ -1,5 +1,5 @@ - +
@@ -9,7 +9,7 @@

- + - +
- + - +
diff --git a/themes/logs/main.html.php b/themes/logs/main.html.php index 8e0fea5..f51aed9 100644 --- a/themes/logs/main.html.php +++ b/themes/logs/main.html.php @@ -1,21 +1,19 @@ - +
- - -
-

title;?>

-
- body; ?> -
+ +
+

title;?>

+
+ body; ?>
- +
- link)) { ?> + link) { ?>

title ?> →

title ?>

@@ -29,24 +27,24 @@ - url ?>> - Edit'; } ?> + Edit'; } ?>
- image)) { ?> + image) { ?>
<?php echo $p->title ?>
- video)) { ?> + video) { ?>
- audio)) { ?> + audio) { ?>
- quote)) { ?> + quote) { ?>
quote ?>
@@ -59,13 +57,13 @@
- +
- + - +
diff --git a/themes/logs/post.html.php b/themes/logs/post.html.php index 8271fac..ce4cb1a 100644 --- a/themes/logs/post.html.php +++ b/themes/logs/post.html.php @@ -1,12 +1,12 @@ - +
- link)) { ?> + link) { ?>

title ?> →

title ?>

@@ -18,22 +18,22 @@ - Permalink
- image)) { ?> + image) { ?>
<?php echo $p->title ?>
- video)) { ?> + video) { ?>
- audio)) { ?> + audio) { ?>
- quote)) { ?> + quote) { ?>
quote ?>
@@ -70,10 +70,10 @@
- + « - + »
diff --git a/themes/logs/profile.html.php b/themes/logs/profile.html.php index 30310e5..5a6124b 100644 --- a/themes/logs/profile.html.php +++ b/themes/logs/profile.html.php @@ -1,5 +1,5 @@ - +
@@ -9,7 +9,7 @@

- + - +
- + - +
diff --git a/themes/readable/main.html.php b/themes/readable/main.html.php index 4950bb3..0ca72b7 100644 --- a/themes/readable/main.html.php +++ b/themes/readable/main.html.php @@ -1,21 +1,19 @@ - +
- - -
-

title;?>

-
- body; ?> -
+ +
+

title;?>

+
+ body; ?>
- +
- link)) { ?> + link) { ?>

title ?> →

title ?>

@@ -29,24 +27,24 @@ - url ?>> - Edit'; } ?> + Edit'; } ?>
- image)) { ?> + image) { ?>
<?php echo $p->title ?>
- video)) { ?> + video) { ?>
- audio)) { ?> + audio) { ?>
- quote)) { ?> + quote) { ?>
quote ?>
@@ -59,12 +57,12 @@
- +
- + - +
diff --git a/themes/readable/post.html.php b/themes/readable/post.html.php index 7a90be6..db520d4 100644 --- a/themes/readable/post.html.php +++ b/themes/readable/post.html.php @@ -1,12 +1,12 @@ - +
- link)) { ?> + link) { ?>

title ?> →

title ?>

@@ -18,22 +18,22 @@ - Permalink
- image)) { ?> + image) { ?>
<?php echo $p->title ?>
- video)) { ?> + video) { ?>
- audio)) { ?> + audio) { ?>
- quote)) { ?> + quote) { ?>
quote ?>
@@ -68,10 +68,10 @@
- + - +
diff --git a/themes/readable/profile.html.php b/themes/readable/profile.html.php index 8bbf5bd..136900c 100644 --- a/themes/readable/profile.html.php +++ b/themes/readable/profile.html.php @@ -1,5 +1,5 @@ - +
@@ -9,7 +9,7 @@

- + - +
- + - +
diff --git a/themes/readable/static.html.php b/themes/readable/static.html.php index 969ced9..480c9fc 100644 --- a/themes/readable/static.html.php +++ b/themes/readable/static.html.php @@ -1,5 +1,5 @@ - +
diff --git a/themes/twentyfifteen/main.html.php b/themes/twentyfifteen/main.html.php index 6f5a68a..c233294 100644 --- a/themes/twentyfifteen/main.html.php +++ b/themes/twentyfifteen/main.html.php @@ -1,42 +1,42 @@ - +

: title;?>

body;?>
- +

: title;?>

- +

: title;?>

- +

: title;?>

- +

Type: title);?>

-
- image)):?> +
+ image):?>
<?php echo $p->title; ?>
- audio)):?> + audio):?>
- video)):?> + video):?>
- quote)):?> + quote):?>
quote ?>
- link)) { ?> + link) { ?>

title; ?>

@@ -73,14 +73,14 @@
- +