From 271244bb36df0656209472f3d1e9a6c363c0ddab Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 12 Nov 2016 08:06:18 -0500 Subject: [PATCH 1/4] Wiki control dropdown menu improvement --- view/tpl/wikilist.tpl | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index 6b37be4c5..8ec7d8245 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -2,19 +2,19 @@

{{$header}}

-
+ +
From af11525338d185fcbb586d8cb8ef0028946c8230 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 12 Nov 2016 14:42:21 -0500 Subject: [PATCH 3/4] Moved save to bottom. Created Wiki Tools dropdown to be consistent, moved page tools in there as well as new page and new wiki --- Zotlabs/Module/Wiki.php | 2 ++ view/tpl/wiki.tpl | 69 +++++++++++++++++++++++++++++------------ 2 files changed, 51 insertions(+), 20 deletions(-) diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php index aaa1f1e3d..b73244a1c 100644 --- a/Zotlabs/Module/Wiki.php +++ b/Zotlabs/Module/Wiki.php @@ -211,6 +211,8 @@ class Wiki extends \Zotlabs\Web\Controller { '$wikiheaderPage' => $wikiheaderPage, '$hideEditor' => $hide_editor, '$showPageControls' => $showPageControls, + '$tools_label' => 'Wiki Tools', + '$showTools' => $showNewWikiButton || $showNewPageButton, '$showNewWikiButton'=> $showNewWikiButton, '$showNewPageButton'=> $showNewPageButton, '$hidePageHistory' => $hidePageHistory, diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 79836dac5..7e18b0fc4 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -15,12 +15,40 @@
- {{if $showNewWikiButton}} - - {{/if}} - {{if $showNewPageButton}} - - {{/if}} + {{if $showNewWikiButton || $showPageControls}} +
+ + +
+ + {{/if}} +
{{if $showCommitMsg}} + {{if $showPageControls}}
- {{include file="field_input.tpl" field=$commitMsg}} +
+ + + + Save + + {{$commitMsg.3}} + +
+
{{/if}} + {{/if}}
{{$wikiModal}} @@ -167,6 +194,7 @@ $('#rename-page').click(function (ev) { $('#rename-page-form-wrapper').show(); + ev.preventDefault(); }); $( "#rename-page-form" ).submit(function( event ) { @@ -318,6 +346,7 @@ function wiki_download_wiki(resource_id) { return false; } if(!confirm('Are you sure you want to delete the page: ' + window.wiki_page_name)) { + ev.preventDefault(); return; } $.post("wiki/{{$channel}}/delete/page", {name: window.wiki_page_name, resource_id: window.wiki_resource_id}, From da5b9d5c743cfb51dfbea7a79feba463b4331aa5 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Sat, 12 Nov 2016 15:24:22 -0500 Subject: [PATCH 4/4] Removed wiki list dropdown menus, moving the download and delete icons to beside the open wiki link. --- view/tpl/wikilist.tpl | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index 8ec7d8245..7cf04d35e 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -1,21 +1,13 @@

{{$header}}

- +