From 8e02b48df380f436cafc73814695dfa3ce3b49c8 Mon Sep 17 00:00:00 2001 From: pewgeuges <73141620+pewgeuges@users.noreply.github.com> Date: Wed, 9 Dec 2020 15:12:37 +0000 Subject: [PATCH] development 2.2.0d0 for Forum git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2435618 b8457f37-d9ea-0310-8a92-e5e31aec5664 --- class/config.php | 5 +- class/dashboard/layout.php | 13 +- class/dashboard/subpage-main.php | 182 ++++++++++-------- class/init.php | 22 ++- class/language.php | 93 +++++---- class/settings.php | 16 +- class/task.php | 9 +- css/public.css | 62 ++++-- css/settings.css | 108 ++++++++--- footnotes.php | 4 +- readme.txt | 6 + templates/dashboard/customize-css.html | 45 +++-- .../dashboard/customize-mouse-over-box.html | 2 +- .../dashboard/customize-superscript.html | 2 +- templates/dashboard/expert-lookup.html | 2 +- templates/dashboard/settings-love.html | 2 +- templates/dashboard/settings-other.html | 10 +- .../settings-reference-container.html | 2 +- templates/dashboard/settings-styling.html | 2 +- templates/public/reference-container.html | 2 +- 20 files changed, 373 insertions(+), 216 deletions(-) diff --git a/class/config.php b/class/config.php index 617f63d..96612d5 100644 --- a/class/config.php +++ b/class/config.php @@ -6,7 +6,10 @@ * @author Stefan Herndler * @since 1.5.0 12.09.14 10:56 * - * Last edited for v2.0.4 2020-11-01T0452+0100 + * Edited for: + * 2.0.4 add Public Plugin name for dashboard heading 2020-11-01T0452+0100 + * + * Last modified: 2020-12-08T2032+0100 */ diff --git a/class/dashboard/layout.php b/class/dashboard/layout.php index 1862d6e..1326188 100644 --- a/class/dashboard/layout.php +++ b/class/dashboard/layout.php @@ -10,11 +10,9 @@ * 2.1.2 add versioning of settings.css for cache busting 2020-11-19T1456+0100 * 2.1.4 automate passing version number for cache busting 2020-11-30T0648+0100 * 2.1.4 optional step argument and support for floating in numbox 2020-12-05T0540+0100 + * 2.2.0 fix punctuation-related localization issue in dashboard labels 2020-12-08T1547+0100 * - * ########## fix punctuation-related localization issue in dashboard labels 2020-12-01T0211+0100 - * ########## this fix reverted for now; restore when updating strings and translations, line 400 - * - * Last modified: 2020-12-06T1654+0100 + * Last modified: 2020-12-08T1547+0100 */ @@ -296,7 +294,7 @@ abstract class MCI_Footnotes_LayoutEngine { $l_str_ActiveSectionID = isset($_GET['t']) ? $_GET['t'] : key($this->a_arr_Sections); $l_arr_ActiveSection = $this->a_arr_Sections[$l_str_ActiveSectionID]; - // iterate through each value that has to be in the specific contaienr + // iterate through each value that has to be in the specific container foreach(MCI_Footnotes_Settings::instance()->getDefaults($l_arr_ActiveSection["container"]) as $l_str_Key => $l_mixed_Value) { // setting is available in the POST array, use it if (array_key_exists($l_str_Key, $_POST)) { @@ -396,9 +394,8 @@ abstract class MCI_Footnotes_LayoutEngine { // and narrow per new school. // Add colon to label strings for inclusion in localization. // Colon after label is widely preferred best practice, mandatory per style guides. - return sprintf('', $p_str_SettingName, $p_str_Caption); - // ^ here deleted colon 2020-12-01T0156+0100 - // ########## this fix reverted for now; restore when updating strings and translations + return sprintf('', $p_str_SettingName, $p_str_Caption); + // ^ here deleted colon 2020-12-08T1546+0100 } /** diff --git a/class/dashboard/subpage-main.php b/class/dashboard/subpage-main.php index 1919a37..d0c73ea 100644 --- a/class/dashboard/subpage-main.php +++ b/class/dashboard/subpage-main.php @@ -11,8 +11,10 @@ * 2.1.0 read-on button label 2020-11-08T2148+0100 * 2.1.1 options for ref container and alternative tooltips 2020-11-16T2152+0100 * 2.1.4 settings for ref container, tooltips and scrolling 2020-12-03T0950+0100 + * 2.2.0 slight UI reordering 2020-12-09T1114+0100 + * 2.2.0 option to disable URL line wrapping 2020-12-09T1604+0100 * - * Last modified: 2020-12-06T1653+0100 + * Last modified: 2020-12-09T1604+0100 */ /** @@ -66,10 +68,9 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { protected function getSections() { $l_arr_Tabs = array(); $l_arr_Tabs[] = $this->addSection("settings", __("Settings", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), 0, true); - $l_arr_Tabs[] = $this->addSection("customize", __("Customize", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), 1, true); - if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_EXPERT_MODE))) { - $l_arr_Tabs[] = $this->addSection("expert", __("Expert mode", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), 2, true); - } + $l_arr_Tabs[] = $this->addSection("expert", __("Priority", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), 2, true); + $l_arr_Tabs[] = $this->addSection("referrers", __("Referrers", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), 1, true); + $l_arr_Tabs[] = $this->addSection("customize", __("Custom CSS", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), 1, true); $l_arr_Tabs[] = $this->addSection("how-to", __("How to", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), null, false); return $l_arr_Tabs; } @@ -87,20 +88,21 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { protected function getMetaBoxes() { return array( // Change string "%s styling" to "Footnotes styling" to fix layout in WPv5.5: - $this->addMetaBox("settings", "styling", __("Footnotes styling", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "Styling"), - $this->addMetaBox("settings", "reference-container", __("References Container", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "ReferenceContainer"), - $this->addMetaBox("settings", "other", __("Other", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "Other"), + $this->addMetaBox("settings", "styling", __("Main settings", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "Styling"), + $this->addMetaBox("settings", "reference-container", __("Reference Container", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "ReferenceContainer"), + $this->addMetaBox("settings", "other", __("Other settings", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "Other"), // Leave intact since this is not localized: $this->addMetaBox("settings", "love", MCI_Footnotes_Config::C_STR_PLUGIN_HEADING_NAME . ' ' . MCI_Footnotes_Config::C_STR_LOVE_SYMBOL_HEADING, "Love"), + $this->addMetaBox("expert", "lookup", __("WordPress hooks and priority levels", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "lookupHooks"), + // The HyperlinkArrow meta box ceased for 2.0.0 // The HyperlinkArrow meta box was restored for 2.0.4 to meet user demand for arrow symbol semantics // The HyperlinkArrow meta box ceased for 2.1.4 as its content is moved to Settings > Reference container > Display a backlink symbol - $this->addMetaBox("customize", "superscript", __("Superscript layout", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "Superscript"), - $this->addMetaBox("customize", "mouse-over-box", __("Mouse-over box", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "MouseOverBox"), - $this->addMetaBox("customize", "custom-css", __("Add custom CSS to the public page", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "CustomCSS"), + $this->addMetaBox("referrers", "superscript", __("Referrer typesetting", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "Superscript"), + $this->addMetaBox("referrers", "mouse-over-box", __("Mouse-over box", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "MouseOverBox"), - $this->addMetaBox("expert", "lookup", __("WordPress hooks to look for Footnote short codes", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "lookupHooks"), + $this->addMetaBox("customize", "custom-css", __("Custom CSS", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "CustomCSS"), $this->addMetaBox("how-to", "help", __("Brief introduction in how to use the plugin", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "Help"), $this->addMetaBox("how-to", "donate", __("Help us to improve our Plugin", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "Donate") @@ -164,60 +166,60 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { // replace all placeholders $l_obj_Template->replace( array( - "label-name" => $this->addLabel(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_NAME, __("References label", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-name" => $this->addLabel(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_NAME, __("Heading:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "name" => $this->addTextBox(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_NAME), - "label-collapse" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_COLLAPSE, __("Collapse references by default", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-collapse" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_COLLAPSE, __("Collapse by default:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "collapse" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_COLLAPSE, $l_arr_Enabled), - "label-position" => $this->addLabel(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_POSITION, __("Where shall the reference container appear", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-position" => $this->addLabel(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_POSITION, __("Position:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "position" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_POSITION, $l_arr_Positions), - "label-page-layout" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_PAGE_LAYOUT_SUPPORT, __("Apply basic responsive page layout", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-page-layout" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_PAGE_LAYOUT_SUPPORT, __("Apply basic responsive page layout:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "page-layout" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_PAGE_LAYOUT_SUPPORT, $l_arr_PageLayoutOptions), "notice-page-layout" => __("Most themes don’t need this fix.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-startpage" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_START_PAGE_ENABLE, __("Display on start page too", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-startpage" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_START_PAGE_ENABLE, __("Display on start page too:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "startpage" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_START_PAGE_ENABLE, $l_arr_Enabled), - "label-symbol" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_BACKLINK_SYMBOL_ENABLE, __("Display a backlink symbol", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-symbol" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_BACKLINK_SYMBOL_ENABLE, __("Display a backlink symbol:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "symbol-enable" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_BACKLINK_SYMBOL_ENABLE, $l_arr_Enabled), "symbol-options" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_HYPERLINK_ARROW, MCI_Footnotes_Convert::getArrow()), "symbol-custom" => $this->addTextBox(MCI_Footnotes_Settings::C_STR_HYPERLINK_ARROW_USER_DEFINED), "notice-symbol" => __("Your input overrides the selection.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-switch" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_BACKLINK_SYMBOL_SWITCH, __("Symbol appended, not prepended", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-switch" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_BACKLINK_SYMBOL_SWITCH, __("Symbol appended, not prepended:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "switch" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_BACKLINK_SYMBOL_SWITCH, $l_arr_Enabled), - "label-3column" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_3COLUMN_LAYOUT_ENABLE, __("Backlink symbol in an extra column", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-3column" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_3COLUMN_LAYOUT_ENABLE, __("Backlink symbol in an extra column:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "3column" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_3COLUMN_LAYOUT_ENABLE, $l_arr_Enabled), "notice-3column" => __("This legacy layout is available if identical footnotes are not combined.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-separator" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_SEPARATOR_ENABLED, __("Add a separator when enumerating backlinks", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-separator" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_SEPARATOR_ENABLED, __("Add a separator when enumerating backlinks:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "separator-enable" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_SEPARATOR_ENABLED, $l_arr_Enabled), "separator-options" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_BACKLINKS_SEPARATOR_OPTION, $l_arr_Separators), "separator-custom" => $this->addTextBox(MCI_Footnotes_Settings::C_STR_BACKLINKS_SEPARATOR_CUSTOM), "notice-separator" => __("Your input overrides the selection.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-terminator" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_TERMINATOR_ENABLED, __("Add a terminal punctuation to backlinks", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-terminator" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_TERMINATOR_ENABLED, __("Add a terminal punctuation to backlinks:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "terminator-enable" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_TERMINATOR_ENABLED, $l_arr_Enabled), "terminator-options" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_BACKLINKS_TERMINATOR_OPTION, $l_arr_Terminators), "terminator-custom" => $this->addTextBox(MCI_Footnotes_Settings::C_STR_BACKLINKS_TERMINATOR_CUSTOM), "notice-terminator" => __("Your input overrides the selection.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-width" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_COLUMN_WIDTH_ENABLED, __("Set backlinks column width", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-width" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_COLUMN_WIDTH_ENABLED, __("Set backlinks column width:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "width-enable" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_COLUMN_WIDTH_ENABLED, $l_arr_Enabled), "width-scalar" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_BACKLINKS_COLUMN_WIDTH_SCALAR, 0, 500, true), "width-unit" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_BACKLINKS_COLUMN_WIDTH_UNIT, $l_arr_WidthUnits), "notice-width" => __("Absolute width in pixels doesn’t need to be accurate to the tenth, but relative width in rem or em may.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-max-width" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_COLUMN_MAX_WIDTH_ENABLED, __("Set backlinks column maximum width", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-max-width" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_COLUMN_MAX_WIDTH_ENABLED, __("Set backlinks column maximum width:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "max-width-enable" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_COLUMN_MAX_WIDTH_ENABLED, $l_arr_Enabled), "max-width-scalar" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_BACKLINKS_COLUMN_MAX_WIDTH_SCALAR, 0, 500, true), "max-width-unit" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_BACKLINKS_COLUMN_MAX_WIDTH_UNIT, $l_arr_WidthUnits), "notice-max-width" => __("Absolute width in pixels doesn’t need to be accurate to the tenth, but relative width in rem or em may.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "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)), + "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), ) ); @@ -267,11 +269,11 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { // replace all placeholders $l_obj_Template->replace( array( - "label-short-code-start" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_START, __("Footnote tag starts with", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-short-code-start" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_START, __("Footnote start tag short code:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "short-code-start" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_START, $l_arr_ShortCodeStart), "short-code-start-user" => $this->addTextBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_START_USER_DEFINED), - "label-short-code-end" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_END, __("and ends with", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-short-code-end" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_END, __("Footnote end tag short code:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "short-code-end" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_END, $l_arr_ShortCodeEnd), "short-code-end-user" => $this->addTextBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_END_USER_DEFINED), @@ -281,18 +283,18 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { "short-code-start-user-id" => MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_START_USER_DEFINED, "short-code-end-user-id" => MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_END_USER_DEFINED, - "label-counter-style" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE, __("Counter style", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-counter-style" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE, __("Counter style:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "counter-style" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE, $l_arr_CounterStyle), // algorithmically combine identicals: - "label-identical" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_COMBINE_IDENTICAL_FOOTNOTES, __("Combine identical footnotes", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-identical" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_COMBINE_IDENTICAL_FOOTNOTES, __("Combine identical footnotes:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "identical" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_COMBINE_IDENTICAL_FOOTNOTES, $l_arr_Enable), - "label-scroll-offset" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_SCROLL_OFFSET, __("Scroll offset", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-scroll-offset" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_SCROLL_OFFSET, __("Scroll offset:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "scroll-offset" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_FOOTNOTES_SCROLL_OFFSET, 0, 100), "notice-scroll-offset" => __("per cent from the upper edge of the window", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-scroll-duration" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_SCROLL_DURATION, __("Scroll duration", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-scroll-duration" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_SCROLL_DURATION, __("Scroll duration:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "scroll-duration" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_FOOTNOTES_SCROLL_DURATION, 0, 20000), "notice-scroll-duration" => __("milliseconds", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), @@ -311,11 +313,13 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { public function Love() { // options for the positioning of the reference container $l_arr_Love = array( + // I love Footnotes "text-1" => sprintf(__('I %s %s', MCI_Footnotes_Config::C_STR_PLUGIN_NAME), MCI_Footnotes_Config::C_STR_LOVE_SYMBOL, MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME), - "text-2" => sprintf(__('this site uses the awesome %s Plugin', MCI_Footnotes_Config::C_STR_PLUGIN_NAME), MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME), - "text-3" => sprintf(__('extra smooth %s', MCI_Footnotes_Config::C_STR_PLUGIN_NAME), MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME), - "random" => __('random text', MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "no" => sprintf(__("Don't display a %s %s text in my footer.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME, MCI_Footnotes_Config::C_STR_LOVE_SYMBOL) + "text-2" => sprintf(__('This site uses the awesome %s Plugin.', MCI_Footnotes_Config::C_STR_PLUGIN_NAME), MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME), + // logo only + "text-3" => sprintf('%s', MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME), + "random" => __('random-driven display of either variant', MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "no" => sprintf(__("no display of any “%s %s” mention in the footer", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME, MCI_Footnotes_Config::C_STR_LOVE_SYMBOL) ); // load template file @@ -323,10 +327,10 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { // replace all placeholders $l_obj_Template->replace( array( - "label-love" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_LOVE, sprintf(__("Tell the world you're using %s", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME)), + "label-love" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_LOVE, sprintf(__("Tell the world you’re using %s:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME)), "love" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_LOVE, $l_arr_Love), - "label-no-love" => $this->addText(sprintf(__("Don't tell the world you're using %s on specific pages by adding the following short code:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME)), + "label-no-love" => $this->addText(sprintf(__("Don’t tell the world you’re using %s on specific pages by adding the following short code:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), MCI_Footnotes_Config::C_STR_PLUGIN_PUBLIC_NAME)), "no-love" => $this->addText(MCI_Footnotes_Config::C_STR_NO_LOVE_SLUG) ) ); @@ -352,16 +356,20 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { // replace all placeholders $l_obj_Template->replace( array( - "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)), + "label-url-wrap" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTE_URL_WRAP_ENABLED, __("Allow URLs to line-wrap anywhere:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "url-wrap" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_FOOTNOTE_URL_WRAP_ENABLED, $l_arr_Enabled), + "notice-url-wrap" => __("Unicode-conformant browsers don’t need this fix.", 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), - "label-excerpt" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_IN_EXCERPT, __("Allow footnotes on Summarized Posts", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-excerpt" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_IN_EXCERPT, __("Display footnotes in excerpts:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "excerpt" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_IN_EXCERPT, $l_arr_Enabled), "notice1-excerpt" => __("This should be disabled.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "notice2-excerpt" => __("In some themes, the Advanced Excerpt plugin is indispensable to display footnotes in excerpts.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "notice3-excerpt" => __("Footnotes cannot be disabled in excerpts. A workaround is to avoid footnotes in the first 55 words.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-expert-mode" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_EXPERT_MODE, __("Enable the Expert mode", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-expert-mode" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_EXPERT_MODE, __("Enable the Expert mode:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "expert-mode" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_EXPERT_MODE, $l_arr_Enabled) ) ); @@ -386,13 +394,13 @@ 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 for 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)), + "label-before" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_STYLING_BEFORE, __("Before the footnote referrer:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "before" => $this->addTextBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_STYLING_BEFORE), - "label-after" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_STYLING_AFTER, __("After Footnotes index", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-after" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_STYLING_AFTER, __("After the footnote referrer:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "after" => $this->addTextBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_STYLING_AFTER) ) ); @@ -442,85 +450,85 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { // tooltip settings: - "label-enable" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ENABLED, __("Enable the mouse-over box", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-enable" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ENABLED, __("Enable the tooltip infobox:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "enable" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ENABLED, $l_arr_Enabled), - "label-alternative" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ALTERNATIVE, __("Use alternative tooltip implementation", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-alternative" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ALTERNATIVE, __("Use alternative tooltip implementation:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "alternative" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_ALTERNATIVE, $l_arr_Enabled), - "label-activate-excerpt" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_EXCERPT_ENABLED, __("Display only an excerpt", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-activate-excerpt" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_EXCERPT_ENABLED, __("Truncate the note in the tooltip:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "activate-excerpt" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_EXCERPT_ENABLED, $l_arr_Enabled), - "label-excerpt-length" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_EXCERPT_LENGTH, __("Maximum characters for the excerpt", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-excerpt-length" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_EXCERPT_LENGTH, __("Maximum number of characters in the tooltip:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "excerpt-length" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_EXCERPT_LENGTH, 3, 10000), - "label-readon" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_TOOLTIP_READON_LABEL, __("‘Read on’ button label", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-readon" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_TOOLTIP_READON_LABEL, __("‘Read on’ button label:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "readon" => $this->addTextBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_TOOLTIP_READON_LABEL), - "label-position" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_POSITION, __("Position", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-position" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_POSITION, __("Position:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "position" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_POSITION, $l_arr_Position), - "label-offset-x" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_OFFSET_X, __("Offset X (px)", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-offset-x" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_OFFSET_X, __("Horizontal offset:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "offset-x" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_OFFSET_X, -150, 150), - "notice-offset-x" => __("Offset (X axis) in px (may be negative)", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "notice-offset-x" => __("pixels; negative value for a leftwards offset", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-offset-y" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_OFFSET_Y, __("Offset Y (px)", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-offset-y" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_OFFSET_Y, __("Vertical offset downwards:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "offset-y" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_OFFSET_Y, -150, 150), - "notice-offset-y" => __("Offset (Y axis) in px (may be negative)", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "notice-offset-y" => __("pixels; negative value for an upwards offset", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-max-width" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_MAX_WIDTH, __("Max. width (px)", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-max-width" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_MAX_WIDTH, __("Maximum width:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "max-width" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_MAX_WIDTH, 0, 1280), - "notice-max-width" => __("Set the max-width to 0px to disable this setting.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "notice-max-width" => __("pixels; 0 to disable this setting", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), // display durations: - "label-fade-in-delay" => $this->addLabel(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_IN_DELAY, __("Fade-in delay", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-fade-in-delay" => $this->addLabel(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_IN_DELAY, __("Fade-in delay:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "fade-in-delay" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_IN_DELAY, 0, 20000), "notice-fade-in-delay" => __("milliseconds", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-fade-in-duration" => $this->addLabel(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_IN_DURATION, __("Fade-in duration", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-fade-in-duration" => $this->addLabel(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_IN_DURATION, __("Fade-in duration:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "fade-in-duration" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_IN_DURATION, 0, 20000), "notice-fade-in-duration" => __("milliseconds", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-fade-out-delay" => $this->addLabel(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_OUT_DELAY, __("Fade-out delay", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-fade-out-delay" => $this->addLabel(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_OUT_DELAY, __("Fade-out delay:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "fade-out-delay" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_OUT_DELAY, 0, 20000), "notice-fade-out-delay" => __("milliseconds", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-fade-out-duration" => $this->addLabel(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_OUT_DURATION, __("Fade-out duration", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-fade-out-duration" => $this->addLabel(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_OUT_DURATION, __("Fade-out duration:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "fade-out-duration" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_MOUSE_OVER_BOX_FADE_OUT_DURATION, 0, 20000), "notice-fade-out-duration" => __("milliseconds", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), // tooltip styling: - "label-font-size" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_MOUSE_OVER_BOX_FONT_SIZE_ENABLED, __("Set font size", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-font-size" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_MOUSE_OVER_BOX_FONT_SIZE_ENABLED, __("Set font size:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "font-size-enable" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_MOUSE_OVER_BOX_FONT_SIZE_ENABLED, $l_arr_Enabled), "font-size-scalar" => $this->addNumBox(MCI_Footnotes_Settings::C_FLO_MOUSE_OVER_BOX_FONT_SIZE_SCALAR, 0, 50, true), "font-size-unit" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_MOUSE_OVER_BOX_FONT_SIZE_UNIT, $l_arr_FontSizeUnits), "notice-font-size" => __("By default, the font size is set to equal the surrounding text.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-color" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_COLOR, __("Color", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-color" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_COLOR, __("Text color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "color" => $this->addColorSelection(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_COLOR), - "notice-color" => __("Empty color will use the default color defined by your current theme.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "notice-color" => __("To use the current theme’s default text color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear and leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-background" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BACKGROUND, __("Background color", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-background" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BACKGROUND, __("Background color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "background" => $this->addColorSelection(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BACKGROUND), - "notice-background" => __("Empty color will use the default background-color defined by your current theme.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "notice-background" => __("To use the current theme’s default background color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear and leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-border-width" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_WIDTH, __("Border width (px)", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-border-width" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_WIDTH, __("Border width:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "border-width" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_WIDTH, 0, 4, true), - "notice-border-width" => __("Set the width to 0px to hide the border.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "notice-border-width" => __("pixels; 0 for borderless", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-border-color" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BORDER_COLOR, __("Border color", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-border-color" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BORDER_COLOR, __("Border color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "border-color" => $this->addColorSelection(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_BORDER_COLOR), - "notice-border-color" => __("Empty color will use the default border-color defined by your current theme.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "notice-border-color" => __("To use the current theme’s default border color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear and leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-border-radius" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_RADIUS, __("Border radius (px)", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-border-radius" => $this->addLabel(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_RADIUS, __("Rounded corner radius:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "border-radius" => $this->addNumBox(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_BORDER_RADIUS, 0, 500), - "notice-border-radius" => __("Set the radius to 0px to avoid a radius.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "notice-border-radius" => __("pixels; 0 for sharp corners", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), - "label-box-shadow-color" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_SHADOW_COLOR, __("Box shadow color", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "label-box-shadow-color" => $this->addLabel(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_SHADOW_COLOR, __("Box shadow color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "box-shadow-color" => $this->addColorSelection(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_SHADOW_COLOR), - "notice-box-shadow-color" => __("Empty color will use the default box shadow defined by your current theme.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "notice-box-shadow-color" => __("To use the current theme’s default box shadow color:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . ' ' . __("Clear and leave empty.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), ) ); @@ -548,6 +556,11 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { * * @author Stefan Herndler * @since 1.5.0 + * + * Edited: + * 2.2.0 drop localized notices, list directly in the template 2020-12-09T1113+0100 + * + * @see templates/dashboard/customize-css.html */ public function CustomCSS() { // load template file @@ -555,22 +568,25 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { // replace all placeholders $l_obj_Template->replace( array( - "label-css" => $this->addLabel(MCI_Footnotes_Settings::C_STR_CUSTOM_CSS, __("Add custom CSS", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + // "label-css" => $this->addLabel(MCI_Footnotes_Settings::C_STR_CUSTOM_CSS, __("Add custom CSS:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), "css" => $this->addTextArea(MCI_Footnotes_Settings::C_STR_CUSTOM_CSS), - "headline" => $this->addText(__("Available CSS classes to customize the footnotes and the reference container", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + "headline" => $this->addText(__("Recommended CSS classes:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), - "label-class-1" => ".footnote_plugin_tooltip_text", - "class-1" => $this->addText(__("superscript, Footnotes index", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + // CSS classes are listed in the template. + // Localized notices are dropped to ease translators’ task. - "label-class-2" => ".footnote_tooltip", - "class-2" => $this->addText(__("mouse-over box, tooltip for each superscript", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + // "label-class-1" => ".footnote_plugin_tooltip_text", + // "class-1" => $this->addText(__("superscript, Footnotes index", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), - "label-class-3" => ".footnote_plugin_index", - "class-3" => $this->addText(__("1st column of the Reference Container, Footnotes index", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + // "label-class-2" => ".footnote_tooltip", + // "class-2" => $this->addText(__("mouse-over box, tooltip for each superscript", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), - "label-class-4" => ".footnote_plugin_text", - "class-4" => $this->addText(__("2nd column of the Reference Container, Footnote text", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)) + // "label-class-3" => ".footnote_plugin_index", + // "class-3" => $this->addText(__("1st column of the Reference Container, Footnotes index", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)), + + // "label-class-4" => ".footnote_plugin_text", + // "class-4" => $this->addText(__("2nd column of the Reference Container, Footnote text", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)) ) ); // display template with replaced placeholders @@ -675,7 +691,7 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine { "label-start" => __("Start your footnote with the following short code:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "start" => $l_arr_Footnote_StartingTag["value"], - "label-end" => __("...and end your footnote with this short code:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), + "label-end" => __("…and end your footnote with this short code:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "end" => $l_arr_Footnote_EndingTag["value"], "example-code" => $l_str_Example, diff --git a/class/init.php b/class/init.php index ebf567a..854bf79 100644 --- a/class/init.php +++ b/class/init.php @@ -14,7 +14,7 @@ * 2.1.4 automate passing version number for cache busting 2020-11-30T0646+0100 * 2.1.4 optionally enqueue an extra style sheet 2020-12-04T2231+0100 * - * Last modified: 2020-12-06T1655+0100 + * Last modified: 2020-12-08T1927+0100 */ @@ -158,13 +158,29 @@ class MCI_Footnotes { // up-to-date plugin version number needed for cache busting: // not use '-css' in the handle, is appended automatically; // constant FOOTNOTES_VERSION defined in footnotes.php, media all is default - wp_enqueue_style( 'mci-footnotes-public', plugins_url('footnotes/css/public.css'), array(), FOOTNOTES_VERSION, 'all' ); + wp_enqueue_style( + 'mci-footnotes-public', + plugins_url( + MCI_Footnotes_Config::C_STR_PLUGIN_NAME . '/css/public.css' + ), + array(), + FOOTNOTES_VERSION, + 'all' + ); // optional layout fix by lack of layout support: // since 2.1.4 2020-12-05T1417+0100 $l_str_LayoutOption = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_PAGE_LAYOUT_SUPPORT); if ($l_str_LayoutOption != 'none') { - wp_enqueue_style( 'mci-footnotes-layout-' . $l_str_LayoutOption, plugins_url('footnotes/css/layout-' . $l_str_LayoutOption . '.css'), array(), FOOTNOTES_VERSION, 'all' ); + wp_enqueue_style( + 'mci-footnotes-layout-' . $l_str_LayoutOption, + plugins_url( + MCI_Footnotes_Config::C_STR_PLUGIN_NAME . '/css/layout-' . $l_str_LayoutOption . '.css' + ), + array(), + FOOTNOTES_VERSION, + 'all' + ); } } } diff --git a/class/language.php b/class/language.php index 9ec44b5..df3111b 100644 --- a/class/language.php +++ b/class/language.php @@ -4,6 +4,10 @@ * @filesource * @author Stefan Herndler * @since 1.5.0 14.09.14 17:47 + * + * Edited for: + * 2.0.0 PHP-related bug fix thanks to MatKus (@matkus) 2020-10-26T1609+0100 + * 2.2.0 conform to WordPress plugin language file name scheme 2020-12-08T1931+0100 */ /** @@ -13,46 +17,55 @@ */ class MCI_Footnotes_Language { - /** - * Register WordPress Hook. - * - * @author Stefan Herndler - * @since 1.5.0 - */ - public static function registerHooks() { - add_action('plugins_loaded', array("MCI_Footnotes_Language", "loadTextDomain")); - } + /** + * Register WordPress Hook. + * + * @author Stefan Herndler + * @since 1.5.0 + */ + public static function registerHooks() { + add_action('plugins_loaded', array("MCI_Footnotes_Language", "loadTextDomain")); + } - /** - * Loads the text domain for current WordPress language if exists. Otherwise fallback "en_GB" will be loaded. - * - * @author Stefan Herndler - * @since 1.5.0 - */ - public static function loadTextDomain() { - // language file with localization exists - if (self::load(apply_filters('plugin_locale', get_locale(), ''))) { - // added 3rd (empty) parameter as a PHP-related bug fix thanks to MatKus (@matkus) in - // - // - // "Fatal error: Uncaught ArgumentCountError: Too few arguments […]" - // 2020-10-26T1609+0100 - return; - } - // fallback to english - self::load("en_GB"); - } + /** + * Loads the text domain for current WordPress language if exists. Otherwise fallback "en_GB" will be loaded. + * + * @author Stefan Herndler + * @since 1.5.0 + * + * @since 2.0.0 PHP 7.1 related bug fix thanks to MatKus (@matkus) + * @see + * @see + */ + public static function loadTextDomain() { + // language file with localization exists + if (self::load(apply_filters('plugin_locale', get_locale(), ''))) { + // added 3rd (empty) parameter to prevent "Fatal error: Uncaught ArgumentCountError: Too few arguments […]" + // 2020-10-26T1609+0100 + return; + } + // fallback to english + self::load("en_GB"); + } - /** - * Loads a specific text domain. - * - * @author Stefan Herndler - * @since 1.5.1 - * @param string $p_str_LanguageCode Language Code to load a specific text domain. - * @return bool - */ - private static function load($p_str_LanguageCode) { - return load_textdomain(MCI_Footnotes_Config::C_STR_PLUGIN_NAME, - dirname(__FILE__) . "/../languages/" . $p_str_LanguageCode . '.mo'); - } + /** + * Loads a specific text domain. + * + * @author Stefan Herndler + * @since 1.5.1 + * @param string $p_str_LanguageCode Language Code to load a specific text domain. + * @return bool + * + * Edited for: + * 2.2.0 conform to WordPress plugin language file name scheme by using load_plugin_textdomain() + * @see wp-includes/l10n.php:857 + * “ The .mo file should be named based on the text domain with a dash, and then the locale exactly.” + */ + private static function load($p_str_LanguageCode) { + return load_plugin_textdomain( + MCI_Footnotes_Config::C_STR_PLUGIN_NAME, + false, // This argument only fills the gap left by a deprecated argument (since WP2.7). + MCI_Footnotes_Config::C_STR_PLUGIN_NAME . '/languages/' . MCI_Footnotes_Config::C_STR_PLUGIN_NAME . $p_str_LanguageCode . '.mo' + ); + } } diff --git a/class/settings.php b/class/settings.php index 244b781..4494f8e 100644 --- a/class/settings.php +++ b/class/settings.php @@ -18,8 +18,9 @@ * 2.1.1 fix ref container by option to switch index/symbol 2020-11-16T2022+0100 * 2.1.3 fix ref container positioning by priority level 2020-11-17T0205+0100 * 2.1.4 more settings container keys 2020-12-03T0955+0100 + * 2.2.0 option to disable URL line wrapping 2020-12-09T1606+0100 * - * Last modified: 2020-12-06T1653+0100 + * Last modified: 2020-12-09T1606+0100 */ @@ -460,6 +461,16 @@ class MCI_Footnotes_Settings { const C_INT_MOUSE_OVER_BOX_FADE_OUT_DELAY = "footnotes_inputfield_mouse_over_box_fade_out_delay"; const C_INT_MOUSE_OVER_BOX_FADE_OUT_DURATION = "footnotes_inputfield_mouse_over_box_fade_out_duration"; + /** + * Settings Container Key for URL wrap option + * + * @since 2.2.0 + * @var bool + * + * 2020-12-09T1554+0100 + */ + const C_BOOL_FOOTNOTE_URL_WRAP_ENABLED = "footnote_inputfield_url_wrap_enabled"; + /** * Stores a singleton reference of this class. @@ -533,6 +544,9 @@ class MCI_Footnotes_Settings { // whether a
tag is inserted: self::C_BOOL_BACKLINKS_LINE_BREAKS_ENABLED => 'no', + // whether to enable URL line wrapping: + self::C_BOOL_FOOTNOTE_URL_WRAP_ENABLED => 'yes', + // whether to use link elements: self::C_BOOL_LINK_ELEMENT_ENABLED => 'yes', diff --git a/class/task.php b/class/task.php index a0606b1..3f0f22a 100644 --- a/class/task.php +++ b/class/task.php @@ -25,8 +25,9 @@ * 2.1.4 ref container column width and tooltip font size settings 2020-12-03T0954+0100 * 2.1.4 scroll offset and duration settings 2020-12-05T0538+0100 * 2.1.4 tooltip display duration settings 2020-12-06T1320+0100 + * 2.2.0 option to disable URL line wrapping 2020-12-09T1606+0100 * - * Last modified: 2020-12-06T2248+0100 + * Last modified: 2020-12-09T1607+0100 */ // If called directly, abort: @@ -518,8 +519,10 @@ class MCI_Footnotes_Task { // fix line wrapping of URLs (hyperlinked or not) based on pattern, not link element, // to prevent them from hanging out of the tooltip in non-Unicode-compliant user agents // spare however values of the href and the src arguments! - // see public.css - $l_str_FootnoteText = preg_replace( '#(?$1', $l_str_FootnoteText ); + // see public.css + if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_FOOTNOTE_URL_WRAP_ENABLED))) { + $l_str_FootnoteText = preg_replace( '#(?$1', $l_str_FootnoteText ); + } // Text to be displayed instead of the footnote $l_str_FootnoteReplaceText = ""; diff --git a/css/public.css b/css/public.css index ce17a61..a9f4a85 100755 --- a/css/public.css +++ b/css/public.css @@ -5,15 +5,18 @@ * Created-Time: 16:21 * Since: 1.0 * - * Version: 2.1.5 + * Version: 2.2.0d0 * - * Last modified: 2020-12-06T2259+0100 + * Last modified: 2020-12-09T1608+0100 */ /***************************************************** MCI Footnotes logo -The classes with 'heading' fix display in dashboard + +The classes with 'heading' fix display in dashboard, +where since WordPress 5.5 settings box labels with +spans are displayed as justified and not last line. class/config.php css/settings.css @@ -37,13 +40,18 @@ css/settings.css /***************************************************** Long URLs in Unicode-non-compliant user agents -prevent URLs from expanding the reference container -in mobile view, or from hanging out of the tooltip +Unicode recommends to break URLs at slashes, but +some browsers don’t, so we need to prevent URLs +from expanding the reference container in mobile view, +or from hanging out of the tooltip even on desktop. + +Based on pattern, not link element, since some URLs +are not hyperlinked, while often the hyperlink text +is common language, that mustn’t be broken anywhere. -based on pattern, not link element class/task.php -not cross-browser compatible: +These rules aren’t cross-browser compatible: word-break: break-word; overflow-wrap: anywhere; word-wrap: anywhere; @@ -58,9 +66,11 @@ word-break: break-all; /***************************************************** Footnote referrers and tooltips +Templates: templates/public/footnote.html templates/public/footnote-alternative.html +Classes: .footnote_referrer = enclosing .footnote_plugin_tooltip_text = inner .footnote_tooltip = inner @@ -89,7 +99,7 @@ templates/public/footnote-alternative.html .footnote_tooltip { display: none; - z-index: 999; + z-index: 99999; cursor: auto; text-align: left; padding: 12px; @@ -152,13 +162,37 @@ Read-on button /***************************************************** -Footnote references container +Footnote reference container +Templates: templates/public/reference-container.html +templates/public/reference-container-body.html +templates/public/reference-container-combi.html +templates/public/reference-container-switch.html +templates/public/reference-container-3column.html + +Optional responsive basic page layout support +style sheets: +css/layout-reference-container.css +css/layout-main-content.css +css/layout-page-content.css + +Classes: +.footnotes_reference_container = enclosing
+.footnote_container_prepare = label
+.footnote_reference_container_label = +.footnote_reference_container_collapse_button = sibling +.footnote-reference-container = misleading and inconsistent; alias: +.footnotes_table = +.footnote_plugin_index_combi = first
if identical footnotes are combined +.footnote_plugin_index = first if not +.footnote_index = or in first in 3-column table +.footnote_plugin_link = or if identical footnotes are not combined, or second in 3-column table +.footnote_backlink = or if identical footnotes are combined, or in second in 3-column table +.footnote_index_arrow = nested , symbol only +.footnote_plugin_text = second , or third in 3-column table + -Also optional responsive basic page layout support: -public-container.css -public-main.css */ /* @@ -205,14 +239,14 @@ fully clickable, not sign only /* table */ -.footnote-reference-container { +.footnote-reference-container, +.footnotes_table { width: 100%; border: none; } /* footnotes -reference-container-body.html */ .footnote_plugin_index, .footnote_plugin_index_combi, diff --git a/css/settings.css b/css/settings.css index 71c8578..47131d0 100755 --- a/css/settings.css +++ b/css/settings.css @@ -5,13 +5,13 @@ * Created-Time: 16:21 * Since: 1.0 * - * Version: 2.1.5 + * Version: 2.2.0d0 * - * Last modified: 2020-12-06T2258+0100 + * Last modified: 2020-12-09T1607+0100 */ -/***************************************************** +/************************************************************ MCI Footnotes logo The classes with 'heading' fix display in dashboard @@ -40,14 +40,16 @@ See class/config.php and css/public.css left: 96px; } -/************************************************************************* -On User Request: limited to a number of IDs to not affect all dashboards +/************************************************************ +Input fields + +On User Request: +Limited to a number of IDs to not affect all dashboards */ /*input[type=text], input[type=password], textarea, select*/ #footnote_inputfield_readon_label, #footnote_inputfield_references_label, -#footnote_inputfield_custom_css, #footnote_inputfield_love { padding-left: 8px !important; padding-right: 8px !important; @@ -106,10 +108,9 @@ On User Request: limited to a number of IDs to not affect all dashboards width: 140px; } -/*textarea*/ -#footnote_inputfield_custom_css { - height: 250px; -} +/************************************************************ +Headings and labels +*/ label { display: inline-block; @@ -154,34 +155,90 @@ span.footnote_highlight_placeholder { text-align: center !important; } -/********************************************************* +/************************************************************ +Special table layout + +Hooks and priority levels: initialized from style attributes in templates IE doesn’t support nth child, but these are not critical */ -#expert-lookup tr th:first-child, -#expert-lookup tr td:first-child { +#expert_lookup tr th:first-child, +#expert_lookup tr td:first-child { width: 170px !important; } -#expert-lookup tr th:nth-child(2), -#expert-lookup tr td:nth-child(2) { +#expert_lookup tr th:nth-child(2), +#expert_lookup tr td:nth-child(2) { width: 65px !important; } -#expert-lookup tr th:nth-child(3), -#expert-lookup tr td:nth-child(3) { +#expert_lookup tr th:nth-child(3), +#expert_lookup tr td:nth-child(3) { width: 200px !important; } -#expert-lookup tr td:nth-child(3) input { +#expert_lookup tr td:nth-child(3) input { width: 190px; } -#expert-lookup tr th:last-child, -#expert-lookup tr td:last-child { +#expert_lookup tr th:last-child, +#expert_lookup tr td:last-child { white-space: nowrap; } -#settings-other tr td:nth-child(2) { +/* +Other settings +*/ +#settings_other tr td:nth-child(2) { width: 30%; } + /* +Custom CSS + +16 CSS classes are listed directly in the template +templates/dashboard/customize-css.html + +Localized notices are dropped to ease translators’ task. + +The textarea has monospace font but no tab support. +*/ +#customize_css tr td:first-child { + width: 44% !important; + font-weight: normal !important; +} +#customize_css tr td:first-child span:first-child { + font-weight: bold !important; +} +#customize_css .list { + padding-top: 10px; +} +#customize_css .list p { + font-family: monospace; + padding-left: 10px; + text-indent: -10px; + margin: .5em 0; +} + +#footnote_inputfield_custom_css { + height: 500px; + width: 90%; + resize: both; + overflow: scroll; + font-family: monospace; +} + +/************************************************************ +Notices + +span previously formatted as em element +but emphasis is not the correct semantics, +as it is rendered as bold in other scripts +so we need an explicit italic style: +*/ +.footnotes_notice { + font-style: italic; +} + +/************************************************************ +Descriptions + fullwidth div above or below settings tables: */ .footnotes_description { @@ -191,12 +248,3 @@ fullwidth div above or below settings tables: font-size: 1.4em; font-style: italic; } -/* -span previously formatted as em element -but emphasis is not the correct semantics, -as it is rendered as bold in other scripts -so we need an explicit italic style: -*/ -.footnotes_notice { - font-style: italic; -} diff --git a/footnotes.php b/footnotes.php index 74ea864..a32b9b3 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.1.5 + Version: 2.2.0d0 Author URI: http://cheret.de/plugins/footnotes-2/ Text Domain: footnotes Domain Path: /languages */ -define( 'FOOTNOTES_VERSION', '2.1.5' ); +define( 'FOOTNOTES_VERSION', '2.2.0d0' ); /* Copyright 2020 Mark Cheret (email: mark@cheret.de) diff --git a/readme.txt b/readme.txt index 28fb430..4bd2ed1 100755 --- a/readme.txt +++ b/readme.txt @@ -80,6 +80,12 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest** == Changelog == += 2.2.0d0 = +- Bugfix: add option to disable URL line wrapping added for Unicode non conformant browsers +- Update: Dashboard: reorder tabs, move CSS to extra tab, update tab labels +- Bugfix: Dashboard: fix punctuation-related localization issue by including colon in labels +- Bugfix: Localization: conform to WordPress plugin language file name scheme + = 2.1.5 = - Bugfix: Reference container, tooltips: exclude image source too from URL line wrapping span diff --git a/templates/dashboard/customize-css.html b/templates/dashboard/customize-css.html index dec8ae2..b28460d 100644 --- a/templates/dashboard/customize-css.html +++ b/templates/dashboard/customize-css.html @@ -1,27 +1,30 @@ - +
- + - - - - - - - - - - - - - - - - - - -
[[label-css]][[headline]]
+
+

.footnote_referrer = enclosing <span> +

.footnote_plugin_tooltip_text = inner <sup>, not tooltip +

+

.footnote_tooltip = inner <span> +

.footnote_tooltip_continue = nested <span> +

+

.footnotes_reference_container = enclosing <div> +

.footnote_container_prepare = label <div> +

.footnote_reference_container_label = <span> +

.footnote_reference_container_collapse_button = sibling <span> +

.footnotes_table = <table> +

+

.footnote_plugin_index_combi = first <td> if identical footnotes are combined +

.footnote_plugin_index = first <td> if not +

.footnote_index = <a> or <span> in first <td> in 3-column table +

.footnote_plugin_link = <a> or <span> if identical footnotes are not combined, or second <td> in 3-column table +

.footnote_backlink = <a> or <span> if identical footnotes are combined, or in second <td> in 3-column table +

.footnote_index_arrow = nested <span>, symbol only +

.footnote_plugin_text = second <td>, or third <td> in 3-column table +

+
[[css]]
[[headline]]
 [[label-class-1]]
[[class-1]]
 [[label-class-2]]
[[class-2]]
 [[label-class-3]]
[[class-3]]
 [[label-class-4]]
[[class-4]]
diff --git a/templates/dashboard/customize-mouse-over-box.html b/templates/dashboard/customize-mouse-over-box.html index a2951f7..66750b3 100644 --- a/templates/dashboard/customize-mouse-over-box.html +++ b/templates/dashboard/customize-mouse-over-box.html @@ -1,4 +1,4 @@ - +
diff --git a/templates/dashboard/customize-superscript.html b/templates/dashboard/customize-superscript.html index 81e6770..b4a19cd 100644 --- a/templates/dashboard/customize-superscript.html +++ b/templates/dashboard/customize-superscript.html @@ -1,4 +1,4 @@ -
[[label-enable]]
+
diff --git a/templates/dashboard/expert-lookup.html b/templates/dashboard/expert-lookup.html index 368db89..34fe762 100644 --- a/templates/dashboard/expert-lookup.html +++ b/templates/dashboard/expert-lookup.html @@ -3,7 +3,7 @@

[[description-2]] [[description-3]]

[[description-4]]

-
[[label-superscript]]
+
diff --git a/templates/dashboard/settings-love.html b/templates/dashboard/settings-love.html index cc34f8c..728d954 100644 --- a/templates/dashboard/settings-love.html +++ b/templates/dashboard/settings-love.html @@ -1,4 +1,4 @@ -
[[head-hook]]
+
diff --git a/templates/dashboard/settings-other.html b/templates/dashboard/settings-other.html index 3faa27f..38bc7f2 100644 --- a/templates/dashboard/settings-other.html +++ b/templates/dashboard/settings-other.html @@ -1,13 +1,17 @@ -
[[label-love]]
+
+ + + + - - + + diff --git a/templates/dashboard/settings-reference-container.html b/templates/dashboard/settings-reference-container.html index a6b0723..7a7cea2 100644 --- a/templates/dashboard/settings-reference-container.html +++ b/templates/dashboard/settings-reference-container.html @@ -1,4 +1,4 @@ -
[[label-url-wrap]][[url-wrap]] [[notice-url-wrap]]
[[label-link]] [[link]]
[[label-excerpt]][[excerpt]][[notice1-excerpt]][[notice2-excerpt]]
[[notice3-excerpt]]
[[excerpt]] [[notice1-excerpt]] [[notice2-excerpt]]
[[notice3-excerpt]]
[[label-expert-mode]]
+
diff --git a/templates/dashboard/settings-styling.html b/templates/dashboard/settings-styling.html index 493e202..8564f9e 100644 --- a/templates/dashboard/settings-styling.html +++ b/templates/dashboard/settings-styling.html @@ -1,4 +1,4 @@ -
[[label-name]]
+
diff --git a/templates/public/reference-container.html b/templates/public/reference-container.html index b663207..17ddd10 100644 --- a/templates/public/reference-container.html +++ b/templates/public/reference-container.html @@ -24,7 +24,7 @@ style="[[style]]" >
[[label-short-code-start]]
[[content]]