various fixes

src/portal/admin.py

@@ -17,7 +17,7 @@ class UserAdmin(BaseUserAdmin):
     inlines = [ProfileInline]
     fieldsets = (
         (None, {'fields': ('username', 'email', 'password')}),
-        (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser', 'groups')}),
+        ('Permissions', {'fields': ('is_active', 'is_staff', 'is_superuser', 'groups')}),
     )
 
 
@@ -33,8 +33,8 @@ class InformationAdmin(TranslatableAdmin):
     readonly_fields = ('informed_users',)
     fieldsets = (
         (None, {'fields': ('title', 'published', 'image', 'cropping')}),
-        (_('Permissions'), {'fields': ('groups',)}),
-        (_('Information'), {'fields': ('informed_users',)}),
+        ('Permissions', {'fields': ('groups',)}),
+        ('Information', {'fields': ('informed_users',)}),
     )
 
 

src/portal/models.py

@@ -48,7 +48,7 @@ class Information(TranslatableModel):
     informed_users = models.ManyToManyField(User, verbose_name='Als gelesen markiert von:', null=True, blank=True)
 
     translations = TranslatedFields(
-        title=models.CharField(max_length=100, verbose_name=_('Title')),
+        title=models.CharField(max_length=100, verbose_name='Title'),
     )
 
     class Meta:

src/portal/templates/portal/overview.html

@@ -1,7 +1,7 @@
 {% extends 'main.html' %}
 {% load i18n static cms_tags %}
 
-{% block title %}{% trans 'Mitgliederbereich' %}{% endblock %}
+{% block title %}{% trans 'Elementa Portal' %}{% endblock %}
 
 {% block content %}
     <div class="content__frame">

src/portal/templates/registration/login.html

@@ -1,7 +1,7 @@
 {% extends 'project/dialog.html' %}
 {% load i18n %}
 
-{% block title %}{% trans 'Mitgliederbereich' %}{% endblock %}
+{% block title %}{% trans 'Eltern-Login' %}{% endblock %}
 
 {% block extra_meta %}
     <meta name="robots" content="noindex, nofollow"/>

src/project/cms_plugins.py

@@ -202,7 +202,8 @@ plugin_pool.unregister_plugin(_FormPlugin)
 class FormPlugin(_FormPlugin):
     module = 'Content'
     name = 'Form'
-    child_classes = ['TextField', 'TextAreaField', 'EmailField', 'RadioSelectField', 'MultipleSelectField', 'SubmitButton']
+    child_classes = ['TextField', 'TextAreaField', 'EmailField', 'RadioSelectField', 'MultipleSelectField',
+                     'SubmitButton']
 
 
 class SocialMediaListItemInlineAdmin(admin.TabularInline):

src/project/context_processors.py

@@ -5,7 +5,17 @@ from project.models import Notification
 
 
 def search_form(request):
-    return {'search_form': ModelSearchForm}
+    egg_pages = (
+        (81, 'C', 1),
+        (83, 'R', 2),
+        (95, 'E', 3),
+        (105, 'D', 4),
+        (99, 'O', 5),
+    )
+    return {
+        'egg_pages': egg_pages,
+        'search_form': ModelSearchForm
+    }
 
 
 def notification(request):

src/project/templates/project/content.html

@@ -30,6 +30,28 @@
                         {% block content_main %}
                             {% placeholder 'content' %}
                         {% endblock %}
+
+                        {% for page, letter, position in egg_pages %}
+                            {% if page == request.current_page.pk %}
+                                <a href="#" class="search__contest__item data_id_{{ forloop.counter }}">
+                                    <span class="letter">{{ letter }}</span>
+                                    <span class="position">{{ position }}</span>
+
+                                    <div class="flower petal{% cycle '5' '8' '10' %} {% cycle 'roundpetal' '' %}">
+                                        <div class="petal">
+                                            <div class="petal">
+                                                <div class="petal">
+                                                    <div class="petal">
+                                                        <div class="petal">
+                                                        </div>
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </a>
+                            {% endif %}
+                        {% endfor %}
                     </div>
                 </div>
             </div>

src/project/templates/project/includes/pagination.html

@@ -1,29 +0,0 @@
-{% load i18n spurl %}
-
-{% if page_obj.has_other_pages %}
-
-<div class="pagenav">
-	{% with from=page_obj.start_index until=page_obj.end_index count=page_obj.paginator.count %}
-	<p>{% blocktrans %}{{ from }} – {{ until }} of {{ count }} {{ obj_string }} are displayed{% endblocktrans %}</p>
-	{% endwith %}
-	<ul>
-		{% if page_obj.has_previous %}
-		<li class="prev"><a href="{% spurl base='' query=request.GET set_query='page={{ page_obj.previous_page_number }}' %}">&laquo; {% trans "previous" %}</a></li>
-		{% endif %}
-		{% for page_num in page_obj.page_range %}
-		{% if page_num %}
-		{% if page_obj.number == page_num %}
-		<li class="page active"><span>{{ page_num }}</span></li>
-		{% else %}
-		<li class="page"><a href="{% spurl base='' query=request.GET set_query='page={{ page_num }}' %}">{{ page_num }}</a></li>
-		{% endif %}
-		{% else %}
-		<li class="jumper"><span>...</span></li>
-		{% endif %}
-		{% endfor %}
-		{% if page_obj.has_next %}
-		<li class="prev"><a href="{% spurl base='' query=request.GET set_query='page={{ page_obj.next_page_number }}' %}">{% trans "next" %} &raquo;</a></li>
-		{% endif %}
-	</ul>
-</div>
-{% endif %}

src/project/templates/project/newsletter/subscription_form.html

@@ -3,9 +3,7 @@
 <form method="post" id="newsletter_subscription" action="{% url 'newsletter_subscription' %}" class="form">
     {% if success %}
         <p class="section__text form__success">
-            {% blocktrans %}
-                Ihre Angaben wurden erfolgreich übermittelt. Vielen Dank!
-            {% endblocktrans %}
+            {% trans 'Ihre Angaben wurden erfolgreich übermittelt. Vielen Dank!' %}
         </p>
     {% else %}
         {% if form.non_field_errors %}