summaryrefslogtreecommitdiff
path: root/kolab.org
diff options
context:
space:
mode:
authorTorsten Grote <grote@kolabsys.com>2012-08-16 09:41:52 (GMT)
committerTorsten Grote <grote@kolabsys.com>2012-08-16 09:41:52 (GMT)
commit430d2aace0c46ffc15b5994328958256041c03a1 (patch)
tree925a4c32260c3f0d1c996003fddaeb4f0e07b19c /kolab.org
parent940f1075c2a3046f0fe8fd7b010ad1ef72880f4b (diff)
downloadkolab.org-www-430d2aace0c46ffc15b5994328958256041c03a1.tar.gz
fix region removal
Diffstat (limited to 'kolab.org')
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/themes/kolab/css/custom.css2
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/themes/kolab/kolab.info3
-rw-r--r--kolab.org/www/drupal-7.15/sites/all/themes/kolab/page.tpl.php12
3 files changed, 8 insertions, 9 deletions
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>