ckan#2871: rename the template directory so that the controller urls …

…match in ckan-admin

ckan/controllers/admin.py

@@ -77,7 +77,7 @@ def reset_config(self):
             app_globals.reset()
             h.redirect_to(controller='admin', action='config')
 
-        return base.render('admin/confirm_reset.html')
+        return base.render('ckan-admin/confirm_reset.html')
 
     def config(self):
 
@@ -101,7 +101,7 @@ def config(self):
                 error_summary = e.error_summary
                 vars = {'data': data, 'errors': errors,
                         'error_summary': error_summary, 'form_items': items}
-                return base.render('admin/config.html', extra_vars=vars)
+                return base.render('ckan-admin/config.html', extra_vars=vars)
 
             h.redirect_to(controller='admin', action='config')
 
@@ -111,14 +111,14 @@ def config(self):
             data[key] = config.get(key)
 
         vars = {'data': data, 'errors': {}, 'form_items': items}
-        return base.render('admin/config.html',
+        return base.render('ckan-admin/config.html',
                            extra_vars=vars)
 
     def index(self):
         #now pass the list of sysadmins
         c.sysadmins = [a.name for a in get_sysadmins()]
 
-        return base.render('admin/index.html')
+        return base.render('ckan-admin/index.html')
 
 
     def trash(self):
@@ -128,7 +128,7 @@ def trash(self):
             model.Package).filter_by(state=model.State.DELETED)
         if not request.params or (len(request.params) == 1 and '__no_cache__'
                                   in request.params):
-            return base.render('admin/trash.html')
+            return base.render('ckan-admin/trash.html')
         else:
             # NB: we repeat retrieval of of revisions
             # this is obviously inefficient (but probably not *that* bad)

ckan/lib/helpers.py

@@ -585,7 +585,7 @@ def build_nav(menu_item, title, **kw):
 
 
 def build_extra_admin_nav():
-    '''Build extra navigation items used in ``admin/base.html`` for values
+    '''Build extra navigation items used in ``ckan-admin/base.html`` for values
     defined in the config option ``ckan.admin_tabs``. Typically this is
     populated by extensions.
 

ckan/templates/admin/config.html → ckan/templates/ckan-admin/config.html

@@ -1,6 +1,6 @@
 {% import 'macros/autoform.html' as autoform %}
 
-{% extends "admin/base.html" %}
+{% extends "ckan-admin/base.html" %}
 
 {% import 'macros/form.html' as form %}
 

ckan/templates/admin/confirm_reset.html → ckan/templates/ckan-admin/confirm_reset.html

@@ -1,4 +1,4 @@
-{% extends "admin/base.html" %}
+{% extends "ckan-admin/base.html" %}
 
 {% block subtitle %}{{ _("Confirm Reset") }}{% endblock %}
 

ckan/templates/admin/index.html → ckan/templates/ckan-admin/index.html

@@ -1,4 +1,4 @@
-{% extends "admin/base.html" %}
+{% extends "ckan-admin/base.html" %}
 
 {% block primary_content_inner %}
   <ul class="user-list">

ckan/templates/admin/trash.html → ckan/templates/ckan-admin/trash.html

@@ -1,4 +1,4 @@
-{% extends "admin/base.html" %}
+{% extends "ckan-admin/base.html" %}
 
 {% block primary_content_inner %}
   {% set truncate = truncate or 180 %}

ckanext/example_iconfigurer/templates/admin/myext_config.html

@@ -1,4 +1,4 @@
-{% extends "admin/base.html" %}
+{% extends "ckan-admin/base.html" %}
 
 {% block primary_content_inner %}
     <h1>{{ title }}</h1>