Merge branch 'revert-c16fda1c' into 'dev'

Revert "Update wiki.tpl"

See merge request Kostikov/core!2

1 files changed, 428 insertions, 428 deletions

diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index b7bb80dfd..6ca4b0c77 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -1,476 +1,476 @@
 <div class="generic-content-wrapper">
-        <div class="section-title-wrapper">
-                <div class="pull-right">
-                        <span class="text-muted wiki-typename">[{{$typename}}]&nbsp;</span>
-                        {{if $showPageControls}}
-                        <div id="page-tools" class="btn-group" style="display: none;">
-                                <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
-                                        <i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
-                                </button>
-                                <div class="dropdown-menu dropdown-menu-right">
-                                        {{if $renamePage}}
-                                        <a class="dropdown-item rename-page" href="#"><i class="fa fa-fw fa-edit"></i>&nbsp;{{$renamePage}}</a>
-                                        {{/if}}
-                                        <a id="embed-image" class="dropdown-item" href="#"><i class="fa fa-fw fa-picture-o"></i>&nbsp;Embed Image</a>
-                                </div>
-                        </div>
-                        {{/if}}
-                        <button type="button" class="btn btn-outline-secondary btn-sm" title="{{$sharePage}}" onclick="window.location.href='rpost?f=&body={{$shareLink}}';"><i class="fa fa-fw fa-share"></i></button>
-                        <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button>
-                        <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button>
-                </div>
-                <h2>
-                        <span id="wiki-header-name">{{$wikiheaderName}}</span>:
-                        <span id="wiki-header-page">{{$wikiheaderPage}}</span>
-                </h2>
-                <div class="clear"></div>
-        </div>
-        <div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
-                <form id="rename-page-form" action="wiki/rename/page" method="post" >
-                        {{include file="field_input.tpl" field=$pageRename}}
-                        <div class="form-group">
-                                <div class="pull-right">
-                                        <button id="rename-page-submit" class="btn btn-primary" type="submit" name="submit">Submit</button>
-                                </div>
-                                <div>
-                                        <button class="btn btn-outline-secondary rename-page" type="button">Cancel</button>
-                                </div>
-                                <div class="clear"></div>
-                        </div>
-                </form>
-        </div>
-        <div id="wiki-content-container" class="section-content-wrapper">
-                <ul class="nav nav-tabs" id="wiki-nav-tabs">
-                        <li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
-                        <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">{{$view_lbl}}</a></li>
-                        <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">{{$history_lbl}}</a></li>
-                </ul>
-                <div class="tab-content" id="wiki-page-tabs">
-                        <div id="edit-pane" class="tab-pane">
-                                {{if !$mimeType || $mimeType == 'text/markdown'}}
-                                <div id="ace-editor"></div>
-                                {{else}}
-                                <div id="editor-wrapper">
-                                        <textarea id="editor">{{$content}}</textarea>
-                                </div>
-                                {{/if}}
-                        </div>
-                        <div id="preview-pane" class="tab-pane active">
-                                <div id="wiki-preview">
-                                        {{$renderedContent}}
-                                </div>
-                        </div>
-                        <div id="page-history-pane" class="tab-pane">
-                                <div id="page-history-list"></div>
-                        </div>
-                        {{if $showPageControls}}
-                        <div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none">
-                                <div class="input-group">
-                                        <input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
-                                        <div class="input-group-append">
-                                                <button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
-                                        </div>
-                                </div>
-                        </div>
-                        {{/if}}
-                </div>
-        </div>
+	<div class="section-title-wrapper">
+		<div class="pull-right">
+			<span class="text-muted wiki-typename">[{{$typename}}]&nbsp;</span>
+			{{if $showPageControls}}
+			<div id="page-tools" class="btn-group" style="display: none;">
+				<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown">
+					<i class="fa fa-cog"></i>&nbsp;{{$tools_label}}
+				</button>
+				<div class="dropdown-menu dropdown-menu-right">
+					{{if $renamePage}}
+					<a class="dropdown-item rename-page" href="#"><i class="fa fa-fw fa-edit"></i>&nbsp;{{$renamePage}}</a>
+					{{/if}}
+					<a id="embed-image" class="dropdown-item" href="#"><i class="fa fa-fw fa-picture-o"></i>&nbsp;Embed Image</a>
+				</div>
+			</div>	
+			{{/if}}
+			<button type="button" class="btn btn-outline-secondary btn-sm" title="{{$sharePage}}" onclick="window.location.href='rpost?f=&body={{$shareLink}}';"><i class="fa fa-fw fa-share"></i></button>
+			<button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(); adjustFullscreenEditorHeight();"><i class="fa fa-expand"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false); adjustInlineEditorHeight()"><i class="fa fa-compress"></i></button>
+		</div>
+		<h2>
+			<span id="wiki-header-name">{{$wikiheaderName}}</span>:
+			<span id="wiki-header-page">{{$wikiheaderPage}}</span>
+		</h2>
+		<div class="clear"></div>
+	</div>
+	<div id="rename-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
+		<form id="rename-page-form" action="wiki/rename/page" method="post" >
+			{{include file="field_input.tpl" field=$pageRename}}
+			<div class="form-group">
+				<div class="pull-right">
+					<button id="rename-page-submit" class="btn btn-primary" type="submit" name="submit">Submit</button>
+				</div>
+				<div>
+					<button class="btn btn-outline-secondary rename-page" type="button">Cancel</button>
+				</div>
+				<div class="clear"></div>
+			</div>
+		</form>
+	</div>
+	<div id="wiki-content-container" class="section-content-wrapper">
+		<ul class="nav nav-tabs" id="wiki-nav-tabs">
+			<li class="nav-item" id="edit-pane-tab"><a class="nav-link" data-toggle="tab" href="#edit-pane">{{$editOrSourceLabel}}</a></li>
+			<li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#preview-pane" id="wiki-get-preview">View</a></li>
+			<li class="nav-item"><a class="nav-link" data-toggle="tab" href="#page-history-pane" id="wiki-get-history">History</a></li>
+		</ul>
+		<div class="tab-content" id="wiki-page-tabs">
+			<div id="edit-pane" class="tab-pane">
+				{{if !$mimeType || $mimeType == 'text/markdown'}}
+				<div id="ace-editor"></div>
+				{{else}}
+				<div id="editor-wrapper">
+					<textarea id="editor">{{$content}}</textarea>
+				</div>
+				{{/if}}
+			</div>
+			<div id="preview-pane" class="tab-pane active">
+				<div id="wiki-preview">
+					{{$renderedContent}}
+				</div>
+			</div>
+			<div id="page-history-pane" class="tab-pane">
+				<div id="page-history-list"></div>
+			</div>
+			{{if $showPageControls}}
+			<div id="id_{{$commitMsg.0}}_wrapper" class="field input" style="display: none">
+				<div class="input-group">
+					<input class="form-control form-control-sm" name="{{$commitMsg.0}}" id="id_{{$commitMsg.0}}" type="text" value="{{$commitMsg.2}}"{{if $commitMsg.5}} {{$commitMsg.5}}{{/if}}>
+					<div class="input-group-append">
+						<button id="save-page" type="button" class="btn btn-primary disabled">Save</button>
+					</div>
+				</div>
+			</div>
+			{{/if}}
+		</div>
+	</div>
 </div>
 
 {{$wikiModal}}
 
 <div class="modal" id="embedPhotoModal" tabindex="-1" role="dialog" aria-labelledby="embedPhotoLabel" aria-hidden="true">
-        <div class="modal-dialog">
-                <div class="modal-content">
-                        <div class="modal-header">
-                                <h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
-                                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                        </div>
-                        <div class="modal-body" id="embedPhotoModalBody" >
-                                <div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
-                                        <div id="embedPhotoModalBodyAlbumList"></div>
-                                </div>
-                                <div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
-                        </div>
-                </div><!-- /.modal-content -->
-        </div><!-- /.modal-dialog -->
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<h4 class="modal-title" id="embedPhotoModalLabel">{{$embedPhotosModalTitle}}</h4>
+				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+			</div>
+			<div class="modal-body" id="embedPhotoModalBody" >
+				<div id="embedPhotoModalBodyAlbumListDialog" class="d-none">
+					<div id="embedPhotoModalBodyAlbumList"></div>
+				</div>
+				<div id="embedPhotoModalBodyAlbumDialog" class="d-none"></div>
+			</div>
+		</div><!-- /.modal-content -->
+	</div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
 
 <script>
-        window.wiki_resource_id = '{{$resource_id}}';
-        window.wiki_page_name = '{{$page}}';
-        window.wiki_page_content = '{{$content|escape:'javascript'}}';
-        window.wiki_page_commit = '{{$commit}}';
-        window.saved = true;
+	window.wiki_resource_id = '{{$resource_id}}';
+	window.wiki_page_name = '{{$page}}';
+	window.wiki_page_content = '{{$content|escape:'javascript'}}';
+	window.wiki_page_commit = '{{$commit}}';
+	window.saved = true;
 
-        $("#generic-modal-ok-{{$wikiModalID}}").removeClass('btn-primary');
-        $("#generic-modal-ok-{{$wikiModalID}}").addClass('btn-danger');
+	$("#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').click(function (ev) {
+		$('#rename-page-form-wrapper').toggle();
+		ev.preventDefault();
+	});
 
-        $( "#rename-page-form" ).submit(function( event ) {
-                $.post("wiki/{{$channel_address}}/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));
-                                window.wiki_page_name = data.name.urlName;
-                                $('#wiki-header-page').html(data.name.htmlName);
-                                wiki_refresh_page_list();
-                        } else {
-                                window.console.log('Error renaming page.');
-                        }
-                }, 'json');
-                event.preventDefault();
-        });
+	$( "#rename-page-form" ).submit(function( event ) {
+		$.post("wiki/{{$channel_address}}/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));
+				window.wiki_page_name = data.name.urlName;
+				$('#wiki-header-page').html(data.name.htmlName);
+				wiki_refresh_page_list();
+			} else {
+				window.console.log('Error renaming page.');
+			}
+		}, '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",
 
-                maxLines: Infinity,
-                minLines: 30,
+		maxLines: Infinity,
+		minLines: 30,
 
-                wrap: true,
+		wrap: true,
 
-                printMargin: false
-        });
+		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}}
+	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}}
-                editor.prop('readonly', true);
-                {{/if}}
-        {{/if}}
+	{{if !$showPageControls}}
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		editor.setReadOnly(true); // Disable editing if the viewer lacks edit permission
+		{{else}}
+		editor.prop('readonly', true);
+		{{/if}}
+	{{/if}}
 
-        $('#edit-pane-tab').click(function (ev) {
-                setTimeout(function() {
-                        window.editor.focus();
-                        if($('main').hasClass('fullscreen')) {
-                                adjustFullscreenEditorHeight();
-                        }
-                        else {
-                                adjustInlineEditorHeight();
-                        }
-                }, 500); // Return the focus to the editor allowing immediate text entry
-                $('#page-tools, #id_{{$commitMsg.0}}_wrapper').show();
-        });
+	$('#edit-pane-tab').click(function (ev) {
+		setTimeout(function() {
+			window.editor.focus();
+			if($('main').hasClass('fullscreen')) {
+				adjustFullscreenEditorHeight();
+			}
+			else {
+				adjustInlineEditorHeight();
+			}
+		}, 500); // Return the focus to the editor allowing immediate text entry
+		$('#page-tools, #id_{{$commitMsg.0}}_wrapper').show();
+	});
 
-        $('#wiki-get-preview').click(function (ev) {
-                if(window.saved) {
-                        $('#page-tools, #id_{{$commitMsg.0}}_wrapper').hide();
-                }
-                else {
-                        $('#page-tools').hide();
-                }
-                $.post("wiki/{{$channel_address}}/preview", {
-                        {{if !$mimeType || $mimeType == 'text/markdown'}}
-                        content: editor.getValue(),
-                        {{else}}
-                        content: editor.val(),
-                        {{/if}}
-                        resource_id: window.wiki_resource_id,
-                        mimetype: '{{$mimeType}}'
-                },
-                function (data) {
-                        if (data.success) {
-                                $('#wiki-preview').html(data.html);
-                                {{if !$mimeType || $mimeType == 'text/markdown'}}
-                                $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
-                                {{/if}}
-                        } else {
-                                window.console.log('Error previewing page.');
-                        }
-                }, 'json');
-                ev.preventDefault();
-        });
+	$('#wiki-get-preview').click(function (ev) {
+		if(window.saved) {
+			$('#page-tools, #id_{{$commitMsg.0}}_wrapper').hide();
+		}
+		else {
+			$('#page-tools').hide();
+		}
+		$.post("wiki/{{$channel_address}}/preview", {
+			{{if !$mimeType || $mimeType == 'text/markdown'}}
+			content: editor.getValue(),
+			{{else}}
+			content: editor.val(),
+			{{/if}}
+			resource_id: window.wiki_resource_id,
+			mimetype: '{{$mimeType}}'
+		},
+		function (data) {
+			if (data.success) {
+				$('#wiki-preview').html(data.html);
+				{{if !$mimeType || $mimeType == 'text/markdown'}}
+				$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
+				{{/if}}
+			} else {
+				window.console.log('Error previewing page.');
+			}
+		}, 'json');
+		ev.preventDefault();
+	});
 
-        $('#wiki-get-history').click(function (ev) {
-                if(window.saved) {
-                        $('#page-tools, #id_{{$commitMsg.0}}_wrapper').hide();
-                }
-                else {
-                        $('#page-tools').hide();
-                }
-                $.post("wiki/{{$channel_address}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
-                        if (data.success) {
-                                $('#page-history-list').html(data.historyHTML);
-                        } else {
-                                window.console.log('Error getting page history.');
-                        }
-                }, 'json');
-                ev.preventDefault();
-        });
+	$('#wiki-get-history').click(function (ev) {
+		if(window.saved) {
+			$('#page-tools, #id_{{$commitMsg.0}}_wrapper').hide();
+		}
+		else {
+			$('#page-tools').hide();
+		}
+		$.post("wiki/{{$channel_address}}/history/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) {
+			if (data.success) {
+				$('#page-history-list').html(data.historyHTML);
+			} else {
+				window.console.log('Error getting page history.');
+			}
+		}, 'json');
+		ev.preventDefault();
+	});
 
-        function wiki_refresh_page_list() {
-                if (window.wiki_resource_id === '') {
-                        return false;
-                }
-                $.post("wiki/{{$channel_address}}/get/page/list/", {channel_id: '{{$channel_id}}', resource_id: window.wiki_resource_id}, function (data) {
-                        if (data.success) {
-                                $('#wiki_page_list').html(data.pages);
-                        } else {
-                                alert('Error fetching page list!');
-                                window.console.log('Error fetching page list!');
-                        }
-                }, 'json');
-                return false;
-        }
+	function wiki_refresh_page_list() {
+		if (window.wiki_resource_id === '') {
+			return false;
+		}
+		$.post("wiki/{{$channel_address}}/get/page/list/", {channel_id: '{{$channel_id}}', resource_id: window.wiki_resource_id}, function (data) {
+			if (data.success) {
+				$('#wiki_page_list').html(data.pages);
+			} else {
+				alert('Error fetching page list!');
+				window.console.log('Error fetching page list!');
+			}
+		}, 'json');
+		return false;
+	}
 
-        $('#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) {
-                        $('#save-page').addClass('disabled');  // Disable the save button
-                        window.console.log('No edits to save.');
-                        ev.preventDefault();
-                        return false;
-                }
-                $.post("wiki/{{$channel_address}}/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.saved = true;
-                                window.console.log('Page saved successfully.');
-                                window.wiki_page_content = currentContent;
-                                $('#id_commitMsg').val(''); // Clear the commit message box
-                                $('#save-page').addClass('disabled');  // Disable the save button
-                                {{if !$mimeType || $mimeType == 'text/markdown'}}
-                                window.editor.getSession().getUndoManager().markClean();  // Reset the undo history for the editor
-                                {{/if}}
+		if (window.wiki_page_content === currentContent) {
+			$('#save-page').addClass('disabled');  // Disable the save button
+			window.console.log('No edits to save.');
+			ev.preventDefault();
+			return false;
+		}
+		$.post("wiki/{{$channel_address}}/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.saved = true;
+				window.console.log('Page saved successfully.');
+				window.wiki_page_content = currentContent;
+				$('#id_commitMsg').val(''); // Clear the commit message box
+				$('#save-page').addClass('disabled');  // Disable the save button
+				{{if !$mimeType || $mimeType == 'text/markdown'}}
+				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 === '') {
-                        window.console.log('You must have a wiki page open in order to revert pages.');
-                        return false;
-                }
-                $.post("wiki/{{$channel_address}}/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_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_address}}/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 === '') {
-                        window.console.log('You must have a wiki page open in order to revert pages.');
-                        return false;
-                }
-                $.post("wiki/{{$channel_address}}/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');
-                                $("#generic-modal-ok-{{$wikiModalID}}").off('click');
-                                $("#generic-modal-ok-{{$wikiModalID}}").click(function () {
-                                        wiki_revert_page(compareCommit);
-                                        $('#generic-modal-{{$wikiModalID}}').modal('hide');
-                                });
-                                $('#generic-modal-{{$wikiModalID}}').modal();
-                        } else {
-                                window.console.log('Error comparing page.');
-                        }
-                }, 'json');
-        }
+	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_address}}/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');
+				$("#generic-modal-ok-{{$wikiModalID}}").off('click');
+				$("#generic-modal-ok-{{$wikiModalID}}").click(function () {
+					wiki_revert_page(compareCommit);
+					$('#generic-modal-{{$wikiModalID}}').modal('hide');
+				});
+				$('#generic-modal-{{$wikiModalID}}').modal();
+			} else {
+				window.console.log('Error comparing page.');
+			}
+		}, 'json');
+	}
 
-        function adjustFullscreenEditorHeight() {
-                $('#editor, #ace-editor').height($(window).height() - $('#id_commitMsg_wrapper').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('#wiki-nav-tabs').outerHeight(true) - 17);
-                {{if !$mimeType || $mimeType == 'text/markdown'}}
-                editor.setOptions({
-                        maxLines: null,
-                        minLines: null
-                });
-                editor.resize();
-                {{/if}}
-        }
+	function adjustFullscreenEditorHeight() {
+		$('#editor, #ace-editor').height($(window).height() - $('#id_commitMsg_wrapper').outerHeight(true) - $('.section-title-wrapper').outerHeight(true) - $('#wiki-nav-tabs').outerHeight(true) - 17);
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		editor.setOptions({
+			maxLines: null,
+			minLines: null
+		});
+		editor.resize();
+		{{/if}}
+	}
 
-        function adjustInlineEditorHeight() {
-                {{if !$mimeType || $mimeType == 'text/markdown'}}
-                editor.setOptions({
-                        maxLines: Infinity,
-                        minLines: 30
-                });
-                editor.resize();
-                {{else}}
-                editor.height(editor[0].scrollHeight);
-                {{/if}}
-        }
+	function adjustInlineEditorHeight() {
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		editor.setOptions({
+			maxLines: Infinity,
+			minLines: 30
+		});
+		editor.resize();
+		{{else}}
+		editor.height(editor[0].scrollHeight);
+		{{/if}}
+	}
 
-        $('#embed-image').click(function (ev) {
-                initializeEmbedPhotoDialog();
-                ev.preventDefault();
-        });
+	$('#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();
-        };
+	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 nav-pills flex-column">\n\
-                                                                <li class="nav-item"><a class="nav-link" 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');
-                                                        var href = $(imageparent).attr('href');
+	var choosePhotoFromAlbum = function (album) {
+		$.post("embedphotos/album", {name: album},
+			function(data) {
+				if (data['status']) {
+					$('#embedPhotoModalLabel').html("{{$modalchooseimages}}");
+					$('#embedPhotoModalBodyAlbumDialog').html('\
+							<div><ul class="nav nav-pills flex-column">\n\
+								<li class="nav-item"><a class="nav-link" 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');
+							var href = $(imageparent).attr('href');
                             $.post("embedphotos/photolink", {href: href},
                                 function(ddata) {
                                     if (ddata['status']) {
-                                                                                {{if !$mimeType || $mimeType == 'text/markdown'}}
-                                                                                var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
-                                                                                editor.getSession().insert(editor.getCursorPosition(), imgURL)
-                                                                                {{else}}
-                                                                                var currentContent = $('#editor').val();
-                                                                                $('#editor').val(currentContent + ddata['photolink']);
-                                                                                {{/if}}
+										{{if !$mimeType || $mimeType == 'text/markdown'}}
+										var imgURL = ddata['photolink'].replace( /\[.*\]\[.*\](.*)\[.*\]\[.*\]/, '\n![image]($1)' )
+										editor.getSession().insert(editor.getCursorPosition(), imgURL)
+										{{else}}
+										var currentContent = $('#editor').val();
+										$('#editor').val(currentContent + ddata['photolink']);
+										{{/if}}
                                     } else {
                                         window.console.log("{{$modalerrorlink}}" + ':' + ddata['errormsg']);
                                     }
                                     return false;
-                                                                },
+								},
                                'json');
                             $('#embedPhotoModalBodyAlbumDialog').html('');
                             $('#embedPhotoModalBodyAlbumDialog').off('click');
                             $('#embedPhotoModal').modal('hide');
-                                                }
+						}
                     });
 
-                                        $('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
-                                        $('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
-                                } else {
-                                        window.console.log("{{$modalerroralbum}} " + JSON.stringify(album) + ':' + data['errormsg']);
-                                }
-                                return false;
-                        },
-                'json');
-        };
+					$('#embedPhotoModalBodyAlbumListDialog').addClass('d-none');
+					$('#embedPhotoModalBodyAlbumDialog').removeClass('d-none');
+				} 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 nav-pills flex-column"></ul>');
-                                        for(var i = 0; i < albums.length; i++) {
-                                                var albumName = albums[i].text;
-                                                var jsAlbumName = albums[i].jstext;
-                                                var albumLink = '<li class="nav-item">';
-                                                albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
-                                                albumLink += '</li>';
-                                                $('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
-                                        }
-                                        $('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
-                                        $('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
-                                } else {
-                                        window.console.log("{{$modalerrorlist}}" + ':' + 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 nav-pills flex-column"></ul>');
+					for(var i = 0; i < albums.length; i++) {
+						var albumName = albums[i].text;
+						var jsAlbumName = albums[i].jstext;
+						var albumLink = '<li class="nav-item">';
+						albumLink += '<a class="nav-link" href="#" onclick="choosePhotoFromAlbum(\'' + jsAlbumName + '\'); return false;">' + albumName + '</a>';
+						albumLink += '</li>';
+						$('#embedPhotoModalBodyAlbumList').find('ul').append(albumLink);
+					}
+					$('#embedPhotoModalBodyAlbumDialog').addClass('d-none');
+					$('#embedPhotoModalBodyAlbumListDialog').removeClass('d-none');
+				} else {
+					window.console.log("{{$modalerrorlist}}" + ':' + data['errormsg']);
+				}
+				return false;
+			},
+		'json');
+	};
 
-        $(document).ready(function () {
-                {{if !$mimeType || $mimeType == 'text/markdown'}}
-                $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
-                window.editor.on("input", function() {
-                        window.saved = false;
-                        if(window.editor.getSession().getUndoManager().isClean()) {
-                                $('#save-page').addClass('disabled');
-                        } else {
-                                $('#save-page').removeClass('disabled');
-                        }
-                });
-                {{else}}
-                window.editor.on("input", function() {
-                        window.saved = false;
-                        $('#save-page').removeClass('disabled');
-                });
-                {{if $mimeType == 'text/bbcode'}}
-                window.editor.bbco_autocomplete('bbcode');
-                {{/if}}
-                {{/if}}
-        });
+	$(document).ready(function () {
+		{{if !$mimeType || $mimeType == 'text/markdown'}}
+		$("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"});
+		window.editor.on("input", function() {
+			window.saved = false;
+			if(window.editor.getSession().getUndoManager().isClean()) {
+				$('#save-page').addClass('disabled');
+			} else {
+				$('#save-page').removeClass('disabled');
+			}
+		});
+		{{else}}
+		window.editor.on("input", function() {
+			window.saved = false;
+			$('#save-page').removeClass('disabled');
+		});
+		{{if $mimeType == 'text/bbcode'}}
+		window.editor.bbco_autocomplete('bbcode');
+		{{/if}}
+		{{/if}}
+	});
 
-        $(window).resize(function () {
-                if($('main').hasClass('fullscreen')) {
-                        adjustFullscreenEditorHeight();
-                }
-        });
-</script>
\ No newline at end of file
+	$(window).resize(function () {
+		if($('main').hasClass('fullscreen')) {
+			adjustFullscreenEditorHeight();
+		}
+	});
+</script>