# HG changeset patch
# User ethanzonca
# Date 2010-09-25 00:59:01
# Node ID e2436d712885d9fbaaeb93ca5cd06b2d026912b1
# Parent  e1efe780415ccb2e7dee4dc873f87c91bedaf37a

Additional updates, visual changes, etc

diff --git a/inc/class.page.php b/inc/class.page.php
--- a/inc/class.page.php
+++ b/inc/class.page.php
@@ -78,7 +78,7 @@ class page {
   public function foot(){
     echo '</div>';
     $this->pageGenTime = round(microtime(), 3);
-    echo '<div id="footer"><h5>&copy; '. date('Y').' <a href="http://protofusion.org/~nathang/">Nathan Gelderloos</a><br /> with special thanks to <a href="http://ethanzonca.com">Ethan Zonca</a></h5></div>';
+    echo '<div id="footer"><h5>&copy; '. date('Y').' <a href="http://protofusion.org/~nathang/">Nathan Gelderloos</a> <br /> <a href="http://ethanzonca.com">Ethan Zonca</a></h5></div>';
     echo $this->trackingcode;
     echo '</body></html>';
   }
diff --git a/input.php b/input.php
--- a/input.php
+++ b/input.php
@@ -11,18 +11,18 @@ include_once 'inc/class.page.php';
 $inputPage->showSavedScheds($_SESSION);
 
 ?>
-
+<p>Welcome to SlatePermutate! To get started, enter in some of your classes, and add available sections for each class.</p>
 <form method="post" action="process.php" id="scheduleForm">
 <table>
   <tr>
     <table id="jsrows">
 	<tr>
-		<td colspan="11" style="padding-bottom:2em;"><input id="scheduleName" class="defText" type="text" class="required" title="Schedule Name" name="postData[name]" />
-			<em>(For example: Fall <?php echo Date("Y"); ?>)</em>
+		<td colspan="11"><input id="scheduleName" style="margin-bottom: 2em;" class="defText required" type="text" size="25" title="Schedule Name (e.g., Spring 2011)" name="postData[name]" />
+		
 		</td>
 	</tr>
 	<tr>
-		<td colspan="11" style="padding-bottom: 2em;"><select id="isNumeric" type="text" class="required" name="isnumbered" ><option value="numerous">Custom Section Labels</option><option value="numbered">Numbered Section Labels</option><option value="lettered">Lettered Section Labels</option></select>
+		<td class="advanced" colspan="11" style="padding-bottom: 2em; padding-top: .5em;"><em>Section Labels: </em><select id="isNumeric" type="text" class="required" name="isnumbered" ><option value="numerous">Custom</option><option value="numbered">Numbered</option><option value="lettered">Lettered</option></select>
 
 	<!-- Header -->
 	<tr>
@@ -40,16 +40,17 @@ include_once 'inc/class.page.php';
 	</tr>
     </table>
   </tr>
-  <tr><td> <span class="gray" style="padding: 0 3.5em 0 3.5em;" id="addclass">Add Class - This row should be just as wide as the one above someday</span></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" id="classage"><input type="button" value="Add class" /></div> -->
-<div class="paddingtop"><input style="float:left;" type="submit" value="Find me a schedule!" /></div>
+<div class="paddingtop"><input style="float:left;" type="submit" value="Find a schedule" /></div>
 
 </form>
 
 <p>&nbsp;<br /></p>
-
+<p><span id="showadvanced"><a href="#">Show Advanced Options</a></span></p>
+<span class="advanced">
 <h3>TODO:</h3>
 
 <ul>
diff --git a/scripts/scheduleInput.js b/scripts/scheduleInput.js
--- a/scripts/scheduleInput.js
+++ b/scripts/scheduleInput.js
@@ -14,6 +14,21 @@
 		}, 
 		"<p class=\"error\">Please select a time</p>" 
 	); 
+	jQuery.validator.addMethod( 
+		"daysRequired", 
+		function(value, element) { 
+			var checkedCount = 0;
+			jQuery(element).parent().children('.daysRequired:checked').each( function() {
+				checkedCount++;
+			});
+			if (checkedCount == 0) 
+			{ 
+				return false; 
+			} 
+			else return true; 
+		}, 
+		"<p class=\"error\">Pick a day!</p>" 
+	); 
 
 /* Doesn't work right now:  */ /*
 	jQuery.validator.addMethod( 
@@ -41,7 +56,7 @@
 		selectNone: true
 	});
 	
-	jQuery.validator.addClassRules("daysRequire", {
+	jQuery.validator.addClassRules("daysRequired", {
 		daysRequired: true
 	});
 
@@ -72,7 +87,7 @@
                                 </select></td>';
 	}
 	function customIds(name){
-		return '<td class="sectionIdentifier center"><input type="text" size="1" class="required" title="Schedule Name" name="' + name + '" /></td>';
+		return '<td class="sectionIdentifier center"><input type="text" size="1" class="required" name="' + name + '" /></td>';
 	}
 
 	//--------------------------------------------------
@@ -124,11 +139,11 @@
 				<option value="1920">7:20 pm</option><option value="1950">7:50 pm</option>\
 				<option value="2020">8:20 pm</option><option value="2050">8:50 pm</option>\
 				<option value="2120">9:20 pm</option></select></td>\
-			<td><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][0]" value="1" /></td>\
-			<td><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][1]" value="1" /></td>\
-			<td><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][2]" value="1" /></td>\
-			<td><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][3]" value="1" /></td>\
-			<td><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][4]" value="1" /></td>';
+			<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][0]" value="1" /></td>\
+			<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][1]" value="1" /></td>\
+			<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][2]" value="1" /></td>\
+			<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][3]" value="1" /></td>\
+			<td class="cbrow"><input type="checkbox" class="daysRequired" name="postData[' + cnum + '][' + snum + '][days][4]" value="1" /></td>';
 	
 		return result;
 	}
@@ -237,7 +252,11 @@
       }
 
     });
-    
 
+  jQuery('.advanced').hide();    
+  jQuery('#showadvanced').click( function() {
+    jQuery('#showadvanced').hide();
+    jQuery('.advanced').slideToggle();
+  });
 });
 
diff --git a/styles/general.css b/styles/general.css
--- a/styles/general.css
+++ b/styles/general.css
@@ -64,6 +64,7 @@
 
 }
 .gray {
+  border: 1px dashed #999;
   text-align: center!important;
   background: #BBB!important;
   cursor:default;