From f3f323d30f77b102c19966b29d08ede4557c882b Mon Sep 17 00:00:00 2001 From: Joey Kimsey Date: Tue, 10 Dec 2024 01:46:00 -0500 Subject: [PATCH] update to bootstrap 5.2.3 continued --- app/classes/plugin.php | 11 +- app/css/main.css | 120 +++++++++++++++++- app/plugins/blog/plugin.php | 2 +- app/plugins/bugreport/plugin.php | 2 +- app/plugins/feedback/plugin.php | 2 +- app/plugins/messages/plugin.php | 3 +- .../views/nav/recentMessagesDropdown.html | 13 +- app/plugins/notifications/plugin.php | 2 +- .../nav/recentNotificationsDropdown.html | 12 +- app/plugins/subscribe/plugin.php | 6 +- app/plugins/subscribe/views/footer/right.html | 29 ++--- app/resources/plugin.php | 9 +- app/templates/default/default.inc.php | 12 +- app/templates/default/default.tpl | 48 +++---- app/views/footer/center.html | 15 +-- app/views/footer/container.html | 40 ++---- app/views/footer/copy.html | 1 + app/views/footer/left.html | 11 +- app/views/footer/right.html | 19 +-- app/views/footer/social.html | 27 ++++ app/views/nav/main.html | 6 +- app/views/nav/statusLoggedIn.html | 19 ++- bin/tempus_project.php | 25 +++- 23 files changed, 279 insertions(+), 155 deletions(-) create mode 100644 app/views/footer/copy.html create mode 100644 app/views/footer/social.html diff --git a/app/classes/plugin.php b/app/classes/plugin.php index 8fed33e..76b1c67 100644 --- a/app/classes/plugin.php +++ b/app/classes/plugin.php @@ -335,9 +335,14 @@ class Plugin { } public function loadFooterNav() { - if ( !empty( $this->footer_links ) ) { - foreach( $this->footer_links as $key => $link ) { - Navigation::addLink( App::FOOTER_MENU_NAME, $link ); + if ( !empty( $this->contact_footer_links ) ) { + foreach( $this->contact_footer_links as $key => $link ) { + Navigation::addLink( App::CONTACT_FOOTER_MENU_NAME, $link ); + } + } + if ( !empty( $this->info_footer_links ) ) { + foreach( $this->info_footer_links as $key => $link ) { + Navigation::addLink( App::INFO_FOOTER_MENU_NAME, $link ); } } } diff --git a/app/css/main.css b/app/css/main.css index b048703..593bf0a 100644 --- a/app/css/main.css +++ b/app/css/main.css @@ -13,16 +13,10 @@ html { position: relative; min-height: 100%; } -body { - margin-top: 100px; -} pre { white-space: pre-wrap; } @media ( min-width: 768px ) { - body { - margin-top: 75px; - } .main { padding-right: 40px; padding-left: 40px; @@ -578,4 +572,118 @@ ul.alert-dropdown { .material-switch > input[type="checkbox"]:checked + label::after { background: inherit; left: 20px; +} + +body { + background-image: linear-gradient(180deg, #eee, #fff 100px, #fff); +} +@media (min-width: 768px) { + .bd-placeholder-img-lg { + font-size: 3.5rem; + } +} +.pricing-header { + max-width: 700px; +} +.pricing-container { + max-width: 960px; +} +.bd-placeholder-img { + font-size: 1.125rem; + text-anchor: middle; + -webkit-user-select: none; + -moz-user-select: none; + user-select: none; +} +.b-example-vr { + flex-shrink: 0; + width: 1.5rem; + height: 100vh; +} +.bi { + vertical-align: -.125em; + fill: currentColor; +} +.form-control-dark { + border-color: var(--bs-gray); +} +.form-control-dark:focus { + border-color: #fff; + box-shadow: 0 0 0 .25rem rgba(255, 255, 255, .25); +} +.text-small { + font-size: 85%; +} +.dropdown-toggle { + outline: 0; +} +.b-example-divider { + height: 3rem; + background-color: rgba(0, 0, 0, .1); + border: solid rgba(0, 0, 0, .15); + border-width: 1px 0; + box-shadow: inset 0 .5em 1.5em rgba(0, 0, 0, .1), inset 0 .125em .5em rgba(0, 0, 0, .15); +} +.b-example-vr { + flex-shrink: 0; + width: 1.5rem; + height: 100vh; +} +.nav-scroller { + position: relative; + z-index: 2; + height: 2.75rem; + overflow-y: hidden; +} +.nav-scroller .nav { + display: flex; + flex-wrap: nowrap; + padding-bottom: 1rem; + margin-top: -1px; + overflow-x: auto; + text-align: center; + white-space: nowrap; + -webkit-overflow-scrolling: touch; +} +.b-example-vr { + flex-shrink: 0; + width: 1.5rem; + height: 100vh; +} +.feature-icon { + width: 4rem; + height: 4rem; + border-radius: .75rem; +} +.icon-link > .bi { + margin-top: .125rem; + margin-left: .125rem; + fill: currentcolor; + transition: transform .25s ease-in-out; +} +.icon-link:hover > .bi { + transform: translate(.25rem); +} +.icon-square { + width: 3rem; + height: 3rem; + border-radius: .75rem; +} +.text-shadow-1 { + text-shadow: 0 .125rem .25rem rgba(0, 0, 0, .25); +} +.text-shadow-2 { + text-shadow: 0 .25rem .5rem rgba(0, 0, 0, .25); +} +.text-shadow-3 { + text-shadow: 0 .5rem 1.5rem rgba(0, 0, 0, .25); +} +.card-cover { + background-repeat: no-repeat; + background-position: center center; + background-size: cover; +} +.feature-icon-small { + width: 3rem; + height: 3rem; } \ No newline at end of file diff --git a/app/plugins/blog/plugin.php b/app/plugins/blog/plugin.php index dd90d1b..de83c57 100644 --- a/app/plugins/blog/plugin.php +++ b/app/plugins/blog/plugin.php @@ -32,7 +32,7 @@ class Blog extends Plugin { 'url' => '{ROOT_URL}admin/blog', ], ]; - public $footer_links = [ + public $info_footer_links = [ [ 'text' => 'Blog', 'url' => '{ROOT_URL}blog/index', diff --git a/app/plugins/bugreport/plugin.php b/app/plugins/bugreport/plugin.php index 3ac70ea..0ed29b0 100644 --- a/app/plugins/bugreport/plugin.php +++ b/app/plugins/bugreport/plugin.php @@ -49,7 +49,7 @@ class Bugreport extends Plugin { 'default' => false, ], ]; - public $footer_links = [ + public $contact_footer_links = [ [ 'text' => 'Bug Report', 'url' => '{ROOT_URL}bugreport', diff --git a/app/plugins/feedback/plugin.php b/app/plugins/feedback/plugin.php index cd4e3c7..bde7ba4 100644 --- a/app/plugins/feedback/plugin.php +++ b/app/plugins/feedback/plugin.php @@ -45,7 +45,7 @@ class Feedback extends Plugin { 'default' => false, ], ]; - public $footer_links = [ + public $contact_footer_links = [ [ 'text' => 'Feedback', 'url' => '{ROOT_URL}feedback', diff --git a/app/plugins/messages/plugin.php b/app/plugins/messages/plugin.php index 15b17d7..13624ef 100644 --- a/app/plugins/messages/plugin.php +++ b/app/plugins/messages/plugin.php @@ -48,9 +48,8 @@ class Messages extends Plugin { } else { Components::set( 'RECENT_MESSAGES', '' ); } - App::$topNavRight .= '{RECENT_MESSAGES}'; - App::$topNavRightDropdown .= '
  • Inbox {MBADGE}
    • '; + App::$topNavRightDropdown .= '
  • Inbox {MBADGE}
    • '; self::$loaded = true; } parent::__construct(); diff --git a/app/plugins/messages/views/nav/recentMessagesDropdown.html b/app/plugins/messages/views/nav/recentMessagesDropdown.html index 7cd7f31..f353853 100644 --- a/app/plugins/messages/views/nav/recentMessagesDropdown.html +++ b/app/plugins/messages/views/nav/recentMessagesDropdown.html @@ -1,15 +1,14 @@ -
  • +
    -
    \ No newline at end of file diff --git a/app/plugins/notifications/plugin.php b/app/plugins/notifications/plugin.php index ea35a37..c1833d2 100644 --- a/app/plugins/notifications/plugin.php +++ b/app/plugins/notifications/plugin.php @@ -56,7 +56,7 @@ class Notifications extends Plugin { Components::set( 'recentNotifications', '' ); } App::$topNavRight .= '{recentNotifications}'; - App::$topNavRightDropdown .= '
  • Notifications {NBADGE}
    • '; + App::$topNavRightDropdown .= '
  • Notifications {NBADGE}
    • '; self::$loaded = true; } } diff --git a/app/plugins/notifications/views/nav/recentNotificationsDropdown.html b/app/plugins/notifications/views/nav/recentNotificationsDropdown.html index 507d892..c630da2 100644 --- a/app/plugins/notifications/views/nav/recentNotificationsDropdown.html +++ b/app/plugins/notifications/views/nav/recentNotificationsDropdown.html @@ -1,14 +1,14 @@ -
  • +
    -
    \ No newline at end of file diff --git a/app/plugins/subscribe/plugin.php b/app/plugins/subscribe/plugin.php index e95d34e..b6a023b 100644 --- a/app/plugins/subscribe/plugin.php +++ b/app/plugins/subscribe/plugin.php @@ -21,6 +21,7 @@ use TheTempusProject\Houdini\Classes\Views; use TheTempusProject\TheTempusProject as App; class Subscribe extends Plugin { + private static $loaded = false; public $pluginName = 'TP Subscribe'; public $pluginAuthor = 'JoeyK'; public $pluginWebsite = 'https://TheTempusProject.com'; @@ -36,6 +37,9 @@ class Subscribe extends Plugin { public function __construct( $load = false ) { parent::__construct( $load ); - Components::set( 'FOOTER_RIGHT', Views::simpleView( 'subscribe.footer.right') ); + if ( ! self::$loaded ) { + Components::append( 'FOOTER_RIGHT', Views::simpleView( 'subscribe.footer.right') ); + self::$loaded = true; + } } } diff --git a/app/plugins/subscribe/views/footer/right.html b/app/plugins/subscribe/views/footer/right.html index 70302b7..8a5c7ba 100644 --- a/app/plugins/subscribe/views/footer/right.html +++ b/app/plugins/subscribe/views/footer/right.html @@ -1,18 +1,13 @@ -
    -

    Subscribe

    -
      -
    • - -
      • -
    -
    - - -
    +
    +
    +
    Subscribe to our newsletter
    +
    + + + + + + +
    +
    \ No newline at end of file diff --git a/app/resources/plugin.php b/app/resources/plugin.php index 9a7f4d8..72bd393 100644 --- a/app/resources/plugin.php +++ b/app/resources/plugin.php @@ -71,7 +71,7 @@ class notrealplugin extends forealthoughModel { 'draft' => 0, ], ]; - public $footer_links = [ + public $contact_footer_links = [ [ 'text' => 'Bug Report', 'url' => '{ROOT_URL}bugreport', @@ -82,8 +82,11 @@ class notrealplugin extends forealthoughModel { if ( true === self::$initialized || !Installer::pluginEnabled( $reflect->getShortName() ) ) { return; } - foreach ( $this->footer_links as $key => $link ) { - Navigation::addLink( App::FOOTER_MENU_NAME, $link ); + foreach ( $this->contact_footer_links as $key => $link ) { + Navigation::addLink( App::CONTACT_FOOTER_MENU_NAME, $link ); + } + foreach ( $this->info_footer_links as $key => $link ) { + Navigation::addLink( App::INFO_MENU_NAME, $link ); } foreach ( $this->main_links as $key => $link ) { Navigation::addLink( App::MAIN_MENU_NAME, $link ); diff --git a/app/templates/default/default.inc.php b/app/templates/default/default.inc.php index 88081bd..1e2cdc3 100644 --- a/app/templates/default/default.inc.php +++ b/app/templates/default/default.inc.php @@ -41,11 +41,12 @@ class DefaultLoader extends Loader { $this->addCss( '' ); $this->addJs( '' ); Components::setIfNull( 'LOGO', Config::getValue( 'main/logo' ) ); - Components::setIfNull( 'FOOTER_LEFT', Navigation::getMenuView( 'footer.left', 'FOOTER_LINKS', App::FOOTER_MENU_NAME, false ) ); - Components::setIfNull( 'FOOTER_CENTER', Views::simpleView( 'footer.center') ); - Components::setIfNull( 'FOOTER_RIGHT', Views::simpleView( 'footer.right') ); + Components::setIfNull( 'COPY', Views::simpleView( 'footer.copy') ); + Components::setIfNull( 'SOCIAL', Views::simpleView( 'footer.social') ); + Components::prepend( 'FOOTER_LEFT', Views::simpleView( 'footer.left', Navigation::getMenuLinks( App::CONTACT_FOOTER_MENU_NAME ) ) ); + Components::prepend( 'FOOTER_CENTER', Views::simpleView( 'footer.center', Navigation::getMenuLinks( App::INFO_FOOTER_MENU_NAME ) ) ); + Components::prepend( 'FOOTER_RIGHT', Views::simpleView( 'footer.right') ); Components::setIfNull( 'FOOT', Views::simpleView( 'footer.container') ); - Components::setIfNull( 'COPY', Views::simpleView( 'copy') ); /** * Top-Nav */ @@ -57,8 +58,7 @@ class DefaultLoader extends Loader { Components::set( 'STATUS', Views::simpleView( 'nav.statusLoggedOut' ) ); } Components::set( 'topNavRight', Template::parse( App::$topNavRight . '{STATUS}' ) ); - Components::set( 'topNavLeft', Navigation::getMenuView( 'nav.main', 'MENU_LINKS', App::MAIN_MENU_NAME ) ); - + Components::set( 'topNavLeft', Views::simpleView( 'nav.main', Navigation::getMenuLinks( App::MAIN_MENU_NAME ) ) ); 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 e564b98..dd7d2ef 100644 --- a/app/templates/default/default.tpl +++ b/app/templates/default/default.tpl @@ -29,36 +29,29 @@ {ROBOT} - + + {TEMPLATE_CSS_INCLUDES} - -
    +
    + {topNavRight} +
    +
    +
    + +
    {ISSUES}
    @@ -70,13 +63,10 @@
    {/ISSUES}
    - {CONTENT} + {CONTENT}
    -
    - {FOOT} - {COPY} -
    + {FOOT} diff --git a/app/views/footer/center.html b/app/views/footer/center.html index 49675e3..435eda4 100644 --- a/app/views/footer/center.html +++ b/app/views/footer/center.html @@ -1,9 +1,8 @@ -
    - +
    +
    More Info
    +
      + {LOOP} +
    • {text}
      • + {/LOOP} +
    \ No newline at end of file diff --git a/app/views/footer/container.html b/app/views/footer/container.html index dc1f4f8..f59846a 100644 --- a/app/views/footer/container.html +++ b/app/views/footer/container.html @@ -1,27 +1,15 @@ - +
    +
    +
    + {FOOTER_LEFT} + {FOOTER_CENTER} + {FOOTER_RIGHT} +
    + +
    + {COPY} + {SOCIAL} +
    +
    +
    \ No newline at end of file diff --git a/app/views/footer/copy.html b/app/views/footer/copy.html new file mode 100644 index 0000000..77642e3 --- /dev/null +++ b/app/views/footer/copy.html @@ -0,0 +1 @@ +

    © 2024 AllTheBookmarks, Powered by The Tempus Project.

    \ No newline at end of file diff --git a/app/views/footer/left.html b/app/views/footer/left.html index d4e7db6..0450ad9 100644 --- a/app/views/footer/left.html +++ b/app/views/footer/left.html @@ -1,7 +1,8 @@ - -
    -

    Contact

    -
      - {FOOTER_LINKS} +
      +
      Contact Us
      +
      \ No newline at end of file diff --git a/app/views/footer/right.html b/app/views/footer/right.html index 18e85b8..d9df4db 100644 --- a/app/views/footer/right.html +++ b/app/views/footer/right.html @@ -1,19 +1,6 @@ - -
      -

      Information

      - -
      - +
      +
      +
      \ No newline at end of file diff --git a/app/views/footer/social.html b/app/views/footer/social.html new file mode 100644 index 0000000..bb34bad --- /dev/null +++ b/app/views/footer/social.html @@ -0,0 +1,27 @@ + \ No newline at end of file diff --git a/app/views/nav/main.html b/app/views/nav/main.html index 71aecbf..11988cf 100644 --- a/app/views/nav/main.html +++ b/app/views/nav/main.html @@ -1,3 +1,5 @@ -
        - {MENU_LINKS} + \ No newline at end of file diff --git a/app/views/nav/statusLoggedIn.html b/app/views/nav/statusLoggedIn.html index 5f5be68..9ac991d 100644 --- a/app/views/nav/statusLoggedIn.html +++ b/app/views/nav/statusLoggedIn.html @@ -1,21 +1,20 @@ -
      • +
        -
        \ No newline at end of file diff --git a/bin/tempus_project.php b/bin/tempus_project.php index 2415298..45ab2bb 100644 --- a/bin/tempus_project.php +++ b/bin/tempus_project.php @@ -41,7 +41,8 @@ use TheTempusProject\Models\Routes as RoutesModel; class TheTempusProject extends Bedrock { const MAIN_MENU_NAME = 'topNavLeft'; const ADMIN_MENU_NAME = 'adminMenu'; - const FOOTER_MENU_NAME = 'footerMenu'; + const CONTACT_FOOTER_MENU_NAME = 'contactFooterMenu'; + const INFO_FOOTER_MENU_NAME = 'infoFooterMenu'; public static $plugins = []; public static $activeGroup; public static $activePerms; @@ -55,7 +56,20 @@ class TheTempusProject extends Bedrock { public static $isAdmin = false; public static $isMod = false; private $initialized = false; - public $footer_links = [ + public $contact_footer_links = []; + public $info_footer_links = [ + [ + 'text' => 'FAQs', + 'url' => '{ROOT_URL}home/terms', + ], + [ + 'text' => 'About', + 'url' => '{ROOT_URL}home/terms', + ], + [ + 'text' => 'Privacy Policy', + 'url' => '{ROOT_URL}home/terms', + ], [ 'text' => 'Terms of Service', 'url' => '{ROOT_URL}home/terms', @@ -480,8 +494,11 @@ class TheTempusProject extends Bedrock { } public function loadLinks() { - foreach ( $this->footer_links as $key => $link ) { - Navigation::addLink( self::FOOTER_MENU_NAME, $link ); + foreach ( $this->contact_footer_links as $key => $link ) { + Navigation::addLink( self::CONTACT_FOOTER_MENU_NAME, $link ); + } + foreach ( $this->info_footer_links as $key => $link ) { + Navigation::addLink( self::INFO_FOOTER_MENU_NAME, $link ); } foreach ( $this->main_links as $key => $link ) { Navigation::addLink( self::MAIN_MENU_NAME, $link );