* Aktelle Vorlagen in den src Ordner verschoben, damit sie in der Versionierung enthalten sind.

* INSTALLED_APPS auf PROJECT_APPS + PREREQ_APPS damit Vorlagen aus den kasu/templates Ordner bevorzugt werden. So lassen sich Vorlagen von 3rd Party Apps überschreiben, wie z.b. django-contrib-comments.

* Javascript Code für Google Maps entfernt, dies funktioniert mit Content Security Policy nicht mehr so gut und wird eh nicht gebraucht.

* Javascript für das Hanchan Formular vom header an des Ende des body gesetzt, der Code darf erst ausgeführt werden, wenn das Formular aufgebaut wurde.

src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html

@@ -4,31 +4,7 @@
 {% block title %}{% if hanchan.id %}{% trans "Edit Hanchan" %}{% else %}{% trans "Add Hanchan" %}{% endif %}{% endblock %}
 
 {% block extra_head %}
- <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
- {% endblock %}
-
-
-<script class="javascript">
-{% block javascript %}
-function recalculate_values(element) {
-    var total = 0
-    $('input[name$="_input_score"]').each(function() {total += Number($(this).val());});
-    $('#total').val(total)
-
-    var difference = 100000 - total
-    if (difference > 0) {
-        differnence_text = difference + ' offen'
-    } else if (difference < 0) {
-        differnence_text = (0 - difference) + ' zu viel'
-    } else {
-        differnence_text = 'Ok'
-    }
-    $('#difference').text(differnence_text)
-}
-$("#id_start_1").focus();
-$('input[name$="_input_score"]').keyup(function() {recalculate_values(this);});
-$('input[name$="_input_score"]').change(function() {recalculate_values(this);});
-</script>
+<script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
 {% endblock %}
 
 {% block maincontent %}
@@ -95,6 +71,26 @@ $('input[name$="_input_score"]').change(function() {recalculate_values(this);});
         <button type="submit"><span class="fa fa-hdd-o"></span> {% trans 'save' %}</button>
     </p>
 </fieldset></form>
+<script type="text/javascript">
+function recalculate_values(element) {
+    var total = 0
+    $('input[name$="_input_score"]').each(function() {total += Number($(this).val());});
+    $('#total').val(total)
+
+    var difference = 100000 - total
+    if (difference > 0) {
+        differnence_text = difference + ' offen'
+    } else if (difference < 0) {
+        differnence_text = (0 - difference) + ' zu viel'
+    } else {
+        differnence_text = 'Ok'
+    }
+    $('#difference').text(differnence_text)
+}
+$("#id_start_1").focus();
+$('input[name$="_input_score"]').keyup(function() {recalculate_values(this);});
+$('input[name$="_input_score"]').change(function() {recalculate_values(this);});
+</script>
 {% endblock %}
 
 {% block comments %}{% endblock %}

src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html

@@ -2,6 +2,10 @@
 {% load i18n thumbnail %}
 
 {% block title %}{% trans 'Player List' %}{% endblock %}
+{% block extra_head %}
+<link rel="canonical" href="{% url 'kyudanranking-list' %}?page={{page_obj.number}}" />
+{% endblock %}
+
 {% block teaser %}<h1>{% trans 'Player List' %}</h1>{% endblock %}
 
 {% block redbox %}{% include 'mahjong_ranking/ladder_redbox.html' %}{% endblock %}
@@ -12,29 +16,29 @@
   <tr>
    <th>{% trans 'Avatar' %}</th>
    <th>
-   <a href="{% url 'kyudanranking-list' order_by='+username' %}?page={{page_obj.number}}" class="fa fa-sort-asc"></a>
+   <a href="{% url 'kyudanranking-list' order_by='+username' %}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
    {% trans 'Nickname' %}
-   <a href="{% url 'kyudanranking-list' order_by='-username' %}?page={{page_obj.number}}" class="fa fa-sort-desc"></a>
+   <a href="{% url 'kyudanranking-list' order_by='-username' %}?page={{page_obj.number}}" class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
    <th>
-    <a href="{% url 'kyudanranking-list' order_by='+full_name'%}?page={{page_obj.number}}" class="fa fa-sort-asc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='+full_name'%}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
     {% trans 'Full Name' %}
-    <a href="{% url 'kyudanranking-list' order_by='-full_name' %}?page={{page_obj.number}}" class="fa fa-sort-desc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='-full_name' %}?page={{page_obj.number}}" class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
    <th>
-    <a href="{% url 'kyudanranking-list' order_by='+rank' %}?page={{page_obj.number}}" class="fa fa-sort-asc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='+rank' %}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
     {% trans 'Rank' %}
-    <a href="{% url 'kyudanranking-list' order_by='-rank' %}?page={{page_obj.number}}"  class="fa fa-sort-desc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='-rank' %}?page={{page_obj.number}}"  class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
    <th>
-    <a href="{% url 'kyudanranking-list' order_by='+score' %}?page={{page_obj.number}}" class="fa fa-sort-asc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='+score' %}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
     {% trans 'Score' %}
-    <a href="{% url 'kyudanranking-list' order_by='-score' %}?page={{page_obj.number}}" class="fa fa-sort-desc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='-score' %}?page={{page_obj.number}}" class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
    <th>
-    <a href="{% url 'kyudanranking-list' order_by='+hanchan_count'%}?page={{page_obj.number}}" class="fa fa-sort-asc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='+hanchan_count'%}?page={{page_obj.number}}" class="fa fa-sort-asc" rel="nofollow"></a>
     {% trans 'Games Total' %}
-    <a href="{% url 'kyudanranking-list' order_by='-hanchan_count'%}?page={{page_obj.number}}" class="fa fa-sort-desc"></a>
+    <a href="{% url 'kyudanranking-list' order_by='-hanchan_count'%}?page={{page_obj.number}}" class="fa fa-sort-desc" rel="nofollow"></a>
    </th>
   </tr>
  </thead>