Merge branch 'dev' into pdn/doc (e0a2e6a4) · Commits · pdn-certic / MaX

rxq/config.xqm

+0 −8

Original line number	Diff line number	Diff line
		@@ -209,11 +209,3 @@ declare function max.config:getProjectAuthor($project){
		doc($max.config:CONFIGURATION_FILE)//edition[@xml:id=$project]/author/text()
		};

		(: get project data from config file :)
		declare function max.config:getProjectData($project){
		map:merge(
		for $data in doc($max.config:CONFIGURATION_FILE)//edition[@xml:id=$project]/projectData/data
		return
		map{$data/@key : data($data)}
		)
		};

rxq/ead/document_toc.xq

+2 −0

Original line number	Diff line number	Diff line
		@@ -19,8 +19,10 @@ declare function local:buildEADDocumentTOC($projectId, $docPath){
		return
		<details id="details_{$c/@id}">
		<summary>
		<a href="{$baseURI}{$projectId}/{$docPath}/{$c/@id}.html">
		{$c/@id}
		{$c/:did/:unittitle[1]//text()}
		</a>
		</summary>
		{local:childrenToc($c, $projectId, $docPath)}
		</details>

rxq/html.xqm

+1 −2

Original line number	Diff line number	Diff line
		@@ -58,8 +58,7 @@ declare function max.html:render(
		'head' : $head,
		'content' : $content,
		'footer' : max.html:getFooter($projectId),
		'jsImports' : $jsImports,
		'data' : max.config:getProjectData($projectId)
		'jsImports' : $jsImports
		})
		}
		catch err:FODC0002 {

ui/css/ead.css

+169 −144

Original line number	Diff line number	Diff line
		.super {
		vertical-align: super;
		font-size: 66%;}
		font-size: 66%;
		}

		.italic {
		font-style: italic;}
		font-style: italic;
		}

		.bold {
		font-weight: bold;}
		font-weight: bold;
		}

		.smcaps {
		font-variant: small-caps;}
		font-variant: small-caps;
		}

		#toc, .side-toc nav, .browse nav{
		#toc,
		.side-toc nav,
		.browse nav {
		margin-top: 6em;
		}

		@@ -32,9 +41,11 @@ body {
		margin: 0;
		}


		/*
		* Header & Footer
		*/

		header {
		position: fixed;
		height: 5em;
		@@ -43,7 +54,6 @@ header {
		width: 100%;
		border-bottom: 1px solid #1b1e21;
		background-color: white;

		display: flex;
		}

		@@ -53,17 +63,20 @@ header h1 {
		}



		/* menu top */
		header #menu, header #menu nav{

		header #menu,
		header #menu nav {
		display: flex;
		justify-content: center;
		align-items: center;
		}

		header nav button {
		display: none;/.../
		display: none;
		/.../
		}

		header nav ul {
		display: flex;
		margin: 0;
		@@ -78,7 +91,10 @@ header nav ul li a{
		header nav ul li.active {
		font-weight: bold;
		}


		/----------/

		footer {
		border-top: 1px solid #1b1e21;
		text-align: center;
		@@ -101,6 +117,7 @@ footer p {
		/*
		* Affichage si aucun noeud sélectionné
		*/

		section.home {
		position: fixed;
		top: 5.1em;
		@@ -114,6 +131,7 @@ section.home {
		/*
		* Panneau de droite, le détail de l'item
		*/

		section.browse>div>div {
		position: fixed;
		left: 40vw;
		@@ -154,9 +172,16 @@ figcaption {
		font-style: italic;
		}

		img {
		width: 100px;
		margin: 5px;
		}


		/*
		* Affichage de l'arborescence
		*/

		summary {
		border: 1px dotted transparent;
		/margin-bottom: 0.3em;/
		@@ -179,7 +204,6 @@ summary a {
		color: var(--ead-link-color-hover);
		}


		.side-toc details details {
		padding: 0;
		margin-left: 2em;
		@@ -263,14 +287,15 @@ section.porte-documents {
		opacity: 0;
		}


		/*
		* Adaptation pour écran large
		*/

		@media (min-width: 1000px) {
		section.browse nav {
		right: 60vw;
		}

		section.browse article {
		left: 40vw;
		}

ui/xsl/ead/ead2fo.xsl

+9 −9

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@



		<xsl:template match="ead:archdesc">
		<xsl:template match="ead:ead">
		<fo:root>
		<!-- équivalent du head html -->
		<fo:layout-master-set>
		@@ -79,16 +79,16 @@
		<xsl:value-of select="$pretty-name"/>
		</fo:block>
		<fo:block text-align="center" font-size="14pt" font-weight="bold" space-after="26pt">
		<xsl:value-of select="../ead:eadheader/ead:filedesc/ead:titlestmt/ead:titleproper"/>
		<xsl:value-of select="ead:eadheader/ead:filedesc/ead:titlestmt/ead:titleproper"/>
		</fo:block>
		<fo:block text-align="left" font-size="10pt" space-after="6pt">
		<xsl:text>Auteur(s) : </xsl:text>
		<xsl:value-of select="../ead:eadheader/ead:filedesc/ead:titlestmt/ead:author"/>
		<xsl:value-of select="ead:eadheader/ead:filedesc/ead:titlestmt/ead:author"/>
		</fo:block>
		<fo:block text-align="left" font-size="10pt" space-after="6pt">
		<xsl:if test="../ead:eadheader/ead:filedesc/ead:titlestmt/ead:sponsor">
		<xsl:if test="ead:eadheader/ead:filedesc/ead:titlestmt/ead:sponsor">
		<xsl:text>Commanditaire : </xsl:text>
		<xsl:value-of select="../ead:eadheader/ead:filedesc/ead:titlestmt/ead:sponsor"/>
		<xsl:value-of select="ead:eadheader/ead:filedesc/ead:titlestmt/ead:sponsor"/>
		</xsl:if>
		</fo:block>
		</fo:flow>
		@@ -329,7 +329,7 @@
		<xsl:text>Documents de substitution</xsl:text>
		</xsl:when>
		<xsl:when test="self::ead:appraisal">
		<xsl:text>Informations sur l'évaluation</xsl:text>
		<xsl:text>Informations sur l’évaluation</xsl:text>
		</xsl:when>
		<xsl:when test="self::ead:arrangement">
		<xsl:text>Classement</xsl:text>
		@@ -353,7 +353,7 @@
		<xsl:text>Existence et lieu de conservation des documents originaux</xsl:text>
		</xsl:when>
		<xsl:when test="self::ead:otherfindaid">
		<xsl:text>Autres instrument de recherche</xsl:text>
		<xsl:text>Autre(s) instrument(s) de recherche</xsl:text>
		</xsl:when>
		<xsl:when test="self::ead:phystech">
		<xsl:text>Caractéristiques matérielles et contraintes techniques</xsl:text>
		@@ -374,7 +374,7 @@
		<xsl:text>Documents séparés</xsl:text>
		</xsl:when>
		<xsl:when test="self::ead:userestrict">
		<xsl:text>Conditions d'utilisation</xsl:text>
		<xsl:text>Conditions d’utilisation</xsl:text>
		</xsl:when>
		</xsl:choose>
		</fo:block>