summaryrefslogtreecommitdiff
path: root/lib/tpl
diff options
context:
space:
mode:
Diffstat (limited to 'lib/tpl')
-rw-r--r--lib/tpl/dokuwiki/css/basic.less4
-rw-r--r--lib/tpl/dokuwiki/css/content.less22
-rw-r--r--lib/tpl/dokuwiki/css/design.less79
-rw-r--r--lib/tpl/dokuwiki/css/mobile.less30
-rw-r--r--lib/tpl/dokuwiki/detail.php13
-rw-r--r--lib/tpl/dokuwiki/main.php25
-rw-r--r--lib/tpl/dokuwiki/style.ini3
-rw-r--r--lib/tpl/dokuwiki/tpl_header.php2
8 files changed, 102 insertions, 76 deletions
diff --git a/lib/tpl/dokuwiki/css/basic.less b/lib/tpl/dokuwiki/css/basic.less
index 5886889fd..c296185e9 100644
--- a/lib/tpl/dokuwiki/css/basic.less
+++ b/lib/tpl/dokuwiki/css/basic.less
@@ -101,7 +101,9 @@ address {
padding: 0;
}
-div {
+div,
+video,
+audio {
margin: 0;
padding: 0;
}
diff --git a/lib/tpl/dokuwiki/css/content.less b/lib/tpl/dokuwiki/css/content.less
index a5ffbf2be..a2e343a33 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -67,19 +67,19 @@
/*____________ lists ____________*/
-#dokuwiki__content ul li,
-#dokuwiki__aside ul li {
- color: @ini_text_alt;
-}
+.dokuwiki .page,
+.dokuwiki .aside {
+ ul li {
+ color: @ini_text_alt;
+ }
-#dokuwiki__content ol li,
-#dokuwiki__aside ol li {
- color: @ini_text_neu;
-}
+ ol li {
+ color: @ini_text_neu;
+ }
-#dokuwiki__content li .li,
-#dokuwiki__aside li .li {
- color: @ini_text;
+ li .li {
+ color: @ini_text;
+ }
}
/*____________ tables ____________*/
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
index 42292de49..46b4a045b 100644
--- a/lib/tpl/dokuwiki/css/design.less
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -186,50 +186,50 @@
text-align: right;
form.search {
- display: block;
font-size: 0.875em;
- position: relative;
+ }
+}
- input.edit {
- width: 18em;
- padding: .35em 22px .35em .1em;
- }
+[dir=rtl] #dokuwiki__sitetools {
+ text-align: left;
+}
- input.button {
- background: transparent url(images/search.png) no-repeat 0 0;
- border-width: 0;
- width: 19px;
- height: 14px;
- text-indent: -99999px;
- margin-left: -20px;
- box-shadow: none;
- padding: 0;
- }
+form.search {
+ display: block;
+ position: relative;
+ margin-bottom: 0.5em;
+
+ input.edit {
+ width: 18em;
+ padding: .35em 22px .35em .1em;
}
- ul {
- margin-top: 0.5em;
+ input.button {
+ background: transparent url(images/search.png) no-repeat 0 0;
+ border-width: 0;
+ width: 19px;
+ height: 14px;
+ text-indent: -99999px;
+ margin-left: -20px;
+ box-shadow: none;
+ padding: 0;
}
}
-[dir=rtl] #dokuwiki__sitetools {
- text-align: left;
-
- form.search {
- input.edit {
- padding: .35em .1em .35em 22px;
- }
+[dir=rtl] form.search {
+ input.edit {
+ padding: .35em .1em .35em 22px;
+ }
- input.button {
- background-position: 5px 0;
- margin-left: 0;
- margin-right: -20px;
- position: relative;
- }
+ input.button {
+ background-position: 5px 0;
+ margin-left: 0;
+ margin-right: -20px;
+ position: relative;
}
}
-#IE7 #dokuwiki__sitetools form.search {
+#IE7 form.search {
min-height: 1px;
z-index: 21;
}
@@ -278,13 +278,10 @@
/* sidebar
********************************************************************/
-#dokuwiki__aside {
-
- > .pad {
- font-size: 0.875em;
- overflow: hidden;
- word-wrap: break-word;
- }
+.dokuwiki .aside {
+ font-size: 0.875em;
+ overflow: hidden;
+ word-wrap: break-word;
/* make sidebar more condensed */
@@ -340,8 +337,8 @@
}
}
-[dir=rtl] #dokuwiki__aside ul,
-[dir=rtl] #dokuwiki__aside ol {
+[dir=rtl] .dokuwiki .aside ul,
+[dir=rtl] .dokuwiki .aside ol {
padding-right: .5em;
}
diff --git a/lib/tpl/dokuwiki/css/mobile.less b/lib/tpl/dokuwiki/css/mobile.less
index 289f5afa3..75ae5dbe4 100644
--- a/lib/tpl/dokuwiki/css/mobile.less
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -65,6 +65,15 @@
margin-right: 0;
}
+/* preview */
+.dokuwiki.hasSidebar div.preview {
+ border-right: none;
+}
+
+[dir=rtl] .dokuwiki.hasSidebar div.preview {
+ border-left: none;
+}
+
/* toc */
#dw__toc {
float: none;
@@ -96,6 +105,15 @@
overflow: auto;
}
+/* push pagetools closer to content */
+#dokuwiki__pagetools {
+ top: 0;
+}
+.showSidebar #dokuwiki__pagetools {
+ top: 3.5em;
+}
+
+
/* _edit */
.dokuwiki div.section_highlight {
margin: 0 -1em;
@@ -290,5 +308,17 @@ body {
}
+} /* /@media */
+
+
+/* for screen heights smaller than the pagetools permit
+********************************************************************/
+@media only screen and (max-height: 400px) {
+// 400px is only roughly the required value, this may be wrong under non-standard circumstances
+
+#dokuwiki__pagetools div.tools {
+ position: static;
+}
+
} /* /@media */
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index c602830f7..ec846f6fd 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -110,26 +110,23 @@ header('X-UA-Compatible: IE=edge,chrome=1');
<ul>
<?php
$data = array();
+ $data['view'] = 'detail';
// View in media manager; @todo: transfer logic to backend
$imgNS = getNS($IMG);
$authNS = auth_quickaclcheck("$imgNS:*");
if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) {
$mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG));
- $data['mediaManager'] = '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>';
+ $data['items']['mediaManager'] = '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>';
}
// Back to [ID]; @todo: transfer logic to backend
- $data['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
+ $data['items']['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
// the page tools can be amended through a custom plugin hook
- // if you're deriving from this template and your design is close enough to
- // the dokuwiki template you might want to trigger a DOKUWIKI event instead
- // of using $conf['template'] here
- $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
- $evt = new Doku_Event($hook, $data);
+ $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data);
if($evt->advise_before()){
- foreach($evt->data as $k => $html) echo $html;
+ foreach($evt->data['items'] as $k => $html) echo $html;
}
$evt->advise_after();
unset($data);
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index f6ca4ed86..44fef81eb 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -36,7 +36,7 @@ $showSidebar = $hasSidebar && ($ACT=='show');
<?php if($showSidebar): ?>
<!-- ********** ASIDE ********** -->
- <div id="dokuwiki__aside"><div class="pad include group">
+ <div id="dokuwiki__aside"><div class="pad aside include group">
<h3 class="toggle"><?php echo $lang['sidebar'] ?></h3>
<div class="content">
<?php tpl_flush() ?>
@@ -75,22 +75,21 @@ $showSidebar = $hasSidebar && ($ACT=='show');
<ul>
<?php
$data = array(
- 'edit' => tpl_action('edit', 1, 'li', 1, '<span>', '</span>'),
- 'revert' => tpl_action('revert', 1, 'li', 1, '<span>', '</span>'),
- 'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'),
- 'backlink' => tpl_action('backlink', 1, 'li', 1, '<span>', '</span>'),
- 'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'),
- 'top' => tpl_action('top', 1, 'li', 1, '<span>', '</span>')
+ 'view' => 'main',
+ 'items' => array(
+ 'edit' => tpl_action('edit', 1, 'li', 1, '<span>', '</span>'),
+ 'revert' => tpl_action('revert', 1, 'li', 1, '<span>', '</span>'),
+ 'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'),
+ 'backlink' => tpl_action('backlink', 1, 'li', 1, '<span>', '</span>'),
+ 'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'),
+ 'top' => tpl_action('top', 1, 'li', 1, '<span>', '</span>')
+ )
);
// the page tools can be amended through a custom plugin hook
- // if you're deriving from this template and your design is close enough to
- // the dokuwiki template you might want to trigger a DOKUWIKI event instead
- // of using $conf['template'] here
- $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
- $evt = new Doku_Event($hook, $data);
+ $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data);
if($evt->advise_before()){
- foreach($evt->data as $k => $html) echo $html;
+ foreach($evt->data['items'] as $k => $html) echo $html;
}
$evt->advise_after();
unset($data);
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 897b6e6da..cc23c169f 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -2,7 +2,8 @@
; for limitations of the ini format used here
; To extend this file or make changes to it, it is recommended to create
-; a style.local.ini file to prevent losing any changes after an upgrade.
+; a local conf/tpl/<template-folder-name>/style.ini file to prevent losing
+; any changes after an upgrade.
; Please don't forget to copy the section your changes should be under
; (i.e. [stylesheets] or [replacements]) into that file as well.
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 19d165059..a2bfd4346 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -41,7 +41,7 @@ if (!defined('DOKU_INC')) die();
<h3 class="a11y"><?php echo $lang['user_tools']; ?></h3>
<ul>
<?php
- if ($_SERVER['REMOTE_USER']) {
+ if (!empty($_SERVER['REMOTE_USER'])) {
echo '<li class="user">';
tpl_userinfo(); /* 'Logged in as ...' */
echo '</li>';
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-10 14:01:07 +0000