Fix indent and more style-issues in details.php

This commit is contained in:
Michael Große 2017-04-10 13:49:54 +02:00
commit ecb77cc51c
No known key found for this signature in database
GPG key ID: 7E31028FBFEACC79

View file

@ -9,21 +9,25 @@
*/
// must be run from within DokuWiki
if (!defined('DOKU_INC')) die();
if (!defined('DOKU_INC')) {
die();
}
header('X-UA-Compatible: IE=edge,chrome=1');
?>
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>"
lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang'] ?>"
lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
<head>
<meta charset="UTF-8" />
<meta charset="UTF-8"/>
<title>
<?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?>
[<?php echo strip_tags($conf['title'])?>]
<?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG)) ?>
[<?php echo strip_tags($conf['title']) ?>]
</title>
<script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
<?php tpl_metaheaders()?>
<meta name="viewport" content="width=device-width,initial-scale=1" />
<script>(function (H) {
H.className = H.className.replace(/\bno-js\b/, 'js')
})(document.documentElement)</script>
<?php tpl_metaheaders() ?>
<meta name="viewport" content="width=device-width,initial-scale=1"/>
<?php echo tpl_favicon(array('favicon', 'mobile')) ?>
<?php tpl_includeFile('meta.html') ?>
</head>
@ -43,7 +47,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
<div class="row">
<div class="col-xs-12">
<div class="claim main-sidebar">
<?php if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){
<?php if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))) {
/* upload your logo into the data/media folder (root of the media manager) and replace 'logo.png' in der template config accordingly: */
include('tpl/main-sidebar-logo.php');
@ -108,19 +112,21 @@ header('X-UA-Compatible: IE=edge,chrome=1');
<div id="dokuwiki__detail">
<?php html_msgarea() ?>
<?php html_msgarea() ?>
<div class="content group">
<div class="container">
<div class="row">
<div class="col-xs-12">
<div class="breadcrumbs" data-do="<?php echo $ACT?>">
<div class="breadcrumbs" data-do="<?php echo $ACT ?>">
<div class="togglelink page_main-content">
<a href="#"><span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle')?></span></a>
<a href="#"><span
class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle') ?></span></a>
</div>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_status') ?></h6>
<h6 class="sr-only" role="heading"
aria-level="2"><?php echo tpl_getLang('head_menu_status') ?></h6>
<?php
@ -137,7 +143,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
include('tpl/nav-breadcrumb.php');
?>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['page_tools'] ?></h6>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['page_tools'] ?></h6>
<nav id="dokuwiki__pagetools">
<div class="tools">
@ -155,44 +161,46 @@ header('X-UA-Compatible: IE=edge,chrome=1');
<div id="spr__meta-box"></div>
<?php if($ERROR): print $ERROR; ?>
<?php else: ?>
<?php if ($ERROR): print $ERROR; ?>
<?php else: ?>
<?php if($REV) echo p_locale_xhtml('showrev');?>
<h1><?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG))?></h1>
<?php if ($REV) {
echo p_locale_xhtml('showrev');
} ?>
<h1><?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG)) ?></h1>
<?php tpl_img(900, 700); /* the image; parameters: maximum width, maximum height (and more) */ ?>
<?php tpl_img(900, 700); /* the image; parameters: maximum width, maximum height (and more) */ ?>
<div class="img_detail">
<h2><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h2>
<div class="img_detail">
<h2><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h2>
<?php
tpl_img_meta();
<?php
tpl_img_meta();
/** @var helper_plugin_spatialhelper_index $spatial */
$spatial = plugin_load('helper', 'spatialhelper_index');
if ($spatial && plugin_load('helper', 'geophp')) {
global $IMG;
$point = $spatial->getCoordsFromExif($IMG);
if ($point) {
$long = $point->getX();
$lat = $point->getY();
$latShort = round($lat,3);
$longShort = round($long,3);
/** @var helper_plugin_spatialhelper_index $spatial */
$spatial = plugin_load('helper', 'spatialhelper_index');
if ($spatial && plugin_load('helper', 'geophp')) {
global $IMG;
$point = $spatial->getCoordsFromExif($IMG);
if ($point) {
$long = $point->getX();
$lat = $point->getY();
$latShort = round($lat, 3);
$longShort = round($long, 3);
$hrefOSM = "https://www.openstreetmap.org/?mlat=$lat&mlon=$long#map=18/$lat/$long";
$srcOSM = 'https://www.openstreetmap.org/export/embed.html?bbox='.($long-0.004).','.($lat-0.002).','.($long+0.004).','.($lat+0.002).'&layer=mapnik&marker='.$lat.','.$long;
echo '<dl>';
echo '<dt title="Open Street Maps">OSM:</dt><dd>';
echo '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="'.$srcOSM.'" style="border: 1px solid black"></iframe><br/><small><a href="'.$hrefOSM.'">View Larger Map</a></small>';
echo '</dd>';
echo '</dl>';
}
}
?>
<?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw')); ?>
</div>
$hrefOSM = "https://www.openstreetmap.org/?mlat=$lat&mlon=$long#map=18/$lat/$long";
$srcOSM = 'https://www.openstreetmap.org/export/embed.html?bbox=' . ($long - 0.004) . ',' . ($lat - 0.002) . ',' . ($long + 0.004) . ',' . ($lat + 0.002) . '&layer=mapnik&marker=' . $lat . ',' . $long;
echo '<dl>';
echo '<dt title="Open Street Maps">OSM:</dt><dd>';
echo '<iframe width="425" height="350" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="' . $srcOSM . '" style="border: 1px solid black"></iframe><br/><small><a href="' . $hrefOSM . '">View Larger Map</a></small>';
echo '</dd>';
echo '</dl>';
}
}
?>
<?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw')); ?>
</div>
</div><!-- .main-content -->
</div><!-- .col -->
</div><!-- .row -->
@ -201,11 +209,10 @@ header('X-UA-Compatible: IE=edge,chrome=1');
<?php endif; ?>
</div>
</div>
</div><!-- /wrapper -->
<!-- ********** FOOTER ********** -->
<div id="dokuwiki__footer">