Index: panels_ipe/panels_ipe.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_ipe/Attic/panels_ipe.module,v
retrieving revision 1.1.2.35
diff -u -p -r1.1.2.35 panels_ipe.module
--- panels_ipe/panels_ipe.module	10 Aug 2010 23:25:19 -0000	1.1.2.35
+++ panels_ipe/panels_ipe.module	27 Aug 2010 12:22:30 -0000
@@ -50,6 +50,9 @@ function panels_ipe_theme() {
     'panels_ipe_dnd_form_container' => array(
       'arguments' => array('link' => NULL, 'cache_key' => NULL, 'display' => NULL),
     ),
+    'panels_ipe_controller' => array(
+      'arguments' => array('cache_key' => NULL),
+    ),
   );
 }
 
@@ -123,19 +126,14 @@ function panels_ipe_get_cache_key($key =
 }
 
 /**
- * Implementation of hook_footer()
- *
- * Adds the IPE control container.
- *
- * @param unknown_type $main
+ * Renders the IPE control container.
  */
-function panels_ipe_footer($main = 0) {
-  $key = panels_ipe_get_cache_key();
-  if (!isset($key)) {
+function theme_panels_ipe_controller(&$vars) { 
+  $key = $vars['cache_key'];
+  if (!isset($key)) { 
     return;
   }
 
-  // TODO should be moved into the IPE plugin - WAAAY too hardcoded right now
   $output = "<div id='panels-ipe-control-container' class='clear-block'>";
   $output .= "<div id='panels-ipe-control-$key' class='panels-ipe-control'>";
   $output .= "<div class='panels-ipe-startedit panels-ipe-pseudobutton panels-ipe-off'>";
Index: panels_ipe/css/panels_ipe.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_ipe/css/Attic/panels_ipe.css,v
retrieving revision 1.1.2.3
diff -u -p -r1.1.2.3 panels_ipe.css
--- panels_ipe/css/panels_ipe.css	10 Aug 2010 20:03:35 -0000	1.1.2.3
+++ panels_ipe/css/panels_ipe.css	27 Aug 2010 12:22:30 -0000
@@ -187,7 +187,7 @@ div.panels-ipe-pseudobutton {
 
 div.panels-ipe-control .form-submit {
   float: left;
-  margin: 0.3em 0.5em;
+  margin: -0.5em 0 0 0.6em;
 }
 
 div.panels-ipe-form-container {
Index: panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/panels/panels_ipe/plugins/display_renderers/Attic/panels_renderer_ipe.class.php,v
retrieving revision 1.1.2.19
diff -u -p -r1.1.2.19 panels_renderer_ipe.class.php
--- panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php	26 Jul 2010 21:24:22 -0000	1.1.2.19
+++ panels_ipe/plugins/display_renderers/panels_renderer_ipe.class.php	27 Aug 2010 12:22:30 -0000
@@ -9,8 +9,14 @@ class panels_renderer_ipe extends panels
   var $admin = FALSE;
 
   function render() {
-    $output = parent::render();
-    return "<div id='panels-ipe-display-{$this->clean_key}' class='panels-ipe-display-container'>$output</div>";
+    $parent .= parent::render();
+    $output = "<div id='panels-ipe-display-{$this->clean_key}' class='panels-ipe-display-container'>". $parent ."</div>";
+
+    if (user_access('use panels in place editing')) { 
+      $output .= theme('panels_ipe_controller', $this->clean_key);
+    }
+
+    return $output;
   }
 
   function add_meta() {