Changeset 543927

Timestamp:

05/14/2012 02:58:28 AM (14 years ago)

Author:

alledia

Message:

 

Location:

ostoolbar/trunk

Files:

• controller.php (modified) (3 diffs)
• libraries/application.php (modified) (2 diffs)
• libraries/mce (added)
• libraries/mce/editor_plugin.js (added)
• libraries/mce/icon-tutorials.png (added)
• ostoolbar.php (modified) (2 diffs)
• readme.txt (modified) (4 diffs)

ostoolbar/trunk/controller.php

@@ -3 +3 @@
 class OST_Controller
 {
+    
 
-    public function action_tutorials()
+    public function action_tutorials($isFrontend = false)
     {
         if ($id = (int)$_GET['id'])
@@ -51 +52 @@
                         ?>
                         <tr>
-                            <td><a href="<?php echo $tutorials[$i]->link;?>">
+                            <td><a href="<?php echo ($isFrontend ?  "index.php?page_id=".$_GET["page_id"]."&id=".$tutorials[$i]->id : $tutorials[$i]->link);?>">
                                 <?php echo $tutorials[$i]->title; ?></a>
                             </td>
@@ -81 +82 @@
         <div class="wrap">
             <?php if (in_array($tutorial->jversion, array("wp_trial"))):?>
-                <iframe src="http://www.ostraining.com/services/adv/adv1.html" width="734px" height="80px"></iframe>
+                <iframe src="http://www.ostraining.com/services/adv/adv1.html" width="734px" height="80px" style="overflow:visible"></iframe>
             <?php endif;?>
         

ostoolbar/trunk/libraries/application.php

@@ -6 +6 @@
     public function init()
     {
+        add_shortcode("ostoolbar", array("OST_Application", "display"));
+        
         get_role('administrator')->add_cap( 'see_videos' );
         $text = get_option('toolbar_permission');
@@ -27 +29 @@
             add_action('admin_notices', array($this, 'api_key_check'));
         }
+        add_action('init', array($this, 'ostoolbar_add_editor_button'));
+    }
+    
+    function display()
+    {
+        ob_start();
+        if (!$_GET["id"])
+            OST_Controller::action_tutorials(true);
+        else
+            OST_Controller::action_tutorial($_GET["id"]);
+        $content = ob_get_contents();
+        ob_end_clean();
+        return $content;
+    }
+
+    function ostoolbar_add_editor_button() {
+        if ( ! current_user_can('edit_posts') && ! current_user_can('edit_pages') )
+            return;
+            
+        if ( get_user_option('rich_editing') == 'true') {
+            add_filter("mce_external_plugins", array($this, "ostoolbar_load_plugin"));
+            add_filter('mce_buttons', array($this, 'ostoolbar_register_button'));
+        }
+    } 
+    
+    // ---
+    function ostoolbar_load_plugin($plugin_array) {
+        $plug = plugins_url('mce/editor_plugin.js',__FILE__);
+        $plugin_array['ostoolbar_plugin'] = $plug;
+        return $plugin_array;
+    }
+    
+    // ---
+    function ostoolbar_register_button($buttons) {
+        $b[] = "separator";
+        $b[] = "ostoolbar_plugin_button";
+        if ( is_array($buttons) && !empty($buttons) ) {
+            $b = array_merge( $buttons, $b );
+        }
+        return $b;
     }
 

ostoolbar/trunk/ostoolbar.php

@@ -2 +2 @@
 /**
  * @package OSToolbar
- * @version 1.6
+ * @version 2.2
  */
 /*
@@ -9 +9 @@
 Description: This plugin shows training videos inside your WordPress admin panel.
 Author: OSTraining.com
-Version: 1.0
+Version: 2.2
 Author URI: http://www.ostraining.com
 */
 
-if ( ! is_admin())
-    return false;
 
 require_once(dirname(__FILE__).'/libraries/factory.php');

ostoolbar/trunk/readme.txt

@@ -1 +1 @@
 === Plugin Name ===
 Contributors: alledia
-Tags: video, tutorials, helo
+Tags: video, tutorials, help, support, documentation
 Requires at least: 3.0
 Tested up to: 3.4
@@ -23 +23 @@
 3. Choose what order the videos appear in
 4. Choose which users can see the videos
-5. Whitelabel the plugin. Add your name and image.
+5. Show the videos on the fronted of your site
+6. Whitelabel the plugin. Add your company name and logo.
 
 
 == Installation ==
 
-1. Install: install OSToolbar either via the WordPress.org plugin directory, or by uploading the files to your server
-2. Activate: click the Activate button.
-3. Watch: visit the OSToolbar link in your WordPress admin menu and start watching videos.
+1. Istall OSToolbar either via the WordPress.org plugin directory, or by uploading the files to your server
+2. Click the Activate button.
+3. Visit the OSToolbar link in your WordPress admin menu and start watching videos.
 
 == Frequently Asked Questions ==
@@ -37 +38 @@
 
 Yes, the plugin is released under the GPL license and you can install it on as many sites as wish.
+
+= How Do I Show These Videos on the Front of My Site? =
+
+1. Go to a post or page.
+2. There will be an OSToolbar button in the editor. Click that button.
+3. The button will insert this code into your content [ostoolbar]
+4. Save and you're done!
 
 == Screenshots ==
@@ -48 +56 @@
 * Initial Launch
 
+= 2.2 =
+* Added front-end viewing of the videos via a button in the editor
+* Jumped version numbers from 1.0 to 2.2 in order to match our current version, not the one set by WordPress.org