diff --git a/class/dashboard/subpage-main.php b/class/dashboard/subpage-main.php index f97a8ae..2d09a7d 100644 --- a/class/dashboard/subpage-main.php +++ b/class/dashboard/subpage-main.php @@ -17,7 +17,7 @@ * 2.2.0 add options, redistribute, update strings 2020-12-12T2135+0100 * 2.2.0 shortcode for reference container custom position 2020-12-13T2055+0100 * - * Last modified: 2020-12-13T2055+0100 + * Last modified: 2020-12-14T1404+0100 */ /** @@ -121,6 +121,7 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { $this->addMetaBox("customize", "mouse-over-box-position", __("Tooltip position", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "MouseOverBoxPosition"), $this->addMetaBox("customize", "mouse-over-box-timing", __("Tooltip timing", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "MouseOverBoxTiming"), $this->addMetaBox("customize", "mouse-over-box-appearance", __("Tooltip appearance", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "MouseOverBoxAppearance"), + $this->addMetaBox("customize", "custom-css", __("Custom CSS", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "CustomCSS"), $this->addMetaBox("expert", "lookup", __("WordPress hooks and priority levels", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "LookupHooks"), $this->addMetaBox("expert", "custom-css", __("Custom CSS", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "CustomCSS"), @@ -252,6 +253,11 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { "label-line-break" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_LINE_BREAKS_ENABLED, __("Stack backlinks when enumerating:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "line-break" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_LINE_BREAKS_ENABLED, $l_arr_Enabled), "notice-line-break" => __("This option adds a line break before each added backlink when identical footnotes are combined.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + + "label-link" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_LINK_ELEMENT_ENABLED, __("Use the link element for referrers and backlinks:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "link" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_LINK_ELEMENT_ENABLED, $l_arr_Enabled), + "notice-link" => __("The link element is needed to apply the theme’s link color.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "description-link" => __("If the link element is not desired for styling, a simple span is used instead when the above is set to No. The link addresses have been removed. Else footnote clicks are logged in the browsing history and make the back button unusable.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), ) ); // display template with replaced placeholders diff --git a/class/settings.php b/class/settings.php index 839403b..f1b2c80 100644 --- a/class/settings.php +++ b/class/settings.php @@ -22,7 +22,7 @@ * 2.1.6 set default priority level of the_content to 98 2020-12-10T0447+0100 * 2.2.0 reference container custom position shortcode 2020-12-13T2056+0100 * - * Last modified: 2020-12-13T2057+0100 + * Last modified: 2020-12-13T2123+0100 */ @@ -534,7 +534,7 @@ class MCI_Footnotes_Settings { // whether to enqueue additional style sheet: self::C_STR_FOOTNOTES_PAGE_LAYOUT_SUPPORT => 'none', - self::C_STR_REFERENCE_CONTAINER_POSITION_SHORTCODE => '[[references]]', + self::C_STR_REFERENCE_CONTAINER_POSITION_SHORTCODE => '[[references]]', self::C_BOOL_REFERENCE_CONTAINER_START_PAGE_ENABLE => 'yes', self::C_BOOL_REFERENCE_CONTAINER_3COLUMN_LAYOUT_ENABLE => 'no', self::C_BOOL_REFERENCE_CONTAINER_BACKLINK_SYMBOL_ENABLE => 'yes', diff --git a/class/task.php b/class/task.php index cf518c5..132d45c 100644 --- a/class/task.php +++ b/class/task.php @@ -120,7 +120,7 @@ class MCI_Footnotes_Task { add_filter('the_title', array($this, "the_title"), $p_int_TheTitlePriority); } - // custom priority level for reference container relative positioning; default PHP_INT_MAX: + // custom priority level for reference container relative positioning; default 98: if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_THE_CONTENT))) { add_filter('the_content', array($this, "the_content"), $p_int_TheContentPriority); } @@ -256,7 +256,7 @@ class MCI_Footnotes_Task { printf(" -moz-box-shadow: 2px 2px 11px %s;", $l_str_BoxShadowColor); printf(" box-shadow: 2px 2px 11px %s;", $l_str_BoxShadowColor); } - echo '}'; + echo "}\r\n"; // set custom CSS to override settings, not conversely: echo MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_CUSTOM_CSS); diff --git a/css/settings.css b/css/settings.css index 64776be..5761adc 100755 --- a/css/settings.css +++ b/css/settings.css @@ -7,7 +7,7 @@ * * Version: 2.2.0 * - * Last modified: 2020-12-13T2059+0100 + * Last modified: 2020-12-13T2127+0100 */ @@ -147,7 +147,7 @@ span.footnote_highlight_placeholder { .footnote_placeholder_box_example { border: 2px solid #2bb975 !important; border-radius: 4px !important; - padding-top: 16px 0 !important; + padding: 16px 0 !important; width: 50% !important; display: block !important; margin: 20px auto !important; diff --git a/footnotes.php b/footnotes.php index e7812d5..75885c7 100755 --- a/footnotes.php +++ b/footnotes.php @@ -4,12 +4,12 @@ Plugin URI: https://wordpress.org/plugins/footnotes/ Description: time to bring footnotes to your website! footnotes are known from offline publishing and everybody takes them for granted when reading a magazine. Author: Mark Cheret - Version: 2.2.0 + Version: 2.2.1 Author URI: http://cheret.de/plugins/footnotes-2/ Text Domain: footnotes Domain Path: /languages */ -define( 'FOOTNOTES_VERSION', '2.2.0' ); +define( 'FOOTNOTES_VERSION', '2.2.1' ); /* Copyright 2020 Mark Cheret (email: mark@cheret.de) diff --git a/readme.txt b/readme.txt index f82ce86..0a40b32 100755 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: footnote, footnotes, bibliography, formatting, notes, Post, posts, referen Requires at least: 3.9 Tested up to: 5.6 Requires PHP: 5.6 -Stable Tag: 2.1.6 +Stable Tag: 2.2.1 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -80,6 +80,9 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest** == Changelog == += 2.2.1 = +- Bugfix: Dashboard: duplicate moved settings under their legacy tab to account for data structure + = 2.2.0 = - Add: Reference container: support for custom position shortcode - Update: Priority levels: update the notice in the dashboard Priority tab diff --git a/templates/dashboard/settings-reference-container.html b/templates/dashboard/settings-reference-container.html index e3e97eb..ef983e3 100644 --- a/templates/dashboard/settings-reference-container.html +++ b/templates/dashboard/settings-reference-container.html @@ -88,7 +88,11 @@ [[label-line-break]] [[line-break]] [[notice-line-break]] - + + + + [[label-link]] + [[link]] [[notice-link]]