4 files changed, 34 insertions, 52 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 08b51d2fa..6a64e7cc2 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -245,3 +245,19 @@ a.wall-item-name-link {
 	color: #FF0000;
 	font-size: 1em !important;
 }
+
+/* event item */
+
+.event-title h3 {
+	font-weight: bold;
+}
+
+.event-title,
+.event-end,
+.event-description {
+	padding-bottom: 10px;
+}
+
+.event-label {
+	font-weight: bold;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 2fde8fde9..357bb5093 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -857,41 +857,10 @@ nav .acpopup {
 	border-color: #ccc !important;
 }
 
-.eventcal {
-	float: left;
-	font-size: 20px;
-}
-
 #event-summary-text {
 	margin-top: 15px;
 }
 
-.event-wrapper {
-	width: 400px;
-	height: auto;
-	padding: 10px;
-}
-
-.vevent {
-	max-width: 100%; 
-	margin: 10px;
-	padding: 10px;
-	border: 1px solid #CCCCCC;
-}
-
-.vevent .event-summary {
-	margin: 10px;
-	font-weight: bold;
-}
-
-.vevent .event-description, .vevent .event-location {
-	margin-left: 10px;
-	margin-right: 10px;
-}
-.vevent .event-start {
-	margin-left: 10px;
-	margin-right: 10px;
-}
 
 #new-event-link {
 	margin-bottom: 10px;
@@ -904,29 +873,13 @@ nav .acpopup {
 	margin-bottom: 15px;
 }
 
-.event-description:before {
-	content: url('../../../../images/calendar.png');
-	margin-right: 15px;
-}
-
-.event-start, .event-end {
-	margin-left: 10px;
-	width: 300px;
-	clear: both;
-}
-
 .event-owner img {
-	padding: 10px;
+	padding-bottom: 10px;
+	padding-right: 10px;
 }
 
 .event-buttons {
 	margin-top: 10px;
-	margin-left: 10px;
-}
-
-.event-start .dtstart, .event-end .dtend {
-	float: right;
-	margin-right: 10px;
 }
 
 .event-list-date {
diff --git a/view/tpl/event.tpl b/view/tpl/event.tpl
index c1793c3e7..3fc2063ef 100755
--- a/view/tpl/event.tpl
+++ b/view/tpl/event.tpl
@@ -2,7 +2,7 @@
 	<div class="event-wrapper">
 		<div class="event">
 			<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}}
+				{{if $event.item.author.xchan_name}}<a href="{{$event.item.author.xchan_url}}" ><img src="{{$event.item.author.xchan_photo_s}}">{{$event.item.author.xchan_name}}</a>{{/if}}
 			</div>
 			{{$event.html}}
 			<div class="event-buttons">
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index d193696b7..ec43d7ab7 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -97,7 +97,7 @@
 				}
 			}
 			
-		})
+		});
 		
 		// center on date
 		var args=location.href.replace(baseurl,"").split("/");
@@ -113,6 +113,20 @@
 		var view = $('#events-calendar').fullCalendar('getView');
 		$('#title').text(view.title);
 
+		// shift the finish time date on start time date change automagically
+		var origsval = $('#id_start_text').val();
+		$('#id_start_text').change(function() {
+			var origfval = $('#id_finish_text').val();
+			if(origfval) {
+				var sval = $('#id_start_text').val();
+				var diff = moment(sval).diff(origsval);
+				var fval = moment(origfval).add(diff, 'millisecond').format("YYYY-MM-DD HH:mm");
+				$('#id_finish_text').val(fval);
+				origsval = sval;
+			}
+		});
+
+		// ACL
 		$('#id_share').change(function() {
 
 			if ($('#id_share').is(':checked')) { 
@@ -123,7 +137,6 @@
 			}
 		}).trigger('change');
 
-
 		$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 			var selstr;
 			$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {