SlatePermutate Changeset - 3b98a9a5aee8 · protofusion repositories

Changeset - 3b98a9a5aee8

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Ethan Zonca - 15 years ago 2010-11-16 00:36:29
ez@ethanzonca.com

Page class now outputs nicely indented html, other minor indentation fixes.

2 files changed with 56 insertions and 52 deletions:

inc/class.page.php

input.php

0 comments (0 inline, 0 general)

inc/class.page.php

➞

Show inline comments

@@ @@ -168,53 +168,55 @@ class page @@
     $this->pageGenTime = round(microtime(), 3);
     if ($this->xhtml)
-       echo '<?xml version="1.0" encoding="utf-8" ?>' . "\n";
+       echo '<?xml version="1.0" encoding="utf-8" ?>' . PHP_EOL;
     echo '<!DOCTYPE ' . $this->doctype . '>
 	  <html ' . $this->htmlargs . '>
 	  <head>
 	    <title>' . $this->pagetitle . ' :: ' . $this->base_title . '</title>
            <link rel="stylesheet" href="styles/general.css" type="text/css" media="screen" charset="utf-8" />
 	   <link rel="stylesheet" type="text/css" media="print" href="styles/print.css" />';
     echo '<!DOCTYPE ' . $this->doctype . '>'. PHP_EOL .
 	  '<html ' . $this->htmlargs . '>'. PHP_EOL .
 	  '  <head>'. PHP_EOL .
 	  '    <title>' . $this->pagetitle . ' :: ' . $this->base_title . '</title>'. PHP_EOL .
           '    <link rel="stylesheet" href="styles/general.css" type="text/css" media="screen" charset="utf-8" />'.  PHP_EOL .
 	  '    <link rel="stylesheet" type="text/css" media="print" href="styles/print.css" />'. PHP_EOL;
     // Write out all passed scripts
     foreach ($this->scripts as $i)
-      echo '            ' . $this->headCode["$i"] . "\n";
       echo '    ' . $this->headCode["$i"] . "\n";
     echo '</head>
 	  <body '.$this->bodyargs.' ><div id="page">';
     echo '  </head>' . PHP_EOL .
 	 '  <body '.$this->bodyargs.'>'. PHP_EOL .
          '    <div id="page">'. PHP_EOL;
     echo $this->top(); // Write out top
+  }
   /** Write out the top of the page, including opening div tags, header title and images, etc */
   private function top(){
     echo '<div id="header">
 	    <div id="title">
               <h1><a href="index.php"><img src="images/slatepermutate.png" alt="SlatePermutate" class="noborder" /></a><br /></h1>
               <p>
                 <span id="subtitle">'.$this->pagetitle.'</span>
   	        <span id="menu">Profile: '.$this->school['name'].' <a href="input.php?selectschool=1">(change)</a></span>
               </p>
             </div>
 	  </div>
           <div id="content">';
     echo '      <div id="header">'. PHP_EOL .
 	 '        <div id="title">'. PHP_EOL .
          '          <h1><a href="index.php"><img src="images/slatepermutate.png" alt="SlatePermutate" class="noborder" /></a><br /></h1>'. PHP_EOL .
          '          <p>'. PHP_EOL .
          '            <span id="subtitle">'.$this->pagetitle.'</span>'. PHP_EOL .
   	 '            <span id="menu">Profile: '.$this->school['name'].' <a href="input.php?selectschool=1">(change)</a></span>'. PHP_EOL .
          '          </p>'. PHP_EOL .
          '        </div>'. PHP_EOL .
 	 '      </div>'. PHP_EOL .
          '      <div id="content">'. PHP_EOL;
+  }
   /** Write out the foot of the page and closing divs */
   public function foot(){
     echo '</div> <!-- id="content" -->';
+    echo '      </div> <!-- id="content" -->'. PHP_EOL;
     $this->pageGenTime = round(microtime(), 3);
     echo '  <div id="footer">
   	      <div id="leftfoot" style="float:left; margin-top: 1em;">
 	        <a href="feedback.php">Submit Feedback</a>
               </div>
               <div id="rightfoot">
                 <h5>&copy; '. date('Y').' <a href="http://protofusion.org/~nathang/">Nathan Gelderloos</a><br /><a href="http://ethanzonca.com">Ethan Zonca</a><br /><a href="http://ohnopub.net">Nathan Phillip Brink</a></h5>
 	      </div>
             </div> <!-- id="footer" -->
           </div>';
     echo '      <div id="footer">'. PHP_EOL .
   	 '        <div id="leftfoot" style="float:left; margin-top: 1em;">'. PHP_EOL .
 	 '          <a href="feedback.php">Submit Feedback</a>'. PHP_EOL .
          '        </div>'. PHP_EOL .
          '        <div id="rightfoot">'. PHP_EOL .
          '          <h5>&copy; '. date('Y').' <a href="http://protofusion.org/~nathang/">Nathan Gelderloos</a><br /><a href="http://ethanzonca.com">Ethan Zonca</a><br /><a href="http://ohnopub.net">Nathan Phillip Brink</a></h5>'. PHP_EOL .
 	 '        </div>'. PHP_EOL .
          '      </div> <!-- id="footer" -->'. PHP_EOL .
          '    </div> <!-- id="page" -->'. PHP_EOL;
     echo $this->trackingcode;
     echo '</body></html>';
     echo '  </body>'. PHP_EOL .
          '</html>';
+  }
   /** Takes a number in seconds, and outputs HH:MM:SS */

input.php

➞

Show inline comments

@@ @@ -109,33 +109,35 @@ if (!empty($_REQUEST['selectschool']) @@
 />
 <table id="container">
   <tr><td>
     <table id="jsrows">
 	<!-- Header -->
 	<tr>
 		<td>Class ID</td>
 		<td class="center" id="letterNumber">Section</td>
 		<td class="center">Prof</td>
 		<td class="center">Start Time</td>
 		<td class="center">End Time</td>
 		<td class="center">M</td>
 		<td class="center">Tu</td>
 		<td class="center">W</td>
 		<td class="center">Th</td>
 		<td class="center">F</td>
 		<td class="center"></td>
 		<td class="center"></td>
 	</tr>
     </table>
   </td>
   <tr>
     <td>
       <table id="jsrows">
         <!-- Header -->
         <tr>
           <td>Class ID</td>
           <td class="center" id="letterNumber">Section</td>
           <td class="center">Prof</td>
           <td class="center">Start Time</td>
           <td class="center">End Time</td>
           <td class="center">M</td>
           <td class="center">Tu</td>
           <td class="center">W</td>
           <td class="center">Th</td>
           <td class="center">F</td>
           <td class="center"></td>
           <td class="center"></td>
         </tr>
       </table>
     </td>
   </tr>
   <tr>
     <td><span class="gray" style="padding: 0 3.5em 0 3.5em;" id="addclass">Add Class</span></td>
   </tr>
 </table>
 <div class="paddingtop"><input class="green" style="margin:0;padding:0;" type="submit" value="Find a schedule" /></div>
 <div class="paddingtop">
   <input class="green" style="margin:0;padding:0;" type="submit" value="Find a schedule" />
 </div>
 </form>

0 comments (0 inline, 0 general)