diff options
| author | zotlabs <mike@macgirvin.com> | 2016-11-16 14:15:42 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2016-11-16 14:15:42 -0800 |
| commit | 0e8b13841a921bef6492e20e478cf27976384d84 (patch) | |
| tree | 3e07b52cc50bb935b88debf904461087e681135c /view/tpl | |
| parent | 91c803ff65314ff50621556da102ea37223cc64c (diff) | |
| parent | 1ad8f20bcea6395cd8f9a50907a36bae1e425352 (diff) | |
| download | volse-hubzilla-0e8b13841a921bef6492e20e478cf27976384d84.tar.gz volse-hubzilla-0e8b13841a921bef6492e20e478cf27976384d84.tar.bz2 volse-hubzilla-0e8b13841a921bef6492e20e478cf27976384d84.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/wiki.tpl | 13 | ||||
| -rw-r--r-- | view/tpl/wiki_page_history.tpl | 4 |
2 files changed, 11 insertions, 6 deletions
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 26a0a72e8..54d501396 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -37,10 +37,8 @@ {{/if}} - <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(); - adjustFullscreenTopBarHeight();"><i class="fa fa-expand"></i></button> - <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false); - adjustInlineTopBarHeight();"><i class="fa fa-compress"></i></button> + <button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button> + <button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><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> @@ -221,6 +219,8 @@ var editor = ace.edit("ace-editor"); editor.setTheme("ace/theme/github"); + editor.setShowPrintMargin(false); + editor.getSession().setUseWrapMode('free'); editor.getSession().setMode("ace/mode/markdown"); editor.getSession().setValue(window.wiki_page_content); window.editor = editor; // Store the editor in the window object so the anonymous function can use it. @@ -405,10 +405,11 @@ 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').width('80%'); + $('.modal-dialog').addClass('modal-lg'); $("#generic-modal-ok-{{$wikiModalID}}").off('click'); $("#generic-modal-ok-{{$wikiModalID}}").click(function () { wiki_revert_page(compareCommit); @@ -545,4 +546,4 @@ $('#new-wiki-button').hide(); {{/if}} }); -</script>
\ No newline at end of file +</script> diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl index fef5d93a5..9a313f767 100644 --- a/view/tpl/wiki_page_history.tpl +++ b/view/tpl/wiki_page_history.tpl @@ -1,4 +1,8 @@ <style> + .diff { + width:100%; + } + .diff td{ padding:0 0.667em; vertical-align:top; |