diff --git a/appcreator/management/commands/custom_import.py b/appcreator/management/commands/custom_import.py index e9cac86..93c2c14 100644 --- a/appcreator/management/commands/custom_import.py +++ b/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()) diff --git a/archiv/models.py b/archiv/models.py index 84b3d51..827a1c0 100644 --- a/archiv/models.py +++ b/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", diff --git a/archiv/static/img/handcopy.jpg b/archiv/static/img/handcopy.jpg new file mode 100644 index 0000000..b26c772 Binary files /dev/null and b/archiv/static/img/handcopy.jpg differ diff --git a/archiv/static/img/project_background.jpg b/archiv/static/img/project_background.jpg new file mode 100644 index 0000000..fca28db Binary files /dev/null and b/archiv/static/img/project_background.jpg differ diff --git a/archiv/tables.py b/archiv/tables.py index 2de7458..74f2a68 100644 --- a/archiv/tables.py +++ b/archiv/tables.py @@ -14,18 +14,18 @@ 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() @@ -33,7 +33,7 @@ class BibliographyTable(tables.Table): class Meta: model = Bibliography - sequence = ('id',) + sequence = ('title', 'short_title', 'publication_year', 'author',) attrs = {"class": "table table-responsive table-hover"} diff --git a/archiv/templates/archiv/generic_detail.html b/archiv/templates/archiv/generic_detail.html index 2facd6e..e83e3a4 100644 --- a/archiv/templates/archiv/generic_detail.html +++ b/archiv/templates/archiv/generic_detail.html @@ -149,8 +149,8 @@

{% endif %} - + {% endblock custom %} {% endblock %} \ No newline at end of file diff --git a/archiv/views.py b/archiv/views.py index e0f97d9..539a1dd 100644 --- a/archiv/views.py +++ b/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 diff --git a/webpage/static/webpage/css/style.css b/webpage/static/webpage/css/style.css index 9c3f2fb..e6fc574 100644 --- a/webpage/static/webpage/css/style.css +++ b/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 { diff --git a/webpage/templates/webpage/base.html b/webpage/templates/webpage/base.html index 255b309..fb016b2 100644 --- a/webpage/templates/webpage/base.html +++ b/webpage/templates/webpage/base.html @@ -63,7 +63,7 @@
+
+ diff --git a/webpage/templates/webpage/index.html b/webpage/templates/webpage/index.html index 7ee6fc3..67c0a2c 100644 --- a/webpage/templates/webpage/index.html +++ b/webpage/templates/webpage/index.html @@ -4,11 +4,15 @@ {% load webpage_extras %} {% block content %} -
+
-

{% projects_metadata 'title' %}

+ + +

NaBuCCo

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.