Compare commits
8 Commits
b81e5cf6e4
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 0ed8206959 | |||
| a7a27436b6 | |||
| 8f796bfaf0 | |||
| 1a8adbcfd8 | |||
| fd53bfa625 | |||
| e3641093ab | |||
| 339e171ec7 | |||
| e1e89b40fb |
@@ -105,8 +105,6 @@ div.picker button.toolbutton {
|
|||||||
margin-right: 0;
|
margin-right: 0;
|
||||||
margin-left: 1em;
|
margin-left: 1em;
|
||||||
}
|
}
|
||||||
.dokuwiki .editBar .editButtons button {
|
|
||||||
}
|
|
||||||
|
|
||||||
/* summary input and minor changes checkbox */
|
/* summary input and minor changes checkbox */
|
||||||
.dokuwiki .editBar .summary {
|
.dokuwiki .editBar .summary {
|
||||||
@@ -140,9 +138,46 @@ div.picker button.toolbutton {
|
|||||||
/* section edit buttons
|
/* section edit buttons
|
||||||
********************************************************************/
|
********************************************************************/
|
||||||
|
|
||||||
/* Hidden for now - positioning was problematic */
|
.dokuwiki .section-heading-row {
|
||||||
.dokuwiki .secedit {
|
display: flex;
|
||||||
display: none;
|
align-items: baseline;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dokuwiki .section-heading-row > .secedit {
|
||||||
|
flex-shrink: 0;
|
||||||
|
margin-left: .4em;
|
||||||
|
}
|
||||||
|
|
||||||
|
[dir=rtl] .dokuwiki .section-heading-row > .secedit {
|
||||||
|
margin-left: 0;
|
||||||
|
margin-right: .4em;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dokuwiki .section-heading-row > .secedit form {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dokuwiki .section-heading-row > .secedit button {
|
||||||
|
border: 0;
|
||||||
|
padding: .15em;
|
||||||
|
min-width: 1.25em;
|
||||||
|
background: transparent;
|
||||||
|
color: @ini_icons;
|
||||||
|
font-size: 0;
|
||||||
|
line-height: 1;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dokuwiki .section-heading-row > .secedit button::before {
|
||||||
|
content: '\270E edit';
|
||||||
|
opacity: 0.75;
|
||||||
|
font-style: italic;
|
||||||
|
font-size: .95rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.dokuwiki .section-heading-row > .secedit button:hover,
|
||||||
|
.dokuwiki .section-heading-row > .secedit button:focus {
|
||||||
|
color: @ini_link;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Sidebar should never show section edit buttons */
|
/* Sidebar should never show section edit buttons */
|
||||||
|
|||||||
BIN
images/apple-touch-icon.png
Executable file → Normal file
BIN
images/apple-touch-icon.png
Executable file → Normal file
Binary file not shown.
|
Before Width: | Height: | Size: 6.2 KiB After Width: | Height: | Size: 2.6 KiB |
130
main.php
130
main.php
@@ -8,59 +8,127 @@
|
|||||||
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
|
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
|
if (!defined("DOKU_INC")) {
|
||||||
|
die();
|
||||||
|
} /* must be run from within DokuWiki */
|
||||||
|
|
||||||
$hasSidebar = page_findnearest($conf['sidebar']);
|
// Replace default section edit buttons with a compact pencil icon
|
||||||
$showSidebar = $hasSidebar && ($ACT == 'show');
|
global $EVENT_HANDLER;
|
||||||
|
$EVENT_HANDLER->register_hook(
|
||||||
|
"HTML_SECEDIT_BUTTON",
|
||||||
|
"BEFORE",
|
||||||
|
null,
|
||||||
|
"_luxtools_secedit_button",
|
||||||
|
);
|
||||||
|
|
||||||
|
// Remove the edit page intro text ("Edit the page and hit Save...")
|
||||||
|
$EVENT_HANDLER->register_hook(
|
||||||
|
"PARSER_LOCALE_XHTML",
|
||||||
|
"BEFORE",
|
||||||
|
null,
|
||||||
|
"_luxtools_suppress_edit_intro",
|
||||||
|
);
|
||||||
|
|
||||||
|
function _luxtools_suppress_edit_intro(\dokuwiki\Extension\Event $event, $param)
|
||||||
|
{
|
||||||
|
if ($event->data['id'] === 'edit' || $event->data['id'] === 'editrev') {
|
||||||
|
$event->preventDefault();
|
||||||
|
$event->data['html'] = '';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function _luxtools_secedit_button(\dokuwiki\Extension\Event $event, $param)
|
||||||
|
{
|
||||||
|
global $ID, $INFO;
|
||||||
|
$data = $event->data;
|
||||||
|
|
||||||
|
if (!isset($data["name"]) || $data["name"] === "") {
|
||||||
|
$event->preventDefault();
|
||||||
|
$event->result = "";
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$name = $data["name"];
|
||||||
|
$secid = $data["secid"];
|
||||||
|
unset($data["name"], $data["secid"]);
|
||||||
|
|
||||||
|
$params = array_merge(
|
||||||
|
[
|
||||||
|
"do" => "edit",
|
||||||
|
"rev" => $INFO["lastmod"],
|
||||||
|
"summary" => "[" . $name . "] ",
|
||||||
|
],
|
||||||
|
$data,
|
||||||
|
);
|
||||||
|
|
||||||
|
$html =
|
||||||
|
'<div class="secedit editbutton_' .
|
||||||
|
hsc($data["target"]) .
|
||||||
|
" editbutton_" .
|
||||||
|
(int) $secid .
|
||||||
|
'">';
|
||||||
|
$html .= html_btn("secedit", $ID, "", $params, "post", $name);
|
||||||
|
$html .= "</div>";
|
||||||
|
|
||||||
|
$event->preventDefault();
|
||||||
|
$event->result = $html;
|
||||||
|
}
|
||||||
|
|
||||||
|
$hasSidebar = page_findnearest($conf["sidebar"]);
|
||||||
|
$showSidebar = $hasSidebar && $ACT == "show";
|
||||||
?><!DOCTYPE html>
|
?><!DOCTYPE html>
|
||||||
<html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
|
<html lang="<?php echo $conf["lang"]; ?>" dir="<?php echo $lang[
|
||||||
|
"direction"
|
||||||
|
]; ?>" class="no-js">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="utf-8" />
|
<meta charset="utf-8" />
|
||||||
<title><?php tpl_pagetitle() ?></title>
|
<title><?php tpl_pagetitle(); ?></title>
|
||||||
<?php tpl_metaheaders() ?>
|
<?php tpl_metaheaders(); ?>
|
||||||
<meta name="viewport" content="width=device-width,initial-scale=1" />
|
<meta name="viewport" content="width=device-width,initial-scale=1" />
|
||||||
<?php echo tpl_favicon(['favicon', 'mobile']) ?>
|
<?php echo tpl_favicon(["favicon", "mobile"]); ?>
|
||||||
<?php tpl_includeFile('meta.html') ?>
|
<?php tpl_includeFile("meta.html"); ?>
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php
|
<div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php echo $showSidebar
|
||||||
echo ($showSidebar) ? 'showSidebar' : ''; ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
|
? "showSidebar"
|
||||||
|
: ""; ?> <?php echo $hasSidebar ? "hasSidebar" : ""; ?>">
|
||||||
|
|
||||||
<?php include(__DIR__ . '/tpl_header.php') ?>
|
<?php include __DIR__ . "/tpl_header.php"; ?>
|
||||||
|
|
||||||
<div class="wrapper group">
|
<div class="wrapper group">
|
||||||
|
|
||||||
<?php if ($showSidebar): ?>
|
<?php if ($showSidebar): ?>
|
||||||
<!-- ********** ASIDE ********** -->
|
<!-- ********** ASIDE ********** -->
|
||||||
<nav id="dokuwiki__aside" aria-label="<?php echo $lang['sidebar']
|
<nav id="dokuwiki__aside" aria-label="<?php echo $lang[
|
||||||
?>"><div class="pad aside include group">
|
"sidebar"
|
||||||
<h3 class="toggle"><?php echo $lang['sidebar'] ?></h3>
|
]; ?>"><div class="pad aside include group">
|
||||||
|
<h3 class="toggle"><?php echo $lang["sidebar"]; ?></h3>
|
||||||
<div class="content"><div class="group">
|
<div class="content"><div class="group">
|
||||||
<?php tpl_flush() ?>
|
<?php tpl_flush(); ?>
|
||||||
<?php tpl_includeFile('sidebarheader.html') ?>
|
<?php tpl_includeFile("sidebarheader.html"); ?>
|
||||||
<?php tpl_include_page($conf['sidebar'], true, true) ?>
|
<?php tpl_include_page($conf["sidebar"], true, true); ?>
|
||||||
<?php tpl_includeFile('sidebarfooter.html') ?>
|
<?php tpl_includeFile("sidebarfooter.html"); ?>
|
||||||
</div></div>
|
</div></div>
|
||||||
</div></nav><!-- /aside -->
|
</div></nav><!-- /aside -->
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
|
|
||||||
<!-- ********** CONTENT ********** -->
|
<!-- ********** CONTENT ********** -->
|
||||||
<main id="dokuwiki__content"><div class="pad group">
|
<main id="dokuwiki__content"><div class="pad group">
|
||||||
<?php html_msgarea() ?>
|
<?php html_msgarea(); ?>
|
||||||
|
|
||||||
<div class="page group">
|
<div class="page group">
|
||||||
<?php tpl_flush() ?>
|
<?php tpl_flush(); ?>
|
||||||
<?php tpl_includeFile('pageheader.html') ?>
|
<?php tpl_includeFile("pageheader.html"); ?>
|
||||||
<!-- wikipage start -->
|
<!-- wikipage start -->
|
||||||
<?php tpl_content() ?>
|
<?php tpl_content(); ?>
|
||||||
<!-- wikipage stop -->
|
<!-- wikipage stop -->
|
||||||
<?php tpl_includeFile('pagefooter.html') ?>
|
<?php tpl_includeFile("pagefooter.html"); ?>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="docInfo"><?php tpl_pageinfo() ?></div>
|
<div class="docInfo"><?php tpl_pageinfo(); ?></div>
|
||||||
|
|
||||||
<?php tpl_flush() ?>
|
<?php tpl_flush(); ?>
|
||||||
|
|
||||||
<hr class="a11y" />
|
<hr class="a11y" />
|
||||||
</div></main><!-- /content -->
|
</div></main><!-- /content -->
|
||||||
@@ -70,13 +138,17 @@ $showSidebar = $hasSidebar && ($ACT == 'show');
|
|||||||
<!-- PAGE ACTIONS (Status Bar) -->
|
<!-- PAGE ACTIONS (Status Bar) -->
|
||||||
<?php
|
<?php
|
||||||
$menuClass = \dokuwiki\Menu\PageMenu::class;
|
$menuClass = \dokuwiki\Menu\PageMenu::class;
|
||||||
include(__DIR__ . '/tpl_pagetools.php');
|
include __DIR__ . "/tpl_pagetools.php";
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<?php include(__DIR__ . '/tpl_footer.php') ?>
|
<?php include __DIR__ . "/tpl_footer.php"; ?>
|
||||||
</div></div><!-- /site -->
|
</div></div><!-- /site -->
|
||||||
|
|
||||||
<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
|
<div class="no"><?php tpl_indexerWebBug();
|
||||||
<div id="screen__mode" class="no"></div><?php /* helper to detect CSS media query in script.js */ ?>
|
/* provide DokuWiki housekeeping, required in all templates */
|
||||||
|
?></div>
|
||||||
|
<div id="screen__mode" class="no"></div><?php
|
||||||
|
/* helper to detect CSS media query in script.js */
|
||||||
|
?>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
21
script.js
21
script.js
@@ -139,6 +139,27 @@ jQuery(function(){
|
|||||||
}
|
}
|
||||||
}());
|
}());
|
||||||
|
|
||||||
|
// Relocate section edit buttons next to their headings.
|
||||||
|
// DokuWiki renders the edit marker after the section content div,
|
||||||
|
// so we match by secid: .editbutton_N belongs to h*.sectioneditN.
|
||||||
|
(function enhanceSectionEditButtons() {
|
||||||
|
jQuery('#dokuwiki__content .secedit[class*="editbutton_"]').each(function () {
|
||||||
|
var $btn = jQuery(this);
|
||||||
|
var match = $btn.attr('class').match(/editbutton_(\d+)/);
|
||||||
|
if (!match) return;
|
||||||
|
|
||||||
|
var $heading = jQuery('#dokuwiki__content .sectionedit' + match[1]);
|
||||||
|
if (!$heading.length || !$heading.is('h1,h2,h3,h4,h5,h6')) return;
|
||||||
|
|
||||||
|
// Skip if already relocated
|
||||||
|
if ($heading.parent().hasClass('section-heading-row')) return;
|
||||||
|
|
||||||
|
var $wrapper = jQuery('<div/>', {'class': 'section-heading-row'});
|
||||||
|
$heading.before($wrapper);
|
||||||
|
$wrapper.append($heading, $btn);
|
||||||
|
});
|
||||||
|
}());
|
||||||
|
|
||||||
// enhance header search with suggestions and keyboard navigation
|
// enhance header search with suggestions and keyboard navigation
|
||||||
(function enhanceSearch(){
|
(function enhanceSearch(){
|
||||||
var $input = jQuery('#qsearch__in');
|
var $input = jQuery('#qsearch__in');
|
||||||
|
|||||||
@@ -88,5 +88,3 @@ __tablet_width__ = "800px" ; @ini_tablet_width
|
|||||||
__phone_width__ = "480px" ; @ini_phone_width
|
__phone_width__ = "480px" ; @ini_phone_width
|
||||||
|
|
||||||
__theme_color__ = "#008800" ; @_ini_theme_color: theme_color of the web app
|
__theme_color__ = "#008800" ; @_ini_theme_color: theme_color of the web app
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -16,6 +16,15 @@ if ($conf['useacl']) {
|
|||||||
$breadcrumbsHtml = '';
|
$breadcrumbsHtml = '';
|
||||||
if ($conf['youarehere']) {
|
if ($conf['youarehere']) {
|
||||||
$breadcrumbsHtml = tpl_youarehere(null, true);
|
$breadcrumbsHtml = tpl_youarehere(null, true);
|
||||||
|
// Remove the "You are here" label and the start page link,
|
||||||
|
// since the wiki logo already links to the start page.
|
||||||
|
if ($breadcrumbsHtml) {
|
||||||
|
// Strip the label span and the home/start page span
|
||||||
|
$breadcrumbsHtml = preg_replace('/<span class="bchead">.*?<\/span>/', '', $breadcrumbsHtml);
|
||||||
|
$breadcrumbsHtml = preg_replace('/<span class="home">.*?<\/span>/', '', $breadcrumbsHtml);
|
||||||
|
// Remove any leading separator left over after stripping the home link
|
||||||
|
$breadcrumbsHtml = preg_replace('/^\s*»\s*/', '' , trim($breadcrumbsHtml));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (!$breadcrumbsHtml && $conf['breadcrumbs']) {
|
if (!$breadcrumbsHtml && $conf['breadcrumbs']) {
|
||||||
$breadcrumbsHtml = tpl_breadcrumbs(null, true);
|
$breadcrumbsHtml = tpl_breadcrumbs(null, true);
|
||||||
|
|||||||
Reference in New Issue
Block a user