Changeset 608822

Timestamp:

10/06/2012 07:38:11 AM (13 years ago)

Author:

ti2m

Message:

Shortcode support

Location:

edge-suite/trunk

Files:

• admin/options.php (modified) (1 diff)
• edge-suite.php (modified) (5 diffs)
• includes/edge-suite-comp.inc (modified) (2 diffs)

edge-suite/trunk/admin/options.php

@@ -48 +48 @@
 
       <tr valign="top">
+          <th scope="row">Widget shortcode</th>
+          <td>
+            <?php
+            $selected = intval(get_option('edge_suite_widget_shortcode')) == 1 ? 'checked="checked"' : '';
+            ?>
+            <p><input type="checkbox" name="edge_suite_widget_shortcode" value="1" <?php echo $selected; ?>"/>
+                Enable usage of shortcodes in widgets</p>
+          </td>
+      </tr>
+
+      <tr valign="top">
           <th scope="row">Deactivation deletion</th>
           <td>

edge-suite/trunk/edge-suite.php

@@ -89 +89 @@
   add_option('edge_suite_comp_homepage', 0);
   add_option('edge_suite_deactivation_delete', 0);
+  add_option('edge_suite_widget_shortcode', 0);
 
   // Create main edge suite directory.
@@ -115 +116 @@
     delete_option('edge_suite_comp_homepage');
     delete_option('edge_suite_deactivation_delete');
+    delete_option('edge_suite_widget_shortcode');
   }
 }
@@ -130 +132 @@
   register_setting('edge_suite_options', 'edge_suite_comp_homepage');
   register_setting('edge_suite_options', 'edge_suite_deactivation_delete');
+  register_setting('edge_suite_options', 'edge_suite_widget_shortcode');
 }
 
@@ -344 +347 @@
   $options = array();
   foreach ($definitions as $definition) {
-    $options[$definition->definition_id] = $definition->project_name . ' ' . $definition->composition_id;
+    $options[$definition->definition_id] = $definition->definition_id . ' - ' . $definition->project_name . ' ' . $definition->composition_id;
   }
 
@@ -367 +370 @@
 }
 
+/**
+ * Shortcode implementation for 'edge_animation'
+ */
+function edge_suite_shortcode_edge_animation( $atts ) {
+  $id = -1;
+  extract( shortcode_atts( array(
+    'id' => '-1',
+    'left' => null,
+    'top' => null,
+  ), $atts ) );
+
+  $styles = '';
+
+  // Add left position offset to style.
+  if(isset($left)){
+    if($left == 'auto'){
+      $styles .= 'margin: 0px auto;';
+    }
+    else if(intval($left) != 0){
+      $styles .= 'margin-left:' . $left . 'px;';
+    }
+  }
+
+  //Add top position offset to style.
+  if(isset($top) && intval($top) != 0){
+    $styles .= 'margin-top:' . $top . 'px;';
+  }
+
+  $definition_id = $id;
+  $definition_res = edge_suite_comp_render($definition_id, $styles);
+
+  $stage = $scripts = '';
+
+  if($definition_res != NULL){
+    // Todo: Placing scripts inline in the content really isn't pretty, but so far there
+    // doesn't seem to be an easy way around this, otherwise we need to handle shortcode
+    // before header fuctions get called.
+    $scripts = implode("\n", $definition_res['scripts']);
+
+    $stage = $definition_res['stage'];
+  }
+
+  return "\n" . $scripts . "\n" . $stage ."\n";
+
+}
+add_shortcode('edge_animation', 'edge_suite_shortcode_edge_animation');
+if(get_option('edge_suite_widget_shortcode') == 1){
+  add_filter('widget_text', 'do_shortcode');
+}

edge-suite/trunk/includes/edge-suite-comp.inc

@@ -219 +219 @@
  *   Array with stage content and header scripts.
  */
-function edge_suite_comp_render($definition_id) {
+function edge_suite_comp_render($definition_id, $styles = '') {
   $scripts = array();
   $stage = '';
   if ($definition_id > 0) {
-
     $definition = edge_suite_comp_load_definition($definition_id);
+
+    if(!isset($definition->project_name)){
+      return null;
+    }
 
     $edge_lib_path = EDGE_SUITE_PUBLIC_DIR_REL;
@@ -258 +261 @@
 
     // Put everything together.
-    $stage = '<div id="' . $div_id . '" style="' . $height . $width . '" class="' . $definition->composition_id . '">' . '</div>';
+    $stage = '<div id="' . $div_id . '" style="' . $height . $width . $styles . '" class="' . $definition->composition_id . '">' . '</div>';
 
   }