more event display formatting

4 files changed, 24 insertions, 11 deletions

diff --git a/version.inc b/version.inc
index b8709271f..17865e58f 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-07-06.728
+2014-07-07.729
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 99c11c8be..26bb4ef92 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -934,15 +934,16 @@ aside li {
 	margin-bottom: 10px;
 }
 
-#event-summary {
-	min-width: 400px;
-}
-
 .event-wrapper {
-	padding: 25px;
+	width: 400px;
+	height: auto;
+	padding: 10px;
 }
 
 .vevent {
+	max-width: 100%; 
+	margin-left: 10px;
+	margin-right: 10px;
 	border: 1px solid #CCCCCC;
 }
 
@@ -979,10 +980,19 @@ aside li {
 
 .event-start, .event-end {
 	margin-left: 10px;
-	width: 330px;
+	width: 300px;
 	clear: both;
 }
 
+.event-owner img {
+	padding: 10px;
+}
+
+.event-buttons {
+	margin-top: 10px;
+	margin-left: 10px;
+}
+
 .event-start .dtstart, .event-end .dtend {
 	float: right;
 }
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
index c6e36c3cb..f0e00bd2c 100755
--- a/view/tpl/event.tpl
+++ b/view/tpl/event.tpl
@@ -1,12 +1,15 @@
 {{foreach $events as $event}}
-	<div class="event-wrapper" style="padding: 25px;">
+	<div class="event-wrapper">
 	<div class="event">
-	
-	{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="32" width="32" />{{$event.item.author.xchan_name}}</a>{{/if}}
+	<div class="event-owner">
+	{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}" height="64" width="64" />{{$event.item.author.xchan_name}}</a>{{/if}}
+	</div>
 	{{$event.html}}
+	<div class="event-buttons">
 	{{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}"  class="plink-event-link"><i class="icon-external-link btn btn-default" ></i></a>{{/if}}
 	{{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link"><i class="icon-pencil btn btn-default"></i></a>{{/if}}
 	</div>
+	</div>
 	<div class="clear"></div>
 	</div>
 {{/foreach}}
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index ae80d930a..8388187d1 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -7,7 +7,7 @@
 		$.get(
 			'{{$baseurl}}/events/?id='+eventid,
 			function(data){
-				$.colorbox({ maxWidth: "50%", maxHeight: "75%", html: data });
+				$.colorbox({ html: data });
 			}
 		);			
 	}