- Bugfix: small Xtemplate fixes. Patch by Ax. (Slightly modified.)

- Bugfix: block patch fix.  Patch by Gerhard.

- Bugfix: fixed broken URL in ping.  Patch by Gerhard.

  (This should fix the problems shown on http://www.blo.gs/info.php?id=1515.)

- Improvement: added better password generator.  Patch #1 by Al.  Fixes bug
  #1935.

- Improvement: performance improvement to the blog module.  Patch by Marco.

2 files changed, 3 insertions, 7 deletions

diff --git a/themes/xtemplate/xtemplate.css b/themes/xtemplate/xtemplate.css
index 0a5ae31c7..26bdba3b3 100644
--- a/themes/xtemplate/xtemplate.css
+++ b/themes/xtemplate/xtemplate.css
@@ -80,7 +80,6 @@ img {
 #search .form-text {
   width: 8em;
   height: 1.4em;
-  margin-left: 1em;
   padding: 0 0.5em 0 0.5em;
   margin: 0 0 0.5em 0;
 }
@@ -102,7 +101,7 @@ img {
 #message, #main .node .content, .comment .content {
   line-height: 1.4;
 }
-#sidebar {
+#sidebar-left, #sidebar-right {
   background-color: #ddd;
   width: 16em;
   padding: 1em;
@@ -172,9 +171,6 @@ table {
   float: right;
   color: red;
 }
-.block .content, .box .content {
-  font-size: 0.9em/1.1em;
-}
 #tracker th {
   text-align: left;
   border-bottom: 1px solid #ddd;
diff --git a/themes/xtemplate/xtemplate.xtmpl b/themes/xtemplate/xtemplate.xtmpl
index 2496cc850..15caff8c2 100644
--- a/themes/xtemplate/xtemplate.xtmpl
+++ b/themes/xtemplate/xtemplate.xtmpl
@@ -33,7 +33,7 @@
 <table border="0" cellpadding="0" cellspacing="0" class="header">
   <tr>
     <!-- BEGIN: blocks -->
-      <td valign="top" id="sidebar">
+      <td valign="top" id="sidebar-left">
         {blocks}
       </td>
     <!-- END: blocks -->
@@ -91,7 +91,7 @@
       </div><!-- main -->
     </td>
     <!-- BEGIN: blocks -->
-    <td valign="top" id="sidebar">
+    <td valign="top" id="sidebar-right">
       {blocks}
     </td>
     <!-- END: blocks -->