From b232d232c0102f954435213f7341f25f7b73aee2 Mon Sep 17 00:00:00 2001
From: Dominik Moritz <domoritz@gmail.com>
Date: Mon, 24 Sep 2012 11:37:38 +0100
Subject: [PATCH] Base template for previews

---
 ckan/templates/dataviewer/base.html    | 20 ++++++++++++++++++++
 ckan/templates/dataviewer/json.html    | 24 +++---------------------
 ckan/templates/dataviewer/pdf.html     | 15 ++-------------
 ckan/templates/dataviewer/recline.html | 20 ++------------------
 4 files changed, 27 insertions(+), 52 deletions(-)
 create mode 100644 ckan/templates/dataviewer/base.html

diff --git a/ckan/templates/dataviewer/base.html b/ckan/templates/dataviewer/base.html
new file mode 100644
index 00000000000..bb751c52d12
--- /dev/null
+++ b/ckan/templates/dataviewer/base.html
@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+
+{% block subtitle %}{{ h.dataset_display_name(c.package) }} - {{h.resource_display_name(c.resource) }}{% endblock %}
+
+{# remove any scripts #}
+{% block scripts %}
+	{% resource 'base/main' %}
+  {% resource 'vendor/vendor' %}
+
+  <script>
+    var preload_resource = {{ h.literal(c.resource_json) }};
+  </script>
+{% endblock %}
+
+{# remove any ckan styles #}
+{% block styles %}
+{% endblock %}
+
+{% block custom_styles %}
+{% endblock %}
\ No newline at end of file
diff --git a/ckan/templates/dataviewer/json.html b/ckan/templates/dataviewer/json.html
index 3af1c490951..de6f2218e29 100644
--- a/ckan/templates/dataviewer/json.html
+++ b/ckan/templates/dataviewer/json.html
@@ -1,32 +1,14 @@
-{% extends "base.html" %}
-
-{% set res = c.resource %}
-
-{% block subtitle %}{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }}{% endblock %}
+{% extends "dataviewer/base.html" %}
 
 {% block page %}
 	<div>
 		<pre data-module="jsonpreview">
-	  	{{_('loading...')}}
+	  	{{ _('loading...') }}
 	  </pre>
 	</div>
 {% endblock %}
 
 {% block scripts %}
   {{ super() }}
-  {% resource 'base/main' %}
-  {% resource 'vendor/vendor' %}
   {% resource 'datapreview/jsonpreview' %}
-
-  <script>
-    var preload_resource = {{ h.literal(c.resource_json) }};
-  </script>
-{% endblock %}
-
-
-{# remove any ckan styles #}
-{% block styles %}
-{% endblock %}
-
-{% block custom_styles %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/ckan/templates/dataviewer/pdf.html b/ckan/templates/dataviewer/pdf.html
index 00df75c5c00..351ccaed331 100644
--- a/ckan/templates/dataviewer/pdf.html
+++ b/ckan/templates/dataviewer/pdf.html
@@ -1,15 +1,10 @@
-{% extends "base.html" %}
-
-{% block subtitle %}{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(c.resource) }}{% endblock %}
+{% extends "dataviewer/base.html" %}
 
 {% block styles %}
   {% set locale_href = h.url_for_static('/base/datapreview/vendor/pdfviewer/locale.properties')%}
   <link rel="resource" type="application/l10n" href="{{locale_href}}"/>
 {% endblock %}
 
-{%- block custom_styles %}
-{% endblock %}
-
 {% block page %}
   <div id="outerContainer" class="module-content" data-module="pdfpreview">
     <div id="sidebarContainer">
@@ -154,12 +149,6 @@
 {% endblock %}
 
 {% block scripts %}
-  {% resource 'base/main' %}
-  {% resource 'vendor/vendor' %}
+  {{ super() }}
   {% resource 'datapreview/pdfpreview' %}
-
-  <script>
-    var preload_resource = {{ h.literal(c.resource_json) }};
-    //var pdfjs_workersrc = '{{ h.url_for_static('/base/dataviewer/vendor/pdfjs/pdf.js') }}';
-  </script>
 {% endblock %}
diff --git a/ckan/templates/dataviewer/recline.html b/ckan/templates/dataviewer/recline.html
index 974f845be80..1d15598dcf7 100644
--- a/ckan/templates/dataviewer/recline.html
+++ b/ckan/templates/dataviewer/recline.html
@@ -1,8 +1,4 @@
-{% extends "base.html" %}
-
-{% set res = c.resource %}
-
-{% block subtitle %}{{ h.dataset_display_name(c.package) }} - {{ h.resource_display_name(res) }}{% endblock %}
+{% extends "dataviewer/base.html" %}
 
 {% block page %}
   <div id="ckanext-datapreview"></div>
@@ -11,16 +7,4 @@
 {% block scripts %}
   {{ super() }}
   {% resource 'datapreview/datapreview' %}
-
-  <script>
-    var preload_resource = {{ h.literal(c.resource_json) }};
-  </script>
-{% endblock %}
-
-
-{# remove any ckan styles #}
-{% block styles %}
-{% endblock %}
-
-{% block custom_styles %}
-{% endblock %}
+{% endblock %}
\ No newline at end of file