[3.0] Theme

Languages/en_US/Editor.php

@@ -15,6 +15,21 @@
 $editortxt['font_name'] = 'Font name';
 $editortxt['font_size'] = 'Font size';
 $editortxt['font_color'] = 'Font color';
+$editortxt['black'] = 'Black';
+$editortxt['red'] = 'Red';
+$editortxt['yellow'] = 'Yellow';
+$editortxt['pink'] = 'Pink';
+$editortxt['green'] = 'Green';
+$editortxt['orange'] = 'Orange';
+$editortxt['purple'] = 'Purple';
+$editortxt['blue'] = 'Blue';
+$editortxt['beige'] = 'Beige';
+$editortxt['brown'] = 'Brown';
+$editortxt['teal'] = 'Teal';
+$editortxt['navy'] = 'Navy';
+$editortxt['maroon'] = 'Maroon';
+$editortxt['lime_green'] = 'Lime Green';
+$editortxt['white'] = 'White';
 $editortxt['remove_formatting'] = 'Remove formatting';
 $editortxt['cut'] = 'Cut';
 $editortxt['browser_no_cut'] = 'Your browser does not allow the cut command. Please use the keyboard shortcut Ctrl/Cmd-X';

Languages/en_US/General.php

@@ -239,6 +239,7 @@
 $txt['page'] = 'Page';
 $txt['prev'] = 'Previous page';
 $txt['next'] = 'Next page';
+$txt['breadcrumb'] = 'Breadcrumb';
 
 $txt['page_title_number'] = '{title} - Page {pagenum, number, integer}';
 
@@ -307,7 +308,8 @@
 $txt['reply_quote'] = 'Reply with quote';
 $txt['reply'] = 'Reply';
 $txt['reply_noun'] = 'Reply';
-$txt['reply_number'] = 'Reply #{0, number} - ';
+$txt['reply_number'] = 'Reply #{0, number}';
+$txt['reply_number_sr'] = '<span class="visually_hidden">Reply</span> #{0, number}';
 $txt['approve'] = 'Approve';
 $txt['unapprove'] = 'Unapprove';
 $txt['approve_all'] = 'approve all';

Languages/en_US/Help.php

@@ -265,6 +265,7 @@
 $helptxt['enable_ajax_alerts'] = 'This option allows your members to receive AJAX notifications. This means that members do not need to refresh the page to get new notifications.<br><strong>NOTE:</strong> This option might cause a severe load at your server with many users online.';
 $helptxt['alerts_auto_purge'] = 'Once an alert has been read, it is rarely needed again. For performance reasons, it is a good idea to automatically delete them after a while.';
 $helptxt['jquery_source'] = 'This will determine the source used to load the jQuery Library. <em>Google CDN, jQuery CDN</em> and <em>Microsoft CDN</em> will load the jQuery library from those respective CDN networks. <em>Local</em> will only use the local source. <em>Custom</em> allows you to specify a custom URL for the library.';
+$helptxt['fontawesome_source'] = 'This will determine the source used to load the Font Awesome Library. <em>Cloudflare CDN</em>, and <em>Font Awesome CDN</em> will load the Font Awesome library from those respective CDN networks. <em>Local</em> will only use the local source. <em>Custom</em> allows you to specify a custom URL for the library.';
 $helptxt['compactTopicPagesEnable'] = 'This will just show a selection of the number of pages.<br><em>Example:</em>
 		&quot;3&quot; to display: 1 ... 4 [5] 6 ... 9 <br>
 		&quot;5&quot; to display: 1 ... 3 4 [5] 6 7 ... 9';

Languages/en_US/ManageMaintenance.php

@@ -100,7 +100,7 @@
 $txt['database_optimize_attempt'] = 'Attempting to optimize your database...';
 $txt['database_optimizing'] = 'Optimizing {0}... {1} KB optimized.';
 $txt['database_already_optimized'] = 'All of the tables were already optimized.';
-$txt['database_opimize_unneeded'] = 'It was not necessary to optimize any tables.';
+$txt['database_opimize_unneeded'] = 'No tables need to be optimized.';
 $txt['database_optimized'] = ' table(s) optimized.';
 $txt['database_no_id'] = 'has a non-existent member ID';
 
@@ -162,16 +162,14 @@
 
 $txt['maintain_recount'] = 'Recount all forum totals and statistics';
 $txt['maintain_recount_info'] = 'Should the total replies of a topic or the number of PMs in your inbox be incorrect: this function will recount all saved counts and statistics for you.';
-$txt['maintain_errors'] = 'Find and repair any errors';
-$txt['maintain_errors_info'] = 'If, for example, posts or topics are missing after a server crash, this function may help in finding them again.';
-$txt['maintain_logs'] = 'Empty out unimportant logs';
-$txt['maintain_logs_info'] = 'This function will empty out all unimportant logs. This should be avoided unless something is wrong, but it does not hurt anything.';
-$txt['maintain_cache'] = 'Empty SMF’s cache';
-$txt['maintain_cache_info'] = 'This function will empty out the cache should you need it to be cleared.';
-$txt['maintain_optimize'] = 'Optimize all tables';
-$txt['maintain_optimize_info'] = 'This task allows you to optimize all tables. This will get rid of overhead, effectively making the tables smaller in size and your forum faster.';
+$txt['maintain_repair'] = 'Find and repair any errors';
+$txt['maintain_repair_info'] = 'Try to find and fix any errors that may prevent posts or topics from showinng up or being searchable. This should be run afer a forum conversion.';
+$txt['maintain_logs'] = 'Clear logs';
+$txt['maintain_logs_info'] = 'Clear out all information-related logs, such as the error log. This should be avoided unless something is wrong, and will not adversely affect forum operations';
+$txt['maintain_cleancache'] = 'Empty SMF’s cache';
+$txt['maintain_cleancache_info'] = 'Empty out the cache should you need it to be cleared.';
 $txt['maintain_version'] = 'Check all files against current versions';
-$txt['maintain_version_info'] = 'This maintenance task allows you to do a detailed version check of all forum files against the official list of latest versions.';
+$txt['maintain_version_info'] = 'Runs a detailed version check of all forum files against the official list of latest versions and displays the results.';
 $txt['maintain_rebuild_settings'] = 'Rebuild Settings.php';
 $txt['maintain_rebuild_settings_info'] = 'This task reconstructs your Settings.php file. It does not change the values stored in the file. Instead, it cleans up and reformats your Settings.php file to a pristine version.';
 $txt['maintain_run_now'] = 'Run task now';
@@ -183,7 +181,7 @@
 $txt['maintain_old_nothing_else'] = 'Any sort of topic.';
 $txt['maintain_old_are_moved'] = 'Moved/merged topic notices.';
 $txt['maintain_old_are_locked'] = 'Locked.';
-$txt['maintain_old_are_not_stickied'] = 'But do not count stickied topics.';
+$txt['maintain_old_are_not_stickied'] = 'Exclude sticky topics.';
 $txt['maintain_old_all'] = 'All boards (click to select specific boards)';
 $txt['maintain_old_choose'] = 'Specific boards (click to select all)';
 $txt['maintain_old_remove'] = 'Remove now';
@@ -207,10 +205,10 @@
 $txt['mediumtext_introduction'] = 'The default messages table can contain posts up to a size of 65535 characters, in order be able to store bigger texts the column must be converted to "MEDIUMTEXT". This operation is not reversible.';
 $txt['body_checking_introduction'] = 'This function will convert the column of your database that contains the text of the messages into a "TEXT" format (currently is "MEDIUMTEXT"). This operation will allow to slightly reduce the amount of space occupied by each message (1 byte per message). If any message stored into the database is longer than 65535 characters it will be truncated and part of the text will be lost.';
 
-$txt['entity_convert_title'] = 'Convert HTML-entities to UTF-8 characters';
-$txt['entity_convert_only_utf8'] = 'The database needs to be in UTF-8 format before HTML-entities can be converted to UTF-8';
-$txt['entity_convert_introduction'] = 'This function will convert all characters that are stored in the database as HTML-entities to UTF-8 characters. This is especially useful when you have just converted your forum from a character set like ISO-8859-1 while non-latin characters were used on the forum. The browser then sends all characters as HTML-entities. For example, the HTML-entity α represents the greek letter α (alpha). Converting entities to UTF-8 will improve searching and sorting of text and reduce storage size.';
-$txt['entity_convert_proceed'] = 'Proceed';
+$txt['maintain_convertentities'] = 'Convert HTML-entities to UTF-8 characters';
+$txt['maintain_convertentities_only_utf8'] = 'The database needs to be in UTF-8 format before HTML-entities can be converted to UTF-8';
+$txt['maintain_convertentities_info'] = 'This function will convert all characters that are stored in the database as HTML-entities to UTF-8 characters. This is especially useful when you have just converted your forum from a character set like ISO-8859-1 while non-latin characters were used on the forum. The browser then sends all characters as HTML-entities. For example, the HTML-entity α represents the greek letter α (alpha). Converting entities to UTF-8 will improve searching and sorting of text and reduce storage size.';
+$txt['maintain_convertentities_proceed'] = 'Proceed';
 
 // Move topics out.
 $txt['move_topics_maintenance'] = 'Move Topics';

Languages/en_US/ManageSettings.php

@@ -73,12 +73,16 @@
 $txt['alerts_auto_purge_0'] = 'Never';
 $txt['alerts_per_page'] = 'Alerts Per Page';
 $txt['jquery_source'] = 'Source for the jQuery Library';
-$txt['jquery_custom_label'] = 'Custom';
 $txt['jquery_custom'] = 'Custom URL to the jQuery Library';
-$txt['jquery_local'] = 'Local';
-$txt['jquery_google_cdn'] = 'Google CDN';
-$txt['jquery_jquery_cdn'] = 'jQuery CDN';
-$txt['jquery_microsoft_cdn'] = 'Microsoft CDN';
+$txt['fontawesome_source'] = 'Source for the FontAwesome Library';
+$txt['fontawesome_custom'] = 'Custom URL to the FontAwesome Library';
+$txt['cdn_custom_label'] = 'Custom';
+$txt['local_cdn'] = 'Local';
+$txt['google_cdn'] = 'Google CDN';
+$txt['jquery_cdn'] = 'jQuery CDN';
+$txt['microsoft_cdn'] = 'Microsoft CDN';
+$txt['cloudflare_cdn'] = 'Cloudflare CDN';
+$txt['fontawesome_cdn'] = 'FontAwesome CDN';
 $txt['minimize_files'] = 'Minimize CSS and JavaScript files';
 $txt['queryless_urls'] = 'Use friendly URLs';
 $txt['queryless_urls_note'] = 'Supported on Apache, Lighttpd, and LiteSpeed only';

Languages/en_US/Profile.php

@@ -645,6 +645,8 @@
 $txt['theme_opt_posting'] = 'Posting';
 $txt['theme_opt_moderation'] = 'Moderation';
 $txt['theme_opt_personal_messages'] = 'Personal Messages';
+$txt['theme_opt_colormode'] = 'Theme Color Mode';
+$txt['theme_opt_variant'] = 'Theme Variant';
 
 $txt['export_profile_data'] = 'Download profile data';
 $txt['export_profile_data_desc'] = 'This section allows you to export a copy of your forum profile data to a downloadable file, optionally including your posts and personal messages.<br>Please note:<ul class="bbc_list">{list}</ul>';

Languages/en_US/Themes.php

@@ -65,6 +65,7 @@
 
 $txt['theme_url_config'] = 'Theme URLs and Configuration';
 $txt['theme_variants'] = 'Theme Variants';
+$txt['theme_colormodes'] = 'Theme Color Modes';
 $txt['theme_options'] = 'Theme Options and Preferences';
 $txt['actual_theme_name'] = 'This theme’s name: ';
 $txt['actual_theme_dir'] = 'This theme’s directory: ';
@@ -73,6 +74,7 @@
 $txt['current_theme_style'] = 'This theme’s style: ';
 
 $txt['theme_variants_default'] = 'Default theme variant';
+$txt['variant_default'] = 'Default';
 $txt['theme_variants_user_disable'] = 'Disable user variant selection';
 
 $txt['site_slogan'] = 'Site slogan';
@@ -164,3 +166,11 @@
 // Open Graph
 $txt['og_image'] = 'Open Graph image';
 $txt['og_image_desc'] = 'Suggested size: 175x175px. <a href="https://ogp.me/" target="_blank" class="bbc_link">Open Graph</a> is used for social media sharing.';
+
+// Theme Mode (dark, light, system, etc)
+$txt['theme_pick_colormode'] = 'Select Color Mode';
+$txt['theme_colormode_default'] = 'Default color mode';
+$txt['theme_colormode_user_disable'] = 'Disable user color mode selection';
+$txt['colormode_light'] = 'Light';
+$txt['colormode_dark'] = 'Dark';
+$txt['colormode_system'] = 'System Default';

Sources/Actions/Admin/Features.php

@@ -1572,10 +1572,10 @@ public static function basicConfigVars(): array
 				'select',
 				'jquery_source',
 				[
-					'cdn' => Lang::getTxt('jquery_google_cdn', file: 'ManageSettings'),
-					'jquery_cdn' => Lang::getTxt('jquery_jquery_cdn', file: 'ManageSettings'),
-					'microsoft_cdn' => Lang::getTxt('jquery_microsoft_cdn', file: 'ManageSettings'),
-					'local' => Lang::getTxt('jquery_local', file: 'ManageSettings'),
+					'cdn' => Lang::getTxt('google_cdn', file: 'ManageSettings'),
+					'jquery_cdn' => Lang::getTxt('jquery_cdn', file: 'ManageSettings'),
+					'microsoft_cdn' => Lang::getTxt('microsoft_cdn', file: 'ManageSettings'),
+					'local' => Lang::getTxt('local_cdn', file: 'ManageSettings'),
 					'custom' => Lang::getTxt('jquery_custom', file: 'ManageSettings'),
 				],
 				'onchange' => 'if (this.value == \'custom\'){document.getElementById(\'jquery_custom\').disabled = false; } else {document.getElementById(\'jquery_custom\').disabled = true;}',
@@ -1585,6 +1585,24 @@ public static function basicConfigVars(): array
 				'jquery_custom',
 				'disabled' => !isset(Config::$modSettings['jquery_source']) || (isset(Config::$modSettings['jquery_source']) && Config::$modSettings['jquery_source'] != 'custom'), 'size' => 75,
 			],
+
+			// FontAwesome source
+			[
+				'select',
+				'fontawesome_source',
+				[
+					'cdn' => Lang::getTxt('cloudflare_cdn', file: 'ManageSettings'),
+					'fontawesome_cdn' => Lang::getTxt('fontawesome_cdn', file: 'ManageSettings'),
+					'local' => Lang::getTxt('local_cdn', file: 'ManageSettings'),
+					'custom' => Lang::getTxt('fontawesome_custom', file: 'ManageSettings'),
+				],
+				'onchange' => 'if (this.value == \'custom\'){document.getElementById(\'fontawesome_custom\').disabled = false; } else {document.getElementById(\'fontawesome_custom\').disabled = true;}',
+			],
+			[
+				'text',
+				'fontawesome_custom',
+				'disabled' => !isset(Config::$modSettings['fontawesome_source']) || (isset(Config::$modSettings['fontawesome_source']) && Config::$modSettings['fontawesome_source'] != 'custom'), 'size' => 75,
+			],
 			'',
 
 			// css and js minification.

Sources/Actions/Admin/Maintenance.php

@@ -79,7 +79,6 @@ class Maintenance implements ActionInterface
 	public static array $subactions = [
 		'routine' => [
 			'function' => 'routine',
-			'template' => 'maintain_routine',
 			'activities' => [
 				'version' => 'version',
 				'repair' => 'repair',
@@ -91,7 +90,6 @@ class Maintenance implements ActionInterface
 		],
 		'database' => [
 			'function' => 'database',
-			'template' => 'maintain_database',
 			'activities' => [
 				'optimize' => 'optimize',
 				'convertentities' => 'entitiesToUnicode',
@@ -155,7 +153,7 @@ public function execute(): void
 		// Set a few things.
 		Utils::$context['page_title'] = Lang::getTxt('maintain_title', file: 'Admin');
 		Utils::$context['sub_action'] = $this->subaction;
-		Utils::$context['sub_template'] = !empty(self::$subactions[$this->subaction]['template']) ? self::$subactions[$this->subaction]['template'] : '';
+		Utils::$context['sub_template'] = self::$subactions[$this->subaction]['template'] ?? 'options';
 
 		$call = \is_string(self::$subactions[$this->subaction]['function']) && method_exists($this, self::$subactions[$this->subaction]['function']) ? [$this, self::$subactions[$this->subaction]['function']] : Utils::getCallable(self::$subactions[$this->subaction]['function']);
 
@@ -184,30 +182,43 @@ public function routine(): void
 		if (isset($_GET['done']) && \in_array($_GET['done'], ['recount', 'rebuild_settings'])) {
 			Utils::$context['maintenance_finished'] = Lang::getTxt('maintain_' . $_GET['done'], file: 'ManageMaintenance');
 		}
+		Utils::$context['template_layers'][] = 'maintain';
+		Utils::$context['options'] = array_combine(
+			array_keys(self::$subactions[$this->subaction]['activities']),
+			array_fill(0, count(self::$subactions[$this->subaction]['activities']), []),
+		);
+		Utils::$context['post_url'] = Config::$scripturl . '?action=admin;area=maintain';
 	}
 
 	/**
 	 * Supporting function for the database maintenance area.
 	 */
 	public function database(): void
 	{
+		Utils::$context['template_layers'][] = 'maintain';
+		Utils::$context['options'] = array_combine(
+			array_keys(self::$subactions[$this->subaction]['activities']),
+			array_fill(0, count(self::$subactions[$this->subaction]['activities']), []),
+		);
+		Utils::$context['post_url'] = Config::$scripturl . '?action=admin;area=maintain;sa=database';
+
 		// Show some conversion options?
 		Utils::$context['convert_entities'] = true;
 
 		if (Config::$db_type == 'mysql') {
-			$colData = Db::$db->list_columns('{db_prefix}messages', true);
+			$body_type = array_column(Db::$db->list_columns('{db_prefix}messages', true), 'type', 'name')['body'];
+			Utils::$context['options']['convertmsgbody']['title'] = Lang::$txt[($body_type == 'text' ? 'mediumtext' : 'text') . '_title'];
+			Utils::$context['options']['convertmsgbody']['info'] = Lang::$txt['mediumtext_info'];
 
-			foreach ($colData as $column) {
-				if ($column['name'] == 'body') {
-					$body_type = $column['type'];
-				}
+			if ($body_type != 'text' && !empty(Config::$modSettings['max_messageLength']) && Config::$modSettings['max_messageLength'] < 65536) {
+				Utils::$context['options']['convertmsgbody']['after'] = '<p class="infobox">' . Lang::$txt['convert_to_suggest_text'] . '</p>';
 			}
-
-			Utils::$context['convert_to'] = $body_type == 'text' ? 'mediumtext' : null;
+		} else {
+			unset(Utils::$context['options']['convertmsgbody']);
 		}
 
 		if (isset($_GET['done']) && $_GET['done'] == 'convertentities') {
-			Utils::$context['maintenance_finished'] = Lang::getTxt('entity_convert_title', file: 'ManageMaintenance');
+			Utils::$context['maintenance_finished'] = Lang::getTxt('maintain_convertentities_title', file: 'ManageMaintenance');
 		}
 	}
 

Sources/Actions/Admin/Subscriptions.php

@@ -871,6 +871,7 @@ public function modifyUser(): void
 		// Setup the template.
 		Utils::$context['sub_template'] = 'modify_user_subscription';
 		Utils::$context['page_title'] = Lang::getTxt(Utils::$context['action_type'] . '_subscriber', file: 'ManagePaid');
+		Theme::loadJavaScriptFile('paidsubs.js', ['defer' => true, 'minimize' => true], 'smf_paidsubs');
 
 		// If we haven't been passed the subscription ID get it.
 		if (Utils::$context['log_id'] && !Utils::$context['sub_id']) {