[#2375] move stages inside forms

ckan · Jul 12, 2012 · 3410309 · 3410309
1 parent 8e2ba26
commit 3410309
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 7 deletions.
diff --git a/ckan/templates/package/new_package_metadata.html b/ckan/templates/package/new_package_metadata.html
@@ -2,6 +2,4 @@
 
 {% block title %}{{ _('Add metadata to the dataset') }} - {{ super }}{% endblock %}
 
-{% block stages %}{{ h.snippet('package/snippets/stages.html', stages=['complete', 'complete', 'active'], pkg_name=pkg_name) }}{% endblock %}
-
 {% block form %}{{ h.snippet('package/snippets/package_metadata_form.html', data=data, errors=errors, include_metadata=false, pkg_name=pkg_name) }}{% endblock %}
diff --git a/ckan/templates/package/new_resource.html b/ckan/templates/package/new_resource.html
@@ -2,9 +2,7 @@
 
 {% block title %}{{ _('Add data to the dataset') }} - {{ super }}{% endblock %}
 
-{% block stages %}{{ h.snippet('package/snippets/stages.html', stages=stage, pkg_name=pkg_name) }}{% endblock %}
-
-{% block form %}{{ h.snippet('package/snippets/resource_form.html', data=data, errors=errors, include_metadata=false, pkg_name=pkg_name) }}{% endblock %}
+{% block form %}{{ h.snippet('package/snippets/resource_form.html', data=data, errors=errors, include_metadata=false, pkg_name=pkg_name, stage=stage) }}{% endblock %}
 
 {% block secondary_content %}
   <section class="module module-narrow">

diff --git a/ckan/templates/package/pages/form.html b/ckan/templates/package/pages/form.html
@@ -2,6 +2,7 @@
 {% set action = c.form_action or '' %}
 
 <form class="dataset-form form-horizontal" method="post" action="{{ action }}">
+      {{ h.snippet('package/snippets/stages.html', stages=stage) }}
   <input type="hidden" name="_ckan_phase" value="dataset_new_1" />
   {# pkg_name used in 3 stage edit #}
   <input type="hidden" name="pkg_name" value="{{ data.name }}" />

diff --git a/ckan/templates/package/pages/form_page.html b/ckan/templates/package/pages/form_page.html
@@ -9,7 +9,6 @@
 {% block primary_content %}
   <section class="module">
     <div class="module-content">
-      {% block stages %}{{ h.snippet('package/snippets/stages.html', stages=stage) }}{% endblock %}
       {% block form %}{{ c.form | safe }}{% endblock %}
     </div>
   </section>

diff --git a/ckan/templates/package/snippets/package_metadata_form.html b/ckan/templates/package/snippets/package_metadata_form.html
@@ -4,6 +4,7 @@
 {% set errors = errors or {} %}
 
 <form class="dataset-form dataset-resource-form form-horizontal" method="post">
+  {{ h.snippet('package/snippets/stages.html', stages=['complete', 'complete', 'active'], pkg_name=pkg_name) }}
   {{ form.errors(error_summary) }}
 
   {% snippet 'package/snippets/package_metadata_fields.html', data=data, errors=errors, groups_available=groups_available %}

diff --git a/ckan/templates/package/snippets/resource_form.html b/ckan/templates/package/snippets/resource_form.html
@@ -4,6 +4,7 @@
 {% set errors = errors or {} %}
 
 <form class="dataset-form dataset-resource-form form-horizontal" method="post">
+  {{ h.snippet('package/snippets/stages.html', stages=stage, pkg_name=pkg_name) }}
   <div class="control-group dataset-form-resource-types">
     {% block basic_fields %}
       <div class="controls">

diff --git a/ckan/templates/package/snippets/stages.html b/ckan/templates/package/snippets/stages.html
@@ -31,7 +31,7 @@
     {% if s2 != 'complete' %}
       <span class="highlight">{{ _('Add data') }}</span>
     {% else %}
-      {% if s1 == 'active' %}
+      {% if s1 == 'active' or s3 == 'active'%}
         {# stage 1 #}
         <button class="" name="save" value="go-resources" type="submit">{{ _('Add data') }}</button>
       {% else %}