Merge branch 'trademark' into 'master'

Add trademark hints

See merge request !787

README.rst

@@ -76,6 +76,14 @@ full licence text or on the `European Union Public Licence`_ website
 https://joinup.ec.europa.eu/collection/eupl/guidelines-users-and-developers
 (including all other official language versions).
 
+Trademark
+---------
+
+AlekSIS® is a registered trademark of the AlekSIS open source project, represented
+by Teckids e.V. Please refer to the `trademark policy`_ for hints on using the trademark
+AlekSIS®.
+
 .. _AlekSIS: https://aleksis.org
 .. _European Union Public Licence: https://eupl.eu/
 .. _EduGit: https://edugit.org/AlekSIS/official/AlekSIS
+.. _trademark policy: https://aleksis.org/pages/about

aleksis/core/templates/core/base.html

@@ -172,7 +172,7 @@
     <div class="container">
       <div class="left">
         <a class="blue-text text-lighten-4" href="{% url "about_aleksis" %}">
-          {% trans "About AlekSIS — The Free School Information System" %}
+          {% trans "About AlekSIS® — The Free School Information System" %}
         </a>
         © The AlekSIS Team
       </div>

aleksis/core/templates/core/base_print.html

@@ -69,7 +69,7 @@
             </div>
 
             <div class="right">
-              {% trans "Powered by AlekSIS" %}
+              {% trans "Powered by AlekSIS®" %}
             </div>
           </footer>
         </div>

aleksis/core/templates/core/pages/about.html

@@ -3,8 +3,8 @@
 {% load i18n %}
 
 
-{% block browser_title %}{% blocktrans %}About AlekSIS{% endblocktrans %}{% endblock %}
-{% block page_title %}{% blocktrans %}AlekSIS – The Free School Information System{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}About AlekSIS®{% endblocktrans %}{% endblock %}
+{% block page_title %}{% blocktrans %}AlekSIS® – The Free School Information System{% endblocktrans %}{% endblock %}
 
 {% block content %}
 
@@ -15,11 +15,16 @@
           <span class="card-title">{% blocktrans %}About AlekSIS{% endblocktrans %}</span>
           <p>
             {% blocktrans %}
-              This platform is powered by AlekSIS, a web-based school information system (SIS) which can be used
+              This platform is powered by AlekSIS®, a web-based school information system (SIS) which can be used
               to manage and/or publish organisational artifacts of educational institutions. AlekSIS is free software and
               can be used by anyone.
             {% endblocktrans %}
           </p>
+          <p>
+            {% blocktrans %}
+              AlekSIS® is a registered trademark of the AlekSIS open source project, represented by Teckids e.V.
+            {% endblocktrans %}
+          </p>
         </div>
         <div class="card-action">
           <a class="" href="https://aleksis.org/">{% trans "Website of AlekSIS" %}</a>