Merge remote-tracking branch 'upstream/master'

include/widgets.php

@@ -671,7 +671,6 @@ function widget_eventsmenu($arr) {
 		'$day' => t('Day View'),
 		'$week' => t('Week View'),
 		'$month' => t('Month View'),
-		'$today' => t('Today'),
 		'$export' => t('Export'),
 		'$upload' => t('Import'),
 		'$submit' => t('Submit')

mod/events.php

@@ -530,7 +530,8 @@ function events_content(&$a) {
 			'$upload'   => t('Import'),
 			'$submit'   => t('Submit'),
 			'$prev'	    => t('Previous'),
-			'$next'     => t('Next'),			
+			'$next'     => t('Next'),
+			'$today'    => t('Today')
 		));
 		
 		if (x($_GET,'id')){ echo $o; killme(); }

view/css/mod_events.css

@@ -1,3 +1,9 @@
+/* fix borders */
+#events-calendar {
+	margin-left: -1px;
+	margin-bottom: -1px;
+}
+
 #event-desc-textarea, #event-location-textarea {
     width: 400px;
 }

view/theme/redbasic/css/style.css

@@ -847,6 +847,16 @@ nav .acpopup {
   cursor: pointer;
 }
 
+.fc-unthemed th,
+.fc-unthemed td,
+.fc-unthemed thead,
+.fc-unthemed tbody,
+.fc-unthemed .fc-divider,
+.fc-unthemed .fc-row,
+.fc-unthemed .fc-popover {
+	border-color: #ccc !important;
+}
+
 .eventcal {
 	float: left;
 	font-size: 20px;

view/tpl/events-js.tpl

@@ -6,6 +6,7 @@
 
 			<div class="btn-group">
 				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
+				<button class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>
 				<button class="btn btn-default btn-xs" onclick="changeView('next', false);" title="{{$next}}"><i class="icon-forward"></i></button>
 			</div>
 		</div>

view/tpl/events_side.tpl

@@ -4,6 +4,5 @@
 		<li><a href="#" onclick="changeView('changeView', 'month'); return false;">{{$month}}</a></li>
 		<li><a href="#" onclick="changeView('changeView', 'agendaWeek'); return false;">{{$week}}</a></li>
 		<li><a href="#" onclick="changeView('changeView', 'agendaDay'); return false;">{{$day}}</a></li>
-		<li><a href="#" onclick="changeView('today', false); return false;">{{$today}}</a></li>
 	</ul>
 </div>