# HG changeset patch
# User Ethan Zonca <ez@ethanzonca.com>
# Date 2011-03-29 21:33:54
# Node ID b15090282e58f967fc833c005ce3b3fc4a168281
# Parent  8f5f454f9dd40e784e11a92e418b0dde96782958
# Parent  6e6ed7aaca3b3406fdebeb02a21280b56bd3a1fd

Merge

diff --git a/school.d/umich.crawl.inc b/school.d/umich.crawl.inc
--- a/school.d/umich.crawl.inc
+++ b/school.d/umich.crawl.inc
@@ -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);
diff --git a/scripts/scheduleInput.js b/scripts/scheduleInput.js
--- a/scripts/scheduleInput.js
+++ b/scripts/scheduleInput.js
@@ -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;
 	});
 
 	//--------------------------------------------------
diff --git a/styles/general.css b/styles/general.css
--- a/styles/general.css
+++ b/styles/general.css
@@ -381,6 +381,11 @@ a:hover {
   font: normal bold 1.2em sans-serif;
 }
 
+.course-title-entry
+{
+    width: 80%;
+}
+
 .inPlace {
   color: #000;
   border: none;