aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-11-16 20:16:46 -0500
committerAndrew Manning <tamanning@zoho.com>2016-11-16 20:16:46 -0500
commit748c8944507086651049830631c20d7ea87bc567 (patch)
tree09c886b0f8bde71f801f4641d9872f8159e8a850 /view
parent0e8b13841a921bef6492e20e478cf27976384d84 (diff)
downloadvolse-hubzilla-748c8944507086651049830631c20d7ea87bc567.tar.gz
volse-hubzilla-748c8944507086651049830631c20d7ea87bc567.tar.bz2
volse-hubzilla-748c8944507086651049830631c20d7ea87bc567.zip
Move new wiki dialog directly underneath new wiki button in wiki list widget
Diffstat (limited to 'view')
-rw-r--r--view/tpl/wiki.tpl29
-rw-r--r--view/tpl/wikilist.tpl30
2 files changed, 30 insertions, 29 deletions
diff --git a/view/tpl/wiki.tpl b/view/tpl/wiki.tpl
index 54d501396..9c6499558 100644
--- a/view/tpl/wiki.tpl
+++ b/view/tpl/wiki.tpl
@@ -43,35 +43,6 @@
<h2><span id="wiki-header-name">{{$wikiheaderName}}</span>: <span id="wiki-header-page">{{$wikiheaderPage}}</span></h2>
<div class="clear"></div>
</div>
- <div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
- <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
- <div class="clear"></div>
- {{include file="field_input.tpl" field=$wikiName}}
-
- <div id="post-visible-container" class="form-group field checkbox">
- <span style="font-size:1.2em;" class="pull-left">Send notification post?</span>
- <div style="margin-left:20px" class="pull-left">
- <input name="postVisible" id="postVisible" value="0" type="checkbox">
- <label class="switchlabel" for="postVisible">
- <span class="onoffswitch-inner" data-on="Post" data-off="None"></span>
- <span class="onoffswitch-switch"></span>
- </label>
- </div>
- </div>
-
- <div class="btn-group pull-right">
- <div id="profile-jot-submit-right" class="btn-group">
- <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
- <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{$bang}}
- </button>
- <button id="new-wiki-submit" class="btn btn-primary" type="submit" name="submit" >Create Wiki</button>
- </div>
- </div>
- </form>
- {{$acl}}
- <div class="clear"></div>
- <hr>
- </div>
<div id="edit-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
<form id="edit-wiki-form" action="wiki/edit/wiki" method="post" >
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index eb6dbc722..f23a1d0e3 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -11,5 +11,35 @@
{{/if}}
{{if $owner}}<li><a href="#" class="fakelink" onclick="wiki_show_new_wiki_form(); return false;"><i id="new-wiki-button" class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>{{/if}}
</ul>
+ {{if $owner}}
+ <div id="new-wiki-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
+ <form id="new-wiki-form" action="wiki/{{$channel}}/create/wiki" method="post" class="acl-form" data-form_id="new-wiki-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
+ <div class="clear"></div>
+ {{include file="field_input.tpl" field=$wikiName}}
+
+ <div id="post-visible-container" class="form-group field checkbox">
+ <span style="font-size:1.2em;" class="pull-left">Send notification post?</span>
+ <div style="margin-left:20px" class="pull-left">
+ <input name="postVisible" id="postVisible" value="0" type="checkbox">
+ <label class="switchlabel" for="postVisible">
+ <span class="onoffswitch-inner" data-on="Post" data-off="None"></span>
+ <span class="onoffswitch-switch"></span>
+ </label>
+ </div>
+ </div>
+ <br><br>
+ <div class="btn-group pull-right">
+ <div id="profile-jot-submit-right" class="btn-group">
+ <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">
+ <i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>{{$bang}}
+ </button>
+ <button id="new-wiki-submit" class="btn btn-primary btn-sm" type="submit" name="submit" >Create Wiki</button>
+ </div>
+ </div>
+ </form>
+ {{$acl}}
+ <div class="clear"></div>
+ </div>
+ {{/if}}
</div>