Editors have more control over editorial team display

docs/source/manager/journal/index.rst

@@ -40,7 +40,7 @@ Carousel
 
     - Latest articles
     - Latest news
-    - A combonation of both
+    - A combination of both
 
     You can select the number of items to display as well as select the items you want to include or exclude.
 
@@ -105,6 +105,8 @@ Default thumbnail
 Favicon
     The tiny little image you often see in the browser tab before the name of a webpage. Use a very small image of equal width and height. If not set, no Favicon will appear.
 
+Default Profile Image
+    The default image used when editorial team groups have "Display profile images" enabled. The image is also used on the public profile page when a user has enabled it.
 
 Styling
 -------

src/core/admin.py

@@ -328,7 +328,8 @@ def _journal(self, obj):
 
 
 class EditorialGroupAdmin(admin.ModelAdmin):
-    list_display = ('name', 'journal', 'press', 'sequence')
+    list_display = ('name', 'journal', 'press', 'sequence',
+                    'display_profile_images')
     list_filter = ('journal', 'press')
     search_fields = ('name',)
 

src/core/forms/forms.py

@@ -87,7 +87,6 @@ class Meta:
 
 class EditorialGroupForm(JanewayTranslationModelForm):
 
-
     def __init__(self, *args, **kwargs):
         next_sequence = kwargs.pop('next_sequence', None)
         super(EditorialGroupForm, self).__init__(*args, **kwargs)
@@ -96,7 +95,7 @@ def __init__(self, *args, **kwargs):
 
     class Meta:
         model = models.EditorialGroup
-        fields = ('name', 'description', 'sequence',)
+        fields = ('name', 'description', 'sequence', 'display_profile_images')
         exclude = ('journal', 'press')
 
 
@@ -370,8 +369,9 @@ class JournalImageForm(forms.ModelForm):
     class Meta:
         model = journal_models.Journal
         fields = (
-           'header_image', 'default_cover_image',
-           'default_large_image', 'favicon', 'press_image_override',
+            'header_image', 'default_cover_image',
+            'default_large_image', 'favicon', 'press_image_override',
+            'default_profile_image',
         )
 
 

src/core/logic.py

@@ -500,25 +500,36 @@ def get_settings_to_edit(display_group, journal, user):
     elif display_group == 'styling':
         group_of_settings = [
             {
-                'name': 'enable_editorial_images',
+                'name': 'display_journal_title',
                 'object': setting_handler.get_setting('styling',
-                                                      'enable_editorial_images',
+                                                      'display_journal_title',
                                                       journal),
             },
+        ]
+        setting_group = 'styling'
+    elif display_group == 'editorial':
+        group_of_settings = [
             {
-                'name': 'multi_page_editorial',
+                'name': 'editorial_group_page_name',
                 'object': setting_handler.get_setting('styling',
-                                                      'multi_page_editorial',
+                                                      'editorial_group_page_name',
                                                       journal),
             },
             {
-                'name': 'display_journal_title',
+                'name': 'hide_editorial_group_names',
                 'object': setting_handler.get_setting('styling',
-                                                      'display_journal_title',
+                                                      'hide_editorial_group_names',
+                                                      journal),
+            },
+            {
+                'name': 'multi_page_editorial',
+                'object': setting_handler.get_setting('styling',
+                                                      'multi_page_editorial',
                                                       journal),
             }
         ]
         setting_group = 'styling'
+
     elif display_group == 'news':
         group_of_settings = [
             {

src/core/migrations/0089_auto_20240328_1213.py

@@ -0,0 +1,38 @@
+# Generated by Django 3.2.20 on 2024-03-28 12:13
+
+from django.db import migrations, models
+
+
+def set_editorial_group_image_dispay(apps, schema):
+    EditorialGroup = apps.get_model("core", "EditorialGroup")
+    SettingValue = apps.get_model("core", "SettingValue")
+
+    setting_values = SettingValue.objects.filter(
+        setting__name='enable_editorial_images',
+    )
+    for sv in setting_values:
+        if sv.journal and sv.value in ['on', 'On']:
+            EditorialGroup.objects.filter(
+                journal=sv.journal,
+            ).update(
+                display_profile_images=True,
+            )
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0088_merge_20240327_1910'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='editorialgroup',
+            name='display_profile_images',
+            field=models.BooleanField(default=False, help_text='Enable to display profile images for this group.'),
+        ),
+        migrations.RunPython(
+            set_editorial_group_image_dispay,
+            reverse_code=migrations.RunPython.noop,
+        ),
+    ]

src/core/migrations/0090_editorial_team_page_i18n.py

@@ -0,0 +1,30 @@
+# Generated by Django 3.2.20 on 2024-04-02 14:23
+
+from django.db import migrations
+
+
+def add_translations_to_db(apps, schema_editor):
+    SettingValue = apps.get_model('core', 'SettingValue')
+    svs_to_update = SettingValue.objects.filter(
+        setting__name='editorial_group_page_name',
+    )
+    for sv in svs_to_update:
+        sv.value_fr = 'Équipe éditoriale'
+        sv.value_de = 'Redaktionsteam'
+        sv.value_nl = 'Redactie'
+        sv.value_cy = 'Tîm Golygyddol'
+        sv.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0089_auto_20240328_1213'),
+    ]
+
+    operations = [
+        migrations.RunPython(
+            add_translations_to_db,
+            migrations.RunPython.noop,
+        ),
+    ]

src/core/models.py

@@ -1445,6 +1445,10 @@ class EditorialGroup(models.Model):
         null=True,
     )
     sequence = models.PositiveIntegerField()
+    display_profile_images = models.BooleanField(
+        default=False,
+        help_text="Enable to display profile images for this group.",
+    )
 
     class Meta:
         ordering = ('sequence',)

src/core/views.py

@@ -48,8 +48,7 @@
 from utils import models as util_models, setting_handler, orcid
 from utils.logger import get_logger
 from utils.decorators import GET_language_override
-from utils.shared import language_override_redirect
-from utils.logic import get_janeway_version
+from utils.shared import language_override_redirect, clear_cache
 from repository import models as rm
 from events import logic as events_logic
 
@@ -1639,26 +1638,55 @@ def contacts_order(request):
 
 
 @editor_user_required
+@GET_language_override
 def editorial_team(request):
     """
     Displays a list of EditorialGroup objects, allows them to be deleted and created,
     :param request: HttpRequest object
     :return: HttpResponse object
     """
-    editorial_groups = models.EditorialGroup.objects.filter(journal=request.journal)
+    with translation.override(request.override_language):
+        editorial_groups = models.EditorialGroup.objects.filter(
+            journal=request.journal,
+        )
+        settings, setting_group = logic.get_settings_to_edit(
+            'editorial',
+            request.journal,
+            request.user,
+        )
+        edit_form = forms.GeneratedSettingForm(settings=settings)
+        if request.POST:
+            edit_form = forms.GeneratedSettingForm(
+                request.POST,
+                settings=settings,
+            )
 
-    if 'delete' in request.POST:
-        delete_id = request.POST.get('delete')
-        group = get_object_or_404(models.EditorialGroup, pk=delete_id, journal=request.journal)
-        group.delete()
-        return redirect(reverse('core_editorial_team'))
+            if edit_form.is_valid():
+                edit_form.save(
+                    group=setting_group,
+                    journal=request.journal,
+                )
+                # clear cache to ensure changes display immediately
+                clear_cache()
+                return language_override_redirect(
+                    request,
+                    'core_editorial_team',
+                    kwargs={},
+                )
 
-    template = 'core/manager/editorial/index.html'
-    context = {
-        'editorial_groups': editorial_groups,
-    }
+        if 'delete' in request.POST:
+            delete_id = request.POST.get('delete')
+            group = get_object_or_404(models.EditorialGroup, pk=delete_id, journal=request.journal)
+            group.delete()
+            return redirect(reverse('core_editorial_team'))
 
-    return render(request, template, context)
+        template = 'core/manager/editorial/index.html'
+        context = {
+            'editorial_groups': editorial_groups,
+            'edit_form': edit_form,
+        }
+
+        return render(request, template, context)
 
 
 @editor_user_required

src/journal/migrations/0064_journal_default_editorial_team_image.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.2.20 on 2024-03-28 11:40
+
+import core.file_system
+import core.model_utils
+from django.db import migrations
+import journal.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('journal', '0063_merge_20240327_1910'),
+        ('core', '0089_auto_20240328_1213')
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='journal',
+            name='default_profile_image',
+            field=core.model_utils.SVGImageField(blank=True, help_text='A default image displayed on the profile and editorial team pages when the user has no set profile image.', null=True, storage=core.file_system.JanewayFileSystemStorage(), upload_to=journal.models.cover_images_upload_path),
+        ),
+    ]

src/journal/models.py

@@ -142,6 +142,15 @@ class Journal(AbstractSiteModel):
         help_text=gettext('The tiny round or square image appearing in browser '
                            'tabs before the webpage title'),
     )
+    default_profile_image = SVGImageField(
+        upload_to=cover_images_upload_path,
+        null=True,
+        blank=True,
+        storage=fs,
+        help_text=gettext('A default image displayed on the profile and '
+                          'editorial team pages when the user has no set '
+                          'profile image.'),
+    )
     # DEPRECATED "description" in favour of "journal_description" setting
     description = JanewayBleachField(null=True, blank=True, verbose_name="Journal Description")
     contact_info = JanewayBleachField(null=True, blank=True, verbose_name="Contact Information")

src/templates/admin/core/manager/editorial/index.html

@@ -15,12 +15,13 @@
 {% block body %}
     <div class="large-12 columns">
         <div class="box">
+            {% include "admin/elements/translations/form_tabs.html" with object=request.journal %}
             <div class="title-area">
                 <h2>Editorial Groups</h2>
                 <a class="button" href="{% url 'core_add_editorial_team' %}"><i class="fa fa-plus">&nbsp;</i>Add New Group</a>
                  <a class="button" href="{% url 'editorial_team' %}" target="_blank"><i class="fa fa-eye">&nbsp;</i>View Editorial Team Page</a>
             </div>
-            <div class="box">
+            <div class="content">
                 <p>
                     Editorial team groups are listed below. You can change the order by dragging and dropping table rows into the order you want them to appear.
                 </p>
@@ -50,6 +51,16 @@ <h2>Editorial Groups</h2>
                     </table>
                 </form>
             </div>
+            <div class="title-area">
+                <h2>Display Settings</h2>
+            </div>
+            <div class="content">
+                <form method="POST">
+                    {% csrf_token %}
+                    {% include "admin/elements/forms/group_editorial.html" with edit_form=edit_form %}
+                    <button name="save" class="success button">Save Settings</button>
+                </form>
+            </div>
         </div>
     </div>
 {% endblock body %}

src/templates/admin/elements/cms_nav.html

@@ -93,7 +93,7 @@
                   {% endif %}
                 </button>
             </li>
-            <li class="list-group-item">Editorial Team
+            <li class="list-group-item">{{ journal_settings.styling.editorial_group_page_name }}
                 <button name="editorial_team" value="editorial_team"
                     class="tiny button float-right
                   {% if enable_editorial_display %}

src/templates/admin/elements/forms/group_editorial.html

@@ -0,0 +1,4 @@
+{% include "admin/elements/forms/field.html" with field=edit_form.editorial_group_page_name %}
+{% include "admin/elements/forms/field.html" with field=edit_form.hide_editorial_group_names %}
+{% include "admin/elements/forms/field.html" with field=edit_form.multi_page_editorial %}
+

src/templates/admin/elements/forms/group_journal_images.html

@@ -1,5 +1,6 @@
 {% load svg from press_url %}
 {% load svg_or_image from press_url %}
+{% load static %}
 
 <div class="title-area">
     <h2>Journal Images</h2>
@@ -79,5 +80,17 @@ <h2>Journal Images</h2>
         </div>
         <hr/>
 
+        <div class="large-8 columns">
+            {% include "admin/elements/forms/field.html" with field=attr_form.default_profile_image %}
+        </div>
+        <div class="large-4 columns">
+            {% if request.journal.default_editorial_team_image %}
+                <img src="{{ request.journal.default_editorial_team_image.url }}" class="thumbnail float-right">
+            {% else %}
+                <img src="{% static "common/img/icons/users.png" %}" class="thumbnail float-right"/>
+            {% endif %}
+        </div>
+        <hr/>
+
     </div>
 </div>

src/templates/admin/elements/forms/group_styling.html

@@ -1,7 +1,6 @@
 <div class="content">
     {% include "admin/elements/forms/field.html" with field=attr_form.full_width_navbar %}
     <p class="help-text">{% trans 'Full Width Navbar only applies to the Material theme' %}.</p>
-    {% include "admin/elements/forms/field.html" with field=edit_form.enable_editorial_images %}
     {% include "admin/elements/forms/field.html" with field=edit_form.multi_page_editorial %}
     {% include "admin/elements/forms/field.html" with field=edit_form.display_journal_title %}
 </div>

src/templates/common/elements/journal/editorial_team_image.html

@@ -0,0 +1,5 @@
+{% if group.display_profile_images %}
+    {% if card_wrapper %}<div class="card-image">{% endif %}
+        {% include "common/elements/profile_image.html" with classes=classes user=member.user %}
+    {% if card_wrapper %}</div>{% endif %}
+{% endif %}

src/templates/common/elements/profile_image.html

@@ -0,0 +1,6 @@
+{% load static %}
+<img
+    class="{{ classes }}"
+    src="{% if user.profile_image %}{{ user.profile_image.url }}{% elif request.journal.default_profile_image %}{{ request.journal.default_profile_image.url }}{% else %}{% static "common/img/icons/users.png" %}{% endif %}"
+    alt="{% if user.profile_image %}Profile picture for {{ user.full_name }}{% else %}A generic headshot photograph of a person{% endif %}"
+/>

src/themes/OLH/templates/core/accounts/public_profile.html

@@ -8,7 +8,7 @@
 	<section id="content">
 		<div class="row column">
             <div class="large-3 columns">
-                <img class="thumbnail editorial-image" src="{% if user.profile_image %}{{ user.profile_image.url }}{% else %}{% static "common/img/icons/users.png" %}{% endif %}" alt="Profile photo.">
+                {% include "common/elements/profile_image.html" with classes="thumbnail editorial-image" user=user %}
                 <h3>{{ user.full_name }}</h3>
                 {% if roles %}
                   <p>