[#890] Fixes for template extends

ckan · Jun 18, 2013 · 5a15fa5 · 5a15fa5
1 parent dc0172b
commit 5a15fa5
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 14 deletions.
diff --git a/ckan/public/base/less/ckan.less b/ckan/public/base/less/ckan.less
@@ -137,3 +137,7 @@ iframe {
 }
 
 @import "iehacks.less";
+
+.debug {
+  display: none;
+}
diff --git a/ckan/templates/group/about.html b/ckan/templates/group/about.html
@@ -1,4 +1,4 @@
-{% extends "group/read.html" %}
+{% extends "group/read_base.html" %}
 
 {% block subtitle %}{{ _('About') }} - {{ c.group_dict.display_name }}{% endblock %}
 

diff --git a/ckan/templates/group/activity_stream.html b/ckan/templates/group/activity_stream.html
@@ -1,4 +1,4 @@
-{% extends "group/read.html" %}
+{% extends "group/read_base.html" %}
 
 {% block subtitle %}{{ _('Activity Stream') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %}
 

diff --git a/ckan/templates/group/admins.html b/ckan/templates/group/admins.html
@@ -1,4 +1,4 @@
-{% extends "group/read.html" %}
+{% extends "group/read_base.html" %}
 
 {% block subtitle %}{{ _('Administrators') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %}
 

diff --git a/ckan/templates/group/followers.html b/ckan/templates/group/followers.html
@@ -1,4 +1,4 @@
-{% extends "group/read.html" %}
+{% extends "group/read_base.html" %}
 
 {% block subtitle %}{{ _('Followers') }} - {{ c.group_dict.title or c.group_dict.name }}{% endblock %}
 

diff --git a/ckan/templates/group/read.html b/ckan/templates/group/read.html
@@ -2,6 +2,10 @@
 
 {% block subtitle %}{{ c.group_dict.display_name }}{% endblock %}
 
+{% block add_action %}
+  {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
+{% endblock %}
+
 {% block primary_content_inner %}
   {% block packages_list %}
     {% include "package/snippets/search_form.html" %}

diff --git a/ckan/templates/group/read_base.html b/ckan/templates/group/read_base.html
@@ -7,10 +7,6 @@
   <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='group', action='read', id=c.group_dict.name %}</li>
 {% endblock %}
 
-{% block add_action %}
-  {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
-{% endblock %}
-
 {% block edit_action %}
   {% if h.check_access('group_update', {'id': c.group_dict.id}) %}
     {% link_for _('Edit'), controller='group', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}

diff --git a/ckan/templates/organization/read.html b/ckan/templates/organization/read.html
@@ -1,5 +1,11 @@
 {% extends "organization/read_base.html" %}
 
+{% block add_action %}
+  {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
+    {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
+  {% endif %}
+{% endblock %}
+
 {% block primary_content_inner %}
   {% block packages_list %}
     {% include "package/snippets/search_form.html" %}

diff --git a/ckan/templates/organization/read_base.html b/ckan/templates/organization/read_base.html
@@ -7,12 +7,6 @@
   <li class="active">{% link_for c.group_dict.display_name|truncate(35), controller='organization', action='read', id=c.group_dict.name %}</li>
 {% endblock %}
 
-{% block add_action %}
-  {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
-    {% link_for _('Add Dataset'), controller='package', action='new', group=c.group_dict.id, class_='btn btn-primary', icon='plus-sign-alt' %}
-  {% endif %}
-{% endblock %}
-
 {% block edit_action %}
   {% if h.check_access('organization_update', {'id': c.group_dict.id}) %}
     {% link_for _('Admin'), controller='organization', action='edit', id=c.group_dict.name, class_='btn', icon='wrench' %}