SlatePermutate Changeset - 986e496149ed · protofusion repositories

Changeset - 986e496149ed

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

ethanzonca - 15 years ago 2010-09-23 23:28:46

Additional minor changes

3 files changed with 24 insertions and 20 deletions:

class.schedule.php

inc/class.page.php

input.php

0 comments (0 inline, 0 general)

class.schedule.php

➞

Show inline comments

@@ @@ -245,28 +245,29 @@ class Schedule @@
 			"\n\n<div id=\"header\">\n<h1><em>SlatePermutate</em> - Scheduler</h1><h3>Schedule name: " . $this->getName() . "</h3>\n</div><div id=\"content\">".
 			*/
 		$headcode = array('outputStyle', 'gliderHeadcode');
 		$footcloser = '';
                 if(isset($_REQUEST['print'])){
 	                $headcode = array('outputStyle', 'outputPrintStyle');
+		}
 		else {
 			$footcloser .="</div></div><script type=\"text/javascript\" charset=\"utf-8\">".
 				"\n\tvar my_glider = new Glider('my-glider', {duration:0});".
 				"\n</script>";
 			$headcode = array('outputStyle', 'gliderHeadcode');
+		}
 		$outputPage = new page($this->getName(), $headcode);
 		if(isset($_REQUEST['print'])){
 			echo '<script type="text/javascript">window.print();</script>';
 			echo '<p><a href="'.$_SERVER["SCRIPT_NAME"].'?savedkey=0">Return to normal view</a> :: <a href="input.php">Home</a></p>';
+		}
 		else {
 			echo '<p><a href="'.$_SERVER["SCRIPT_NAME"].'?savedkey=0&print=1">Print</a> :: <a href="input.php">Home</a></p>';
+		}
 		echo "<p>There were a total of " . $this->possiblePermutations . " possible permutations. Only " . $this->nPermutations . " permutations had no class conflicts.</p>";
 		$footcloser .="</div></div><script type=\"text/javascript\" charset=\"utf-8\">".
 			"\n\tvar my_glider = new Glider('my-glider', {duration:0});".
 			"\n</script>";
 		if($this->nPermutations > 0)
+		{

inc/class.page.php

➞

Show inline comments

@@ @@ -33,6 +33,7 @@ class page { @@
     $this->headCode['jQuery'] = '<script src="http://www.google.com/jsapi"></script><script type="text/javascript" charset="utf-8"> google.load("jquery", "1.3.2"); google.load("jqueryui", "1.7.2");</script>';
     $this->headCode['jValidate'] = '<script type="text/javascript" src="http://ajax.microsoft.com/ajax/jquery.validate/1.7/jquery.validate.pack.js"></script>';
     $this->headCode['schedInput'] = '<script type="text/javascript" src="scripts/scheduleInput.js"></script>';
     $this->headCode['outputPrintStyle'] = '<link rel="stylesheet" href="styles/print.css" type="text/css" media="screen" charset="utf-8">';
     $this->headCode['outputStyle'] = '<link rel="stylesheet" href="styles/output.css" type="text/css" media="screen" charset="utf-8">';
     $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>';

input.php

➞

Show inline comments

@@ @@ -22,7 +22,7 @@ include_once 'inc/class.page.php'; @@
 		</td>
 	</tr>
 	<tr>
-		<td colspan="11" style="padding-bottom: 2em;">Section Numbering Style: <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>
+		<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>
 	<!-- Header -->
 	<tr>
@@ @@ -53,7 +53,9 @@ include_once 'inc/class.page.php'; @@
 <h3>TODO:</h3>
 <ul>
 	<li>Add print stylesheet and button to output page</li>
 	<li>Autoincrement section num/letter/custom labels</li>
 	<li>Make output and print output formatting look nicer</li>
 	<li>Make printing work for saved jobs where jobkey != 0</li>
 	<li>After selecting a start time, set the end time to one hour after the start time</li>
         <li><strong>Append</strong> sections</li>
         <li>Move the add class button to somewhere nicer, maybe a gray row at the bottom. Make the submit button more obvious.</li>

0 comments (0 inline, 0 general)