Changeset 1922554

Timestamp:

08/09/2018 08:58:28 PM (7 years ago)

Author:

felipemontoya

Message:

Adding version 1.3.0 to the trunk

Location:

edunext-openedx-integrator/trunk

Files:

• includes/class-wp-edunext-marketing-site-settings.php (modified) (4 diffs)
• includes/lib/class-wp-edunext-marketing-site-admin-api.php (modified) (3 diffs)
• wp-edunext-marketing-site.php (modified) (2 diffs)

edunext-openedx-integrator/trunk/includes/class-wp-edunext-marketing-site-settings.php

@@ -36 +36 @@
      */
     public $settings = array();
+
+    /**
+     * Available settings for plugin.
+     * @var     string
+     * @access  public
+     * @since   1.0.0
+     */
+    public $active_tab = '';
 
     public function __construct ( $parent ) {
@@ -442 +450 @@
 
                 // Add section to page
+                $this->active_tab = $section;
                 add_settings_section( $section, $data['title'], array( $this, 'settings_section' ), $this->parent->_token . '_settings' );
 
@@ -457 +466 @@
 
                     // Add field to page
-                    add_settings_field( $field['id'], $field['label'], array( $this->parent->admin, 'display_field' ), $this->parent->_token . '_settings', $section, array( 'field' => $field, 'prefix' => $this->base ) );
+                    add_settings_field(
+                        $field['id'],
+                        $field['label'],
+                        array( $this->parent->admin, 'display_field' ),
+                        $this->parent->_token . '_settings',
+                        $section,
+                        array( 'field' => $field, 'prefix' => $this->base )
+                    );
                 }
 
@@ -526 +542 @@
                 settings_fields( $this->parent->_token . '_settings' );
                 do_settings_sections( $this->parent->_token . '_settings' );
+                do_action($this->active_tab . '_after_settings_page_html');
                 $html .= ob_get_clean();
-
                 $html .= '<p class="submit">' . "\n";
                     $html .= '<input type="hidden" name="tab" value="' . esc_attr( $tab ) . '" />' . "\n";

edunext-openedx-integrator/trunk/includes/lib/class-wp-edunext-marketing-site-admin-api.php

@@ -4 +4 @@
 
 class WP_eduNEXT_Marketing_Site_Admin_API {
+
+    /**
+     * Where notices to be shown to the user are stored
+     */
+    private $notices = array();
+    private $error_notices = array();
+
 
     /**
@@ -10 +17 @@
     public function __construct () {
         add_action( 'save_post', array( $this, 'save_meta_boxes' ), 10, 1 );
+        add_action('admin_notices', array($this, 'show_notices'));
     }
 
@@ -318 +326 @@
     }
 
+    /**
+     *
+     */
+    public function add_notice($type, $message) {
+        $notice = array(
+            'type' => $type,
+            'message' => $message
+        );
+        if ($type === 'error') {
+            array_push($this->error_notices, $notice);
+        } else {
+            array_push($this->notices, $notice);
+        }
+    }
+
+    /**
+     *
+     */
+    public function show_notices() {
+        $notices = array_merge($this->notices, $this->error_notices);
+        foreach ($notices as $message) {
+            ?>
+            <div class="<?= $message['type'] ?> notice">
+                    <p><?= __($message['message'], 'eox-core-api') ?></p>
+            </div>
+            <?php
+        }
+    }
+
+
 }

edunext-openedx-integrator/trunk/wp-edunext-marketing-site.php

@@ -22 +22 @@
 require_once( 'includes/class-wp-edunext-marketing-site.php' );
 require_once( 'includes/class-wp-edunext-marketing-site-settings.php' );
+require_once( 'includes/class-wp-edunext-eox-core-api.php' );
 
 // Load plugin libraries
@@ -47 +48 @@
 
 WP_eduNEXT_Marketing_Site();
+
+
+/**
+ * Returns the main instance of WP_EoxCoreApi to prevent the need to use globals.
+ *
+ * @since  1.0.0
+ * @return object WP_EoxCoreApi
+ */
+function WP_EoxCoreApi () {
+    $instance = WP_EoxCoreApi::instance( __FILE__, '1.1.0' );
+    return $instance;
+}
+
+WP_EoxCoreApi();