aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2016-11-17 14:17:26 +0100
committerMario Vavti <mario@mariovavti.com>2016-11-17 14:17:26 +0100
commit0b0e0f8f43fc199e0b45a15cc2bc1bd228b58ba9 (patch)
tree3e626a4f7506ae8ae81e872e31f862d5e8d048d6
parenta444c860a466e06d95a591dc6946229fe8f39753 (diff)
downloadvolse-hubzilla-0b0e0f8f43fc199e0b45a15cc2bc1bd228b58ba9.tar.gz
volse-hubzilla-0b0e0f8f43fc199e0b45a15cc2bc1bd228b58ba9.tar.bz2
volse-hubzilla-0b0e0f8f43fc199e0b45a15cc2bc1bd228b58ba9.zip
wiki list fixes
-rw-r--r--include/widgets.php6
-rw-r--r--view/theme/redbasic/css/style.css14
-rw-r--r--view/tpl/wikilist.tpl88
3 files changed, 54 insertions, 54 deletions
diff --git a/include/widgets.php b/include/widgets.php
index e74f2c58b..3dc555b46 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -965,8 +965,9 @@ function widget_wiki_list($arr) {
'$edit' => t('Edit'),
'$download' => t('Download'),
'$view' => t('View'),
- '$addnew' => t('Add new wiki'),
- '$wikiName' => array('wikiName', t('Enter the name of your new wiki:'), '', ''),
+ '$addnew' => t('Create new wiki'),
+ '$create' => t('Create'),
+ '$wikiName' => array('wikiName', t('Wiki name'), '', ''),
'$lockstate' => $x['lockstate'],
'$acl' => $x['acl'],
'$allow_cid' => $x['allow_cid'],
@@ -974,6 +975,7 @@ function widget_wiki_list($arr) {
'$deny_cid' => $x['deny_cid'],
'$deny_gid' => $x['deny_gid'],
'$bang' => $x['bang'],
+ '$notify' => t('Send notification')
));
}
return '';
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index a7ce3af38..f71fe8ea8 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2025,11 +2025,17 @@ dl.bb-dl > dd > li {
}
.embed-photo-selected-photo {
- border-color: blue;
- border-style: solid;
- border-width: 5px;
+ border-color: blue;
+ border-style: solid;
+ border-width: 5px;
}
#wiki-preview img {
- max-width: 100%;
+ max-width: 100%;
+}
+
+.sub-menu {
+ margin-top: 10px;
+ padding-left: 15px;
+ border-left: 3px solid #ccc;
}
diff --git a/view/tpl/wikilist.tpl b/view/tpl/wikilist.tpl
index d3fca8ab7..d3c6b867f 100644
--- a/view/tpl/wikilist.tpl
+++ b/view/tpl/wikilist.tpl
@@ -1,57 +1,49 @@
<div id="wiki_list" class="widget">
- <h3>{{$header}}</h3>
- <ul class="nav nav-pills nav-stacked">
+ <h3>{{$header}}</h3>
+ <ul class="nav nav-pills nav-stacked">
{{if $wikis}}
{{foreach $wikis as $wiki}}
- <li {{if $wiki.active}}class="active"{{/if}}>{{if $owner}}<a href="#" onclick="$('div[id^=\'edit-wiki-form-wrapper\']').hide(); $('div[id^=\'new-wiki-form-wrapper\']').hide(); openClose('edit-wiki-form-wrapper-{{$wiki.resource_id}}'); return false;" class="pull-right wikilist" title="{{$edit}}"><i class="fa fa-pencil"></i></a>{{/if}}
- <a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="{{$download}}" class="pull-right wikilist"><i class="fa fa-download"></i></a>
- <a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}">{{$wiki.title}}</a>
- {{if $owner}}
-
- <div id="edit-wiki-form-wrapper-{{$wiki.resource_id}}" class="section-content-tools-wrapper" style="display:none;">
- <form id="edit-wiki-form" action="wiki/edit/wiki" method="post" >
- <div class="clear"></div>
- <div class="btn-group pull-right">
- <button class="btn btn-xs btn-danger" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"><i class="fa fa-trash-o"></i>&nbsp;Delete Wiki</button>
- </div>
- </form>
- <div class="clear"></div>
- </div>
- {{/if}}
+ <li>{{if $owner}}<a href="#" onclick="$('div[id^=\'edit-wiki-form-wrapper\']').hide(); $('div[id^=\'new-wiki-form-wrapper\']').hide(); openClose('edit-wiki-form-wrapper-{{$wiki.resource_id}}'); return false;" class="pull-right wikilist" title="{{$edit}}"><i class="fa fa-pencil"></i></a>{{/if}}
+ <a href="#" onclick="wiki_download_wiki('{{$wiki.resource_id}}'); return false;" title="{{$download}}" class="pull-right wikilist"><i class="fa fa-download"></i></a>
+ <a href="/wiki/{{$channel}}/{{$wiki.urlName}}/Home" title="{{$view}}"{{if $wiki.active}} class="active"{{/if}}>{{$wiki.title}}</a>
+ {{if $owner}}
+ <div id="edit-wiki-form-wrapper-{{$wiki.resource_id}}" class="section-content-tools-wrapper" style="display:none;">
+ <form id="edit-wiki-form" action="wiki/edit/wiki" method="post" >
+ <div class="clear"></div>
+ <div class="btn-group pull-right">
+ <button class="btn btn-xs btn-danger" onclick="wiki_delete_wiki('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;"><i class="fa fa-trash-o"></i>&nbsp;Delete Wiki</button>
+ </div>
+ </form>
+ <div class="clear"></div>
+ </div>
+ {{/if}}
</li>
{{/foreach}}
{{/if}}
- {{if $owner}}<li><a href="#" class="fakelink" onclick="$('div[id^=\'edit-wiki-form-wrapper\']').hide(); openClose('new-wiki-form-wrapper'); 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>
+ <li><a href="#" class="fakelink" onclick="$('div[id^=\'edit-wiki-form-wrapper\']').hide(); openClose('new-wiki-form-wrapper'); 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="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>
+ <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;">
+ <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}}</button>
+ </div>
+ </div>
+ </form>
+ <div class="clear"></div>
+ </div>
+ {{/if}}
</div>
-
+{{$acl}}