EH22/dokuwiki-template-sprintdoc-modified
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into fixDoDashboardLink

Browse source
This commit is contained in:
Michael Große 2017-04-19 16:17:32 +02:00
commit c75ed2051f
No known key found for this signature in database
GPG key ID: 7E31028FBFEACC79
21 changed files with 814 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tpl/favicon_tiles.php
View file

@ -17,7 +17,7 @@ echo Template::getResizedImgTag(
'link',
array(
'rel' => 'shortcut icon',
'href' => array('wiki:favicon.ico', 'wiki:favicon.png')
'href' => array('wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo-square.png')
),
0, 0 // no scaling
);
@ -29,7 +29,7 @@ foreach(array(57, 60, 72, 76, 114, 120, 144, 152, 180) as $size) {
array(
'rel' => 'apple-touch-icon',
'sizes' => $size . 'x' . $size,
'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png')
'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo.png'),
),
$size, $size
);
@ -42,7 +42,7 @@ foreach(array(32, 96, 192) as $size) {
array(
'rel' => 'icon',
'sizes' => $size . 'x' . $size,
'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png')
'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo.png')
),
$size, $size
);
@ -54,7 +54,7 @@ foreach(array(70, 310) as $size) {
'meta',
array(
'name' => 'msapplication-square' . $size . 'x' . $size . 'logo',
'content' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png')
'content' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo.png'),
),
$size, $size
);

2
tpl/nav-meta-box.php
View file

@ -12,7 +12,7 @@ $tabs = \dokuwiki\template\sprintdoc\Template::getInstance()->getMetaBoxTabs();
if (empty($tab['tab']) || trim($tab['tab']) === '') {
continue;
}
echo '<li>';
echo '<li class="' . $tab['id'] . '">';
echo '<a href="#' . $tab['id'] . '" aria-expanded="false">';
echo '<span class="prefix">';
echo $tab['label'];

57
tpl/nav-page-attributes.php Executable file
View file

@ -0,0 +1,57 @@
<?php
if(!defined('DOKU_INC')) die();
/** @var \helper_plugin_do $doPlugin */
$doPlugin = plugin_load('helper', 'do');
/** @var \helper_plugin_qc $qcPlugin */
$qcPlugin = plugin_load('helper', 'qc');
if($doPlugin !== null || $qcPlugin !== null) {
echo '<ul class="page-attributes">';
}
if($qcPlugin && $qcPlugin->shouldShow()) {
echo '<li class="plugin_qc"><a href="#">…</a></li>'; // filled by javascript
}
if($doPlugin !== null) {
$count = $doPlugin->getPageTaskCount();
$num = $count['count'];
$title = "";
if($num == 0) { // no tasks - does not exist do in plug-in
$class = "do_none";
$title = tpl_getLang('tasks_page_none');
} elseif($count['undone'] == 0) { // all tasks done
$class = 'do_done';
$title = $this->getLang('title_alldone');
} elseif($count['late'] == 0) { // open tasks but none late
$class = 'do_undone';
$title = sprintf(tpl_getLang('title_intime'), $count['undone']);
} else { // late tasks
$class = 'do_late';
$title = sprintf(tpl_getLang('title_late'), $count['undone'], $count['late']);
}
$markup = "<li class=\"plugin__do_pagetasks " . $class . "\" title=\"'.$title.'\"><strong><span class=\"prefix\">" . tpl_getLang('prefix_tasks_page') . " </span><span class=\"num\">" . $num . "</span></strong></li>";
echo $markup;
}
if($doPlugin !== null || $qcPlugin !== null) {
echo "</ul>";
}
/*
$out = '<div class="plugin__do_pagetasks" title="' . $title . '"><span class="' . $class . '">';
$out .= $count['undone'];
$out .= '</span></div>';
if($return) return $out;
echo $out;*/

54
tpl/nav-page-quality-tasks.php
View file

@ -1,54 +0,0 @@
<?php
if (!defined('DOKU_INC')) die();
?>
<?php
/** @var \helper_plugin_do $doPlugin */
$doPlugin = plugin_load('helper','do');
/** @var \helper_plugin_qc $qc */
$qc = plugin_load('helper','qc');
if ($doPlugin !== null ||$qc ) {
echo "<ul class=\"page-attributes\">";
}
if ($qc) {
echo "<li class=\"plugin__qc do_none\"><a id=\"plugin__qc__link\" aria-expanded=\"false\" href=\"#plugin__qc__wrapper\"><span class=\"prefix\">".tpl_getLang('quality_trigger')."</span><span class=\"num\">0</span></strong></a>";
$qc->tplErrorCount();
echo "</li>";
}
if ($doPlugin !== null ) {
$count = $doPlugin->getPageTaskCount();
$num = $count['count'];
$title = "";
if($num == 0){ // no tasks - does not exist do in plug-in
$class = "do_none";
$title = tpl_getLang('tasks_page_none');
} elseif($count['undone'] == 0){ // all tasks done
$class = 'do_done';
$title = $this->getLang('title_alldone');
}elseif($count['late'] == 0) { // open tasks but none late
$class = 'do_undone';
$title = sprintf($this->getLang('title_intime'), $count['undone']);
} else { // late tasks
$class = 'do_late';
$title = sprintf($this->getLang('title_late'), $count['undone'], $count['late']);
}
$markup = "<li class=\"plugin__do_pagetasks ".$class."\" title=\"'.$title.'\"><strong><span class=\"prefix\">".tpl_getLang('prefix_tasks_page')." </span><span class=\"num\">".$num."</span></strong></li>";
echo $markup;
}
if ($doPlugin !== null ||$qc ) {
echo "</ul>";
}
/*
$out = '<div class="plugin__do_pagetasks" title="' . $title . '"><span class="' . $class . '">';
$out .= $count['undone'];
$out .= '</span></div>';
if($return) return $out;
echo $out;*/