#2 new header and jumbotron; list views adapted to "original" Nabucco

appcreator/management/commands/custom_import.py

@@ -96,4 +96,4 @@ def handle(self, *args, **kwargs):
                     related_tablet.mentioned_in_pub.add(bib_item)
                 except:
                     continue
-                # print(related_tablet.mentioned_in_pub.all())
+                print(related_tablet.mentioned_in_pub.all())

archiv/models.py

@@ -612,6 +612,7 @@ class Tablet(models.Model):
         help_text="whatever",
     ).set_extra(
         is_public=True,
+        data_lookup="Place of issue",
     )
     mentioned_place = models.ManyToManyField(
         "Place",

archiv/tables.py

@@ -14,26 +14,26 @@
 
 class ArchivTable(tables.Table):
 
-    id = tables.LinkColumn(verbose_name='ID')
+    name = tables.LinkColumn(verbose_name='Name')
     merge = MergeColumn(verbose_name='keep | remove', accessor='pk')
 
     class Meta:
         model = Archiv
-        sequence = ('id',)
+        sequence = ('name', 'alt_name', 'part_of',)
         attrs = {"class": "table table-responsive table-hover"}
 
 
 class BibliographyTable(tables.Table):
 
-    id = tables.LinkColumn(verbose_name='ID')
+    title = tables.LinkColumn()
     merge = MergeColumn(verbose_name='keep | remove', accessor='pk')
     mentioned_place = tables.columns.ManyToManyColumn()
     mentioned_archive = tables.columns.ManyToManyColumn()
     mentioned_glossary_item = tables.columns.ManyToManyColumn()
 
     class Meta:
         model = Bibliography
-        sequence = ('id',)
+        sequence = ('title', 'short_title', 'publication_year', 'author',)
         attrs = {"class": "table table-responsive table-hover"}
 
 

archiv/templates/archiv/generic_detail.html

@@ -149,8 +149,8 @@ <h2>
       </a>
     </div>
     {% endif %}
-
   </div>
 </div>
+
 {% endblock custom %}
 {% endblock %}

archiv/views.py

@@ -26,7 +26,7 @@ class ArchivListView(GenericListView):
     formhelper_class = ArchivFilterFormHelper
     table_class = ArchivTable
     init_columns = [
-        'id', 'name',
+        'name', 'alt_name', 'part_of'
     ]
     enable_merge = True
 
@@ -74,7 +74,7 @@ class BibliographyListView(GenericListView):
     formhelper_class = BibliographyFilterFormHelper
     table_class = BibliographyTable
     init_columns = [
-        'id', 'short_title',
+        'title', 'short_title', 'publication_year', 'author',
     ]
     enable_merge = True
 

webpage/static/webpage/css/style.css

@@ -10,7 +10,34 @@ body {
 }
 
 .navbar {
-	border-bottom: 5px solid #254aa5;;
+	border-bottom: 5px solid #254aa5;
+}
+
+.jumbotron {
+    position: relative;
+}
+
+#title-img {
+    opacity: 0.4;
+    border-radius: 50%;
+    max-width:100%;
+    height: auto;
+}
+
+.center {
+position: absolute;
+top: 50%;
+left: 50%;
+transform: translate(-50%, -50%);
+color: #254aa5;
+font-weight: bold;
+font-size: 24px;
+text-align: justify;
+}
+
+.center h1 {
+    text-align: center;
+    font-weight: bold;
 }
 
 span.select2-container--default .select2-selection--single .select2-selection__rendered {

webpage/templates/webpage/base.html

@@ -63,7 +63,7 @@
                 <div class="container-fluid">
                     <!-- Your site title as branding in the menu -->
                     <a href="/" class="navbar-brand custom-logo-link" rel="home" itemprop="url">
-                        <img src="{{ PROJECT_LOGO }}" class="img-fluid" alt="{% projects_metadata 'title' %}" itemprop="{% projects_metadata 'title' %}"/>
+                        <img src="{% static 'img/Logo_NaBuCCo.jpg' %}" style="height:110px" class="img-fluid" alt="{% projects_metadata 'title' %}" itemprop="{% projects_metadata 'title' %}"/>
                     </a><!-- end custom logo -->
                     <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNavDropdown" aria-controls="navbarNavDropdown" aria-expanded="false" aria-label="Toggle navigation">
                         <span class="navbar-toggler-icon"/>
@@ -103,6 +103,7 @@
                                         </div>
                                     </li>
                             </ul>
+                            <div> <img src="{% static 'img/handcopy.jpg' %}" style="max-width: 80%; height: auto;"> </div>
                             <ul class="navbar-nav justify-content-end">
                                 {% if user.is_authenticated %}
                                 <li class="nav-item dropdown ml-auto">
@@ -121,6 +122,7 @@
                                 </li>
                                 {% endif %}
                             </ul>
+
                         </div>
                         <!-- .collapse navbar-collapse -->
                     </div>

webpage/templates/webpage/index.html

@@ -4,11 +4,15 @@
 {% load webpage_extras %}
 {% block content %}
 
-        <div class="jumbotron" style="background-image: url({% static 'webpage/img/project_background.jpg' %}) ">
+        <div class="jumbotron">
             <div class="container">
-                <h1 style="text-align:center; color: #111;">{% projects_metadata 'title' %}</h1>
+                    <img src="{% static 'img/project_background.jpg' %}" class='mx-auto d-block' id="title-img">
+                <!-- <h1 style="text-align:center; color: #111;">{% projects_metadata 'title' %}</h1>
                 <h3 style="text-align:center; color: #111;">{% projects_metadata 'subtitle' %}</h3>
-                <h5 style="text-align:center; color: #111;">{% projects_metadata 'description' %}</h5>
+                <h5 style="text-align:center; color: #111;">{% projects_metadata 'description' %}</h5> -->
+                <div class="center"><h1 class="display-2">NaBuCCo</h1>THE NEO-BABYLONIAN CUNEIFORM CORPUS aims at making available 
+                    the large corpus of archival documents from first millennium BCE Babylonia 
+                    to historians of the ancient world in general and Assyriologists in particular.</div>
             </div>
         </div>