[CalendarServer-changes] [13513] CalendarServer/trunk/contrib/webpoll/webapp/js/webpoll.js

[source_changes at macosforge.org]

Revision: 13513
          http://trac.calendarserver.org//changeset/13513
Author:   cdaboo at apple.com
Date:     2014-05-20 06:52:55 -0700 (Tue, 20 May 2014)
Log Message:
-----------
UI fixes.

Modified Paths:
--------------
    CalendarServer/trunk/contrib/webpoll/webapp/js/webpoll.js

Modified: CalendarServer/trunk/contrib/webpoll/webapp/js/webpoll.js
===================================================================
--- CalendarServer/trunk/contrib/webpoll/webapp/js/webpoll.js	2014-05-20 03:39:30 UTC (rev 13512)
+++ CalendarServer/trunk/contrib/webpoll/webapp/js/webpoll.js	2014-05-20 13:52:55 UTC (rev 13513)
@@ -877,7 +877,7 @@
 	
 	var grid = $('<table id="hover-grid" />').appendTo(dialog_div);
 	for(var i = startHour; i < endHour; i++) {
-		var text = i > 12 ? i - 12 +":00 pm" : i + ":00 am";
+		var text = i > 12 ? i - 12 +":00 pm" : i + (i == 12 ? ":00 pm" : ":00 am");
 		$('<tr><td class="hover-grid-td-time">' + text + '</td><td class="hover-grid-td-slot" /></tr>').appendTo(grid);
 	}
 	gSession.currentPrincipal.eventsForTimeRange(
@@ -900,7 +900,7 @@
 					styles += ";left:206px;width:125px";
 				}
 				last_dtend = result.dtend();
-				$('<div class="hover-event ui-corner-all" style="' + styles + '" />').appendTo(grid).addClass(result.pollitemid() !== null ? "ui-state-active" : "ui-state-default").text(result.summary());
+				$('<div class="hover-event ui-corner-all" style="' + styles + '" />').appendTo(grid).addClass(result.pollitemid() !== null ? "ui-state-focus" : "ui-state-default").text(result.summary());
 			});
 		}
 	);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140520/61d6a3b3/attachment.html>