From e3cb392ace82614afacf61fbbfab3900ed82a851 Mon Sep 17 00:00:00 2001 From: pewgeuges <73141620+pewgeuges@users.noreply.github.com> Date: Wed, 18 Nov 2020 00:47:53 +0000 Subject: [PATCH] stable bugfix release 2.1.1 git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2420456 b8457f37-d9ea-0310-8a92-e5e31aec5664 --- class/dashboard/subpage-main.php | 7 ++-- class/init.php | 2 +- class/task.php | 16 ++++++-- css/public.css | 15 ++++++-- css/settings.css | 4 +- footnotes.php | 2 +- js/jquery.tools.js | 8 ++-- readme.txt | 51 +++++++------------------- templates/dashboard/expert-lookup.html | 14 +++---- 9 files changed, 57 insertions(+), 62 deletions(-) diff --git a/class/dashboard/subpage-main.php b/class/dashboard/subpage-main.php index 9e03bef..c562ad3 100644 --- a/class/dashboard/subpage-main.php +++ b/class/dashboard/subpage-main.php @@ -302,7 +302,7 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { // replace all placeholders $l_obj_Template->replace( array( - "label-superscript" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_REFERRER_SUPERSCRIPT_TAGS, __("Enable superscript footnote referrers", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-superscript" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_REFERRER_SUPERSCRIPT_TAGS, __("Enable superscript for footnote referrers", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "superscript" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_REFERRER_SUPERSCRIPT_TAGS, $l_arr_Enabled), "label-before" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_STYLING_BEFORE, __("Before Footnotes index", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), @@ -489,8 +489,9 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { "url-the-title" => "http://codex.wordpress.org/Plugin_API/Filter_Reference/the_title", "label-the-content" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_THE_CONTENT, "the_content"), - "the-content" => $this->addCheckbox(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_THE_CONTENT), - "priority-the-content" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_EXPERT_LOOKUP_THE_CONTENT_PRIORITY_LEVEL, 0, PHP_INT_MAX), + "the-content" => $this->addCheckbox(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_THE_CONTENT), + // allowed for priority level are all positive integers, zero and -1 interpreted as PHP_INT_MAX: + "priority-the-content" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_EXPERT_LOOKUP_THE_CONTENT_PRIORITY_LEVEL, -1, PHP_INT_MAX), "url-the-content" => "http://codex.wordpress.org/Plugin_API/Filter_Reference/the_content", "label-the-excerpt" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_THE_EXCERPT, "the_excerpt"), diff --git a/class/init.php b/class/init.php index a9034ab..ffccc15 100644 --- a/class/init.php +++ b/class/init.php @@ -159,7 +159,7 @@ class MCI_Footnotes { 'mci-footnotes-css-public', plugins_url('../css/public.css', __FILE__), '', - '2.1.1d10' + '2.1.1' ); } diff --git a/class/task.php b/class/task.php index cc4cb24..d1aee03 100644 --- a/class/task.php +++ b/class/task.php @@ -17,7 +17,7 @@ * 2.1.1: options fixing ref container layout and referrer vertical alignment 2020-11-16T2024+0100 * 2.1.1: option fixing ref container relative position 2020-11-17T0254+0100 * - * Last modified 2020-11-17T0255+0100 + * Last modified 2020-11-18T0138+0100 */ // If called directly, abort: @@ -76,6 +76,16 @@ class MCI_Footnotes_Task { * See */ public function registerHooks() { + + // first compute values from settings: + // for now only the_content is supported for customization: + $p_int_TheContentPriority = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_INT_EXPERT_LOOKUP_THE_CONTENT_PRIORITY_LEVEL); + + // PHP_INT_MAX can be set using the value -1: + if ( $p_int_TheContentPriority == -1 ) { + $p_int_TheContentPriority = PHP_INT_MAX; + } + // append custom css to the header add_filter('wp_head', array($this, "wp_head"), PHP_INT_MAX); @@ -88,7 +98,7 @@ class MCI_Footnotes_Task { // SET PRIORITY LEVEL TO CUSTOM FOR PAGE LAYOUT; DEFAULT PHP_INT_MAX: 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"), MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_INT_EXPERT_LOOKUP_THE_CONTENT_PRIORITY_LEVEL)); + add_filter('the_content', array($this, "the_content"), $p_int_TheContentPriority); } if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_EXPERT_LOOKUP_THE_EXCERPT))) { add_filter('the_excerpt', array($this, "the_excerpt"), PHP_INT_MAX); @@ -525,7 +535,7 @@ class MCI_Footnotes_Task { // FOOTNOTE INDEX BACKLINK SYMBOL - // check if arrow is not disabled: + // check if arrow is enabled: if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_BACKLINK_SYMBOL_ENABLE))) { // get html arrow diff --git a/css/public.css b/css/public.css index fcd1f2a..da97741 100755 --- a/css/public.css +++ b/css/public.css @@ -4,9 +4,9 @@ * Created-Date: 15.05.14 * Created-Time: 16:21 * Since: 1.0 - * Version: 2.1.1d10 + * Version: 2.1.1 * - * Last modified: 2020-11-17T0256+0100 + * Last modified: 2020-11-18T0137+0100 */ @@ -143,7 +143,6 @@ label .footnote_container_prepare { display: block !important; padding-top: 24px !important; - margin-bottom: -5px; } .footnote_container_prepare > p { line-height: 1.3 !important; @@ -212,9 +211,17 @@ reference-container-body.html text-decoration: none !important; border-bottom: none !important; } -.footnote_backlink:hover, +/* +These rules when enabled cause the backlink to take an overline +when hovered in some themes, not in others: .footnote_plugin_index:hover, +.footnote_plugin_index.pointer:hover, +*/ +.footnote_backlink:hover, +.footnote_plugin_index_combi:hover, +.footnote_plugin_link:hover, .footnote_plugin_text a:hover { + text-decoration: unset; text-decoration: underline !important; } .footnote_plugin_index { diff --git a/css/settings.css b/css/settings.css index 3edbbea..6bdf62a 100755 --- a/css/settings.css +++ b/css/settings.css @@ -4,9 +4,9 @@ * Created-Date: 15.05.14 * Created-Time: 16:21 * Since: 1.0 - * Version: 2.1.1d10 + * Version: 2.1.1 * - * Last modified: 2020-11-17T0256+0100 + * Last modified: 2020-11-18T0136+0100 */ diff --git a/footnotes.php b/footnotes.php index 9227b8b..e3225ba 100755 --- a/footnotes.php +++ b/footnotes.php @@ -4,7 +4,7 @@ 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.1.1d10 + Version: 2.1.1 Author URI: http://cheret.de/plugins/footnotes-2/ Text Domain: footnotes Domain Path: /languages diff --git a/js/jquery.tools.js b/js/jquery.tools.js index cc33d6d..71448ef 100644 --- a/js/jquery.tools.js +++ b/js/jquery.tools.js @@ -21,13 +21,13 @@ * * ----- * - * Added jQueryUI and checks whether jQuery.browser exists - * Following @vonpiernik - * 2020-10-26T2005+0100 + * Added checks whether jQuery.browser exists 2020-10-26T2005+0100 + * * * Removed usage of jQuery browser check function 2020-11-12T0127+0100 * ‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾‾ - * See also on the Forum, lastly + * See also on the Forum: , + * lastly * * #1 (54) This was only a tweak to adjust width and height in Internet Explorer. * diff --git a/readme.txt b/readme.txt index 7aae771..24a7c10 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.5 Requires PHP: 5.6 -Stable Tag: 2.1.0 +Stable Tag: 2.1.1 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -80,48 +80,25 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest** == Changelog == -= 2.1.1d10 = -- Bugfix: Layout: Reference container: fix relative positioning by priority level setting - -= 2.1.1d9 = += 2.1.1 = +- Bugfix: Combining identical footnotes: fix dead links, ensure referrer-backlink bijectivity +- Update: Libraries: jQuery Tools: redact jQuery.browser function use in js/jquery.tools.min.js +- Update: Libraries: jQuery Tools: complete minification +- Bugfix: Libraries: made script loads depend on tooltip implementation option +- Bugfix: Libraries: jQuery UI: properly pick the libraries registered by WordPress needed for tooltips +- Bugfix: UI: Tooltips: optional alternative JS implementation with CSS animation to fix site issues +- Bugfix: UI: Tooltips: add delay (400ms) before fade-out to fix UX wrt links and Read-on button +- Bugfix: UI: Tooltips: fix line breaking for hyperlinked URLs in Unicode-non-compliant user agents - Bugfix: Layout: Footnote referrers: select box to make superscript optional wrt themes w/o support -- Bugfix: Layout: Footnote referrers: new fix for line height +- Bugfix: Layout: Reference container: fix relative positioning by priority level setting - Bugfix: Layout: Reference container: Backlink symbol: select box to disable instead of space character +- Bugfix: Layout: Reference container: Footnote number links: disable bottom border for theme compatibility - Bugfix: Layout: Reference container: option to restore 3-column layout when combined are turned off - Bugfix: Layout: Reference container: option to APpend symbol in 2-column when combined are turned off - Bugfix: Layout: Reference container: fix start pages by an option to hide the reference container - Bugfix: Layout: Reference container: Table rows: fix top and bottom padding -- Bugfix: Libraries: made script loads depend on tooltip implementation option - -= 2.1.1d8 = -- Bugfix: Libraries: commented out all script loads to check if it fixes a theme incompatibility - -= 2.1.1d7 = -- Bugfix: Combining identical footnotes: fix dead links, ensure referrer-backlink bijectivity - -= 2.1.1d6 = -- Bugfix: UI: Tooltips: fix line breaking for hyperlinked URLs in Unicode-non-compliant user agents -- Update: Libraries: complete minification of jQuery Tools - -= 2.1.1d5 = -- Add: UI: Tooltips: Alternative implementation: add CSS animation - -= 2.1.1d4 = -- Add: UI: Tooltips: add delay (400ms) before fade-out to improve usability of links and Read-on button -- Update: Libraries: jQuery Tools: redact jQuery.browser function use in js/jquery.tools.min.js - -= 2.1.1d3 = -- Add: UI: Tooltips: experimental optional alternative CSS/JS implementation - -= 2.1.1d2 = -- Bugfix: Libraries: jQuery UI: properly pick the libraries registered by WordPress needed for tooltips - -= 2.1.1d1 = -- Bugfix: Libraries: jQuery UI: load in header not in footer in case it matters for fixing tooltips -- Bugfix: Layout: Ref container: Footnote number links: disable bottom border for theme compatibility - -= 2.1.1d0 -- Bugfix: Libraries: jQuery UI: switch to third party to look whether it can fix a broken tooltip display 2020-11-07T1604+0100/2020-11-08T2242+0100 +- Bugfix: Layout: Footnote referrers: new fix for line height +- Bugfix: Formatting: disabled overline showing in some themes on hovered backlinks = 2.1.0 = - Add: UI: Tooltip: made 'Continue reading' button label customizable diff --git a/templates/dashboard/expert-lookup.html b/templates/dashboard/expert-lookup.html index aeb2e04..03daf5f 100644 --- a/templates/dashboard/expert-lookup.html +++ b/templates/dashboard/expert-lookup.html @@ -1,39 +1,39 @@ - + - + - + - + - + - + - +
[[head-hook]][[head-hook]] [[head-checkbox]]PriorityPriority level
Set -1 for minimum priority		 [[head-url]]
[[label-the-title]][[label-the-title]] [[the-title]] [[url-the-title]]
[[label-the-content]][[label-the-content]] [[the-content]] [[priority-the-content]] [[url-the-content]]
[[label-the-excerpt]][[label-the-excerpt]] [[the-excerpt]] [[url-the-excerpt]]
[[label-widget-title]][[label-widget-title]] [[widget-title]] [[url-widget-title]]
[[label-widget-text]][[label-widget-text]] [[widget-text]] [[url-widget-text]]