aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-09-20 11:08:01 +0200
committerMario Vavti <mario@mariovavti.com>2017-09-20 11:08:01 +0200
commit6f2dd5d32546c8f812e04bf098d61c7ec6ba73ac (patch)
tree53694520877725d184d2a095bc58b8a993c6fb3b
parent9e46472ca26f2bd38d2e71c221a9fbf5618b5822 (diff)
downloadvolse-hubzilla-6f2dd5d32546c8f812e04bf098d61c7ec6ba73ac.tar.gz
volse-hubzilla-6f2dd5d32546c8f812e04bf098d61c7ec6ba73ac.tar.bz2
volse-hubzilla-6f2dd5d32546c8f812e04bf098d61c7ec6ba73ac.zip
wiki: translateable strings and move page mimetype selector to options submenu
-rw-r--r--Zotlabs/Module/Wiki.php3
-rw-r--r--Zotlabs/Widget/Wiki_pages.php4
-rw-r--r--view/tpl/wiki_page_list.tpl13
-rw-r--r--view/tpl/wikilist.tpl2
4 files changed, 15 insertions, 7 deletions
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index 2668229ee..fe2bfbdfb 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -216,7 +216,8 @@ class Wiki extends \Zotlabs\Web\Controller {
'$deny_cid' => $x['deny_cid'],
'$deny_gid' => $x['deny_gid'],
'$typelock' => array('typelock', t('Lock content type'), '', '', array(t('No'), t('Yes'))),
- '$notify' => array('postVisible', t('Create a status post for this wiki'), '', '', array(t('No'), t('Yes')))
+ '$notify' => array('postVisible', t('Create a status post for this wiki'), '', '', array(t('No'), t('Yes'))),
+ '$edit_wiki_name' => t('Edit Wiki Name')
));
return $o;
diff --git a/Zotlabs/Widget/Wiki_pages.php b/Zotlabs/Widget/Wiki_pages.php
index b4928ede5..ac44b8d88 100644
--- a/Zotlabs/Widget/Wiki_pages.php
+++ b/Zotlabs/Widget/Wiki_pages.php
@@ -56,7 +56,9 @@ class Wiki_pages {
'$mimetype' => mimetype_select(0,$w['mimeType'],
[ 'text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]),
'$pageName' => array('pageName', t('Page name')),
- '$refresh' => $arr['refresh']
+ '$refresh' => $arr['refresh'],
+ '$options' => t('Options'),
+ '$submit' => t('Submit')
));
}
}
diff --git a/view/tpl/wiki_page_list.tpl b/view/tpl/wiki_page_list.tpl
index a7e6ebdaf..d75f22f64 100644
--- a/view/tpl/wiki_page_list.tpl
+++ b/view/tpl/wiki_page_list.tpl
@@ -17,16 +17,21 @@
<li class="nav-item"><a class="nav-link" href="#" onclick="wiki_show_new_page_form(); return false;"><i class="fa fa-plus-circle"></i>&nbsp;{{$addnew}}</a></li>
{{/if}}
{{if $canadd}}
- <div id="new-page-form-wrapper" class="sub-menu" style="display:none;">
+ <div id="new-page-form-wrapper" class="clearfix sub-menu" style="display:none;">
<form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" >
<input type="hidden" name="resource_id" value="{{$resource_id}}">
+ {{include file="field_input.tpl" field=$pageName}}
{{if $typelock}}
<input id="id_mimetype" type="hidden" name="mimetype" value="{{$lockedtype}}">
{{else}}
- {{$mimetype}}
+ <div id="wiki_page_options" style="display: none">
+ {{$mimetype}}
+ </div>
+ <div class="float-right fakelink" onClick="openClose('wiki_page_options')">
+ {{$options}}
+ </div>
{{/if}}
- {{include file="field_input.tpl" field=$pageName}}
- <button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >Submit</button>
+ <button id="new-page-submit" class="btn btn-primary" type="submit" name="submit" >{{$submit}}</button>
</form>
</div>
{{/if}}
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index dfd7f553d..094c1e265 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -61,7 +61,7 @@
<td colspan="6">
<form id="edit-wiki-form-{{$wiki.id}}" method="post" action="wiki/{{$channel}}/update/wiki" class="acl-form" data-form_id="edit-wiki-form-{{$wiki.id}}" data-allow_cid='{{$wiki.json_allow_cid}}' data-allow_gid='{{$wiki.json_allow_gid}}' data-deny_cid='{{$wiki.json_deny_cid}}' data-deny_gid='{{$wiki.json_deny_gid}}'>
<input type="hidden" name="origRawName" value="{{$wiki.title}}">
- {{include file="field_input.tpl" field=['updateRawName', 'Edit Wiki Name', $wiki.title]}}
+ {{include file="field_input.tpl" field=['updateRawName', $edit_wiki_name, $wiki.title]}}
<div class="btn-group float-right">
<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button">
<i class="jot-perms-icon fa fa-{{$wiki.lockstate}}"></i>