Skip to content

Commit

Permalink
Merge pull request #37 from modfin/mfn-wp-plugin-fixes-and-php8-1-sup…
Browse files Browse the repository at this point in the history 
…port

MFN WP Plugin - Fixes and PHP 8+ support
  • Loading branch information
@abulerforrest
abulerforrest authored Sep 19, 2022
2 parents c692d15 + b211c95 commit e40b9b0
Show file tree
Hide file tree
Showing 7 changed files with 160 additions and 114 deletions.
36 changes: 35 additions & 1 deletion admin/css/mfn-wp-plugin-admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,21 +114,26 @@ input.wide {
.mfn-settings-table {
width: 90%;
}

.mfn-settings-table input[readonly] {
background: rgba(255,255,255,.5);
border-color: rgba(220,220,222,.75);
box-shadow: inset 0 1px 2px rgb(0 0 0 / 4%);
color: rgba(44,51,56,.5);
}

.mfn-settings-table th {
text-align: left;
}

.mfn-settings-table small {
font-weight: normal;
}

.mfn-settings-table label {
user-select: none;
}

.mfn-status-table {
margin: 40px 0 40px 0;
text-align: left;
Expand Down Expand Up @@ -156,6 +161,7 @@ input.wide {
span.mfn-status-error {
color: #DC3232;
}

span.mfn-status-success {
color: green;
}
Expand Down Expand Up @@ -184,6 +190,11 @@ span.mfn-status-success {
.mfn-danger-zone-table .dashicons {
margin: 5px 6px 0 0;
}

.mfn-status-table span.dashicons {
margin-top: -2px;
}

.mfn-danger-zone-table tbody {
width: 500px;
padding: 20px 0;
Expand Down Expand Up @@ -493,6 +504,7 @@ span#mfn-subscription-status p, #mfn-sync-status p {
text-align: center;
padding: 6px;
opacity: 0.85;
font-size: 13px;
border-radius: 4px;
cursor: default;
user-select: none;
Expand Down Expand Up @@ -582,6 +594,7 @@ span#mfn-subscription-status p, #mfn-sync-status p {

.mfn-settings-table label {
pointer-events: none;
margin-right: 3px;
}

.mfn-selected-radio-option {
Expand Down Expand Up @@ -718,7 +731,6 @@ span#mfn-subscription-status p, #mfn-sync-status p {
background-color: #d12424;
}


#mfn-item-restore-confirm-button {
background-color: #F56E28;
border-color: #F56E28;
Expand All @@ -738,6 +750,7 @@ span#mfn-subscription-status p, #mfn-sync-status p {
justify-content: flex-end;
width: 100%;
}

.mfn-modal-dialog-buttons-container span {
padding: 5px;
}
Expand Down Expand Up @@ -852,4 +865,25 @@ span.mfn-modal-dialog-actions b:first-child {

.mfn-checkbox-input:checked + .mfn-checkbox span:first-child svg {
stroke-dashoffset: 0;
}

#mfn-status-container table,
#mfn-admin-wrapper p,
.mfn-settings-table {
font-size: 13px;
}

.mfn-action-heading-wrapper {
align-items: center;
display: inline-flex;
}

#mfn-rewrite-wrapper table td {
display: flex;
align-items: center;
}

#mfn-rewrite-wrapper table small {
position: relative;
top: 1px;
}
226 changes: 119 additions & 107 deletions admin/partials/mfn-wp-plugin-admin-display.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,55 +166,57 @@ function toggleQueryInput(e) {
</tr>
</tbody>
</table>
<table class="mfn-settings-table">
<tbody>
<tr>
<td>
' . mfn_parse_label('label_rewrite_post_type_slug') . '
' . mfn_parse_small('small_default_mfn_news') . '
</td>
</tr>
<tr>
<td class="mfn-inline-td">
<input type="text" class="regular-text wide" name="' . $this->plugin_name . '[rewrite_post_type][slug]' . '" id="' . $this->plugin_name . '-rewrite_post_type_slug"' . ' value="' . $slug . '" ' . $is_readonly . '>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_rewrite_post_type_slug') . '</span>
</div>
</td>
</tr>
<tr>
<td>
' . mfn_parse_label('label_rewrite_post_type_archive_name') . '
' . mfn_parse_small('small_default_mfn_news_items') . '
</td>
</tr>
<tr>
<td class="mfn-inline-td">
<input type="text" class="regular-text wide" name="' . $this->plugin_name . '[rewrite_post_type][archive-name]' . '" id="' . $this->plugin_name . '-rewrite_post_type_archive_name' . '" value="' . $archive_name . '" ' . $is_readonly . '>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_rewrite_post_type_archive_name') . '</span>
</div>
</td>
</tr>
<tr>
<td>
' . mfn_parse_label('label_rewrite_post_type_singular_name') . '
' . mfn_parse_small('small_default_mfn_news_item') . '
</td>
</tr>
<tr>
<td class="mfn-inline-td">
<input type="text" class="regular-text wide" name="' . $this->plugin_name . '[rewrite_post_type][singular-name]' . '" id="' . $this->plugin_name . '-rewrite_post_type_singular_name' . '" value="' . $singular_name . '" ' . $is_readonly . '>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_rewrite_post_type_singular_name') . '</span>
</div>
</td>
</tr>
</tbody>
</table>
<div id="mfn-rewrite-wrapper">
<table class="mfn-settings-table">
<tbody>
<tr>
<td>
' . mfn_parse_label('label_rewrite_post_type_slug') . '
' . mfn_parse_small('small_default_mfn_news') . '
</td>
</tr>
<tr>
<td class="mfn-inline-td">
<input type="text" class="regular-text wide" name="' . $this->plugin_name . '[rewrite_post_type][slug]' . '" id="' . $this->plugin_name . '-rewrite_post_type_slug"' . ' value="' . $slug . '" ' . $is_readonly . '>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_rewrite_post_type_slug') . '</span>
</div>
</td>
</tr>
<tr>
<td>
' . mfn_parse_label('label_rewrite_post_type_archive_name') . '
' . mfn_parse_small('small_default_mfn_news_items') . '
</td>
</tr>
<tr>
<td class="mfn-inline-td">
<input type="text" class="regular-text wide" name="' . $this->plugin_name . '[rewrite_post_type][archive-name]' . '" id="' . $this->plugin_name . '-rewrite_post_type_archive_name' . '" value="' . $archive_name . '" ' . $is_readonly . '>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_rewrite_post_type_archive_name') . '</span>
</div>
</td>
</tr>
<tr>
<td>
' . mfn_parse_label('label_rewrite_post_type_singular_name') . '
' . mfn_parse_small('small_default_mfn_news_item') . '
</td>
</tr>
<tr>
<td class="mfn-inline-td">
<input type="text" class="regular-text wide" name="' . $this->plugin_name . '[rewrite_post_type][singular-name]' . '" id="' . $this->plugin_name . '-rewrite_post_type_singular_name' . '" value="' . $singular_name . '" ' . $is_readonly . '>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_rewrite_post_type_singular_name') . '</span>
</div>
</td>
</tr>
</tbody>
</table>
</div>
<table class="mfn-settings-table">
<tbody>
<tr>
Expand Down Expand Up @@ -245,7 +247,7 @@ function toggleQueryInput(e) {
<td>
<div class="mfn-radio-button-container' . $append_none_radio_classes . '">
<input type="radio" id="' . $this->plugin_name . '-language_plugin_none" name="' . $this->plugin_name . '[language_plugin]" value="none" ' . $checked_none . ' ' . $is_readonly . '>
' . mfn_parse_label('label_language_plugin_none', 'mfn-h2-label') . '
' . mfn_parse_label('label_language_plugin_none') . '
<div>
<td>
</tr>
Expand Down Expand Up @@ -321,65 +323,69 @@ function toggleQueryInput(e) {
</tbody>
</table>
<hr>
<table class="mfn-settings-table">
<tbody>
<tr>
<th scope="row">
<div id="mfn-advanced-settings-container" class="do-fade">
<table class="mfn-settings-table">
<tbody>
<tr>
<th scope="row">
<p>
' . mfn_parse_label('label_advanced_settings', 'mfn-h2-label') . '
</p>
</th>
</tr>
<tr>
<td>
<p>
<input type="checkbox" id="' . $this->plugin_name . '-thumbnail_on" name="' . $this->plugin_name . '[thumbnail_on]" ' . checked($thumbnail_on, "on", false) . ' value="on" ' . $is_readonly . '>
' . mfn_parse_label('label_thumbnail_on') . '
<br>
' . mfn_parse_small('small_thumbnail_on_description') . '
</p>
<td>
</tr>
<tr>
<td>
<p>
<input type="checkbox" id="' . $this->plugin_name . '-thumbnail_allow_delete" name="' . $this->plugin_name . '[thumbnail_allow_delete]" ' . checked($thumbnail_allow_delete, "on", false) . ' value="on" ' . $is_readonly . '>
' . mfn_parse_label('label_thumbnail_allow_delete') . '
<br>
' . mfn_parse_small('small_thumbnail_allow_delete_description') . '
</p>
<td>
</tr>
<tr>
<td>
<p>
' . mfn_parse_label('label_advanced_settings', 'mfn-h2-label') . '
<input type="checkbox" id="' . $this->plugin_name . '-verify_signature" name="' . $this->plugin_name . '[verify_signature]" ' . checked($verify_signature, "on", false) . ' value="on" ' . $is_readonly . '>
' . mfn_parse_label('label_verify_signature') . '
<br>
' . mfn_parse_small('small_verify_signature_description') . '
</p>
</th>
<td>
</tr>
<tr>
<td>
<input type="checkbox" id="' . $this->plugin_name . '-thumbnail_on" name="' . $this->plugin_name . '[thumbnail_on]" ' . checked($thumbnail_on, "on", false) . ' value="on" ' . $is_readonly . '>
' . mfn_parse_label('label_thumbnail_on') . '
<br>
' . mfn_parse_small('small_thumbnail_on_description') . '
<p>
<input type="checkbox" id="' . $this->plugin_name . '-reset_cache" name="' . $this->plugin_name . '[reset_cache]" ' . checked($reset_cache, "on", false) . ' value="on" ' . $is_readonly . '>
' . mfn_parse_label('label_reset_cache') . '
<br>
' . mfn_parse_small('small_reset_cache_description') . '
</p>
<td>
</tr>
<tr>
<td>
<p>
<input type="checkbox" id="' . $this->plugin_name . '-thumbnail_allow_delete" name="' . $this->plugin_name . '[thumbnail_allow_delete]" ' . checked($thumbnail_allow_delete, "on", false) . ' value="on" ' . $is_readonly . '>
' . mfn_parse_label('label_thumbnail_allow_delete') . '
<input type="checkbox" id="' . $this->plugin_name . '-enable_attachments" name="' . $this->plugin_name . '[enable_attachments]" ' . checked($enable_attachments, "on", false) . ' value="on" ' . $is_readonly . '>
' . mfn_parse_label('label_enable_attachments') . '
<br>
' . mfn_parse_small('small_thumbnail_allow_delete_description') . '
' . mfn_parse_small('small_enable_attachments_description') . '
</p>
<td>
</tr>
<tr>
<td>
<p>
<input type="checkbox" id="' . $this->plugin_name . '-verify_signature" name="' . $this->plugin_name . '[verify_signature]" ' . checked($verify_signature, "on", false) . ' value="on" ' . $is_readonly . '>
' . mfn_parse_label('label_verify_signature') . '
<br>
' . mfn_parse_small('small_verify_signature_description') . '
</p>
<td>
</tr>
<tr>
<td>
<p>
<input type="checkbox" id="' . $this->plugin_name . '-reset_cache" name="' . $this->plugin_name . '[reset_cache]" ' . checked($reset_cache, "on", false) . ' value="on" ' . $is_readonly . '>
' . mfn_parse_label('label_reset_cache') . '
<br>
' . mfn_parse_small('small_reset_cache_description') . '
</p>
<td>
</tr>
<tr>
<td>
<p>
<input type="checkbox" id="' . $this->plugin_name . '-enable_attachments" name="' . $this->plugin_name . '[enable_attachments]" ' . checked($enable_attachments, "on", false) . ' value="on" ' . $is_readonly . '>
' . mfn_parse_label('label_enable_attachments') . '
<br>
' . mfn_parse_small('small_enable_attachments_description') . '
</p>
<td>
</tr>
</tbody>
</table>
</tbody>
</table>
</div>
<div class="mfn-save-buttons-container">
<table>
<tbody>
Expand Down Expand Up @@ -457,10 +463,12 @@ function toggleQueryInput(e) {
' . mfn_parse_heading('heading_subscription', 'h2') . '
<div id="mfn-status-container" class="do-fade"></div>
' . mfn_parse_heading('heading_actions', 'h3') . '
<h4 class="mfn-h4">' . mfn_get_text('heading_sync_feed') . '</h4>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_sync') . '</span>
<div class="mfn-action-heading-wrapper">
<h4 class="mfn-h4">' . mfn_get_text('heading_sync_feed') . '</h4>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_sync') . '</span>
</div>
</div>
<span class="mfn-action-buttons-container">
<button id="mfn-sync-latest" class="button mfn-button">
Expand All @@ -474,10 +482,12 @@ function toggleQueryInput(e) {
</span>
<span id="mfn-sync-status"></span>
<div>
<h4 class="mfn-h4">' . mfn_get_text('heading_sync_taxonomy') . '</h4>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_sync_taxonomy') . '</span>
<div class="mfn-action-heading-wrapper">
<h4 class="mfn-h4">' . mfn_get_text('heading_sync_taxonomy') . '</h4>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_sync_taxonomy') . '</span>
</div>
</div>
<div class="mfn-row-container">
<div class="mfn-buttons-container">
Expand All @@ -489,10 +499,12 @@ function toggleQueryInput(e) {
<span id="mfn-sync-tax-status"></span>
</div>
</div>
<h4 class="mfn-h4">' . mfn_get_text('heading_subscribe') . '</h4>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_subscribe') . '</span>
<div class="mfn-action-heading-wrapper">
<h4 class="mfn-h4">' . mfn_get_text('heading_subscribe') . '</h4>
<div class="mfn-tooltip-box">
<span class="mfn-info-icon-wrapper"><i class="dashicons dashicons-info-outline"></i></span>
<span class="mfn-tooltip-text">' . mfn_get_text('tooltip_subscribe') . '</span>
</div>
</div>
<div class="mfn-row-container">
<div class="mfn-buttons-container">';
Expand Down
Loading

0 comments on commit e40b9b0

Please sign in to comment.