Merge pull request #589 from anaqreon/wiki-gui
Active wiki highlighting, move wiki edit panel into wiki list
This commit is contained in:
git-marijus
GitHub
commit
a444c860a4
@ -910,7 +910,51 @@ function widget_wiki_list($arr) {
|
|||||||
if (!$channel) {
|
if (!$channel) {
|
||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
// init() should have forced the URL to redirect to /wiki/channel so assume argc() > 1
|
||||||
|
$nick = argv(1);
|
||||||
|
$owner = channelx_by_nick($nick); // The channel who owns the wikis being viewed
|
||||||
|
// Determine if the observer is the channel owner so the ACL dialog can be populated
|
||||||
|
if (local_channel() === intval($owner['channel_id'])) {
|
||||||
|
|
||||||
|
// Obtain the default permission settings of the channel
|
||||||
|
$owner_acl = array(
|
||||||
|
'allow_cid' => $owner['channel_allow_cid'],
|
||||||
|
'allow_gid' => $owner['channel_allow_gid'],
|
||||||
|
'deny_cid' => $owner['channel_deny_cid'],
|
||||||
|
'deny_gid' => $owner['channel_deny_gid']
|
||||||
|
);
|
||||||
|
// Initialize the ACL to the channel default permissions
|
||||||
|
$x = array(
|
||||||
|
'lockstate' => (( $owner['channel_allow_cid'] ||
|
||||||
|
$owner['channel_allow_gid'] ||
|
||||||
|
$owner['channel_deny_cid'] ||
|
||||||
|
$owner['channel_deny_gid']) ? 'lock' : 'unlock'
|
||||||
|
),
|
||||||
|
'acl' => populate_acl($owner_acl),
|
||||||
|
'allow_cid' => acl2json($owner_acl['allow_cid']),
|
||||||
|
'allow_gid' => acl2json($owner_acl['allow_gid']),
|
||||||
|
'deny_cid' => acl2json($owner_acl['deny_cid']),
|
||||||
|
'deny_gid' => acl2json($owner_acl['deny_gid']),
|
||||||
|
'bang' => ''
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
// Not the channel owner
|
||||||
|
$owner_acl = $x = array();
|
||||||
|
}
|
||||||
|
if(argc()>1) {
|
||||||
|
$activeWikiURLname = argv(2);
|
||||||
|
} else {
|
||||||
|
$activeWikiURLname = '';
|
||||||
|
}
|
||||||
|
logger($activeWikiURLname, LOGGER_DEBUG);
|
||||||
$wikis = wiki_list($channel, get_observer_hash());
|
$wikis = wiki_list($channel, get_observer_hash());
|
||||||
|
foreach($wikis['wikis'] as &$w) {
|
||||||
|
if($w['urlName'] === $activeWikiURLname) {
|
||||||
|
$w['active'] = true;
|
||||||
|
} else {
|
||||||
|
$w['active'] = false;
|
||||||
|
}
|
||||||
|
}
|
||||||
if ($wikis) {
|
if ($wikis) {
|
||||||
return replace_macros(get_markup_template('wikilist.tpl'), array(
|
return replace_macros(get_markup_template('wikilist.tpl'), array(
|
||||||
'$header' => t('Wiki List'),
|
'$header' => t('Wiki List'),
|
||||||
@ -921,7 +965,15 @@ function widget_wiki_list($arr) {
|
|||||||
'$edit' => t('Edit'),
|
'$edit' => t('Edit'),
|
||||||
'$download' => t('Download'),
|
'$download' => t('Download'),
|
||||||
'$view' => t('View'),
|
'$view' => t('View'),
|
||||||
'$addnew' => t('Add new wiki')
|
'$addnew' => t('Add new wiki'),
|
||||||
|
'$wikiName' => array('wikiName', t('Enter the name of your new wiki:'), '', ''),
|
||||||
|
'$lockstate' => $x['lockstate'],
|
||||||
|
'$acl' => $x['acl'],
|
||||||
|
'$allow_cid' => $x['allow_cid'],
|
||||||
|
'$allow_gid' => $x['allow_gid'],
|
||||||
|
'$deny_cid' => $x['deny_cid'],
|
||||||
|
'$deny_gid' => $x['deny_gid'],
|
||||||
|
'$bang' => $x['bang'],
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
return '';
|
return '';
|
||||||
|
|||||||
@ -43,47 +43,7 @@
|
|||||||
<h2><span id="wiki-header-name">{{$wikiheaderName}}</span>: <span id="wiki-header-page">{{$wikiheaderPage}}</span></h2>
|
<h2><span id="wiki-header-name">{{$wikiheaderName}}</span>: <span id="wiki-header-page">{{$wikiheaderPage}}</span></h2>
|
||||||
<div class="clear"></div>
|
<div class="clear"></div>
|
||||||
</div>
|
</div>
|
||||||
<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>
|
|
||||||
|
|
||||||
<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" type="submit" name="submit" >Create Wiki</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</form>
|
|
||||||
{{$acl}}
|
|
||||||
<div class="clear"></div>
|
|
||||||
<hr>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="edit-wiki-form-wrapper" 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 id="edit-wiki-submit" class="btn btn-success" type="submit" name="submit" >Edit Wiki</button>-->
|
|
||||||
<button class="btn btn-md btn-danger" onclick="wiki_delete_wiki(window.wiki_title, window.wiki_resource_id); return false;"><i class="fa fa-trash-o"></i> Delete Wiki</button>
|
|
||||||
</div>
|
|
||||||
</form> <div class="clear"></div>
|
|
||||||
<hr>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
|
<div id="new-page-form-wrapper" class="section-content-tools-wrapper" style="display:none;">
|
||||||
<form id="new-page-form" action="wiki/create/page" method="post" >
|
<form id="new-page-form" action="wiki/create/page" method="post" >
|
||||||
|
|||||||
@ -3,13 +3,55 @@
|
|||||||
<ul class="nav nav-pills nav-stacked">
|
<ul class="nav nav-pills nav-stacked">
|
||||||
{{if $wikis}}
|
{{if $wikis}}
|
||||||
{{foreach $wikis as $wiki}}
|
{{foreach $wikis as $wiki}}
|
||||||
<li>{{if $owner}}<a href="#" onclick="wiki_show_edit_wiki_form('{{$wiki.title}}', '{{$wiki.resource_id}}'); return false;" class="pull-right wikilist" title="{{$edit}}"><i class="fa fa-pencil"></i></a>{{/if}}
|
<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="#" 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>
|
<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> Delete Wiki</button>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
<div class="clear"></div>
|
||||||
|
</div>
|
||||||
|
{{/if}}
|
||||||
</li>
|
</li>
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
{{if $owner}}<li><a href="#" class="fakelink" onclick="wiki_show_new_wiki_form(); return false;"><i id="new-wiki-button" class="fa fa-plus-circle"></i> {{$addnew}}</a></li>{{/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> {{$addnew}}</a></li>{{/if}}
|
||||||
</ul>
|
</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>
|
||||||
|
{{/if}}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user