diff --git a/app/classes/preferences.php b/app/classes/preferences.php index 3f05c9e..c32d08c 100644 --- a/app/classes/preferences.php +++ b/app/classes/preferences.php @@ -268,13 +268,13 @@ class Preferences { } $html .= '
'; - $html .= ''; + $html .= ''; $html .= '
'; $html .= $fieldHtml; $html .= '
'; if ( 'file' === $type ) { $html .= '
'; - $html .= '

Current Image

'; + $html .= '

Current Image

'; $html .= '
'; $html .= 'User Avatar'; $html .= '
'; diff --git a/app/controllers/admin/home.php b/app/controllers/admin/home.php index 6d5fbdd..f3b6ea0 100644 --- a/app/controllers/admin/home.php +++ b/app/controllers/admin/home.php @@ -22,6 +22,7 @@ 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; +use TheTempusProject\Bedrock\Functions\Input; class Home extends AdminController { public static $user; diff --git a/app/controllers/admin/users.php b/app/controllers/admin/users.php index d97aa97..fbc83a5 100644 --- a/app/controllers/admin/users.php +++ b/app/controllers/admin/users.php @@ -27,6 +27,7 @@ use TheTempusProject\Models\User; use TheTempusProject\Models\Group; use TheTempusProject\TheTempusProject as App; use TheTempusProject\Houdini\Classes\Template; +use TheTempusProject\Bedrock\Functions\Upload; class Users extends AdminController { public static $user; @@ -104,7 +105,7 @@ class Users extends AdminController { } if ( Input::exists( 'submit' ) ) { - if ( !FormChecker::check( 'editUser' ) ) { + if ( ! FormChecker::check( 'editUser' ) ) { Issues::add( 'error', [ 'There was an error with your request.' => Check::userErrors() ] ); } else { $fields = [ @@ -112,6 +113,25 @@ class Users extends AdminController { 'email' => Input::post( 'email' ), 'userGroup' => Input::post( 'groupSelect' ), ]; + + if ( Input::exists( 'avatar' ) ) { + $folder = UPLOAD_DIRECTORY . $userData->username . DIRECTORY_SEPARATOR . 'images' . DIRECTORY_SEPARATOR; + $upload = Upload::image( 'avatar', $folder ); + if ( $upload ) { + $route = str_replace( APP_ROOT_DIRECTORY, '', $folder ); + $prefs = []; + $prefs['avatar'] = $route . Upload::last(); + + self::$user->updatePrefs( $prefs, $userData->ID ); + } else { + Issues::add( 'error', [ 'There was an error with your avatar.' => Check::userErrors() ] ); + } + } + + if ( Input::exists( 'password' ) ) { + $fields['password'] = Hash::make( Input::post( 'password' ) ); + } + if ( Input::exists( 'confirmed' ) ) { $fields['confirmed'] = 1; } else { @@ -119,6 +139,7 @@ class Users extends AdminController { $fields['confirmationCode'] = Code::genConfirmation(); } } + if ( self::$user->update( $userData->ID, $fields ) ) { Issues::add( 'success', 'User Updated.' ); return $this->index(); diff --git a/app/controllers/home.php b/app/controllers/home.php index 16659f1..ddc3a8a 100644 --- a/app/controllers/home.php +++ b/app/controllers/home.php @@ -38,15 +38,15 @@ class Home extends Controller { return Issues::add( 'notice', 'You are already logged in. Please click here to log out.' ); } if ( !Input::exists() ) { - return Views::view( 'login' ); + return Views::view( 'auth.login' ); } if ( !Forms::check( 'login' ) ) { Issues::add( 'error', [ 'There was an error with your login.' => Check::userErrors() ] ); - return Views::view( 'login' ); + return Views::view( 'auth.login' ); } if ( !self::$user->logIn( Input::post( 'username' ), Input::post( 'password' ), Input::post( 'remember' ) ) ) { Issues::add( 'error', 'Username or password was incorrect.' ); - return Views::view( 'login' ); + return Views::view( 'auth.login' ); } Session::flash( 'success', 'You have been logged in.' ); if ( Input::exists( 'rurl' ) ) { @@ -79,13 +79,13 @@ class Home extends Controller { } self::$title = $user->username . '\'s Profile - {SITENAME}'; self::$pageDescription = 'User Profile for ' . $user->username . ' - {SITENAME}'; - Views::view( 'profile', $user ); + Views::view( 'profilePage', $user ); } public function terms() { self::$title = 'Terms and Conditions - {SITENAME}'; self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.'; - Components::set( 'TERMS', Views::simpleView( 'terms' ) ); + Components::set( 'TERMS', Views::simpleView( 'auth.terms' ) ); Views::view( 'termsPage' ); } @@ -98,8 +98,7 @@ class Home extends Controller { public function privacy() { self::$title = 'Privacy Policy - {SITENAME}'; self::$pageDescription = 'At {SITENAME} you privacy is very important to us. On this page you can find a detailed outline of all the information we collect and how its used.'; - Components::set( 'PRIVACY', Views::simpleView( 'privacy' ) ); - Views::raw( '
{PRIVACY}
' ); + Views::view( 'privacy' ); } public function faq() { diff --git a/app/controllers/register.php b/app/controllers/register.php index da84cc5..3e5d10d 100644 --- a/app/controllers/register.php +++ b/app/controllers/register.php @@ -31,14 +31,14 @@ class Register extends Controller { Template::noIndex(); self::$title = 'Confirm Email'; if ( !isset( $code ) && !Input::exists( 'confirmationCode' ) ) { - return Views::view( 'confirmation' ); + return Views::view( 'auth.confirmation' ); } if ( Forms::check( 'emailConfirmation' ) ) { $code = Input::post( 'confirmationCode' ); } if ( !self::$user->confirm( $code ) ) { Issues::add( 'error', 'There was an error confirming your account, please try again.' ); - return Views::view( 'confirmation' ); + return Views::view( 'auth.confirmation' ); } Session::flash( 'success', 'You have successfully confirmed your email address.' ); Redirect::to( 'home/index' ); @@ -52,16 +52,16 @@ class Register extends Controller { return Issues::add( 'notice', 'The site administrator has disable the ability to register a new account.' ); } - Components::set( 'TERMS', Views::simpleView( 'terms' ) ); + Components::set( 'TERMS', Views::simpleView( 'auth.terms' ) ); if ( App::$isLoggedIn ) { return Issues::add( 'notice', 'You are currently logged in.' ); } if ( !Input::exists() ) { - return Views::view( 'register' ); + return Views::view( 'auth.register' ); } if ( !Forms::check( 'register' ) ) { Issues::add( 'error', [ 'There was an error with your registration.' => Check::userErrors() ] ); - return Views::view( 'register' ); + return Views::view( 'auth.register' ); } self::$user->create( [ 'username' => Input::post( 'username' ), @@ -80,7 +80,7 @@ class Register extends Controller { self::$title = 'Recover Account - {SITENAME}'; Template::noIndex(); if ( !Input::exists() ) { - return Views::view( 'forgot' ); + return Views::view( 'auth.forgot' ); } if ( Check::email( Input::post( 'entry' ) ) && self::$user->findByEmail( Input::post( 'entry' ) ) ) { $userData = self::$user->data(); @@ -96,7 +96,7 @@ class Register extends Controller { Redirect::to( 'home/login' ); } Issues::add( 'error', 'User not found.' ); - Views::view( 'forgot' ); + Views::view( 'auth.forgot' ); } public function resend() { @@ -109,7 +109,7 @@ class Register extends Controller { return Issues::add( 'notice', 'Your account has already been confirmed.' ); } if ( !Forms::check( 'confirmationResend' ) ) { - return Views::view( 'confirmation_resend' ); + return Views::view( 'auth.confirmation_resend' ); } Email::send( App::$activeUser->email, 'confirmation', App::$activeUser->confirmationCode, [ 'template' => true ] ); Session::flash( 'success', 'Your confirmation email has been sent to the email for your account.' ); @@ -121,7 +121,7 @@ class Register extends Controller { Template::noIndex(); if ( !isset( $code ) && !Input::exists( 'resetCode' ) ) { Issues::add( 'info', 'Please provide a reset code.' ); - return Views::view( 'password_reset_code' ); + return Views::view( 'auth.password_reset_code' ); } if ( Input::exists( 'resetCode' ) ) { if ( Forms::check( 'passwordResetCode' ) ) { @@ -130,15 +130,15 @@ class Register extends Controller { } if ( ! self::$user->checkCode( $code ) ) { Issues::add( 'error', 'There was an error with your reset code. Please try again.' ); - return Views::view( 'password_reset_code' ); + return Views::view( 'auth.password_reset_code' ); } Components::set( 'resetCode', $code ); if ( ! Input::exists('password') ) { - return Views::view( 'password_reset' ); + return Views::view( 'auth.password_reset' ); } if ( ! Forms::check( 'passwordReset' ) ) { Issues::add( 'error', [ 'There was an error with your request.' => Check::userErrors() ] ); - return Views::view( 'password_reset' ); + return Views::view( 'auth.password_reset' ); } self::$user->changePassword( $code, Input::post( 'password' ) ); Email::send( self::$user->data()->email, 'passwordChange', null, [ 'template' => true ] ); diff --git a/app/controllers/usercp.php b/app/controllers/usercp.php index c35ad0d..5d1c6c1 100644 --- a/app/controllers/usercp.php +++ b/app/controllers/usercp.php @@ -70,7 +70,7 @@ class Usercp extends Controller { self::$title = 'User Control Panel'; $menu = Views::simpleView( 'nav.usercp', App::$userCPlinks ); Navigation::activePageSelect( $menu, null, true, true ); - Views::view( 'profile', App::$activeUser ); + Views::view( 'user_cp.profile', App::$activeUser ); } public function password() { @@ -104,6 +104,10 @@ class Usercp extends Controller { $userPrefs = App::$activePrefs; if ( Input::exists( 'submit' ) ) { $fields = $prefs->convertFormToArray( true, false ); + // @TODO now i may need to rework the form checker to work with this.... + // if (!Forms::check('userPrefs')) { + // Issues::add( 'error', [ 'There was an error with your request.' => Check::userErrors() ] ); + // } self::$user->updatePrefs( $fields, App::$activeUser->ID ); Issues::add( 'success', 'Your preferences have been updated.' ); // if the image upload fails, need to fall back on original diff --git a/app/css/main-dark.css b/app/css/main-dark.css index ce8a267..f13b9f0 100644 --- a/app/css/main-dark.css +++ b/app/css/main-dark.css @@ -9,36 +9,42 @@ * @license https://opensource.org/licenses/MIT [MIT LICENSE] */ -.context-main { - color: #fff; -} -.context-second { - color: #1e1e1e; +.context-main-border { + border-color: #f5f5f5!important; } + .context-main-bg { background-color: #2c2c2c; } .context-second-bg { - background-color: #1e1e1e; + background-color: #383838; } .context-third-bg { background-color: #3a3a3a; } +.context-other-bg { + background-color: #1e1e1e; +} + +.context-main { + color: #fff; +} + + + .bg-default { background-color: #2c2c2c; } - hr { color: #f5f5f5; } + + .bg-none,.bg-warning { color: #000 !important; } -.context-other { - color: #000; -} .accordion-button:not(.collapsed) { color: #f5f5f5; background-color: var(--bs-accordion-dark-active-bg); @@ -68,12 +74,6 @@ body { .install-terms strong { color: #ffffff; } -.context-main { - color: #ffffff; -} -.context-other { - color: #ffffff; -} /** * Terms Page diff --git a/app/css/main.css b/app/css/main.css index e984dd3..67330d8 100644 --- a/app/css/main.css +++ b/app/css/main.css @@ -8,10 +8,29 @@ * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] */ -.context-other-bg { - background-color: #eaeaea; + +.context-main-border { + border-color: #1e1e1e!important; } +.context-main-bg { + background-color: #f7f7f7; + /* background-color: #b1b; */ +} +.context-second-bg { + background-color: #eaeaea; + /* background-color: #b1b; */ +} +.context-third-bg { + background-color: #ccc; + /* background-color: #b1b; */ +} + +.context-main { + color: #000; +} + + .nav-link.active { font-weight: bold; /* Make the text bold */ } @@ -20,10 +39,6 @@ hr { color: #000; } -.context-main-bg { - background-color: #f7f7f7; -} - /* Base styles for the switch container */ .material-switch { position: relative; @@ -76,12 +91,6 @@ hr { transform: translateX(25px); /* Adjust based on switch width */ } -.context-main { - color: #000; -} -.context-other { - color: #fff; -} html { font-family: 'Open Sans', sans-serif; position: relative; @@ -310,3 +319,4 @@ body { /* W3C, IE 10+/ Edge, Firefox 16+, Chrome 26+, Opera 12+, Safari 7+ */ background: linear-gradient(to right, #2c2c2c, #1e1e1e, #1e1e1e); } + diff --git a/app/models/group.php b/app/models/group.php index 759dae7..f5331a3 100644 --- a/app/models/group.php +++ b/app/models/group.php @@ -38,6 +38,9 @@ class Group extends DatabaseModel { [ 'name', 'varchar', '32' ], [ 'permissions', 'text', '' ], ]; + public $searchFields = [ + 'name', + ]; public $permissionMatrix = [ 'adminAccess' => [ 'pretty' => 'Access Administrator Areas', diff --git a/app/models/log.php b/app/models/log.php index efd7b4a..135758b 100644 --- a/app/models/log.php +++ b/app/models/log.php @@ -46,6 +46,9 @@ class Log extends DatabaseModel { [ 'source', 'varchar', '64' ], [ 'action', 'text', '' ], ]; + public $searchFields = [ + 'source', + ]; /** * The model constructor. diff --git a/app/models/routes.php b/app/models/routes.php index 8333692..a48b834 100644 --- a/app/models/routes.php +++ b/app/models/routes.php @@ -24,6 +24,9 @@ class Routes extends DatabaseModel { [ 'original_url', 'varchar', '32' ], [ 'forwarded_url', 'text', '' ], ]; + public $searchFields = [ + 'nickname', + ]; public $resourceMatrix = [ [ 'original_url' => 'fb', diff --git a/app/models/sessions.php b/app/models/sessions.php index 9edde85..427d573 100644 --- a/app/models/sessions.php +++ b/app/models/sessions.php @@ -36,6 +36,9 @@ class Sessions extends DatabaseModel { [ 'username', 'varchar', '20' ], [ 'token', 'varchar', '120' ], ]; + public $searchFields = [ + 'username', + ]; public static $activeSession = false; /** diff --git a/app/models/token.php b/app/models/token.php index fe9198a..59cb422 100644 --- a/app/models/token.php +++ b/app/models/token.php @@ -31,6 +31,10 @@ class Token extends DatabaseModel { [ 'createdBy', 'int', '10' ], [ 'expiresAt', 'int', '10' ], ]; + public $searchFields = [ + 'name', + 'token', + ]; public $permissionMatrix = [ 'addAppToken' => [ 'pretty' => 'Add Application Tokens', diff --git a/app/models/user.php b/app/models/user.php index 62012fa..286663d 100644 --- a/app/models/user.php +++ b/app/models/user.php @@ -44,6 +44,9 @@ class User extends DatabaseModel { [ 'confirmationCode', 'varchar', '80' ], [ 'prefs', 'text', '' ], ]; + public $searchFields = [ + 'username', + ]; public $permissionMatrix = [ 'uploadImages' => [ 'pretty' => 'Upload images (such as avatars)', @@ -428,7 +431,7 @@ class User extends DatabaseModel { if ( ! empty( $filter ) ) { switch ( $filter ) { case 'newsletter': - $data = self::$db->search( $this->tableName, 'prefs', 'newsletter":"true' ); + $data = self::$db->searchColumn( $this->tableName, 'prefs', 'newsletter":"true' ); break; default: $data = self::$db->get( $this->tableName, '*' ); @@ -546,6 +549,7 @@ class User extends DatabaseModel { $instance->prefs = json_decode( $instance->prefs, true ); $instance->gender = $instance->prefs['gender']; $instance->avatar = $instance->prefs['avatar']; + $instance->usernamePretty = \ucfirst( $instance->username ); $out[] = $instance; if ( !empty( $end ) ) { $out = $out[0]; @@ -659,7 +663,7 @@ class User extends DatabaseModel { } if ( !self::$db->update( $this->tableName, $id, $fields ) ) { new CustomException( 'userUpdate' ); - Debug::error( "User: $id not updated: $fields" ); + Debug::error( "User: $id not updated: " . var_export( $fields, true ) ); return false; } return true; diff --git a/app/plugins/blog/controllers/blog.php b/app/plugins/blog/controllers/blog.php index 80cc7c8..678f1ee 100644 --- a/app/plugins/blog/controllers/blog.php +++ b/app/plugins/blog/controllers/blog.php @@ -171,4 +171,16 @@ class Blog extends Controller { self::$pageDescription = '{SITENAME} blog posts easily and conveniently sorted by years.'; Views::view( 'blog.list', self::$posts->byYear( $year ) ); } + + public function search() { + $results = []; + if ( Input::exists( 'submit' ) ) { + $dbResults = self::$posts->search( Input::post('searchTerm') ); + if ( ! empty( $dbResults ) ) { + $results = $dbResults; + } + } + Components::set( 'searchResults', Views::simpleView( 'blog.list', $results ) ); + Views::view( 'blog.searchResults' ); + } } diff --git a/app/plugins/blog/models/posts.php b/app/plugins/blog/models/posts.php index 7a4baac..ed049c5 100644 --- a/app/plugins/blog/models/posts.php +++ b/app/plugins/blog/models/posts.php @@ -24,6 +24,11 @@ use TheTempusProject\Models\Comments; class Posts extends DatabaseModel { public $tableName = 'posts'; + public $searchFields = [ + 'title', + 'slug', + 'content', + ]; public static $comments = false; public $databaseMatrix = [ diff --git a/app/plugins/blog/plugin.php b/app/plugins/blog/plugin.php index 883d6bd..0c5275b 100644 --- a/app/plugins/blog/plugin.php +++ b/app/plugins/blog/plugin.php @@ -37,6 +37,7 @@ class Blog extends Plugin { 'posts' => [ [ 'title' => 'Welcome', + 'slug' => 'welcome', 'content' => '

This is just a simple message to say thank you for installing The Tempus Project. If you have any questions you can find everything through our website here.

', 'author' => 1, 'created' => '{time}', diff --git a/app/plugins/blog/templates/blog.inc.php b/app/plugins/blog/templates/blog.inc.php index 857006f..575c5da 100644 --- a/app/plugins/blog/templates/blog.inc.php +++ b/app/plugins/blog/templates/blog.inc.php @@ -26,9 +26,10 @@ class BlogLoader extends DefaultLoader { */ public function __construct() { $posts = new Posts; - Components::set('SIDEBAR', Views::simpleView('blog.sidebar', $posts->recent(5))); - Components::set('SIDEBAR2', Views::simpleView('blog.sidebar2', $posts->archive())); - Components::set('SIDEBARABOUT', Views::simpleView('blog.about')); + Components::set('SIDEBAR', Views::simpleView('blog.widgets.recent', $posts->recent(5))); + Components::set('SIDEBAR2', Views::simpleView('blog.widgets.archive', $posts->archive())); + Components::set('SIDEBARABOUT', Views::simpleView('blog.widgets.about')); + Components::set('SIDEBARSEARCH', Views::simpleView('blog.widgets.search')); Components::set('BLOGFEATURES', ''); Navigation::setCrumbComponent( 'BLOG_BREADCRUMBS', Input::get( 'url' ) ); Components::set( 'BLOG_TEMPLATE_URL', Template::parse( '{ROOT_URL}app/plugins/comments/' ) ); diff --git a/app/plugins/blog/templates/blog.tpl b/app/plugins/blog/templates/blog.tpl index 880a176..eb9530f 100644 --- a/app/plugins/blog/templates/blog.tpl +++ b/app/plugins/blog/templates/blog.tpl @@ -39,26 +39,44 @@ -
-
-
- - - {SITENAME} - - {topNavLeft} -
- {topNavRight} -
-
-
-
- - - - - - +
+
+
+ + + + + {SITENAME} Logo + + + + + {SITENAME} Logo + + +
+ +
+ + +
+
+
{ISSUES} @@ -79,24 +97,27 @@
-

+

{SITENAME} Blog

-
+
-
+
{CONTENT}
-
+
-
+
{SIDEBARABOUT}
-
+
+ {SIDEBARSEARCH} +
+
{SIDEBAR}
-
+
{SIDEBAR2}
diff --git a/app/plugins/blog/views/about.html b/app/plugins/blog/views/about.html deleted file mode 100644 index ccd8d95..0000000 --- a/app/plugins/blog/views/about.html +++ /dev/null @@ -1,6 +0,0 @@ -
-

About

-

- The blog is mostly here to serve ass a simple way to link to long-form content on the site. There won't be any breaking news or tell-all stories here. Just good ole fashioned boring crap no one wants to read. -

-
\ No newline at end of file diff --git a/app/plugins/blog/views/admin/create.html b/app/plugins/blog/views/admin/create.html index 00d9d00..7d82eb5 100644 --- a/app/plugins/blog/views/admin/create.html +++ b/app/plugins/blog/views/admin/create.html @@ -2,7 +2,7 @@ Add Blog Post
{ADMIN_BREADCRUMBS} -
+
diff --git a/app/plugins/blog/views/admin/edit.html b/app/plugins/blog/views/admin/edit.html index 957a2e8..2cfd7ef 100644 --- a/app/plugins/blog/views/admin/edit.html +++ b/app/plugins/blog/views/admin/edit.html @@ -2,7 +2,7 @@ Edit Blog Post
{ADMIN_BREADCRUMBS} - +
diff --git a/app/plugins/blog/views/admin/preview.html b/app/plugins/blog/views/admin/preview.html index 41c358d..c0794ea 100644 --- a/app/plugins/blog/views/admin/preview.html +++ b/app/plugins/blog/views/admin/preview.html @@ -7,7 +7,7 @@
- + New Blog Post
diff --git a/app/plugins/blog/views/list.html b/app/plugins/blog/views/list.html index 5fd3a34..89a6c9e 100644 --- a/app/plugins/blog/views/list.html +++ b/app/plugins/blog/views/list.html @@ -1,5 +1,5 @@ {LOOP} -
+

{title}

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

@@ -9,7 +9,7 @@
{/LOOP} {ALT} -
-

No Posts Found.

-
+
+

No Posts Found

+
{/ALT} diff --git a/app/plugins/blog/views/post.html b/app/plugins/blog/views/post.html index bcd8f84..e470cff 100644 --- a/app/plugins/blog/views/post.html +++ b/app/plugins/blog/views/post.html @@ -1,6 +1,6 @@
-
-
+
+

{title}

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

diff --git a/app/plugins/blog/views/recentWidget.html b/app/plugins/blog/views/recentWidget.html deleted file mode 100644 index e256079..0000000 --- a/app/plugins/blog/views/recentWidget.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
-

Recent Posts

-
-
    - {LOOP} -
  • - {title} -
    • - {/LOOP} - {ALT} -
  • No Posts to show
    • - {/ALT} -
-
\ No newline at end of file diff --git a/app/plugins/blog/views/searchResults.html b/app/plugins/blog/views/searchResults.html new file mode 100644 index 0000000..64adfe6 --- /dev/null +++ b/app/plugins/blog/views/searchResults.html @@ -0,0 +1,3 @@ +Search Results +
+{searchResults} \ No newline at end of file diff --git a/app/plugins/blog/views/sidebar.html b/app/plugins/blog/views/sidebar.html deleted file mode 100644 index 85eb67e..0000000 --- a/app/plugins/blog/views/sidebar.html +++ /dev/null @@ -1,18 +0,0 @@ -
-
-

Recent Posts

-
-
-
    - {LOOP} -
  1. {title}
    2. - {/LOOP} - {ALT} -
  2. No Posts to show
    3. - {/ALT} -
-
-
- View All -
-
\ No newline at end of file diff --git a/app/plugins/blog/views/sidebar2.html b/app/plugins/blog/views/sidebar2.html deleted file mode 100644 index cef0110..0000000 --- a/app/plugins/blog/views/sidebar2.html +++ /dev/null @@ -1,15 +0,0 @@ -
-
-

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/blog/views/widgets/about.html b/app/plugins/blog/views/widgets/about.html new file mode 100644 index 0000000..b6c67f7 --- /dev/null +++ b/app/plugins/blog/views/widgets/about.html @@ -0,0 +1,11 @@ +
+
+
+

About

+

+ The blog is mostly here to serve ass a simple way to link to long-form content on the site. + There won't be any breaking news or tell-all stories here. Just good ole fashioned boring crap no one wants to read. +

+
+
+
\ No newline at end of file diff --git a/app/plugins/blog/views/widgets/archive.html b/app/plugins/blog/views/widgets/archive.html new file mode 100644 index 0000000..63fb52d --- /dev/null +++ b/app/plugins/blog/views/widgets/archive.html @@ -0,0 +1,17 @@ +
+
+
+

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/blog/views/widgets/recent.html b/app/plugins/blog/views/widgets/recent.html new file mode 100644 index 0000000..5822bfe --- /dev/null +++ b/app/plugins/blog/views/widgets/recent.html @@ -0,0 +1,20 @@ +
+
+
+

Recent Posts

+
+
+
    + {LOOP} +
  1. {title}
    2. + {/LOOP} + {ALT} +
  2. No Posts to show
    3. + {/ALT} +
+
+
+ View All +
+
+
\ No newline at end of file diff --git a/app/plugins/blog/views/widgets/search.html b/app/plugins/blog/views/widgets/search.html new file mode 100644 index 0000000..aa84fe9 --- /dev/null +++ b/app/plugins/blog/views/widgets/search.html @@ -0,0 +1,18 @@ +
+
+
+ +
+ + + + +
+ + +
+
+ +
+
+
\ No newline at end of file diff --git a/app/plugins/bugreport/plugin.php b/app/plugins/bugreport/plugin.php index c509440..d54e69d 100644 --- a/app/plugins/bugreport/plugin.php +++ b/app/plugins/bugreport/plugin.php @@ -51,7 +51,7 @@ class Bugreport extends Plugin { ]; public $contact_footer_links = [ [ - 'text' => 'Bug Report', + 'text' => 'Report a Bug', 'url' => '{ROOT_URL}bugreport', 'filter' => 'loggedin', ], diff --git a/app/plugins/bugreport/views/create.html b/app/plugins/bugreport/views/create.html index 8230842..3f6ca83 100644 --- a/app/plugins/bugreport/views/create.html +++ b/app/plugins/bugreport/views/create.html @@ -1,15 +1,20 @@ -
-

Bug Report

+
+
+

Report a Bug

-

Thank you for visiting our bug reporting page. We value our users' input highly and in an effort to better serve your needs, please fill out the form below to help us address this issue.

-

We read each and every bug report submitted, and by submitting this form you allow us to send you a follow-up email.

-
+

+ Thank you for visiting our bug reporting page. We value our users' input highly and in an effort to better serve your needs, please fill out the form below to help us address this issue. +

+

+ We read each and every bug report submitted, and by submitting this form you allow us to send you a follow-up email. +

+
- What is the URL of the page you actually received the error on? (The URL is the website address. Example: {ROOT_URL}home) + This is the URL of the page you actually received the error.
@@ -18,7 +23,7 @@ - What is the URL of the page you were on before you received the error? (The URL is the website address. Example: {ROOT_URL}home/newhome) + This is the URL of the page you were on before you received the error.
@@ -37,8 +42,11 @@
- - + + + + (max: 2000 characters) +
@@ -49,4 +57,5 @@
+
\ No newline at end of file diff --git a/app/plugins/comments/views/admin/edit.html b/app/plugins/comments/views/admin/edit.html index 47553e3..fad7bdb 100644 --- a/app/plugins/comments/views/admin/edit.html +++ b/app/plugins/comments/views/admin/edit.html @@ -3,7 +3,7 @@ Edit Comment
{ADMIN_BREADCRUMBS} -
+
diff --git a/app/plugins/comments/views/create.html b/app/plugins/comments/views/create.html index af241f5..6adaf54 100644 --- a/app/plugins/comments/views/create.html +++ b/app/plugins/comments/views/create.html @@ -1,4 +1,4 @@ - +
+ Max: 2000 characters +
+
+ + + + + +
+ +
+
-
- -
- -
- -
-
- - -
- -
- -
-
- - -
- -
- - Max: 2000 characters -
-
- - - - - -
- -
-
-
+
\ No newline at end of file diff --git a/app/plugins/messages/models/message.php b/app/plugins/messages/models/message.php index 6236fd2..a9277a2 100644 --- a/app/plugins/messages/models/message.php +++ b/app/plugins/messages/models/message.php @@ -259,7 +259,9 @@ class Message extends DatabaseModel { } $messageOut['fromAvatar'] = self::$user->getAvatar( $message->userFrom ); $messageOut['userTo'] = self::$user->getUsername( $message->userTo ); + $messageOut['userToPretty'] = \ucfirst( $messageOut['userTo'] ); $messageOut['userFrom'] = self::$user->getUsername( $message->userFrom ); + $messageOut['userFromPretty'] = \ucfirst( $messageOut['userFrom'] ); $out[] = (object) $messageOut; if ( !empty( $end ) ) { $out = $out[0]; diff --git a/app/plugins/messages/views/create.html b/app/plugins/messages/views/create.html index d1cd308..f680f0f 100644 --- a/app/plugins/messages/views/create.html +++ b/app/plugins/messages/views/create.html @@ -1,57 +1,73 @@ -
-
-
-
- New Message -
- -
- -
- +
+
+ +
+
+ + New Message +
+ +
+ +
+ +
-
- - -
- -
- + + +
+ +
+ +
+ + +
+ + +
+
+ +
+
- - -
- - -
- - - -
+ +
-
+
\ No newline at end of file diff --git a/app/plugins/messages/views/inbox.html b/app/plugins/messages/views/inbox.html index 71b1c34..2194b7b 100644 --- a/app/plugins/messages/views/inbox.html +++ b/app/plugins/messages/views/inbox.html @@ -1,14 +1,14 @@

Inbox

- +
- - - - + + + - + @@ -16,11 +16,11 @@ {LOOP} - - - - - + + + + + @@ -35,5 +35,6 @@ {/ALT}
FromSubjectLast ReplyFromSubjectLast Reply +
{userFrom}{subject}{DTC}{lastReply}{/DTC}Mark as readDelete{userFromPretty}{subject}{DTC date}{lastReply}{/DTC}
- New message + + New message
diff --git a/app/plugins/messages/views/index.html b/app/plugins/messages/views/index.html index f35bcad..7d4b30a 100644 --- a/app/plugins/messages/views/index.html +++ b/app/plugins/messages/views/index.html @@ -1,8 +1,10 @@ -
-
- {message_inbox} -
-
- {message_outbox} +
+
+
+ {message_inbox} +
+
+ {message_outbox} +
\ No newline at end of file diff --git a/app/plugins/messages/views/mesage.html b/app/plugins/messages/views/mesage.html deleted file mode 100644 index e076f5b..0000000 --- a/app/plugins/messages/views/mesage.html +++ /dev/null @@ -1,43 +0,0 @@ -
-
-
-
- {LOOP} - {SINGLE} -
-

{subject}

-
- {/SINGLE} -
-
-
- {userFrom}
- User Pic -
-
- - - - -
{message}
-
-
-
-
- {ADMIN} - {ID} - - {DTC}{sent}{/DTC} - - {/ADMIN} -
- {/LOOP} -
-
- - - -
-
-
-
\ No newline at end of file diff --git a/app/plugins/messages/views/message.html b/app/plugins/messages/views/message.html index 919a748..628e76b 100644 --- a/app/plugins/messages/views/message.html +++ b/app/plugins/messages/views/message.html @@ -1,37 +1,53 @@ -
-
-
- {LOOP} - {SINGLE} -
-
{subject}
+
+
+ +
+ {LOOP} + {SINGLE} +
+

{subject}

+
+ {/SINGLE} +
+
+
+ {userFromPretty}
+ User Pic
- {/SINGLE} -
-
-
- {userFrom}
- User Pic -
-
- {message} -
+
+ {message}
-
- {ADMIN} - {ID} - +
+
+ {ADMIN} +
+
+ {ID} +
+
{DTC}{sent}{/DTC} - - {/ADMIN} -
- {/LOOP} -
-
- - - -
+
+
+ {/ADMIN} +
+ {/LOOP}
+
+ + + +
+
\ No newline at end of file diff --git a/app/plugins/messages/views/nav/recentMessagesDropdown.html b/app/plugins/messages/views/nav/recentMessagesDropdown.html index c89a2e8..f7ea71e 100644 --- a/app/plugins/messages/views/nav/recentMessagesDropdown.html +++ b/app/plugins/messages/views/nav/recentMessagesDropdown.html @@ -1,4 +1,4 @@ -
+
Outbox
- +
@@ -15,10 +15,10 @@ {LOOP} - - + + - + @@ -33,5 +33,5 @@ {/ALT}
To
{userTo}{subject}{userToPretty}{subject} {DTC date}{sent}{/DTC}Delete
- +
\ No newline at end of file diff --git a/app/plugins/messages/views/reply.html b/app/plugins/messages/views/reply.html index e3abe02..289a1a5 100644 --- a/app/plugins/messages/views/reply.html +++ b/app/plugins/messages/views/reply.html @@ -1,5 +1,5 @@
-
+ Reply
diff --git a/app/plugins/notifications/views/admin/send.html b/app/plugins/notifications/views/admin/send.html index 57fbda4..d8a35e7 100644 --- a/app/plugins/notifications/views/admin/send.html +++ b/app/plugins/notifications/views/admin/send.html @@ -2,8 +2,7 @@ Send Notification
{ADMIN_BREADCRUMBS} - - +
diff --git a/app/plugins/notifications/views/list.html b/app/plugins/notifications/views/list.html index 631c3c0..6f059ff 100644 --- a/app/plugins/notifications/views/list.html +++ b/app/plugins/notifications/views/list.html @@ -1,4 +1,6 @@ -
+ +
+
Notifications @@ -26,7 +28,7 @@ {/LOOP} {ALT} - + No Notifications @@ -35,4 +37,5 @@
+
\ No newline at end of file diff --git a/app/plugins/notifications/views/nav/recentNotificationsDropdown.html b/app/plugins/notifications/views/nav/recentNotificationsDropdown.html index f3f0648..ff333db 100644 --- a/app/plugins/notifications/views/nav/recentNotificationsDropdown.html +++ b/app/plugins/notifications/views/nav/recentNotificationsDropdown.html @@ -1,5 +1,5 @@ -
+
Add Subscriber
{ADMIN_BREADCRUMBS} - +
diff --git a/app/plugins/subscribe/views/footer/right.html b/app/plugins/subscribe/views/footer/right.html index 3644978..fa833b8 100644 --- a/app/plugins/subscribe/views/footer/right.html +++ b/app/plugins/subscribe/views/footer/right.html @@ -1,7 +1,7 @@ -
+
Subscribe
-
- +
+ diff --git a/app/plugins/subscribe/views/subscribe.html b/app/plugins/subscribe/views/subscribe.html index cbb3203..90798db 100644 --- a/app/plugins/subscribe/views/subscribe.html +++ b/app/plugins/subscribe/views/subscribe.html @@ -1,4 +1,4 @@ - +
diff --git a/app/plugins/subscribe/views/unsubscribe.html b/app/plugins/subscribe/views/unsubscribe.html index dd4041d..9d231ad 100644 --- a/app/plugins/subscribe/views/unsubscribe.html +++ b/app/plugins/subscribe/views/unsubscribe.html @@ -1,4 +1,4 @@ - +
diff --git a/app/templates/admin/admin.inc.php b/app/templates/admin/admin.inc.php index 1a0fa59..07bdb7e 100644 --- a/app/templates/admin/admin.inc.php +++ b/app/templates/admin/admin.inc.php @@ -44,6 +44,11 @@ class AdminLoader extends DefaultLoader { $menu = Views::simpleView( 'nav.admin', $links ); $activeMenu = Navigation::activePageSelect( $menu, Input::get( 'url' ), false, true ); Components::set( 'ADMIN_LINKS', $activeMenu ); + + $menu = Views::simpleView( 'nav.adminTop', Navigation::getMenuLinks( App::MAIN_MENU_NAME ) ); + $activeMenu = Navigation::activePageSelect( $menu, Input::get( 'url' ), false, true ); + Components::set( 'topNavLeft', $activeMenu ); + Navigation::setCrumbComponent( 'ADMIN_BREADCRUMBS', Input::get( 'url' ) ); } } diff --git a/app/templates/admin/admin.tpl b/app/templates/admin/admin.tpl index 6decfa7..9e48eee 100644 --- a/app/templates/admin/admin.tpl +++ b/app/templates/admin/admin.tpl @@ -45,7 +45,7 @@
-
+
{topNavLeft}
diff --git a/app/templates/default/default.inc.php b/app/templates/default/default.inc.php index 6232f97..6597d3d 100644 --- a/app/templates/default/default.inc.php +++ b/app/templates/default/default.inc.php @@ -73,9 +73,11 @@ class DefaultLoader extends Loader { $this->addCss( '' ); } Components::set( 'topNavRight', Template::parse( App::$topNavRight . '{STATUS}' ) ); + $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/templates/default/default.tpl b/app/templates/default/default.tpl index 2be042f..a76f00b 100644 --- a/app/templates/default/default.tpl +++ b/app/templates/default/default.tpl @@ -39,20 +39,45 @@ -
-
-
- {SITENAME} Logo - - {SITENAME} - - {topNavLeft} -
- {topNavRight} -
-
-
-
+
+
+
+ + + + + {SITENAME} Logo + + + + + {SITENAME} Logo + + +
+ +
+ + +
+
+
+
diff --git a/app/views/about.html b/app/views/about.html index 6a1a1c9..14f7598 100644 --- a/app/views/about.html +++ b/app/views/about.html @@ -1,16 +1,27 @@ -
-

About {SITENAME}

-

- {SITENAME} was built out of a need to create and manage my own web applications. -

-

- Right now, this entire system was built and managed by myself. As stated, I have used my own version of this for years, but translating it to a publicly available product is not a 1-to-1 job. There may be bugs or issues encountered while you use the product. I can't guarantee a fix for every need in every case immediately, but I do actively keep track of bugs and work hard to ensure everyone has a great experience using the app. -

-

- If you encounter any bugs, feel free to report them here. Likewise, there are forms for feedback, reviews, suggestions, and a general contact form. Thanks for taking the time to check out the product! -

-
- {loggedin}Report a Bug{/loggedin} - Contact Us +
+
+

About {SITENAME}

+

+ {SITENAME} was built out of a need to create and manage web applications. + At the time, I had used wordpress but I didn't want or even need any of the blog functionality. + No matter what plugins you add, no matter how you customize layout, wordpress is still a blog at its core. + There is nothing inherently wrong with a blog, but when you start from a blog, everything is a post, or a plugin. + Under the hood, wordpress is going to run how wordpress wants, as a web interface for accessing text records. +

+

+ The Tempus Project was always intended to be a web application, not a blog. +

+

+ Right now, this entire system was built and managed by myself. As stated, I have used my own version of this for years, but translating it to a publicly available product is not a 1-to-1 job. There may be bugs or issues encountered while you use the product. I can't guarantee a fix for every need in every case immediately, but I do actively keep track of bugs and work hard to ensure everyone has a great experience using the app. +

+

+ If you encounter any bugs, feel free to report them here. Likewise, there are forms for feedback, reviews, suggestions, and a general contact form. Thanks for taking the time to check out the product! +

+
+ {loggedin} + Report a Bug + {/loggedin} + Contact Us +
\ No newline at end of file diff --git a/app/views/admin/contact.html b/app/views/admin/contact.html index a2f0e50..d9a4e97 100644 --- a/app/views/admin/contact.html +++ b/app/views/admin/contact.html @@ -7,7 +7,7 @@ Please be very careful with this feature. This form allows you to send an email (formatted within the default site email template) to registered emails from various sources including newsletter subscribers, call to action subscribers, and all registered user accounts.

- +
diff --git a/app/views/admin/settings.html b/app/views/admin/settings.html index 08fa990..5e858f2 100644 --- a/app/views/admin/settings.html +++ b/app/views/admin/settings.html @@ -2,7 +2,7 @@ Settings
{ADMIN_BREADCRUMBS} - +
{configForm} diff --git a/app/views/admin/tokens/create.html b/app/views/admin/tokens/create.html index c496486..c219b3d 100644 --- a/app/views/admin/tokens/create.html +++ b/app/views/admin/tokens/create.html @@ -3,7 +3,7 @@ Create Token
{ADMIN_BREADCRUMBS} - +
diff --git a/app/views/admin/tokens/edit.html b/app/views/admin/tokens/edit.html index b2f36b3..39fab09 100644 --- a/app/views/admin/tokens/edit.html +++ b/app/views/admin/tokens/edit.html @@ -3,7 +3,7 @@ Edit Token
{ADMIN_BREADCRUMBS} - +
diff --git a/app/views/admin/users/edit.html b/app/views/admin/users/edit.html index eb93fc1..8ab31ca 100644 --- a/app/views/admin/users/edit.html +++ b/app/views/admin/users/edit.html @@ -34,7 +34,7 @@
- +
@@ -42,7 +42,7 @@
- +
diff --git a/app/views/admin/users/list.html b/app/views/admin/users/list.html index bcacc1c..79110bd 100644 --- a/app/views/admin/users/list.html +++ b/app/views/admin/users/list.html @@ -20,7 +20,7 @@ {LOOP} {ID} - {username} + {usernamePretty} {DTC date}{registered}{/DTC} diff --git a/app/views/admin/users/view.html b/app/views/admin/users/view.html index ff7c04b..432b75b 100644 --- a/app/views/admin/users/view.html +++ b/app/views/admin/users/view.html @@ -5,7 +5,7 @@
-

{username}

+

{usernamePretty}

@@ -27,7 +27,7 @@ Group: - {groupName} + {groupName} {/ADMIN} @@ -45,7 +45,7 @@ {ADMIN} Email: - {email} + {email} User ID: diff --git a/app/views/confirmation.html b/app/views/auth/confirmation.html similarity index 92% rename from app/views/confirmation.html rename to app/views/auth/confirmation.html index e1426c8..1dfa5fb 100644 --- a/app/views/confirmation.html +++ b/app/views/auth/confirmation.html @@ -3,7 +3,7 @@

Email Confirmation

Please enter the confirmation code you received in your email.

- +
@@ -12,4 +12,4 @@
-
\ No newline at end of file +
\ No newline at end of file diff --git a/app/views/confirmation_resend.html b/app/views/auth/confirmation_resend.html similarity index 92% rename from app/views/confirmation_resend.html rename to app/views/auth/confirmation_resend.html index d5e3d5f..1a105af 100644 --- a/app/views/confirmation_resend.html +++ b/app/views/auth/confirmation_resend.html @@ -2,7 +2,7 @@

Re-Send Confirmation

Please click the resend button to resend your email confirmation. Don't forget to check the spam folder!

-
+
diff --git a/app/views/forgot.html b/app/views/auth/forgot.html similarity index 95% rename from app/views/forgot.html rename to app/views/auth/forgot.html index 99dc34e..9308235 100644 --- a/app/views/forgot.html +++ b/app/views/auth/forgot.html @@ -1,5 +1,5 @@
- + Lost and Found

You can begin the process of recovering your account here. Provide your username, or email address and instructions for ressetting your password will be mailed to you shortly.

diff --git a/app/views/login.html b/app/views/auth/login.html similarity index 100% rename from app/views/login.html rename to app/views/auth/login.html diff --git a/app/views/password_reset.html b/app/views/auth/password_reset.html similarity index 95% rename from app/views/password_reset.html rename to app/views/auth/password_reset.html index 9c61e86..372772b 100644 --- a/app/views/password_reset.html +++ b/app/views/auth/password_reset.html @@ -2,7 +2,7 @@

Change Password

Please enter the confirmation code you received in your email.

- +
diff --git a/app/views/password_reset_code.html b/app/views/auth/password_reset_code.html similarity index 94% rename from app/views/password_reset_code.html rename to app/views/auth/password_reset_code.html index d3abd84..b4742a2 100644 --- a/app/views/password_reset_code.html +++ b/app/views/auth/password_reset_code.html @@ -2,7 +2,7 @@

Change Password

Please enter the code you received in your email. If you did not receive the code, please check your spam filter or click here to request a new reset code.

- +
diff --git a/app/views/auth/register.html b/app/views/auth/register.html new file mode 100644 index 0000000..9fec3f3 --- /dev/null +++ b/app/views/auth/register.html @@ -0,0 +1,76 @@ + + + + + + + + + +
+

Create an Account

+ +
+ +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+ +
+ +
+
+ + +
+
+ + +
+
+ {TERMS} +
+
+ + + + + +
+ +
+
+ +
\ No newline at end of file diff --git a/app/views/terms.html b/app/views/auth/terms.html similarity index 100% rename from app/views/terms.html rename to app/views/auth/terms.html diff --git a/app/views/contact.html b/app/views/contact.html deleted file mode 100644 index e69de29..0000000 diff --git a/app/views/copy.html b/app/views/copy.html deleted file mode 100644 index ea124f3..0000000 --- a/app/views/copy.html +++ /dev/null @@ -1,5 +0,0 @@ -
-
-

Powered by The Tempus Project.

-
-
\ No newline at end of file diff --git a/app/views/footer/center.html b/app/views/footer/center.html index d934eed..ed9acd4 100644 --- a/app/views/footer/center.html +++ b/app/views/footer/center.html @@ -1,4 +1,4 @@ -
+
More Info
    {LOOP} diff --git a/app/views/footer/container.html b/app/views/footer/container.html index 9e6cdb1..8633997 100644 --- a/app/views/footer/container.html +++ b/app/views/footer/container.html @@ -1,11 +1,23 @@ -
    +