Update about page for journal

journals/templates/journals/SciPostPhys_about.html

@@ -73,16 +73,19 @@
 
     <div class="row">
         <div class="col-12">
-            <ul class="nav nav-tabs" id="myTab" role="tablist">
+            <ul class="nav nav-tabs" id="journals-about-tab" role="tablist">
               <li class="nav-item">
                 <a class="nav-link active" id="most-cited-tab" data-toggle="tab" href="#most-cited" role="tab" aria-controls="most-cited" aria-selected="true">Most cited</a>
               </li>
               <li class="nav-item">
-                  <a class="nav-link" id="latest-tab" data-toggle="tab" href="#latest" role="tab" aria-controls="latest" aria-selected="true">Latest articles</a>
+                  <a class="nav-link" id="latest-tab" data-toggle="tab" href="#latest" role="tab" aria-controls="latest" aria-selected="true">Latest publications</a>
+              </li>
+              <li class="nav-item">
+                  <a class="nav-link" id="accepted-tab" data-toggle="tab" href="#accepted" role="tab" aria-controls="accepted" aria-selected="true">Accepted Submissions</a>
               </li>
              </ul>
              <div class="tab-content" id="journals-about">
-                 <div class="tab-pane fade show active pt-4" id="most-cited" role="tabpanel" aria-labelledby="most-cited-tab">
+                 <div class="tab-pane show active pt-4" id="most-cited" role="tabpanel" aria-labelledby="most-cited-tab">
                     <ul class="list-unstyled mt-2">
                         {% for publication in most_cited %}
                             <li>
@@ -95,7 +98,7 @@
                         {% endfor %}
                     </ul>
                 </div>
-                <div class="tab-pane fade show pt-4" id="latest" role="tabpanel" aria-labelledby="latest-tab">
+                <div class="tab-pane pt-4" id="latest" role="tabpanel" aria-labelledby="latest-tab">
                     <ul class="list-unstyled mt-2">
                         {% for publication in latest_publications %}
                             <li>
@@ -108,6 +111,21 @@
                         {% endfor %}
                     </ul>
                 </div>
+                <div class="tab-pane pt-4" id="accepted" role="tabpanel" aria-labelledby="accepted-tab">
+                    <ul class="list-group list-group-flush mt-2">
+                        {% for submission in accepted_submissions %}
+                            <li class="list-group-item">
+                                <div class="card-body px-0">
+                                    {% include 'partials/submissions/submission_card_content.html' with submission=submission %}
+                                </div>
+                            </li>
+                        {% empty %}
+                            <li class="list-group-item">
+                                <p>All recently accepted Submissions to SciPost Physics have been published.</p>
+                        </li>
+                        {% endfor %}
+                    </ul>
+                </div>
             </div>
         </div>
     </div>

journals/templates/journals/_publication_card_content.html

@@ -3,7 +3,7 @@
 </div>
 <div class="card-body publication-{{publication.id}}">
     <div class="row justify-content-between mb-0">
-        <div class="col">
+        <div class="col-md-auto">
             <p class="card-text mb-2">{{ publication.author_list }}</p>
             <p class="card-text text-muted">
                 {{ publication.citation }} &middot;
@@ -19,7 +19,7 @@
             </p>
             <p class="abstract mb-0 mt-2 py-2" style="display:none;">{{ publication.abstract }}</p>
         </div>
-        <div class="col">
+        <div class="col-md-auto">
             {% if include_citation_rate %}
                 <h3><span class="badge badge-primary">Cited {{ publication.number_of_citations }} times</span></h3>
             {% endif %}

journals/urls/journal.py

@@ -9,8 +9,8 @@ from journals import views as journals_views
 urlpatterns = [
     # Journal routes
     url(r'^issues$', journals_views.IssuesView.as_view(), name='issues'),
-    url(r'^recent$', journals_views.RecentView.as_view(), name='recent'),
-    url(r'^accepted$', journals_views.AcceptedView.as_view(), name='accepted'),
+    url(r'^recent$', journals_views.redirect_to_about, name='recent'),
+    url(r'^accepted$', journals_views.redirect_to_about, name='accepted'),
     url(r'^info_for_authors$', journals_views.info_for_authors, name='info_for_authors'),
     url(r'^about$', journals_views.about, name='about'),
 ]

journals/views.py

@@ -134,30 +134,10 @@ class IssuesView(DetailView):
     template_name = 'journals/journal_issues.html'
 
 
-class RecentView(DetailView):
-    """
-    List all recent Publications for a specific Journal.
-    """
-    queryset = Journal.objects.active()
-    slug_field = slug_url_kwarg = 'doi_label'
-    template_name = 'journals/journal_recent.html'
-
-
-class AcceptedView(DetailView):
-    """
-    List all Submissions for a specific Journal which have been accepted but are not
-    yet published.
-    """
-    queryset = Journal.objects.active()
-    slug_field = slug_url_kwarg = 'doi_label'
-    template_name = 'journals/journal_accepted.html'
-
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-        context['accepted_submissions'] = Submission.objects.accepted().filter(
-            submitted_to_journal=context['journal'].name).order_by('-latest_activity')
-        return context
-
+def redirect_to_about(request, doi_label):
+    journal = get_object_or_404(Journal, doi_label=doi_label)
+    return redirect(
+        reverse('journal:about', kwargs={'doi_label': journal.doi_label}), permanent=True)
 
 def info_for_authors(request, doi_label):
     journal = get_object_or_404(Journal, doi_label=doi_label)
@@ -170,7 +150,9 @@ def about(request, doi_label):
     context = {
         'journal': journal,
         'most_cited': Publication.objects.for_journal(journal.name).published().most_cited(5),
-        'latest_publications': Publication.objects.for_journal(journal.name)[:5]
+        'latest_publications': Publication.objects.for_journal(journal.name)[:5],
+        'accepted_submissions': Submission.objects.accepted().filter(
+            submitted_to_journal=journal.name).order_by('-latest_activity'),
     }
     return render(request, 'journals/%s_about.html' % doi_label, context)