diff --git a/_templates/pdf.html b/_templates/pdf.html index 3d1e0d6bfbefe689cb0cd105a807dac3e83ab10c..6f6e190e89063bde94b715278b4d2e25194dc8f1 100644 --- a/_templates/pdf.html +++ b/_templates/pdf.html @@ -1,8 +1,7 @@ {% if pages_slug != "index" %} {% for proposal_name in proposals %} {% if pagename == "proposals/"+proposal_name %} - <!-- TODO: Dynamically create custom link for every proposal PDF--> - <a class="btn btn-danger btn-sm btn-block text-light" role="button" href="{{docs_url}}/{{proposal_name}}.pdf"> + <a class="btn btn-danger btn-sm btn-block text-light" role="button" href="{{proposal_name}}.pdf"> <i class="fa-solid fa-download"></i> {{proposal_name}}.pdf </a> {% endif %} diff --git a/conf.py b/conf.py index bc050f2f7dfc8cccdbb087e36d69b9f616dfb099..5d297545d6acb632445a7a541c53f99d9dbbbcfb 100644 --- a/conf.py +++ b/conf.py @@ -8,7 +8,6 @@ import os import sys -import re from pathlib import Path from typing import Any, Dict from os import walk @@ -131,35 +130,6 @@ for proposal_filename in proposal_filenames: print(proposals) -# parse pages details from 'PAGES' file -docs_url = "gsoc.beagleboard.io" -with open("PAGES") as f: - m = re.match( - ( - r"^PAGES_URL\s*=\s*(\S+)$\n" - + r"^PAGES_SLUG\s*=\s*(\S+)$\n" - + r"^GITLAB_USER\s*=\s*(\S+)$\n" - + r"^PROJECT_BRANCH\s*=\s*(\S+)$\n" - + r"^GITLAB_HOST\s*=\s*(\S+)$\n" - + r"^PROJECT_REPO\s*=\s*(\S+)$\n" - ), - f.read(), - re.MULTILINE, - ) - - if not m: - sys.stderr.write("Warning: Could not extract pages information\n") - else: - url, slug, user, branch, host, repo = m.groups(1) - slug = "latest" if slug == "main" else slug - pages_url = url - pages_slug = slug - gitlab_user = user - gitlab_version = branch - gitlab_host = host - gitlab_repo = repo - docs_url = "/".join((url, slug)) - html_context = { "display_gitlab": True, "gitlab_url": "https://openbeagle.org", @@ -171,7 +141,7 @@ html_context = { "show_license": True, "pages_url": "https://gsoc.beagleboard.io", "pages_slug": "", - "docs_url": docs_url, + "docs_url": "https://docs.beagleboard.org/latest/", "edit_page_url_template": "{{ my_vcs_site }}{{ file_name }}", "edit_page_provider_name": "OpenBeagle", "my_vcs_site": "https://openbeagle.org/gsoc/gsoc.beagleboard.io/-/edit/main/", diff --git a/gitlab-build.sh b/gitlab-build.sh index 1e0ac91b1f2e225dcd5746323dc85f1a846533e4..22e76e418d11e52d6c628cc12ded5ce22087af1e 100755 --- a/gitlab-build.sh +++ b/gitlab-build.sh @@ -1,15 +1,6 @@ #!/bin/bash -xe mkdir -p public -cat << EOF > PAGES -PAGES_URL = $PAGES_URL -PAGES_SLUG = $PAGES_SLUG -GITLAB_USER = $GITLAB_USER -PROJECT_BRANCH = $PROJECT_BRANCH -GITLAB_HOST = $GITLAB_HOST -PROJECT_REPO = $PROJECT_REPO -EOF - echo "**** Updating $PAGES_URL/$VER_DIR ****" echo "**** env ****" env @@ -23,7 +14,7 @@ mv public/html/* public/ # Render PDF make latexpdf BUILDDIR=public/ -mv public/latex/*.pdf public/ +mv public/latex/*.pdf public/proposals # Cleanup echo "**** cleanup ****"