kolab.org/www

Torsten Grote grote at kolabsys.com
Thu Aug 16 11:42:05 CEST 2012


 kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css |    2 -
 kolab.org/www/drupal-7.15/sites/all/themes/kolab/kolab.info     |    3 +-
 kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php   |   12 ++++------
 3 files changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 430d2aace0c46ffc15b5994328958256041c03a1
Author: Torsten Grote <grote at kolabsys.com>
Date:   Thu Aug 16 11:41:52 2012 +0200

    fix region removal

diff --git a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css
index a81d59c..c5cb056 100644
--- a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css
+++ b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css
@@ -114,7 +114,7 @@ div.body-field-wrapper {
 	width: 100%;
 }
 
-#content-sidebar {
+#right-sidebar {
     width: 250px;
 }
 
diff --git a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/kolab.info b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/kolab.info
index d71322b..83547ec 100644
--- a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/kolab.info
+++ b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/kolab.info
@@ -9,6 +9,7 @@ stylesheets[all][] = css/ie.css
 stylesheets[all][] = css/custom.css
 stylesheets[print][] = css/print.css
 
-regions[right] = Right sidebar
+regions[help] = Help
 regions[content] = Content
+regions[right_sidebar] = Right sidebar
 regions[footer] = Footer
diff --git a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php
index 5675d12..67fad08 100644
--- a/kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php
+++ b/kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php
@@ -2,10 +2,6 @@
   if(drupal_is_front_page()): $title = ""; endif;
 ?>
 
-<div id="header-region" class="clear-block">
-  <?php if($page['header']): print render($page['header']); endif; ?>
-</div>
-
 <div id="header-normal" class="container">
   <div class="span-24">
     <?php if($site_name): ?>
@@ -41,7 +37,9 @@
       )); ?>
       <div class="clear"></div>
       <div class="tabs"><?php if($tabs): print render($tabs); endif; ?></div>
+
       <?php if($page['help']): print render($page['help']); endif; ?>      
+
       <div id="main">
         <div id="content">
           <?php print render($title_prefix); ?>
@@ -50,9 +48,9 @@
           <?php if($messages): print render($messages); endif; ?>
           <?php if($page['content']): print render($page['content']); endif; ?>
         </div>
-        <?php if($page['content_sidebar']): ?>
-          <div id="content-sidebar">
-            <?php print render($page['content_sidebar']); ?>
+        <?php if($page['right_sidebar']): ?>
+          <div id="right-sidebar">
+            <?php print render($page['right_sidebar']); ?>
           </div>
         <?php endif; ?>
         <div class="clear"></div>





More information about the commits mailing list