Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM wordpress:6.2.2-php8.2-apache
FROM wordpress:6.9.0-php8.2-apache

RUN apt-get update && \
apt-get install -y --no-install-recommends ssl-cert && \
Expand Down
6 changes: 6 additions & 0 deletions admin/class-bmltenabled-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@ function admin_menu_link()
if (!current_user_can($cap)) {
$cap = 'manage_bread';
}
// The prefix "BmltEnabled" is correct: it is unique enough to avoid conflicts and the filter is shared
// with other plugins from this author
// phpcs:ignore
$icon = apply_filters("BmltEnabled_IconSVG", 'dashicons-location-alt');
add_menu_page(
'Meeting Lists',
Expand All @@ -49,6 +52,9 @@ function admin_menu_link()
$icon,
null
);
// The prefix "BmltEnabled" is correct: it is unique enough to avoid conflicts and the filter is shared
// with other plugins from this author
// phpcs:ignore
do_action('BmltEnabled_Submenu', $this->slug);
}
}
72 changes: 47 additions & 25 deletions admin/class-bread-admin.php
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
* @subpackage Bread/admin
* @author bmlt-enabled <help@bmlt.app>
*/
include_once plugin_dir_path(__FILE__) . 'partials/_meeting_list_setup.php';
class Bread_Admin
{

Expand Down Expand Up @@ -66,13 +67,14 @@ public function enqueue_styles($hook)
if (!str_ends_with($hook, $this->hook)) {
return;
}
wp_enqueue_style("jquery-ui", plugin_dir_url(__FILE__) . "css/jquery-ui.min.css", false, "1.2", 'all');
wp_enqueue_style("spectrum", plugin_dir_url(__FILE__) . "css/spectrum.min.css", false, "1.2", 'all');
wp_enqueue_style("tooltipster", plugin_dir_url(__FILE__) . "css/tooltipster.bundle.min.css", false, "1.2", 'all');
wp_enqueue_style("tooltipster-noir", plugin_dir_url(__FILE__) . "css/tooltipster-sideTip-noir.min.css", false, "1.2", 'all');
wp_enqueue_style("admin", plugin_dir_url(__FILE__) . "css/admin.css", false, "1.2", 'all');
wp_enqueue_style("chosen", plugin_dir_url(__FILE__) . "css/chosen.min.css", false, "1.2", 'all');
wp_enqueue_style("smartWizard-dots", plugin_dir_url(__FILE__) . "css/smart_wizard_dots.css", false, "6.0.6", 'all');
wp_enqueue_style("jquery-ui", plugin_dir_url(__FILE__) . "css/jquery-ui.min.css", false, BREAD_VERSION, 'all');
wp_enqueue_style("spectrum", plugin_dir_url(__FILE__) . "css/spectrum.min.css", false, BREAD_VERSION, 'all');
wp_enqueue_style("tooltipster", plugin_dir_url(__FILE__) . "css/tooltipster.bundle.min.css", false, BREAD_VERSION, 'all');
wp_enqueue_style("tooltipster-noir", plugin_dir_url(__FILE__) . "css/tooltipster-sideTip-noir.min.css", false, BREAD_VERSION, 'all');
wp_enqueue_style("admin", plugin_dir_url(__FILE__) . "css/admin.css", false, BREAD_VERSION, 'all');
wp_enqueue_style("bread-fonts", plugin_dir_url(__FILE__) . "css/fonts.css", false, BREAD_VERSION, 'all');
wp_enqueue_style("select2", plugin_dir_url(__FILE__) . "css/select2.min.css", false, BREAD_VERSION, 'all');
wp_enqueue_style("smartWizard-dots", plugin_dir_url(__FILE__) . "css/smart_wizard_dots.css", false, BREAD_VERSION, 'all');
}

/**
Expand All @@ -89,13 +91,13 @@ public function enqueue_scripts($hook)
wp_enqueue_script('jquery-ui-tabs');
wp_enqueue_script('jquery-ui-accordion');
wp_enqueue_script('jquery-ui-dialog');
wp_enqueue_script("bmlt_meeting_list", plugin_dir_url(__FILE__) . "js/bmlt_meeting_list.js", array('jquery'), "2.8.0", true);
wp_enqueue_script("bmlt_meeting_list", plugin_dir_url(__FILE__) . "js/bmlt_meeting_list.js", array('jquery'), BREAD_VERSION, true);
wp_enqueue_script("tooltipster", plugin_dir_url(__FILE__) . "js/tooltipster.bundle.min.js", array('jquery'), "1.2", true);
wp_enqueue_script("spectrum", plugin_dir_url(__FILE__) . "js/spectrum.min.js", array('jquery'), "1.2", true);
wp_enqueue_script("chosen", plugin_dir_url(__FILE__) . "js/chosen.jquery.min.js", array('jquery'), "1.2", true);
wp_enqueue_script("select2", plugin_dir_url(__FILE__) . "js/select2.min.js", array('jquery'), "1.2", true);
wp_enqueue_script("fetch-jsonp", plugin_dir_url(__FILE__) . "js/fetch-jsonp.js", array('jquery'), "1.30", true);
wp_enqueue_script("smartWizard", plugin_dir_url(__FILE__) . "js/jquery.smartWizard.js", array('jquery'), "6.0.6", true);
wp_enqueue_script("breadWizard", plugin_dir_url(__FILE__) . "js/bread-wizard.js", array('smartWizard'), "2.8.0", true);
wp_enqueue_script("breadWizard", plugin_dir_url(__FILE__) . "js/bread-wizard.js", array('smartWizard'), BREAD_VERSION, true);
/**
* Make some JSON from PHP available in JS.
*/
Expand Down Expand Up @@ -204,10 +206,22 @@ function tiny_tweaks($initArray)
$initArray['fontsize_formats'] = "5pt 6pt 7pt 8pt 9pt 10pt 11pt 12pt 13pt 14pt 15pt 16pt 17pt 18pt 19pt 20pt 22pt 24pt 26pt 28pt 30pt 32pt 34pt 36pt 38pt";
$initArray['theme_advanced_blockformats'] = 'h2,h3,h4,p';
$initArray['wordpress_adv_hidden'] = false;
$initArray['font_formats'] = 'Arial (Default)=arial;';
$initArray['font_formats'] = 'Arial (Sans-Serif)=arial;';
$initArray['font_formats'] .= 'Times (Sans-Serif)=times;';
$initArray['font_formats'] .= 'Courier (Monospace)=courier;';
$initArray['content_style'] = 'body { font-family: Arial; }';
$initArray['font_formats'] .= 'DejaVu (Sans-Serif)=DejaVuSansCondensed;';
$dir = plugin_dir_url(__FILE__);
$font = $this->bread->getOption('base_font');
if ($font == 'dejavusanscondensed') {
$initArray['content_style'] = "@import url('$dir/css/fonts.css'); body { font-family: DejaVuSansCondensed; }";
} elseif ($font == 'times') {
$initArray['content_style'] = "@import url('$dir/css/fonts.css'); body { font-family: Times; }";
} elseif ($font == 'courier') {
$initArray['content_style'] = "@import url('$dir/css/fonts.css'); body { font-family: Courier; }";
} else {
$initArray['content_style'] = "@import url('$dir/css/fonts.css'); body { font-family: Arial; }";
}
//$initArray['content_style'] = "body { font-family: Arial; }";
}
}
return $initArray;
Expand Down Expand Up @@ -248,9 +262,6 @@ function pwsix_process_settings_export()
if (!isset($_POST['pwsix_export_nonce']) || ! wp_verify_nonce($_POST['pwsix_export_nonce'], 'pwsix_export_nonce')) {
return;
}
if (! current_user_can('manage_bread')) { // TODO: Is this necessary? Why not let the user make a copy
return;
}
$this->download_settings_inner();
}
function download_settings()
Expand Down Expand Up @@ -317,13 +328,13 @@ function exportLogFile($file)
}
function current_user_can_modify()
{
if (! current_user_can('manage_bread')) {
return false;
}
$user = wp_get_current_user();
if (in_array('administrator', $user->roles)) {
return true;
}
if (! current_user_can('manage_bread')) {
return false;
}
$authors_safe = $this->bread->getOption('authors');
if (!is_array($authors_safe) || empty($authors_safe)) {
return true;
Expand All @@ -335,10 +346,17 @@ function current_user_can_modify()
}
function current_user_can_create()
{
if (! current_user_can('manage_bread')) {
return false;
$user = wp_get_current_user();
if (in_array('administrator', $user->roles)) {
return true;
}
return true;
if (current_user_can('manage_options')) {
return true;
}
if (current_user_can('manage_bread')) {
return true;
}
return false;
}
/**
* Process a settings import from a json file
Expand All @@ -348,7 +366,7 @@ function pwsix_process_settings_import()
if (empty($_REQUEST['pwsix_import_nonce']) || !wp_verify_nonce($_REQUEST['pwsix_import_nonce'], 'pwsix_import_nonce')) {
return;
}
if (! current_user_can('manage_bread')) {
if (! $this->current_user_can_modify()) {
return;
}
$this->bread->getConfigurationForSettingId($this->bread->getRequestedSetting());
Expand Down Expand Up @@ -376,7 +394,7 @@ function pwsix_process_settings_import()
update_option($this->bread->getOptionsName(), $this->bread->getOptions());
setcookie('current-meeting-list', $this->bread->getRequestedSetting(), time() + 10);
setcookie('bread_import_file', $import_file, time() + 10);
wp_safe_redirect(admin_url('?page=class-bread-admin.php'));
wp_safe_redirect(admin_url('?page=bmlt-enabled-bread'));
}
function my_theme_add_editor_styles()
{
Expand Down Expand Up @@ -430,14 +448,18 @@ function get($url, $cookies = array())
*/
function admin_submenu_link($parent_slug)
{
activate_bread();
Bread_activate();
$this->bmltEnabled_admin->createMenu();

$cap = 'manage_options';
if (!current_user_can($cap)) {
$cap = 'manage_bread';
}
$this->hook = add_submenu_page(
$parent_slug,
'Printable Meeting Lists',
'Printable Meeting Lists',
'manage_bread',
$cap,
'bmlt-enabled-bread',
array(&$this, 'admin_options_page'),
2
Expand Down
82 changes: 61 additions & 21 deletions admin/css/admin.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.wpbody-content {
margin-top: 0;
margin-left: 0;
margin-right: 0;
margin-inline-start: 0;
margin-inline-end: 0;
height: 100%;
width: 100%;
}
Expand Down Expand Up @@ -34,7 +34,7 @@ and (orientation: portrait) {
}

.ui-accordion .ui-accordion-icons {
padding-left: 2.2em !important;
padding-inline-start: 2.2em !important;
}
img.box-description {
margin: 0px 10px 0px 10px;
Expand Down Expand Up @@ -123,12 +123,12 @@ div#meeting-list-tabs-wrapper li {
margin-top: 1px;
color: #FFF;
float: right;
margin-right: 20px;
margin-inline-end: 20px;
}
#meeting-list-tabs .icon-question2 {
margin-top: 1px;
color: #FFF;
margin-left: 5px;
margin-inline-start: 5px;
}
#meeting-list-tabs .icon-question2:before {
content: "\e6b7";
Expand Down Expand Up @@ -205,8 +205,8 @@ a img.alignleft {

a img.aligncenter {
display: block;
margin-left: auto;
margin-right: auto
margin-inline-start: auto;
margin-inline-end: auto
}

.wp-caption {
Expand Down Expand Up @@ -273,7 +273,7 @@ width:410px;
vertical-align: top;
border: solid 1px #D5D5D5;
padding: 10px 15px;
margin-left: 5px;
margin-inline-start: 5px;
margin-bottom: 10px;
display: -webkit-inline-box;
color: #999;
Expand All @@ -293,10 +293,10 @@ font-size: 22px;
}
.tooltipster-icon {
cursor: help;
margin-left: 10px;
margin-inline-start: 10px;
background: url("images/help-image2.png") no-repeat;
color: rgba(0, 0, 0, 0);
padding-right: 5px;
padding-inline-end: 5px;
}
.mlg.dashicons-search:before
{
Expand All @@ -322,17 +322,17 @@ color: #222;
.ui-tabs.ui-tabs-vertical .ui-widget-header {
border: none;
}
.ui-tabs.ui-tabs-vertical .ui-tabs-nav {
.bmlt-ltr .ui-tabs.ui-tabs-vertical .ui-tabs-nav {
float: left;
width: 10em;
background: #CCC;
border-radius: 4px 0 0 4px;
border-right: 1px solid gray;
padding-right: 20px;
padding-inline-end: 20px;
padding-top: 7px;
padding-left: 0;
padding-inline-start: 0;
}
#meeting-list-tabs.ui-tabs.ui-tabs-vertical .ui-tabs-nav li {
.bmlt-ltr #meeting-list-tabs.ui-tabs.ui-tabs-vertical .ui-tabs-nav li {
clear: left;
width: 100%;
margin: 0.2em 0;
Expand Down Expand Up @@ -373,7 +373,7 @@ color: #000;
#meeting-list-tabs.ui-tabs.ui-tabs-vertical .ui-tabs-nav li:last-child {
margin-bottom: 10px;
}
#meeting-list-tabs.ui-tabs.ui-tabs-vertical .ui-tabs-panel {
.bmlt-ltr #meeting-list-tabs.ui-tabs.ui-tabs-vertical .ui-tabs-panel {
float: left;
width: 50%;
border-left: 0;
Expand Down Expand Up @@ -408,7 +408,7 @@ width: 4em !important;
}
.mce-listbox button {
text-align: left;
padding-right: 20px !important;
padding-inline-end: 20px !important;
position: relative;
}
/*
Expand Down Expand Up @@ -473,7 +473,7 @@ h3.help-accordion { background-color: #F5F5F5 !important; color: #000 !important
z-index: 9999;
background: url('images/saving.gif') 50% 50% no-repeat;
}
select.service_body_select {
select.bread_service_body_select {
width: 62%;
max-width: 62%;
}
Expand All @@ -496,13 +496,10 @@ select.service_body_select {
.extra_meetings_label {
margin-top: 10px;
}
.exactCenter { width:800px; height:800px; position: fixed; top: 50%; left: 50%; margin-top: -100px; margin-left: -100px; }
.exactCenter { width:800px; height:800px; position: fixed; top: 50%; left: 50%; margin-top: -100px; margin-inline-start: -100px; }
#extra_meetings * {
font-family: 'Courier New', Courier, monospace !important;
}
.chosen-container-multi .chosen-choices li.search-field input[type=text] {
width: 100% !important;
}
.step-description {
margin: 10px;
border: solid;
Expand All @@ -517,3 +514,46 @@ select.service_body_select {
color: green;
font-weight: bold;
}

.bmlt-rtl .ui-tabs-vertical { width: 55em; }
.bmlt-rtl .ui-tabs-vertical .ui-tabs-nav li a { display:block; }
.bmlt-rtl .ui-tabs-vertical .ui-tabs-panel {
direction:rtl;
width: 60%;
position: relative;
float: right;
}
.bmlt-rtl .ui-tabs .ui-tabs-nav li a { float:none;}

.bmlt-rtl .ui-tabs-vertical .ui-tabs-nav {
float: right;
width: 10em;
background: #CCC;
border-radius: 4px 0 0 4px;
border-right: 1px solid gray;
padding-inline-end: 20px;
padding-top: 7px;
padding-inline-start: 0;
}
.bmlt-rtl .ui-tabs-vertical .ui-tabs-nav li {
clear: right;
width: 100%;
margin: 0.2em 0;
/* border: 1px solid gray; */
/* border-width: 1px 1px 1px 1px; */
/* border-radius: 4px 4px 4px 4px; */
overflow: hidden;
position: relative;
left: -2px;
z-index: 2;
}
.bmlt-rtl .ui-tabs .ui-tabs-nav li {
float: right !important
}
.select2-container {
width: 50% !important;
}
.nav-tab-wrapper {
width: max-content !important;
}
.select2-search--inline { display: contents; } .select2-search__field:placeholder-shown { width: 100% !important; }
Binary file removed admin/css/chosen-sprite-2x.png
Binary file not shown.
Binary file removed admin/css/chosen-sprite.png
Binary file not shown.
Loading