diff options
| author | Andrew Manning <tamanning@zoho.com> | 2016-06-05 20:30:45 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2016-06-05 20:30:45 -0400 |
| commit | b8b50bdb5abb5403f3f8a8662b7db0703b39073b (patch) | |
| tree | 66e2215423b28adddbfef7e8dfbde483a825693b /view | |
| parent | 08a9553ccc0fd883a77fbf36be5941ba119deda1 (diff) | |
| download | volse-hubzilla-b8b50bdb5abb5403f3f8a8662b7db0703b39073b.tar.gz volse-hubzilla-b8b50bdb5abb5403f3f8a8662b7db0703b39073b.tar.bz2 volse-hubzilla-b8b50bdb5abb5403f3f8a8662b7db0703b39073b.zip | |
Custom commit message available. Improved history viewer and feedback from revert buttons.
Diffstat (limited to 'view')
| -rw-r--r-- | view/tpl/wiki.tpl | 20 | ||||
| -rw-r--r-- | view/tpl/wiki_page_history.tpl | 8 |
2 files changed, 22 insertions, 6 deletions
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index d9a490bf8..05ddad05b 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -101,6 +101,11 @@ </div> </div> + {{if $showCommitMsg}} + <div class="section-content-wrapper"> + {{include file="field_input.tpl" field=$commitMsg}} + </div> + {{/if}} </div> <script> @@ -198,10 +203,16 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) { ev.preventDefault(); return false; } - $.post("wiki/{{$channel}}/save/page", {content: editor.getValue(), name: window.wiki_page_name, resource_id: window.wiki_resource_id}, + $.post("wiki/{{$channel}}/save/page", + { content: editor.getValue(), + 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.'); + $('#id_commitMsg').val(''); // Clear the commit message box } else { alert('Error saving page.'); // TODO: Replace alerts with auto-timeout popups window.console.log('Error saving page.'); @@ -241,7 +252,12 @@ function wiki_delete_wiki(wikiHtmlName, resource_id) { $.post("wiki/{{$channel}}/revert/page", {commitHash: commitHash, name: window.wiki_page_name, resource_id: window.wiki_resource_id}, function (data) { if (data.success) { - window.console.log('Reverted content: ' + data.content); + $('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'); // put contents in editor editor.getSession().setValue(data.content); } else { diff --git a/view/tpl/wiki_page_history.tpl b/view/tpl/wiki_page_history.tpl index b124d4cb5..6ce3ce204 100644 --- a/view/tpl/wiki_page_history.tpl +++ b/view/tpl/wiki_page_history.tpl @@ -1,10 +1,10 @@ <table class="table-striped table-responsive table-hover" style="width: 100%;"> {{foreach $pageHistory as $commit}} <tr><td> - <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()"> - <tr><td>Date</td><td>{{$commit.date}}</td><td rowspan="3""> - <button id="revert-{{$commit.hash}}" class="btn btn-warning btn-xs" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button></td></tr> - <tr><td>Name</td><td>{{$commit.name}}</td></tr> + <table id="rev-{{$commit.hash}}" onclick="$('#details-{{$commit.hash}}').show()" width="100%"> + <tr><td width="10%">Date</td><td width="70%">{{$commit.date}}</td><td rowspan="3" width="20%" align="right"> + <button id="revert-{{$commit.hash}}" class="btn btn-danger btn-xs" onclick="wiki_revert_page('{{$commit.hash}}')">Revert</button></td></tr> + <tr><td>Name</td><td>{{$commit.name}} <{{$commit.email}}></td></tr> <tr><td>Message</td><td>{{$commit.title}}</td></tr> </table> </td></tr> |