diff --git a/modules/gallery.py b/modules/gallery.py index be8d481..2490027 100644 --- a/modules/gallery.py +++ b/modules/gallery.py @@ -74,6 +74,7 @@ class Gallery(MenuItemMixin, NewsItemMixin, TemplateMixin, FileAssetsMixin): def get_context(self): context = super(Gallery,self).get_context() context['title'] = self.description['title'] + context['url'] = "/%s" % self.url markdown_converter = markdown.Markdown(extensions = self.markdown_extensions) diff --git a/modules/newsfeed.py b/modules/newsfeed.py index fa6c023..34e0a38 100644 --- a/modules/newsfeed.py +++ b/modules/newsfeed.py @@ -48,6 +48,7 @@ class NewsFeed(MenuItemMixin, TemplateMixin, FileAssetsMixin): rendered_items = [] for item in self.items: item['content'] = markdown_converter.convert(item['content']) + item['url'] = "/%s" % item['url'] rendered_items += [item] item_directory = os.path.join(self.content_directory, self.news_item_directory) @@ -62,7 +63,7 @@ class NewsFeed(MenuItemMixin, TemplateMixin, FileAssetsMixin): item['content'] = markdown_converter.convert(item['content']) item['anchor'] = filename - item['url'] = "%s#%s" % (self.url, filename) + item['url'] = "/%s#%s" % (self.url, filename) rendered_items += [item] diff --git a/modules/page.py b/modules/page.py index e2ccf29..3342079 100644 --- a/modules/page.py +++ b/modules/page.py @@ -49,6 +49,7 @@ class Page(MenuItemMixin, NewsItemMixin, TemplateMixin, FileAssetsMixin): def get_context(self): context = super(Page,self).get_context() context['title'] = self.content['title'] + context['url'] = "/%s" % self.url context['content_creation_time'] = self.content['creation_time'] context['content_edit_time'] = self.content['edit_time'] diff --git a/verdandi.py b/verdandi.py index 0f667d4..37e126d 100644 --- a/verdandi.py +++ b/verdandi.py @@ -28,10 +28,12 @@ class Verdandi(object): output_directory = OUTPUT_DIRECTORY modules = [] + base_url = "" def __init__(self): self.jinja_env = Environment(loader=FileSystemLoader(TEMPLATE_DIRECTORY)) + self.jinja_env.globals['base_url'] = self.base_url def send_message(self, message):