Rumperuu/footnotes
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

upcoming 2.1.4 was not ready, instead thanks for testing 2.1.4d8, to be shared on Forum too

Browse source 
git-svn-id: https://plugins.svn.wordpress.org/footnotes/trunk@2431035 b8457f37-d9ea-0310-8a92-e5e31aec5664
This commit is contained in:
pewgeuges 2020-12-03 17:38:14 +00:00
parent 95ed6631e2
commit 6e0698293c
18 changed files with 439 additions and 444 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
class/dashboard/layout.php
View file

@ -9,10 +9,11 @@
* Edited:
* 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 started fixing punctuation-related localization issue in dashboard labels 2020-12-01T0211+0100
* 2.1.4 start fixing punctuation-related localization issue in dashboard labels 2020-12-01T0211+0100
* ########## this fix reverted for now; restore when updating strings and translations
* 2.1.4 step argument and support for floating in numbox 2020-12-03T0952+0100
*
* Last modified: 2020-12-01T1559+0100
* Last modified: 2020-12-03T0952+0100
*/

11
class/dashboard/subpage-main.php
View file

@ -7,13 +7,12 @@
* @since 1.5.0 14.09.14 14:47
*
* Edited for:
* 2.0.4 2020-11-01T0509+0100
* 2.1.0 2020-11-08T2148+0100
* 2.1.1 2020-11-16T2152+0100
* 2.1.3 2020-11-24T0955+0100
* 2.1.4 2020-11-28T1050+0100
* 2.0.4 restore arrow settings 2020-11-01T0509+0100
* 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 and tooltips 2020-12-03T0950+0100
*
* Last modified: 2020-11-30T0711+0100
* Last modified: 2020-12-03T1359+0100
*/
/**

11
class/settings.php
View file

@ -17,8 +17,9 @@
* 2.1.1 fix ref container by option restoring 3-column layout
* 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
*
* Last modified: 2020-11-17T0311+0100
* Last modified: 2020-12-03T1603+0100
*/
@ -492,12 +493,12 @@ class MCI_Footnotes_Settings {
self::C_STR_BACKLINKS_TERMINATOR_CUSTOM => '',
// set backlinks column width:
self::C_BOOL_BACKLINKS_COLUMN_WIDTH_ENABLED => 'yes',
self::C_INT_BACKLINKS_COLUMN_WIDTH_SCALAR => '2',
self::C_STR_BACKLINKS_COLUMN_WIDTH_UNIT => 'em',
self::C_BOOL_BACKLINKS_COLUMN_WIDTH_ENABLED => 'no',
self::C_INT_BACKLINKS_COLUMN_WIDTH_SCALAR => '50',
self::C_STR_BACKLINKS_COLUMN_WIDTH_UNIT => 'px',
// set backlinks column max width:
self::C_BOOL_BACKLINKS_COLUMN_MAX_WIDTH_ENABLED => 'yes',
self::C_BOOL_BACKLINKS_COLUMN_MAX_WIDTH_ENABLED => 'no',
self::C_INT_BACKLINKS_COLUMN_MAX_WIDTH_SCALAR => '140',
self::C_STR_BACKLINKS_COLUMN_MAX_WIDTH_UNIT => 'px',

80
class/task.php
View file

@ -8,22 +8,23 @@
*
* Edited for v2.0.0 and following.
*
* 2.0.5: Autoload / infinite scroll support added thanks to code from
* 2.0.5 Autoload / infinite scroll support added thanks to code from
* @docteurfitness <https://wordpress.org/support/topic/auto-load-post-compatibility-update/>
*
* 2.0.9: DISABLED the_post HOOK 2020-11-08T1839+0100
* 2.1.0: promoted the 'Continue reading' button from localization to customization 2020-11-08T2146+0100
* 2.1.1: combining identical footnotes: fixed dead links 2020-11-14T2233+0100
* 2.1.1: options fixing ref container layout and referrer vertical alignment 2020-11-16T2024+0100
* 2.1.1: option fixing ref container relative position 2020-11-17T0254+0100
* 2.1.2: options for the other hooks 2020-11-19T1849+0100
* 2.1.4: fix line wrapping of URLs based on pattern, not link element 2020-11-25T0837+0100
* 2.1.4: fix issues with link elements by making them optional 2020-11-26T1051+0100
* 2.1.4: support appending arrow when combining identicals is on 2020-11-26T1633+0100
* 2.1.4: disable or select backlink separator and terminator 2020-11-28T1048+0100
* 2.1.4: optional line breaks to stack enumerated backlinks 2020-11-28T1049+0100
* 2.0.9 DISABLED the_post HOOK 2020-11-08T1839+0100
* 2.1.0 promoted the 'Continue reading' button from localization to customization 2020-11-08T2146+0100
* 2.1.1 combining identical footnotes: fixed dead links 2020-11-14T2233+0100
* 2.1.1 options fixing ref container layout and referrer vertical alignment 2020-11-16T2024+0100
* 2.1.1 option fixing ref container relative position 2020-11-17T0254+0100
* 2.1.2 options for the other hooks 2020-11-19T1849+0100
* 2.1.4 fix line wrapping of URLs based on pattern, not link element 2020-11-25T0837+0100
* 2.1.4 fix issues with link elements by making them optional 2020-11-26T1051+0100
* 2.1.4 support appending arrow when combining identicals is on 2020-11-26T1633+0100
* 2.1.4 disable or select backlink separator and terminator 2020-11-28T1048+0100
* 2.1.4 optional line breaks to stack enumerated backlinks 2020-11-28T1049+0100
* 2.1.4 ref container column width and tooltip font size settings 2020-12-03T0954+0100
*
* Last modified: 2020-11-28T1049+0100
* Last modified: 2020-12-03T1623+0100
*/
// If called directly, abort:
@ -165,9 +166,14 @@ class MCI_Footnotes_Task {
$l_str_BoxShadowColor = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_MOUSE_OVER_BOX_SHADOW_COLOR);
// ref container first column width:
$l_bool_ColumnWidthEnabled = MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_COLUMN_WIDTH_ENABLED));
$l_int_ColumnWidthScalar = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_INT_BACKLINKS_COLUMN_WIDTH_SCALAR);
$l_str_ColumnWidthUnit = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_BACKLINKS_COLUMN_WIDTH_UNIT);
$l_bool_ColumnMaxWidthEnabled = MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_COLUMN_MAX_WIDTH_ENABLED));
$l_int_ColumnMaxWidthScalar = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_INT_BACKLINKS_COLUMN_MAX_WIDTH_SCALAR);
$l_str_ColumnMaxWidthUnit = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_BACKLINKS_COLUMN_MAX_WIDTH_UNIT);
if (!empty($l_int_ColumnWidthScalar)) {
if ($l_str_ColumnWidthUnit == '%') {
if ($l_int_ColumnWidthScalar > 100) {
@ -178,10 +184,6 @@ class MCI_Footnotes_Task {
$l_int_ColumnWidthScalar = 0;
}
// ref container first column max width:
$l_int_ColumnMaxWidthScalar = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_INT_BACKLINKS_COLUMN_MAX_WIDTH_SCALAR);
$l_str_ColumnMaxWidthUnit = MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_BACKLINKS_COLUMN_MAX_WIDTH_UNIT);
if (!empty($l_int_ColumnMaxWidthScalar)) {
if ($l_str_ColumnMaxWidthUnit == '%') {
if ($l_int_ColumnMaxWidthScalar > 100) {
@ -201,20 +203,21 @@ class MCI_Footnotes_Task {
echo ".home .footnotes_reference_container { display: none; }\r\n";
}
// first column width:
if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_COLUMN_WIDTH_ENABLED))) {
// ref container first column width:
if ( $l_bool_ColumnWidthEnabled || $l_bool_ColumnMaxWidthEnabled ) {
echo ".footnote-reference-container { table-layout: fixed; }";
echo ".footnote_plugin_index, .footnote_plugin_index_combi {";
if ( $l_bool_ColumnWidthEnabled ) {
echo " width: $l_int_ColumnWidthScalar$l_str_ColumnWidthUnit !important;";
echo '}';
}
// first column max width:
if (MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_BACKLINKS_COLUMN_MAX_WIDTH_ENABLED))) {
echo ".footnote_plugin_index, .footnote_plugin_index_combi {";
if ( $l_bool_ColumnMaxWidthEnabled ) {
echo " max-width: $l_int_ColumnMaxWidthScalar$l_str_ColumnMaxWidthUnit !important;";
}
echo '}';
}
// tooltip:
echo '.footnote_tooltip {';
echo ' font-size: ';
@ -862,26 +865,23 @@ class MCI_Footnotes_Task {
$l_str_FootnoteBacklinks = $l_str_FootnoteReference;
$l_str_FootnoteBacklinks .= $l_str_BacklinkEvent;
// finish both single note and notes cluster, depending on switch option status:
// continue both single note and notes cluster, depending on switch option status:
if ($l_bool_SymbolSwitch) {
$l_str_FootnoteReference .= ">$l_str_FootnoteId$l_str_FootnoteArrow</$l_str_LinkSpan>";
$l_str_FootnoteBacklinks .= ">$l_str_FootnoteId$l_str_FootnoteArrow</$l_str_LinkSpan>";
$l_str_FootnoteReference .= ">$l_str_FootnoteId$l_str_FootnoteArrow";
$l_str_FootnoteBacklinks .= ">$l_str_FootnoteId$l_str_FootnoteArrow";
} else {
$l_str_FootnoteReference .= ">$l_str_FootnoteArrow$l_str_FootnoteId</$l_str_LinkSpan>";
$l_str_FootnoteBacklinks .= ">$l_str_FootnoteArrow$l_str_FootnoteId</$l_str_LinkSpan>";
}
// If that is the only footnote with this text, we’re done.
$l_str_FootnoteReference .= ">$l_str_FootnoteArrow$l_str_FootnoteId";
$l_str_FootnoteBacklinks .= ">$l_str_FootnoteArrow$l_str_FootnoteId";
}
// If that is the only footnote with this text, we’re nearly done.
// CHECK IF COMBINING IDENTICALS IS TURNED ON, and
// check if it isn't the last footnote in the array:
if ($l_int_FirstFootnoteIndex < count(self::$a_arr_Footnotes) && MCI_Footnotes_Convert::toBool(MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_BOOL_COMBINE_IDENTICAL_FOOTNOTES))) {
if ($l_int_FirstFootnoteIndex < count(self::$a_arr_Footnotes)) {
// get all footnotes that haven't passed yet:
for ($l_int_CheckIndex = $l_int_FirstFootnoteIndex; $l_int_CheckIndex < count(self::$a_arr_Footnotes); $l_int_CheckIndex++) {
@ -903,7 +903,8 @@ class MCI_Footnotes_Task {
$l_str_FootnoteId = MCI_Footnotes_Convert::Index(($l_int_CheckIndex + 1), MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE));
// resume composing the backlinks enumeration:
$l_str_FootnoteBacklinks .= "$l_str_Separator$l_str_LineBreak<$l_str_LinkSpan";
$l_str_FootnoteBacklinks .= "$l_str_Separator</$l_str_LinkSpan>";
$l_str_FootnoteBacklinks .= "$l_str_LineBreak<$l_str_LinkSpan";
$l_str_FootnoteBacklinks .= ' id="footnote_plugin_reference_';
$l_str_FootnoteBacklinks .= $l_int_PostId;
$l_str_FootnoteBacklinks .= "_$l_str_FootnoteId";
@ -914,15 +915,16 @@ class MCI_Footnotes_Task {
$l_str_FootnoteBacklinks .= $l_bool_SymbolSwitch ? '' : $l_str_FootnoteArrow;
$l_str_FootnoteBacklinks .= $l_str_FootnoteId;
$l_str_FootnoteBacklinks .= $l_bool_SymbolSwitch ? $l_str_FootnoteArrow : '';
$l_str_FootnoteBacklinks .= "</$l_str_LinkSpan>";
// this legacy is not used:
//$l_str_FootnoteIndex .= ', ' . MCI_Footnotes_Convert::Index(($l_int_CheckIndex + 1), MCI_Footnotes_Settings::instance()->get(MCI_Footnotes_Settings::C_STR_FOOTNOTES_COUNTER_STYLE));
}
}
}
$l_str_FootnoteReference .= "$l_str_Terminator</$l_str_LinkSpan>";
$l_str_FootnoteBacklinks .= "$l_str_Terminator</$l_str_LinkSpan>";
}
// line wrapping of URLs already fixed, see:
// $l_str_FootnoteText = preg_replace( '#(?<!href=.)(https?://[^\\s<]+)#', '<span class="footnote_url_wrap">$1</span>', $l_str_FootnoteText );

24
css/public.css
View file

@ -4,9 +4,9 @@
* Created-Date: 15.05.14
* Created-Time: 16:21
* Since: 1.0
* Version: 2.1.4d7
* Version: 2.1.4d8
*
* Last modified: 2020-12-03T0836+0100
* Last modified: 2020-12-03T1834+0100
*/
@ -261,28 +261,30 @@ when hovered in some themes, not in others:
}
/*
These rules are moved to settings defaulting to this
since 2.1.4
auto-expanding column to fit widest
Not using 'max-content' as that causes no-wrap and overflows.
These rules are just defauls preventing the table from filling the width.
They are not very effective by lack of table-layout: fixed;
since 2.1.4 settings are optionally available, with table-layout: fixed;
By default, the backlink column is auto-expanding to fit widest.
Not using 'max-content' as that causes no-wrap and overflows.
These are overridden if settings are enabled.
*/
.footnote_plugin_index,
.footnote_plugin_index_combi {
max-width: 140px;
width: 2em;
max-width: 100px;
width: 2.5em;
}
*/
/*
Responsive
*/
@media only screen and (max-width: 768px) {
.footnote_plugin_index,
.footnote_plugin_index_combi {
max-width: 100px;
max-width: 80px;
}
}
/****************************************************************
Footnotes printing style rules

25
css/settings.css
View file

@ -4,16 +4,17 @@
* Created-Date: 15.05.14
* Created-Time: 16:21
* Since: 1.0
* Version: 2.1.4d7
* Version: 2.1.4d8
*
* Last modified: 2020-12-03T0837+0100
* Last modified: 2020-12-03T1834+0100
*/
/* MCI Footnotes logo
*
* The classes with 'heading' fix display in dashboard
* See class/config.php and css/public.css
/*****************************************************
MCI Footnotes logo
The classes with 'heading' fix display in dashboard
See class/config.php and css/public.css
*/
.postbox-header {
@ -38,7 +39,7 @@
left: 96px;
}
/*
/*************************************************************************
On User Request: limited to a number of IDs to not affect all dashboards
<https://wordpress.org/support/topic/all-input-have-width-80/>
*/
@ -119,7 +120,7 @@ span.footnote_highlight_placeholder {
text-align: center !important;
}
/*
/*********************************************************
initialized from style attributes in templates
IE doesn’t support nth child, but these are not critical
*/
@ -143,6 +144,10 @@ IE doesn’t support nth child, but these are not critical
white-space: nowrap;
}
#settings-other tr td:nth-child(2) {
width: 30%;
}
.footnotes-description {
padding: 0 10%;
}
@ -150,7 +155,3 @@ IE doesn’t support nth child, but these are not critical
font-size: 1.4em;
font-style: italic;
}
#settings-other tr td:nth-child(2) {
width: 30%;
}

4
footnotes.php
View file

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

41
readme.txt
View file

@ -80,37 +80,26 @@ Visit this swift write-up from a **footnotes** user by the name of **Southwest**
== Changelog ==
= 2.1.4d7 =
- Bugfix: Reference container: fix layout issues by moving backlink column width to settings
- Bugfix: Tooltip: fix issues with font size by moving it to settings and defaulting to previous
= 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
= 2.1.4d8 =
- Bugfix: Dashboard: Main settings: fix layout, raise shortcodes to top
- Bugfix: Dashboard: move arrow settings from Customize to Settings > Reference container to reunite and fix issue with new heading wording
- Bugfix: Dashboard: Other settings: Excerpt: display guidance next to select box
= 2.1.4d4 =
- Bugfix: Reference container: Backlinks: disable separators and terminators
- Bugfix: Reference container: Backlinks: optional line breaks to stack enumerations
= 2.1.4d3 =
- Bugfix: Layout: Tooltips: prevent line break in Read-on link label
- Bugfix: Reference container, tooltips: fix line wrapping of URLs based on pattern, not link element
- Bugfix: Reference container: Backlink symbol: support for appending when combining identicals is on
- Bugfix: Reference container: Backlinks: deprioritize hover underline to ease customization
- Bugfix: Footnote referrers: disable hover underline
= 2.1.4d2 =
- Bugfix: Styling: Referrers and backlinks: make link elements optional to fix issues
- Update: Dashboard: Expert mode: streamline and update description for hooks and priority levels
- Bugfix: Layout: Tooltip: prevent line break in Read-on link label
= 2.1.4d1 =
- Bugfix: Reference container, tooltips: fix line wrapping of URLs based on pattern, not link element
- Bugfix: Reference container: Backlinks: fix line breaking with respect to separators and terminators
- Bugfix: Reference container: Backlinks: options to disable separators and terminators
- Bugfix: Reference container: Backlinks: optional line breaks to stack enumerations
- Bugfix: Reference container: fix layout issues by moving backlink column width to settings
- Bugfix: Reference container: Label: delete overflow hidden rule
- Bugfix: Reference container: separating and terminating punctuation optional and customizable
- Bugfix: Reference container: Styles: re-add the class dedicated to combined footnotes indices
- Bugfix: Styling: Referrers and backlinks: make link elements optional to fix issues
- Bugfix: Styling: Referrers: disable hover underline
- Bugfix: Styling: Tooltips: fix font size issue by moving it to settings, defaulting to inherit
- Bugfix: WordPress hooks: the_content: set priority to 1000 as a safeguard
- Update: Dashboard: Expert mode: streamline and update description for hooks and priority levels
= 2.1.3 =
- Bugfix: disable widget_text hook by default to fix accordions declaring headings as widgets

2
templates/dashboard/customize-css.html
View file

@ -1,4 +1,4 @@
<table class="widefat fixed">
<table id="customize-css" class="widefat fixed">
<tbody>
<tr>
<td>[[label-css]]</td>

2
templates/dashboard/customize-mouse-over-box.html
View file

@ -1,4 +1,4 @@
<table class="widefat fixed">
<table id="customize-mouse-over-box" class="widefat fixed">
<tbody>
<tr>
<td>[[label-enable]]</td>

2
templates/dashboard/customize-superscript.html
View file

@ -1,4 +1,4 @@
<table class="widefat fixed">
<table id="customize-superscript" class="widefat fixed">
<tbody>
<tr>
<td>[[label-superscript]]</td>

2
templates/dashboard/diagnostics.html
View file

@ -1,4 +1,4 @@
<table class="widefat fixed">
<table id="diagnostics" class="widefat fixed">
<tbody>
<tr>
<td>[[label-server]]</td>

2
templates/dashboard/settings-love.html
View file

@ -1,4 +1,4 @@
<table class="widefat fixed">
<table id="settings-love" class="widefat fixed">
<tbody>
<tr>
<td>[[label-love]]</td>

2
templates/dashboard/settings-reference-container.html
View file

@ -1,4 +1,4 @@
<table class="widefat fixed">
<table id="settings-reference-container" class="widefat fixed">
<tbody>
<tr>
<td>[[label-name]]</td>

2
templates/dashboard/settings-styling.html
View file

@ -1,4 +1,4 @@
<table class="widefat fixed">
<table id="settings-styling" class="widefat fixed">
<tbody>
<tr>
<td>[[label-short-code-start]]</td>

2
templates/public/reference-container-body-combi.html
View file

@ -2,7 +2,7 @@
<td
class="footnote_plugin_index_combi[[pointer]]"
[[event]]
>[[backlinks]][[terminator]]</td>
>[[backlinks]]</td>
<td
class="footnote_plugin_text"
>[[text]]</td>