harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wiki: translateable strings and move page mimetype selector to options submenu

Browse Source
This commit is contained in:
Mario Vavti 2017-09-20 11:08:01 +02:00
parent 9e46472ca2
commit 6f2dd5d325
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Module/Wiki.php
View File

@ -216,7 +216,8 @@ class Wiki extends \Zotlabs\Web\Controller {
'$deny_cid' => $x['deny_cid'], '$deny_cid' => $x['deny_cid'],
'$deny_gid' => $x['deny_gid'], '$deny_gid' => $x['deny_gid'],
'$typelock' => array('typelock', t('Lock content type'), '', '', array(t('No'), t('Yes'))), '$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; return $o;

4
Zotlabs/Widget/Wiki_pages.php
View File

@ -56,7 +56,9 @@ class Wiki_pages {
'$mimetype' => mimetype_select(0,$w['mimeType'], '$mimetype' => mimetype_select(0,$w['mimeType'],
[ 'text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]), [ 'text/markdown' => t('Markdown'), 'text/bbcode' => t('BBcode'), 'text/plain' => t('Text') ]),
'$pageName' => array('pageName', t('Page name')), '$pageName' => array('pageName', t('Page name')),
'$refresh' => $arr['refresh'] '$refresh' => $arr['refresh'],
'$options' => t('Options'),
'$submit' => t('Submit')
)); ));
} }
} }

13
view/tpl/wiki_page_list.tpl
View File

@ -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> <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}}
{{if $canadd}} {{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" > <form id="new-page-form" action="wiki/{{$channel_address}}/create/page" method="post" >
<input type="hidden" name="resource_id" value="{{$resource_id}}"> <input type="hidden" name="resource_id" value="{{$resource_id}}">
{{include file="field_input.tpl" field=$pageName}}
{{if $typelock}} {{if $typelock}}
<input id="id_mimetype" type="hidden" name="mimetype" value="{{$lockedtype}}"> <input id="id_mimetype" type="hidden" name="mimetype" value="{{$lockedtype}}">
{{else}} {{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}} {{/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> </form>
</div> </div>
{{/if}} {{/if}}

2
view/tpl/wikilist.tpl
View File

@ -61,7 +61,7 @@
<td colspan="6"> <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}}'> <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}}"> <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"> <div class="btn-group float-right">
<button class="btn btn-outline-secondary btn-sm" data-toggle="modal" data-target="#aclModal" type="button"> <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> <i class="jot-perms-icon fa fa-{{$wiki.lockstate}}"></i>