summaryrefslogtreecommitdiff
path: root/lib/tpl/dokuwiki
diff options
context:
space:
mode:
Diffstat (limited to 'lib/tpl/dokuwiki')
-rw-r--r--lib/tpl/dokuwiki/css/_links.css6
-rw-r--r--lib/tpl/dokuwiki/css/basic.css2
-rw-r--r--lib/tpl/dokuwiki/css/design.css18
-rw-r--r--lib/tpl/dokuwiki/css/mobile.css8
-rw-r--r--lib/tpl/dokuwiki/css/structure.css8
-rw-r--r--lib/tpl/dokuwiki/detail.php10
-rw-r--r--lib/tpl/dokuwiki/images/email.pngbin502 -> 659 bytes
-rw-r--r--lib/tpl/dokuwiki/images/external-link.pngbin758 -> 816 bytes
-rw-r--r--lib/tpl/dokuwiki/images/unc.pngbin517 -> 553 bytes
-rw-r--r--lib/tpl/dokuwiki/main.php15
-rw-r--r--lib/tpl/dokuwiki/mediamanager.php7
-rw-r--r--lib/tpl/dokuwiki/script.js10
12 files changed, 45 insertions, 39 deletions
diff --git a/lib/tpl/dokuwiki/css/_links.css b/lib/tpl/dokuwiki/css/_links.css
index c8f5b7c9e..22502f6a9 100644
--- a/lib/tpl/dokuwiki/css/_links.css
+++ b/lib/tpl/dokuwiki/css/_links.css
@@ -39,12 +39,11 @@
.dokuwiki a.interwiki {
background-repeat: no-repeat;
background-position: 0 center;
- padding: 0 0 0 20px;
+ padding: 0 0 0 18px;
}
/* external link */
.dokuwiki a.urlextern {
background-image: url(images/external-link.png);
- padding: 0 0 0 17px;
}
/* windows share */
.dokuwiki a.windows {
@@ -61,7 +60,6 @@
}
/* interwiki link */
.dokuwiki a.interwiki {
- padding: 0 0 0 17px;
}
/* RTL corrections; if link icons don't work as expected, remove the following lines */
@@ -71,5 +69,5 @@
[dir=rtl] .dokuwiki a.interwiki,
[dir=rtl] .dokuwiki a.mediafile {
background-position: right center;
- padding: 0 17px 0 0;
+ padding: 0 18px 0 0;
}
diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.css
index eb659f12e..21bc9b25e 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.css
@@ -45,7 +45,7 @@ legend {
h1 {
font-size: 2em;
- margin: -.222em 0 0.444em;
+ margin: 0 0 0.444em;
}
h2 {
font-size: 1.5em;
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
index 4f18b79e8..d1a00ce0a 100644
--- a/lib/tpl/dokuwiki/css/design.css
+++ b/lib/tpl/dokuwiki/css/design.css
@@ -340,7 +340,7 @@
border: 1px solid #eee;
box-shadow: 0 0 .5em #999;
border-radius: 2px;
- padding: 2em;
+ padding: 1.556em 2em 2em;
margin-bottom: .5em;
overflow: hidden;
word-wrap: break-word;
@@ -426,21 +426,31 @@
.dokuwiki div.preview {
margin: 0 -2em;
- padding: 2em;
+ padding: 0 2em;
+}
+.dokuwiki.hasSidebar div.preview {
+ border-right: __sidebar_width__ solid __background_alt__;
+}
+[dir=rtl] .dokuwiki.hasSidebar div.preview {
+ border-right-width: 0;
+ border-left: __sidebar_width__ solid __background_alt__;
+}
+.dokuwiki div.preview div.pad {
+ padding: 1.556em 0 2em;
}
/*____________ changes to _toc ____________*/
#dw__toc {
- margin: -2em -2em .5em 1.4em;
+ margin: -1.556em -2em .5em 1.4em;
width: __sidebar_width__;
border-left: 1px solid __border__;
background: __background__;
color: inherit;
}
[dir=rtl] #dw__toc {
- margin: -2em 1.4em .5em -2em;
+ margin: -1.556em 1.4em .5em -2em;
border-left-width: 0;
border-right: 1px solid __border__;
}
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index 4d18113ac..5a72ed095 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -28,17 +28,17 @@
margin-bottom: .5em;
}
-.hasSidebar #dokuwiki__content {
+.showSidebar #dokuwiki__content {
float: none;
margin-left: 0;
width: 100%;
}
-.hasSidebar #dokuwiki__content > .pad {
+.showSidebar #dokuwiki__content > .pad {
margin-left: 0;
}
-[dir=rtl] .hasSidebar #dokuwiki__content,
-[dir=rtl] .hasSidebar #dokuwiki__content > .pad {
+[dir=rtl] .showSidebar #dokuwiki__content,
+[dir=rtl] .showSidebar #dokuwiki__content > .pad {
margin-right: 0;
}
diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css
index 5e2eab3bc..00642e90b 100644
--- a/lib/tpl/dokuwiki/css/structure.css
+++ b/lib/tpl/dokuwiki/css/structure.css
@@ -56,20 +56,20 @@ body {
margin: 0 0 0 1.5em;
}
- .hasSidebar #dokuwiki__content {
+ .showSidebar #dokuwiki__content {
float: right;
margin-left: -__sidebar_width__;
width: 100%;
}
- [dir=rtl] .hasSidebar #dokuwiki__content {
+ [dir=rtl] .showSidebar #dokuwiki__content {
float: left;
margin-left: 0;
margin-right: -__sidebar_width__;
}
- .hasSidebar #dokuwiki__content > .pad {
+ .showSidebar #dokuwiki__content > .pad {
margin-left: __sidebar_width__;
}
- [dir=rtl] .hasSidebar #dokuwiki__content > .pad {
+ [dir=rtl] .showSidebar #dokuwiki__content > .pad {
margin-left: 0;
margin-right: __sidebar_width__;
}
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index a3516a7ed..bb64b42cb 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -10,11 +10,8 @@
// must be run from within DokuWiki
if (!defined('DOKU_INC')) die();
-$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show');
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>"
- lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>">
+?><!DOCTYPE html>
+<html lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
@@ -22,6 +19,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
<?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?>
[<?php echo strip_tags($conf['title'])?>]
</title>
+ <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
<?php tpl_metaheaders()?>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<?php echo tpl_favicon(array('favicon', 'mobile')) ?>
@@ -31,7 +29,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
<body>
<!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
<div id="dokuwiki__site"><div id="dokuwiki__top"
- class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
+ class="dokuwiki site mode_<?php echo $ACT ?>">
<?php include('tpl_header.php') ?>
diff --git a/lib/tpl/dokuwiki/images/email.png b/lib/tpl/dokuwiki/images/email.png
index 5128be895..d1d4a5fd5 100644
--- a/lib/tpl/dokuwiki/images/email.png
+++ b/lib/tpl/dokuwiki/images/email.png
Binary files differ
diff --git a/lib/tpl/dokuwiki/images/external-link.png b/lib/tpl/dokuwiki/images/external-link.png
index 084135f95..a4d5de17c 100644
--- a/lib/tpl/dokuwiki/images/external-link.png
+++ b/lib/tpl/dokuwiki/images/external-link.png
Binary files differ
diff --git a/lib/tpl/dokuwiki/images/unc.png b/lib/tpl/dokuwiki/images/unc.png
index f2aca8815..a552d6e6f 100644
--- a/lib/tpl/dokuwiki/images/unc.png
+++ b/lib/tpl/dokuwiki/images/unc.png
Binary files differ
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index d8e85850f..563d9c949 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -10,15 +10,15 @@
if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */
-$showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show');
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang'] ?>"
- lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>">
+$hasSidebar = page_findnearest($conf['sidebar']);
+$showSidebar = $hasSidebar && ($ACT=='show');
+?><!DOCTYPE html>
+<html lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
<title><?php tpl_pagetitle() ?> [<?php echo strip_tags($conf['title']) ?>]</title>
+ <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
<?php tpl_metaheaders() ?>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<?php echo tpl_favicon(array('favicon', 'mobile')) ?>
@@ -28,7 +28,8 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
<body>
<!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
<div id="dokuwiki__site"><div id="dokuwiki__top"
- class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
+ class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'showSidebar' : '';
+ ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
<?php include('tpl_header.php') ?>
@@ -41,7 +42,7 @@ $showSidebar = $conf['sidebar'] && page_exists($conf['sidebar']) && ($ACT=='show
<div class="content">
<?php tpl_flush() ?>
<?php tpl_includeFile('sidebarheader.html') ?>
- <?php tpl_include_page($conf['sidebar']) ?>
+ <?php tpl_sidebar() ?>
<?php tpl_includeFile('sidebarfooter.html') ?>
</div>
</div></div><!-- /aside -->
diff --git a/lib/tpl/dokuwiki/mediamanager.php b/lib/tpl/dokuwiki/mediamanager.php
index 1f3b9661b..4919632c9 100644
--- a/lib/tpl/dokuwiki/mediamanager.php
+++ b/lib/tpl/dokuwiki/mediamanager.php
@@ -8,10 +8,8 @@
// must be run from within DokuWiki
if (!defined('DOKU_INC')) die();
-?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>"
- lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="popup">
+?><!DOCTYPE html>
+<html lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="popup no-js">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
@@ -19,6 +17,7 @@ if (!defined('DOKU_INC')) die();
<?php echo hsc($lang['mediaselect'])?>
[<?php echo strip_tags($conf['title'])?>]
</title>
+ <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
<?php tpl_metaheaders()?>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<?php echo tpl_favicon(array('favicon', 'mobile')) ?>
diff --git a/lib/tpl/dokuwiki/script.js b/lib/tpl/dokuwiki/script.js
index 677e2f53b..d858bda89 100644
--- a/lib/tpl/dokuwiki/script.js
+++ b/lib/tpl/dokuwiki/script.js
@@ -7,7 +7,7 @@
* - tablet 481 - 979 (ostensibly for tablets in portrait mode)
* - phone <= 480
*/
-var device_class = 'not yet known';
+var device_class = ''; // not yet known
var device_classes = 'desktop mobile tablet phone';
function tpl_dokuwiki_mobile(){
@@ -67,9 +67,9 @@ jQuery(function(){
);
// increase sidebar length to match content (desktop mode only)
- var $sb = jQuery('.desktop #dokuwiki__aside');
- if($sb.length) {
- var $ct = jQuery('#dokuwiki__content div.page');
- if($sb.height() > $ct.height()) $ct.height($sb.height());
+ var $sidebar = jQuery('.desktop #dokuwiki__aside');
+ if($sidebar.length) {
+ var $content = jQuery('#dokuwiki__content div.page');
+ $content.css('min-height', $sidebar.height());
}
});
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-26 08:49:04 +0000