- Revision
- 909
- Author
- mde
- Date
- 2006-08-03 10:34:54 -0700 (Thu, 03 Aug 2006)
Log Message
Changes to allow three different basic layouts with same header and footer to avoid profusion of different versions of boilerplate code.
Modified Paths
Diff
Modified: trunk/sites/chandler/1.0_vision.php (908 => 909)
--- trunk/sites/chandler/1.0_vision.php 2006-08-01 23:42:51 UTC (rev 908) +++ trunk/sites/chandler/1.0_vision.php 2006-08-03 17:34:54 UTC (rev 909) @@ -1,5 +1,6 @@ <?php -require('short.header.inc.php'); +$hasSideNav = true; +require('header.inc.php'); ?> <h1 style="text-align:center;">Vision of Chandler 1.0</h1> @@ -885,5 +886,7 @@ <hr /> -</body> -</html> +<?php +require('footer.inc.php'); +?> +
Modified: trunk/sites/chandler/demos/Chandler Demos.php (908 => 909)
--- trunk/sites/chandler/demos/Chandler Demos.php 2006-08-01 23:42:51 UTC (rev 908) +++ trunk/sites/chandler/demos/Chandler Demos.php 2006-08-03 17:34:54 UTC (rev 909) @@ -1,5 +1,5 @@ <?php -require('http://chandler.osafoundation.org/short.header.inc.php'); +require('../short.header.inc.php'); ?> <p> </p>
Modified: trunk/sites/chandler/fordevelopers.php (908 => 909)
--- trunk/sites/chandler/fordevelopers.php 2006-08-01 23:42:51 UTC (rev 908) +++ trunk/sites/chandler/fordevelopers.php 2006-08-03 17:34:54 UTC (rev 909) @@ -1,4 +1,5 @@ <?php +$hasSideNav = true; require('header.inc.php'); ?> <h1><font size="+2">For Developers </font></h1> @@ -43,3 +44,8 @@ <br> <h1>Getting Chandler</h1> <p>You have a few choices when deciding what to download, depending on what you plan on doing with Chandler, and whether you want a version built from the absolute newest code or one that has gone through testing by people. For links to the various versions of Chandler go the the <a href="" Chandler</a> wiki page. </p> + +<?php +require('footer.inc.php'); +?> +
Modified: trunk/sites/chandler/header.inc.php (908 => 909)
--- trunk/sites/chandler/header.inc.php 2006-08-01 23:42:51 UTC (rev 908) +++ trunk/sites/chandler/header.inc.php 2006-08-03 17:34:54 UTC (rev 909) @@ -1,15 +1,19 @@ <?php $path = strtolower($_SERVER['PHP_SELF']); $isIndex = false; +$layoutMainWidth = 0; // Figure out if this is the main page or a sub-page if ($path == '/' || $path == '/index.php' || $path == '/index2.php') { $isIndex = true; + $hasSideNav = true; } else { $isIndex = false; } +$layoutMainWidth = $hasSideNav ? 780 : 580; + ?> <!DOCTYPE html @@ -22,17 +26,22 @@ <title>Chandler, a next-generation Personal Information Manager (PIM) integrating calendar, e-mail, contact management, task management, notes, and instant messaging</title> +<?php +if ($hasSideNav) { +?> <script type="text/_javascript_" src="" <script type="text/_javascript_" src="" - +<link rel="stylesheet" href="" type="text/css"/> +<?php +} +?> <link rel="stylesheet" href="" type="text/css"/> -<link rel="stylesheet" href="" type="text/css"/> <body> <div id="centeringDiv" style="text-align:center;"> -<div id="layoutMain"> +<div id="layoutMain" style="width:<?php print($layoutMainWidth); ?>px;"> <div id="bannerDiv"> @@ -79,6 +88,9 @@ <div id="contentArea"> +<?php +if ($hasSideNav) { +?> <div id="leftNav"> <div class="navSection" id="buttonSection1"></div> <div class="navSection" id="buttonSection2"></div> @@ -88,5 +100,8 @@ </div> <div class="gutterDiv"> </div> +<?php +} +?> <div id="contentMain">
Modified: trunk/sites/chandler/main.css (908 => 909)
--- trunk/sites/chandler/main.css 2006-08-01 23:42:51 UTC (rev 908) +++ trunk/sites/chandler/main.css 2006-08-03 17:34:54 UTC (rev 909) @@ -108,7 +108,6 @@ font-weight:bold; } #layoutMain { - width:780px; height:100%; margin:auto; margin-top:24px;
Modified: trunk/sites/chandler/philosophy.php (908 => 909)
--- trunk/sites/chandler/philosophy.php 2006-08-01 23:42:51 UTC (rev 908) +++ trunk/sites/chandler/philosophy.php 2006-08-03 17:34:54 UTC (rev 909) @@ -1,5 +1,6 @@ <?php -require('short.header.inc.php'); +$hasSideNav = true; +require('header.inc.php'); ?> <h1 align="center"> @@ -116,3 +117,8 @@ <li> <a class="twikiLink" href="" </li> <li> <a class="twikiLink" href="" </li> </ul> + +<?php +require('footer.inc.php'); +?> +
_______________________________________________ Commits mailing list [email protected] http://lists.osafoundation.org/mailman/listinfo/commits
