Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

1 files changed, 260 insertions, 266 deletions

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 33bb3c449..226d785f5 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -105,27 +105,27 @@
 
 
 <script>
-		window.wiki_resource_id = '{{$resource_id}}';
-		window.wiki_page_name = '{{$page}}';
-		window.wiki_page_content = {{if !$mimeType || $mimeType == 'text/markdown'}}{{$content}}{{else}}`{{$content}}`{{/if}};
-		window.wiki_page_commit = '{{$commit}}';
-
-		$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-		$("#generic-modal-ok-{{$wikiModalID}}").addClass('btn-danger');
-
-		$('.rename-page').click(function (ev) {
-			$('#rename-page-form-wrapper').toggle();
-			ev.preventDefault();
-		});
-
-		$( "#rename-page-form" ).submit(function( event ) {
-			$.post("wiki/{{$channel}}/rename/page", 
-			{
-				oldName: window.wiki_page_name, 
-				newName: $('#id_pageRename').val(), 
-				resource_id: window.wiki_resource_id
-			}, 
-			function (data) {
+	window.wiki_resource_id = '{{$resource_id}}';
+	window.wiki_page_name = '{{$page}}';
+	window.wiki_page_content = {{if !$mimeType || $mimeType == 'text/markdown'}}{{$content}}{{else}}`{{$content}}`{{/if}};
+	window.wiki_page_commit = '{{$commit}}';
+
+	$("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
+	$("#generic-modal-ok-{{$wikiModalID}}").addClass('btn-danger');
+
+	$('.rename-page').click(function (ev) {
+		$('#rename-page-form-wrapper').toggle();
+		ev.preventDefault();
+	});
+
+	$( "#rename-page-form" ).submit(function( event ) {
+		$.post("wiki/{{$channel}}/rename/page", 
+		{
+			oldName: window.wiki_page_name, 
+			newName: $('#id_pageRename').val(), 
+			resource_id: window.wiki_resource_id
+		}, 
+		function (data) {
 			if (data.success) {
 				$('#rename-page-form-wrapper').hide();
 				window.console.log('data: ' + JSON.stringify(data));
@@ -135,181 +135,178 @@
 			} else {
 				window.console.log('Error renaming page.');
 			}
-			}, 'json');    
-			event.preventDefault();
-		});
+		}, 'json');    
+		event.preventDefault();
+	});
 
-		{{if !$mimeType || $mimeType == 'text/markdown'}}
-		var editor = ace.edit("ace-editor");
-		editor.setOptions({
-			theme: "ace/theme/github",
-			mode: "ace/mode/markdown",
+	{{if !$mimeType || $mimeType == 'text/markdown'}}
+	var editor = ace.edit("ace-editor");
+	editor.setOptions({
+		theme: "ace/theme/github",
+		mode: "ace/mode/markdown",
 
-			wrap: true,
+		wrap: true,
 
-			minLines: 30,
-			maxLines: Infinity,
+		minLines: 30,
+		maxLines: Infinity,
 
-			printMargin: false
-		});
-
-		editor.getSession().setValue(window.wiki_page_content);
-		window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
+		printMargin: false
+	});
 
+	editor.getSession().setValue(window.wiki_page_content);
+	window.editor = editor; // Store the editor in the window object so the anonymous function can use it.
+	{{else}}
+	window.editor = editor = $('#editor');
+	{{/if}}
 
+	{{if !$showPageControls}}
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		editor.setReadOnly(true); // Disable editing if the viewer lacks edit permission
 		{{else}}
-		window.editor = editor = $('#editor');
+		editor.prop('readonly', true);
 		{{/if}}
+	{{/if}}
 
-		{{if !$showPageControls}}
+	$('#edit-pane-tab').click(function (ev) {
+		setTimeout(function() {window.editor.focus();}, 500); // Return the focus to the editor allowing immediate text entry
+			$('#page-tools').show();
+	});
+
+	$('#wiki-get-preview').click(function (ev) {
+		$.post("wiki/{{$channel}}/preview", {
 			{{if !$mimeType || $mimeType == 'text/markdown'}}
-			editor.setReadOnly(true); // Disable editing if the viewer lacks edit permission
+			content: editor.getValue(),
 			{{else}}
-			editor.prop('readonly', true);
+			content: editor.val(),
 			{{/if}}
-		{{/if}}
-
-		$('#edit-pane-tab').click(function (ev) {
-			setTimeout(function() {window.editor.focus();}, 500); // Return the focus to the editor allowing immediate text entry
-			$('#page-tools').show();
-		});
+			resource_id: window.wiki_resource_id
+		},
+		function (data) {
+		if (data.success) {
+			$('#wiki-preview').html(data.html);
+			$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
+			$('#page-tools').hide();
+		} else {
+			window.console.log('Error previewing page.');
+		}
+		}, 'json');
+		ev.preventDefault();
+	});
 
-		$('#wiki-get-preview').click(function (ev) {
-			$.post("wiki/{{$channel}}/preview", {
-				{{if !$mimeType || $mimeType == 'text/markdown'}}
-				content: editor.getValue(),
-				{{else}}
-				content: editor.val(),
-				{{/if}}
-				resource_id: window.wiki_resource_id
-			},
-			function (data) {
+	$('#wiki-get-history').click(function (ev) {
+		$.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
 			if (data.success) {
-				$('#wiki-preview').html(data.html);
-				$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
+				$('#page-history-list').html(data.historyHTML);
 				$('#page-tools').hide();
 			} else {
-				window.console.log('Error previewing page.');
+				window.console.log('Error getting page history.');
 			}
 			}, 'json');
 			ev.preventDefault();
 		});
 
-		$('#wiki-get-history').click(function (ev) {
-			$.post("wiki/{{$channel}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
+	function wiki_refresh_page_list() {
+		if (window.wiki_resource_id === '') {
+			return false;
+		}
+		$.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) {
 			if (data.success) {
-				$('#page-history-list').html(data.historyHTML);
-				$('#page-tools').hide();
+				$('#wiki_page_list_container').html(data.pages);
+				$('#wiki_page_list_container').show();
+				{{if $showNewPageButton}}
+					$('#new-page-button').show();
+				{{else}}
+					$('#new-page-button').hide();
+				{{/if}}
 			} else {
-				window.console.log('Error getting page history.');
+				alert('Error fetching page list!');
+				window.console.log('Error fetching page list!');
 			}
-			}, 'json');
-			ev.preventDefault();
-		});
+		}, 'json');
+		return false;
+	}
 
-		function wiki_refresh_page_list() {
-			if (window.wiki_resource_id === '') {
-				return false;
-			}
-			$.post("wiki/{{$channel}}/get/page/list/", {resource_id: window.wiki_resource_id}, function (data) {
-				if (data.success) {
-						$('#wiki_page_list_container').html(data.pages);
-						$('#wiki_page_list_container').show();
-						{{if $showNewPageButton}}
-								$('#new-page-button').show();
-						{{else}}
-								$('#new-page-button').hide();
-						{{/if}}
-				} else {
-					alert('Error fetching page list!');
-					window.console.log('Error fetching page list!');
-				}
-			}, 'json');
+	$('#save-page').click(function (ev) {
+		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
+			window.console.log('You must have a wiki page open in order to edit pages.');
+			ev.preventDefault();
 			return false;
 		}
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		var currentContent = editor.getValue();
+		{{else}}
+		var currentContent = editor.val();
+		{{/if}}
 
-		$('#save-page').click(function (ev) {
-                        if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
-                            window.console.log('You must have a wiki page open in order to edit pages.');
-                            ev.preventDefault();
-                            return false;
-                        }
-			{{if !$mimeType || $mimeType == 'text/markdown'}}
-			var currentContent = editor.getValue();
-			{{else}}
-			var currentContent = editor.val();
-			{{/if}}
-
-                        if (window.wiki_page_content === currentContent) {
-                            window.console.log('No edits to save.');
-                            ev.preventDefault();
-                            return false;
-                        }
-                        $.post("wiki/{{$channel}}/save/page", 
-                        { content: currentContent, 
-                            commitMsg: $('#id_commitMsg').val(),
-                            name: window.wiki_page_name, 
-                            resource_id: window.wiki_resource_id
-                        }, 
-                        function (data) {
-                            if (data.success) {
-                                window.console.log('Page saved successfully.');
-                                window.wiki_page_content = currentContent;
-                                $('#id_commitMsg').val(''); // Clear the commit message box
+		if (window.wiki_page_content === currentContent) {
+			window.console.log('No edits to save.');
+			ev.preventDefault();
+			return false;
+		}
+		$.post("wiki/{{$channel}}/save/page", {
+			content: currentContent, 
+			commitMsg: $('#id_commitMsg').val(),
+			name: window.wiki_page_name, 
+			resource_id: window.wiki_resource_id
+		}, 
+		function (data) {
+			if (data.success) {
+				window.console.log('Page saved successfully.');
+				window.wiki_page_content = currentContent;
+				$('#id_commitMsg').val(''); // Clear the commit message box
 
 				{{if !$mimeType || $mimeType == 'text/markdown'}}
-                                $('#save-page').addClass('disabled');  // Disable the save button
-                                window.editor.getSession().getUndoManager().markClean();  // Reset the undo history for the editor
+				$('#save-page').addClass('disabled');  // Disable the save button
+				window.editor.getSession().getUndoManager().markClean();  // Reset the undo history for the editor
 				{{/if}}
 
-                                window.editor.focus();  // Return focus to the editor for continued editing
-                                // $('#wiki-get-history').click();
-                            } else {
-                                alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups 
-                                window.console.log('Error saving page.');
-                            }
-                        }, 'json');
-                        ev.preventDefault();
-		});
+				window.editor.focus();  // Return focus to the editor for continued editing
+				// $('#wiki-get-history').click();
+			} else {
+				alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups 
+				window.console.log('Error saving page.');
+			}
+		}, 'json');
+		ev.preventDefault();
+	});
 
-		function wiki_revert_page(commitHash) {
-			if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
+	function wiki_revert_page(commitHash) {
+		if (window.wiki_resource_id === '' || window.wiki_page_name === '') {
 			window.console.log('You must have a wiki page open in order to revert pages.');
 			return false;
-			}
-			$.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
-			function (data) {
-				if (data.success) {
-				$('button[id^=revert-]').removeClass('btn-success');
-				$('button[id^=revert-]').addClass('btn-danger');
-				$('button[id^=revert-]').html('Revert');
-				$('#revert-'+commitHash).removeClass('btn-danger');
-				$('#revert-'+commitHash).addClass('btn-success');
-				$('#revert-'+commitHash).html('Page reverted<br>but not saved');
-				window.wiki_page_commit = commitHash;
-				// put contents in editor
-				editor.getSession().setValue(data.content);
-				} else {
-				window.console.log('Error reverting page.');
-				}
-			}, 'json');
 		}
+		$.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, 
+		function (data) {
+			if (data.success) {
+			$('button[id^=revert-]').removeClass('btn-success');
+			$('button[id^=revert-]').addClass('btn-danger');
+			$('button[id^=revert-]').html('Revert');
+			$('#revert-'+commitHash).removeClass('btn-danger');
+			$('#revert-'+commitHash).addClass('btn-success');
+			$('#revert-'+commitHash).html('Page reverted<br>but not saved');
+			window.wiki_page_commit = commitHash;
+			// put contents in editor
+			editor.getSession().setValue(data.content);
+			} else {
+			window.console.log('Error reverting page.');
+			}
+		}, 'json');
+	}
 
-		function wiki_compare_page(compareCommit) {
-			if (window.wiki_resource_id === '' || window.wiki_page_name === '' || window.wiki_page_commit === '') {
+	function wiki_compare_page(compareCommit) {
+		if (window.wiki_resource_id === '' || window.wiki_page_name === '' || window.wiki_page_commit === '') {
 			window.console.log('You must have a wiki page open in order to revert pages.');
 			return false;
-			}
-			$.post("wiki/{{$channel}}/compare/page", 
-			{
-				compareCommit: compareCommit, 
-				currentCommit: window.wiki_page_commit, 
-				name: window.wiki_page_name, 
-				resource_id: window.wiki_resource_id
-			}, 
-			function (data) {
-				console.log(data);
-				if (data.success) {
+		}
+		$.post("wiki/{{$channel}}/compare/page", {
+			compareCommit: compareCommit, 
+			currentCommit: window.wiki_page_commit, 
+			name: window.wiki_page_name, 
+			resource_id: window.wiki_resource_id
+		}, 
+		function (data) {
+			console.log(data);
+			if (data.success) {
 				var modalBody = $('#generic-modal-body-{{$wikiModalID}}');
 				modalBody.html('<div class="descriptive-text">'+data.diff+'</div>');
 				$('.modal-dialog').addClass('modal-lg');
@@ -319,122 +316,119 @@
 					$('#generic-modal-{{$wikiModalID}}').modal('hide');
 				});
 				$('#generic-modal-{{$wikiModalID}}').modal();
-				} else {
+			} else {
 				window.console.log('Error comparing page.');
-				}
-			}, 'json');
-		}
-
-		$('#embed-image').click(function (ev) {
-			initializeEmbedPhotoDialog();
-			ev.preventDefault();
-		});
-
-
-		var initializeEmbedPhotoDialog = function () {
-			$('.embed-photo-selected-photo').each(function (index) {
-				$(this).removeClass('embed-photo-selected-photo');
-			});
-			getPhotoAlbumList();
-			$('#embedPhotoModalBodyAlbumDialog').off('click');
-			$('#embedPhotoModal').modal();
-		};
+			}
+		}, 'json');
+	}
 
-		var choosePhotoFromAlbum = function (album) {
-			$.post("embedphotos/album", {name: album},
-				function(data) {
-					if (data['status']) {
-						$('#embedPhotoModalLabel').html('{{$modalchooseimages}}');
-						$('#embedPhotoModalBodyAlbumDialog').html('\
-								<div><ul class="nav">\n\
-									<li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
-										<i class="fa fa-chevron-left"></i>&nbsp;\n\
-										{{$modaldiffalbum}}\n\
-										</a>\n\
-									</li>\n\
-								</ul><br></div>')
-						$('#embedPhotoModalBodyAlbumDialog').append(data['content']);
-						$('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
-							evt.preventDefault();
-							var image = document.getElementById(evt.target.id);
-							if (typeof($(image).parent()[0]) !== 'undefined') {
-								var imageparent = document.getElementById($(image).parent()[0].id);
-								$(imageparent).toggleClass('embed-photo-selected-photo');
-							}
-						});
-						$('#embedPhotoModalBodyAlbumListDialog').addClass('hide');
-						$('#embedPhotoModalBodyAlbumDialog').removeClass('hide');
-						$('#embed-photo-OKButton').click(function () {
-							$('.embed-photo-selected-photo').each(function (index) {
-								var href = $(this).attr('href');
-								$.post("embedphotos/photolink", {href: href},
-									function(ddata) {
-										if (ddata['status']) {
-											var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
-											editor.getSession().insert(editor.getCursorPosition(), imgURL)
-										} else {
-											window.console.log('{{$modalerrorlink}}' + ':' + ddata['errormsg']);
-										}
-										return false;
-									},
-								'json');
-							});
-							$('#embedPhotoModalBodyAlbumDialog').html('');
-							$('#embedPhotoModalBodyAlbumDialog').off('click');
-							$('#embedPhotoModal').modal('hide');
-						});
-					} else {
-						window.console.log('{{$modalerroralbum}} ' + JSON.stringify(album) + ':' + data['errormsg']);
-					}
-					return false;
-				},
-			'json');
-		};
+	$('#embed-image').click(function (ev) {
+		initializeEmbedPhotoDialog();
+		ev.preventDefault();
+	});
 
-		var getPhotoAlbumList = function () {
-			$.post("embedphotos/albumlist", {},
-				function(data) {
-					if (data['status']) {
-						var albums = data['albumlist']; //JSON.parse(data['albumlist']);
-						$('#embedPhotoModalLabel').html('{{$modalchoosealbum}}');
-						$('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>');
-						for(var i=0; i<albums.length; i++) {
-							var albumName = albums[i].text;
-							var albumLink = '<li>';
-							albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>';
-							albumLink += '</li>';
-							$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+	var initializeEmbedPhotoDialog = function () {
+		$('.embed-photo-selected-photo').each(function (index) {
+			$(this).removeClass('embed-photo-selected-photo');
+		});
+		getPhotoAlbumList();
+		$('#embedPhotoModalBodyAlbumDialog').off('click');
+		$('#embedPhotoModal').modal();
+	};
+
+	var choosePhotoFromAlbum = function (album) {
+		$.post("embedphotos/album", {name: album},
+			function(data) {
+				if (data['status']) {
+					$('#embedPhotoModalLabel').html('{{$modalchooseimages}}');
+					$('#embedPhotoModalBodyAlbumDialog').html('\
+							<div><ul class="nav">\n\
+								<li><a href="#" onclick="initializeEmbedPhotoDialog();return false;">\n\
+									<i class="fa fa-chevron-left"></i>&nbsp;\n\
+									{{$modaldiffalbum}}\n\
+									</a>\n\
+								</li>\n\
+							</ul><br></div>')
+					$('#embedPhotoModalBodyAlbumDialog').append(data['content']);
+					$('#embedPhotoModalBodyAlbumDialog').click(function (evt) {
+						evt.preventDefault();
+						var image = document.getElementById(evt.target.id);
+						if (typeof($(image).parent()[0]) !== 'undefined') {
+							var imageparent = document.getElementById($(image).parent()[0].id);
+							$(imageparent).toggleClass('embed-photo-selected-photo');
 						}
-						$('#embedPhotoModalBodyAlbumDialog').addClass('hide');
-						$('#embedPhotoModalBodyAlbumListDialog').removeClass('hide');
-					} else {
-						window.console.log('{{$modalerrorlist}}' + ':' + data['errormsg']);
+					});
+					$('#embedPhotoModalBodyAlbumListDialog').addClass('hide');
+					$('#embedPhotoModalBodyAlbumDialog').removeClass('hide');
+					$('#embed-photo-OKButton').click(function () {
+						$('.embed-photo-selected-photo').each(function (index) {
+							var href = $(this).attr('href');
+							$.post("embedphotos/photolink", {href: href},
+								function(ddata) {
+									if (ddata['status']) {
+										var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
+										editor.getSession().insert(editor.getCursorPosition(), imgURL)
+									} else {
+										window.console.log('{{$modalerrorlink}}' + ':' + ddata['errormsg']);
+									}
+									return false;
+								},
+							'json');
+						});
+						$('#embedPhotoModalBodyAlbumDialog').html('');
+						$('#embedPhotoModalBodyAlbumDialog').off('click');
+						$('#embedPhotoModal').modal('hide');
+					});
+				} else {
+					window.console.log('{{$modalerroralbum}} ' + JSON.stringify(album) + ':' + data['errormsg']);
+				}
+				return false;
+			},
+		'json');
+	};
+
+	var getPhotoAlbumList = function () {
+		$.post("embedphotos/albumlist", {},
+			function(data) {
+				if (data['status']) {
+					var albums = data['albumlist']; //JSON.parse(data['albumlist']);
+					$('#embedPhotoModalLabel').html('{{$modalchoosealbum}}');
+					$('#embedPhotoModalBodyAlbumList').html('<ul class="nav"></ul>');
+					for(var i=0; i<albums.length; i++) {
+						var albumName = albums[i].text;
+						var albumLink = '<li>';
+						albumLink += '<a href="#" onclick="choosePhotoFromAlbum(\'' + albumName + '\');return false;">' + albumName + '</a>';
+						albumLink += '</li>';
+						$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
 					}
-					return false;
-				},
-			'json');
-		};
-
-		$(document).ready(function () {
-				wiki_refresh_page_list();
-				$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
+					$('#embedPhotoModalBodyAlbumDialog').addClass('hide');
+					$('#embedPhotoModalBodyAlbumListDialog').removeClass('hide');
+				} else {
+					window.console.log('{{$modalerrorlist}}' + ':' + data['errormsg']);
+				}
+				return false;
+			},
+		'json');
+	};
 
-				// This seems obsolete
-				// Show Edit tab first. Otherwise the Ace editor does not load.
-				//$("#wiki-nav-tabs li:eq(1) a").tab('show');
+	$(document).ready(function () {
+		wiki_refresh_page_list();
+		$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
 
-				{{if !$mimeType || $mimeType == 'text/markdown'}}
-                                window.editor.on("input", function() {
-                                    if(window.editor.getSession().getUndoManager().isClean()) {
-                                        $('#save-page').addClass('disabled');
-                                    } else {
-                                        $('#save-page').removeClass('disabled');
-                                    }
-                                });
-				{{else}}
-				window.editor.bbco_autocomplete('bbcode');
-				{{/if}}
+		// This seems obsolete
+		// Show Edit tab first. Otherwise the Ace editor does not load.
+		//$("#wiki-nav-tabs li:eq(1) a").tab('show');
 
-				
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		window.editor.on("input", function() {
+			if(window.editor.getSession().getUndoManager().isClean()) {
+				$('#save-page').addClass('disabled');
+			} else {
+				$('#save-page').removeClass('disabled');
+			}
 		});
+		{{else}}
+		window.editor.bbco_autocomplete('bbcode');
+		{{/if}}
+	});
 </script>