aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-11-18 18:51:02 -0500
committerAndrew Manning <tamanning@zoho.com>2016-11-18 18:51:02 -0500
commitf9b836027d4d06d218e0926c539845b641353cfb (patch)
tree287bd0b784d3ce7c7a8204fbea646c6afe2d5726
parent3cb138ea41bda9c64b6295d53e7d65fbb29d203a (diff)
parent3147b7c62bf1541b3c458baa5b5af47c0663ead2 (diff)
downloadvolse-hubzilla-f9b836027d4d06d218e0926c539845b641353cfb.tar.gz
volse-hubzilla-f9b836027d4d06d218e0926c539845b641353cfb.tar.bz2
volse-hubzilla-f9b836027d4d06d218e0926c539845b641353cfb.zip
Merge branch 'dev' into wiki-gui
-rw-r--r--include/widgets.php4
-rw-r--r--view/theme/redbasic/css/style.css2
-rw-r--r--view/tpl/wikilist.tpl6
3 files changed, 4 insertions, 8 deletions
diff --git a/include/widgets.php b/include/widgets.php
index 3dc555b46..c0cc15e34 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -967,7 +967,7 @@ function widget_wiki_list($arr) {
'$view' => t('View'),
'$addnew' => t('Create new wiki'),
'$create' => t('Create'),
- '$wikiName' => array('wikiName', t('Wiki name'), '', ''),
+ '$wikiName' => array('wikiName', t('Wiki name')),
'$lockstate' => $x['lockstate'],
'$acl' => $x['acl'],
'$allow_cid' => $x['allow_cid'],
@@ -975,7 +975,7 @@ function widget_wiki_list($arr) {
'$deny_cid' => $x['deny_cid'],
'$deny_gid' => $x['deny_gid'],
'$bang' => $x['bang'],
- '$notify' => t('Send notification')
+ '$notify' => array('postVisible', t('Send notification'), '', '', array(t('No'), t('Yes')))
));
}
return '';
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index f71fe8ea8..bd0e372f8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2037,5 +2037,5 @@ dl.bb-dl > dd > li {
.sub-menu {
margin-top: 10px;
padding-left: 15px;
- border-left: 3px solid #ccc;
+ border-left: 3px solid #eee;
}
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index d3c6b867f..b8da88ec4 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -28,11 +28,7 @@
<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}}'>
{{include file="field_input.tpl" field=$wikiName}}
- <div id="post-visible-container" class="checkbox">
- <label>
- <input name="postVisible" id="postVisible" value="0" type="checkbox">{{$notify}}
- </label>
- </div>
+ {{include file="field_checkbox.tpl" field=$notify}}
<div>
<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;">