3 files changed, 68 insertions, 82 deletions
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index fd0ef0d9b..5d87caa7c 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -1,6 +1,7 @@
 <link rel='stylesheet' type='text/css' href='{{$baseurl}}/library/fullcalendar/fullcalendar.css' />
-<script language="javascript" type="text/javascript"
-          src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/moment/min/moment.min.js"></script>
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/fullcalendar.min.js"></script>
+<script language="javascript" type="text/javascript" src="{{$baseurl}}/library/fullcalendar/lang-all.js"></script>
 
 <script>
 	function showEvent(eventid) {
@@ -20,31 +21,34 @@
 		$('#event-edit-preview').val(0);
 	}
 
+	function exportDate() {
+		var moment = $('#events-calendar').fullCalendar('getDate');
+		var sT = 'events/' + moment.year() + '/' + (moment.month() + 1) + '/export';
+		window.location.href=sT;
+	}
+	
+	function changeView(action, viewName) {
+		$('#events-calendar').fullCalendar(action, viewName);
+		var view = $('#events-calendar').fullCalendar('getView');
+		$('#title').text(view.title);
+	}
+
 
 	$(document).ready(function() {
 		$('#events-calendar').fullCalendar({
-			events: '{{$baseurl}}/events/json/',
-			header: {
-				left: 'prev,next today',
-				center: 'title',
-				right: 'month,agendaWeek,agendaDay'
-			},			
+			events: '{{$baseurl}}/events/json',
+			header: false,
+			//lang: 'de',	
+			eventLimit: 3,
+			height: 'auto',
+
 			monthNames: aStr['monthNames'],
 			monthNamesShort: aStr['monthNamesShort'],
 			dayNames: aStr['dayNames'],
 			dayNamesShort: aStr['dayNamesShort'],
-			buttonText: { 
-				prev: "<span class='fc-text-arrow'>&lsaquo;</span>",
-				next: "<span class='fc-text-arrow'>&rsaquo;</span>",
-				prevYear: "<span class='fc-text-arrow'>&laquo;</span>",
-				nextYear: "<span class='fc-text-arrow'>&raquo;</span>",
-				today: aStr['today'],
-				month: aStr['month'],
-				week: aStr['week'],
-				day: aStr['day']
-			},
+
 			allDayText: aStr['allday'],
-			timeFormat: 'H(:mm)',
+			timeFormat: 'HH:mm',
 			eventClick: function(calEvent, jsEvent, view) {
 				showEvent(calEvent.id);
 			},
@@ -100,46 +104,17 @@
 		var hash = location.hash.split("-")
 		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
 		
-	});
-</script>
+		// echo the title
+		var view = $('#events-calendar').fullCalendar('getView');
+		$('#title').text(view.title);
+
 
-{{if $editselect != 'none'}}
-<script language="javascript" type="text/javascript"
-          src="{{$baseurl}}/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
-<script language="javascript" type="text/javascript">
-
-
-	tinyMCE.init({
-		theme : "advanced",
-		mode : "{{$editselect}}",
-		plugins : "bbcode,paste",
-		theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
-		theme_advanced_buttons2 : "",
-		theme_advanced_buttons3 : "",
-		theme_advanced_toolbar_location : "top",
-		theme_advanced_toolbar_align : "center",
-		theme_advanced_blockformats : "blockquote,code",
-		gecko_spellcheck : true,
-		paste_text_sticky : true,
-		entity_encoding : "raw",
-		add_unload_trigger : false,
-		remove_linebreaks : false,
-		force_p_newlines : false,
-		force_br_newlines : true,
-		forced_root_block : '',
-		content_css: "{{$baseurl}}/view/custom_tinymce.css",
-		theme_advanced_path : false,
-		setup : function(ed) {
-			ed.onInit.add(function(ed) {
-				ed.pasteAsPlainText = true;
-			});
-		}
 
 	});
-	{{else}}
-	<script language="javascript" type="text/javascript">
-	{{/if}}
+</script>
+
 
+<script>
 	$(document).ready(function() { 
 
 		$('#id_share').change(function() {
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index bb6ca63a4..03c6a5fb6 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,30 +1,32 @@
-{{$tabs}}
-<div class="generic-content-wrapper-styled">
-<h2>{{$title}}</h2>
+<div class="generic-content-wrapper">
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<button class="btn btn-default btn-xs" onclick="openClose('event-tools');"><i class="icon-cog"></i></button>
+			<button class="btn btn-success btn-xs" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button>
 
-<div class="pull-right">
-<button class="btn btn-xs" onclick="window.location.href='{{$new_event.0}}'; return false;" >{{$new_event.1}}</button>&nbsp;<button class="btn btn-xs" onclick="exportDate(); return false;" ><i class="icon-download"></i>&nbsp;{{$export.1}}</button>&nbsp;<button class="btn btn-xs" onclick="openClose('event-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
-</div>
-
-<div id="event-upload-form" style="display:none;">
-    <div class="section-content-tools-wrapper">
-        <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
-            <div class="form-group">
-                <input id="event-upload-choose" type="file" name="userfile" />
-            </div>
-            <button id="dbtn-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >{{$submit}}</button>
-		</form>
-    </div>
-</div>
+			<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('next', false);" title="{{$next}}"><i class="icon-forward"></i></button>
+			</div>
+		</div>
+		<h2 id="title"></h2>
+		<div class="clear"></div>
+	</div>
+	<div id="event-tools" class="section-content-tools-wrapper" style="display:none;">
+		<div class="form-group">
+			<button class="btn btn-primary btn-xs" onclick="exportDate(); return false;"><i class="icon-download"></i>&nbsp;{{$export.1}}</button>
+			<button class="btn btn-primary btn-xs" onclick="openClose('event-upload-form');"><i class="icon-upload"></i>&nbsp;{{$upload}}</button>
+		</div>
+		<div id="event-upload-form" style="display:none;">
+			<form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form">
+				<button id="dbtn-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" >{{$submit}}</button>
+				<input id="event-upload-choose" type="file" name="userfile" />
 
-<script>
-function exportDate() {
-    var moment = $('#events-calendar').fullCalendar('getDate');
-	var sT = 'events/' + moment.getFullYear() + '/' + (moment.getMonth() + 1) + '/export';
-    window.location.href=sT;
-}
-</script>
-<div class="clear"></div>
-<br />
-<div id="events-calendar"></div>
+			</form>
+		</div>
+	</div>
+	<div class="clear"></div>
+	<div class="section-content-wrapper-np">
+		<div id="events-calendar"></div>
+	</div>
 </div>
diff --git a/view/tpl/events_side.tpl b/view/tpl/events_side.tpl
new file mode 100755
index 000000000..4659063c3
--- /dev/null
+++ b/view/tpl/events_side.tpl
@@ -0,0 +1,9 @@
+<div class="widget">
+	<h3>{{$title}}</h3>
+	<ul class="nav nav-pills nav-stacked">
+		<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>