Permalink
Browse files

fixed detail.php closes #6

  • Loading branch information...
Michael Klier
Michael Klier committed Nov 12, 2010
1 parent e856c05 commit 8a9a12cab6433e2a6cceeeb139fb954f03aad03e
Showing with 68 additions and 60 deletions.
  1. +37 −32 detail.php
  2. +1 −28 main.php
  3. +30 −0 sidebar.html
View
@@ -34,55 +34,60 @@
<div class="dokuwiki">
<?php html_msgarea()?>
- <div class="page">
- <?php if($ERROR){ print $ERROR; }else{ ?>
+ <div id="content">
+ <div class="page">
+ <?php if($ERROR){ print $ERROR; }else{ ?>
- <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></h1>
+ <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></h1>
- <div class="img_big">
- <?php tpl_img(900,700) ?>
- </div>
+ <div class="img_big">
+ <?php tpl_img(900,700) ?>
+ </div>
- <div class="img_detail">
- <p class="img_caption">
- <?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?>
- </p>
+ <div class="img_detail">
+ <p class="img_caption">
+ <?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?>
+ </p>
- <p>&larr; <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p>
+ <p>&larr; <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p>
- <dl class="img_tags">
- <?php
- $t = tpl_img_getTag('Date.EarliestTime');
- if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.dformat($t).'</dd>';
+ <dl class="img_tags">
+ <?php
+ $t = tpl_img_getTag('Date.EarliestTime');
+ if($t) print '<dt>'.$lang['img_date'].':</dt><dd>'.dformat($t).'</dd>';
- $t = tpl_img_getTag('File.Name');
- if($t) print '<dt>'.$lang['img_fname'].':</dt><dd>'.hsc($t).'</dd>';
+ $t = tpl_img_getTag('File.Name');
+ if($t) print '<dt>'.$lang['img_fname'].':</dt><dd>'.hsc($t).'</dd>';
- $t = tpl_img_getTag(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit'));
- if($t) print '<dt>'.$lang['img_artist'].':</dt><dd>'.hsc($t).'</dd>';
+ $t = tpl_img_getTag(array('Iptc.Byline','Exif.TIFFArtist','Exif.Artist','Iptc.Credit'));
+ if($t) print '<dt>'.$lang['img_artist'].':</dt><dd>'.hsc($t).'</dd>';
- $t = tpl_img_getTag(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright'));
- if($t) print '<dt>'.$lang['img_copyr'].':</dt><dd>'.hsc($t).'</dd>';
+ $t = tpl_img_getTag(array('Iptc.CopyrightNotice','Exif.TIFFCopyright','Exif.Copyright'));
+ if($t) print '<dt>'.$lang['img_copyr'].':</dt><dd>'.hsc($t).'</dd>';
- $t = tpl_img_getTag('File.Format');
- if($t) print '<dt>'.$lang['img_format'].':</dt><dd>'.hsc($t).'</dd>';
+ $t = tpl_img_getTag('File.Format');
+ if($t) print '<dt>'.$lang['img_format'].':</dt><dd>'.hsc($t).'</dd>';
- $t = tpl_img_getTag('File.NiceSize');
- if($t) print '<dt>'.$lang['img_fsize'].':</dt><dd>'.hsc($t).'</dd>';
+ $t = tpl_img_getTag('File.NiceSize');
+ if($t) print '<dt>'.$lang['img_fsize'].':</dt><dd>'.hsc($t).'</dd>';
- $t = tpl_img_getTag('Simple.Camera');
- if($t) print '<dt>'.$lang['img_camera'].':</dt><dd>'.hsc($t).'</dd>';
+ $t = tpl_img_getTag('Simple.Camera');
+ if($t) print '<dt>'.$lang['img_camera'].':</dt><dd>'.hsc($t).'</dd>';
- $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'));
- if($t) print '<dt>'.$lang['img_keywords'].':</dt><dd>'.hsc($t).'</dd>';
+ $t = tpl_img_getTag(array('IPTC.Keywords','IPTC.Category','xmp.dc:subject'));
+ if($t) print '<dt>'.$lang['img_keywords'].':</dt><dd>'.hsc($t).'</dd>';
- ?>
- </dl>
- <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?>
+ ?>
+ </dl>
+ <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?>
+ </div>
</div>
<?php } ?>
</div>
+ <div id="sidebar">
+ <?php require_once(DOKU_TPLINC.'sidebar.html')?>
+ </div>
</div>
</body>
</html>
View
@@ -14,8 +14,6 @@
// must be run from within DokuWiki
if (!defined('DOKU_INC')) die();
-require_once(DOKU_TPLINC . 'tpl_functions.php');
-
?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -62,32 +60,7 @@
</div>
<div id="sidebar">
- <div id="header">
- <div class="logo">
- <?php tpl_link(wl(),$conf['title'],'name="dokuwiki__top" id="dokuwiki__top" accesskey="h" title="[H]"')?>
- </div>
- <?php tpl_navigation() ?>
- </div>
-
- <div class="actions">
- <?php tpl_actions()?>
- </div>
-
- <div id="search">
- <?php tpl_searchform()?>
- </div>
-
- <div id="pagemeta">
- <?php tpl_license(false);?>
- <br />
-
- <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10-blue" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
- <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3"><img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss-blue" alt="Valid CSS!" /></a>
- <div class="clearer"></div>
- <div class="doc">
- <?php tpl_pageinfo()?>
- </div>
- </div>
+ <?php require_once(DOKU_TPLINC.'sidebar.html')?>
</div>
<?php flush()?>
View
@@ -0,0 +1,30 @@
+<?php
+// DO NOT REMOVE
+require_once(DOKU_TPLINC . 'tpl_functions.php');
+?>
+ <div id="header">
+ <div class="logo">
+ <?php tpl_link(wl(),$conf['title'],'name="dokuwiki__top" id="dokuwiki__top" accesskey="h" title="[H]"')?>
+ </div>
+ <?php tpl_navigation() ?>
+ </div>
+
+ <div class="actions">
+ <?php tpl_actions()?>
+ </div>
+
+ <div id="search">
+ <?php tpl_searchform()?>
+ </div>
+
+ <div id="pagemeta">
+ <?php tpl_license(false);?>
+ <br />
+
+ <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10-blue" alt="Valid XHTML 1.0 Transitional" height="31" width="88" /></a>
+ <a href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3"><img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss-blue" alt="Valid CSS!" /></a>
+ <div class="clearer"></div>
+ <div class="doc">
+ <?php tpl_pageinfo()?>
+ </div>
+ </div>

0 comments on commit 8a9a12c

Please sign in to comment.