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

Merge branch 'dev' into wiki-gui

Browse Source
This commit is contained in:
Andrew Manning 2016-11-18 18:51:02 -05:00
commit f9b836027d
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/widgets.php
View File

@ -967,7 +967,7 @@ function widget_wiki_list($arr) {
'$view' => t('View'), '$view' => t('View'),
'$addnew' => t('Create new wiki'), '$addnew' => t('Create new wiki'),
'$create' => t('Create'), '$create' => t('Create'),
'$wikiName' => array('wikiName', t('Wiki name'), '', ''), '$wikiName' => array('wikiName', t('Wiki name')),
'$lockstate' => $x['lockstate'], '$lockstate' => $x['lockstate'],
'$acl' => $x['acl'], '$acl' => $x['acl'],
'$allow_cid' => $x['allow_cid'], '$allow_cid' => $x['allow_cid'],
@ -975,7 +975,7 @@ function widget_wiki_list($arr) {
'$deny_cid' => $x['deny_cid'], '$deny_cid' => $x['deny_cid'],
'$deny_gid' => $x['deny_gid'], '$deny_gid' => $x['deny_gid'],
'$bang' => $x['bang'], '$bang' => $x['bang'],
'$notify' => t('Send notification') '$notify' => array('postVisible', t('Send notification'), '', '', array(t('No'), t('Yes')))
)); ));
} }
return ''; return '';

2
view/theme/redbasic/css/style.css
View File

@ -2037,5 +2037,5 @@ dl.bb-dl > dd > li {
.sub-menu { .sub-menu {
margin-top: 10px; margin-top: 10px;
padding-left: 15px; padding-left: 15px;
border-left: 3px solid #ccc; border-left: 3px solid #eee;
} }

6
view/tpl/wikilist.tpl
View File

@ -28,11 +28,7 @@
<div id="new-wiki-form-wrapper" class="sub-menu" style="display:none;"> <div id="new-wiki-form-wrapper" class="sub-menu" 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}}'> <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}}'>
{{include file="field_input.tpl" field=$wikiName}} {{include file="field_input.tpl" field=$wikiName}}
<div id="post-visible-container" class="checkbox"> {{include file="field_checkbox.tpl" field=$notify}}
<label>
<input name="postVisible" id="postVisible" value="0" type="checkbox">{{$notify}}
</label>
</div>
<div> <div>
<div id="profile-jot-submit-right" class="btn-group"> <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;"> <button id="dbtn-acl" class="btn btn-default btn-sm" data-toggle="modal" data-target="#aclModal" title="Permission settings" onclick="return false;">