From 14353296bbf53a370646962d9d9d86ecda72c0bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Thu, 30 Mar 2017 16:58:17 +0200 Subject: [PATCH 01/13] Copy'n'paste php boilerplate to detail.php We need most of the html/php from the main.php for this view as well. For lack of a better alternative I copied the relevant parts to this file. At some point we should consider if we either want to extend with features or get rid of the detail.php Known Issues ------------ - [ ] the pagetools are still wrong. These should be replaced once the new pagetool-mechanism has been implemented (see SPR-837) SPR-814 --- detail.php | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 169 insertions(+), 5 deletions(-) diff --git a/detail.php b/detail.php index f010711..6a1fd9e 100755 --- a/detail.php +++ b/detail.php @@ -28,17 +28,141 @@ header('X-UA-Compatible: IE=edge,chrome=1'); - -
+ +
+ + + +
+ + +
+
+
+
+
+ + +

+ + +
+
+
+
+
+ +
+
+
+ +
+
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+
+
+
+ +
+
+
+
+ + + +
+
+
+
+ + +
+
+
+
+
+
+ +
+ < > +
+ +
+ + + + + +
+ + + +
+
+ +
+

-
+
@@ -80,14 +204,54 @@ header('X-UA-Compatible: IE=edge,chrome=1');
-
-


←

+
+
+
+
+
+ +
+
+ + + + + +
+
+
+
+ +
+

+ +

+
+ +
+
+
+
+ + + +
+ +
+ From f2a0ea7b7df1ef33f18e553628b9b3af76a3d9f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Fri, 31 Mar 2017 13:32:20 +0200 Subject: [PATCH 02/13] Show OSM iframe if image is geotagged If the spatialhelper and the geophp plugins are available, then show a iframe from open street map with the location of the photo. SPR-814 --- detail.php | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/detail.php b/detail.php index 6a1fd9e..70ddd7c 100755 --- a/detail.php +++ b/detail.php @@ -169,7 +169,30 @@ header('X-UA-Compatible: IE=edge,chrome=1');

- + 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 '
'; + echo '
OSM:
'; + echo '
View Larger Map'; + echo '
'; + echo '
'; + } + } + ?>
Date: Mon, 10 Apr 2017 13:43:43 +0200 Subject: [PATCH 03/13] Adjust to changed main html --- detail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/detail.php b/detail.php index 70ddd7c..5cce646 100755 --- a/detail.php +++ b/detail.php @@ -117,7 +117,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
- < > +
From 5c6ddbf8b29351dbab45fb87cd45106e942d7e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Mon, 10 Apr 2017 13:45:43 +0200 Subject: [PATCH 04/13] Use correct pagetools for details.php SPR-814 --- detail.php | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/detail.php b/detail.php index 5cce646..9aa119e 100755 --- a/detail.php +++ b/detail.php @@ -139,17 +139,16 @@ header('X-UA-Compatible: IE=edge,chrome=1');
- +
@@ -227,11 +226,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');
-

-
- ← -

-
From 6f352bafb27d6b8a6819ca65a04198c78d30d566 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Mon, 10 Apr 2017 13:49:08 +0200 Subject: [PATCH 05/13] function tpl_img_meta reliably exists --- detail.php | 33 --------------------------------- 1 file changed, 33 deletions(-) diff --git a/detail.php b/detail.php index 9aa119e..fdd2cbc 100755 --- a/detail.php +++ b/detail.php @@ -167,7 +167,6 @@ header('X-UA-Compatible: IE=edge,chrome=1');

- - -
- $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 '
'.$lang[$tag[1]].':
'; - if ($tag[2] == 'date') { - echo dformat($value); - } else { - echo hsc($value); - } - echo '
'; - } - } - ?> -
-
From ecb77cc51cadc644f63b3cf5e3c2a7d1fb3c45a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Mon, 10 Apr 2017 13:49:54 +0200 Subject: [PATCH 06/13] Fix indent and more style-issues in details.php --- detail.php | 103 ++++++++++++++++++++++++++++------------------------- 1 file changed, 55 insertions(+), 48 deletions(-) diff --git a/detail.php b/detail.php index fdd2cbc..8c87871 100755 --- a/detail.php +++ b/detail.php @@ -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'); ?> - + - + - <?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']) ?>] - - - + + + @@ -43,7 +47,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
- - +
-
+
- +
-
+
-
+
@@ -201,11 +209,10 @@ header('X-UA-Compatible: IE=edge,chrome=1'); -
+
-
From e1c37e409cc404c96f18025a6a5e52220b15ea16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20Gro=C3=9Fe?= Date: Tue, 11 Apr 2017 11:20:40 +0200 Subject: [PATCH 07/13] Fix js errors by initializing JSINFO on details.php SPR-814 --- detail.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/detail.php b/detail.php index 8c87871..faf5eef 100755 --- a/detail.php +++ b/detail.php @@ -14,6 +14,11 @@ if (!defined('DOKU_INC')) { } header('X-UA-Compatible: IE=edge,chrome=1'); +global $JSINFO; +if (empty($JSINFO)) { + $JSINFO = array(); +} + ?> From 2ac13e14316e4dcdcd92344027505d3695d158fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Tue, 11 Apr 2017 12:53:03 +0200 Subject: [PATCH 08/13] SPR-814: style linked image --- css/template_detail.less | 64 ++++++++++++++++++++++++++++++++++++++++ detail.php | 6 ++-- style.ini | 4 ++- 3 files changed, 70 insertions(+), 4 deletions(-) create mode 100644 css/template_detail.less diff --git a/css/template_detail.less b/css/template_detail.less new file mode 100644 index 0000000..b11c551 --- /dev/null +++ b/css/template_detail.less @@ -0,0 +1,64 @@ +/** + * This file provides the design styles for the the detail template + * (media details) + * + * @author Jana Deutschlaender + */ +#dokuwiki__detail { + + // linked image + .img-link{ + + text-align: center; + + a { + display: inline-block; + margin: 0 auto 1.4em; + position: relative; + + img { + margin: 0; + display: block; + border: 1px dotted @ini_background; + position: relative; + z-index: 1; + } + + &:hover, + &:focus, + &:active { + &:before{ + position: absolute; + top: 0; + left: 0; + width: 100%; + box-sizing: border-box; + display: block; + padding: @margin-small; + + z-index:2; + background: @ini_button_background; + color: @ini_button_color; + content:attr(title); + } + img { + border: 1px solid @ini_button_background; + } + } + + } + } + + // meta data + .img_detail { + /* vertical minus margin of .img-detail corresponds to the padding of .page */ + margin: @margin-default -(@margin-default); + @media @screen_max-md { + margin-right: -(@margin-default * 1.6); + } + + @media @screen_max-xs { + margin-left: -(@margin-small); + } + } +} diff --git a/detail.php b/detail.php index 8c87871..5768eb1 100755 --- a/detail.php +++ b/detail.php @@ -168,9 +168,9 @@ header('X-UA-Compatible: IE=edge,chrome=1'); echo p_locale_xhtml('showrev'); } ?>

- - - +
+ +

diff --git a/style.ini b/style.ini index 1fd8b20..64e1480 100755 --- a/style.ini +++ b/style.ini @@ -72,7 +72,6 @@ css/area_nav-pagetools.less = all css/area_nav-metabox.less = all css/area_main-sidebar-nav.less = all css/area_main-sidebar-content.less = all -;css/area_sidetools.less = all css/area_main-content.less = all css/area_main-content-secedit.less = all css/area_togglelink.less = all @@ -80,7 +79,10 @@ css/area_forms.less = all css/area_search.less = all css/area_tabs.less = all +; ____________ template styles _____________ + css/template_admin.less = all +css/template_detail.less = all ; _____________ plugin styles _____________ From fa31b96cc4fcf7b1ac51920ced1fb7822903d1f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jana=20Deutschla=CC=88nder?= Date: Wed, 12 Apr 2017 15:14:46 +0200 Subject: [PATCH 09/13] SPR-814: html5 instead of xhtml --- detail.php | 72 +++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/detail.php b/detail.php index 25b09d5..d964f3d 100755 --- a/detail.php +++ b/detail.php @@ -1,17 +1,16 @@ - * @author Anika Henke + * @link FIXME + * @author Jana Deutschlaender + * @author Michael Grosse * @license GPL 2 (http://www.gnu.org/licenses/gpl.html) */ +use dokuwiki\template\sprintdoc\Template; -// must be run from within DokuWiki -if (!defined('DOKU_INC')) { - die(); -} +if (!defined('DOKU_INC')) die(); /* must be run from within DokuWiki */ header('X-UA-Compatible: IE=edge,chrome=1'); global $JSINFO; @@ -20,21 +19,44 @@ if (empty($JSINFO)) { } ?> - + - - - <?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']) ?>] + + + + + + @@ -177,8 +199,12 @@ if (empty($JSINFO)) {
-
-

+
0) { ?> +

Date: Wed, 19 Apr 2017 15:21:55 +0200 Subject: [PATCH 10/13] SPR-814: detail template --- css/template_detail.less | 58 ++++++++++- detail.php | 176 ++++++++++++++++++++++++++------- lang/de/lang.php | 3 + lang/de/settings.php | 5 +- lang/en/lang.php | 3 + lang/en/settings.php | 5 +- tpl/nav-page-quality-tasks.php | 2 +- 7 files changed, 204 insertions(+), 48 deletions(-) diff --git a/css/template_detail.less b/css/template_detail.less index b11c551..f11cfcf 100644 --- a/css/template_detail.less +++ b/css/template_detail.less @@ -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; + } } + } } diff --git a/detail.php b/detail.php index d964f3d..0250f6f 100755 --- a/detail.php +++ b/detail.php @@ -61,12 +61,24 @@ include('tpl/favicon_tiles.php');
+
@@ -76,19 +88,57 @@ include('tpl/favicon_tiles.php');
- -

- +
+ +

+ +
+
+
+ +

+ + +

+ +
+
+
+
@@ -98,20 +148,37 @@ include('tpl/favicon_tiles.php');
-
- -
+
+ +
+ +
@@ -127,8 +194,18 @@ include('tpl/favicon_tiles.php');
@@ -139,7 +216,8 @@ include('tpl/favicon_tiles.php');
- + +
@@ -148,30 +226,28 @@ include('tpl/favicon_tiles.php');
- +
-
+
-
+