[31470] trunk/www/includes

jmpp at macports.org jmpp at macports.org
Sat Nov 24 18:35:30 PST 2007


Revision: 31470
          http://trac.macosforge.org/projects/macports/changeset/31470
Author:   jmpp at macports.org
Date:     2007-11-24 18:35:28 -0800 (Sat, 24 Nov 2007)

Log Message:
-----------

 * Move all of the header's content into the www/includes/header.inc file, except for other function calls;
 * Move all of the footer's content into the www/includes/footer.inc file;

Modified Paths:
--------------
    trunk/www/includes/common.inc
    trunk/www/includes/footer.inc
    trunk/www/includes/header.inc

Modified: trunk/www/includes/common.inc
===================================================================
--- trunk/www/includes/common.inc	2007-11-25 01:39:00 UTC (rev 31469)
+++ trunk/www/includes/common.inc	2007-11-25 02:35:28 UTC (rev 31470)
@@ -42,29 +42,10 @@
 
 # Page header
 function print_header($title, $encoding) {
-    global $MPWEB;
+    global $MPWEB, $mp_version_major, $trac_url, $svn_url, $downloads, $guide_url;
+    $PHP_SELF = $_SERVER['PHP_SELF'];
+    
     header("Content-Type: application/xhtml+xml; charset=$encoding");
-    echo "<?xml version=\"1.0\" encoding=\"$encoding\"?>\n";
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-
-    <head>
-        <title><?php echo $title; ?></title>
-        <meta http-equiv="Content-type" content="application/xhtml+xml; charset=<?php echo $encoding; ?>" />
-        <meta name="author" content="Jim Mock (mij at macports.org)" />
-        <meta name="author" content="Juan Manuel Palacios (jmpp at macports.org)" />
-        <meta name="author" content="Chris Pickel (sfiera at macports.org)" />
-        <meta name="copyright" content="2003, OpenDarwin" />
-        <meta name="copyright" content="2007, The MacPorts Project" />
-        <meta name="robots" content="all" />
-        <link rel="stylesheet" type="text/css" href="macports.css" />
-        <script type="text/javascript" src="mootools.v1.11.js"></script>
-        <script type="text/javascript" src="language.js"></script>
-    </head>
-
-    <body>
-<?php
     include("$MPWEB/includes/header.inc");
     check_referer();
 }
@@ -77,9 +58,6 @@
     global $MPWEB;
 
     include("$MPWEB/includes/footer.inc");
-
-    echo "    </body>\n";
-    echo "</html>\n";
 }
 
 

Modified: trunk/www/includes/footer.inc
===================================================================
--- trunk/www/includes/footer.inc	2007-11-25 01:39:00 UTC (rev 31469)
+++ trunk/www/includes/footer.inc	2007-11-25 02:35:28 UTC (rev 31470)
@@ -13,3 +13,5 @@
     src="img/vcss.png" alt="Valid CSS!" /></a></p> Copyright &#xA9; 2002&#x2013;<?php print date("Y"); ?>, <a href="http://www.macports.org/">
     The MacPorts Project</a>. Hosted by <a href="http://www.macosforge.org">Mac OS Forge</a>. All rights reserved.
 </div>
+</body>
+</html>

Modified: trunk/www/includes/header.inc
===================================================================
--- trunk/www/includes/header.inc	2007-11-25 01:39:00 UTC (rev 31469)
+++ trunk/www/includes/header.inc	2007-11-25 02:35:28 UTC (rev 31470)
@@ -3,11 +3,28 @@
     /* $Id$ */
     /* Copyright (c) 2004, OpenDarwin. */
     /* Copyright (c) 2004-2007, The MacPorts Project. */
-    $PHP_SELF = $_SERVER['PHP_SELF'];
-    global $mp_version_major, $trac_url, $svn_url, $downloads, $guide_url;
+    echo "<?xml version=\"1.0\" encoding=\"$encoding\"?>\n";
 ?>
 
 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+    <head>
+        <title><?php echo $title; ?></title>
+        <meta name="author" content="Jim Mock (mij at macports.org)" />
+        <meta name="author" content="Juan Manuel Palacios (jmpp at macports.org)" />
+        <meta name="author" content="Chris Pickel (sfiera at macports.org)" />
+        <meta name="copyright" content="2003, OpenDarwin" />
+        <meta name="copyright" content="2007, The MacPorts Project" />
+        <meta name="robots" content="all" />
+        <link rel="stylesheet" type="text/css" href="macports.css" />
+        <script type="text/javascript" src="mootools.v1.11.js"></script>
+        <script type="text/javascript" src="language.js"></script>
+    </head>
+
+    <body>
+
 <h1><a href="http://www.macports.org/" title="The MacPorts Project"><span class="accessibility">The MacPorts Project</span>
 </a></h1>
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071124/21fa2827/attachment.html


More information about the macports-changes mailing list