From 1bd38be4bb5732a6fec86c215eacc2ccb174b6fc Mon Sep 17 00:00:00 2001 From: Peter Stadler Date: Wed, 20 Nov 2013 20:42:27 +0100 Subject: [PATCH] added proposed citation and persistent url to footer --- webapp/css/main.css | 2 +- webapp/xml/dictionary_de.xml | 4 +++- webapp/xml/dictionary_en.xml | 4 +++- webapp/xml/wegaOptions.xml | 4 +++- webapp/xql/modules/xho.xqm | 13 ++++++++++--- 5 files changed, 20 insertions(+), 7 deletions(-) diff --git a/webapp/css/main.css b/webapp/css/main.css index 0b0d36625..00afdb8c4 100644 --- a/webapp/css/main.css +++ b/webapp/css/main.css @@ -126,7 +126,7 @@ a:hover { background-color:#E6E6E6; } -#footer a { +#supportBadges a { padding: 0 1em; } diff --git a/webapp/xml/dictionary_de.xml b/webapp/xml/dictionary_de.xml index 26216117c..22b90c4ed 100644 --- a/webapp/xml/dictionary_de.xml +++ b/webapp/xml/dictionary_de.xml @@ -151,7 +151,9 @@ Hilfe Weitergeleitet von %1 - Letzte Änderung am %1 durch %2 + Letzte Änderung dieses Dokuments am %1 durch %2 + Letzte Änderung dieses Dokuments am %1 + Empfohlene Zitierweise: Carl-Maria-von-Weber-Gesamtausgabe. Digitale Edition Erweiterte Suche WeGA-Suche diff --git a/webapp/xml/dictionary_en.xml b/webapp/xml/dictionary_en.xml index 78659c7c5..497654223 100644 --- a/webapp/xml/dictionary_en.xml +++ b/webapp/xml/dictionary_en.xml @@ -148,7 +148,9 @@ Help Redirected from %1 - Last change by %2 on %1 + Last change of this document by %2 on %1 + Last change of this document on %1 + Proposed citation: Complete Works of Carl Maria von Weber. Digital Edition Advanced Search WeGA-Search diff --git a/webapp/xml/wegaOptions.xml b/webapp/xml/wegaOptions.xml index 2c53247d1..7aab0c55f 100644 --- a/webapp/xml/wegaOptions.xml +++ b/webapp/xml/wegaOptions.xml @@ -23,7 +23,7 @@ [not(*/tei:ref)] [./tei:ab] [not(*/tei:ref)] - + [not(*/tei:ref)] @@ -83,6 +83,8 @@ 120 EAO5d_GiQPkJeTGACYYOFahJm2HRNvJUWwIkyw4j0Ys AE39DA5613844228642EE48196AAA94A + 1.2 + A050140
http://toolserver.org/~authoritycontrol/redirect/gnd/ diff --git a/webapp/xql/modules/xho.xqm b/webapp/xql/modules/xho.xqm index 82c160b91..ee47d0e41 100644 --- a/webapp/xql/modules/xho.xqm +++ b/webapp/xql/modules/xho.xqm @@ -80,6 +80,7 @@ declare function xho:createHeadContainer($lang as xs:string) as element()* { :) declare function xho:createFooter($lang as xs:string, $docPath as xs:string) as element(xhtml:div) { + let $docID := substring-before(functx:substring-after-last($docPath, '/'), '.') let $docHash := util:hash($docPath, 'md5') (: let $log := util:log-system-out($docPath):) let $entry := doc(wega:getOption('svnChangeHistoryFile'))//id(concat('_',$docHash)) @@ -94,10 +95,16 @@ declare function xho:createFooter($lang as xs:string, $docPath as xs:string) as then '%B %d, %Y' else '%d. %B %Y' let $encryptedBugEmail := wega:encryptString(wega:getOption('bugEmail'), ()) - return if(exists($author) and exists($date)) - then + let $version := concat(wega:getOption('version'), if(wega:getOption('environment') eq 'development') then 'dev' else '') + let $permalink := string-join((wega:getOption('baseHref'), $docID), '/') + return + if(exists($author) and exists($date)) then - {wega:getLanguageString('lastChangeDate',(wega:strftime($dateFormat, $date, $lang),$author),$lang)} + {wega:getLanguageString('proposedCitation', $lang)}, {$permalink} (Version: {$version}) + { + if(wega:getOption('environment') eq 'development') then wega:getLanguageString('lastChangeDateWithAuthor',(wega:strftime($dateFormat, $date, $lang),$author),$lang) + else wega:getLanguageString('lastChangeDateWithoutAuthor', wega:strftime($dateFormat, $date, $lang), $lang) + } {if($lang eq 'en') then If you've spotted some error or inaccurateness please do not hesitate to inform us via {wega:obfuscateEmail(wega:getOption('bugEmail'))}