diff --git a/class/init.php b/class/init.php index cd8242c..2db91e6 100644 --- a/class/init.php +++ b/class/init.php @@ -12,7 +12,7 @@ * Edited for v2.0.3: Added style sheet versioning 2020-10-29T1413+0100 * Edited for v2.0.4: Added jQuery UI from WordPress 2020-11-01T1902+0100 * - * Last modified: 2020-11-05T0638+0100 + * Last modified: 2020-11-05T1824+0100 */ @@ -126,6 +126,6 @@ class MCI_Footnotes { wp_enqueue_script('mci-footnotes-js-jquery-tools', plugins_url('../js/jquery.tools.min.js', __FILE__)); // IMPORTANT: up-to-date plugin version number for cache busting. - wp_enqueue_style('mci-footnotes-css-public', plugins_url('../css/public.css', __FILE__), '', '2.0.5rc1'); + wp_enqueue_style('mci-footnotes-css-public', plugins_url('../css/public.css', __FILE__), '', '2.0.6'); } } diff --git a/class/task.php b/class/task.php index 5586204..fa9d12c 100644 --- a/class/task.php +++ b/class/task.php @@ -488,9 +488,14 @@ class MCI_Footnotes_Task { if (empty($l_str_FootnoteText)) { continue; } - // get footnote index - $l_str_FirstFootnoteIndex = ($l_str_Index + 1); - $l_str_FootnoteIndex = MCI_Footnotes_Convert::Index(($l_str_Index + 1), MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE)); + // generate content of footnote index cell + $l_str_FirstFootnoteIndex = ($l_str_Index + 1); + // wrap each index # in a white-space:nowrap span + $l_str_FootnoteIndex = ''; + // wrap the arrow in a @media print { display:hidden } span + $l_str_FootnoteIndex .= '' . $l_str_Arrow . ' '; + // get the index + $l_str_FootnoteIndex .= MCI_Footnotes_Convert::Index(($l_str_Index + 1), MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE)); // check if it isn't the last footnote in the array if ($l_str_FirstFootnoteIndex < count(self::$a_arr_Footnotes) && MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_COMBINE_IDENTICAL_FOOTNOTES))) { @@ -501,16 +506,18 @@ class MCI_Footnotes_Task { // set the further footnote as empty so it won't be displayed later self::$a_arr_Footnotes[$l_str_CheckIndex] = ""; // add the footnote index to the actual index - $l_str_FootnoteIndex .= ", " . MCI_Footnotes_Convert::Index(($l_str_CheckIndex + 1), MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE)); + $l_str_FootnoteIndex .= ', ' . MCI_Footnotes_Convert::Index(($l_str_CheckIndex + 1), MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE)); } } } + + $l_str_FootnoteIndex .= ''; + // replace all placeholders in the template templates/public/reference-container-body.html $l_obj_Template->replace( array( "post_id" => $l_int_PostID, "id" => MCI_Footnotes_Convert::Index($l_str_FirstFootnoteIndex, MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE)), - "arrow" => $l_str_Arrow, "index" => $l_str_FootnoteIndex, "text" => $l_str_FootnoteText ) diff --git a/css/public.css b/css/public.css index 64c0ff8..8e89433 100755 --- a/css/public.css +++ b/css/public.css @@ -6,7 +6,7 @@ * Since: 1.0 * Version: 2.0.6 * - * Last modified: 2020-11-04T2131+0100 + * Last modified: 2020-11-05T1826+0100 */ @@ -127,7 +127,7 @@ span.footnote_tooltip { border:none !important; text-align: left !important; vertical-align: top !important; - padding: 10px 5px 5px 0 !important; + padding: 10px 6px 5px 0 !important; } .footnote_plugin_index a, .footnote_plugin_text a { @@ -138,17 +138,19 @@ span.footnote_tooltip { text-decoration: underline !important; } .footnote_plugin_index { - cursor: pointer; + cursor: pointer; overflow-wrap: unset; word-wrap: unset; word-wrap: normal !important; word-break: unset; word-break: keep-all !important; max-width: 140px; - width: 1px; /*auto-extending column to fit widest*/ - white-space: nowrap; + width: 2em; /*auto-extending column to fit widest*/ overflow: hidden; } +.footnote_index_item { + white-space: nowrap; +} .footnote_plugin_text { width: unset; /*unset width of text column to fix site issues*/ } @@ -175,7 +177,7 @@ span.footnote_tooltip { @media print { .footnote_tooltip, .footnote_reference_container_collapse_button, - .footnote_plugin_index_arrow { + .footnote_index_arrow { display: none; } .footnote_plugin_tooltip_text { diff --git a/footnotes.php b/footnotes.php index a3f4c54..28e7152 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.0.4 + Version: 2.0.6 Author URI: http://cheret.de/plugins/footnotes-2/ Text Domain: footnotes Domain Path: /languages diff --git a/languages/en_GB.mo b/languages/en_GB.mo index 14ad813..d9c8f63 100755 Binary files a/languages/en_GB.mo and b/languages/en_GB.mo differ diff --git a/languages/en_GB.po b/languages/en_GB.po index 7a257c3..b29988b 100755 --- a/languages/en_GB.po +++ b/languages/en_GB.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: footnotes\n" "Report-Msgid-Bugs-To: http://wordpress.org/tag/footnotes\n" "POT-Creation-Date: 2014-10-18 20:58+0100\n" -"PO-Revision-Date: 2020-11-04T2152+0100\n" +"PO-Revision-Date: 2020-11-05T1306+0100\n" "Last-Translator: @pewgeuges\n" "Language-Team: SHE \n" "Language: en_GB\n" @@ -168,7 +168,7 @@ msgstr "in the footer" #: class/dashboard/subpage-main.php:113 msgid "at the end of the post" -msgstr "at the end of the page" +msgstr "at the end of the post" #: class/dashboard/subpage-main.php:114 msgid "in the widget area" diff --git a/languages/en_US.mo b/languages/en_US.mo index bdadec4..d7ff42d 100644 Binary files a/languages/en_US.mo and b/languages/en_US.mo differ diff --git a/languages/en_US.po b/languages/en_US.po index 8c26f64..29643cd 100755 --- a/languages/en_US.po +++ b/languages/en_US.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: footnotes\n" "Report-Msgid-Bugs-To: http://wordpress.org/tag/footnotes\n" "POT-Creation-Date: 2014-10-18 20:59+0100\n" -"PO-Revision-Date: 2020-11-04T2153+0100\n" +"PO-Revision-Date: 2020-11-05T1307+0100\n" "Last-Translator: @pewgeuges\n" "Language-Team: SHE \n" "Language: en_US\n" @@ -168,7 +168,7 @@ msgstr "in the footer" #: class/dashboard/subpage-main.php:113 msgid "at the end of the post" -msgstr "at the end of the page" +msgstr "at the end of the post" #: class/dashboard/subpage-main.php:114 msgid "in the widget area" diff --git a/readme.txt b/readme.txt index 2a07fa2..92ac6b7 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.0.4 +Stable Tag: 2.0.6 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html @@ -82,19 +82,25 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest** == Changelog == -= 2.0.5rc1 = -- Update: Autoload / infinite scroll support added thanks to @docteurfitness -- Bugfix: Settings style sheet unenqueued to fix input boxes on public pages (enqueued for 2.0.4) -- Bugfix: Public style sheet: Footnote referrers: deleted vertical align tweaks for cross-theme and user agent compatibility -- Bugfix: Public style sheet: Reference container: auto-extending column to fit widest, to fix display with short note texts -- Bugfix: Public style sheet: Reference container: IDs: slightly increased left padding += 2.0.6 = +- Update: Autoload / infinite scroll support thanks to @docteurfitness +- Bugfix: Layout: Footnote referrers: deleted vertical align tweaks for cross-theme and user agent compatibility +- Bugfix: Layout: Reference container: fixed line break behavior in footnote # clusters +- Bugfix: Layout: Reference container: auto-extending column to fit widest, to fix display with short note texts +- Bugfix: Layout: Reference container: IDs: slightly increased left padding +- Bugfix: Translations: fixed spelling error and erroneously changed word in en_GB and en_US +- Update: Typesetting: discarded the dot after footnote numbers as not localizable (should be optional) +- Bugfix: UI: Reference container: Collapse button fully clickable, not sign only +- Bugfix: UI: Reference container: Collapse button 'collapse' with minus sign not hyphen-minus +- Update: UX: Tooltip: set display predelay to 0 for responsiveness (was 800 since 2.0.0, 400 before) +- BUGFIX: Priority level back to PHP_INT_MAX (ref container positioning not this plugin’s responsibility) + += 2.0.5 = +- Bugfix: Get references container close to content, not below all other features, by priority level 10 - Bugfix: Public style sheet: Reference container: unset width of text column to fix site issues - Update: Enable all hooks by default to prevent footnotes from seeming broken in post titles - Bugfix: Restore cursor shape pointer over 'Continue reading' button after hyperlink removal -- Update: Tooltip infobox: set display predelay to 0 for responsiveness (was 800 since 2.0.0, 400 before) -- Bugfix: Reference container: collapse button fully clickable, not sign only -- Bugfix: Reference container: collapse button 'collapse' with minus sign not hyphen-minus -- Bugfix: Translations: Spelling error in en_GB and en_US +- Bugfix: Settings style sheet unenqueued to fix input boxes on public pages (enqueued for 2.0.4) = 2.0.4 = - Update: Restored arrow settings to customize or disable the now prepended arrow symbol diff --git a/templates/public/reference-container-body.html b/templates/public/reference-container-body.html index b47e714..8af0475 100755 --- a/templates/public/reference-container-body.html +++ b/templates/public/reference-container-body.html @@ -1,13 +1,10 @@ [[arrow]] [[index]].[[index]]