From ca850bb46bb8337531be80748b47c1790ef83bab Mon Sep 17 00:00:00 2001 From: Joey Kimsey Date: Mon, 27 Jan 2025 00:26:43 -0500 Subject: [PATCH] UI fixes and composer bump --- app/controllers/admin/home.php | 15 ++++ app/css/main-dark.css | 5 ++ app/css/main.css | 11 ++- app/plugins/blog/models/posts.php | 4 +- app/plugins/blog/views/admin/list.html | 2 +- app/plugins/blog/views/list.html | 2 +- app/plugins/blog/views/post.html | 2 +- app/plugins/blog/views/sidebar2.html | 24 +++--- .../contact/views/admin/dashboard.html | 29 +++++++ app/templates/admin/admin.inc.php | 8 +- app/templates/default/default.inc.php | 4 +- app/views/admin/dashboard/dash.html | 5 ++ app/views/admin/groups/list.html | 4 +- app/views/admin/groups/list_members.html | 83 ++++++++++--------- app/views/admin/modules/plugins/list.html | 2 +- app/views/admin/routes/list.html | 2 +- app/views/admin/settings.html | 2 + app/views/admin/tokens/list.html | 2 +- app/views/admin/users/list.html | 2 +- app/views/nav/admin.html | 2 +- app/views/nav/adminSub.html | 2 +- app/views/nav/main.html | 18 ++-- composer.json | 4 +- composer.lock | 16 ++-- 24 files changed, 167 insertions(+), 83 deletions(-) create mode 100644 app/plugins/contact/views/admin/dashboard.html diff --git a/app/controllers/admin/home.php b/app/controllers/admin/home.php index 6572929..6d5fbdd 100644 --- a/app/controllers/admin/home.php +++ b/app/controllers/admin/home.php @@ -17,8 +17,10 @@ use TheTempusProject\Classes\AdminController; use TheTempusProject\Models\User; use TheTempusProject\Models\Comments; use TheTempusProject\Models\Posts; +use TheTempusProject\Models\Contact; use TheTempusProject\Plugins\Comments as CommentPlugin; use TheTempusProject\Plugins\Blog as BlogPlugin; +use TheTempusProject\Plugins\Contact as ContactPlugin; use TheTempusProject\Canary\Bin\Canary as Debug; class Home extends AdminController { @@ -58,6 +60,19 @@ class Home extends AdminController { } } + if ( class_exists( 'TheTempusProject\Plugins\Contact' ) ) { + $plugin = new ContactPlugin; + + if ( ! $plugin->checkEnabled() ) { + Debug::info( 'Contact Plugin is disabled in the control panel.' ); + Components::set( 'contactDash', '' ); + } else { + $posts = new Contact; + $postsList = Views::simpleView( 'contact.admin.dashboard', $posts->listPaginated( 5 ) ); + Components::set( 'contactDash', $postsList ); + } + } + self::$user = new User; $users = Views::simpleView( 'admin.dashboard.users', self::$user->recent( 5 ) ); Components::set( 'userDash', $users ); diff --git a/app/css/main-dark.css b/app/css/main-dark.css index 4e9e249..ce8a267 100644 --- a/app/css/main-dark.css +++ b/app/css/main-dark.css @@ -28,6 +28,10 @@ background-color: #2c2c2c; } +hr { + color: #f5f5f5; +} + .bg-none,.bg-warning { color: #000 !important; @@ -145,6 +149,7 @@ body { background-color: #1f1f1f; color: #e0e0e0; } + .form-control:focus { color: #e0e0e0; border-color: #1e90ff; diff --git a/app/css/main.css b/app/css/main.css index c05624d..4153e56 100644 --- a/app/css/main.css +++ b/app/css/main.css @@ -12,7 +12,14 @@ .context-other-bg { background-color: #eaeaea; } - + +.nav-link.active { + font-weight: bold; /* Make the text bold */ +} + +hr { + color: #000; +} .context-main-bg { background-color: #f7f7f7; @@ -57,7 +64,7 @@ bottom: 2.5px; left: 5px; transition: transform 0.3s ease-in-out; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2); + box-shadow: 0 2px 4px #00000033; } /* Change background color when checked */ diff --git a/app/plugins/blog/models/posts.php b/app/plugins/blog/models/posts.php index 212ac2b..7a4baac 100644 --- a/app/plugins/blog/models/posts.php +++ b/app/plugins/blog/models/posts.php @@ -168,9 +168,11 @@ class Posts extends DatabaseModel { $draft = ' Draft'; } $instance->isDraft = $draft; - $instance->authorName = $authorName; + $instance->authorName = \ucfirst( $authorName ); if ( self::$comments !== false ) { $instance->commentCount = self::$comments->count( 'blog', $instance->ID ); + } else { + $instance->commentCount = 0; } $instance->content = Filters::applyOne( 'mentions.0', $instance->content, true ); $instance->content = Filters::applyOne( 'hashtags.0', $instance->content, true ); diff --git a/app/plugins/blog/views/admin/list.html b/app/plugins/blog/views/admin/list.html index 62df2fb..7e40fc8 100644 --- a/app/plugins/blog/views/admin/list.html +++ b/app/plugins/blog/views/admin/list.html @@ -21,7 +21,7 @@ {LOOP} - {title}{isDraft} + {title}{isDraft} {authorName} {commentCount} {DTC}{created}{/DTC} diff --git a/app/plugins/blog/views/list.html b/app/plugins/blog/views/list.html index 0a42697..5fd3a34 100644 --- a/app/plugins/blog/views/list.html +++ b/app/plugins/blog/views/list.html @@ -1,7 +1,7 @@ {LOOP}

{title}

-

{DTC date}{created}{/DTC} by {authorName}

+

{DTC date}{created}{/DTC} by {authorName}

{contentSummary}
diff --git a/app/plugins/blog/views/post.html b/app/plugins/blog/views/post.html index 3484817..bcd8f84 100644 --- a/app/plugins/blog/views/post.html +++ b/app/plugins/blog/views/post.html @@ -3,7 +3,7 @@

{title}

-

{DTC date}{created}{/DTC} by {authorName}

+

{DTC date}{created}{/DTC} by {authorName}

{content} {ADMIN}
diff --git a/app/plugins/blog/views/sidebar2.html b/app/plugins/blog/views/sidebar2.html index d64ac19..cef0110 100644 --- a/app/plugins/blog/views/sidebar2.html +++ b/app/plugins/blog/views/sidebar2.html @@ -1,11 +1,15 @@ -
-

Archives

- +
+
+

Archives

+
+
+
    + {LOOP} +
  1. ({count}) {monthText} {year}
    2. + {/LOOP} + {ALT} +
  2. None To Show
    3. + {/ALT} +
+
\ No newline at end of file diff --git a/app/plugins/contact/views/admin/dashboard.html b/app/plugins/contact/views/admin/dashboard.html new file mode 100644 index 0000000..615217a --- /dev/null +++ b/app/plugins/contact/views/admin/dashboard.html @@ -0,0 +1,29 @@ + + + + + + + + + + + + {LOOP} + + + + + + + + {/LOOP} + {ALT} + + + + {/ALT} + +
{ID}{DTC}{time}{/DTC}{feedback}
+ No Contact forms to show. +
\ No newline at end of file diff --git a/app/templates/admin/admin.inc.php b/app/templates/admin/admin.inc.php index 779b9b4..1a0fa59 100644 --- a/app/templates/admin/admin.inc.php +++ b/app/templates/admin/admin.inc.php @@ -34,14 +34,16 @@ class AdminLoader extends DefaultLoader { } $links[$key]->url = '#' . $name . 'Dropdown'; $links[$key]->text = '' . $link->text . ''; - $links[$key]->duuuuuuuh = Views::simpleView( 'nav.adminSub', $out ); + $links[$key]->subnav = Views::simpleView( 'nav.adminSub', $out ); } else { $links[$key]->linkClasses = 'nav-link'; $links[$key]->linkAttributes = ''; - $links[$key]->duuuuuuuh = ''; + $links[$key]->subnav = ''; } } - Components::set( 'ADMIN_LINKS', Views::simpleView( 'nav.admin', $links ) ); + $menu = Views::simpleView( 'nav.admin', $links ); + $activeMenu = Navigation::activePageSelect( $menu, Input::get( 'url' ), false, true ); + Components::set( 'ADMIN_LINKS', $activeMenu ); Navigation::setCrumbComponent( 'ADMIN_BREADCRUMBS', Input::get( 'url' ) ); } } diff --git a/app/templates/default/default.inc.php b/app/templates/default/default.inc.php index e9b6245..6232f97 100644 --- a/app/templates/default/default.inc.php +++ b/app/templates/default/default.inc.php @@ -73,7 +73,9 @@ class DefaultLoader extends Loader { $this->addCss( '' ); } Components::set( 'topNavRight', Template::parse( App::$topNavRight . '{STATUS}' ) ); - Components::set( 'topNavLeft', Views::simpleView( 'nav.main', Navigation::getMenuLinks( App::MAIN_MENU_NAME ) ) ); + $menu = Views::simpleView( 'nav.main', Navigation::getMenuLinks( App::MAIN_MENU_NAME ) ); + $activeMenu = Navigation::activePageSelect( $menu, Input::get( 'url' ), false, true ); + Components::set( 'topNavLeft', $activeMenu ); Components::set( 'colorSelect', Views::simpleView( 'forms.colorSelect' ) ); Components::set( 'iconSelect', Views::simpleView( 'forms.iconSelect' ) ); Navigation::setCrumbComponent( 'BREADCRUMB', Input::get( 'url' ) ); diff --git a/app/views/admin/dashboard/dash.html b/app/views/admin/dashboard/dash.html index dccea54..240d46a 100644 --- a/app/views/admin/dashboard/dash.html +++ b/app/views/admin/dashboard/dash.html @@ -8,6 +8,11 @@ {commentDash}
+
+
+ {contactDash} +
+
{blogDash} diff --git a/app/views/admin/groups/list.html b/app/views/admin/groups/list.html index 82c27bc..7be39db 100644 --- a/app/views/admin/groups/list.html +++ b/app/views/admin/groups/list.html @@ -18,8 +18,8 @@ {LOOP} - {name} - {userCount} + {name} + {userCount} diff --git a/app/views/admin/groups/list_members.html b/app/views/admin/groups/list_members.html index 23cabf7..8966b47 100644 --- a/app/views/admin/groups/list_members.html +++ b/app/views/admin/groups/list_members.html @@ -1,40 +1,43 @@ -

{groupName} user list

-{PAGINATION} -
- - - - - - - - - - - - - {LOOP} - - - - - - - - - {/LOOP} - {ALT} - - - - {/ALT} - -
IDUsernameJoined - -
{ID}{username}{DTC date}{registered}{/DTC} - -
- No results to show. -
- -
\ No newline at end of file +
+ {groupName} user list +
+ {ADMIN_BREADCRUMBS} +
+ + + + + + + + + + + + + {LOOP} + + + + + + + + + {/LOOP} + {ALT} + + + + {/ALT} + +
IDUsernameJoined + +
{ID}{username}{DTC date}{registered}{/DTC} + +
+ No results to show. +
+ +
+
\ No newline at end of file diff --git a/app/views/admin/modules/plugins/list.html b/app/views/admin/modules/plugins/list.html index 8c05b59..ea5b7ef 100644 --- a/app/views/admin/modules/plugins/list.html +++ b/app/views/admin/modules/plugins/list.html @@ -17,7 +17,7 @@ {LOOP} - {name} + {name} {enabled_txt} {installStatus} {version} diff --git a/app/views/admin/routes/list.html b/app/views/admin/routes/list.html index 115ce9b..7ac23df 100644 --- a/app/views/admin/routes/list.html +++ b/app/views/admin/routes/list.html @@ -22,7 +22,7 @@ {LOOP} {ID} - {nickname} + {nickname} {redirect_type} {original_url} {forwarded_url} diff --git a/app/views/admin/settings.html b/app/views/admin/settings.html index 59c8136..08fa990 100644 --- a/app/views/admin/settings.html +++ b/app/views/admin/settings.html @@ -1,4 +1,6 @@
+ Settings +
{ADMIN_BREADCRUMBS}
diff --git a/app/views/admin/tokens/list.html b/app/views/admin/tokens/list.html index dbffd99..d1262b9 100644 --- a/app/views/admin/tokens/list.html +++ b/app/views/admin/tokens/list.html @@ -14,7 +14,7 @@ {LOOP} - {name} + {name} {token_type} diff --git a/app/views/admin/users/list.html b/app/views/admin/users/list.html index f5bf83b..bcacc1c 100644 --- a/app/views/admin/users/list.html +++ b/app/views/admin/users/list.html @@ -20,7 +20,7 @@ {LOOP} {ID} - {username} + {username} {DTC date}{registered}{/DTC} diff --git a/app/views/nav/admin.html b/app/views/nav/admin.html index aaf01c4..66db4ee 100644 --- a/app/views/nav/admin.html +++ b/app/views/nav/admin.html @@ -4,7 +4,7 @@ {text} - {duuuuuuuh} + {subnav} {/LOOP} \ No newline at end of file diff --git a/app/views/nav/adminSub.html b/app/views/nav/adminSub.html index 513c731..61eb758 100644 --- a/app/views/nav/adminSub.html +++ b/app/views/nav/adminSub.html @@ -1,6 +1,6 @@ \ No newline at end of file diff --git a/app/views/nav/main.html b/app/views/nav/main.html index 11988cf..cb19bbb 100644 --- a/app/views/nav/main.html +++ b/app/views/nav/main.html @@ -1,5 +1,13 @@ -
    - {LOOP} -
  • {text}
    • - {/LOOP} -
\ No newline at end of file + \ No newline at end of file diff --git a/composer.json b/composer.json index f98d8a2..6315553 100644 --- a/composer.json +++ b/composer.json @@ -22,9 +22,9 @@ { "components/jquery": "1.9.*", "fortawesome/font-awesome": "4.7", - "thetempusproject/bedrock": "1.1", + "thetempusproject/bedrock": "1.1.1", "thetempusproject/canary": "1.0.6", - "thetempusproject/houdini": "2.0.1", + "thetempusproject/houdini": "2.0.2", "twbs/bootstrap": "5.2.3" }, "autoload": diff --git a/composer.lock b/composer.lock index b5bb9db..4f37afa 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "7b53f62bdce4655bce03a69a5e6ae57a", + "content-hash": "b54d2da34f833481cff28144a669b2aa", "packages": [ { "name": "components/jquery", @@ -303,17 +303,17 @@ }, { "name": "thetempusproject/bedrock", - "version": "1.1", + "version": "1.1.1", "source": { "type": "git", "url": "https://git.thetempusproject.com/the-tempus-project/bedrock", - "reference": "3b8e0994912eef8c203c8d47258754d6c78d4b19" + "reference": "bcd73d58f9d7df41b5ec0f12871ff15cfcc215ae" }, "require": { "php": ">=8.1.0", "thetempusproject/canary": "1.0.6", "thetempusproject/hermes": "1.0.3", - "thetempusproject/houdini": "2.0.1" + "thetempusproject/houdini": "2.0.2" }, "type": "library", "autoload": { @@ -344,7 +344,7 @@ "framework", "mvc" ], - "time": "2025-01-22T02:02:57+00:00" + "time": "2025-01-27T05:07:05+00:00" }, { "name": "thetempusproject/canary", @@ -434,11 +434,11 @@ }, { "name": "thetempusproject/houdini", - "version": "2.0.1", + "version": "2.0.2", "source": { "type": "git", "url": "https://git.thetempusproject.com/the-tempus-project/houdini", - "reference": "b03fc3b7ddcdd0213f8f927a9bf1c0c68c62138f" + "reference": "fb027a4ebc327e709ad3da29a4cf112894c2b7e6" }, "require": { "php": ">=8.1.0", @@ -474,7 +474,7 @@ "thetempusproject", "tools" ], - "time": "2025-01-22T01:59:01+00:00" + "time": "2025-01-27T05:02:14+00:00" }, { "name": "twbs/bootstrap",