Merge https://github.com/friendica/friendica into pull

1 files changed, 71 insertions, 56 deletions

diff --git a/view/event_head.tpl b/view/event_head.tpl
index 97201e722..471748b97 100644
--- a/view/event_head.tpl
+++ b/view/event_head.tpl
@@ -3,8 +3,17 @@
           src="$baseurl/library/fullcalendar/fullcalendar.min.js"></script>
 
 <script>
+	function showEvent(eventid) {
+		$.get(
+			'$baseurl/events/?id='+eventid,
+			function(data){
+				$.fancybox(data);
+			}
+		);			
+	}
+	
 	$(document).ready(function() {
-	    $('#events-calendar').fullCalendar({
+		$('#events-calendar').fullCalendar({
 			events: '$baseurl/events/json/',
 			header: {
 				left: 'prev,next today',
@@ -13,12 +22,7 @@
 			},			
 			timeFormat: 'H(:mm)',
 			eventClick: function(calEvent, jsEvent, view) {
-				$.get(
-					'$baseurl/events/?id='+calEvent.id,
-					function(data){
-						$.fancybox(data);
-					}
-				);
+				showEvent(calEvent.id);
 			},
 			
 			eventRender: function(event, element, view) {
@@ -55,70 +59,81 @@
 			}
 			
 		})
+		
+		// center on date
+		var args=location.href.replace(baseurl,"").split("/");
+		if (args.length>=4) {
+			$("#events-calendar").fullCalendar('gotoDate',args[2] , args[3]-1);
+		} 
+		
+		// show event popup
+		var hash = location.hash.split("-")
+		if (hash.length==2 && hash[0]=="#link") showEvent(hash[1]);
+		
 	});
 </script>
 
 
 <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 : "textareas",
-	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;
-		});
-	}
+<script language="javascript" type="text/javascript">
+
+
+	tinyMCE.init({
+		theme : "advanced",
+		mode : "textareas",
+		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;
+			});
+		}
 
-});
+	});
 
 
-$(document).ready(function() { 
+	$(document).ready(function() { 
 
-	$('#event-share-checkbox').change(function() {
+		$('#event-share-checkbox').change(function() {
 
-		if ($('#event-share-checkbox').is(':checked')) { 
-			$('#acl-wrapper').show();
-		}
-		else {
-			$('#acl-wrapper').hide();
-		}
-	}).trigger('change');
+			if ($('#event-share-checkbox').is(':checked')) { 
+				$('#acl-wrapper').show();
+			}
+			else {
+				$('#acl-wrapper').hide();
+			}
+		}).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() {
-			selstr = $(this).text();
-			$('#jot-public').hide();
-		});
-		if(selstr == null) {
-			$('#jot-public').show();
-		}
+		$('#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() {
+				selstr = $(this).text();
+				$('#jot-public').hide();
+			});
+			if(selstr == null) {
+				$('#jot-public').show();
+			}
 
-	}).trigger('change');
+		}).trigger('change');
 
-});
+	});
 
 </script>