Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

allow for different authors in the URL, closes #316 #333

Merged
merged 13 commits into from
Nov 28, 2019
Merged

allow for different authors in the URL, closes #316 #333

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2c3bac5
fix breadcrumbs and URL rewritings for multiple authors #316
peterstadler Nov 14, 2019
7f530c7
fix breadcrumb for authors without key #316
peterstadler Nov 14, 2019
66bf5a1
fix csLink for multiple authors/senders #316
peterstadler Nov 14, 2019
7ae91b9
improve jsonld output for multiple authors #316
peterstadler Nov 15, 2019
9df9c34
update expected results
peterstadler Nov 15, 2019
7ca6c6f
keep author/sender context for links #316
peterstadler Nov 25, 2019
b1bd45a
Merge branch 'develop' into issue-316
peterstadler Nov 25, 2019
d2e0eb7
fix breadcrumb
peterstadler Nov 25, 2019
3cbc9d9
small fix
peterstadler Nov 25, 2019
c85116b
check explicitly for sequences
peterstadler Nov 25, 2019
dfbd1ba
update expected results
peterstadler Nov 25, 2019
a24d273
only output context when there's more than a senderID
peterstadler Nov 25, 2019
73be194
update expected results
peterstadler Nov 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
update expected results
  • Loading branch information
@peterstadler
peterstadler committed Nov 25, 2019
commit 73be19496ab316273031e648c2100b39a532bef7
93 changes: 27 additions & 66 deletions testing/expected-results/letters/A042080.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,30 +213,33 @@ <h1 class="document">Hoftheaterintendanz Karlsruhe an Carl Maria von Weber in Dr
</div>
<div class="colored borderBottom">
<div class="container">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz">Korrespondenz</a>
</li>
<li>
<span>A042080</span>
<span class="docStatus">in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>

<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz">Korrespondenz</a>
</li>
<li>
<span>A042080</span>
<span class="docStatus">in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>
</div>
</div>
</div>


</div>
</div>
<div class="container documentText paddingTopIcon paddingBottomIcon">
Expand Down Expand Up @@ -316,49 +319,7 @@ <h4><a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz/A042080.txt">Plain
</div>
</div>
</div>
<div>
<h2>
<a href="#kontext" class="collapseSingle collapsed" data-toggle="collapse">Kontext</a>
</h2>
<div id="kontext" class="panel-collapse collapse borderBox">
<div>
<div id="csLink" data-correspondent-1-id="" data-correspondent-1-name="" data-correspondent-2-id="" data-correspondent-2-name="" data-start-date="1823-12-04" data-end-date="1823-12-04" data-range="30" data-selection-when="before-after" data-selection-span="median-before-after" data-result-max="4" data-exclude-edition="#WEGA"></div>
<script type="text/javascript" src="/exist/apps/WeGA-WebApp/resources/lib/csLink/dist/static/js/cslink.js"></script>
</div>

<div>

<h3>Absolute Chronologie</h3>
<h4>Vorausgehend</h4>
<ul>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz/A042079.html">1823-11-01</a>: an <a href="" class="preview A002068 persons"></a>
</li>
</ul>
<h4>Folgend</h4>
<ul>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz/A042215.html">1824-01-24</a>: an <a href="" class="preview A080050 orgs"></a>
</li>
</ul>

<hr />

<h3>Korrespondenzstelle</h3>
<h4>Vorausgehend</h4>
<ul>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz/A042079.html">1823-11-01</a>: an <a href="" class="preview A002068 persons"></a>
</li>
</ul>
<h4>Folgend</h4>
<ul>

</ul>

</div>
</div>
</div>
<div></div>
<div class="filtersection">
<h2>
<a class="collapseSingle collapsed" data-toggle="collapse" href="#personsPlus">Personen</a>
Expand Down
93 changes: 27 additions & 66 deletions testing/expected-results/letters/A042081.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,30 +213,33 @@ <h1 class="document">Hoftheaterintendanz Karlsruhe an Carl Maria von Weber in Dr
</div>
<div class="colored borderBottom">
<div class="container">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz">Korrespondenz</a>
</li>
<li>
<span>A042081</span>
<span class="docStatus">in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>

<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz">Korrespondenz</a>
</li>
<li>
<span>A042081</span>
<span class="docStatus">in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>
</div>
</div>
</div>


</div>
</div>
<div class="container documentText paddingTopIcon paddingBottomIcon">
Expand Down Expand Up @@ -316,49 +319,7 @@ <h4><a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz/A042081.txt">Plain
</div>
</div>
</div>
<div>
<h2>
<a href="#kontext" class="collapseSingle collapsed" data-toggle="collapse">Kontext</a>
</h2>
<div id="kontext" class="panel-collapse collapse borderBox">
<div>
<div id="csLink" data-correspondent-1-id="" data-correspondent-1-name="" data-correspondent-2-id="" data-correspondent-2-name="" data-start-date="1823-12-21" data-end-date="1823-12-21" data-range="30" data-selection-when="before-after" data-selection-span="median-before-after" data-result-max="4" data-exclude-edition="#WEGA"></div>
<script type="text/javascript" src="/exist/apps/WeGA-WebApp/resources/lib/csLink/dist/static/js/cslink.js"></script>
</div>

<div>

<h3>Absolute Chronologie</h3>
<h4>Vorausgehend</h4>
<ul>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz/A042079.html">1823-11-01</a>: an <a href="" class="preview A002068 persons"></a>
</li>
</ul>
<h4>Folgend</h4>
<ul>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz/A042215.html">1824-01-24</a>: an <a href="" class="preview A080050 orgs"></a>
</li>
</ul>

<hr />

<h3>Korrespondenzstelle</h3>
<h4>Vorausgehend</h4>
<ul>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A080005/Korrespondenz/A042079.html">1823-11-01</a>: an <a href="" class="preview A002068 persons"></a>
</li>
</ul>
<h4>Folgend</h4>
<ul>

</ul>

</div>
</div>
</div>
<div></div>
<div class="filtersection">
<h2>
<a class="collapseSingle collapsed" data-toggle="collapse" href="#personsPlus">Personen</a>
Expand Down
18 changes: 1 addition & 17 deletions testing/expected-results/letters/A042603.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,23 +323,7 @@ <h4><a href="/exist/apps/WeGA-WebApp/de/A001353/Korrespondenz/A042603.txt">Plain
</div>
</div>
</div>
<div>
<h2>
<a href="#kontext" class="collapseSingle collapsed" data-toggle="collapse">Kontext</a>
</h2>
<div id="kontext" class="panel-collapse collapse borderBox">
<div>
<div id="csLink" data-correspondent-1-id="" data-correspondent-1-name="" data-correspondent-2-id="" data-correspondent-2-name="" data-start-date="1826-03-09" data-end-date="1826-03-09" data-range="30" data-selection-when="before-after" data-selection-span="median-before-after" data-result-max="4" data-exclude-edition="#WEGA"></div>
<script type="text/javascript" src="/exist/apps/WeGA-WebApp/resources/lib/csLink/dist/static/js/cslink.js"></script>
</div>

<div>

<hr />

</div>
</div>
</div>
<div></div>
<div class="filtersection">
<h2>
<a class="collapseSingle collapsed" data-toggle="collapse" href="#personsPlus">Personen</a>
Expand Down
87 changes: 27 additions & 60 deletions testing/expected-results/letters/A044833.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,30 +215,33 @@ <h1 class="document">Carl Maria von Weber
</div>
<div class="colored borderBottom">
<div class="container">
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A002068/Korrespondenz">Korrespondenz</a>
</li>
<li>
<span>A044833</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>

<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li>
<a href="/exist/apps/WeGA-WebApp/de/Index">Home</a>
</li>
<li>
<span></span>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A002068/Korrespondenz">Korrespondenz</a>
</li>
<li>
<span>A044833</span>
<span class="docStatus">Kommentar in Bearbeitung</span>

</li>
</ol>
</div>
<div class="col-sm-2 d-none d-sm-block backLinkInBreadcrumb" onclick="history.back();">
<i class="fa fa-arrow-left"></i>
<span>Zurück</span>
</div>
</div>
</div>


</div>
</div>
<div class="container documentText paddingTopIcon paddingBottomIcon">
Expand Down Expand Up @@ -318,43 +321,7 @@ <h4><a href="/exist/apps/WeGA-WebApp/de/A002068/Korrespondenz/A044833.txt">Plain
</div>
</div>
</div>
<div>
<h2>
<a href="#kontext" class="collapseSingle collapsed" data-toggle="collapse">Kontext</a>
</h2>
<div id="kontext" class="panel-collapse collapse borderBox">
<div>
<div id="csLink" data-correspondent-1-id="" data-correspondent-1-name="" data-correspondent-2-id="" data-correspondent-2-name="" data-start-date="1826-03-31" data-end-date="1826-03-31" data-range="30" data-selection-when="before-after" data-selection-span="median-before-after" data-result-max="4" data-exclude-edition="#WEGA"></div>
<script type="text/javascript" src="/exist/apps/WeGA-WebApp/resources/lib/csLink/dist/static/js/cslink.js"></script>
</div>

<div>

<h3>Absolute Chronologie</h3>
<h4>Vorausgehend</h4>
<ul>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A002068/Korrespondenz/A042719.html">1826-03-24</a>: an <a href="/exist/apps/WeGA-WebApp/de/A000213.html" class="preview A000213 persons">Weber</a>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A000213/Korrespondenz/A042723.html">1826-03-27</a>: von <a href="/exist/apps/WeGA-WebApp/de/A000213.html" class="preview A000213 persons">Weber</a>
</li>
</ul>
<h4>Folgend</h4>
<ul>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A002068/Korrespondenz/A042763.html">1826-04-30</a>: an <a href="" class="preview A000568 persons"></a>
</li>
<li>
<a href="/exist/apps/WeGA-WebApp/de/A000213/Korrespondenz/A042739.html">1826-04-14</a>: von <a href="/exist/apps/WeGA-WebApp/de/A000213.html" class="preview A000213 persons">Weber</a>
</li>
</ul>

<hr />

</div>
</div>
</div>
<div></div>
<div class="filtersection">
<h2>
<a class="collapseSingle collapsed" data-toggle="collapse" href="#personsPlus">Personen</a>
Expand Down
Loading