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

Merge csLink into develop #251

Merged
merged 12 commits into from
Jan 7, 2019
Merged

Merge csLink into develop #251

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
47ee043
WIP: csLink-Einbindung
Dec 8, 2018
3eed659
current progress
Dec 16, 2018
36e0429
csLink CSS hinzugefügt (wird doch benötigt)
Dec 17, 2018
193feae
css-Anpassungen für die WeGA-Anzeige, Einbindung des nötigen csLink CSS
Dec 31, 2018
b663dc8
csLink Einbindungen nur für Briefe, csLink-CSS entfernt
Dec 31, 2018
9b4a64a
more sensible data-range, removed code examples
Dec 31, 2018
be1fa55
Version mit csLink.css-Einbindung und Überschreibung
jakosch Jan 3, 2019
b9aadc2
fix popover arrow
peterstadler Jan 3, 2019
1018739
better spacing in popover
jakosch Jan 5, 2019
2df58ee
Merge branch 'develop' into csLink
jakosch Jan 6, 2019
e2f22ce
update expected results
peterstadler Jan 7, 2019
f535d25
update expected results part 2
peterstadler Jan 7, 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
43 changes: 43 additions & 0 deletions modules/app.xqm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1442,6 +1442,49 @@ declare
lang:get-language-string($model?context-relatedItem?context-relatedItem-type, $lang)
};

(:~
: Create csLink element (see https://github.com/correspSearch/csLink for options)
: wip!
: @author Jakob Schmidt
:)

declare
%templates:default("lang", "en")
function app:csLink($node as node(), $model as map(*), $lang as xs:string) as element(div) {
let $doc := $model('doc')
let $correspondent-1-key := query:get-authorID($doc)
let $correspondent-1-gnd := query:get-gnd($correspondent-1-key)
let $correspondent-2-key := $doc//tei:correspAction[range:eq(@type,'received')]//@key[parent::tei:persName or parent::name or parent::tei:orgName]
let $correspondent-2-gnd := query:get-gnd($correspondent-2-key)
let $gnd-uri := config:get-option("dnb") (: 'http://d-nb.info/gnd/' :)
(: Element-Parameter :)
let $data-correspondent-1-id := if ($correspondent-1-gnd) then concat($gnd-uri,$correspondent-1-gnd) else ""
let $data-correspondent-1-name :=
(:if ($data-correspondent-1-id) then "" else:)
if ($correspondent-1-key) then query:title($correspondent-1-key) else ""
let $data-correspondent-2-id := if ($correspondent-2-gnd) then concat($gnd-uri,$correspondent-2-gnd) else ""
let $data-correspondent-2-name :=
(:if ($data-correspondent-2-id) then "" else :)
if ($correspondent-2-key) then query:title($correspondent-2-key) else ""
let $data-start-date := query:get-normalized-date($doc)
return
element { node-name($node) } {
attribute id {"csLink"}, (: mandatory :)
attribute data-correspondent-1-id {$data-correspondent-1-id},
attribute data-correspondent-1-name {$data-correspondent-1-name},
attribute data-correspondent-2-id {$data-correspondent-2-id},
attribute data-correspondent-2-name {$data-correspondent-2-name},
attribute data-start-date { $data-start-date},
attribute data-end-date {$data-start-date},
attribute data-range {"30"},
attribute data-selection-when {"before-after"},
attribute data-selection-span {"median-before-after"},
attribute data-result-max {"4"},
attribute data-exclude-edition {"#WEGA"}
}
};


(:~
: Create dateline and author link for website news
: (Helper Function for app:print-transcription)
Expand Down
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"selectize": "^0.12.0",
"swagger-ui": "^2.2.10",
"vnu": "^0.0.1",
"yuicompressor": "^2.4.8"
"yuicompressor": "^2.4.8",
"csLink":"correspSearch/csLink"
}
}
59 changes: 59 additions & 0 deletions resources/less/csLink.less
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
.popover.fade.show {
max-width:300px;
font-family: unset;
font-size:1em;
opacity:1;

table {
font-size:unset;
}

table.b-table > thead > tr > th.sorting {
padding-right: 2em;
}

.fade.show {
opacity:1;
}

.popover-body {
max-height:400px;
overflow-y:auto;
padding:4px;
}

.popover-header:empty {
display:none;
}

.nav {
margin:4px 0 4px 0;
}

.nav-tabs li {
width: unset;
}

.nav-item .nav-link.active {
background:@brand-primary;
color:white;
}

.tab-content {
font-size:smaller;
}

hr {
margin: 4px 0 4px 0;
}

.arrow {
border-width: 0px;
}

.arrow::after {
border-width: 0 .5rem .5rem;
border-bottom-color: #fff;
}

}
3 changes: 2 additions & 1 deletion resources/less/styles.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,5 @@
@import "weber.less";
@import "tei.less";
@import "gui.less";
@import "greedynav.less";
@import "greedynav.less";
@import "csLink.less";
100 changes: 75 additions & 25 deletions templates/document.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,20 @@ <h1 class="document" data-template="app:document-title">CARL MARIA VON WEBER AN
<div class="row">
<div class="col-sm-10">
<ol class="breadcrumb">
<li><a href="$link/index">Home</a></li>
<li><a data-template="app:breadcrumb-person">Carl Maria von Weber</a></li>
<li><a data-template="app:breadcrumb-docType">Korrespondenz</a></li>
<li><span data-template="app-shared:print" data-template-key="docID">A040080</span> <span data-template="app-shared:if-not-matches" data-template-key="docType" data-template-value="news" data-template-wrap="no"><span data-template="app:status" class="docStatus">in Bearbeitung</span></span></li>
<li>
peterstadler marked this conversation as resolved.
Show resolved Hide resolved
<a href="$link/index">Home</a>
</li>
<li>
<a data-template="app:breadcrumb-person">Carl Maria von Weber</a>
</li>
<li>
<a data-template="app:breadcrumb-docType">Korrespondenz</a>
</li>
<li>
<span data-template="app-shared:print" data-template-key="docID">A040080</span> <span data-template="app-shared:if-not-matches" data-template-key="docType" data-template-value="news" data-template-wrap="no">
<span data-template="app:status" class="docStatus">in Bearbeitung</span>
</span>
</li>
</ol>
</div>
<div class="col-sm-2 hidden-xs backLinkInBreadcrumb" onclick="history.back();">
Expand All @@ -32,33 +42,61 @@ <h1 class="document" data-template="app:document-title">CARL MARIA VON WEBER AN
<div class="col-md-3 col-md-push-9">
<div class="allFilter" data-template="facets:document-allFilter">
<div data-template="app-shared:if-matches" data-template-key="docType" data-template-value="diaries">
<h2><a href="#datePicker" data-template="lang:translate" class="collapseSingle collapsed" data-toggle="collapse">calendar</a></h2>
<h2>
<a href="#datePicker" data-template="lang:translate" class="collapseSingle collapsed" data-toggle="collapse">calendar</a>
</h2>
<div class="panel-collapse collapse" id="datePicker" data-template="app:inject-api-base"/>
</div>
<div>
<h2><a href="#dokument" data-template="lang:translate" class="collapseSingle collapsed" data-toggle="collapse">document</a></h2>
<h2>
<a href="#dokument" data-template="lang:translate" class="collapseSingle collapsed" data-toggle="collapse">document</a>
</h2>
<div id="dokument" class="panel-collapse collapse">
<!-- Nav tabs -->
<ul class="nav nav-tabs">
<li class="gradient-light active"><a href="#transcription" data-toggle="tab">Text</a></li>
<div data-template="app-shared:if-not-matches" data-template-key="docType" data-template-value="news" data-template-wrap="no"><li class="gradient-light"><a href="#editorial" data-toggle="tab" data-template="lang:translate">editorial</a></li></div>
<li class="gradient-light"><a href="#facsimile" data-toggle="tab" data-template="app:facsimile-tab" id="facsimile-tab">facsimile</a></li>
<li class="gradient-light"><a href="#backlinks" data-toggle="tab" data-template="app:ajax-tab" data-tab-callback="removeFilter">backlinks</a></li>
<li class="gradient-light"><a href="#XMLPreview" data-toggle="tab" data-template="app:ajax-tab">XML-Preview</a></li>
<li class="gradient-light"><a href="#" data-toggle="modal" data-target="#downloadModal">Download</a></li>
<li class="gradient-light active">
<a href="#transcription" data-toggle="tab">Text</a>
</li>
<div data-template="app-shared:if-not-matches" data-template-key="docType" data-template-value="news" data-template-wrap="no">
<li class="gradient-light">
<a href="#editorial" data-toggle="tab" data-template="lang:translate">editorial</a>
</li>
</div>
<li class="gradient-light">
<a href="#facsimile" data-toggle="tab" data-template="app:facsimile-tab" id="facsimile-tab">facsimile</a>
</li>
<li class="gradient-light">
<a href="#backlinks" data-toggle="tab" data-template="app:ajax-tab" data-tab-callback="removeFilter">backlinks</a>
</li>
<li class="gradient-light">
<a href="#XMLPreview" data-toggle="tab" data-template="app:ajax-tab">XML-Preview</a>
</li>
<li class="gradient-light">
<a href="#" data-toggle="modal" data-target="#downloadModal">Download</a>
</li>
</ul>
</div>
</div>
<div data-template="templates:include" data-template-path="templates/includes/download-modal.html"/>
<div data-template="app:context">
<h2><a href="#kontext" data-template="lang:translate" class="collapseSingle collapsed" data-toggle="collapse">context</a></h2>
<div id="kontext" class="panel-collapse collapse borderBox">
<div data-template="app:context">

<h2>
<a href="#kontext" data-template="lang:translate" class="collapseSingle collapsed" data-toggle="collapse">context</a>
</h2>
<div id="kontext" class="panel-collapse collapse borderBox">
<div data-template="app-shared:if-matches" data-template-key="docType" data-template-value="letters">
<div data-template="app:csLink"/>
<script type="text/javascript" src="$resources/lib/csLink/dist/static/js/cslink.js"/>
<h2/>
</div>
<div id="relatedItems" data-template="app-shared:if-exists" data-template-key="context-relatedItems">
<h3 data-template="lang:translate">relatedItems</h3>
<ul>
<li data-template="app-shared:each" data-template-from="context-relatedItems" data-template-to="context-relatedItem">
<h4 data-template="app:print-context-relatedItem-type">Draft</h4>
<p><a href="#" data-template="app:print-context-relatedItem">Brief an Weber</a></p>
<p>
<a href="#" data-template="app:print-context-relatedItem">Brief an Weber</a>
</p>
</li>
</ul>
</div>
Expand All @@ -68,13 +106,17 @@ <h3 data-template="lang:translate">absouluteChronology</h3>
<h4 data-template="lang:translate">prevLetters</h4>
<ul>
<li data-template="app-shared:each" data-template-from="context-letter-absolute-prev" data-template-to="letter-norm-entry">
<span data-template="app:print-letter-context"><a href="/de/A002068/Korrespondenz/A040086">1799-01-01</a>: An <span class="noDataFound">unbekannt</span></span>
<span data-template="app:print-letter-context">
<a href="/de/A002068/Korrespondenz/A040086">1799-01-01</a>: An <span class="noDataFound">unbekannt</span>
</span>
</li>
</ul>
<h4 data-template="lang:translate">nextLetters</h4>
<ul>
<li data-template="app-shared:each" data-template-from="context-letter-absolute-next" data-template-to="letter-norm-entry">
<span data-template="app:print-letter-context"><a href="/de/A002068/Korrespondenz/A040086">1799-01-01</a>: An <span class="noDataFound">unbekannt</span></span>
<span data-template="app:print-letter-context">
<a href="/de/A002068/Korrespondenz/A040086">1799-01-01</a>: An <span class="noDataFound">unbekannt</span>
</span>
</li>
</ul>
</div>
Expand All @@ -83,21 +125,27 @@ <h3 data-template="lang:translate">korrespondenzstelle</h3>
<h4 data-template="lang:translate">prevLetters</h4>
<ul>
<li data-template="app-shared:each" data-template-from="context-letter-korrespondenzstelle-prev" data-template-to="letter-norm-entry">
<span data-template="app:print-letter-context"><a href="/de/A002068/Korrespondenz/A040086">1799-01-01</a>: An <span class="noDataFound">unbekannt</span></span>
<span data-template="app:print-letter-context">
<a href="/de/A002068/Korrespondenz/A040086">1799-01-01</a>: An <span class="noDataFound">unbekannt</span>
</span>
</li>
</ul>
<h4 data-template="lang:translate">nextLetters</h4>
<ul>
<li data-template="app-shared:each" data-template-from="context-letter-korrespondenzstelle-next" data-template-to="letter-norm-entry">
<span data-template="app:print-letter-context"><a href="/de/A002068/Korrespondenz/A040086">1799-01-01</a>: An <span class="noDataFound">unbekannt</span></span>
<span data-template="app:print-letter-context">
<a href="/de/A002068/Korrespondenz/A040086">1799-01-01</a>: An <span class="noDataFound">unbekannt</span>
</span>
</li>
</ul>
</div>
</div>
</div>
</div>
<div data-template="app-shared:each" data-template-from="filterSections" data-template-to="filterSection">
<h2><a class="collapseSingle collapsed" data-toggle="collapse" data-template="facets:filter-head" href="#">Personen</a></h2>
<h2>
<a class="collapseSingle collapsed" data-toggle="collapse" data-template="facets:filter-head" href="#">Personen</a>
</h2>
<div class="panel-collapse collapse" data-template="facets:filter-body">
<div data-toggle="buttons" class="btn-group primary" data-template="facets:filter-options">
<label class="btn gradient-light" data-template="app-shared:each" data-template-from="filterOptions" data-template-to="filterOption">
Expand Down Expand Up @@ -177,7 +225,7 @@ <h5 data-template="lang:translate" class="media-heading">additionalSources</h5>
</ul>
</div>
</div>
</div>
</div>

<div data-template="app-shared:if-exists" data-template-key="thematicCommentaries">
<h3 data-template="lang:translate" class="media-heading">thematicCommentaries</h3>
Expand Down Expand Up @@ -211,13 +259,15 @@ <h2>XML</h2>
<h4>Empfohlene Zitierweise</h4>
<p>Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition, <span data-template="app-shared:print" data-template-key="permalink">http://www.weber-gesamtausgabe.de/wega/A000154</span> (<span data-template="app-shared:print" data-template-key="versionNews">Version 1.2dev vom 12. Juni 2014</span>)
<br/>
<span data-template="app-shared:print" data-template-key="latestChange">Letzte Änderung dieses Dokuments am 22. Mai 2014 durch Peter Stadler</span></p>
<span data-template="app-shared:print" data-template-key="latestChange">Letzte Änderung dieses Dokuments am 22. Mai 2014 durch Peter Stadler</span>
</p>
</div>
<div class="col-md-9" data-template="app-shared:if-matches" data-template-key="lang" data-template-value="en">
<h4>Proposed citation</h4>
<p>Complete Works of Carl Maria von Weber. Digital Edition, <span data-template="app-shared:print" data-template-key="permalink">http://www.weber-gesamtausgabe.de/wega/A000154</span> (<span data-template="app-shared:print" data-template-key="versionNews">Version 1.2dev vom 12. Juni 2014</span>)
<br/>
<span data-template="app-shared:print" data-template-key="latestChange">Letzte Änderung dieses Dokuments am 22. Mai 2014 durch Peter Stadler</span></p>
<span data-template="app-shared:print" data-template-key="latestChange">Letzte Änderung dieses Dokuments am 22. Mai 2014 durch Peter Stadler</span>
</p>
</div>
</div>
<div class="row bugreport">
Expand All @@ -229,4 +279,4 @@ <h4>Proposed citation</h4>
</div>
</div>
</div>
</div>
</div>
Loading