From f8bc05f6b06e6466c362736366a72a89349ce37f Mon Sep 17 00:00:00 2001
From: Garvin Hicking <mail@garv.in>
Date: Sat, 20 Dec 2008 17:00:22 +0000
Subject: [PATCH] Added serendipity_preview_spacer and
 pluginmanager_(sidebar|event) CSS ids

---
 include/functions_config.inc.php        | 6 +++++-
 include/functions_plugins_admin.inc.php | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/functions_config.inc.php b/include/functions_config.inc.php
index 19448b9a..8ea175c2 100644
--- a/include/functions_config.inc.php
+++ b/include/functions_config.inc.php
@@ -745,9 +745,13 @@ function serendipity_iframe(&$entry, $mode = null, $use_smarty = true) {
             break;
 
         case 'preview':
+<<<<<<< .mine
+            echo '<div style="float: left; height: 225px" id="serendipity_preview_spacer"></div>';
+=======
             echo '<div id="serendipity_preview_spacer" style="float: left; height: 225px"></div>';
+>>>>>>> .r2407
             serendipity_printEntries(array($entry), ($entry['extended'] != '' ? 1 : 0), true);
-            echo '<br style="clear: both" />';
+            echo '<br id="serendipity_preview_spacer2" style="clear: both" />';
 
             $show = true;
             break;
diff --git a/include/functions_plugins_admin.inc.php b/include/functions_plugins_admin.inc.php
index 31055003..a50871b4 100644
--- a/include/functions_plugins_admin.inc.php
+++ b/include/functions_plugins_admin.inc.php
@@ -139,7 +139,7 @@ function show_plugins($event_only = false, $sidebars = null)
         $ptitle = $opts[$plugin_placement];
         $pid    = $plugin_placement;
 
-        echo '<td class="pluginmanager_side">';
+        echo '<td class="pluginmanager_side pluginmanager_' . ($event_only ? 'event' : 'sidebar') . '">';
         echo '<div class="heading">' . $ptitle . '</div>';
         echo '<ol id="' . $pid . '_col" class="pluginmanager_container">';
         if ($is_invisible) {