From cc7ca4da73890e4ab0af0b3d3bdde7d985637076 Mon Sep 17 00:00:00 2001
From: Joar Wandborg <git@wandborg.com>
Date: Wed, 25 Jan 2012 23:53:02 +0100
Subject: [PATCH] Refractored media.html template and related includes

- Added <p> around license part to separate it properly
  from other sidebar content
- Moved exif part to mediagoblin/utils/exif.html
- Moved geolocation map to mediagoblin/utils/geolocation_map.html
---
 .../mediagoblin/user_pages/media.html         | 42 ++-----------------
 .../templates/mediagoblin/utils/exif.html     | 33 +++++++++++++++
 .../mediagoblin/utils/geolocation_map.html    | 42 +++++++++++++++++++
 .../templates/mediagoblin/utils/license.html  | 14 ++++---
 4 files changed, 86 insertions(+), 45 deletions(-)
 create mode 100644 mediagoblin/templates/mediagoblin/utils/exif.html
 create mode 100644 mediagoblin/templates/mediagoblin/utils/geolocation_map.html

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 446c9f85..a2ad117e 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -181,44 +181,8 @@
 
     {% include "mediagoblin/utils/license.html" %}
 
-    {% if media.media_data.has_key('gps')
-           and app_config['geolocation_map_visible']
-           and media.media_data.gps %}
-      <h4>Map</h4>
-      <div>
-	{% set gps = media.media_data.gps %}
- 	<div id="tile-map" style="width: 100%; height: 196px;">
-	  <input type="hidden" id="gps-longitude"
-		 value="{{ gps.longitude }}" />
-	  <input type="hidden" id="gps-latitude"
-		 value="{{ gps.latitude }}" />
-	</div>
-	<p>
-	  <small>
-	    View on 
-	    <a href="http://openstreetmap.org/?mlat={{ gps.latitude }}&mlon={{ gps.longitude }}">
-	      OpenStreetMap
-	    </a>
-	  </small>
-	</p>
-      </div>
-    {% endif %}
-    {% if media.media_data.has_key('exif')
-           and app_config['exif_visible']
-           and media.media_data.exif.has_key('useful') %}
-      {#-
-      TODO:
-      - Render GPS data in a human-readable format
-      #}
-      <h4>EXIF</h4>
-      <table>
-	{% for key, tag in media.media_data.exif.useful.items() %}
-          <tr>
-            <td>{{ key }}</td>
-            <td>{{ tag.printable }}</td>
-          </tr>
-        {% endfor %}
-      </table>
-    {% endif %}
+    {% include "mediagoblin/utils/geolocation_map.html" %}
+
+    {% include "mediagoblin/utils/exif.html" %}
   </div>
 {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/utils/exif.html b/mediagoblin/templates/mediagoblin/utils/exif.html
new file mode 100644
index 00000000..9962dd65
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/utils/exif.html
@@ -0,0 +1,33 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% block exif_content %}
+  {% if media.media_data.has_key('exif')
+        and app_config['exif_visible']
+        and media.media_data.exif.has_key('useful') %}
+    <h4>EXIF</h4>
+    <table>
+      {% for key, tag in media.media_data.exif.useful.items() %}
+        <tr>
+          <td>{{ key }}</td>
+          <td>{{ tag.printable }}</td>
+        </tr>
+      {% endfor %}
+    </table>
+  {% endif %}
+{% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/utils/geolocation_map.html b/mediagoblin/templates/mediagoblin/utils/geolocation_map.html
new file mode 100644
index 00000000..ce1edc39
--- /dev/null
+++ b/mediagoblin/templates/mediagoblin/utils/geolocation_map.html
@@ -0,0 +1,42 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% block geolocation_map %}
+  {% if media.media_data.has_key('gps')
+        and app_config['geolocation_map_visible']
+        and media.media_data.gps %}
+    <h4>Map</h4>
+    <div>
+      {% set gps = media.media_data.gps %}
+        <div id="tile-map" style="width: 100%; height: 196px;">
+	  <input type="hidden" id="gps-longitude"
+		 value="{{ gps.longitude }}" />
+	  <input type="hidden" id="gps-latitude"
+		 value="{{ gps.latitude }}" />
+	</div>
+        <p>
+	  <small>
+	    View on 
+	    <a href="http://openstreetmap.org/?mlat={{ gps.latitude }}&mlon={{ gps.longitude }}">
+	      OpenStreetMap
+	    </a>
+	  </small>
+	</p>
+    </div>
+  {% endif %}
+{% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/utils/license.html b/mediagoblin/templates/mediagoblin/utils/license.html
index 056c356e..5a268e39 100644
--- a/mediagoblin/templates/mediagoblin/utils/license.html
+++ b/mediagoblin/templates/mediagoblin/utils/license.html
@@ -17,10 +17,12 @@
 #}
 
 {% block license_content -%}
-  {% trans %}License:{% endtrans %}
-  {% if media.license %}
-  <a href="{{ media.license }}">{{ media.get_license_data().abbreviation }}</a>
-  {% else %}
-  {% trans %}All rights reserved{% endtrans %}
-  {% endif %}
+  <p>
+    {% trans %}License:{% endtrans %}
+    {% if media.license %}
+      <a href="{{ media.license }}">{{ media.get_license_data().abbreviation }}</a>
+    {% else %}
+      {% trans %}All rights reserved{% endtrans %}
+    {% endif %}
+  </p>
 {% endblock %}
-- 
2.25.1