diff --git a/app/classes/preferences.php b/app/classes/preferences.php index 958f0bc..6b840f0 100644 --- a/app/classes/preferences.php +++ b/app/classes/preferences.php @@ -200,13 +200,13 @@ class Preferences { foreach ( self::$preferences as $name => $details ) { $tempPrefsArray = $this->normalizePreferenceArray( $name, $details ); if ( isset( $populated[ $name ] ) ) { - $tempPrefsArray['default'] = $populated[$name]; + $tempPrefsArray['value'] = $populated[$name]; } // $form .= Forms::getFormFieldHtml( $name, $tempPrefsArray['pretty'], $tempPrefsArray['type'], $tempPrefsArray['default'], $tempPrefsArray['options'] ); if ( $tempPrefsArray['type'] == 'checkbox' ) { $tempPrefsArray['type'] = 'switch'; } - $inputTypes[ $tempPrefsArray['type'] ][] = self::getFormFieldHtml( $name, $tempPrefsArray['pretty'], $tempPrefsArray['type'], $tempPrefsArray['default'], $tempPrefsArray['options'] ); + $inputTypes[ $tempPrefsArray['type'] ][] = self::getFormFieldHtml( $name, $tempPrefsArray['pretty'], $tempPrefsArray['type'], $tempPrefsArray['value'], $tempPrefsArray['options'] ); } foreach ( $inputTypes as $skip => $items ) { $form .= implode( ' ', $items ); diff --git a/app/controllers/home.php b/app/controllers/home.php index b4a7505..447b925 100644 --- a/app/controllers/home.php +++ b/app/controllers/home.php @@ -27,13 +27,13 @@ use TheTempusProject\TheTempusProject as App; class Home extends Controller { public function index() { self::$title = '{SITENAME}'; - self::$pageDescription = 'This is the homepage of your new Tempus Project Installation. Thank you for installing. find more info at https://thetempusproject.com'; + self::$pageDescription = 'AllTheBookmarks.com is here to provide you a better, faster, and easier way - to manage bookmarks across multiple browser and multiple devices seamlessly.'; Views::view( 'index' ); } public function login() { self::$title = 'Portal - {SITENAME}'; - self::$pageDescription = 'Please log in to use {SITENAME} member features.'; + self::$pageDescription = 'Please log in to access all of the great features {SITENAME} has to offer.'; if ( App::$isLoggedIn ) { return Issues::add( 'notice', 'You are already logged in. Please click here to log out.' ); } @@ -69,7 +69,7 @@ class Home extends Controller { public function profile( $id = null ) { self::$title = 'User Profile - {SITENAME}'; - self::$pageDescription = 'User Profiles for {SITENAME}'; + self::$pageDescription = 'User Profile - {SITENAME}'; if ( !App::$isLoggedIn ) { return Issues::add( 'notice', 'You must be logged in to view this page.' ); } @@ -91,26 +91,26 @@ class Home extends Controller { public function about() { self::$title = 'About - {SITENAME}'; - self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.'; + self::$pageDescription = '{SITENAME} was started by a developer with years of industry experience which has lead to a refined no-nonsense tool for everyone. Find out more about us here.'; Views::view( 'about' ); } public function contact() { self::$title = 'Contact Us - {SITENAME}'; - self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.'; + self::$pageDescription = 'On this page, you\'ll be able to reach out to the team directly with any questions, comments, or concerns you may have.'; Views::view( 'contact' ); } public function privacy() { self::$title = 'Privacy Policy - {SITENAME}'; - self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.'; + 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}
' ); } public function faq() { self::$title = 'Frequently Asked Questions - {SITENAME}'; - self::$pageDescription = '{SITENAME} Terms and Conditions of use. Please use {SITENAME} safely.'; + self::$pageDescription = 'Many times, we aren\'t the first to ask why or how something works. Here you will find a list of {SITENAME} commonly asked questions and our best answers.' ; Views::view( 'faq' ); } } diff --git a/app/controllers/register.php b/app/controllers/register.php index f07cb19..275fdc2 100644 --- a/app/controllers/register.php +++ b/app/controllers/register.php @@ -27,6 +27,7 @@ use TheTempusProject\Classes\Forms; class Register extends Controller { public function confirm( $code = null ) { + Template::noIndex(); self::$title = 'Confirm Email'; if ( !isset( $code ) && !Input::exists( 'confirmationCode' ) ) { return Views::view( 'confirmation' ); @@ -43,8 +44,8 @@ class Register extends Controller { } public function index() { - self::$title = 'Register'; - self::$pageDescription = 'Many features of the site are disabled or even hidden from unregistered users. On this page you can sign up for an account to access all the app has to offer.'; + self::$title = '{SITENAME} Sign Up'; + self::$pageDescription = 'Many features of {SITENAME} are disabled or hidden from unregistered users. On this page you can sign up for an account to access all the app has to offer.'; Components::set( 'TERMS', Views::simpleView( 'terms' ) ); if ( App::$isLoggedIn ) { return Issues::add( 'notice', 'You are currently logged in.' ); @@ -94,6 +95,7 @@ class Register extends Controller { public function resend() { self::$title = 'Resend Confirmation'; + Template::noIndex(); if ( !App::$isLoggedIn ) { return Issues::add( 'notice', 'Please log in to resend your confirmation email.' ); } @@ -110,6 +112,7 @@ class Register extends Controller { public function reset( $code = null ) { self::$title = 'Password Reset'; + Template::noIndex(); if ( !isset( $code ) && !Input::exists( 'resetCode' ) ) { Issues::add( 'info', 'Please provide a reset code.' ); return Views::view( 'password_reset_code' ); diff --git a/app/controllers/usercp.php b/app/controllers/usercp.php index 55f7c58..c1c9b15 100644 --- a/app/controllers/usercp.php +++ b/app/controllers/usercp.php @@ -98,7 +98,6 @@ class Usercp extends Controller { $fields = App::$activePrefs; if ( Input::exists( 'submit' ) ) { $fields = $prefs->convertFormToArray( true, false ); - // dv( $fields ); // @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() ] ); diff --git a/app/css/main-dark.css b/app/css/main-dark.css index a13f078..ce195ba 100644 --- a/app/css/main-dark.css +++ b/app/css/main-dark.css @@ -139,4 +139,12 @@ body { .form-control { background-color: #1f1f1f; color: #e0e0e0; +} +.form-control:focus { + color: #e0e0e0; + /* border-color: #85bd3e; */ + border-color: #1b947f; + background-color: #1f1f1f; + /* box-shadow: 0 0 0 .25rem #1b947f; */ + box-shadow: 0 0 0 .25rem #85bd3e; } \ No newline at end of file diff --git a/app/css/main.css b/app/css/main.css index 63f1300..42881ec 100644 --- a/app/css/main.css +++ b/app/css/main.css @@ -8,11 +8,9 @@ * @link https://TheTempusProject.com * @license https://opensource.org/licenses/MIT [MIT LICENSE] */ - - .context-other-bg { +.context-other-bg { background-color: #eaeaea; } - .context-main-bg { background-color: #f7f7f7; @@ -70,14 +68,6 @@ transform: translateX(25px); /* Adjust based on switch width */ } - - - - - - - - .context-main { color: #000; } @@ -92,8 +82,10 @@ html { pre { white-space: pre-wrap; } + body { - background-image: linear-gradient(180deg, #eee, #fff 100px, #fff); + background-color: #e4e4e4; + /* background-image: linear-gradient(180deg, #eee, #fff 100px, #fff); */ } @media ( min-width: 768px ) { .main { @@ -370,3 +362,16 @@ button.atb-green-bg:hover { opacity: 0.7; cursor: move; /* Show a move cursor when dragging */ } + + +.form-switch .form-check-input { + border-color: #1b947f; +} +.form-switch .form-check-input:checked { + border-color: #1b947f; + background-color: #85bd3e; +} +.form-switch .form-check-input:focus { + border-color: #1b947f; + box-shadow: #85bd3e; +} \ No newline at end of file diff --git a/app/plugins/blog/models/posts.php b/app/plugins/blog/models/posts.php index 471f51d..b42c1d9 100644 --- a/app/plugins/blog/models/posts.php +++ b/app/plugins/blog/models/posts.php @@ -131,34 +131,34 @@ class Posts extends DatabaseModel { } $draft = ''; $authorName = self::$user->getUsername( $instance->author ); + $cleanPost = Sanitize::contentShort( $instance->content ); - $postSpace = explode( ' ', $cleanPost ); + $wordsArray = explode( ' ', $cleanPost ); $postLine = explode( "\n", $cleanPost ); - // summary by words: 100 - $spaceSummary = implode( ' ', array_splice( $postSpace, 0, 100 ) ); - // summary by lines: 5 + $spaceSummary = implode( ' ', array_splice( $wordsArray, 0, 100 ) ); $lineSummary = implode( "\n", array_splice( $postLine, 0, 5 ) ); if ( strlen( $spaceSummary ) < strlen( $lineSummary ) ) { + $contentSummaryNoLink = $spaceSummary; $contentSummary = $spaceSummary; - if ( count( $postSpace, 1 ) <= 100 ) { + if ( count( $wordsArray, 1 ) >= 100 ) { $contentSummaryNoLink = $contentSummary; $contentSummary .= '... Read More'; } } else { - // @todo: need to refine this after testing $contentSummaryNoLink = $lineSummary; $contentSummary = $lineSummary . '... Read More'; } + $instance->contentSummaryNoLink = $contentSummaryNoLink; + $instance->contentSummary = $contentSummary; + + if ( isset( $params['stripHtml'] ) && $params['stripHtml'] === true ) { + $instance->contentSummary = strip_tags( $instance->content ); + } if ( $instance->draft != '0' ) { $draft = ' Draft'; } $instance->isDraft = $draft; $instance->authorName = $authorName; - $instance->contentSummaryNoLink = $contentSummaryNoLink; - $instance->contentSummary = $contentSummary; - if ( isset( $params['stripHtml'] ) && $params['stripHtml'] === true ) { - $instance->contentSummary = strip_tags( $instance->content ); - } if ( self::$comments !== false ) { $instance->commentCount = self::$comments->count( 'blog', $instance->ID ); } diff --git a/app/plugins/bookmarks/controllers/bookmarks.php b/app/plugins/bookmarks/controllers/bookmarks.php index c4c36f6..7ebf81a 100644 --- a/app/plugins/bookmarks/controllers/bookmarks.php +++ b/app/plugins/bookmarks/controllers/bookmarks.php @@ -70,6 +70,22 @@ class Bookmarks extends Controller { $this->setPrefToggles(); } + public function tutorials( $browser = '', $tutorial = '' ) { + self::$title = 'Tutorials - {SITENAME}'; + if ( empty( $browser ) && empty( $tutorial ) ) { + return Views::view( 'bookmarks.tutorials.list' ); + } + if ( ! in_array( $browser, ['chrome','brave','firefox','edge','safari','opera'] ) ) { + Issues::add( 'error', 'Unknown browser' ); + return Views::view( 'bookmarks.tutorials.list' ); + } + if ( ! in_array( $tutorial, ['pin','settings','import','export'] ) ) { + Issues::add( 'error', 'Unknown tutorial' ); + return Views::view( 'bookmarks.tutorials.list' ); + } + return Views::view( 'bookmarks.tutorials.' . $browser . '.' . $tutorial ); + } + public function index() { self::$title = 'Manage Bookmarks - {SITENAME}'; if ( Input::exists('submit') ) { @@ -95,8 +111,11 @@ class Bookmarks extends Controller { $panelArray[] = $folderObject; } } - Components::set( 'folderPanels', Views::simpleView( 'bookmarks.components.bookmarkListPanel', $panelArray ) ); - return Views::view( 'bookmarks.dash' ); + if ( ! empty( $folders ) ) { + Components::set( 'folderPanels', Views::simpleView( 'bookmarks.components.bookmarkListPanel', $panelArray ) ); + return Views::view( 'bookmarks.dash' ); + } + return Views::view( 'bookmarks.indexExplainer' ); } /** @@ -564,9 +583,10 @@ class Bookmarks extends Controller { public function dashboards() { self::$title = 'Bookmark Dashboards - {SITENAME}'; + if ( !App::$isMember ) { - Issues::add( 'notice', 'You must have an active membership to manage dashboards.' ); - return $this->index(); + Issues::add( 'notice', 'You will need an active subscription to start creating dashboards. You can check our Pricing page for more details.' ); + return Views::view( 'bookmarks.dashboardExplainer' ); } $dashboards = self::$dashboards->byUser(); return Views::view( 'bookmarks.dashboards.list', $dashboards ); @@ -687,8 +707,8 @@ class Bookmarks extends Controller { public function import() { self::$title = 'Bookmark Import - {SITENAME}'; if ( !App::$isMember ) { - Issues::add( 'notice', 'You must have an active membership to import bookmarks.' ); - return $this->index(); + Issues::add( 'notice', 'You will need an active subscription to start importing bookmarks. You can check our Pricing page for more details.' ); + return Views::view( 'bookmarks.importExplainer' ); } if ( ! Input::exists('submit') ) { @@ -739,8 +759,8 @@ class Bookmarks extends Controller { public function export() { self::$title = 'Bookmark Export - {SITENAME}'; if ( !App::$isMember ) { - Issues::add( 'notice', 'You must have an active membership to export bookmarks.' ); - return $this->index(); + Issues::add( 'notice', 'You will need an active subscription to start exporting bookmarks. You can check our Pricing page for more details.' ); + return Views::view( 'bookmarks.exportExplainer' ); } $folders = self::$folders->byUser(); @@ -806,7 +826,7 @@ class Bookmarks extends Controller { $panelArray = []; $folders = self::$folders->byUser(); if ( empty( $folders ) ) { - return Views::view( 'bookmarks.share' ); + return Views::view( 'bookmarks.shareExplainer' ); } foreach ( $folders as $key => $folder ) { $panel = new \stdClass(); @@ -924,13 +944,17 @@ class Bookmarks extends Controller { } $options = $assocOptions; } - foreach ( $options as $fieldname => $value ) { - if ( $folderID == $value ) { - $selected = ' selected'; - } else { - $selected = ''; + if ( ! empty( $options ) ) { + foreach ( $options as $fieldname => $value ) { + if ( $folderID == $value ) { + $selected = ' selected'; + } else { + $selected = ''; + } + $out .= ''; } - $out .= ''; + } else { + $out .= ''; } $out .= ''; $out .= ''; diff --git a/app/plugins/bookmarks/images/brave/bookmark-manager.png b/app/plugins/bookmarks/images/brave/bookmark-manager.png new file mode 100644 index 0000000..3024811 Binary files /dev/null and b/app/plugins/bookmarks/images/brave/bookmark-manager.png differ diff --git a/app/plugins/bookmarks/images/brave/bookmark-menu.png b/app/plugins/bookmarks/images/brave/bookmark-menu.png new file mode 100644 index 0000000..b6d3309 Binary files /dev/null and b/app/plugins/bookmarks/images/brave/bookmark-menu.png differ diff --git a/app/plugins/bookmarks/images/brave/bookmarks.png b/app/plugins/bookmarks/images/brave/bookmarks.png new file mode 100644 index 0000000..b431cbe Binary files /dev/null and b/app/plugins/bookmarks/images/brave/bookmarks.png differ diff --git a/app/plugins/bookmarks/images/brave/export.png b/app/plugins/bookmarks/images/brave/export.png new file mode 100644 index 0000000..87dd1c6 Binary files /dev/null and b/app/plugins/bookmarks/images/brave/export.png differ diff --git a/app/plugins/bookmarks/images/brave/extensions-icon.png b/app/plugins/bookmarks/images/brave/extensions-icon.png new file mode 100644 index 0000000..bcc2cc1 Binary files /dev/null and b/app/plugins/bookmarks/images/brave/extensions-icon.png differ diff --git a/app/plugins/bookmarks/images/brave/import.png b/app/plugins/bookmarks/images/brave/import.png new file mode 100644 index 0000000..622053c Binary files /dev/null and b/app/plugins/bookmarks/images/brave/import.png differ diff --git a/app/plugins/bookmarks/images/brave/options.png b/app/plugins/bookmarks/images/brave/options.png new file mode 100644 index 0000000..10b9339 Binary files /dev/null and b/app/plugins/bookmarks/images/brave/options.png differ diff --git a/app/plugins/bookmarks/images/brave/pin.png b/app/plugins/bookmarks/images/brave/pin.png new file mode 100644 index 0000000..8e800f0 Binary files /dev/null and b/app/plugins/bookmarks/images/brave/pin.png differ diff --git a/app/plugins/bookmarks/images/brave/pinned.png b/app/plugins/bookmarks/images/brave/pinned.png new file mode 100644 index 0000000..f94fb59 Binary files /dev/null and b/app/plugins/bookmarks/images/brave/pinned.png differ diff --git a/app/plugins/bookmarks/images/brave/settings-page.png b/app/plugins/bookmarks/images/brave/settings-page.png new file mode 100644 index 0000000..f1671dc Binary files /dev/null and b/app/plugins/bookmarks/images/brave/settings-page.png differ diff --git a/app/plugins/bookmarks/images/brave/settings.png b/app/plugins/bookmarks/images/brave/settings.png new file mode 100644 index 0000000..668b048 Binary files /dev/null and b/app/plugins/bookmarks/images/brave/settings.png differ diff --git a/app/plugins/bookmarks/images/chrome/bookmark-manager.png b/app/plugins/bookmarks/images/chrome/bookmark-manager.png new file mode 100644 index 0000000..1dd091a Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/bookmark-manager.png differ diff --git a/app/plugins/bookmarks/images/chrome/bookmark-menu.png b/app/plugins/bookmarks/images/chrome/bookmark-menu.png new file mode 100644 index 0000000..f559010 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/bookmark-menu.png differ diff --git a/app/plugins/bookmarks/images/chrome/bookmarks.png b/app/plugins/bookmarks/images/chrome/bookmarks.png new file mode 100644 index 0000000..def6eb6 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/bookmarks.png differ diff --git a/app/plugins/bookmarks/images/chrome/chrome-add.jpg b/app/plugins/bookmarks/images/chrome/chrome-add.jpg new file mode 100644 index 0000000..579d5b8 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/chrome-add.jpg differ diff --git a/app/plugins/bookmarks/images/chrome/chrome-login.jpg b/app/plugins/bookmarks/images/chrome/chrome-login.jpg new file mode 100644 index 0000000..db42731 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/chrome-login.jpg differ diff --git a/app/plugins/bookmarks/images/chrome/chrome-marquee-promo-tile.png b/app/plugins/bookmarks/images/chrome/chrome-marquee-promo-tile.png new file mode 100644 index 0000000..3c9da7f Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/chrome-marquee-promo-tile.png differ diff --git a/app/plugins/bookmarks/images/chrome/chrome-settings.jpg b/app/plugins/bookmarks/images/chrome/chrome-settings.jpg new file mode 100644 index 0000000..97949b7 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/chrome-settings.jpg differ diff --git a/app/plugins/bookmarks/images/chrome/chrome-small-promo-tile.png b/app/plugins/bookmarks/images/chrome/chrome-small-promo-tile.png new file mode 100644 index 0000000..015a2f2 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/chrome-small-promo-tile.png differ diff --git a/app/plugins/bookmarks/images/chrome/export.png b/app/plugins/bookmarks/images/chrome/export.png new file mode 100644 index 0000000..42d4fe1 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/export.png differ diff --git a/app/plugins/bookmarks/images/chrome/extensions-icon.png b/app/plugins/bookmarks/images/chrome/extensions-icon.png new file mode 100644 index 0000000..34dfd50 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/extensions-icon.png differ diff --git a/app/plugins/bookmarks/images/chrome/import.png b/app/plugins/bookmarks/images/chrome/import.png new file mode 100644 index 0000000..9d6cb93 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/import.png differ diff --git a/app/plugins/bookmarks/images/chrome/options.png b/app/plugins/bookmarks/images/chrome/options.png new file mode 100644 index 0000000..9fa20a6 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/options.png differ diff --git a/app/plugins/bookmarks/images/chrome/pin.png b/app/plugins/bookmarks/images/chrome/pin.png new file mode 100644 index 0000000..eb90300 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/pin.png differ diff --git a/app/plugins/bookmarks/images/chrome/pinned.png b/app/plugins/bookmarks/images/chrome/pinned.png new file mode 100644 index 0000000..7f21ba0 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/pinned.png differ diff --git a/app/plugins/bookmarks/images/chrome/settings-page.png b/app/plugins/bookmarks/images/chrome/settings-page.png new file mode 100644 index 0000000..e662028 Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/settings-page.png differ diff --git a/app/plugins/bookmarks/images/chrome/settings.png b/app/plugins/bookmarks/images/chrome/settings.png new file mode 100644 index 0000000..ba7f40b Binary files /dev/null and b/app/plugins/bookmarks/images/chrome/settings.png differ diff --git a/app/plugins/bookmarks/images/edge/edge-add.png b/app/plugins/bookmarks/images/edge/edge-add.png new file mode 100644 index 0000000..547cf55 Binary files /dev/null and b/app/plugins/bookmarks/images/edge/edge-add.png differ diff --git a/app/plugins/bookmarks/images/edge/edge-login.png b/app/plugins/bookmarks/images/edge/edge-login.png new file mode 100644 index 0000000..7e27a1c Binary files /dev/null and b/app/plugins/bookmarks/images/edge/edge-login.png differ diff --git a/app/plugins/bookmarks/images/edge/edge-settings.png b/app/plugins/bookmarks/images/edge/edge-settings.png new file mode 100644 index 0000000..db02594 Binary files /dev/null and b/app/plugins/bookmarks/images/edge/edge-settings.png differ diff --git a/app/plugins/bookmarks/images/edge/edge-small-promo-tile.png b/app/plugins/bookmarks/images/edge/edge-small-promo-tile.png new file mode 100644 index 0000000..015a2f2 Binary files /dev/null and b/app/plugins/bookmarks/images/edge/edge-small-promo-tile.png differ diff --git a/app/plugins/bookmarks/images/edge/export.png b/app/plugins/bookmarks/images/edge/export.png new file mode 100644 index 0000000..69d71fb Binary files /dev/null and b/app/plugins/bookmarks/images/edge/export.png differ diff --git a/app/plugins/bookmarks/images/edge/favorites.png b/app/plugins/bookmarks/images/edge/favorites.png new file mode 100644 index 0000000..f45bf3e Binary files /dev/null and b/app/plugins/bookmarks/images/edge/favorites.png differ diff --git a/app/plugins/bookmarks/images/edge/import-complete.png b/app/plugins/bookmarks/images/edge/import-complete.png new file mode 100644 index 0000000..843469a Binary files /dev/null and b/app/plugins/bookmarks/images/edge/import-complete.png differ diff --git a/app/plugins/bookmarks/images/edge/import-menu.png b/app/plugins/bookmarks/images/edge/import-menu.png new file mode 100644 index 0000000..7d86967 Binary files /dev/null and b/app/plugins/bookmarks/images/edge/import-menu.png differ diff --git a/app/plugins/bookmarks/images/edge/import-select.png b/app/plugins/bookmarks/images/edge/import-select.png new file mode 100644 index 0000000..ac3d844 Binary files /dev/null and b/app/plugins/bookmarks/images/edge/import-select.png differ diff --git a/app/plugins/bookmarks/images/edge/import-start.png b/app/plugins/bookmarks/images/edge/import-start.png new file mode 100644 index 0000000..8dfb0d1 Binary files /dev/null and b/app/plugins/bookmarks/images/edge/import-start.png differ diff --git a/app/plugins/bookmarks/images/edge/import.png b/app/plugins/bookmarks/images/edge/import.png new file mode 100644 index 0000000..c0b8a67 Binary files /dev/null and b/app/plugins/bookmarks/images/edge/import.png differ diff --git a/app/plugins/bookmarks/images/edge/settings.png b/app/plugins/bookmarks/images/edge/settings.png new file mode 100644 index 0000000..68ffede Binary files /dev/null and b/app/plugins/bookmarks/images/edge/settings.png differ diff --git a/app/plugins/bookmarks/images/firefox/added.png b/app/plugins/bookmarks/images/firefox/added.png new file mode 100644 index 0000000..0c4dc64 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/added.png differ diff --git a/app/plugins/bookmarks/images/firefox/bookmarks.png b/app/plugins/bookmarks/images/firefox/bookmarks.png new file mode 100644 index 0000000..33b7050 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/bookmarks.png differ diff --git a/app/plugins/bookmarks/images/firefox/enable.png b/app/plugins/bookmarks/images/firefox/enable.png new file mode 100644 index 0000000..fc2f578 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/enable.png differ diff --git a/app/plugins/bookmarks/images/firefox/export.png b/app/plugins/bookmarks/images/firefox/export.png new file mode 100644 index 0000000..a95ca72 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/export.png differ diff --git a/app/plugins/bookmarks/images/firefox/firefox-login.jpg b/app/plugins/bookmarks/images/firefox/firefox-login.jpg new file mode 100644 index 0000000..df62908 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/firefox-login.jpg differ diff --git a/app/plugins/bookmarks/images/firefox/firefox-save.jpg b/app/plugins/bookmarks/images/firefox/firefox-save.jpg new file mode 100644 index 0000000..48e3a98 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/firefox-save.jpg differ diff --git a/app/plugins/bookmarks/images/firefox/firefox-settings.jpg b/app/plugins/bookmarks/images/firefox/firefox-settings.jpg new file mode 100644 index 0000000..f2c8921 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/firefox-settings.jpg differ diff --git a/app/plugins/bookmarks/images/firefox/import-export.png b/app/plugins/bookmarks/images/firefox/import-export.png new file mode 100644 index 0000000..5809cc1 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/import-export.png differ diff --git a/app/plugins/bookmarks/images/firefox/import.png b/app/plugins/bookmarks/images/firefox/import.png new file mode 100644 index 0000000..de7fdf0 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/import.png differ diff --git a/app/plugins/bookmarks/images/firefox/manage-bookmarks.png b/app/plugins/bookmarks/images/firefox/manage-bookmarks.png new file mode 100644 index 0000000..c0b76a6 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/manage-bookmarks.png differ diff --git a/app/plugins/bookmarks/images/firefox/options.png b/app/plugins/bookmarks/images/firefox/options.png new file mode 100644 index 0000000..234ed54 Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/options.png differ diff --git a/app/plugins/bookmarks/images/firefox/settings.png b/app/plugins/bookmarks/images/firefox/settings.png new file mode 100644 index 0000000..5af44af Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/settings.png differ diff --git a/app/plugins/bookmarks/images/firefox/version.png b/app/plugins/bookmarks/images/firefox/version.png new file mode 100644 index 0000000..ed7e94e Binary files /dev/null and b/app/plugins/bookmarks/images/firefox/version.png differ diff --git a/app/plugins/bookmarks/images/opera/bookmarks.png b/app/plugins/bookmarks/images/opera/bookmarks.png new file mode 100644 index 0000000..6d61869 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/bookmarks.png differ diff --git a/app/plugins/bookmarks/images/opera/export.png b/app/plugins/bookmarks/images/opera/export.png new file mode 100644 index 0000000..afee201 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/export.png differ diff --git a/app/plugins/bookmarks/images/opera/extensions.png b/app/plugins/bookmarks/images/opera/extensions.png new file mode 100644 index 0000000..48587bc Binary files /dev/null and b/app/plugins/bookmarks/images/opera/extensions.png differ diff --git a/app/plugins/bookmarks/images/opera/import-select.png b/app/plugins/bookmarks/images/opera/import-select.png new file mode 100644 index 0000000..ce92936 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/import-select.png differ diff --git a/app/plugins/bookmarks/images/opera/import-start.png b/app/plugins/bookmarks/images/opera/import-start.png new file mode 100644 index 0000000..75b2a2c Binary files /dev/null and b/app/plugins/bookmarks/images/opera/import-start.png differ diff --git a/app/plugins/bookmarks/images/opera/import-success.png b/app/plugins/bookmarks/images/opera/import-success.png new file mode 100644 index 0000000..e34bc70 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/import-success.png differ diff --git a/app/plugins/bookmarks/images/opera/import.png b/app/plugins/bookmarks/images/opera/import.png new file mode 100644 index 0000000..02c0046 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/import.png differ diff --git a/app/plugins/bookmarks/images/opera/opera-login.jpg b/app/plugins/bookmarks/images/opera/opera-login.jpg new file mode 100644 index 0000000..0bb1bc7 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/opera-login.jpg differ diff --git a/app/plugins/bookmarks/images/opera/opera-promo-image.png b/app/plugins/bookmarks/images/opera/opera-promo-image.png new file mode 100644 index 0000000..cd2ca2a Binary files /dev/null and b/app/plugins/bookmarks/images/opera/opera-promo-image.png differ diff --git a/app/plugins/bookmarks/images/opera/opera-save.jpg b/app/plugins/bookmarks/images/opera/opera-save.jpg new file mode 100644 index 0000000..aaa5aa6 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/opera-save.jpg differ diff --git a/app/plugins/bookmarks/images/opera/opera-settiings.jpg b/app/plugins/bookmarks/images/opera/opera-settiings.jpg new file mode 100644 index 0000000..37c4081 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/opera-settiings.jpg differ diff --git a/app/plugins/bookmarks/images/opera/optiions.png b/app/plugins/bookmarks/images/opera/optiions.png new file mode 100644 index 0000000..1e0f192 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/optiions.png differ diff --git a/app/plugins/bookmarks/images/opera/pin.png b/app/plugins/bookmarks/images/opera/pin.png new file mode 100644 index 0000000..986aac1 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/pin.png differ diff --git a/app/plugins/bookmarks/images/opera/sidebar.png b/app/plugins/bookmarks/images/opera/sidebar.png new file mode 100644 index 0000000..bc0a3d6 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/sidebar.png differ diff --git a/app/plugins/bookmarks/images/opera/toolbar.png b/app/plugins/bookmarks/images/opera/toolbar.png new file mode 100644 index 0000000..6a84ab2 Binary files /dev/null and b/app/plugins/bookmarks/images/opera/toolbar.png differ diff --git a/app/plugins/bookmarks/plugin.php b/app/plugins/bookmarks/plugin.php index ea7d157..9dc4886 100644 --- a/app/plugins/bookmarks/plugin.php +++ b/app/plugins/bookmarks/plugin.php @@ -18,6 +18,7 @@ use TheTempusProject\Models\Bookmarks as Bookmark; use TheTempusProject\Models\Folders; use TheTempusProject\Houdini\Classes\Components; use TheTempusProject\Houdini\Classes\Template; +use TheTempusProject\TheTempusProject as App; class Bookmarks extends Plugin { public $pluginName = 'TP Bookmarks'; @@ -43,11 +44,22 @@ class Bookmarks extends Plugin { 'url' => '{ROOT_URL}bookmarks/index', 'filter' => 'loggedin', ], + [ + 'text' => 'Tutorials', + 'url' => '{ROOT_URL}bookmarks/tutorials', + 'filter' => 'bkmtuts', + ], [ 'text' => 'Extensions', 'url' => '{ROOT_URL}extensions/index', ], ]; + public $info_footer_links = [ + [ + 'text' => 'Tutorials', + 'url' => '{ROOT_URL}bookmarks/tutorials', + ], + ]; public $configMatrix = [ 'enabled' => [ 'type' => 'radio', @@ -96,9 +108,12 @@ class Bookmarks extends Plugin { 'type' => 'checkbox', 'default' => 'true', ], + 'bookmarkTutorials' => [ + 'pretty' => 'Show tutorials for the bookmark feature', + 'type' => 'checkbox', + 'default' => 'true', + ], ]; - - public $resourceMatrix = [ 'routes' => [ [ @@ -134,17 +149,32 @@ class Bookmarks extends Plugin { ] ]; - - - - - public $bookmarks; public $folders; + protected static $loaded = false; public function __construct( $load = false ) { $this->bookmarks = new Bookmark; $this->folders = new Folders; + + if ( ! self::$loaded && $load ) { + $tutpref = true; + if ( App::$isLoggedIn ) { + if ( empty( App::$activeUser->prefs['bookmarkTutorials'] ) ) { + $tutpref = false; + } + } + $this->filters[] = [ + 'name' => 'bkmtuts', + 'find' => '#{BKMTUTS}(.*?){/BKMTUTS}#is', + 'replace' => ( $tutpref ? '$1' : '' ), + 'enabled' => true, + ]; + } + parent::__construct( $load ); + if ( ! self::$loaded && $load ) { + self::$loaded = true; + } } } diff --git a/app/plugins/bookmarks/views/bookmarks/unsorted.html b/app/plugins/bookmarks/views/bookmarks/unsorted.html index 5d8c1e7..4f01789 100644 --- a/app/plugins/bookmarks/views/bookmarks/unsorted.html +++ b/app/plugins/bookmarks/views/bookmarks/unsorted.html @@ -2,6 +2,13 @@
Unsorted Bookmarks
+ {BKMTUTS} +

+ When you add bookmarks without a folder, they will be considered "Unsorted". There is nothing wrong with these bookmarks, + but much of the application relies on folder for organizing and displaying bookmarks. You may find that these bookmarks do not regularly appear in other sections of the application. +

+
+ {/BKMTUTS} diff --git a/app/plugins/bookmarks/views/dash.html b/app/plugins/bookmarks/views/dash.html index 5275773..a3d40d3 100644 --- a/app/plugins/bookmarks/views/dash.html +++ b/app/plugins/bookmarks/views/dash.html @@ -1,7 +1,18 @@
- MAnage + Manage Bookmarks
+ {BKMTUTS} +

+ Dashboards are one of our most powerful and useful features of AllTheBookmarks. With dashboards, you're able to create, edit, share, and use pages built dynamically from your bookmark folders. + When you create a dashboard, you select any number of your organized folders, select a few display options, and you gain access to a new page just for those folders. +

+

+ Sometimes, there just isn't enough room on the toolbar. Instead of having 6 folders you always use, have 1, short link called "Games" that opens 1 page. I use this to group small sections of + my bookmarks together like games. I have PalWorld, WoW, Satisfactory, and Diablo links in a "Games" dashboard. I can just quickly go to that dash, find the folder I need and go. +

+
+ {/BKMTUTS} {VIEW_OPTIONS}
diff --git a/app/plugins/bookmarks/views/dashboardExplainer.html b/app/plugins/bookmarks/views/dashboardExplainer.html new file mode 100644 index 0000000..daf1592 --- /dev/null +++ b/app/plugins/bookmarks/views/dashboardExplainer.html @@ -0,0 +1,14 @@ +
+
+ Bookmark Dashboards +
+

+ Dashboards are one of our most powerful and useful features of AllTheBookmarks. With dashboards, you're able to create, edit, share, and use pages built dynamically from your bookmark folders. + When you create a dashboard, you select any number of your organized folders, select a few display options, and you gain access to a new page just for those folders. +

+

+ Sometimes, there just isn't enough room on the toolbar. Instead of having 6 folders you always use, have 1, short link called "Games" that opens 1 page. I use this to group small sections of + my bookmarks together like games. I have PalWorld, WoW, Satisfactory, and Diablo links in a "Games" dashboard. I can just quickly go to that dash, find the folder I need and go. +

+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/dashboards/list.html b/app/plugins/bookmarks/views/dashboards/list.html index fad456b..e6db2f7 100644 --- a/app/plugins/bookmarks/views/dashboards/list.html +++ b/app/plugins/bookmarks/views/dashboards/list.html @@ -2,10 +2,17 @@
Dashboards
-
-

From here you can easily create, update, or remove any bookmark dashboards you have created.

-

Dashboards are a feature that allow you to build customized bookmark pages that you can easily save and open la

-
+ {BKMTUTS} +

+ Dashboards are one of our most powerful and useful features of AllTheBookmarks. With dashboards, you're able to create, edit, share, and use pages built dynamically from your bookmark folders. + When you create a dashboard, you select any number of your organized folders, select a few display options, and you gain access to a new page just for those folders. +

+

+ Sometimes, there just isn't enough room on the toolbar. Instead of having 6 folders you always use, have 1, short link called "Games" that opens 1 page. I use this to group small sections of + my bookmarks together like games. I have PalWorld, WoW, Satisfactory, and Diablo links in a "Games" dashboard. I can just quickly go to that dash, find the folder I need and go. +

+
+ {/BKMTUTS}
diff --git a/app/plugins/bookmarks/views/export.html b/app/plugins/bookmarks/views/export.html index ce64985..79c0c48 100644 --- a/app/plugins/bookmarks/views/export.html +++ b/app/plugins/bookmarks/views/export.html @@ -2,6 +2,20 @@
Bookmark Export
+ {BKMTUTS} +

+ Our export tool allows you to select bookmarks and folders from your AllTheBookmarks account and generate a file that you can then import into any browser. + Giving you access to all your bookmarks right inside your browser. +

+

+ You can simply select the folders you want to bring into your browser on this page and click generate. A notification will pop-up showing you where you can + find your file for download. You take that newly saved file an import it into your browser of choice. +

+

+ If you need help importing your bookmarks, we have tutorials available for every major browser that can help. +

+
+ {/BKMTUTS}

Select which folders to include in the export

diff --git a/app/plugins/bookmarks/views/exportExplainer.html b/app/plugins/bookmarks/views/exportExplainer.html new file mode 100644 index 0000000..8e033c8 --- /dev/null +++ b/app/plugins/bookmarks/views/exportExplainer.html @@ -0,0 +1,17 @@ +
+
+ Bookmark Export +
+

+ Our export tool allows you to select bookmarks and folders from your AllTheBookmarks account and generate a file that you can then import into any browser. + Giving you access to all your bookmarks right inside your browser. +

+

+ You can simply select the folders you want to bring into your browser on this page and click generate. A notification will pop-up showing you where you can + find your file for download. You take that newly saved file an import it into your browser of choice. +

+

+ If you need help importing your bookmarks, we have tutorials available for every major browser that can help. +

+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/folders/listPage.html b/app/plugins/bookmarks/views/folders/listPage.html index 003a3db..0353abf 100644 --- a/app/plugins/bookmarks/views/folders/listPage.html +++ b/app/plugins/bookmarks/views/folders/listPage.html @@ -1,5 +1,11 @@
Folders List
+ {BKMTUTS} +

+ Just like the folders you have in your web browser, you can add, edit, or remove folders for organizing your bookmarks here. +

+
+ {/BKMTUTS} {foldersList}
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/import.html b/app/plugins/bookmarks/views/import.html index 6d6b770..3d692bd 100644 --- a/app/plugins/bookmarks/views/import.html +++ b/app/plugins/bookmarks/views/import.html @@ -1,7 +1,20 @@
- Import Bookmarks + Bookmark Import
+ {BKMTUTS} +

+ Our import tool allows you to upload a file from you browser (Chrome, Firefox, etc) that will add all of your bookmarks and folders to your allthebookmarks.com dashboard. +

+

+ The tool has been tested with all major browsers except safari. This includes Firefox, Chrome, Opera, Brave, and Edge. + You will need to browse your computer and select the .html file where you exported your bookmarks from your browser. +

+

+ If you need help exporting your bookmarks, we have tutorials available for every major browser that can help. +

+
+ {/BKMTUTS}
diff --git a/app/plugins/bookmarks/views/importExplainer.html b/app/plugins/bookmarks/views/importExplainer.html new file mode 100644 index 0000000..5506724 --- /dev/null +++ b/app/plugins/bookmarks/views/importExplainer.html @@ -0,0 +1,16 @@ +
+
+ Bookmark Import +
+

+ Our import tool allows you to upload a file from you browser (Chrome, Firefox, etc) that will add all of your bookmarks and folders to your allthebookmarks.com dashboard. +

+

+ The tool has been tested with all major browsers except safari. This includes Firefox, Chrome, Opera, Brave, and Edge. + You will need to browse your computer and select the .html file where you exported your bookmarks from your browser. +

+

+ If you need help exporting your bookmarks, we have tutorials available for every major browser that can help. +

+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/indexExplainer.html b/app/plugins/bookmarks/views/indexExplainer.html new file mode 100644 index 0000000..a30b67f --- /dev/null +++ b/app/plugins/bookmarks/views/indexExplainer.html @@ -0,0 +1,19 @@ +
+
+ Manage Bookmarks +
+

+ This is one of the main pages you'll be using to manage your bookmarks. Here you will find a list of all of your folders and the bookmarks they contain. + Hidden, archived, private, and public bookmarks can all be reviewed on this page using the filter options below. Some controls may be hidden by default, + so you're encouraged to toggle them to better understand your options for managing your bookmarks. +

+

+ Once you start collecting hundreds and thousands of bookmarks, this page can get a bit overwhelming. We encourage you to check out our Dashboards feature + for a more robust way to interact with all your saved bookmarks. Make use of the ability to hide and archive bookmarks to keep organized as well. +

+ +
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/introduction.html b/app/plugins/bookmarks/views/introduction.html new file mode 100644 index 0000000..c21ad72 --- /dev/null +++ b/app/plugins/bookmarks/views/introduction.html @@ -0,0 +1,60 @@ +
+ +
+

Welcome to All The Bookmarks

+

Your ultimate tool for organizing, sharing, and managing website bookmarks effortlessly.

+ Illustration of bookmark organization + Get Started +
+ + +
+
+ +
Organize Your Bookmarks
+

Create folders to keep your bookmarks tidy and easy to find.

+
+
+ +
Share Collections
+

Share dashboards with groups of folders to collaborate seamlessly.

+
+
+ +
Import & Export
+

Sync your bookmarks across major browsers with our easy import/export tools.

+
+
+ + +
+
+

Bookmark Anytime, Anywhere

+

Our browser extension works with Chrome, Firefox, Brave, Edge, and Opera, making it simple to save and manage bookmarks directly from your browser.

+ Install Extension +
+
+ Illustration of browser extensions +
+
+ + +
+
+ Illustration of dashboards +
+
+

Dynamic Dashboards

+

Group folders into dashboards and share them to keep everyone updated on the latest changes.

+ Learn More About Dashboards +
+
+ + +
+

Ready to Get Started?

+

Start organizing, sharing, and syncing your bookmarks today!

+ Create Your First Folder +
+
+ \ No newline at end of file diff --git a/app/plugins/bookmarks/views/share.html b/app/plugins/bookmarks/views/share.html index d1b33e7..d53159c 100644 --- a/app/plugins/bookmarks/views/share.html +++ b/app/plugins/bookmarks/views/share.html @@ -2,9 +2,17 @@
Share
+ {BKMTUTS}
-

Any link or folder can be shared. By default, the extensions and app both default to private. On this page, you can quickly see a list of any public links and folders. These "public" items can be shared with anyone who has the link.

+

+ This is the share page, designed to very quickly show you what folders and urls you have set to public and have the ability to share with anyone. +

+

+ Any link or folder can be shared and by default, the extensions and app default to private. These "public" items can be viewed by anyone with the link provided from this page. +

+
+ {/BKMTUTS}
{LOOP} {panel} diff --git a/app/plugins/bookmarks/views/shareExplainer.html b/app/plugins/bookmarks/views/shareExplainer.html new file mode 100644 index 0000000..b742d53 --- /dev/null +++ b/app/plugins/bookmarks/views/shareExplainer.html @@ -0,0 +1,12 @@ +
+
+ Share +
+

+ This is the share page, designed to very quickly show you what folders and urls you have set to public and have the ability to share with anyone. +

+

+ Any link or folder can be shared and by default, the extensions and app default to private. These "public" items can be viewed by anyone with the link provided from this page. +

+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/shareLink.html b/app/plugins/bookmarks/views/shareLink.html deleted file mode 100644 index e69de29..0000000 diff --git a/app/plugins/bookmarks/views/tutorials/brave/export.html b/app/plugins/bookmarks/views/tutorials/brave/export.html new file mode 100644 index 0000000..75e41dd --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/brave/export.html @@ -0,0 +1,42 @@ +
+
+
+

How to Export bookmarks from Brave

+
+

+ Exporting your bookmarks is lightning fast and simple inside of brave. +

+
Step 1: open the main application menu
+

+ Simply left-click these three lines on the right side of your main toolbar. +

+
+ Right-clicking on the extension icon +
+
Step 2: Open the Bookmark Manager
+

+ In the list, hover over Bookmarks and Lists then select Bookmark Manager. +

+
+ Extension settings page +
+
Step 2: Open the Export Menu
+

+ On this page, in the top right, you should see another set of three dots, click these. +

+
+ Extension settings page +
+

+ From this list, select Export Bookmarks. +

+
+ Extension settings page +
+ +

+ Finally, save the .html file somewhere easy to access when you use the imports feature. +

+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/brave/import.html b/app/plugins/bookmarks/views/tutorials/brave/import.html new file mode 100644 index 0000000..6570a13 --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/brave/import.html @@ -0,0 +1,44 @@ +
+
+
+

How to Import bookmarks in Brave

+
+

+ Importing your bookmarks from AllTheBookmarks is lightning fast and simple inside of brave. +

+
Step 1: open the main application menu
+

+ Simply left-click these three lines on the right side of your main toolbar. +

+
+ Right-clicking on the extension icon +
+
Step 2: Open the Bookmark Manager
+

+ In the list, hover over Bookmarks and Lists then select Bookmark Manager. +

+
+ Extension settings page +
+
Step 2: Open the Import Menu
+ +

+ On this page, in the top right, you should see another set of three dots, click these. +

+
+ Extension settings page +
+ +

+ From this list, select Import Bookmarks. +

+
+ Extension settings page +
+ +

+ Finally, select the .html file you saved when using the exports feature. +

+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/brave/pin.html b/app/plugins/bookmarks/views/tutorials/brave/pin.html new file mode 100644 index 0000000..c0d22cf --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/brave/pin.html @@ -0,0 +1,35 @@ +
+
+
+

How to pin the extension to your toolbar in Brave

+
+ +

+ Once installed, you can add the extension to your brave toolbar with just a few easy steps. +

+
Step 1: Find the extensions icon on your toolbar.
+

+ It should look like this: +

+
+ Right-clicking on the extension icon +
+
Step 2: Left click this icon and a list of your currently installed extensions should show.
+

+ Next to AllTheBookmarks, on the right you should see a pin icon, click this. +

+
+ Extension settings page +
+

+ Once pinned, you should see the AllTheBookmarks icon on the toolbar. +

+
+ Extension settings page +
+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/brave/settings.html b/app/plugins/bookmarks/views/tutorials/brave/settings.html new file mode 100644 index 0000000..6b747ea --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/brave/settings.html @@ -0,0 +1,33 @@ +
+
+
+

How to Access Extension Settings in Brave

+
+ +

+ With Brave, accessing the extension settings couldn't be easier. +

+
Step 1: Locate the Extension Icon
+

+ Simply locate the AllTheBookmarks icon on your toolbar and right-click the icon. +

+
+ Right-clicking on the extension icon +
+
Step 2: Open the Options
+

+ From the dropdown menu that appears, select Options. You should be greeted by a settings page very similar to the one below. +

+
+ Extension settings page +
+

+ (If you need help pinning the extension to your toolbar for easy access, we have a separate + tutorial for that.) +

+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/chrome/export.html b/app/plugins/bookmarks/views/tutorials/chrome/export.html new file mode 100644 index 0000000..3825dd4 --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/chrome/export.html @@ -0,0 +1,42 @@ +
+
+
+

How to Export bookmarks from Chrome

+
+

+ Exporting your bookmarks is lightning fast and simple inside of chrome. +

+
Step 1: open the main application menu
+

+ Simply left-click these three dots on the right side of your main toolbar. +

+
+ Right-clicking on the extension icon +
+
Step 2: Open the Bookmark Manager
+

+ In the list, hover over Bookmarks and Lists then select Bookmark Manager. +

+
+ Extension settings page +
+
Step 2: Open the Export Menu
+

+ On this page, in the top right, you should see another set of three dots, click these. +

+
+ Extension settings page +
+

+ From this list, select Export Bookmarks. +

+
+ Extension settings page +
+ +

+ Finally, save the .html file somewhere easy to access when you use the imports feature. +

+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/chrome/import.html b/app/plugins/bookmarks/views/tutorials/chrome/import.html new file mode 100644 index 0000000..d3957d6 --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/chrome/import.html @@ -0,0 +1,44 @@ +
+
+
+

How to Import bookmarks in Chrome

+
+

+ Importing your bookmarks from AllTheBookmarks is lightning fast and simple inside of chrome. +

+
Step 1: open the main application menu
+

+ Simply left-click these three dots on the right side of your main toolbar. +

+
+ Right-clicking on the extension icon +
+
Step 2: Open the Bookmark Manager
+

+ In the list, hover over Bookmarks and Lists then select Bookmark Manager. +

+
+ Extension settings page +
+
Step 2: Open the Import Menu
+ +

+ On this page, in the top right, you should see another set of three dots, click these. +

+
+ Extension settings page +
+ +

+ From this list, select Import Bookmarks. +

+
+ Extension settings page +
+ +

+ Finally, select the .html file you saved when using the exports feature. +

+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/chrome/pin.html b/app/plugins/bookmarks/views/tutorials/chrome/pin.html new file mode 100644 index 0000000..949abce --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/chrome/pin.html @@ -0,0 +1,35 @@ +
+
+
+

How to pin the extension to your toolbar in Chrome

+
+ +

+ Once installed, you can add the extension to your chrome toolbar with just a few easy steps. +

+
Step 1: Find the extensions icon on your toolbar.
+

+ It should look like this: +

+
+ Right-clicking on the extension icon +
+
Step 2: Left click this icon and a list of your currently installed extensions should show.
+

+ Next to AllTheBookmarks, on the right you should see a pin icon, click this. +

+
+ Extension settings page +
+

+ Once pinned, you should see the AllTheBookmarks icon on the toolbar. +

+
+ Extension settings page +
+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/chrome/settings.html b/app/plugins/bookmarks/views/tutorials/chrome/settings.html new file mode 100644 index 0000000..86ddc0f --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/chrome/settings.html @@ -0,0 +1,33 @@ +
+
+
+

How to Access Extension Settings in Chrome

+
+ +

+ With Chrome, accessing the extension settings couldn't be easier. +

+
Step 1: Locate the Extension Icon
+

+ Simply locate the AllTheBookmarks icon on your toolbar and right-click the icon. +

+
+ Right-clicking on the extension icon +
+
Step 2: Open the Options
+

+ From the dropdown menu that appears, select Options. You should be greeted by a settings page very similar to the one below. +

+
+ Extension settings page +
+

+ (If you need help pinning the extension to your toolbar for easy access, we have a separate + tutorial for that.) +

+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/firefox/export.html b/app/plugins/bookmarks/views/tutorials/firefox/export.html new file mode 100644 index 0000000..8c2b172 --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/firefox/export.html @@ -0,0 +1,54 @@ +
+
+
+

How to Export bookmarks in Firefox

+
+

+ Exporting your bookmarks is lightning fast and simple inside of firefox. +

+ +
Step 1: open the main application menu
+

+ Simply left-click these three lines on the right side of your main toolbar. +

+
+ Right-clicking on the extension icon +
+ +
Step 2: Open the Bookmark Menu
+

+ In the list, select Bookmarks and another menu should appear. +

+
+ Extension settings page +
+ +
Step 3: Open the Bookmark Manager
+

+ In the list, select Manage Bookmarks. +

+
+ Extension settings page +
+ +
Step 3: Open the Import Menu
+

+ On this page, near the top left, you should see a button that says Import and Backup. Click this button and another menu should appear. +

+
+ Extension settings page +
+ +

+ From this list, select Export Bookmarks. +

+
+ Extension settings page +
+ +

+ Finally, save the .html file somewhere easy to access when you use the imports feature. +

+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/firefox/import.html b/app/plugins/bookmarks/views/tutorials/firefox/import.html new file mode 100644 index 0000000..c97d105 --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/firefox/import.html @@ -0,0 +1,54 @@ +
+
+
+

How to Import bookmarks in Firefox

+
+

+ Importing your bookmarks from AllTheBookmarks is lightning fast and simple inside of firefox. +

+ +
Step 1: open the main application menu
+

+ Simply left-click these three lines on the right side of your main toolbar. +

+
+ Right-clicking on the extension icon +
+ +
Step 2: Open the Bookmark Menu
+

+ In the list, select Bookmarks and another menu should appear. +

+
+ Extension settings page +
+ +
Step 3: Open the Bookmark Manager
+

+ In the list, select Manage Bookmarks. +

+
+ Extension settings page +
+ +
Step 3: Open the Import Menu
+

+ On this page, near the top left, you should see a button that says Import and Backup. Click this button and another menu should appear. +

+
+ Extension settings page +
+ +

+ From this list, select Import Bookmarks. +

+
+ Extension settings page +
+ +

+ Finally, select the .html file you saved when using the exports feature. +

+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/firefox/pin.html b/app/plugins/bookmarks/views/tutorials/firefox/pin.html new file mode 100644 index 0000000..55593f9 --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/firefox/pin.html @@ -0,0 +1,35 @@ +
+
+
+

How to pin the extension to your toolbar in Firefox

+
+ +

+ Once installed, you can add the extension to your firefox toolbar with just a few easy steps. +

+
Step 1: Find the extensions icon on your toolbar.
+

+ It should look like this: +

+
+ Right-clicking on the extension icon +
+
Step 2: Left click this icon and a list of your currently installed extensions should show.
+

+ Next to AllTheBookmarks, on the right you should see a pin icon, click this. +

+
+ Extension settings page +
+

+ Once pinned, you should see the AllTheBookmarks icon on the toolbar. +

+
+ Extension settings page +
+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/firefox/settings.html b/app/plugins/bookmarks/views/tutorials/firefox/settings.html new file mode 100644 index 0000000..cbb06c9 --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/firefox/settings.html @@ -0,0 +1,33 @@ +
+
+
+

How to Access Extension Settings in Firefox

+
+ +

+ With Firefox, accessing the extension settings couldn't be easier. +

+
Step 1: Locate the Extension Icon
+

+ Simply locate the AllTheBookmarks icon on your toolbar and right-click the icon. +

+
+ Right-clicking on the extension icon +
+
Step 2: Open the Options
+

+ From the dropdown menu that appears, select Options. You should be greeted by a settings page very similar to the one below. +

+
+ Extension settings page +
+

+ (If you need help pinning the extension to your toolbar for easy access, we have a separate + tutorial for that.) +

+
+
+
\ No newline at end of file diff --git a/app/plugins/bookmarks/views/tutorials/list.html b/app/plugins/bookmarks/views/tutorials/list.html new file mode 100644 index 0000000..8173a1c --- /dev/null +++ b/app/plugins/bookmarks/views/tutorials/list.html @@ -0,0 +1,202 @@ +
+

Browser Tutorials

+ +
\ No newline at end of file diff --git a/app/plugins/members/controllers/member.php b/app/plugins/members/controllers/member.php index 51b2e22..31959bf 100644 --- a/app/plugins/members/controllers/member.php +++ b/app/plugins/members/controllers/member.php @@ -174,7 +174,7 @@ class Member extends Controller { Session::flash( 'success', 'We aren\'t currently accepting new members, please check back soon!' ); return Redirect::home(); } - Views::view( 'members.landing', $product ); + Views::view( 'members.join', $product ); } public function checkout( $plan = 'monthly' ) { @@ -210,6 +210,7 @@ class Member extends Controller { 'quantity' => 1, ]], 'mode' => 'subscription', + 'allow_promotion_codes' => true, 'success_url' => $successUrl, 'cancel_url' => Routes::getAddress() . 'member/payment/cancel', ]); @@ -304,6 +305,7 @@ class Member extends Controller { 'quantity' => 1, ]], 'mode' => 'subscription', + 'allow_promotion_codes' => true, 'success_url' => Routes::getAddress() . 'member/payment/complete?session_id={CHECKOUT_SESSION_ID}', 'cancel_url' => Routes::getAddress() . 'member/payment/cancel', ]); diff --git a/app/plugins/members/plugin.php b/app/plugins/members/plugin.php index 54b0adb..b347f47 100644 --- a/app/plugins/members/plugin.php +++ b/app/plugins/members/plugin.php @@ -98,7 +98,6 @@ class Members extends Plugin { 'default' => 'sk_xxxxxxxxxxxxxxx', ], ]; - public static $webhookEvents = [ 'customer.subscription.created', 'customer.subscription.updated', @@ -110,7 +109,6 @@ class Members extends Plugin { 'invoice.payment_succeeded', 'checkout.session.completed', ]; - public static $userLinks = [ "url" => "{ROOT_URL}member/manage", "name" => "Subscriptions" diff --git a/app/plugins/members/views/landing.html b/app/plugins/members/views/join.html similarity index 98% rename from app/plugins/members/views/landing.html rename to app/plugins/members/views/join.html index d9c397a..d124c21 100644 --- a/app/plugins/members/views/landing.html +++ b/app/plugins/members/views/join.html @@ -1,7 +1,7 @@

Compare plans

-
+
diff --git a/app/views/footer/container.html b/app/views/footer/container.html index 9a4859b..9e6cdb1 100644 --- a/app/views/footer/container.html +++ b/app/views/footer/container.html @@ -1,11 +1,11 @@ -
+
{FOOTER_LEFT} {FOOTER_CENTER} {FOOTER_RIGHT}
-
+
{COPY} {SOCIAL}
diff --git a/app/views/index.html b/app/views/index.html index 27a2895..c35051c 100644 --- a/app/views/index.html +++ b/app/views/index.html @@ -1,5 +1,5 @@ -
+

AllTheBookmarks - In one place

Quickly add and manage an internet worth of bookmarks with AllTheBookmarks, my personal favorite app for keeping track of dead memes long after they outlive their hilarity.

@@ -14,7 +14,7 @@
- Example image + Example image
@@ -23,7 +23,7 @@
-

All the stuff you need, none of the stuff you don't!

+

All the stuff you need, none of the stuff you don't!

I just wanted something cross-browser for storing bookmarks.

@@ -104,7 +104,7 @@
-

Never Browse without it

+

Never Browse without it

@@ -164,7 +164,7 @@
-
+

Clean, Simple, Direct

An intuitive app with a sleep, modern design is the goal. There is no need for hundreds of bells in whistles, no bluetooth, no AII to tell you what your best bookmark is, just a simple app to make life easier.

@@ -187,7 +187,7 @@
+
diff --git a/app/views/login.html b/app/views/login.html index 6ed5b17..2dc0542 100644 --- a/app/views/login.html +++ b/app/views/login.html @@ -26,14 +26,14 @@
- Forgot password?

Don't have an account?

- + Create new
diff --git a/app/views/nav/statusLoggedOut.html b/app/views/nav/statusLoggedOut.html index aecd27d..1b28575 100644 --- a/app/views/nav/statusLoggedOut.html +++ b/app/views/nav/statusLoggedOut.html @@ -1,4 +1,3 @@ -