Skip to content

Commit

Permalink
With the new location, it all now works.
Browse files Browse the repository at this point in the history
There are a fwe things we need to discuss.
I use the wrong resolver.
Is it api compatible with the old version.
Anything else?
  • Loading branch information
PythonLinks committed Jan 7, 2018
1 parent d07c374 commit 3605fa8
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/dolmen/breadcrumbs/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

def defaultBreadcrumbs(item,request):
#import pdb; pdb.set_trace()
crumbs=BreadcrumbsRenderer(item,request,viewName='')
crumbs=BreadcrumbsRenderer(item,request,viewName='',separator='/')
crumbs.update()
return crumbs.render()

Expand Down
7 changes: 5 additions & 2 deletions src/dolmen/breadcrumbs/crumbs.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
# -*- coding: utf-8 -*-

from cromlech.browser import IPublicationRoot
from dolmen.location import get_absolute_url, lineage_chain
from dolmen.location import lineage_chain
from dolmen.location import resolve_url
from dolmen.location import get_absolute_url


try:
from urllib import quote # Python 2.X
Expand Down Expand Up @@ -37,7 +40,7 @@ def breadcrumbs(item, request, viewName='', resolver=resolve_name):
parents.reverse()
root = parents.pop(0)
#base_url = get_absolute_url(root, request)
base_url="pythonLinks.info:8081"
base_url = resolve_url(root, request)
name, title = resolver(root)
yield {'name': title, 'url': base_url + viewName}

Expand Down
10 changes: 5 additions & 5 deletions src/dolmen/breadcrumbs/renderer.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
TEMPLATES_DIR = path.join(path.dirname(__file__), 'templates')
template = TALTemplate(path.join(TEMPLATES_DIR, 'breadcrumbs.pt'))


def render_breadcrumbs(renderer, crumbs, viewName='', separator="→"):
def render_breadcrumbs(renderer, crumbs, viewName='', separator=''):
namespace = dict(
breadcrumbs=crumbs,
viewName=viewName,
target_language='en',
separator=separator)

return template.render(renderer, **namespace)
# target_language=ILanguage(renderer.request, None),
#WHAT SHOULD I HAVE DONE HERE?
Expand All @@ -28,14 +28,14 @@ class BreadcrumbsRenderer(object):

resolver = None

def __init__(self, context, request, viewName=''):
def __init__(self, context, request, viewName='', separator="→"):
self.context = context
self.request = request
self.viewName = viewName

self.separator=separator
def update(self):
self.breadcrumbs = list(
breadcrumbs(self.context, self.request, self.viewName, self.resolver))

def render(self):
return render_breadcrumbs(self, self.breadcrumbs)
return render_breadcrumbs(self, self.breadcrumbs, viewName=self.viewName, separator=self.separator)
4 changes: 2 additions & 2 deletions src/dolmen/breadcrumbs/templates/breadcrumbs.pt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="breadcrumb" i18n:domain="dolmen.breadcrumbs">
<span class="breadcrumb" i18n:domain="dolmen.breadcrumbs">
<span class="you-are-here" i18n:translate="">You are here :</span>
<tal:loop repeat="crumb breadcrumbs">
<span class="crumb" tal:condition="crumb['name']">
Expand All @@ -10,4 +10,4 @@
tal:condition="not: repeat['crumb'].end" />
</span>
</tal:loop>
</div>
</span>

0 comments on commit 3605fa8

Please sign in to comment.