Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

first changes to new html-structure

  • Loading branch information...
commit 363d8e898e06d60ff8cd07c8935a32674a36f63a 1 parent 5596ab4
Helrunar authored
Showing with 136 additions and 47 deletions.
  1. +61 −0 css/clearfix.css
  2. +74 −47 index.php
  3. +1 −0  templateDetails.xml
View
61 css/clearfix.css
@@ -0,0 +1,61 @@
+/* `Clear Floated Elements
+----------------------------------------------------------------------------------------------------*/
+
+/* http://sonspring.com/journal/clearing-floats */
+
+html body div.clear,
+html body span.clear {
+ background: none;
+ border: 0;
+ clear: both;
+ display: block;
+ float: none;
+ font-size: 0;
+ margin: 0;
+ padding: 0;
+ position: static;
+ overflow: hidden;
+ visibility: hidden;
+ width: 0;
+ height: 0;
+}
+
+/* http://perishablepress.com/press/2009/12/06/new-clearfix-hack */
+
+.clearfix:after,
+ul.links:after,
+ul.menu:after,
+.clear-block:after
+{
+ clear: both;
+ content: ' ';
+ display: block;
+ font-size: 0;
+ line-height: 0;
+ visibility: hidden;
+ width: 0;
+ height: 0;
+}
+
+/*
+ The following zoom:1 rule is specifically for IE6 + IE7.
+ Move to separate stylesheet if invalid CSS is a problem.
+*/
+
+* html .clearfix,
+* html ul.links,
+* html ul.menu,
+* html .clear-block,
+*:first-child+html .clearfix,
+*:first-child+html ul.links,
+*:first-child+html .clear-block
+{
+ zoom: 1;
+}
+
+/* Exclude inline links from clear-block behavior */
+ul.inline:after {
+ content: "";
+ display:none;
+ clear:none;
+}
View
121 index.php
@@ -13,11 +13,11 @@
$showLeftPosition = $this->countModules('left');
$showRightPosition = $this->countModules('right');
$showTopPosition = $this->countModules('top');
-$showUser1User2User3Positions = $this->countModules('user1 or user2 or user3');
-$showUser1Position = $this->countModules('user1');
-$showUser2Position = $this->countModules('user2');
-$showUser3Position = $this->countModules('user3');
+$showUser4User5User5Positions = $this->countModules('user4 or user5 or user6');
$showUser4Position = $this->countModules('user4');
+$showUser5Position = $this->countModules('user5');
+$showUser6Position = $this->countModules('user6');
+$showUser7Position = $this->countModules('user7');
// Set Container and Grid to grid-12 or grid-16
$GridContainer = 12;
@@ -45,71 +45,98 @@
<link rel="stylesheet" href="<?php echo $templatePath; ?>/css/reset.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $templatePath; ?>/css/text.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $templatePath; ?>/css/960.css" type="text/css" />
+ <link rel="stylesheet" href="<?php echo $templatePath; ?>/css/clearfix.css" type="text/css" />
<link rel="stylesheet" href="<?php echo $templatePath; ?>/css/template_css.css" type="text/css" />
</head>
<body>
- <div class="container-<?php echo $GridContainer; ?>">
- <div class="grid-<?php echo $GridContainer; ?> header">
- <h1>
- <?php echo $siteName; ?>
- </h1>
- </div>
- <div class="clear"></div>
+<div id="page-wrapper" class="page">
- <?php if ($showTopPosition) : ?>
- <div class="grid-<?php echo $GridContainer; ?>">
+ <!-- ***************** top *************** -->
+ <?php if ($showTopPosition) : ?>
+ <div id="top-wrapper">
+ <div class="top-wrapper-inner container-<?php echo $GridContainer; ?> region clearfix">
<jdoc:include type="modules" name="top" style="box" />
</div>
- <div class="clear"></div>
- <?php endif; ?>
+ </div>
+ <?php endif; ?>
- <div class="grid-<?php echo $leftPositionWidth; ?>">
- <jdoc:include type="modules" name="left" style="box" />
- </div>
- <div class="grid-<?php echo $componentWidth; ?>">
- <jdoc:include type="message" />
- <jdoc:include type="component" />
+ <!-- ***************** header *************** -->
+ <div id="header-wrapper">
+ <div class="header-wrapper-inner container-<?php echo $GridContainer; ?> region header clearfix">
+ <h1>
+ <?php echo $siteName; ?>
+ </h1>
</div>
- <?php if ($showRightPosition) : ?>
- <div class="grid-<?php echo $rightPositionWidth; ?>">
- <jdoc:include type="modules" name="right" style="box" />
+ </div>
+
+ <!-- ***************** topmenu *************** -->
+ <div id="topmenu-wrapper">
+ <div class="topmenu-wrapper-inner container-<?php echo $GridContainer; ?> region clearfix">
+ <jdoc:include type="modules" name="topmenu" style="box" />
</div>
- <?php endif; ?>
- <div class="clear"></div>
+ </div>
+
+ <!-- ***************** main *************** -->
+ <div id="main-wrapper">
+ <div class="main-wrapper-inner container-<?php echo $GridContainer; ?> clearfix">
+
+ <!-- ***************** left *************** -->
+ <div class="grid-<?php echo $leftPositionWidth; ?>">
+ <jdoc:include type="modules" name="left" style="box" />
+ </div>
+
+ <!-- ***************** content *************** -->
+ <div class="grid-<?php echo $componentWidth; ?>">
+ <jdoc:include type="message" />
+ <jdoc:include type="component" />
+ </div>
- <?php if ($showUser1User2User3Positions) : ?>
- <div class="grid-4">
- <?php if ($showUser1Position) : ?>
- <jdoc:include type="modules" name="user1" style="box" />
- <?php else : ?>
- &nbsp;
+ <!-- ***************** right *************** -->
+ <?php if ($showRightPosition) : ?>
+ <div class="grid-<?php echo $rightPositionWidth; ?>">
+ <jdoc:include type="modules" name="right" style="box" />
+ </div>
<?php endif; ?>
</div>
- <div class="grid-4">
- <?php if ($showUser2Position) : ?>
- <jdoc:include type="modules" name="user2" style="box" />
- <?php else : ?>
- &nbsp;
+ </div>
+
+ <!-- ***************** user 4,5,6 *************** -->
+ <div id="user-wrapper">
+ <div class="user-wrapper-inner container-<?php echo $GridContainer; ?> clearfix">
+ <?php if ($showUser4User5User6Positions) : ?>
+ <div class="grid-4">
+ <?php if ($showUser4Position) : ?>
+ <jdoc:include type="modules" name="user1" style="box" />
+ <?php else : ?>
+ &nbsp;
<?php endif; ?>
- </div>
- <div class="grid-4">
- <?php if ($showUser3Position) : ?>
- <jdoc:include type="modules" name="user3" style="box" />
- <?php else : ?>
- &nbsp;
+ </div>
+ <div class="grid-4">
+ <?php if ($showUser5Position) : ?>
+ <jdoc:include type="modules" name="user2" style="box" />
+ <?php else : ?>
+ &nbsp;
+ <?php endif; ?>
+ </div>
+ <div class="grid-4">
+ <?php if ($showUser6Position) : ?>
+ <jdoc:include type="modules" name="user3" style="box" />
+ <?php else : ?>
+ &nbsp;
+ <?php endif; ?>
+ </div>
<?php endif; ?>
</div>
- <div class="clear"></div>
- <?php endif; ?>
+ </div>
- <?php if ($showUser4Position) : ?>
+ <?php if ($showUser7Position) : ?>
<div class="grid-12">
<jdoc:include type="modules" name="user4" style="box" />
</div>
<div class="clear"></div>
<?php endif; ?>
</div>
-
+</div>
</body>
</html>
View
1  templateDetails.xml
@@ -26,6 +26,7 @@
<position>left</position>
<position>right</position>
<position>top</position>
+ <position>topmenu</position>
<position>user1</position>
<position>user2</position>
<position>user3</position>

0 comments on commit 363d8e8

Please sign in to comment.
Something went wrong with that request. Please try again.