diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc8cedf..2fc4993 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -42,7 +42,7 @@ jobs: run: PRODUCTION=1 ./run-qa-checks - name: Setup Google Cloud - if: ${{ github.event_name=='push' }} + # if: ${{ github.event_name=='push' }} uses: 'google-github-actions/auth@v2' with: credentials_json: ${{ secrets.GCS_DOWNLOADS_SERVICE_ACCOUNT_JSON }} @@ -50,24 +50,25 @@ jobs: export_environment_variables: true - name: 'Set up Cloud SDK' - if: ${{ github.event_name=='push' }} + # if: ${{ github.event_name=='push' }} uses: 'google-github-actions/setup-gcloud@v2' - name: Deploy pages to openwisp.io/docs - if: ${{ github.event_name=='push' }} + # if: ${{ github.event_name=='push' }} run: | gsutil -m rsync -r ${{ env.SRC_URL }} ${{ env.DST_URL }} env: SRC_URL: /home/runner/work/openwisp-docs/openwisp-docs/_build/docs/ - DST_URL: gs://${{ secrets.GCS_DOCS_BUCKET_NAME }}/docs/ + DST_URL: gs://${{ secrets.GCS_DOCS_BUCKET_NAME }}/docs/preview/ invalidate-cache: runs-on: ubuntu-latest needs: build - if: ${{ needs.build.result == 'success' }} && ${{ github.event_name=='push' }} + if: ${{ needs.build.result == 'success' }} steps: - name: Authenticate to Google Cloud + # if: ${{ github.event_name=='push' }} uses: google-github-actions/auth@v2 with: credentials_json: ${{ secrets.GCS_DOWNLOADS_SERVICE_ACCOUNT_JSON }} @@ -75,6 +76,7 @@ jobs: export_environment_variables: true - name: Invalid CDN cache on GCP + # if: ${{ github.event_name=='push' }} uses: stefanodotit/github-actions-invalidate-gcp-cdn@v1 with: load_balancer_name: ${{ secrets.GCS_MAIN_LOAD_BALANCER_NAME }} diff --git a/_templates/footer.html b/_templates/footer.html index f70dd5c..4481e29 100644 --- a/_templates/footer.html +++ b/_templates/footer.html @@ -10,28 +10,28 @@ {%- if show_copyright and copyright|length -%} {%- if hasdoc('copyright') -%} {%- trans path=pathto('copyright'), copyright=copyright|e -%} - © Copyright{{ copyright }} + © Copyright{{ copyright }} + {%- endtrans -%} + {%- else -%} + {%- trans copyright=copyright|e -%} + © {{ copyright }}  + {%- endtrans -%} + {%- endif -%} + {%- endif -%} + {%- if last_updated -%} + {%- trans last_updated=last_updated|e -%} + Last updated: {{ last_updated }}.  {%- endtrans -%} - {%- else -%} - {%- trans copyright=copyright|e -%} - © {{ copyright }}  - {%- endtrans -%} - {%- endif -%} - {%- endif -%} - {%- if last_updated -%} - {%- trans last_updated=last_updated|e -%} - Last updated: {{ last_updated }}.  - {%- endtrans -%} - {%- endif -%} - {%- if show_sphinx -%} - {%- trans sphinx_version=sphinx_version|e -%} - Built with Sphinx {{ sphinx_version }} - {%- endtrans -%} - {%- endif -%} -

- - -{%- block footer_after %}{%- endblock footer_after %} + {%- endif -%} + {%- if show_sphinx -%} + {%- trans sphinx_version=sphinx_version|e -%} + Built with Sphinx {{ sphinx_version }} + {%- endtrans -%} + {%- endif -%} +

+ + + {%- block footer_after %}{%- endblock footer_after %} diff --git a/_templates/layout.html b/_templates/layout.html new file mode 100644 index 0000000..9cd200e --- /dev/null +++ b/_templates/layout.html @@ -0,0 +1,36 @@ +{% extends "!layout.html" %} + +{% block linktags %} +{{ super() }} + +{% endblock %} + +{% block footer %} +{{ super() }} + + + + +{% endblock %}