From 9016ba0d61f486a0315ed208853b5230f0163c86 Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Thu, 17 Nov 2016 20:38:07 -0500 Subject: Remove page widget completely. Render the page list in a tab alongside History Edit and renamed View tabs. Move new page form below new page button within this page list tab. --- view/pdl/mod_wiki.pdl | 2 +- view/tpl/wiki.tpl | 40 +++++++++++++++++++++++++--------------- 2 files changed, 26 insertions(+), 16 deletions(-) (limited to 'view') diff --git a/view/pdl/mod_wiki.pdl b/view/pdl/mod_wiki.pdl index 76ed1c70c..9d2160935 100644 --- a/view/pdl/mod_wiki.pdl +++ b/view/pdl/mod_wiki.pdl @@ -1,4 +1,4 @@ [region=aside] [widget=wiki_list][/widget] -[widget=wiki_pages][/widget] +[comment][widget=wiki_pages][/widget][/comment] [/region] diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 4eefb3189..55093aa3d 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -40,21 +40,12 @@ -

{{$wikiheaderName}}: {{$wikiheaderPage}}

+

 {{$wikiheaderName}} +

-
+ - +
@@ -88,7 +81,24 @@
-
+
+
+ + +
-- cgit v1.2.3 From 3cb138ea41bda9c64b6295d53e7d65fbb29d203a Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Fri, 18 Nov 2016 06:04:00 -0500 Subject: move commit message and save button into edit pane. Change page list tab label to Pages and move current page name back to section header. --- view/tpl/wiki.tpl | 37 +++++++++++++++++++------------------ view/tpl/wiki_page_list.tpl | 2 +- 2 files changed, 20 insertions(+), 19 deletions(-) (limited to 'view') diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index 55093aa3d..2c2f05867 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -40,7 +40,8 @@
-

 {{$wikiheaderName}} +

 {{$wikiheaderName}}  :   +  {{$wikiheaderPage}}

@@ -65,13 +66,29 @@
  • Edit
  • View
  • History
    • -
  •  {{$wikiheaderPage}}
    • +
  •   Pages
    • + {{if $showCommitMsg}} + {{if $showPageControls}} +
    +
    + + + + Save + + {{$commitMsg.3}} + +
    +
    +
    + {{/if}} + {{/if}}
    @@ -103,22 +120,6 @@
    - {{if $showCommitMsg}} - {{if $showPageControls}} -
    -
    - - - - Save - - {{$commitMsg.3}} - -
    -
    -
    - {{/if}} - {{/if}}
    {{$wikiModal}} diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index c020f2520..afb14c6a9 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -1,6 +1,6 @@ {{if $not_refresh}} @@ -62,11 +62,11 @@
    @@ -519,7 +519,7 @@ wiki_refresh_page_list(); $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"}); // Show Edit tab first. Otherwise the Ace editor does not load. - $("#wiki-nav-tabs li:eq(1) a").tab('show'); + $("#wiki-nav-tabs li:eq(2) a").tab('show'); {{if $showNewWikiButton}} $('#new-wiki-button').show(); {{else}} -- cgit v1.2.3 From d24e867603fd253ea42050057896422beeba59db Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Fri, 18 Nov 2016 21:55:29 -0500 Subject: Move page list back out to the side menu, but with the new page form below the new page button like the new wiki form. Disable text editing if viewer lacks edit permission, and change the tab label to Source instead of Edit in that case. --- view/pdl/mod_wiki.pdl | 2 +- view/tpl/wiki.tpl | 49 ++++++++++----------------------------------- view/tpl/wiki_page_list.tpl | 35 +++++++++++++++++++++++++++++++- view/tpl/wikilist.tpl | 2 +- 4 files changed, 47 insertions(+), 41 deletions(-) (limited to 'view') diff --git a/view/pdl/mod_wiki.pdl b/view/pdl/mod_wiki.pdl index 9d2160935..76ed1c70c 100644 --- a/view/pdl/mod_wiki.pdl +++ b/view/pdl/mod_wiki.pdl @@ -1,4 +1,4 @@ [region=aside] [widget=wiki_list][/widget] -[comment][widget=wiki_pages][/widget][/comment] +[widget=wiki_pages][/widget] [/region] diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index fd983ebdf..e23f9d286 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -62,8 +62,7 @@
    @@ -203,7 +187,9 @@ editor.getSession().setValue(window.wiki_page_content); window.editor = editor; // Store the editor in the window object so the anonymous function can use it. - + {{if !$showPageControls}} + editor.setReadOnly(true); // Disable editing if the viewer lacks edit permission + {{/if}} $('#edit-pane-tab').click(function (ev) { setTimeout(function() {window.editor.focus();}, 500); // Return the focus to the editor allowing immediate text entry }); @@ -252,23 +238,6 @@ window.location = "wiki/{{$channel}}/download/wiki/" + resource_id; } - $('#new-page-submit').click(function (ev) { - if (window.wiki_resource_id === '') { - window.console.log('You must have a wiki open in order to create pages.'); - ev.preventDefault(); - return false; - } - $.post("wiki/{{$channel}}/create/page", {name: $('#id_pageName').val(), resource_id: window.wiki_resource_id}, - function (data) { - if (data.success) { - window.location = data.url; - } else { - window.console.log('Error creating page.'); - } - }, 'json'); - ev.preventDefault(); - }); - function wiki_refresh_page_list() { if (window.wiki_resource_id === '') { return false; @@ -493,6 +462,7 @@ }; function wiki_show_new_wiki_form() { + $('div[id^=\'edit-wiki-form-wrapper\']').hide(); $('#new-page-form-wrapper').hide(); $('#edit-wiki-form-wrapper').hide(); $('#new-wiki-form-wrapper').toggle(); @@ -500,6 +470,7 @@ } function wiki_show_new_page_form() { + $('div[id^=\'edit-wiki-form-wrapper\']').hide(); $('#edit-wiki-form-wrapper').hide(); $('#new-wiki-form-wrapper').hide(); $('#new-page-form-wrapper').toggle(); @@ -509,6 +480,7 @@ function wiki_show_edit_wiki_form(wiki_title, wiki_resource_id) { window.wiki_resource_id = wiki_resource_id; window.wiki_title = wiki_title; + $('div[id^=\'edit-wiki-form-wrapper\']').hide(); $('#new-page-form-wrapper').hide(); $('#new-wiki-form-wrapper').hide(); $('#edit-wiki-form-wrapper').toggle(); @@ -519,11 +491,12 @@ wiki_refresh_page_list(); $("#wiki-toc").toc({content: "#wiki-preview", headings: "h1,h2,h3,h4"}); // Show Edit tab first. Otherwise the Ace editor does not load. - $("#wiki-nav-tabs li:eq(2) a").tab('show'); + $("#wiki-nav-tabs li:eq(1) a").tab('show'); {{if $showNewWikiButton}} $('#new-wiki-button').show(); {{else}} $('#new-wiki-button').hide(); {{/if}} + }); diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl index afb14c6a9..c0eeecff8 100644 --- a/view/tpl/wiki_page_list.tpl +++ b/view/tpl/wiki_page_list.tpl @@ -1,6 +1,6 @@ {{if $not_refresh}}{{/if}} + + \ No newline at end of file diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl index b8da88ec4..51eccad90 100644 --- a/view/tpl/wikilist.tpl +++ b/view/tpl/wikilist.tpl @@ -21,7 +21,7 @@ {{/foreach}} {{/if}} {{if $owner}} -
  •  {{$addnew}}
    • +
  •  {{$addnew}}
    • {{/if}} {{if $owner}} -- cgit v1.2.3 From 16281c626b7db96e5af3e05179315b4f0dc33d1c Mon Sep 17 00:00:00 2001 From: Andrew Manning Date: Fri, 18 Nov 2016 22:10:55 -0500 Subject: Hide all content if no wiki is selected except for a message saying to choose one. --- view/tpl/wiki.tpl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl index e23f9d286..cf076c244 100644 --- a/view/tpl/wiki.tpl +++ b/view/tpl/wiki.tpl @@ -11,7 +11,12 @@ transition: opacity 0.5s 0.5s ease; } -
    +{{if $hideEditor}} +
    +

    {{$chooseWikiMessage}}

    +
    +{{/if}} +
    -- cgit v1.2.3