summaryrefslogtreecommitdiff
path: root/lib/tpl/dokuwiki
diff options
context:
space:
mode:
Diffstat (limited to 'lib/tpl/dokuwiki')
-rw-r--r--lib/tpl/dokuwiki/css/_forms.css1
-rw-r--r--lib/tpl/dokuwiki/css/_media_fullscreen.css1
-rw-r--r--lib/tpl/dokuwiki/css/_media_popup.css1
-rw-r--r--lib/tpl/dokuwiki/detail.php20
-rw-r--r--lib/tpl/dokuwiki/main.php25
-rw-r--r--lib/tpl/dokuwiki/style.ini3
-rw-r--r--lib/tpl/dokuwiki/tpl_footer.php3
-rw-r--r--lib/tpl/dokuwiki/tpl_header.php2
8 files changed, 26 insertions, 30 deletions
diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 4d3f2b97a..522f9ed4d 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -1,4 +1,3 @@
-
/* TODO: this file is not up to the best standards and will be fixed after an overhaul of the form code */
/**
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 28e347882..31b71897b 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -501,4 +501,3 @@
width: 100%;
max-width: none;
}
-
diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css
index 1fefd68b6..20d669c14 100644
--- a/lib/tpl/dokuwiki/css/_media_popup.css
+++ b/lib/tpl/dokuwiki/css/_media_popup.css
@@ -154,6 +154,7 @@ html.popup {
#media__content a.mediafile {
margin-right: 1.5em;
font-weight: bold;
+ cursor: pointer;
}
[dir=rtl] #media__content a.mediafile {
margin-right: 0;
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 7e46231d3..ec846f6fd 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -28,8 +28,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
<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="site <?php echo tpl_classes(); ?> <?php
- echo ($showSidebar) ? 'showSidebar' : ''; ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
+ <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?>">
<?php include('tpl_header.php') ?>
@@ -111,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>';
-
- // the page tools can be ammended 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['tpl'] here
- $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY';
- $evt = new Doku_Event($hook, $data);
+ $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
+ $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 9e507d86d..3bc46406a 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -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 ammended 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['tpl'] here
- $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY';
- $evt = new Doku_Event($hook, $data);
+ // the page tools can be amended through a custom plugin hook
+ $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_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index b7dc9c631..00417de9c 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -29,4 +29,5 @@ if (!defined('DOKU_INC')) die();
</div>
</div></div><!-- /footer -->
-<?php tpl_includeFile('footer.html') ?>
+<?php
+tpl_includeFile('footer.html');
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-17 14:08:45 +0000