summaryrefslogtreecommitdiff
path: root/lib/tpl/dokuwiki
diff options
context:
space:
mode:
authorAnika Henke <anika@selfthinker.org>2013-11-02 13:10:14 +0000
committerAnika Henke <anika@selfthinker.org>2013-11-02 13:10:14 +0000
commitc5393ecb1aa570830d21e9dc95b4c21cd9aa9c01 (patch)
tree96e8dc34468a325596a5f94c85e38374fbc4b9ba /lib/tpl/dokuwiki
parent71c1143e8785954ea00a62aeb755ca7d8fa47e56 (diff)
parent38d74b12176722ce52dc1905c13816a78a2551ee (diff)
downloadrpg-c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01.tar.gz
rpg-c5393ecb1aa570830d21e9dc95b4c21cd9aa9c01.tar.bz2
Merge remote-tracking branch 'origin/master' into video-audio
Conflicts: inc/parser/xhtml.php
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/css/content.less15
-rw-r--r--lib/tpl/dokuwiki/detail.php9
-rw-r--r--lib/tpl/dokuwiki/main.php6
-rw-r--r--lib/tpl/dokuwiki/tpl_footer.php3
-rw-r--r--lib/tpl/dokuwiki/tpl_header.php2
8 files changed, 22 insertions, 16 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/css/content.less b/lib/tpl/dokuwiki/css/content.less
index 56551fe3b..a5ffbf2be 100644
--- a/lib/tpl/dokuwiki/css/content.less
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -113,10 +113,6 @@
text-decoration: underline;
}
-/* for code in <file> */
-.dokuwiki pre.file {
-}
-
/* filenames for downloadable file and code blocks */
.dokuwiki dl.code,
.dokuwiki dl.file {
@@ -163,6 +159,17 @@
}
}
+/* for code in <file> */
+.dokuwiki dl.file {
+ pre,
+ dt {
+ border-style: dashed;
+ }
+ dt {
+ border-bottom-style: solid;
+ }
+}
+
/*____________ JS popup ____________*/
.JSpopup {
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index 7e46231d3..c602830f7 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') ?>
@@ -123,11 +122,11 @@ header('X-UA-Compatible: IE=edge,chrome=1');
// 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
+ // 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['tpl'] here
- $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY';
+ // of using $conf['template'] here
+ $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
$evt = new Doku_Event($hook, $data);
if($evt->advise_before()){
foreach($evt->data as $k => $html) echo $html;
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 9e507d86d..f6ca4ed86 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -83,11 +83,11 @@ $showSidebar = $hasSidebar && ($ACT=='show');
'top' => tpl_action('top', 1, 'li', 1, '<span>', '</span>')
);
- // the page tools can be ammended through a custom plugin hook
+ // 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['tpl'] here
- $hook = 'TEMPLATE_'.strtoupper($conf['tpl']).'_PAGETOOLS_DISPLAY';
+ // of using $conf['template'] here
+ $hook = 'TEMPLATE_'.strtoupper($conf['template']).'_PAGETOOLS_DISPLAY';
$evt = new Doku_Event($hook, $data);
if($evt->advise_before()){
foreach($evt->data as $k => $html) echo $html;
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-06-24 20:57:32 +0000