From 7309f8402e83d41a069ddf39def7e374d7c88b4d Mon Sep 17 00:00:00 2001
From: Aron Carroll <self@aroncarroll.com>
Date: Tue, 5 Jun 2012 15:23:24 +0100
Subject: [PATCH] [2445] Move new related code into a template page

This allows us to share the same code between the add and edit pages.
---
 ckan/templates/related/new.html               | 26 ++-------------
 .../related/pages/related_form_page.html      | 32 +++++++++++++++++++
 2 files changed, 35 insertions(+), 23 deletions(-)
 create mode 100644 ckan/templates/related/pages/related_form_page.html

diff --git a/ckan/templates/related/new.html b/ckan/templates/related/new.html
index d19ec64451c..3ecefd6c250 100644
--- a/ckan/templates/related/new.html
+++ b/ckan/templates/related/new.html
@@ -1,27 +1,7 @@
-{% extends "page.jinja.html" %}
+{% extends "related/pages/related_form_page.html" %}
 
 {% block title %}Create a related item - {{ super() }}{% endblock %}
 
-{% block breadcrumb %}
-  {{ h.snippet('package/new_breadcrumb.html') }}
-{% endblock %}
+{% block breadcrumb_item %}{{ h.nav_link(_('Create Related'), controller='related', action='new', id=c.id) }}{% endblock %}
 
-{% block primary_content %}
-  <section class="module">
-    <div class="content">
-      {{ c.form }}
-    </div>
-  </section>
-{% endblock %}
-
-{% block secondary_content %}
-  <section class="module">
-    <h2 class="heading"><i class="ckan-icon ckan-icon-info"></i> What are related items?</h2>
-    <div class="content">
-      <p>Related Media is any app, article, visualisation or idea related to
-      this dataset. For example, it could be a custom visualisation, pictograph
-      or bar chart, an app using all or part of the data or even a news story
-      that references this dataset.</p>
-    </div>
-  </section>
-{% endblock %}
+{% block page_heading %}{{ _('Create Related Item') }}{% endblock %}
diff --git a/ckan/templates/related/pages/related_form_page.html b/ckan/templates/related/pages/related_form_page.html
new file mode 100644
index 00000000000..4e86f975ced
--- /dev/null
+++ b/ckan/templates/related/pages/related_form_page.html
@@ -0,0 +1,32 @@
+{% extends "page.jinja.html" %}
+
+{% block breadcrumb %}
+  <ol class="breadcrumb">
+    <li>{{ h.nav_link(_('Datasets'), controller='package', action='search', highlight_actions = 'new index') }}</li>
+    {# TODO: Insert rest of breadcrumb here #}
+    <li class="current">{% block breadcrumb_item %}{% endblock %}</li>
+  </ol>
+{% endblock %}
+
+{% block primary_content %}
+  <section class="module"> 
+    <div class="content">
+      <h1 class="page-heading">{% block page_heading %}{{ _('Related Form') }}{% endblock %}</h1>
+      {{ c.form }}
+    </div>
+  </section>
+{% endblock %}
+
+{% block secondary_content %}
+  <section class="module">
+    <h2 class="heading"><i class="ckan-icon ckan-icon-info"></i> What are related items?</h2>
+    <div class="content">
+      <p>Related Media is any app, article, visualisation or idea related to
+      this dataset.</p>
+
+      <p>For example, it could be a custom visualisation, pictograph
+      or bar chart, an app using all or part of the data or even a news story
+      that references this dataset.</p>
+    </div>
+  </section>
+{% endblock %}