diff --git a/classes/footnotes.php b/classes/footnotes.php index 57ab322..a99b710 100644 --- a/classes/footnotes.php +++ b/classes/footnotes.php @@ -4,7 +4,7 @@ * User: Stefan * Date: 15.05.14 * Time: 16:21 - * Version: 1.0 + * Version: 1.0.6 * Since: 1.0 */ @@ -42,7 +42,7 @@ class Class_Footnotes /* register hook for deactivating the plugin */ register_deactivation_hook( __FILE__, array( $this, 'deactivate' ) ); /* register hook for uninstalling the plugin */ - register_uninstall_hook( __FILE__, array( __CLASS__, 'uninstall' ) ); + register_uninstall_hook( __FILE__, array( $this, 'uninstall' ) ); } /** @@ -65,11 +65,12 @@ class Class_Footnotes /** * uninstalls the plugin + * updated file path in version 1.0.6 * @since 1.0 */ function uninstall() { - require_once( PLUGIN_DIR . '/includes/uninstall.php' ); + require_once( dirname(__FILE__) . '/../includes/uninstall.php' ); } /** diff --git a/classes/footnotes_settings.php b/classes/footnotes_settings.php index 7539a9c..e539b0b 100644 --- a/classes/footnotes_settings.php +++ b/classes/footnotes_settings.php @@ -4,7 +4,7 @@ * User: Stefan * Date: 15.05.14 * Time: 16:21 - * Version: 1.0-beta + * Version: 1.0.6 * Since: 1.0 */ @@ -16,6 +16,7 @@ class Class_FootnotesSettings { /* * attribute for default settings value + * updated default value for 'FOOTNOTE_INPUTFIELD_LOVE' to default: 'no' in version 1.0.6 * @since 1.0 */ public static $a_arr_Default_Settings = array( @@ -25,7 +26,7 @@ class Class_FootnotesSettings FOOTNOTE_INPUTFIELD_PLACEHOLDER_START => '((', FOOTNOTE_INPUTFIELD_PLACEHOLDER_END => '))', FOOTNOTE_INPUTFIELD_SEARCH_IN_EXCERPT => 'yes', - FOOTNOTE_INPUTFIELD_LOVE => 'yes', + FOOTNOTE_INPUTFIELD_LOVE => 'no', FOOTNOTE_INPUTFIELD_COUNTER_STYLE => 'arabic_plain' ); /* diff --git a/css/footnote.css b/css/footnote.css index f6b2ea5..30391fd 100755 --- a/css/footnote.css +++ b/css/footnote.css @@ -3,7 +3,7 @@ * User: Stefan * Date: 15.05.14 * Time: 16:21 - * Version: 1.0-beta + * Version: 1.0.6 * Since: 1.0 */ @@ -105,12 +105,17 @@ cursor: default; } +/* + * added width and white-space styling in version 1.0.6 + */ .footnote_plugin_tooltip:hover span, .footnote_plugin_tooltip span:hover { display: inline !important; position: absolute !important; color: #474747 !important; border: 1px solid #ddccaa !important; background: #fffaf0 !important; + width: auto; + white-space: nowrap; } .callout { diff --git a/includes/replacer.php b/includes/replacer.php index ae67dfb..e931408 100644 --- a/includes/replacer.php +++ b/includes/replacer.php @@ -4,7 +4,7 @@ * User: Stefan * Date: 15.05.14 * Time: 16:21 - * Version: 1.0 + * Version: 1.0.6 * Since: 1.0 */ @@ -99,9 +99,14 @@ function footnotes_StopReplacing() */ function footnotes_LoveAndShareMe() { + /* + * updated url to wordpress.org plugin page instead of the github page + * also updated the font-style and translation the string "footnotes" + * in version 1.0.6 + */ echo '
'. - sprintf(__("Hey there, I'm using the awesome WordPress Plugin called %sfootnotes%s", FOOTNOTES_PLUGIN_NAME), '', ''). + sprintf(__("Hey there, I'm using the awesome WordPress Plugin called %s", FOOTNOTES_PLUGIN_NAME), 'footnotes'). '
' ; } @@ -270,7 +275,10 @@ function footnotes_OutputReferenceContainer() } /* add the footnote to the output box */ - $l_str_ReplaceText = str_replace( "[[FOOTNOTE INDEX SHORT]]", $l_str_FirstFootnoteIndex, $l_str_FootnoteTemplate ); + /* + * added function to convert the counter style in the reference container (bugfix for the link to the footnote) in version 1.0.6 + */ + $l_str_ReplaceText = str_replace( "[[FOOTNOTE INDEX SHORT]]", footnote_convert_index($l_str_FirstFootnoteIndex,$l_str_CounterStyle), $l_str_FootnoteTemplate ); $l_str_ReplaceText = str_replace( "[[FOOTNOTE INDEX]]", $l_str_FootnoteIndex, $l_str_ReplaceText ); $l_str_ReplaceText = str_replace( "[[FOOTNOTE TEXT]]", $l_str_FootnoteText, $l_str_ReplaceText ); /* add the footnote container to the output */ diff --git a/includes/uninstall.php b/includes/uninstall.php index 9870683..e13260d 100644 --- a/includes/uninstall.php +++ b/includes/uninstall.php @@ -4,7 +4,7 @@ * User: Stefan * Date: 15.05.14 * Time: 16:21 - * Version: 1.0 + * Version: 1.0.6 * Since: 1.0 */ @@ -15,6 +15,12 @@ if ( !defined( 'WP_UNINSTALL_PLUGIN' ) ) { exit(); } +/* + * requires the defines of the plugin + * @since 1.0.6 + */ +require_once(dirname(__FILE__) . '/defines.php'); + /* uninstalling the plugin is only allowed for logged in users */ if ( !is_user_logged_in() ) { wp_die( __( 'You must be logged in to run this script.', FOOTNOTES_PLUGIN_NAME ) ); @@ -23,4 +29,10 @@ if ( !is_user_logged_in() ) { /* current user needs the permission to (un)install plugins */ if ( !current_user_can( 'install_plugins' ) ) { wp_die( __( 'You do not have permission to run this script.', FOOTNOTES_PLUGIN_NAME ) ); -} \ No newline at end of file +} + +/* + * delete the settings container in the database + * @since 1.0.6 + */ +delete_option(FOOTNOTE_SETTINGS_CONTAINER); \ No newline at end of file diff --git a/index.php b/index.php index dbceab6..3e32f24 100755 --- a/index.php +++ b/index.php @@ -31,7 +31,7 @@ * User: Stefan * Date: 15.05.14 * Time: 16:21 - * Version: 1.0 + * Version: 1.0.5 * Since: 1.0 */ diff --git a/languages/footnotes-de.mo b/languages/footnotes-de.mo index b9e7ce7..333cebc 100755 Binary files a/languages/footnotes-de.mo and b/languages/footnotes-de.mo differ diff --git a/languages/footnotes-de.po b/languages/footnotes-de.po index c26560a..ac2dba2 100755 --- a/languages/footnotes-de.po +++ b/languages/footnotes-de.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: footnotes\n" -"POT-Creation-Date: 2014-05-19 09:15+0100\n" -"PO-Revision-Date: 2014-05-19 09:16+0100\n" +"POT-Creation-Date: 2014-05-20 17:59+0100\n" +"PO-Revision-Date: 2014-05-20 17:59+0100\n" "Last-Translator: Mark Cheret \n" "Language-Team: SHE \n" "Language: de\n" @@ -18,107 +18,107 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SearchPath-0: .\n" -#: classes/footnotes_settings.php:311 +#: classes/footnotes_settings.php:312 msgid "General" msgstr "Allgemein" -#: classes/footnotes_settings.php:313 +#: classes/footnotes_settings.php:314 #, php-format msgid "%s Settings" msgstr "%s Einstellungen" -#: classes/footnotes_settings.php:314 +#: classes/footnotes_settings.php:315 msgid "References label:" msgstr "Überschrift \"Einzelnachweis\":" -#: classes/footnotes_settings.php:315 +#: classes/footnotes_settings.php:316 msgid "Collapse references by default:" msgstr "Verstecke Einzelnachweise standardmäßig:" -#: classes/footnotes_settings.php:316 +#: classes/footnotes_settings.php:317 msgid "Combine identical footnotes:" msgstr "Kombiniere meine Fußnoten:" -#: classes/footnotes_settings.php:317 +#: classes/footnotes_settings.php:318 msgid "Footnote tag:" msgstr "Fußzeile einbinden:" -#: classes/footnotes_settings.php:318 +#: classes/footnotes_settings.php:319 msgid "Counter style:" msgstr "Fußnoten Zähler:" -#: classes/footnotes_settings.php:319 +#: classes/footnotes_settings.php:320 msgid "Allow footnotes on Summarized Posts:" msgstr "Erlaube Fußnoten in Zusammenfassungen:" -#: classes/footnotes_settings.php:320 +#: classes/footnotes_settings.php:321 #, php-format msgid "Tell the world you're using %sfoot%snotes%s:" msgstr "Teile der Welt mit, dass du %sfoot%snotes%s verwendest:" -#: classes/footnotes_settings.php:361 classes/footnotes_settings.php:409 -#: classes/footnotes_settings.php:424 +#: classes/footnotes_settings.php:362 classes/footnotes_settings.php:410 +#: classes/footnotes_settings.php:425 msgid "Yes" msgstr "Ja" -#: classes/footnotes_settings.php:362 classes/footnotes_settings.php:410 -#: classes/footnotes_settings.php:425 +#: classes/footnotes_settings.php:363 classes/footnotes_settings.php:411 +#: classes/footnotes_settings.php:426 msgid "No" msgstr "Nein" -#: classes/footnotes_settings.php:375 +#: classes/footnotes_settings.php:376 msgid "starts with:" msgstr "beginnt mit:" -#: classes/footnotes_settings.php:379 +#: classes/footnotes_settings.php:380 msgid "ends with:" msgstr "endet mit:" -#: classes/footnotes_settings.php:391 +#: classes/footnotes_settings.php:392 msgid "Arabic Numbers - Plain" msgstr "arabische Ziffern" -#: classes/footnotes_settings.php:392 +#: classes/footnotes_settings.php:393 msgid "Arabic Numbers - Leading 0" msgstr "arabisch Ziffern - führende Null" -#: classes/footnotes_settings.php:393 +#: classes/footnotes_settings.php:394 msgid "Latin Character - lower case" msgstr "alphabetisch - Kleinschreibung" -#: classes/footnotes_settings.php:394 +#: classes/footnotes_settings.php:395 msgid "Latin Character - upper case" msgstr "alphabetisch - Großschreibung" -#: classes/footnotes_settings.php:395 +#: classes/footnotes_settings.php:396 msgid "Roman Numerals" msgstr "Römische Ziffern" -#: classes/footnotes_settings.php:440 classes/footnotes_settings.php:442 +#: classes/footnotes_settings.php:441 classes/footnotes_settings.php:443 msgid "HowTo" msgstr "Hilfe" -#: classes/footnotes_settings.php:453 +#: classes/footnotes_settings.php:454 msgid "This is a brief introduction in how to use the plugin." msgstr "Eine kurze Anleitung für die Verwendung des Plugins." -#: classes/footnotes_settings.php:468 +#: classes/footnotes_settings.php:469 msgid "Start your footnote with the following shortcode:" msgstr "Starten Sie eine Fußnote mit:" -#: classes/footnotes_settings.php:473 +#: classes/footnotes_settings.php:474 msgid "...and end your footnote with this shortcode:" msgstr "...und beenden Sie diese mit:" -#: classes/footnotes_settings.php:479 classes/footnotes_settings.php:482 +#: classes/footnotes_settings.php:480 classes/footnotes_settings.php:483 msgid "example string" msgstr "Beispieltext" -#: classes/footnotes_settings.php:480 +#: classes/footnotes_settings.php:481 msgid "will be displayed as:" msgstr "wird dargestellt als:" -#: classes/footnotes_settings.php:487 +#: classes/footnotes_settings.php:488 #, php-format msgid "If you have any questions, please don't hesitate to %se-mail%s us." msgstr "Bei Fragen können Sie uns gerne eine %se-Mail%s senden." @@ -127,16 +127,16 @@ msgstr "Bei Fragen können Sie uns gerne eine %se-Mail%s senden." msgid "Settings" msgstr "Einstellungen" -#: includes/replacer.php:104 +#: includes/replacer.php:109 #, php-format -msgid "Hey there, I'm using the awesome WordPress Plugin called %sfootnotes%s" -msgstr "Hey Community, ich verwende nun das WordPress Plugin %sfootnotes%s" +msgid "Hey there, I'm using the awesome WordPress Plugin called %s" +msgstr "Hey Community, ich verwende nun das WordPress Plugin %s" -#: includes/uninstall.php:20 +#: includes/uninstall.php:26 msgid "You must be logged in to run this script." msgstr "Sie müssen angemeldet sein um diese Funktion ausführen zu können." -#: includes/uninstall.php:25 +#: includes/uninstall.php:31 msgid "You do not have permission to run this script." msgstr "Sie haben nicht die Berechtigung diese Funktion auszuführen." diff --git a/languages/footnotes-en.mo b/languages/footnotes-en.mo index f262aaf..370b7b6 100755 Binary files a/languages/footnotes-en.mo and b/languages/footnotes-en.mo differ diff --git a/languages/footnotes-en.po b/languages/footnotes-en.po index e8d87db..0d2f4b8 100755 --- a/languages/footnotes-en.po +++ b/languages/footnotes-en.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: footnotes\n" -"POT-Creation-Date: 2014-05-19 09:15+0100\n" -"PO-Revision-Date: 2014-05-19 09:15+0100\n" +"POT-Creation-Date: 2014-05-20 17:59+0100\n" +"PO-Revision-Date: 2014-05-20 17:59+0100\n" "Last-Translator: Mark Cheret \n" "Language-Team: SHE \n" "Language: en\n" @@ -18,107 +18,107 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Poedit-SearchPath-0: .\n" -#: classes/footnotes_settings.php:311 +#: classes/footnotes_settings.php:312 msgid "General" msgstr "General" -#: classes/footnotes_settings.php:313 +#: classes/footnotes_settings.php:314 #, php-format msgid "%s Settings" msgstr "%s Settings" -#: classes/footnotes_settings.php:314 +#: classes/footnotes_settings.php:315 msgid "References label:" msgstr "References label:" -#: classes/footnotes_settings.php:315 +#: classes/footnotes_settings.php:316 msgid "Collapse references by default:" msgstr "Collapse references by default:" -#: classes/footnotes_settings.php:316 +#: classes/footnotes_settings.php:317 msgid "Combine identical footnotes:" msgstr "Combine identical footnotes:" -#: classes/footnotes_settings.php:317 +#: classes/footnotes_settings.php:318 msgid "Footnote tag:" msgstr "Footnote tag:" -#: classes/footnotes_settings.php:318 +#: classes/footnotes_settings.php:319 msgid "Counter style:" msgstr "Counter style:" -#: classes/footnotes_settings.php:319 +#: classes/footnotes_settings.php:320 msgid "Allow footnotes on Summarized Posts:" msgstr "Allow footnotes on Summarized Posts:" -#: classes/footnotes_settings.php:320 +#: classes/footnotes_settings.php:321 #, php-format msgid "Tell the world you're using %sfoot%snotes%s:" msgstr "Tell the world you're using %sfoot%snotes%s:" -#: classes/footnotes_settings.php:361 classes/footnotes_settings.php:409 -#: classes/footnotes_settings.php:424 +#: classes/footnotes_settings.php:362 classes/footnotes_settings.php:410 +#: classes/footnotes_settings.php:425 msgid "Yes" msgstr "Yes" -#: classes/footnotes_settings.php:362 classes/footnotes_settings.php:410 -#: classes/footnotes_settings.php:425 +#: classes/footnotes_settings.php:363 classes/footnotes_settings.php:411 +#: classes/footnotes_settings.php:426 msgid "No" msgstr "No" -#: classes/footnotes_settings.php:375 +#: classes/footnotes_settings.php:376 msgid "starts with:" msgstr "starts with:" -#: classes/footnotes_settings.php:379 +#: classes/footnotes_settings.php:380 msgid "ends with:" msgstr "ends with:" -#: classes/footnotes_settings.php:391 +#: classes/footnotes_settings.php:392 msgid "Arabic Numbers - Plain" msgstr "Arabic Numbers - Plain" -#: classes/footnotes_settings.php:392 +#: classes/footnotes_settings.php:393 msgid "Arabic Numbers - Leading 0" msgstr "Arabic Numbers - Leading 0" -#: classes/footnotes_settings.php:393 +#: classes/footnotes_settings.php:394 msgid "Latin Character - lower case" msgstr "Latin Character - lower case" -#: classes/footnotes_settings.php:394 +#: classes/footnotes_settings.php:395 msgid "Latin Character - upper case" msgstr "Latin Character - upper case" -#: classes/footnotes_settings.php:395 +#: classes/footnotes_settings.php:396 msgid "Roman Numerals" msgstr "Roman Numerals" -#: classes/footnotes_settings.php:440 classes/footnotes_settings.php:442 +#: classes/footnotes_settings.php:441 classes/footnotes_settings.php:443 msgid "HowTo" msgstr "HowTo" -#: classes/footnotes_settings.php:453 +#: classes/footnotes_settings.php:454 msgid "This is a brief introduction in how to use the plugin." msgstr "This is a brief introduction in how to use the plugin." -#: classes/footnotes_settings.php:468 +#: classes/footnotes_settings.php:469 msgid "Start your footnote with the following shortcode:" msgstr "Start your footnote with the following shortcode:" -#: classes/footnotes_settings.php:473 +#: classes/footnotes_settings.php:474 msgid "...and end your footnote with this shortcode:" msgstr "...and end your footnote with this shortcode:" -#: classes/footnotes_settings.php:479 classes/footnotes_settings.php:482 +#: classes/footnotes_settings.php:480 classes/footnotes_settings.php:483 msgid "example string" msgstr "example string" -#: classes/footnotes_settings.php:480 +#: classes/footnotes_settings.php:481 msgid "will be displayed as:" msgstr "will be displayed as:" -#: classes/footnotes_settings.php:487 +#: classes/footnotes_settings.php:488 #, php-format msgid "If you have any questions, please don't hesitate to %se-mail%s us." msgstr "If you have any questions, please don't hesitate to %se-mail%s us." @@ -127,16 +127,16 @@ msgstr "If you have any questions, please don't hesitate to %se-mail%s us." msgid "Settings" msgstr "Settings" -#: includes/replacer.php:104 +#: includes/replacer.php:109 #, php-format -msgid "Hey there, I'm using the awesome WordPress Plugin called %sfootnotes%s" -msgstr "Hey there, I'm using the awesome WordPress Plugin called %sfootnotes%s" +msgid "Hey there, I'm using the awesome WordPress Plugin called %s" +msgstr "Hey there, I'm using the awesome WordPress Plugin called %s" -#: includes/uninstall.php:20 +#: includes/uninstall.php:26 msgid "You must be logged in to run this script." msgstr "You must be logged in to run this script." -#: includes/uninstall.php:25 +#: includes/uninstall.php:31 msgid "You do not have permission to run this script." msgstr "You do not have permission to run this script." diff --git a/readme.txt b/readme.txt index f056e5e..980dea7 100755 --- a/readme.txt +++ b/readme.txt @@ -5,7 +5,6 @@ Requires at least: 3.9 Tested up to: 3.9.1 License: GPLv3 or later License URI: http://www.gnu.org/licenses/gpl-3.0.html -Stable tag: 1.0.5 == Description == @@ -39,6 +38,12 @@ coming soon == Changelog == += 1.0.6 = +- Updated uninstall function to delete all plugin settings (bugfix) +- Updated counter style internal name in the reference container to correctly link to the right footnote on the page above (bugfix) +- Updated footnote hover box styling to not wrap the footnote text on mouse over (bugfix) +- Changed 'Love Me' text in the page footer if admin excepts it and set its default value to 'no' + = 1.0.5 = - The Plugin has been submitted to wordpress.org for review and (hopefully) publication. - Update: Plugin description for public directories (WordPress.org and GitHub)