Merge pull request #368 from EsupPortail/dev

Dev #2.7.2

.github/workflows/pod.yml

@@ -0,0 +1,52 @@
+name: Django Pod CI
+
+on:
+  push:
+    branches: [ master , dev]
+  pull_request:
+    branches: [ '*' ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    strategy:
+      max-parallel: 4
+      matrix:
+        python-version: [3.5, 3.6, 3.7]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Configure sysctl limits (for ES)
+      run: |
+        sudo swapoff -a
+        sudo sysctl -w vm.swappiness=1
+        sudo sysctl -w fs.file-max=262144
+        sudo sysctl -w vm.max_map_count=262144
+    - name: Set up Python ${{ matrix.python-version }}
+      uses: actions/setup-python@v2
+      with:
+        python-version: ${{ matrix.python-version }}
+    - name: Install Dependencies
+      run: |
+        sudo apt-get update
+        sudo apt-get install ffmpeg
+        sudo apt-get install -y ffmpegthumbnailer
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+        pip install flake8
+    - name: Flake8 compliance
+      run: |
+        flake8 --max-complexity=7 --exclude .git,pod/*/migrations/*.py,test_settings.py
+    - name: Runs Elasticsearch
+      uses: elastic/elastic-github-actions/elasticsearch@master
+      with:
+        stack-version: 7.6.0
+    - name: Setup Pod
+      run: |
+        python manage.py create_pod_index
+        python manage.py makemigrations
+        python manage.py migrate
+    - name: Run Tests
+      run: |
+        python manage.py test --settings=pod.main.test_settings

AUTHORS.md

@@ -15,5 +15,6 @@ A list of much-appreciated contributors who have submitted patches and reported
 * Loic Bonavent, University of Montpellier
 * Guillaume Condesse, University of Bordeaux
 * Franck Charneau and Joshua Baubry, University of La Rochelle
+* Olivier Bado, University Cote d'Azur
 * Nicolas Lahoche, University of Lille (design and template)
 * Charlotte Benard (Logo and color)

pod/authentication/templates/authentication/login.html

@@ -13,13 +13,13 @@ <h2>{% trans 'Authentication' %}</h2>
 
 <div class="text-center">
   {% if USE_CAS %}
-  <p><a class="btn btn-primary" href="{% url 'cas-login' %}?next={{ referrer|urlencode }}"  title="{% trans "Single sign on" %} {{TITLE_ETB}}">{% trans "Single sign on" %} {{TITLE_ETB}}</a></p>
+  <p><a class="btn btn-primary" href="{% url 'cas-login' %}?next={{ referrer|urlencode }}"  title="{% trans 'Single sign on' %} {{TITLE_ETB}}">{% trans "Single sign on" %} {{TITLE_ETB}}</a></p>
   {% endif %}
   {% if USE_SHIB %}
     <p><a class="btn btn-primary" href="{{SHIB_URL }}?target={{ referrer|urlencode }}"  title="{{ SHIB_NAME }}">{{ SHIB_NAME}}</a></p>
   {% endif %}
   {% if not local_login %}
-  <p><a class="btn btn-primary" href="{% url 'local-login'%}?{% if request.GET.is_iframe %}is_iframe=true&{%endif%}next={{ referrer|urlencode }}" title="">{% trans "local sign on" %}</a></p>
+  <p><a class="btn btn-primary" href="{% url 'local-login'%}?{% if request.GET.is_iframe %}is_iframe=true&{%endif%}next={{ referrer|urlencode }}" title="">{% trans "Local sign on" %}</a></p>
   {% endif %}
 </div>
 

pod/authentication/templates/registration/login.html

@@ -2,7 +2,7 @@
 {% load i18n static %}
 
 {% block page_extra_head %}
-{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static "admin/css/login.css" %}">
+{{ block.super }}<link rel="stylesheet" type="text/css" href="{% static 'admin/css/login.css' %}">
 {{ form.media }}
 {% endblock %}
 
@@ -30,10 +30,10 @@ <h2>{% trans 'Log in' %}</h2>
 
 {% if user.is_authenticated %}
 <p class="errornote">
-{% blocktrans trimmed %}
+  {% blocktrans trimmed %}
     You are authenticated as {{ username }}, but are not authorized to
     access this page. Would you like to login to a different account?
-{% endblocktrans %}
+  {% endblocktrans %}
 </p>
 {% endif %}