# HG changeset patch
# User Dan
# Date 1184514066 14400
# Node ID 21770a1a5213e0ebc07036b814f85e40fd458b32
# Parent  96fa8ded7698ccf82a0c8636fcdd115dd73b90b8
Pseudo-commit: Merging Scribus and Nighthawk repos

diff -r 96fa8ded7698 -r 21770a1a5213 includes/template.php
--- a/includes/template.php	Thu Jul 12 15:33:25 2007 -0400
+++ b/includes/template.php	Sun Jul 15 11:41:06 2007 -0400
@@ -1434,7 +1434,7 @@
       eval($cmd);
     }
     
-    if(count($ob) > 0) $sb_links = '<div style="text-align: center; padding: 5px 0;">'. ( ( getConfig('powered_btn') == '1' ) ? $this->fading_button : '' ) . implode('<br />', $ob).'</div>';
+    if(count($ob) > 0 || getConfig('powered_btn') == '1') $sb_links = '<div style="text-align: center; padding: 5px 0;">'. ( ( getConfig('powered_btn') == '1' ) ? $this->fading_button : '' ) . implode('<br />', $ob).'</div>';
     else $sb_links = '';
     
     $this->sidebar_widget('Links', $sb_links);
diff -r 96fa8ded7698 -r 21770a1a5213 themes/oxygen/header.tpl
--- a/themes/oxygen/header.tpl	Thu Jul 12 15:33:25 2007 -0400
+++ b/themes/oxygen/header.tpl	Sun Jul 15 11:41:06 2007 -0400
@@ -11,6 +11,7 @@
     {ADDITIONAL_HEADERS}
     
     <script type="text/javascript">
+    // <![CDATA[
     
       function collapseSidebar(side)
       {
@@ -114,6 +115,7 @@
         elem1.style.display = 'block';
         document.onclick = null;
       }
+    // ]]>
     </script>
     
   </head>
@@ -160,7 +162,7 @@
         <tr><td id="mdg-ml"></td><td style="background-color: #FFFFFF;">
           <div class="pad"><div class="contentDiv">
           <div style="float: right;">
-            <image alt=" " src="{SCRIPTPATH}/images/spacer.gif" id="ajaxloadicon" />
+            <img alt=" " src="{SCRIPTPATH}/images/spacer.gif" id="ajaxloadicon" />
           </div>
           <h2 <!-- BEGIN auth_rename --> ondblclick="ajaxRenameInline();" title="Double-click to rename this page" <!-- END auth_rename --> id="h2PageName">{PAGE_NAME}</h2>
             <div id="ajaxEditContainer">