kolab.org/www

Paul James Adams adams at kolabsys.com
Mon Jul 30 16:42:14 CEST 2012


 kolab.org/www/drupal-7.14/sites/all/themes/kolab/page.tpl.php |  159 ++++------
 1 file changed, 74 insertions(+), 85 deletions(-)

New commits:
commit 28b869c2252b7e4b3be7b067bc9283d3133e9a2f
Author: Paul Adams <adams at kolabsys.com>
Date:   Mon Jul 30 16:41:35 2012 +0200

    - New page template for D7

diff --git a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/page.tpl.php b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/page.tpl.php
index cdde5e9..246079d 100644
--- a/kolab.org/www/drupal-7.14/sites/all/themes/kolab/page.tpl.php
+++ b/kolab.org/www/drupal-7.14/sites/all/themes/kolab/page.tpl.php
@@ -1,92 +1,81 @@
-<?php
-if ($is_front) {
-  unset($title);
-}
+<?php 
+  if (!drupal_is_front_page()) {
+    $title = "";
+  }
 ?>
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language ?>" lang="<?php print $language->language ?>" dir="<?php print $language->dir ?>">
-<head>
-    <?php print $head ?>
-    <title><?php print $head_title ?></title>
-    <?php print $styles ?>
-    <?php print $scripts ?>
-</head>
-<body id="main-body">
 
-    <?php /*
-        Start of header section
-    */ ?>
+<div id="header-region" class="clear-block">
+  <?php if($page['header']): print render($page['header']); endif; ?>
+</div>
 
-    <?php /* header block(s) */ ?>
-    <div id="header-region" class="clear-block"><?php print $header; ?></div>
+<div id=<?php /*if ($is_front) { echo addslashes("header"); } else {*/ echo addslashes("header-normal");/* }*/ ?> class="container">
+  <div class="span-24">
+    <?php if($site_name): ?>
+      <h1 class='site-name'>
+        <a href="<?php print $front_page ?>" title="<?php print t('Home') ?>">
+          <?php print $site_name ?>
+        </a>
+      </h1>
+    <?php endif; ?>
+    <?php if ($site_slogan): ?>
+      <h3>
+        <?php print $site_slogan ?>
+      </h3>
+    <?php endif; ?>
+  </div>
+</div>
 
-    <div id=<?php /*if ($is_front) { echo addslashes("header"); } else {*/ echo addslashes("header-normal");/* }*/ ?> class="container">
-        <div class="span-24"> <!-- has a certain width used down below //-->
-            <?php if ($site_name) { ?>
-                <h1 class='site-name'>
-                    <a href="<?php print $front_page ?>" title="<?php print t('Home') ?>">
-                        <?php print $site_name ?>
-                    </a>
-                </h1>
-            <?php } ?>
-            <?php if ($site_slogan) { ?>
-                <h3>
-                    <?php print $site_slogan ?>
-                </h3>
-            <?php } ?>
+<div id="root">
+  <div class="container">
+    <div class="span-24">
+      <?php print theme('links__system_main_menu', array(
+        'links' => $main_menu,
+        'attributes' => array(
+          'id' => 'navlist',
+          'class' => array('links', 'inline', 'clearfix'),
+        ),
+        'heading' => array(
+          'text' => t('Main menu'),
+          'level' => 'h2',
+          'class' => array('element-invisible'),
+        ),
+      )); ?>
+      <?php print theme('links__system_secondary_menu', array(
+        'links' => $secondary_menu,
+        'attributes' => array(
+          'id' => 'subnavlist',
+          'class' => array('links', 'inline', 'clearfix'),
+        ),
+        'heading' => array(
+          'text' => t('Secondary menu'),
+          'level' => 'h2',
+          'class' => array('element-invisible'),
+        ),
+      )); ?>
+      <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 if ($title): ?>
+            <h1 class="title"><?php print render($title); ?></h1>
+          <?php endif; ?>
+          <?php if($messages): print render($messages); endif; ?>
+          <?php if($page['content']): print render($page['content']); endif; ?>
         </div>
-    </div>
-
-    <?php /*
-            End of header section
-    */ ?>
-
-    <div id="root">
-        <div class="container">
-
-            <div class="span-24">
-                <?php if (isset($main_menu)) : ?>
-                    <?php print theme('links', $main_menu, array(' id' => 'navlist')) ?>
-                    <div class="clear"></div>
-                <?php endif; ?>
-
-				<?php if (isset($secondary_menu)) : ?>
-                    <?php print theme('links', $secondary_menu, array(' id' => 'subnavlist')) ?>
-                    <div class="clear"></div>
-                <?php endif; ?>
-
-                <div class="tabs"><?php print $tabs ?></div>
+        <?php if($page['content-sidebar']): ?>
+          <div id="content-sidebar">
+            <?php print render($page['content_sidebar']); ?>
+          </div>
+        <?php endif; ?>
+        <div class="clear"></div>
+      </div>
 
-                <?php print $help ?>
+      <?php print render($feed_icons); ?>
 
-                <div id="main">
-                    <div id="content">
-                    <?php if ($title) { ?><h1 class="title"><?php print $title ?></h1><?php } ?>
-                        <?php print $search_box ?>
-                        <?php if ($show_messages) { print $messages; } ?>
-                        <?php print $header ?>
-                        <?php print $breadcrumb ?>
-                        <?php print $content; ?>
-                    </div>
-		    <?php if ($content_sidebar) { ?>
-		        <div id="content-sidebar">
-			    <?php print $content_sidebar ?>
-			</div>
-		    <?php } ?>
-                    <div class="clear"></div>
-                </div>
-
-                <?php print $feed_icons; ?>
-
-                <div id="footer"><?php print $footer_message . $footer ?></div>
-
-            </div>
-
-        </div><?php /*
-            End of container div
-        */ ?>
-    </div><?php /*
-        End of root div
-    */ ?>
-</body>
-</html>
-<?php print $closure; ?>
+      <div id="footer">
+        <?php print render($page['footer']); ?>
+      </div>
+    </div>
+  </div>
+</div>
\ No newline at end of file





More information about the commits mailing list