SlatePermutate Changeset - 5bc9711b7884 · protofusion repositories

Changeset - 5bc9711b7884

Parent rev.

Child rev.

[Not reviewed]

default

0 7 1

ethanzonca - 15 years ago 2011-03-12 02:21:49

Fairly major styling changes, various styling fixes

8 files changed with 171 insertions and 46 deletions:

feedback.php

inc/class.page.php

inc/class.schedule.php

index.php

input.php

scripts/scheduleInput.js

styles/general.css

139

styles/ie.css

0 comments (0 inline, 0 general)

feedback.php

➞

Show inline comments

@@ @@ -41,12 +41,12 @@ if (isset($_GET['feedback'])) @@
 <input type="hidden" name="fromdom" value="<?php echo $fromdom ?>" />
 <input type="hidden" name="httpagent" value="<?php echo $httpagenti ?>" />
 <h2>Feedback Form</h2>
 <label for="nameis">Name: </label><input type="text" name="nameis" size="20" /><br />
 <label for="visitormail">Email:&nbsp; </label><input type="text" name="visitormail" size="20" /> <span class="graytext">(if you want us to get back to you)</span><br />
 <label for="school">School: </label><input type="text" name="school" value="<?php echo htmlentities($school['id']); ?>" size="20" /> <span class="graytext">(if relevant to your feedback)</span><br />
 <br/> Overall Rating:<br/> <input checked="checked" name="rating" type="radio" value="Good" />Good <input name="rating" type="radio" value="Buggy" />Buggy  <input name="rating" type="radio" value="Needs more features" />Needs more features <input name="rating" type="radio" value="Don't know" />Don't Know <!-- ' -->
 <table>
 <tr><td><label for="nameis">Name: </label></td><td><input type="text" name="nameis" size="20" /></td></tr>
 <tr><td><label for="visitormail">Email:</label></td><td><input type="text" name="visitormail" size="20" /> <span class="graytext">(if you want us to get back to you)</span></td></tr>
 <tr><td><label for="school">School: </label></td><td><input type="text" name="school" value="<?php echo htmlentities($school['id']); ?>" size="20" /> <span class="graytext">(if relevant to your feedback)</span></td></tr>
 </table>
 <br/> Overall Rating:<br/> <input checked="checked" name="rating" type="radio" value="Great" />Great <input name="rating" type="radio" value="Usable" />Usable  <input name="rating" type="radio" value="Buggy/Hard to Use" />Buggy/Hard to Use <input name="rating" type="radio" value="Don't know" />Don't Know <!-- ' -->
 <br /><br />
 <h3>General Comments</h3>
@@ @@ -67,7 +67,7 @@ if (isset($_GET['feedback'])) @@
+    }
 ?>
-<input class="gray" type="submit" value="Submit Feedback" />
+<input class="gray" type="submit" value="Send Feedback" />
 </form>
 <?php

inc/class.page.php

➞

Show inline comments

@@ @@ -217,6 +217,9 @@ class page @@
 	  '    <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 .
           '    <!--[if IE]>'. PHP_EOL .
           '      <link rel="stylesheet" type="text/css" media="screen" charset="utf-8" href="styles/ie.css" />'. PHP_EOL .
           '    <![endif]-->'. PHP_EOL .
           '    <link rel="shortcut icon" href="images/favicon.png" />'. PHP_EOL;
     // Write out all passed scripts
@@ @@ -249,8 +252,8 @@ class page @@
   public function foot(){
     echo '      </div> <!-- id="content" -->'. PHP_EOL;
     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 id="leftfoot">'. PHP_EOL .
 	 '          <a href="feedback.php">Contact Us</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 .
@@ @@ -272,7 +275,7 @@ class page @@
     global $clean_urls;
     if (isset($session['saved']) && count($session['saved']) > 0) {
       echo '<div id="savedBox">' . PHP_EOL;
+      echo '<div id="savedBox" class="note saved">' . PHP_EOL;
       $process_php_s = 'process.php?s=';
       if ($clean_urls) {

inc/class.schedule.php

➞

Show inline comments

@@ @@ -296,7 +296,7 @@ class Schedule @@
             </script>';
       echo '<div id="sharedialog" title="Share Schedule"><p>You can share your schedule with the URL below:</p><p>' . htmlentities($outputPage->gen_share_url($this->id_get())) . '</p></div>' . "\n";
-      echo '<p><a href="input.php?s='.$this->id.'">Edit</a> :: <span id="printItems"><a href="#">Print</a></span> :: <span id="share"><a href="#">Share</a></span> :: <a href="input.php">Home</a></p>'. "\n";
+      echo '<p><a href="input.php?s='.$this->id.'" class="button">Edit</a> <span id="printItems"><a href="#" class="button">Print</a></span> <span id="share"><a href="#" class="button">Share</a></span>  <a class="button" href="input.php">Home</a></p>'. "\n";
       echo '<p class="centeredtext">Having problems? <a href="feedback.php">Let us know</a>.</p>' . "\n";
       echo '<p class="centeredtext graytext"><em>Keyboard Shortcut: Left and right arrow keys switch between schedules</em></p>' . "\n";

index.php

➞

Show inline comments

@@ @@ -26,9 +26,8 @@ require_once 'inc/class.page.php'; @@
 <h3>Find the schedule that works for you!</h3>
 <p>Plan your next semester with SlatePermutate! SlatePermutate generates every possible schedule with the courses you enter to let you pick the schedule that fits your life.</p>
 <p><a href="input.php">Get started</a></p>
 <p class="righttext"><a href="input.php"><img class="noborder" src="images/get-started.png" alt="Get Started" /></a></p>
+<p class="righttext" style="padding-right: 1em;"><a class="button blue large" href="input.php"><!--<img class="noborder" src="images/get-started.png" alt="Get Started" />-->Get Started</a></p>
 <?php
 $welcomepage->foot();

input.php

➞

Show inline comments

@@ @@ -183,16 +183,18 @@ if (!empty($_REQUEST['selectsemester'])) @@
 </table>
 <div class="paddingtop">
-  <input class="green" style="margin:0;padding:0;" type="submit" value="Find a schedule" />
+  <input class="button olive" type="submit" value="Find a schedule" />
 </div>
 </form>
 <p>&nbsp;<br /><br /><br /></p>
 <?php
 /* Show/hide Advanced Options: <p><span id="showadvanced" style="margin-left: 1em;"><a href="#">Advanced</a></span></p> */
 ?>
 <div id="showInstructions" style="width: 100%; text-align: center;"><a href="#">Detailed Instructions...</a></div>
 <?php
 $inputPage->showSchoolInstructions();
 $inputPage->foot();

scripts/scheduleInput.js

➞

Show inline comments

@@ @@ -482,6 +482,16 @@ jQuery(document).ready(function() { @@
 		jQuery('.advanced').slideToggle();
 	});
         //--------------------------------------------------
         // Show/Hide instructions
         //--------------------------------------------------
 	jQuery('#schoolInstructionsBox').hide();
 	jQuery('#showInstructions').click( function() {
 		jQuery('#showInstructions').hide();
 		jQuery('#schoolInstructionsBox').slideToggle();
 	});
 	//-------------------------------------------------
 	// Show more saved schedules
 	//-------------------------------------------------

styles/general.css

➞

Show inline comments

@@ @@ -26,18 +26,29 @@ body { @@
 #page {
   font: normal 14px sans-serif;
-  background: transparent;
+  background: #ffffff;
   width: 80%;
   padding: .5em;
   margin:auto;
   margin-top: 2em;
   min-width: 900px;
   max-width: 1100px;
+}
 #content {
   -moz-box-shadow: 0 0 .7em #999;
   -webkit-box-shadow: 0 0 .7em #999;
   box-shadow: 0 0 .7em #999;
   -webkit-border-radius: .2em;
   -moz-border-radius: .2em;
   border-radius: .2em;
   background: #fff;
-  padding: 12px;
+  padding: 1em;
+}
 #header {
   border-bottom: 1px dashed #888;
   text-align: left;
   width: 100%;
+}
@@ @@ -47,16 +58,13 @@ body { @@
   padding: 0;
+}
 #footer {
   border-top: 1px dashed #888;
   text-align: right;
   padding-left:1em;
   padding-right: 1em;
+}
 #savedBox {
   width: 20em;
   padding: 1em;
   border: 1px solid #CCC;
   float:right;
   background: #EEE;
   font-size: .8em;
 #leftfoot {
   margin-top: 0;
   float:left;
+}
 #title p {
   margin-top: -1.5em;
@@ @@ -67,7 +75,8 @@ body { @@
 #menu {
   float: right;
   text-align: right;
   margin-top: 1em;
   margin-top: .7em;
   padding-right: 1em;
+}
 #menu a {
   text-decoration: none;
@@ @@ -100,37 +109,39 @@ a:hover { @@
 /* Table Styling */
 td {
   padding: .17em;
+}
 .class td {
   background: #70a97c;
+}
 .tdInput {
   background: none!important;
+}
 td.center {
   text-align:center;
+}
 .section:nth-child(even) {
 .section:nth-child(even) td {
   background: #EEE;
+}
 .section:nth-child(odd) td {
   background: #CCC;
+}
 .section:nth-child(odd) {
   background: #EEE;
 .section.lab td {
   background: #96acc4;
+}
 .none {
   background: #fff;
+}
 .class {
   /* background: #99FF99; */
   background: #70a97c;
   background: none!important;
+}
 .emptyCell, .removeCell {
   background: #fff!important;
+}
 .lab {
   background: #96acc4!important;
   background: none!important;
+}
 .lab .sectionIdentifier {
-  background: #fff!important;
+  background: none!important;
+}
 .lab .sectionIdentifier input {
   display: none;
+}
 .lab .deleteSection input {
   display: none;
+}
@@ @@ -165,9 +176,6 @@ td.center { @@
   padding: .5em;
   padding-top: 1.5em;
+}
 .tdInput {
   background: #fff;
+}
 .addClassRow {
   padding: 2px;
   width: 30em;
@@ @@ -261,3 +269,103 @@ td.center { @@
   padding:0!important;
   margin:0!important;
+}
 #container td {
   -webkit-border-radius: 3px;
   -moz-border-radius: 3px;
   border-radius: 3px;
+}
 #savedBox {
   width: 15em;
 /*  padding: 1em; */
 /*  border: 1px solid #CCC; */
   float:right;
 /*  background: #EEE; */
   font-size: .8em;
 /*  margin: 1em; */
+}
 /*.note a, .note a:link, .note a:visited, .note a:active {
   color: #CCC;
 }*/
 .note h3 {
   font-size: 1.5em;
+}
 .note {
   position:relative;
   padding:1em 1.5em;
   margin:2em auto;
   color:#000;
   background:#97C02F;
+}
 .note:before {
   content:"";
   position:absolute;
   top:0;
   right:0;
   border-width:0 16px 16px 0; /* This trick side-steps a webkit bug */
   border-style:solid;
   border-color:#fff #fff #658E15 #658E15; /* A bit more verbose to work with .rounded too */
   background:#658E15; /* For Opera when also applying a border-radius */
   display:block; width:0; /* Only for Firefox 3.0 damage limitation */
   /* Optional: shadow */
   -webkit-box-shadow:0 1px 1px rgba(0,0,0,0.3), -1px 1px 1px rgba(0,0,0,0.2);
      -moz-box-shadow:0 1px 1px rgba(0,0,0,0.3), -1px 1px 1px rgba(0,0,0,0.2);
           box-shadow:0 1px 1px rgba(0,0,0,0.3), -1px 1px 1px rgba(0,0,0,0.2);
+}
 .note.red {background:#C93213;}
 .note.red:before {border-color:#fff #fff #97010A #97010A; background:#97010A;}
 .note.blue {background:#53A3B4;}
 .note.blue:before {border-color:#fff #fff transparent transparent; background:transparent;}
 .note.taupe {background:#999868;}
 .note.taupe:before {border-color:#fff #fff #BDBB8B #BDBB8B; background:#BDBB8B;}
 .note.saved {background: #eeeeee;}
 .note.saved:before {border-color:#fff #fff transparent transparent; background:transparent;}
 /* Button Stylings */
 .button {
     padding: 5px 10px;
     display: inline;
     background: #777 url(../images/button.png) repeat-x bottom;
     border: none;
     color: #fff!important; /* kill a styling */
     text-decoration: none!important; /* kill a styling */
     cursor: pointer;
     font-weight: bold;
     border-radius: 5px;
     -moz-border-radius: 5px;
     -webkit-border-radius: 5px;
     text-shadow: 1px 1px #666;
+    }
 .button:hover {
     background-position: 0 -48px;
+    }
 .button:active {
     background-position: 0 top;
     position: relative;
     top: 1px;
     padding: 6px 10px 4px;
+    }
 .button.red { background-color: #e50000; }
 .button.purple { background-color: #9400bf; }
 .button.green { background-color: #58aa00; }
 .button.olive { background-color: #309C47 }
 .button.orange { background-color: #ff9c00; }
 .button.blue { background-color: #2c6da0; }
 .button.black { background-color: #333; }
 .button.white { background-color: #fff; color: #000!important; text-shadow: 1px 1px #fff; }
 .button.small { font-size: 75%; padding: 3px 7px; }
 .button.small:hover { background-position: 0 -50px; }
 .button.small:active { padding: 4px 7px 2px; background-position: 0 top; }
 .button.large { font-size: 125%; padding: 7px 12px; }
 .button.large:hover { background-position: 0 -35px; }
 .button.large:active { padding: 8px 12px 6px; background-position: 0 top; }

styles/ie.css

➞

Show inline comments

@@ new file 100644 @@
 #content {
   border: 1px solid #999;
+}

0 comments (0 inline, 0 general)