summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xcss/design.css21
-rw-r--r--css/pagetools.css18
-rwxr-xr-xcss/rtl.css29
-rwxr-xr-xdetail.php125
-rw-r--r--images/pagetools-sprite.pngbin13032 -> 14139 bytes
-rw-r--r--images/pagetools-sprite.xcfbin30556 -> 34360 bytes
-rw-r--r--images/pagetools.xcfbin12934 -> 14630 bytes
7 files changed, 140 insertions, 53 deletions
diff --git a/css/design.css b/css/design.css
index aa2dab333..2744d8e30 100755
--- a/css/design.css
+++ b/css/design.css
@@ -371,6 +371,27 @@
#dokuwiki__detail {
padding: 0;
}
+#dokuwiki__detail img {
+ float: none;
+ margin-bottom: 1.4em;
+}
+#dokuwiki__detail div.img_detail {
+ float: none;
+}
+
+#dokuwiki__detail div.img_detail dl {
+ overflow: hidden;
+}
+#dokuwiki__detail div.img_detail dl dt {
+ float: left;
+ width: 9em;
+ text-align: right;
+ clear: left;
+}
+#dokuwiki__detail div.img_detail dl dd {
+ margin-left: 9.5em;
+}
+
/*____________ JS popup ____________*/
diff --git a/css/pagetools.css b/css/pagetools.css
index c7575542f..8842a5bea 100644
--- a/css/pagetools.css
+++ b/css/pagetools.css
@@ -182,3 +182,21 @@
.mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
background-position: right -765px;
}
+
+#dokuwiki__pagetools ul li a.mediaManager {
+ background-position: right -900px;
+}
+#dokuwiki__pagetools ul li a.mediaManager:hover,
+#dokuwiki__pagetools ul li a.mediaManager:active,
+#dokuwiki__pagetools ul li a.mediaManager:focus {
+ background-position: right -945px;
+}
+
+#dokuwiki__pagetools ul li a.back {
+ background-position: right -990px;
+}
+#dokuwiki__pagetools ul li a.back:hover,
+#dokuwiki__pagetools ul li a.back:active,
+#dokuwiki__pagetools ul li a.back:focus {
+ background-position: right -1035px;
+}
diff --git a/css/rtl.css b/css/rtl.css
index 2ac39fbb7..6478e01d8 100755
--- a/css/rtl.css
+++ b/css/rtl.css
@@ -344,6 +344,17 @@ form#subscribe__form fieldset {
padding: 0 1.5em 0 0;
}
+#dokuwiki__detail div.img_detail dl dt {
+ float: right;
+ text-align: left;
+ clear: right;
+}
+#dokuwiki__detail div.img_detail dl dd {
+ margin-left: 0;
+ margin-right: 9.5em;
+}
+
+
/*____________ pagetools ____________*/
#dokuwiki__usertools {
@@ -467,6 +478,24 @@ form#subscribe__form fieldset {
background-position: left -765px;
}
+#dokuwiki__pagetools ul li a.mediaManager {
+ background-position: left -900px;
+}
+#dokuwiki__pagetools ul li a.mediaManager:hover,
+#dokuwiki__pagetools ul li a.mediaManager:active,
+#dokuwiki__pagetools ul li a.mediaManager:focus {
+ background-position: left -945px;
+}
+
+#dokuwiki__pagetools ul li a.back {
+ background-position: left -990px;
+}
+#dokuwiki__pagetools ul li a.back:hover,
+#dokuwiki__pagetools ul li a.back:active,
+#dokuwiki__pagetools ul li a.back:focus {
+ background-position: left -1035px;
+}
+
/*____________ content ____________*/
diff --git a/detail.php b/detail.php
index 33d39f5f9..fa193c794 100755
--- a/detail.php
+++ b/detail.php
@@ -51,71 +51,90 @@ $showSidebar = tpl_getConf('sidebarID') && page_exists(tpl_getConf('sidebarID'))
<?php tpl_flush() /* flush the output buffer */ ?>
<?php _tpl_include('pageheader.html') ?>
- <!-- ********** IMG DETAIL ********** -->
-
- <?php if($ERROR){ print $ERROR; }else{ ?>
-
- <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></h1>
-
- <?php tpl_img(900,700); /* parameters: maximum width, maximum height (and more) */ ?>
-
- <div class="img_detail">
- <h2><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h2>
-
- <dl>
- <?php
- $config_files = getConfigFiles('mediameta');
- foreach ($config_files as $config_file) {
- if(@file_exists($config_file)) {
- include($config_file);
+ <?php if(!$ERROR): ?>
+ <div class="pageId"><span><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG)); ?></span></div>
+ <?php endif; ?>
+
+ <div class="page group">
+ <!-- detail start -->
+ <?php
+ if($ERROR):
+ echo '<h1>'.$ERROR.'</h1>';
+ else: ?>
+
+ <h1><?php echo nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h1>
+
+ <?php tpl_img(900,700); /* parameters: maximum width, maximum height (and more) */ ?>
+
+ <div class="img_detail">
+ <dl>
+ <?php
+ // @todo: logic should be transferred to backend
+ $config_files = getConfigFiles('mediameta');
+ foreach ($config_files as $config_file) {
+ if(@file_exists($config_file)) {
+ include($config_file);
+ }
}
- }
- foreach($fields as $key => $tag){
- $t = array();
- if (!empty($tag[0])) {
- $t = array($tag[0]);
- }
- if(is_array($tag[3])) {
- $t = array_merge($t,$tag[3]);
- }
- $value = tpl_img_getTag($t);
- if ($value) {
- echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
- if ($tag[2] == 'date') {
- echo dformat($value);
- } else {
- echo hsc($value);
+ foreach($fields as $key => $tag){
+ $t = array();
+ if (!empty($tag[0])) {
+ $t = array($tag[0]);
+ }
+ if(is_array($tag[3])) {
+ $t = array_merge($t,$tag[3]);
+ }
+ $value = tpl_img_getTag($t);
+ if ($value) {
+ echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
+ if ($tag[2] == 'date') {
+ echo dformat($value);
+ } else {
+ echo hsc($value);
+ }
+ echo '</dd>';
}
- echo '</dd>';
}
- }
- ?>
- </dl>
+ ?>
+ </dl>
+ </div>
<?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?>
- </div>
-
- <p class="back">
- <?php
- $imgNS = getNS($IMG);
- $authNS = auth_quickaclcheck("$imgNS:*");
- if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) {
- $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG));
- echo '<a href="'.$mmURL.'">'.$lang['img_manager'].'</a><br />';
- }
- ?>
- &larr; <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?>
- </p>
-
- <?php } ?>
+ <?php endif; ?>
+ </div>
+ <!-- detail stop -->
- <!-- ********** /IMG DETAIL ********** -->
+ <?php /* doesn't make sense like this; @todo: maybe add tpl_imginfo()?
+ <div class="docInfo"><?php tpl_pageinfo(); ?></div>
+ */ ?>
<?php tpl_flush() ?>
<?php _tpl_include('pagefooter.html') ?>
</div></div><!-- /content -->
+
<hr class="a11y" />
+ <!-- PAGE ACTIONS -->
+ <?php if ($showTools && !$ERROR): ?>
+ <div id="dokuwiki__pagetools">
+ <h3 class="a11y"><?php echo tpl_getLang('page_tools') ?></h3>
+ <div class="tools">
+ <ul>
+ <?php // 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));
+ echo '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>';
+ }
+ ?>
+ <?php // Back to [ID]; @todo: transfer logic to backend
+ echo '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
+ ?>
+ </ul>
+ </div>
+ </div>
+ <?php endif; ?>
</div><!-- /wrapper -->
<?php include('tpl_footer.php') ?>
diff --git a/images/pagetools-sprite.png b/images/pagetools-sprite.png
index f34abdac5..b1a62cacb 100644
--- a/images/pagetools-sprite.png
+++ b/images/pagetools-sprite.png
Binary files differ
diff --git a/images/pagetools-sprite.xcf b/images/pagetools-sprite.xcf
index 4bb1d68f4..062dcae5d 100644
--- a/images/pagetools-sprite.xcf
+++ b/images/pagetools-sprite.xcf
Binary files differ
diff --git a/images/pagetools.xcf b/images/pagetools.xcf
index 759ae4841..980d20363 100644
--- a/images/pagetools.xcf
+++ b/images/pagetools.xcf
Binary files differ
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-25 08:10:13 +0000