r52 - in trunk/direct.openmoko.com: admin/includes includes templates/OpenMoko
roh at sita.openmoko.org
roh at sita.openmoko.org
Tue Jun 12 05:16:22 CEST 2007
Author: roh
Date: 2007-06-12 05:16:22 +0200 (Tue, 12 Jun 2007)
New Revision: 52
Modified:
trunk/direct.openmoko.com/admin/includes/configure.php
trunk/direct.openmoko.com/includes/configure.php
trunk/direct.openmoko.com/templates/OpenMoko/footer.php
trunk/direct.openmoko.com/templates/OpenMoko/header.php
Log:
clean up common code
Modified: trunk/direct.openmoko.com/admin/includes/configure.php
===================================================================
--- trunk/direct.openmoko.com/admin/includes/configure.php 2007-06-12 03:10:10 UTC (rev 51)
+++ trunk/direct.openmoko.com/admin/includes/configure.php 2007-06-12 03:16:22 UTC (rev 52)
@@ -8,7 +8,8 @@
Released under the GNU General Public License
*/
-require_once '../../openmoko_common_cfg.php';
+require_once '../../openmoko_config-inc.php';
+require_once '../../openmoko_common-inc.php';
// Define the webserver and path parameters
// * DIR_FS_* = Filesystem directories (local/physical)
Modified: trunk/direct.openmoko.com/includes/configure.php
===================================================================
--- trunk/direct.openmoko.com/includes/configure.php 2007-06-12 03:10:10 UTC (rev 51)
+++ trunk/direct.openmoko.com/includes/configure.php 2007-06-12 03:16:22 UTC (rev 52)
@@ -8,7 +8,8 @@
Released under the GNU General Public License
*/
-require_once '../openmoko_common_cfg.php';
+require_once '../openmoko_config-inc.php';
+require_once '../openmoko_common-inc.php';
// Define the webserver and path parameters
// * DIR_FS_* = Filesystem directories (local/physical)
Modified: trunk/direct.openmoko.com/templates/OpenMoko/footer.php
===================================================================
--- trunk/direct.openmoko.com/templates/OpenMoko/footer.php 2007-06-12 03:10:10 UTC (rev 51)
+++ trunk/direct.openmoko.com/templates/OpenMoko/footer.php 2007-06-12 03:16:22 UTC (rev 52)
@@ -54,14 +54,14 @@
<div id="footer">
<ul id="secundary_navigation">
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/">Home</a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/about">About</a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/products">Products</a></li>
- <li><a href="<?php echo 'https://'.OPENMOKO_SHOP_HOST.OPENMOKO_SHOP_WS_PATH; ?>/" class="selected">Shop</a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/developers">Developers</a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/press">Press</a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/careers">Careers</a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/contact">Contact</a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/">Home</a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/about">About</a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/products">Products</a></li>
+ <li><a href="<?php /* FIXME */ echo 'https://'.OPENMOKO_SHOP_HOST.OPENMOKO_SHOP_WS_PATH; ?>/" class="selected">Shop</a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/developers">Developers</a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/press">Press</a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/careers">Careers</a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/contact">Contact</a></li>
</ul>
Copyright © 2006 Openmoko, Inc. All Rights Reserved
Modified: trunk/direct.openmoko.com/templates/OpenMoko/header.php
===================================================================
--- trunk/direct.openmoko.com/templates/OpenMoko/header.php 2007-06-12 03:10:10 UTC (rev 51)
+++ trunk/direct.openmoko.com/templates/OpenMoko/header.php 2007-06-12 03:16:22 UTC (rev 52)
@@ -67,14 +67,14 @@
<a href="#" id="site_logo"><img src="http://<?php echo OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/images/openmoko_logo.png" alt="openmoko.com" /></a>
<div id="main_navigation">
<ul>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/" class="nav_home"><span>Home</span></a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/about" class="nav_about"><span>About</span></a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/products" class="nav_products"><span>Products</span></a></li>
- <li><a href="<?php echo 'https://'.OPENMOKO_SHOP_HOST.OPENMOKO_SHOP_WS_PATH; ?>/" class="nav_shop selected"><span>Shop</span></a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/developers" class="nav_developers"><span>Developers</span></a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/press" class="nav_press"><span>Press</span></a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/careers" class="nav_careers"><span>Careers</span></a></li>
- <li><a href="<?php echo PROTOCOL.OPENMOKO_WEB_HOST.OPENMOKO_WEB_WS_PATH; ?>/contact" class="nav_contact"><span>Contact</span></a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/" class="nav_home"><span>Home</span></a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/about" class="nav_about"><span>About</span></a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/products" class="nav_products"><span>Products</span></a></li>
+ <li><a href="<?php /* FIXME */ echo 'https://' . OPENMOKO_SHOP_HOST . OPENMOKO_SHOP_WS_PATH; ?>/" class="nav_shop selected"><span>Shop</span></a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/developers" class="nav_developers"><span>Developers</span></a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/press" class="nav_press"><span>Press</span></a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/careers" class="nav_careers"><span>Careers</span></a></li>
+ <li><a href="<?php echo om_href_link( OPENMOKO_WEB_HOST, OPENMOKO_WEB_WS_PATH ); ?>/contact" class="nav_contact"><span>Contact</span></a></li>
</ul>
</div>
More information about the webdesign-commitlog
mailing list
