Mercurial > hg > mgallery

changeset 66:be68b2d06674

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Cleanup.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 14 Sep 2016 15:34:23 +0300
parents 7019d87bc479
children fc4900455610
files mgallery.php
diffstat 1 files changed, 19 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/mgallery.php	Wed Sep 14 12:57:28 2016 +0300
+++ b/mgallery.php	Wed Sep 14 15:34:23 2016 +0300
@@ -422,6 +422,16 @@
   $naviFlags = mgGetSetting("image_navigation");
   $data = $galEntries[$galImage];
 
+  $list = [
+    mgGetArr($data, ["width", "height"], "<span class=\"infoDimensions\"><b>%1</b> x <b>%2</b> px</span>", NULL),
+    mgGetArr($data, "model", "<span class=\"infoModel\"><b>%1</b></span>", NULL),
+    mgGetArr($data, "fnumber", "<span class=\"infoFNumber\"><b>f/%1</b></span>", NULL),
+    mgGetArr($data, "exposure", "<span class=\"infoExposure\"><b>%1</b> sec</span>", NULL, NULL),
+    mgGetArr($data, "iso", "<span class=\"infoISO\">ISO <b>%1</b></span>", NULL),
+    mgGetArr($data, "focallength", "<span class=\"infoFocalLength\">F-L <b>%1</b>mm</span>", NULL),
+    mgGetArr($data, "lensmodel", "<span class=\"infoLensModel\"><i>%1</i></span>", NULL),
+  ];
+
   $pageTitle = $galTitlePrefix.$galTitleSep.mgGetTrans($galData["caption"])." - ".$galImage;
   cmPrintPageHeader($pageTitle);
   echo
@@ -438,28 +448,15 @@
     echo mgGetNaviControls($galImagesIndex, $index, $naviFlags);
 
   echo
-  "<div class=\"imageCBox\">\n".
-  mgGetNaviControlImageBox($galImagesIndex, $index, "prev", -1).
-  "<div class=\"imageBox\">\n".
-  "<a id=\"imageLink\" target=\"_blank\" href=\"".$galImageURL.$galPath."/".$galImage."\">".
-  "<img id=\"imageImage\" src=\"".mgGetImageURL($galTNPath, $data["base"].$galMedSuffix.$data["ext"])."\" alt=\"".
-  chentities($data["base"].$galMedSuffix.$data["ext"])."\"></a>\n".
-  "</div>\n".
-  mgGetNaviControlImageBox($galImagesIndex, $index, "next", 1).
-  "</div>\n".
-  "<div class=\"imageCaption\">".mgGetArr($data, "caption", "%1", "")."</div>\n";
-
-  $list = [
-    mgGetArr($data, ["width", "height"], "<span class=\"infoDimensions\"><b>%1</b> x <b>%2</b> px</span>", NULL),
-    mgGetArr($data, "model", "<span class=\"infoModel\"><b>%1</b></span>", NULL),
-    mgGetArr($data, "fnumber", "<span class=\"infoFNumber\"><b>f/%1</b></span>", NULL),
-    mgGetArr($data, "exposure", "<span class=\"infoExposure\"><b>%1</b> sec</span>", NULL, NULL),
-    mgGetArr($data, "iso", "<span class=\"infoISO\">ISO <b>%1</b></span>", NULL),
-    mgGetArr($data, "focallength", "<span class=\"infoFocalLength\">F-L <b>%1</b>mm</span>", NULL),
-    mgGetArr($data, "lensmodel", "<span class=\"infoLensModel\"><i>%1</i></span>", NULL),
-  ];
-
-  echo
+    "<div class=\"imageCBox\">\n".
+    mgGetNaviControlImageBox($galImagesIndex, $index, "prev", -1).
+    "<div class=\"imageBox\">\n".
+    "<a id=\"imageLink\" target=\"_blank\" href=\"".$galImageURL.$galPath."/".$galImage."\">".
+    "<img id=\"imageImage\" src=\"".mgGetImageURL($galTNPath, $data["base"].$galMedSuffix.$data["ext"])."\" alt=\"".chentities($data["base"].$galMedSuffix.$data["ext"])."\"></a>\n".
+    "</div>\n".
+    mgGetNaviControlImageBox($galImagesIndex, $index, "next", 1).
+    "</div>\n".
+    "<div class=\"imageCaption\">".mgGetArr($data, "caption", "%1", "")."</div>\n".
     "<div class=\"infoBox\">\n".
     mgGetArr($data, "datetime", "<span class=\"infoDateTime\">%1</span>", "", "mgTimeStr").
     implode(", ", array_filter($list, function($a) { return $a !== NULL; })).