SlatePermutate Changeset - b15090282e58 · protofusion repositories

Changeset - b15090282e58

Parent rev.

Child rev.

[Not reviewed]

Merge default

0 3 0

Ethan Zonca - 15 years ago 2011-03-29 21:33:54
ez@ethanzonca.com

Merge

3 files changed with 21 insertions and 6 deletions:

school.d/umich.crawl.inc

scripts/scheduleInput.js

styles/general.css

0 comments (0 inline, 0 general)

school.d/umich.crawl.inc

➞

Show inline comments

@@ @@ -274,7 +274,7 @@ function umich_crawl_time($raw, $xm = FA @@
 	$xm = 'A';
+    }
   if (!strcmp($xm, 'P'))
+  if (!strcmp($xm, 'P') && $h < 12)
     $h += 12;
   return sprintf('%02d%02d', $h, $m);

scripts/scheduleInput.js

➞

Show inline comments

@@ @@ -452,14 +452,15 @@ function prettyTime(time_str) @@
     var m;
     i_hour = time_str.substr(0, 2) * 1;
-    if (i_hour <= 12)
     if (i_hour < 12)
+	{
 	    m = 'a';
+	}
     else
+	{
 	    m = 'p';
 	    i_hour -= 12;
 	    if (i_hour > 12)
 		i_hour -= 12;
+	}
     hour_str = new String(i_hour);
     /* uncomment to have 08:01 instead of 8:01 */
@@ @@ -480,9 +481,18 @@ jQuery(document).ready(function() { @@
 	// Deletes the selected class from input
 	//--------------------------------------------------
 	jQuery('.deleteClass').live('click', function() {
 		if(confirm('Delete class and all sections of this class?')) {
 		    course_remove(jQuery(this).parent().parent().data('course_i'));
+		}
 	    /* The user is not allowed to interactively delete the one empty course */
 	    var course_i = jQuery(this).parent().parent().data('course_i');
 	    if (slate_permutate_course_free == course_i)
 		return false;
 	    if(confirm('Delete class and all sections of this class?')) {
 		/* The one empty course may have became this course in that time */
 		if (slate_permutate_course_free == course_i)
 		    return false;
 		course_remove(course_i);
 		return false;
+	    }
 	    return false;
 	});
 	//--------------------------------------------------

styles/general.css

➞

Show inline comments

@@ @@ -381,6 +381,11 @@ a:hover { @@
   font: normal bold 1.2em sans-serif;
+}
 .course-title-entry
+{
     width: 80%;
+}
 .inPlace {
   color: #000;
   border: none;

0 comments (0 inline, 0 general)