[2563] Update the user templates to use the new block

ckan · Jun 19, 2012 · c185a69 · c185a69
1 parent 9eacf41
commit c185a69
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 43 deletions.
diff --git a/ckan/templates/user/followers.html b/ckan/templates/user/followers.html
@@ -2,12 +2,9 @@
 
 {% block title %}{{ _('Followers') }} - {{ super() }}{% endblock %}
 
-{% block breadcrumb %}
-  <ol class="breadcrumb">
-    <li class="home hide-text"><a class="ckan-icon ckan-icon-bookmark" href="{{ h.url('home') }}">Home</a></li>
-    <li>{{ h.nav_link(_('Home'), controller='user', action='me') }}</li>
-    <li class="current">{{ h.nav_link(_('Followers'), controller='user', action='followers', id="") }}</li>
-  </ol>
+{% block breadcrumb_content %}
+  <li>{{ h.nav_link(_('Home'), controller='user', action='me') }}</li>
+  <li class="active">{{ h.nav_link(_('Followers'), controller='user', action='followers', id="") }}</li>
 {% endblock %}
 
 {% block primary_content %}

diff --git a/ckan/templates/user/list.html b/ckan/templates/user/list.html
@@ -2,11 +2,8 @@
 
 {% block title %}{{ _('All Users') }} - {{ super() }}{% endblock %}
 
-{% block breadcrumb %}
-  <ol class="breadcrumb">
-    <li class="home hide-text"><a class="ckan-icon ckan-icon-bookmark" href="{{ h.url('home') }}">Home</a></li>
-    <li class="current">{{ h.nav_link(_('Users'), controller='user', action='index') }}</li>
-  </ol>
+{% block breadcrumb_content %}
+  <li class="active">{{ h.nav_link(_('active'), controller='user', action='index') }}</li>
 {% endblock %}
 
 {% block primary_content %}

diff --git a/ckan/templates/user/login.html b/ckan/templates/user/login.html
@@ -2,11 +2,8 @@
 
 {% block title %}{{ _('Login') }} - {{ super() }}{% endblock %}
 
-{% block breadcrumb %}
-  <ol class="breadcrumb">
-    <li class="home hide-text"><a class="ckan-icon ckan-icon-bookmark" href="{{ h.url('home') }}">Home</a></li>
-    <li class="current">{{ h.nav_link(_('Login'), controller='user', action='login') }}</li>
-  </ol>
+{% block breadcrumb_content %}
+  <li class="active">{{ h.nav_link(_('Login'), controller='user', action='login') }}</li>
 {% endblock %}
 
 {% block primary_content %}

diff --git a/ckan/templates/user/new.html b/ckan/templates/user/new.html
@@ -2,11 +2,8 @@
 
 {% block title %}{{ _('Register') }} - {{ super() }}{% endblock %}
 
-{% block breadcrumb %}
-  <ol class="breadcrumb">
-    <li class="home hide-text"><a class="ckan-icon ckan-icon-bookmark" href="{{ h.url('home') }}">Home</a></li>
-    <li class="current">{{ h.nav_link(_('Registration'), controller='user', action='register') }}</li>
-  </ol>
+{% block breadcrumb_content %}
+  <li class="active">{{ h.nav_link(_('Registration'), controller='user', action='register') }}</li>
 {% endblock %}
 
 {% block primary_content %}

diff --git a/ckan/templates/user/perform_reset.html b/ckan/templates/user/perform_reset.html
@@ -2,11 +2,8 @@
 
 {% block title %}{{ _('Reset Your Password') }} - {{ super() }}{% endblock %}
 
-{% block breadcrumb %}
-  <ol class="breadcrumb">
-    <li class="home hide-text"><a class="ckan-icon ckan-icon-bookmark" href="{{ h.url('home') }}">Home</a></li>
-    <li class="current">{{ _('Password Reset') }}</li>
-    </ol>
+{% block breadcrumb_content %}
+  <li class="active">{{ _('Password Reset') }}</li>
 {% endblock %}
 
 {% block primary_content %}

diff --git a/ckan/templates/user/read.html b/ckan/templates/user/read.html
@@ -4,20 +4,15 @@
 
 {% block title %}{{ user.display_name }} - {{ super() }}{% endblock %}
 
-{% block breadcrumb %}
-  <ol class="breadcrumb">
-    <li class="home hide-text"><a class="ckan-icon ckan-icon-bookmark" href="{{ h.url('home') }}">Home</a></li>
-    <li>{{ h.nav_link(_('User'), controller='user', action='index') }}</li>
-    {% with title = _('Your Profile') if c.is_myself  else user.display_name %}
-      <li class="current">{{  h.nav_link(title, controller='user', action='read', id=user.name) }}</li>
-    {% endwith %}
-  </ol>
+{% block breadcrumb_content %}
+  <li>{{ h.nav_link(_('User'), controller='user', action='index') }}</li>
+  {% with title = _('Your Profile') if c.is_myself  else user.display_name %}
+    <li class="active">{{  h.nav_link(title, controller='user', action='read', id=user.name) }}</li>
+  {% endwith %}
 {% endblock %}
 
-{% block actions %}
-  <ul class="actions">
-    <li>{{ h.nav_link(_('Edit'), controller='user', action='edit', id=user.name, class_='btn', icon='star') }}</li>
-  </ul>
+{% block actions_content %}
+  <li>{{ h.nav_link(_('Edit'), controller='user', action='edit', id=user.name, class_='btn', icon='star') }}</li>
 {% endblock %}
 
 {% block primary_content %}

diff --git a/ckan/templates/user/request_reset.html b/ckan/templates/user/request_reset.html
@@ -2,11 +2,8 @@
 
 {% block title %}{{ _('Reset Your Password') }} - {{ super() }}{% endblock %}
 
-{% block breadcrumb %}
-  <ol class="breadcrumb">
-    <li class="home hide-text"><a class="ckan-icon ckan-icon-bookmark" href="{{ h.url('home') }}">Home</a></li>
-    <li class="current">{{ h.nav_link(_('Password Reset'), controller='user', action='register') }}</li>
-  </ol>
+{% block breadcrumb_content %}
+  <li class="active">{{ h.nav_link(_('Password Reset'), controller='user', action='register') }}</li>
 {% endblock %}
 
 {% block primary_content %}