SPR-814: detail template

This commit is contained in:
Jana Deutschländer 2017-04-19 15:21:55 +02:00
commit 58aee1016a
7 changed files with 204 additions and 48 deletions

View file

@ -50,15 +50,71 @@
}
// meta data
.img_detail {
div.img_detail {
/* vertical minus margin of .img-detail corresponds to the padding of .page */
margin: @margin-default -(@margin-default);
border: solid @ini_border_light;
border-width: 1px 0;
background-color: @ini_background_page_header;
h1, h2, h3, h4, h5, h6, p{
padding-left: @margin-default;
padding-right: @margin-default;
}
dl {
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
flex-direction: row;
-ms-flex-direction: row;
flex-wrap: wrap;
-ms-flex-wrap: wrap;
width: 100%;
dt, dd {
box-sizing: border-box;
margin: .2em 0;
padding: (@small-spacing * 2) @small-spacing;
}
dt {
width: 33.3%;
background-color: @ini_highlight;
color: @ini_highlight_text;
}
dd {
width: 66.6%;
padding-left: (@small-spacing * 2);
}
}
.os-map {
p {
text-align: right;
}
iframe {
padding: 0;
margin: 0;
border: solid @ini_button_background;
border-width: 1px 0;
}
}
@media @screen_max-md {
margin-right: -(@margin-default * 1.6);
h1, h2, h3, h4, h5, h6, p {
padding-right: (@margin-default * 1.6);
}
}
@media @screen_max-xs {
margin-left: -(@margin-small);
h1, h2, h3, h4, h5, h6, p {
padding-left: @margin-small;
}
}
}
}

View file

@ -61,12 +61,24 @@ include('tpl/favicon_tiles.php');
<body id="dokuwiki__top" class="<?php echo tpl_classes(); ?> wide-content showSidebar">
<div id="dokuwiki__site">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* template Include: tpl/nav-direct */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
?>
<?php include('tpl/nav-direct.php') ?>
<div class="page-wrapper <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
<?php
tpl_includeFile('header.html');
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Include Hook: header.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('header.html');
?>
<div id="dokuwiki__header" class="header no-print">
@ -76,19 +88,57 @@ include('tpl/favicon_tiles.php');
<div class="claim main-sidebar">
<?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: */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* 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');
} ?>
<?php if ($conf['tagline']): ?>
<p class="claim"><?php echo $conf['tagline'] ?></p>
<?php endif ?>
<div class="main-title">
<?php if ($conf['title']):
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Wiki Title Mobile */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
<p class="title mobile-only"><?php echo $conf['title'] ?></p>
<?php endif ?>
</div><!-- .main-title -->
</div><!-- .headings -->
</div><!-- .col -->
<div class="col-xs-12">
<div class="main-title desktop-only">
<?php if ($conf['title']):
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Wiki Title Desktop */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
<p class="title"><?php echo $conf['title'] ?></p>
<?php endif ?>
<?php if ($conf['tagline']):
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Wiki Tagline Desktop */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
<p class="claim"><?php echo $conf['tagline'] ?></p>
<?php endif ?>
</div><!-- .main-title -->
</div><!-- .col -->
</div><!-- .row -->
</div><!-- .container -->
</div><!-- .header -->
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* headline menu area (Accessibility ) */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
?>
<div class="sr-only nav-area-head">
<h5 class="sr-only" aria-level="1"><?php echo tpl_getLang('nav-area-head') ?></h5>
</div><!-- .nav-area-head -->
@ -98,20 +148,37 @@ include('tpl/favicon_tiles.php');
<div class="row">
<div class="col-xs-12">
<div class="sidebarheader main-sidebar">
<?php
tpl_includeFile('sidebarheader.html')
?>
</div><!-- .sidebarheader -->
<div class="search main-sidebar">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* search form */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/main-sidebar-search.php');
?>
</div><!-- .search -->
<div class="sidebarheader main-sidebar">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Include Hook: sidebarheader.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('sidebarheader.html')
?>
</div><!-- .sidebarheader -->
<div id="dokuwiki__aside">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* sidebar */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/main-sidebar-nav.php');
?>
</div><!-- .aside -->
@ -127,8 +194,18 @@ include('tpl/favicon_tiles.php');
<div class="col-xs-12">
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* User Tools but no MagicMatcher Bar */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
$showTools = true;
include('tpl/nav-usertools-buttons.php');
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* Include Hook: header.html */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_includeFile('header.html');
?>
@ -139,7 +216,8 @@ include('tpl/favicon_tiles.php');
<div id="dokuwiki__detail">
<?php html_msgarea() ?>
<?php tpl_flush(); /* flush the output buffer */ ?>
<div class="content group">
<div class="container">
@ -148,30 +226,28 @@ include('tpl/favicon_tiles.php');
<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
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* page quality / page tasks */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/nav-page-quality-tasks.php');
?>
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* breadcrumb */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* breadcrumb */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
include('tpl/nav-breadcrumb.php');
?>
<h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['page_tools'] ?></h6>
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* page tools */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
<nav id="dokuwiki__pagetools">
<div class="tools">
<ul>
@ -187,6 +263,8 @@ include('tpl/favicon_tiles.php');
<div id="dokuwiki__content" class="page main-content">
<div id="spr__meta-box"></div>
<div class="msg-area"><?php html_msgarea();/*msg('Information.', 0);msg('Success', 1);msg('Notification', 2);msg('Fehler', -1);*/ ?></div>
<?php if ($ERROR): print $ERROR; ?>
<?php else: ?>
@ -194,22 +272,45 @@ include('tpl/favicon_tiles.php');
<?php if ($REV) {
echo p_locale_xhtml('showrev');
} ?>
<h1><?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG)) ?></h1>
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* image */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
?>
<div class="img-link">
<?php tpl_img(900, 700); /* the image; parameters: maximum width, maximum height (and more) */ ?>
</div>
<?php
<div class="img_detail"><?php
$simple_title = hsc(tpl_img_getTag('simple.title'));
if(strlen($simple_title) > 0) { ?>
<h2><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h2><?php
}
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* meta data of image */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
?>
<div class="img_detail">
<?php
$simple_title = hsc(tpl_img_getTag('simple.title'));
if(strlen($simple_title) > 0) {
?>
<h2><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h2>
<?php
}
?>
<?php
tpl_img_meta();
/** @var helper_plugin_spatialhelper_index $spatial */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* open street maps if geo data is available */
/** @var helper_plugin_spatialhelper_index $spatial */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
$spatial = plugin_load('helper', 'spatialhelper_index');
if ($spatial && plugin_load('helper', 'geophp')) {
global $IMG;
@ -222,11 +323,10 @@ include('tpl/favicon_tiles.php');
$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>';
echo '<div class="os-map">';
echo '<h4 lang="en">OSM (Open Street Maps):</h4>';
echo '<iframe width="100%" height="350" frameborder="0" src="' . $srcOSM . '"></iframe><br/><p><a class="button" target="_blank" title="' . tpl_getLang('osm_zoom_link_title') . '" href="' . $hrefOSM . '">' . tpl_getLang('osm_zoom_link_text') . '</a></p>';
echo '</div>';
}
}
?>
@ -256,9 +356,9 @@ include('tpl/favicon_tiles.php');
<?php
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* copyright */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
/* copyright */
/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
tpl_license($img = false, $imgonly = false, $return = false, $wrap = false);
?>
</p>

View file

@ -43,6 +43,9 @@ $lang['discussion'] = 'Diskussion';
$lang['back_to_article'] = 'Zurück zum Artikel';
$lang['userpage'] = 'Benutzer-Seite';
$lang['osm_zoom_link_text'] = 'größere Karte anzeigen';
$lang['osm_zoom_link_title'] = 'externer Link - öffnet in neuem Fenster';
/**
* colors

View file

@ -4,7 +4,4 @@
*
*/
$lang['discussionPage'] = 'Diskussion-Seite (leer lassen, um Funktion zu deaktivieren)';
$lang['userPage'] = 'Benutzer seite (leer lassen, um Funktion zu deaktivieren)';
$lang['hideTools'] = 'Tools abschalten, wenn der Benutzer nicht angemeldet ist?';
$lang['user_ns'] = 'Ort an dem Nutzerseiten gespeichert werden';

View file

@ -44,6 +44,9 @@ $lang['discussion'] = 'Discussion';
$lang['back_to_article'] = 'Back to article';
$lang['userpage'] = 'User page';
$lang['osm_zoom_link_text'] = 'view larger map';
$lang['osm_zoom_link_title'] = 'external link opens new window';
/**
* colors

View file

@ -4,7 +4,4 @@
*
*/
$lang['discussionPage'] = 'Discussion page (leave empty to disable discussions)';
$lang['userPage'] = 'User page (leave empty to disable user pages)';
$lang['hideTools'] = 'Hide tools when not logged in?';
$lang['user_ns'] = 'Where to store user pages.';

View file

@ -13,7 +13,7 @@
}
if ($qc) {
echo "<li class=\"plugin__qc do_none\"><a id=\"plugin__qc__link\" aria-expanded=\"false\" href=\"#plugin__qc__wrapper\"><span class=\"prefix\">".tpl_getLang('quality_trigger')."</span><span class=\"num\">0</span></strong></a>";
$qc->tplErrorCount();
//$qc->tplErrorCount();
echo "</li>";
}
if ($doPlugin !== null ) {