# HG changeset patch
# User ethanzonca
# Date 2010-09-25 01:23:24
# Node ID 0137ddfb7b22e79486b3168aff57bd40817315eb
# Parent  56b03ab8efe90a45732dfdc366a90e57b73c85cc

Fixed up junk left out of ohnobinki's merge, explicitly declare functions pub/priv

diff --git a/inc/class.page.php b/inc/class.page.php
--- a/inc/class.page.php
+++ b/inc/class.page.php
@@ -41,12 +41,12 @@ class page {
     $this->headCode['gliderHeadcode'] = '<link rel="stylesheet" href="styles/glider.css" type="text/css" media="screen" charset="utf-8"><script src="scripts/prototype.js" type="text/javascript" charset="utf-8"></script><script src="scripts/effects.js" type="text/javascript" charset="utf-8"></script><script src="scripts/glider.js" type="text/javascript" charset="utf-8"></script>'; 
 
    $this->pagetitle = $ntitle;
-    $this->scripts = $nscripts;
+   $this->scripts = $nscripts;
+
+    session_start();
     if($immediate
        && $ntitle != "NOHEAD")
       $this->head();
-
-    session_start();
  }
 
   /**
@@ -60,7 +60,7 @@ class page {
    * \param $enable
    *   Whether or not to enable this code while adding it.
    */
-  function headcode_add($key, $code, $enable = FALSE)
+  public function headcode_add($key, $code, $enable = FALSE)
   {
     $this->headCode[$key] = $code;
     if ($enable)
@@ -76,7 +76,7 @@ class page {
 
 // Public functions/vars
 
-  function head(){
+  public function head(){
     $this->pageGenTime = round(microtime(), 3);
 
     echo '<!DOCTYPE ' . $this->doctype . '>
diff --git a/input.php b/input.php
--- a/input.php
+++ b/input.php
@@ -49,18 +49,17 @@ var sectionsOfClass = Array();
     <table id="jsrows">
       <tr>
 	<td colspan="11">
-	  <input id="scheduleName" style="margin-bottom: 2em;" class="defText required" type="text" class="required" size="25" title="Schedule Name (e.g., Spring 2011)" name="postData[name]"
+	  <input id="scheduleName" style="margin-bottom: 2em;" class="defText required" type="text" class="required" size="25" title="Schedule Name (e.g., Spring <?php echo Date('Y'); ?>)" name="postData[name]"
 		 <?php if ($sch) echo 'value="' . str_replace('"', '&quot;', $sch->getName()) . '"'; /*"*/ ?>
 		 />
-	  <em>(For example: Fall <?php echo Date("Y"); ?>)</em>
 	</td>
       </tr>
       <tr>
-	<td colspan="11" style="padding-bottom: 2em;">
-	  <select id="isNumeric" type="text" class="required" name="isnumbered" value="<?php if ($sch) echo $sch->section_format; else echo 'numerous'; ?>" >
-	    <option value="numerous">Custom Section Labels</option>
-	    <option value="numbered">Numbered Section Labels</option>
-	    <option value="lettered">Lettered Section Labels</option>
+	<td class="advanced" colspan="11" style="padding-bottom: 2em;">
+	  Section Labels are <select id="isNumeric" type="text" class="required" name="isnumbered" value="<?php if ($sch) echo $sch->section_format; else echo 'numerous'; ?>" >
+	    <option value="numerous">Custom</option>
+	    <option value="numbered">Numbered</option>
+	    <option value="lettered">Lettered</option>
 	  </select>
 
 	<!-- Header -->