Prepare for release version 1.6.2

- Update: Changed the Preview tab - Bugfix: Html tags has been removed in the Reference container when the excerpt mode is enabled git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@1026210 b8457f37-d9ea-0310-8a92-e5e31aec5664
2014-11-15 13:48:12 +00:00 · 2014-11-15 13:48:12 +00:00 · 7daa3a2106
parent 50f4a3814c
commit 7daa3a2106
6 changed files with 23 additions and 21 deletions
--- a/class/dashboard/subpage-main.php
+++ b/class/dashboard/subpage-main.php
@ -62,7 +62,7 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
        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("how-to", __("How to", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), null, false);
+        $l_arr_Tabs[] = $this->addSection("how-to", __("Preview", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), null, false);
 		return $l_arr_Tabs;
 	}

@ -483,7 +483,13 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
 			$l_arr_Footnote_StartingTag = $this->LoadSetting(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_START_USER_DEFINED);
 			$l_arr_Footnote_EndingTag = $this->LoadSetting(MCI_Footnotes_Settings::C_STR_FOOTNOTES_SHORT_CODE_END_USER_DEFINED);
 		}
-		$l_str_Example = "Hello" . $l_arr_Footnote_StartingTag["value"] . __("example string", MCI_Footnotes_Config::C_STR_PLUGIN_NAME) . $l_arr_Footnote_EndingTag["value"] . " World!";
+		$l_str_Example = "Hello" . $l_arr_Footnote_StartingTag["value"] .
+		                 "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat,".
+		                 " sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum.".
+		                 " Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet,".
+		                 " consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.".
+		                 " At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet."
+		                 . $l_arr_Footnote_EndingTag["value"] . " World!";

 		// load template file
 		$l_obj_Template = new MCI_Footnotes_Template(MCI_Footnotes_Template::C_STR_DASHBOARD, "how-to-help");
@ -497,7 +503,7 @@ class MCI_Footnotes_Layout_Settings extends MCI_Footnotes_LayoutEngine {
 				"end" => $l_arr_Footnote_EndingTag["value"],

 				"example-code" => $l_str_Example,
-				"example-string" => __("will be displayed as:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
+				"example-string" => "<br/>" . __("will be displayed as:", MCI_Footnotes_Config::C_STR_PLUGIN_NAME),
 				"example" => $g_obj_MCI_Footnotes->a_obj_Task->exec($l_str_Example, true),

 				"information" => sprintf(__("For further information please check out our %ssupport forum%s on WordPress.org.", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), '<a href="http://wordpress.org/support/plugin/footnotes" target="_blank" class="footnote_plugin">', '</a>')
--- a/class/task.php
+++ b/class/task.php
@ -363,9 +363,9 @@ class MCI_Footnotes_Task {
                $l_bool_EnableExcerpt = MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_FOOTNOTES_MOUSE_OVER_BOX_EXCERPT_ENABLED));
                $l_int_MaxLength = intval(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_INT_FOOTNOTES_MOUSE_OVER_BOX_EXCERPT_LENGTH));
                if ($l_bool_EnableExcerpt) {
-                    $l_str_FootnoteText = strip_tags($l_str_FootnoteText);
-                    if (is_int($l_int_MaxLength) && strlen($l_str_FootnoteText) > $l_int_MaxLength) {
-                        $l_str_ExcerptText = substr($l_str_FootnoteText, 0, $l_int_MaxLength);
+                    $l_str_DummyText = strip_tags($l_str_FootnoteText);
+                    if (is_int($l_int_MaxLength) && strlen($l_str_DummyText) > $l_int_MaxLength) {
+                        $l_str_ExcerptText = substr($l_str_DummyText, 0, $l_int_MaxLength);
                        $l_str_ExcerptText = substr($l_str_ExcerptText, 0, strrpos($l_str_ExcerptText, ' '));
                        $l_str_ExcerptText .= " ..." . sprintf(__("%scontinue%s", MCI_Footnotes_Config::C_STR_PLUGIN_NAME), '<a href="" onclick="footnote_moveToAnchor(\'footnote_plugin_reference_'.$l_str_Index.'\');">', '</a>');
                    }
--- a/css/public.css
+++ b/css/public.css
@ -29,18 +29,6 @@
    cursor: pointer;
 }

-/* tooltip */
-/*.footnote_tooltip {
-	display: none;
-	background-color: #fff7a7;
-	border: 1px solid #cccc99;
-	border-radius: 3px;
-	padding: 12px;
-	font-size: 13px;
-	-moz-box-shadow: 2px 2px 11px #666;
-	-webkit-box-shadow: 2px 2px 11px #666;
-}*/
-
 /* reference container label */
 .footnote_container_prepare {
 	display: block !important;
--- a/footnotes.php
+++ b/footnotes.php
@ -4,7 +4,7 @@
 	Plugin URI: http://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: ManFisher Medien ManuFaktur
-	Version: 1.6.1
+	Version: 1.6.2
 	Author URI: http://manfisher.net/plugins/footnotes/
 	Text Domain: footnotes
 	Domain Path: /languages
--- a/readme.txt
+++ b/readme.txt
@ -6,7 +6,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
 Tested up to: 4.1
 License: GPLv3 or later
 License URI: http://www.gnu.org/licenses/gpl-3.0.html
-Stable Tag: 1.6.1
+Stable Tag: 1.6.2

 == Description ==

@ -84,6 +84,10 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest**

 == Changelog ==

+= 1.6.2 =
+- Update: Changed the Preview tab
+- Bugfix: Html tags has been removed in the Reference container when the excerpt mode is enabled
+
 = 1.6.1 =
 - Update: Translations
 - Bugfix: Move to anchor
--- a/templates/dashboard/how-to-help.html
+++ b/templates/dashboard/how-to-help.html
@ -5,7 +5,11 @@
 </div>

 <div class="footnote_placeholder_box_example">
-	<span class="footnote_highlight_placeholder">[[example-code]]</span>[[example-string]]&nbsp;&nbsp;&nbsp;&nbsp;[[example]]
+	<span class="footnote_highlight_placeholder">[[example-code]]</span>
+	<br/>
+	[[example-string]]
+	<br/>
+	[[example]]
 </div>

 <div style="text-align:center;">