Skip to content

Commit 7d17b61

Browse files
authored
Layouts, Versionshistorie
2 parents 6130d5b + 46cc0bc commit 7d17b61

File tree

16 files changed

+168
-104
lines changed

16 files changed

+168
-104
lines changed

src/main/resources/i18n/messages_de.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ date_not_edited=kein Datum eingegeben
44
tla_Title=Thesaurus Linguae Aegyptiae
55
tla_Editor=Tonio Sebastian Richter & Daniel A. Werning im Auftrag der Berlin-Brandenburgischen Akademie der Wissenschaften und Hans-Werner Fischer-Elfert & Peter Dils im Auftrag der Sächsischen Akademie der Wissenschaften zu Leipzig
66
tla_version=2.01
7-
tla_ReleaseDate=9.12.2022
7+
tla_ReleaseDate=15.12.2022
88

99
tla_corpusversion=17
1010
tla_corpusdate=25.10.2022
@@ -90,7 +90,7 @@ editorial_title_info_introduction=Einführung
9090
editorial_title_info_licenses=Lizensierung
9191
editorial_title_info_project=Projekt
9292
editorial_title_info_authors=Autor:innen
93-
editorial_title_info_tla-development=Web-App-Entwicklung
93+
editorial_title_info_tla-development=Entwicklung
9494
editorial_title_info_text-corpus=Text-Korpus
9595
editorial_title_help_search-page=Suchseite
9696
editorial_title_help_lemma-search-results=Lemma-Suchergebnisse

src/main/resources/i18n/messages_en.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ date_not_edited=no date edited
44
tla_Title=Thesaurus Linguae Aegyptiae
55
tla_Editor=Tonio Sebastian Richter & Daniel A. Werning by order of the Berlin-Brandenburgische Akademie der Wissenschaften and Hans-Werner Fischer-Elfert & Peter Dils by order of the Sächsische Akademie der Wissenschaften zu Leipzig
66
tla_version=2.01
7-
tla_ReleaseDate=12/9/2022
7+
tla_ReleaseDate=12/15/2022
88

99
tla_corpusversion=17
1010
tla_corpusdate=10/25/2022
@@ -90,7 +90,7 @@ editorial_title_info_introduction=Introduction
9090
editorial_title_info_licenses=Licenses
9191
editorial_title_info_project=Project
9292
editorial_title_info_authors=Authors
93-
editorial_title_info_tla-development=Web App Development
93+
editorial_title_info_tla-development=Development
9494
editorial_title_info_text-corpus=Text Corpus
9595
editorial_title_help_search-page=Search page
9696
editorial_title_help_lemma-search-results=Lemma search results

src/main/resources/pages/de/home.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ <h1>Willkommen im <strong><i>Thesaurus Linguae Aegyptiae</i></strong>!</h1>
99
<a href="search" title="Search the TLA"><img id="homepage-img" th:src="@{/img/zettelarchiv_slips.png}" alt="Slips from the Zettelarchiv"></a>
1010
<figcaption class="figure-caption">Zettel aus dem <i>Zettelarchiv</i></figcaption>
1111
</figure>
12-
<div class="mt-2 mb-3">
12+
<div class="mt-sm-2 mb-sm-3">
1313
<a href="/search"><button type="button" class="btn btn-danger text-left text-decoration-none"><span class="fas fa-arrow-circle-right"></span>&nbsp;Suchen im TLA</button></a>
1414
</div>
1515
</section>

src/main/resources/pages/de/info/tla-development.html

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
11
<article>
22
<header>
3-
<h1 id="page-title">TLA-Webanwendungsentwicklung</h1>
3+
<h1 id="page-title">TLA-Entwicklung</h1>
44
</header>
5+
<section>
6+
<h2>Versionshistorie</h2>
7+
<ul>
8+
<li>15.12.2022:
9+
<ul>
10+
<li>Web-App: v2.01, Verbesserungen
11+
<br/><small>Zitationshinweise, Autor:innen-Liste, Entwicklungsplan, Smartphone-Layout, externe Referenzen, Unicode-Keyboard, Textpfad, Informations-Hinweise, Trismegistos-Links, Label</small></li>
12+
<li>Text-Korpus: v17, <em>unverändert</em></li>
13+
</ul>
14+
</li>
15+
<li>31.10.2022:
16+
<ul>
17+
<li>Web-App: v2.0, Entwicklungspaket 1</li>
18+
<li>Text-Korpus: v17</li>
19+
</ul>
20+
</li>
21+
</ul>
22+
</section>
523
<section>
624
<h2>Vergleich alter vs. neuer TLA, mit Entwicklungsperspektiven</h2>
725
<table class="bordered-table">

src/main/resources/pages/en/info/tla-development.html

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,25 @@
11
<article>
22
<header>
3-
<h1 id="page-title">TLA Web Application Development</h1>
3+
<h1 id="page-title">TLA Development</h1>
44
</header>
5+
<section>
6+
<h2>Version history</h2>
7+
<ul>
8+
<li>12/15/2022:
9+
<ul>
10+
<li>Web app: v2.01, improvements
11+
<br/><small>Citation notes, authors' list, development plan, smartphone layout, external references, Unicode keyboard, text path, information notes, Trismegistos links, labels</small></li>
12+
<li>Text corpus: v17, <em>unchanged</em></li>
13+
</ul>
14+
</li>
15+
<li>10/31/2022:
16+
<ul>
17+
<li>Web app: v2.0, development package 1</li>
18+
<li>Text corpus: v17</li>
19+
</ul>
20+
</li>
21+
</ul>
22+
</section>
523
<section>
624
<h2>Comparison of legacy vs. new TLA, with development perspectives</h2>
725
<table class="bordered-table">

src/main/resources/static/css/tla-styles.css

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,8 +181,8 @@ a.navbar-brand {
181181

182182
.breadcrumb {
183183
background-color: white;
184-
padding: 1rem 0rem;
185-
margin-bottom: 0;
184+
padding: 0rem;
185+
margin: 0.4rem 0rem;
186186
}
187187

188188
.breadcrumb-item,
@@ -196,8 +196,10 @@ a.navbar-brand {
196196
color: var(--BBAWmiddlegrey);
197197
}
198198

199-
.breadcrumb.language > a.active {
199+
#tla-version > a,
200+
#breadcrumbs .language > a.active {
200201
color: var(--BBAWdarkgrey);
202+
font-weight : bold;
201203
}
202204

203205
.cookie-wrapper {
@@ -1306,7 +1308,7 @@ span.multiselect-native-select select {
13061308
/**************/
13071309
/* Smartphone */
13081310
/**************/
1309-
@media only screen and (max-width: 992px) {
1311+
@media only screen and (max-width: 575px) {
13101312

13111313
.container {
13121314
max-width: 100% !important;
@@ -1398,6 +1400,35 @@ span.multiselect-native-select select {
13981400
.result-list-item-element {
13991401
display: block;
14001402
}
1403+
1404+
/*
1405+
.search .form-group {
1406+
padding : 0px!important;
1407+
padding-top: 0.2rem!important;
1408+
padding-bottom: 0.2rem!important;
1409+
margin : 0px!important;
1410+
}
1411+
.search .col-form-label,
1412+
.search .form-control {
1413+
padding: 0px!important;
1414+
padding-left: 0.4rem!important;
1415+
margin: 0px!important;
1416+
}
1417+
*/
1418+
1419+
#details-content hr {
1420+
margin: 0.2rem !important;
1421+
}
1422+
1423+
.breadcrumb {
1424+
padding: 0;
1425+
margin: 0;
1426+
}
1427+
1428+
h2.id {
1429+
padding: 0 !important;
1430+
}
1431+
14011432
}
14021433

14031434

src/main/resources/templates/error.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h3 class="id mt-1">
2424

2525
<div class="row">
2626
<div class="col-sm-12 col-lg-8" id="details-content">
27-
<div class="my-5">
27+
<div class="my-sm-5">
2828
<h5>
2929
<span class="error-msg text-danger" th:text="#{error_500_long}">The database server failed to process your request</span>
3030
<span th:if="${#ctx.containsVariable('url')}" class="text-monospace" th:text="': ...' + ${url}">.../object/0000</span>

src/main/resources/templates/error/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ <h2 class="id mt-1">
2424

2525
<div class="row">
2626
<div id="details-content">
27-
<div class="my-5">
27+
<div class="my-sm-5">
2828
<h5 class="border-bottom">
2929
<span class="error-msg text-danger" th:text="#{error_404} + ':'"></span>
3030
<span class="text-monospace" th:text="'...' + ${url}">.../object/0000</span>

src/main/resources/templates/fragments/common.html

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,14 @@
1616
<div class="navbar-title">
1717
<h1 class="d-none d-sm-block" th:text="#{tla_Title}">Thesaurus Linguae Aegyptiae</h1>
1818
<h1 class="d-block d-sm-none">TLA</h1>
19-
<p>v<span th:text="#{tla_version}">2.0 pre-beta</span></p>
19+
<p id="tla-version"><a href="/info/tla-development">v<span th:text="#{tla_version}">2.xxx</span></a></p>
2020
</div>
2121
<div id="navbar-search-button" class="d-lg-none d-xl-none">
2222
<a type="button" class="btn btn-outline-danger nav-search-button" href="/search"><i class="fas fa-search"></i></a>
2323
</div>
24+
<!--<div id="page-help" class="d-sm-none" th:fragment="page-help(pagename)">
25+
<div th:replace=" :: help-button(${pagename})"/>
26+
</div>-->
2427
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarResponsive" aria-controls="navbarResponsive" aria-expanded="false" aria-label="Toggle navigation">
2528
<span class="navbar-toggler-icon"/>
2629
</button>
@@ -103,7 +106,7 @@ <h1 class="d-block d-sm-none">TLA</h1>
103106
</a>
104107
</div>
105108
</div>
106-
<div class="row mt-2">
109+
<div class="row mt-sm-2">
107110
<div class="col-sm-6 col-lg-8">
108111
<p class="footer-credits" th:utext="#{editorial_footer_credits}"/>
109112
</div>
@@ -127,7 +130,7 @@ <h1 class="d-block d-sm-none">TLA</h1>
127130

128131
<!-- Citation blocks -->
129132

130-
<div class="bg-light citation mt-2 mb-2" th:fragment="citation-website">
133+
<div class="bg-light citation mt-sm-2 mb-sm-2" th:fragment="citation-website">
131134
<p class="h6"><strong th:text="#{citeas_website_heading}">Please cite this website as</strong>:</p>
132135
<blockquote id="full-citation"><i th:text="#{tla_Title}"></i> <span th:text="' <' + ${env.baseUrl} +'>, ' + #{citeas_corpus_version} + ' ' + #{tla_corpusversion} + ', ' + #{citeas_tla_version} + ' ' + #{tla_version} + ', ' + #{tla_ReleaseDate} + ', ' + #{citeas_editor} +' ' + #{tla_Editor} + ' ('+ #{citeas_accessed}+ ': '"></span>
133136
<span id="current-date">xx.xx.20xx</span>)
@@ -190,7 +193,7 @@ <h1 class="d-block d-sm-none">TLA</h1>
190193
<div id="cookie-container" class="cookie-container d-none">
191194
<div class="cookie-wrapper px-5 py-2">
192195
<!-- Content -->
193-
<div class="row my-4">
196+
<div class="row my-sm-4">
194197
<span class="col-sm-8" th:utext="#{cookie_banner_msg}">This website would like to place ...</span>
195198
<!-- Buttons -->
196199
<div class="col-sm-4">
@@ -205,35 +208,35 @@ <h1 class="d-block d-sm-none">TLA</h1>
205208

206209
<!-- page breadcrumbs -->
207210

208-
<div id="breadcrumbs" class="row justify-content-center" th:fragment="breadcrumbs">
209-
<div class="col-12 d-lg-flex">
210-
<nav aria-label="breadcrumb" class="flex-grow-1">
211+
<div id="breadcrumbs" class="row d-flex justify-content-between" th:fragment="breadcrumbs">
212+
<div class="">
213+
<nav aria-label="breadcrumb">
211214
<ol class="breadcrumb">
212215
<li th:each="item : ${breadcrumbs}" class="breadcrumb-item" th:classappend="${itemStat.last} ? 'active' : ''">
213216
<a th:unless="${item.href} == null" th:href="${item.href}" th:text="#{${item.label}}"></a>
214217
<span th:unless="${item.href} != null" th:text="#{${item.label}}"></span>
215218
</li>
216219
</ol>
217220
</nav>
218-
<div class="language breadcrumb">
221+
</div>
222+
<div class="breadcrumb language">
219223
<th:block th:each="lang, i : ${env.l10n}">
220224
<a th:classappend="${env.lang == lang} ? 'active' : ''"
221225
th:href="${@templateUtils.setQueryParam('lang', lang)}" th:text="${lang}" class="text-uppercase">
222226
EN
223227
</a>
224-
<i th:unless="${i.last}" class="px-1">|</i>
228+
<span th:unless="${i.last}" class="px-1">|</span>
225229
</th:block>
226230
</div>
227-
</div>
228231
</div>
229232

230233

231234
<!-- social media stuff for top right header placement -->
232235

233-
<div id="social" class="button-bar col-md-6 col-lg-6 align-right align-baseline d-none d-lg-block" th:fragment="social(helppage)">
236+
<div id="social" class="button-bar align-right align-baseline" th:fragment="social(helppage)">
234237
<div class="functional-icons">
235238
<a href="#" class="btn btn-red solo-icon" role="button" data-toggle="modal" data-target="#modal_sharing">
236-
<span class="mr-1" th:text="#{social-button-share}">Share</span>
239+
<span class="mr-1 d-none d-sm-inline" th:text="#{social-button-share}">Share</span>
237240
<i class="fa fa-share-alt share-results"></i></a>
238241
</div>
239242
<!-- ## email-Funktionalität noch nicht nutzbar ##
@@ -260,10 +263,10 @@ <h5 class="modal-title" id="exampleModalLongTitle" th:text="#{modal_comment_titl
260263
</div>
261264
<div class="modal-body">
262265
<input type="hidden" id="pageHREF" name="pageHREF" value="javascript:getCurrentHREF()"/><!--does this work, or do we need a separate script to change the value?-->
263-
<div class="input-group mb-2">
266+
<div class="input-group mb-sm-2">
264267
<input type="text" class="form-control" disabled th:placeholder="#{modal_comment_name}" aria-label="Username" aria-describedby="basic-addon1">
265268
</div>
266-
<div class="input-group mb-2">
269+
<div class="input-group mb-sm-2">
267270
<input type="text" class="form-control" disabled th:placeholder="#{modal_comment_email}" aria-label="Username" aria-describedby="basic-addon1">
268271
</div>
269272

@@ -307,13 +310,13 @@ <h5 class="modal-title" id="exampleModalLongTitle" th:text="#{modal_share_title}
307310

308311
<!-- help icon for top right header placement -->
309312

310-
<div id="page-help" class="button-bar col-md-6 col-lg-6 align-right align-baseline d-none d-lg-block" th:fragment="page-help(pagename)">
313+
<div id="page-help" class="button-bar align-right align-baseline " th:fragment="page-help(pagename)">
311314
<div th:replace=" :: help-button(${pagename})"/>
312315
</div>
313316

314317
<div id="help-button" class="functional-icons" th:fragment="help-button(pagename)">
315318
<a class="btn btn-red text-left text-decoration-none solo-icon" role="button" th:href="${'/help/' + pagename}" target="_blank" rel="opener">
316-
<span class="mr-1" th:text="#{page-help-button}">Page help</span>
319+
<span class="mr-sm-1 d-none d-sm-inline" th:text="#{page-help-button}">Page help</span>
317320
<i class="fas fa-info-circle"></i></a>
318321
</div>
319322

@@ -348,7 +351,7 @@ <h5 class="modal-title" id="exampleModalLongTitle" th:text="#{modal_share_title}
348351

349352
<!-- object path (thesaurus, text corpus, sentences) -->
350353
<div th:fragment="object-paths(objectPaths, collapse)" class="object-paths">
351-
<div th:each="objectPath, outerIter : ${objectPaths}" class="object-path mt-2">
354+
<div th:each="objectPath, outerIter : ${objectPaths}" class="object-path mt-sm-2">
352355
<div th:each="item, iter : ${objectPath}" class="object-path-element">
353356
<th:block th:if="${item.label} != null">
354357
<span th:class="|object-path-icon ${item.eclass} ${item.type}|"></span>
@@ -365,14 +368,14 @@ <h5 class="modal-title" id="exampleModalLongTitle" th:text="#{modal_share_title}
365368

366369
<!-- sentence hieroglyphs -->
367370
<div th:fragment="sentence-hieroglyphs" class="result-list-item-element hieroglyphs">
368-
<p class="bbaw-libertine mb-2">
371+
<p class="bbaw-libertine mb-sm-2">
369372
<span th:each="token : *{tokens}" th:id="|hieroglyphs-${token.id}|">
370373
<a th:if="${token.lemma.id}" th:href="'/lemma/'+${token.lemma.id}"
371374
th:class="|sentence-token token-${token.type}|" th:classappend="${(#request.getParameter('tokens[0].lemma.id') != Null AND #request.getParameter('tokens[0].lemma.id') == token.lemma.id) ? 'highlight' : ''}" target="_blank" rel="opener"><th:block th:replace=" :: token-hieroglyphs"/></a>
372375
<span th:unless="${token.lemma.id}"><th:block th:replace=" :: token-hieroglyphs"/></span>
373376
</span>
374377
</p>
375-
<!--<p class="bbaw-libertine mb-2">
378+
<!--<p class="bbaw-libertine mb-sm-2">
376379
<span th:if="*{getGlyphs}">
377380
<span th:utext="*{getGlyphs.unicode}"></span>
378381
</span>
@@ -381,7 +384,7 @@ <h5 class="modal-title" id="exampleModalLongTitle" th:text="#{modal_share_title}
381384

382385
<!-- sentence transliteration -->
383386
<div th:fragment="sentence-transcription" class="result-list-item-element transcription">
384-
<p class="bbaw-libertine mb-2">
387+
<p class="bbaw-libertine mb-sm-2">
385388
<span th:each="token : *{tokens}" th:id="|transliteration-${token.id}|" th:class="${(#request.getParameter('tokens[0].lemma.id') != Null AND #request.getParameter('tokens[0].lemma.id') == token.lemma.id) ? 'highlight' : '' }">
386389
<a th:if="${token.lemma.id}" th:href="'/lemma/'+${token.lemma.id}"
387390
th:utext="${{token.transcription.unicode}}"

0 commit comments

Comments
 (0)