Skip to content
Snippets Groups Projects
Commit 0b75b7e0 authored by Jake's avatar Jake
Browse files

Merge branch 'edit_url' into 'master'

Added Edit and View Url

See merge request GAUMI-fginfo/fg-website!16
parents 358a1645 d814c0b4
No related branches found
No related tags found
No related merge requests found
Pipeline #319259 passed
......@@ -12,6 +12,14 @@
"external": "_blank"
},
"default_status": "published",
"gitlab": {
"edit_url": {
"suffix": ""
},
"view_url": {
"suffix": "?plain=1"
}
},
"pandoc": {
"mimetypes": {
"text/markdown": {
......
......@@ -4,6 +4,14 @@
{ "link": "tag:admin" },
{ "link": "tag:internal" }
],
"gitlab": {
"edit_url": {
"prefix": "https://gitlab.gwdg.de/-/ide/project/GAUMI-fginfo/fg-website/edit/master/-/docs/"
},
"view_url": {
"prefix": "https://gitlab.gwdg.de/GAUMI-fginfo/fg-website/-/blob/master/docs/"
}
},
"lang": {
"de": {
"sitename": "Dokumentation Fachgruppenwebseite",
......
......@@ -127,6 +127,25 @@ class Page:
#self.url = self.lang + '/' + self.category.name + '/' + self.slug + ".html"
self.link = self._factories['link'].get_by_type("slug", self.slug, self.lang)
gitlabsettings = self._config["gitlab"]
raw_edit_url = gitlabsettings["edit_url"]["prefix"]
raw_edit_url += '/'.join(self.subpath)
if len(self.subpath):
raw_edit_url += '/'
raw_edit_url += self.filename
raw_edit_url += gitlabsettings["edit_url"]["suffix"]
self.edit_url = self._factories['link'].get_by_raw(raw_edit_url, self.lang)
raw_view_url = gitlabsettings["view_url"]["prefix"]
raw_view_url += '/'.join(self.subpath)
if len(self.subpath):
raw_view_url += '/'
raw_view_url += self.filename
raw_view_url += gitlabsettings["view_url"]["suffix"]
self.view_url = self._factories['link'].get_by_raw(raw_view_url, self.lang)
def get_config(self):
if not self._config:
self._config = self._factories['config'].get(self.lang)
......
......@@ -29,7 +29,13 @@
"tags_prefix": "Tags: ",
"tags_suffix": "",
"slug_prefix": "Slug: ",
"slug_suffix": ""
"slug_suffix": "",
"edit_url_text": "[Seite bearbeiten]",
"view_url_text": "[Quelltext]"
},
"tag": {
"edit_url_text": "[Seite bearbeiten]",
"view_url_text": "[Quelltext]"
},
"atom": {
"title": "<Dein Seitenname> Atom Feed"
......
......@@ -13,4 +13,11 @@
{% endblock %}
{% block page_footer %}
<footer class="page-footer content">
<div>
{{ linkr.render(page.edit_url, t[l].page.edit_url_text, l) }} |
{{ linkr.render(page.view_url, t[l].page.view_url_text, l) }}
</div>
</footer>
{% endblock %}
......@@ -106,5 +106,10 @@
{{ t[l].page.slug_suffix }}
</div>
<div>
{{ linkr.render(page.edit_url, t[l].page.edit_url_text, l) }} |
{{ linkr.render(page.view_url, t[l].page.view_url_text, l) }}
</div>
</footer>
{% endblock %}
......@@ -11,3 +11,14 @@
{{ render.section({"type": "tag", "tag": tag, "num": None}, l) }}
</section>
{% endblock main %}
{% block page_footer %}
{%- if tag.page -%}
<footer class="page-footer content">
<div>
{{ linkr.render(tag.page.edit_url, t[l].tag.edit_url_text, l) }} |
{{ linkr.render(tag.page.view_url, t[l].tag.view_url_text, l) }}
</div>
</footer>
{%- endif -%}
{% endblock %}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment