Mercurial > hg > lukkari

changeset 79:7dd647a01fb6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Implement indicator for "next" class.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 24 Oct 2012 08:25:12 +0300
parents 2f9c78c68a2c
children 4faf9956741b
files index.php luk1.css luk2.css luk3.css luk4.css
diffstat 5 files changed, 31 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/index.php	Wed Oct 24 07:52:03 2012 +0300
+++ b/index.php	Wed Oct 24 08:25:12 2012 +0300
@@ -351,6 +351,10 @@
   $currStamp = time();
   $currTime = $currStamp - mktime(0, 0, 0);
   $currDay = lukGetWeekdayFromTimestamp($currStamp);
+
+  $nextStamp = $currStamp + 30 * 60;
+  $nextTime = $nextStamp - mktime(0, 0, 0);
+  $nextDay = lukGetWeekdayFromTimestamp($nextStamp);
   
   // Create the timetable table
   $out =
@@ -380,12 +384,18 @@
         {
           $class["set"] = TRUE;
 
-          $isActive = $day == $currDay &&
+          $nextActive = $day == $nextDay && 
+                      $nextTime >= $classHourTimes[$class["start"]]["start"] &&
+                      $nextTime <  $classHourTimes[$class["start"] + $class["hours"] - 1]["end"];
+
+          $isActive = $day == $currDay && 
                       $currTime >= $classHourTimes[$class["start"]]["start"] &&
                       $currTime <  $classHourTimes[$class["start"] + $class["hours"] - 1]["end"];
 
-          $out .= "  <td rowspan=\"".$class["hours"].
-          "\" class=\"".($isActive ? "clactive " : "").($class["grouped"] ? "clgrouped" : "clnormal")."\">".
+          $out .= "  <td rowspan=\"".$class["hours"]."\" class=\"".
+          ($isActive ? "clactive " : "").
+          (!$isActive && $nextActive ? "clnext " : "").
+          ($class["grouped"] ? "clgrouped" : "clnormal")."\">".
           lukGetClassInfo($class["grouped"], $class["data"]).
           "<div class=\"nhours\"><span>".$class["hours"]."h</span></div></td>\n";
         }
--- a/luk1.css	Wed Oct 24 07:52:03 2012 +0300
+++ b/luk1.css	Wed Oct 24 08:25:12 2012 +0300
@@ -153,7 +153,11 @@
 }
 
 td.clactive {
-	border: 1px solid white;
+	border: 1px solid rgb(60,174,193);
+}
+
+td.clnext {
+	border: 1px dashed rgb(30,144,163);
 }
 
 div.nhours {
--- a/luk2.css	Wed Oct 24 07:52:03 2012 +0300
+++ b/luk2.css	Wed Oct 24 08:25:12 2012 +0300
@@ -134,6 +134,9 @@
 	border: 1px solid white;
 }
 
+td.clnext {
+	border: 1px dashed yellow;
+}
 
 div.nhours {
 	text-align: right;
--- a/luk3.css	Wed Oct 24 07:52:03 2012 +0300
+++ b/luk3.css	Wed Oct 24 08:25:12 2012 +0300
@@ -152,7 +152,11 @@
 }
 
 td.clactive {
-	border: 1px solid white;
+	box-shadow: 0px 0px 3px rgb(255,255,255);
+}
+
+td.clnext {
+	box-shadow: 0px 0px 1px rgba(255,255,255,0.7);
 }
 
 div.nhours {
--- a/luk4.css	Wed Oct 24 07:52:03 2012 +0300
+++ b/luk4.css	Wed Oct 24 08:25:12 2012 +0300
@@ -153,7 +153,11 @@
 }
 
 td.clactive {
-	border: 1px solid white;
+	box-shadow: 0px 0px 4px rgb(255,255,255);
+}
+
+td.clnext {
+	box-shadow: 0px 0px 2px rgba(255,255,255,0.7);
 }
 
 div.nhours {