development update 2.1.4d6 for testing and sharing

git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2429410 b8457f37-d9ea-0310-8a92-e5e31aec5664

class/dashboard/layout.php

@@ -6,10 +6,13 @@
  * @author Stefan Herndler
  * @since  1.5.0 12.09.14 10:56
  *
- * 2.1.2  added version # of settings.css for cache busting  2020-11-19T1456+0100
+ * Edited:
- * 2.1.4  automated version number update  2020-11-30T0648+0100
+ * 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  fix punctuation issue in dashboard labels  2020-12-01T0211+0100
+ * ########## this fix reverted for now; restore when updating strings and translations
  *
- * Last modified:  2020-11-30T0649+0100
+ * Last modified:  2020-12-01T0439+0100
  */
 
 
@@ -381,12 +384,24 @@ abstract class MCI_Footnotes_LayoutEngine {
      * @param string $p_str_SettingName Name of the Settings key to connect the Label with the input/select field.
      * @param string $p_str_Caption Label caption.
      * @return string
+     * 
+     * Edited 2020-12-01T0159+0100
+     * @since 2.1.4 no colon
      */
     protected function addLabel($p_str_SettingName, $p_str_Caption) {
         if (empty($p_str_Caption)) {
             return "";
         }
+        // remove the colon causing localization issues with French,
+        // and with languages not using punctuation at all,
+        // and with languages using other punctuation marks instead of colon,
+        // e.g. Greek using a raised dot.
+        // In French, colon is preceded by a space, forcibly non-breaking,
+        // and narrow per new school.
+        // Eventually add colon to label strings for inclusion in localization.
+        // Else drop colons after labels.
         return sprintf('<label for="%s">%s:</label>', $p_str_SettingName, $p_str_Caption);
+        //                                ^ here deleted colon  2020-12-01T0156+0100
     }
 
     /**

class/dashboard/subpage-main.php

@@ -94,8 +94,9 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
             // 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 is restored to meet user demand for arrow symbol semantics:
+			// The HyperlinkArrow meta box ceased for 2.0.0
-            $this->addMetaBox("customize", "hyperlink-arrow", __("Hyperlink symbol in the Reference container", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), "HyperlinkArrow"),
+			// 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"),
@@ -155,17 +156,21 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
                 "label-collapse" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_COLLAPSE, __("Collapse references by default", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)),
                 "collapse" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_COLLAPSE, $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)),
-                "symbol" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_BACKLINK_SYMBOL_ENABLE, $l_arr_Enabled),
-
                 "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-3column" => $this->addLabel(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_3COLUMN_LAYOUT_ENABLE, __("Three-column layout", 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)),
-                "3column" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_3COLUMN_LAYOUT_ENABLE, $l_arr_Enabled),
+                "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),
+                "symbol-comment" => __("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)),
-                "switch" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_BACKLINK_SYMBOL_SWITCH, $l_arr_Enabled),
+				"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)),
+                "3column" => $this->addSelectBox(MCI_Footnotes_Settings::C_BOOL_REFERENCE_CONTAINER_3COLUMN_LAYOUT_ENABLE, $l_arr_Enabled),
+                "3column-comment" => __("This legacy layout is available if identical footnotes are not combined.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
 
                 "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)),
                 "position" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_REFERENCE_CONTAINER_POSITION, $l_arr_Positions),
@@ -455,24 +460,9 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
      * The former 'hyperlink arrow', incompatible with combined identical footnotes,
      * became 'prepended arrow' in v2.0.3 after a user complaint about missing backlinking semantics
      * of the footnote number.
+	 * 
+	 * @since 2.1.4  moved to Settings > Reference container > Display a backlink symbol
      */
-    public function HyperlinkArrow() {
-        // load template file
-        $l_obj_Template = new MCI_Footnotes_Template(MCI_Footnotes_Template::C_STR_DASHBOARD, "customize-hyperlink-arrow");
-        // replace all placeholders
-        $l_obj_Template->replace(
-            array(
-                "label-symbol" => $this->addLabel(MCI_Footnotes_Settings::C_STR_HYPERLINK_ARROW, __("Hyperlink symbol", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)),
-                "symbol" => $this->addSelectBox(MCI_Footnotes_Settings::C_STR_HYPERLINK_ARROW, MCI_Footnotes_Convert::getArrow()),
-
-                "label-user-defined" => $this->addLabel(MCI_Footnotes_Settings::C_STR_HYPERLINK_ARROW_USER_DEFINED, __("or enter a user defined symbol", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)),
-                "user-defined" => $this->addTextBox(MCI_Footnotes_Settings::C_STR_HYPERLINK_ARROW_USER_DEFINED),
-                "comment" => __("if set it overrides the hyperlink symbol above", MCI_Footnotes_Config::C_STR_PLUGIN_NAME)
-            )
-        );
-        // display template with replaced placeholders
-        echo $l_obj_Template->getContent();
-    }
 
     /**
      * Displays the custom css box.

class/init.php

@@ -7,13 +7,13 @@
  * @since 1.5.0 12.09.14 10:56
  *
  * Edited:
- * 1.6.5: Replaced deprecated function create_function()
+ * 1.6.5  replace deprecated function create_function()
- * 2.0.0: Added jQueryUI from Cloudflare   2020-10-26T1907+0100
+ * 2.0.0  add jQueryUI from Cloudflare   2020-10-26T1907+0100
- * 2.0.3: Added style sheet versioning   2020-10-29T1413+0100
+ * 2.0.3  add versioning of public.css for cache busting   2020-10-29T1413+0100
- * 2.0.4: Added jQuery UI from WordPress   2020-11-01T1902+0100
+ * 2.0.4  add jQuery UI from WordPress   2020-11-01T1902+0100
- * 2.1.4: Automated update of version number for cache busting  2020-11-30T0646+0100
+ * 2.1.4  automate passing version number for cache busting  2020-11-30T0646+0100
  * 
- * Last modified:  2020-11-30T0646+0100
+ * Last modified:  2020-12-01T0146+0100
  */
 
 

css/public.css

@@ -4,9 +4,9 @@
  * Created-Date: 15.05.14
  * Created-Time: 16:21
  * Since: 1.0
- * Version: 2.1.4d5
+ * Version: 2.1.4d6
  *
- * Last modified: 2020-11-30T0712+0100
+ * Last modified: 2020-12-01T0450+0100
  */
 
 

css/settings.css

@@ -4,9 +4,9 @@
  * Created-Date: 15.05.14
  * Created-Time: 16:21
  * Since: 1.0
- * Version: 2.1.4d5
+ * Version: 2.1.4d6
  *
- * Last modified: 2020-11-30T0712+0100
+ * Last modified: 2020-12-01T0450+0100
  */
 
 
@@ -42,23 +42,25 @@
 On User Request: limited to a number of IDs to not affect all dashboards
 <https://wordpress.org/support/topic/all-input-have-width-80/>
 */
+/*input[type=text], input[type=password], textarea, select*/
 #footnote_inputfield_placeholder_start_user_defined,
 #footnote_inputfield_placeholder_end_user_defined,
 #footnote_inputfield_readon_label,
 #footnote_inputfield_references_label,
-#footnote_inputfield_custom_css
+#footnote_inputfield_custom_css {
-/*input[type=text], input[type=password], textarea, select*/ {
     padding-left: 8px !important;
     padding-right: 8px !important;
     width: 80% !important;
 }
 
+#footnote_inputfield_custom_hyperlink_symbol,
 #footnotes_inputfield_backlinks_terminator_option,
 #footnotes_inputfield_backlinks_separator_option {
 	width: 200px;
 }
 
-textarea {
+/*textarea*/
+#footnote_inputfield_custom_css {
     height: 250px;
 }
 

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.4d5
+    Version: 2.1.4d6
     Author URI: http://cheret.de/plugins/footnotes-2/
     Text Domain: footnotes
     Domain Path: /languages
 */
-define( 'FOOTNOTES_VERSION', '2.1.4d5' );
+define( 'FOOTNOTES_VERSION', '2.1.4d6' );
 /*
     Copyright 2020 Mark Cheret (email: mark@cheret.de)
 

readme.txt

@@ -80,13 +80,16 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest**
 
 == Changelog ==
 
+= 2.1.4d6 =
+- Bugfix: Dashboard: move arrow settings from Customize to Settings > Reference container to reunite and fix issue with new heading wording
+
 = 2.1.4d5
 - Bugfix: Reference container: separating and terminating punctuation optional and customizable
 - Bugfix: Reference container: Label: delete overflow hidden rule
 - Bugfix: WordPress hooks: the_content: set priority to 1000 as a safeguard
-- Bugfix: Dashboard: Footnotes main settings: fix layout, raise shortcodes to top
+- Bugfix: Dashboard: Main settings: fix layout, raise shortcodes to top
-- Bugfix: Reference container: add quick note to the Excerpt select box
+- Bugfix: Dashboard: Other settings: Excerpt: display guidance next to select box
-- Bugfix: Style sheet versioning for cache busting: automated safe mode compatible with security
+- Warning: Plugins deleting version parameter can compromise style sheet cache busting
 
 = 2.1.4d4 =
 - Bugfix: Reference container: Backlinks: disable separators and terminators

templates/dashboard/customize-hyperlink-arrow.html

@@ -1,12 +0,0 @@
-<table class="widefat fixed">
-	<tbody>
-	<tr>
-		<td>[[label-symbol]]</td>
-		<td>[[symbol]]</td>
-	</tr>
-	<tr>
-		<td>[[label-user-defined]]</td>
-		<td>[[user-defined]]<br/><i>[[comment]]</i></td>
-	</tr>
-	</tbody>
-</table>

templates/dashboard/settings-reference-container.html

@@ -8,18 +8,26 @@
         <td>[[label-collapse]]</td>
         <td>[[collapse]]</td>
     </tr>
-    <tr>
-        <td>[[label-3column]]</td>
-        <td>[[3column]]</td>
-    </tr>
     <tr>
         <td>[[label-symbol]]</td>
-        <td>[[symbol]]</td>
+        <td>
+            [[symbol-enable]]
+            [[symbol-options]]
+            [[symbol-custom]]
+            <em>[[symbol-comment]]</em>
+		</td>
     </tr>
     <tr>
         <td>[[label-switch]]</td>
         <td>[[switch]]</td>
     </tr>
+    <tr>
+        <td>[[label-3column]]</td>
+        <td>
+			[[3column]]
+			<em>[[3column-comment]]</em>
+		</td>
+    </tr>
     <tr>
         <td>[[label-separator]]</td>
         <td>