4 files changed, 70 insertions, 23 deletions
diff --git a/slideshows/default/events.js b/slideshows/default/events.js
index 0246330..d64593f 100644
--- a/slideshows/default/events.js
+++ b/slideshows/default/events.js
@@ -1,5 +1,5 @@
 { "type": "ical",
 	"url": "https://sublab.org:5232/calendars/events",
 	"before": 0,
-	"after":  44640
+	"after":  22320
 }
diff --git a/slideshows/default/template.html b/slideshows/default/template.html
index 08c2d9f..a5fd4a6 100644
--- a/slideshows/default/template.html
+++ b/slideshows/default/template.html
@@ -4,20 +4,20 @@
 	<link href="/default/template/styles.css" rel="stylesheet" type="text/css">
 	<script src="/default/template/right.js"></script>
 	<script src="/default/template/billboard.js" type="text/javascript"></script>
+	<script src="http://code.jquery.com/jquery-latest.js"></script>
+	<script src="http://code.jquery.com/ui/jquery-ui-git.js"></script>
+	<script src="/default/template/events.js" type="text/javascript"></script>
 </head>
 <body>
 <div class="frame">
-	<div class="info">
-		<ul>
-			$EVENTS
-		</ul>
-	</div>
-
 	<div class="content">
 	<ul class="rui-billboard" data-billboard='{autostart: true, showButtons: false}'>
 		$IMAGES
 	</ul>
 	</div>
+	<div class="events">
+		$EVENTS
+	</div>
 </div>
 </body>
 </html>
diff --git a/slideshows/default/template/events.js b/slideshows/default/template/events.js
new file mode 100644
index 0000000..a6202ff
--- /dev/null
+++ b/slideshows/default/template/events.js
@@ -0,0 +1,12 @@
+$(document).ready(function(){
+
+	var tot=$('.event').length;
+	
+	var screenWidth = $('.events').width();
+
+	var bord = $('.event').outerWidth() - $('.event').innerWidth();
+	var padd = $('.event').innerWidth() - $('.event').width();
+	var marg = $('.event').outerWidth(true) - $('.event').outerWidth();
+	$('.event').width((screenWidth-(tot * (bord+padd+marg)))/tot);
+
+});
diff --git a/slideshows/default/template/styles.css b/slideshows/default/template/styles.css
index c02d4b7..f16b536 100644
--- a/slideshows/default/template/styles.css
+++ b/slideshows/default/template/styles.css
@@ -1,33 +1,22 @@
 body{
+	color:#555555;
+	font-size:0.825em;
 	background-color:#000;
+	font-family:Arial, Helvetica, sans-serif;
 }
 
-div.frame	{
+div.frame {
 	margin-left: auto;
 	margin-right: auto;
 	min-width: 700px;
-	max-width: 1500px;
+	max-width: 1200px;
 }
 
 div.content {
 	padding: 20px;
-	margin-right: 285px;
 	min-height: 120px;
 }
 
-div.info{
-	color: #fff;
-	margin-top: 20px;
-        padding: 20px;
-	margin-right: 20px;
-        width: 215px;
-	float: right;
-	border: 3px solid #CFCEBD;
-	border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
-
 div.slide_desc {
 	position: absolute;
 	top: 80%;
@@ -57,3 +46,49 @@ ul.rui-billboard li img {
 	width: 100%;
 	display: block;
 }
+
+div.events {
+	padding-left: 20px;
+	padding-right: 20px;
+}
+
+.event{
+	float:left;
+	padding:4px;
+	text-align:left;
+	margin:0px 5px 50px;
+}
+
+ul.eventList { 
+	margin-left:0px; 
+	padding-left:0px; 
+	list-style-type:square;
+}
+
+.eventList li{
+	background:#F4F4F4;
+	border:1px solid #EEEEEE;
+	list-style:none;
+	margin:5px;
+	padding:4px;
+	-moz-border-radius:4px;
+	-webkit-border-radius:4px;
+	border-radius:4px;
+}
+
+.eventDate{
+	font-size:1.5em;
+	margin:-5px -5px 10px;
+	padding:2px 5px;
+	text-align:center;
+	border: 3px solid #CFCEBD;
+	border-radius: 3px;
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	background:#E6FFDF none repeat scroll 0 0;
+	color:#6EA85F;
+}
+
+.clear{
+	clear:both;
+}