[#506] Tidys up views to have better breadcrumbs for editin user

Conflicts: ckan/templates/user/edit_base.html
ckan · Jul 1, 2013 · 35a461c · 35a461c
1 parent f7ec8a8
commit 35a461c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 16 deletions.
diff --git a/ckan/templates/user/edit.html b/ckan/templates/user/edit.html
@@ -1,7 +1,16 @@
 {% extends 'user/edit_base.html' %}
 
-{% block actions_content %}
-
+{% block actions_content %}{% endblock %}
+
+{% block breadcrumb_content %}
+  {% if c.userobj.name == c.user_dict.name %}
+    <li><a href="{{ h.url_for(controller='user', action='dashboard') }}">{{ _('Dashboard') }}</a></li>
+    <li class="active"><a href="#">{{ _('Edit settings') }}</a></li>
+  {% else %}
+    <li><a href="{{ h.url_for(controller='user', action='index') }}">{{ _('Users') }}</a></li>
+    <li><a href="{{ h.url_for(controller='user', action='read', id=c.user_dict.name) }}">{{ c.user_dict.display_name }}</a></li>
+    <li class="active"><a href="#">{{ _('Edit') }}</a></li>
+  {% endif %}
 {% endblock %}
 
 {% block primary_content_inner %}

diff --git a/ckan/templates/user/edit_base.html b/ckan/templates/user/edit_base.html
@@ -4,22 +4,8 @@
 
 {% block subtitle %}{{ _('Dashboard') }}{% endblock %}
 
-{% block breadcrumb_content %}
-  <li class="active"><a href="{{ h.url_for(controller='user', action='dashboard') }}">{{ _('Dashboard') }}</a></li>
-{% endblock %}
-
 {% block primary_content %}
   <article class="module">
-    {% block page_header %}
-      <header class="module-content page-header">
-        <ul class="nav nav-tabs">
-          {% block content_primary_nav %}
-            {{ h.build_nav_icon('user_dashboard', _('News feed')) }}
-            {{ h.build_nav_icon('user_edit', _('Settings'), id=user.name) }}
-          {% endblock %}
-        </ul>
-      </header>
-    {% endblock %}
     <div class="module-content">
       {% block primary_content_inner %}{% endblock %}
     </div>