Merge branch 'starred' into 'master'

SPR-940 Starred Plugin Integration

See merge request !41
This commit is contained in:
Jana Deutschländer 2017-04-24 14:06:04 +02:00
commit d80bb21849
6 changed files with 73 additions and 5 deletions

View file

@ -48,6 +48,35 @@
</div>
</nav>
<?php
/** @var helper_plugin_starred $plugin_starred */
$plugin_starred = plugin_load('helper', 'starred');
$stars = array();
if($plugin_starred) $stars = $plugin_starred->loadStars();
if($stars):
?>
<nav class="nav-starred">
<a class="nav" role="heading" aria-level="2">
<span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/star-circle.svg') ?></span>
<span class="lbl"><?php echo tpl_getLang('head_menu_starred'); ?></span>
</a>
<div class="nav-panel level1 plugin_starred">
<ul>
<?php
foreach($stars as $pid => $time) {
echo '<li>';
echo $plugin_starred->starHtml($ID, $pid);
echo '&nbsp;';
echo html_wikilink(":$pid");
echo '</li>';
}
?>
</ul>
</div>
</nav>
<?php endif; ?>
<?php if($conf['breadcrumbs']): ?>
<nav class="nav-trace">

View file

@ -5,9 +5,10 @@ if(!defined('DOKU_INC')) die();
$doPlugin = plugin_load('helper', 'do');
/** @var \helper_plugin_qc $qcPlugin */
$qcPlugin = plugin_load('helper', 'qc');
/** @var \action_plugin_starred $starredPlugin */
$starredPlugin = plugin_load('action', 'starred');
if($doPlugin !== null || $qcPlugin !== null) {
if($doPlugin !== null || $qcPlugin !== null || $starredPlugin !== null) {
echo '<ul class="page-attributes">';
}
@ -40,6 +41,12 @@ if($doPlugin !== null) {
echo $markup;
}
if($doPlugin !== null || $qcPlugin !== null) {
if($starredPlugin !== null) {
echo '<li class="plugin_starred">';
$starredPlugin->tpl_starred();
echo '</li>';
}
if($doPlugin !== null || $qcPlugin !== null || $starredPlugin !== null) {
echo "</ul>";
}