ViewPhoto: prepare meta data in controller; change layout

templates/PhotoPage.php

@@ -8,8 +8,8 @@
 
 class PhotoPage extends Template
 {
-	protected $photo;
-	private $exif;
+	private $photo;
+	private $metaData;
 	private $tag;
 
 	public function __construct(Image $photo)
@@ -100,52 +100,19 @@ class PhotoPage extends Template
 	private function photoMeta()
 	{
 		echo '
-				<div id="photo_exif_box" class="content-box clearfix">
-					<h3>EXIF</h3>
-					<dl class="photo_meta">';
+				<ul class="list-group photo_meta">';
 
-		if (!empty($this->exif->created_timestamp))
+		foreach ($this->metaData as $header => $body)
+		{
 			echo '
-						<dt>Date Taken</dt>
-						<dd>', date("j M Y, H:i:s", $this->exif->created_timestamp), '</dd>';
+					<li class="list-group-item">
+						<h4>', $header, '</h4>
+						', $body, '
+					</li>';
+		}
 
 		echo '
-						<dt>Uploaded by</dt>
-						<dd>', $this->photo->getAuthor()->getfullName(), '</dd>';
-
-		if (!empty($this->exif->camera))
-			echo '
-						<dt>Camera Model</dt>
-						<dd>', $this->exif->camera, '</dd>';
-
-		if (!empty($this->exif->shutter_speed))
-			echo '
-						<dt>Shutter Speed</dt>
-						<dd>', $this->exif->shutterSpeedFraction(), '</dd>';
-
-		if (!empty($this->exif->aperture))
-			echo '
-						<dt>Aperture</dt>
-						<dd>f/', number_format($this->exif->aperture, 1), '</dd>';
-
-		if (!empty($this->exif->focal_length))
-			echo '
-						<dt>Focal Length</dt>
-						<dd>', $this->exif->focal_length, ' mm</dd>';
-
-		if (!empty($this->exif->iso))
-			echo '
-						<dt>ISO Speed</dt>
-						<dd>', $this->exif->iso, '</dd>';
-
-		if (!empty($this->exif->software))
-			echo '
-						<dt>Software</dt>
-						<dd>', $this->exif->software, '</dd>';
-
-		echo '
-					</dl>
-				</div>';
+				</ul>';
 	}
 
 	private function taggedPeople()
@@ -240,9 +207,9 @@ class PhotoPage extends Template
 				</script>';
 	}
 
-	public function setExif(EXIF $exif)
+	public function setMetaData(array $metaData)
 	{
-		$this->exif = $exif;
+		$this->metaData = $metaData;
 	}
 
 	public function userActions()