Changeset 1238493

Timestamp:

09/05/2015 03:46:33 AM (10 years ago)

Author:

arickards

Message:

Added new settings page with various settings

Location:

tinywym-editor/trunk

Files:

• css/tinywym-styles.css (modified) (2 diffs)
• js/mce-plugin.js (modified) (1 diff)
• languages/twym_editor.pot (modified) (3 diffs)
• readme.txt (modified) (4 diffs)
• tinywym-editor.php (modified) (9 diffs)

tinywym-editor/trunk/css/tinywym-styles.css

@@ -7 +7 @@
 .tiny-wym body {
     background: #f4f4f4;
+    font-size: 16px;
 }
 
@@ -16 +17 @@
 .tiny-wym img {
     max-width: 100%;
+    height: auto;
 }
 

tinywym-editor/trunk/js/mce-plugin.js

@@ -178 +178 @@
                     classes: 'cancel',
                     onclick: 'close',
+                    styles: 'color: red; float: right;'
                 },
                 {

tinywym-editor/trunk/languages/twym_editor.pot

@@ -4 +4 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 "Project-Id-Version: tinyWYM Editor\n"
-"POT-Creation-Date: 2015-08-06 18:27+1000\n"
-"PO-Revision-Date: 2015-08-06 18:27+1000\n"
+"POT-Creation-Date: 2015-09-05 13:40+1000\n"
+"PO-Revision-Date: 2015-09-05 13:39+1000\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -20 +20 @@
 "X-Poedit-SearchPath-0: .\n"
 "X-Poedit-SearchPathExcluded-0: *.js\n"
+
+#: tinywym-editor.php:49
+msgid "Settings"
+msgstr ""
 
 #: translations.php:14
@@ -53 +57 @@
 msgstr ""
 
+#: twym-admin-settings.php:19 twym-admin-settings.php:50
+msgid "tinyWYM Editor Settings"
+msgstr ""
+
 #. Plugin Name of the plugin/theme
+#: twym-admin-settings.php:20
 msgid "tinyWYM Editor"
 msgstr ""
 
+#: twym-admin-settings.php:41
+msgid "administrator"
+msgstr ""
+
+#: twym-admin-settings.php:42
+msgid "editor"
+msgstr ""
+
+#: twym-admin-settings.php:43
+msgid "author"
+msgstr ""
+
+#: twym-admin-settings.php:44
+msgid "contributor"
+msgstr ""
+
+#: twym-admin-settings.php:66
+#, php-format
+msgid "%s Settings"
+msgstr ""
+
+#: twym-admin-settings.php:70
+#, php-format
+msgid "Disable for %ss"
+msgstr ""
+
+#: twym-admin-settings.php:78
+msgid "Compatibility"
+msgstr ""
+
+#: twym-admin-settings.php:80
+msgid ""
+"Some plugins, such as Beaver Builder, disable other editor plugins when "
+"using custom instances of the WordPress editor. Check the box below if "
+"tinyWYM Editor appears to be disabled in some editor instances."
+msgstr ""
+
+#: twym-admin-settings.php:84
+msgid "Force enable tinyWYM Editor"
+msgstr ""
+
+#: twym-admin-settings.php:90
+msgid "Theme Editor Styles"
+msgstr ""
+
+#: twym-admin-settings.php:92
+msgid ""
+"Many themes include their own editor stylesheet which may cause conflicts "
+"with tinyWYM Editor's own stylesheet. If you would like to allow your "
+"theme's editor stylesheet to load anyway, check the box below."
+msgstr ""
+
+#: twym-admin-settings.php:96
+msgid "Allow theme editor styles"
+msgstr ""
+
+#: twym-admin-settings.php:104
+msgid "Save Settings"
+msgstr ""
+
 #. Description of the plugin/theme
-msgid "Converts WordPress's WYSIWYG visual editor into a WYSIWYM editor"
+msgid ""
+"tinyWYM Editor converts WordPress's WYSIWYG visual editor into a WYSIWYM "
+"editor. tinyWYM Editor also give the the control anf flexibility of the text "
+"editor without having to leave the visual editor."
 msgstr ""
 

tinywym-editor/trunk/readme.txt

@@ -3 +3 @@
 Tags: tinyMCE, WYSIWYM, WP Editor
 Requires at least: 4.2.0
-Tested up to: 4.2.3
-Stable tag: 1.0.1
+Tested up to: 4.3
+Stable tag: 1.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -37 +37 @@
 = How do I create an HTML element from a selection? =
 
-To create a new element from a selection first select some text. tinyWYM Editor plugin adds a new button to the toolbar. Click it and a dialogue will appear with a field for your new tag and any attributes you want to give it. Click the 'Okay' button. (You can also hit Ctrl+T instead of clicking the button to open the dialogue.)
+To create a new element from a selection first select some text. tinyWYM Editor plugin adds a new button to the toolbar. Click it and a dialogue will appear with a field for your new tag and any attributes you want to give it. Enter your new HTML tag and any desired attributes, then click the 'Okay' button. (You can also hit Ctrl+T instead of clicking the button to open the dialogue.)
 
 = How do I wrap one HTML element in another HTML element? =
 
-To wrap an element in another element, place the caret inside the element that you want to wrap. tinyWYM Editor plugin adds a new button to the toolbar. Click it and a dialogue will appear with a field for your new tag and any attributes you want to give it. Click the 'Okay' button. (You can also hit Ctrl+T instead of clicking the button to open the dialogue.)
+To wrap an element in another element, place the caret inside the element that you want to wrap. tinyWYM Editor plugin adds a new button to the toolbar. Click it and a dialogue will appear with a field for your new tag and any attributes you want to give it. Enter your new HTML tag and any desired attributes, then click the 'Okay' button. (You can also hit Ctrl+T instead of clicking the button to open the dialogue.)
 
 = How do I edit or add attributes to an HTML element? =
 
-Click any element while holding the Alt key and a dialogue will appear where you can edit the current HTML tag and any attributes it might have or you want to give it. Click the 'Okay' button.
+Click any element while holding the Alt key and a dialogue will appear where you can edit the current HTML tag and any attributes it might have or you want to give it. Enter your new HTML tag and any desired attributes, then click the 'Okay' button.
 
 = How do I unwrap an HTML element from its parent element or remove text from its containing element? =
 
-Click any element while holding the Shift+Alt and that element will be removed from the markup but preserve any inner text or child elements.
+Click any element while holding the Shift+Alt and that element will be removed from the markup preserving any inner text or child elements.
 
 = Why does tinyWYM Editor remove my theme's editor styles? =
 
-tinyWYM Editor removes the current theme's editor stylesheet. It does this partly in order to prevent conflicts with the theme's editor styles, but mainly because it is assumed that if you are using tinyWYM editor it is because you want to see the markup being posted to the front end of the site and not what it will eventually look like. After all, that is what the plugin is for.
+tinyWYM Editor removes the current theme's editor stylesheet by default, however, you can enable your theme's editor stylesheet by going to Settings - tinyWYM Editor and checking 'Allow theme editor styles'. tinyWYM Editor removes other editor styles partly in order to prevent conflicts, but also because it is assumed that if you are using tinyWYM editor it is because you want to see the _markup_ being posted to the front end of the site and not what it will eventually look like. After all, that is what the plugin is for.
+
+= Can I disable tinyWYM Editor for certain users =
+
+tinyWYM Editor allows administrators to disable tinyWYM for particular user roles; Administrators, Editors, Authors, or Contributors. Go to Settings - tinyWYM Editor.
 
 == Screenshots ==
@@ -60 +64 @@
 2. With tinyWYM installed: empty tags and superfluous markup revealed.
 3. tinyWYM Editor converts WordPress's WYSIWYG editor into a WYSIWYM editor.
-4. Create any HTML tag from selection - Select text then click the button or hit Ctrl+T.
-5. Wrap the current element in a new HTML element - Place caret in element you want to wrap, then click the button or hit Ctrl+T.
-6. Wrap multiple elements in a new HTML element - Select elements you want to wrap, then click the button or hit Ctrl+T.
+4. Create any HTML tag from selection: Select text then click the button or hit Ctrl+T.
+5. Wrap the current element in a new HTML element: Place caret in element you want to wrap, then click the button or hit Ctrl+T.
+6. Wrap multiple elements in a new HTML element: Select elements you want to wrap, then click the button or hit Ctrl+T.
 7. Enter the new HTML tag name and any attributes you want it to have, then click 'Okay'.
 8. Elements are now wrapped in a new tag.
-9. Edit any element - Alt+Click any element then edit its tag and attributes.
+9. Edit any element: Alt+Click any element then edit its tag and attributes.
 
 == Changelog ==
+
+= 1.1 =
+
+* Added new settings page
+* Added option for admins to disable tinyWYM for Administrators, Editors, Authors, or Contributors.
+* Added option to re-enable the current theme's editor styles.
+* Added option to increase tinyWYM priority when loading scripts. (This was mainly to allow tinyWYM to work with BeaverBuilder's front end editor.)
+
+= 1.0.2 =
+
+* CSS improvements
+* Increase script loading priority to allow for use with beaverbuilder
 
 = 1.0.1 =
@@ -79 +95 @@
 == Upgrade Notice ==
 
+= 1.1 =
+
+* Added new setting page: Setting - tinyWYM Editor
+
+= 1.0.2 =
+
+* Improved CSS for images inside editor, plus tinyWYM is now works with beaverbuilder
+
 = 1.0 =
 

tinywym-editor/trunk/tinywym-editor.php

@@ -2 +2 @@
 /*
 Plugin Name: tinyWYM Editor
-Description: Converts WordPress's WYSIWYG visual editor into a WYSIWYM editor
-Version:     1.0.1
+Description: tinyWYM Editor converts WordPress's WYSIWYG visual editor into a WYSIWYM editor. tinyWYM Editor also give the the control anf flexibility of the text editor without having to leave the visual editor.
+Version:     1.1
 Author:      Andrew Rickards
 License:     GPL-2.0+
@@ -25 +25 @@
 */
 
-//* If this file is called directly, abort ====================================
+//* If this file is called directly, abort ==================================== */
 if ( ! defined( 'ABSPATH' ) ) {
     exit;
 }
 
-//* Load Plugin textdomain ====================================================
+//* Load Plugin textdomain ==================================================== */
 add_action( 'plugins_loaded', 'twym_load_textdomain' );
 
@@ -39 +39 @@
 }
 
-//* Remove Theme's Editor Stylesheet ==========================================
-add_action( 'admin_init', 'twym_remove_editor_styles' );
+//* Admin Settings ============================================================ */
+include 'twym-admin-settings.php';
+
+//* Plugins Page Settings Link
+add_filter( 'plugin_action_links_' . plugin_basename(__FILE__), 'twym_settings_link' );
+
+function twym_settings_link ( $links ) {
+
+    $links[] = '<a href="' . admin_url( 'options-general.php?page=tinywym-settings' ) . '">' . __( 'Settings', 'twym_editor' ) . '</a>';
+
+    return $links;
+}
+
+//* Remove Theme's Editor Stylesheet ========================================== */
+add_action( 'admin_init', 'twym_remove_editor_styles', 999 );
 
 function twym_remove_editor_styles() {
+
+    $settings = get_option( 'twym_settings' );
+    $theme_styles = isset( $settings[ 'theme_styles' ] ) ? '1' : false;
+
+    if ( '1' === $theme_styles ) {
+        return;
+    }
 
     remove_editor_styles();
@@ -48 +68 @@
 }
 
-//* Add Editor Stylesheet =====================================================
+//* Add Editor Stylesheet ===================================================== */
 add_filter( 'mce_css', 'twym_add_editor_styles' );
 
@@ -63 +83 @@
 }
 
-//* Register tinyMCE Plugin & Button ==========================================
+//* Register tinyMCE Plugin & Button ========================================== */
 add_action( 'init', 'twym_register_mce_plugin' );
 
 function twym_register_mce_plugin() {
+
+    // Get tinyWYM Settings
+    $settings = get_option( 'twym_settings' );
+    $disabled = isset( $settings[ 'disable' ] ) ? $settings[ 'disable' ] : [];
+    $priority = isset( $settings[ 'force_enable' ] ) ? 99999999 : 10;
+
+    // Extract user roles disabled in settings
+    extract( $disabled );
+
+    // Define user capabilities
+    $admin_capabilities       = current_user_can( 'manage_options' );
+    $editor_capabilities      = current_user_can( 'edit_pages' )           && ! current_user_can( 'manage_options' )       ? true : false;
+    $author_capabilities      = current_user_can( 'edit_published_posts' ) && ! current_user_can( 'edit_pages' )           ? true : false;
+    $contributor_capabilities = current_user_can( 'edit_posts' )           && ! current_user_can( 'edit_published_posts' ) ? true : false;
+
+    // Disable editor for various various user roles
+    if ( isset( $administrator ) && $admin_capabilities ) {
+        return;
+    }
+
+    if ( isset( $editor ) && $editor_capabilities ) {
+        return;
+    }
+
+    if ( isset( $author ) && $author_capabilities ) {
+        return;
+    }
+
+    if ( isset( $contributor ) && $contributor_capabilities ) {
+        return;
+    }
 
     // Check user permissions
@@ -76 +127 @@
     if ( get_user_option('rich_editing') == 'true') {
 
-        add_filter( 'mce_external_plugins', 'twym_add_mce_plugin' );
-        add_filter( 'mce_buttons', 'twym_register_mce_button' );
+        add_filter( 'mce_external_plugins', 'twym_add_mce_plugin', $priority );
+        add_filter( 'mce_buttons', 'twym_register_mce_button', $priority );
 
         // Admin Styles for Modal Form
@@ -83 +134 @@
 
     }
+
+    // Tranlations
+    add_filter( 'mce_external_languages', 'twym_load_translation');
 
 }
@@ -104 +158 @@
 }
 
-//* Enqueue Admin Styles for Modal Form =======================================
+//* Enqueue Admin Styles for Modal Form ======================================= */
 function twym_enqueue_admin_style() {
 
@@ -112 +166 @@
 }
 
-//* Load Translation File =====================================================
-add_filter( 'mce_external_languages', 'twym_load_translation');
-
+//* Load Translation File ===================================================== */
 function twym_load_translation( $locales ) {