diff --git a/index.html b/about.html similarity index 79% rename from index.html rename to about.html index 69f3a20b..4702205f 100644 --- a/index.html +++ b/about.html @@ -9,11 +9,6 @@
-
- - Royal Danish Library - -

MerMEId – Metadata Editor and Repository for MEI Data

 
@@ -22,11 +17,13 @@

Introduction to the MerMEId demo server

MerMEId is a system for the editing, handling, and (pre-)viewing of music metadata, based on the the MEI (Music Encoding + href="https://www.music-encoding.org" target="_blank">Music Encoding Initiative) XML schema.

-

MerMEId is a community effort coordinated by ViFE – Virtueller Forschungsverbund Edirom and the Austrian Centre for Digital Humanities and Cultural Heritage (ACDH-CH) both for the production of +

MerMEId is a community effort coordinated by ViFE – + Virtueller Forschungsverbund Edirom and the Austrian + Centre for Digital Humanities and Cultural Heritage (ACDH-CH) both for the production of thematic catalogues of works and for organizing source- and work-related information during the preparation of scholarly editions of music. More information available at @@ -48,7 +45,7 @@

Try it!

target="manual">manual (opens in a new window or tab) which also includes a list of frequently asked questions. 

-

What you can do with the demo

@@ -66,7 +63,7 @@

Setting up your own MerMEId server

MerMEId is open-source software released under the Apache License version + title="See Apache License 2.0" target="_blank">Apache License version 2.0. The software is available for download at https://github.com/Edirom/MerMEId

@@ -75,9 +72,9 @@

Setting up your own MerMEId server

at GitHub.

This version of MerMEId uses - the MEI + the MEI 4.0.0 XML schema. The schema is available at www.music-encoding.org/schema/.

+ href="https://music-encoding.org/resources/schemas.html">https://music-encoding.org/resources/schemas.html.

{$config:footer} diff --git a/controller.xql b/controller.xql index 4d060759..61186185 100755 --- a/controller.xql +++ b/controller.xql @@ -21,6 +21,12 @@ else if ($exist:path eq "/") then +else if ($exist:path eq "/index.html") then + (: forward root path to index.xql :) + + + + else if (contains($exist:path, "/orbeon/")) then diff --git a/filter/xsl/mermeid_configuration.xsl b/filter/xsl/mermeid_configuration.xsl index ef9aa7fa..7e60eb08 100644 --- a/filter/xsl/mermeid_configuration.xsl +++ b/filter/xsl/mermeid_configuration.xsl @@ -2,7 +2,7 @@ + version="3.0"> @@ -10,6 +10,7 @@ + @@ -48,6 +49,9 @@ true +
+ +
diff --git a/forms/edit-form-footer.xml b/forms/edit-form-footer.xml index 0d2571b9..02953a34 100644 --- a/forms/edit-form-footer.xml +++ b/forms/edit-form-footer.xml @@ -1,74 +1,15 @@ - - - - - - - - - - - - - - - - - - - - MerMEId (Metadata Editor and Repository for MEI Data) is written - and distributed by: - - Danish Centre for Music Editing (DCM) - Royal Danish Library - P.O.Box 2149 - DK - 1016 Copenhagen - - Authors: Sigfrid Lundberg (slu@kb.dk) - & Axel Teich Geertinger (atge@kb.dk) - - MerMEId is open-source software released under the Apache License version - 2.0 - The software is provided "as is". Use at own risk. Neither the authors, DCM, - nor the Royal Danish Library can be held responsible for any costs or loss of data - caused by the use of this software. - - - - - - - - - + + + + + + + + + diff --git a/forms/edit-form-head.xml b/forms/edit-form-head.xml index 50a956ec..e3f6b225 100644 --- a/forms/edit-form-head.xml +++ b/forms/edit-form-head.xml @@ -25,6 +25,7 @@ @import "/editor/style/tab_style.css"; @import "/editor/style/xform_style.css"; + @import "/editor/style/footer.css"; diff --git a/forms/includes/topmenu.xml b/forms/includes/topmenu.xml index f4ca06a9..895833c0 100644 --- a/forms/includes/topmenu.xml +++ b/forms/includes/topmenu.xml @@ -38,12 +38,12 @@ title="Close editor and return to file list" border="0"/> - + - + diff --git a/modules/transform.xq b/modules/transform.xq index 971632b9..931c048b 100644 --- a/modules/transform.xq +++ b/modules/transform.xq @@ -1,16 +1,14 @@ xquery version "3.1"; declare namespace exist="http://exist.sourceforge.net/NS/exist"; +declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization"; import module namespace transform = "http://exist-db.org/xquery/transform"; - import module namespace config="https://github.com/edirom/mermeid/config" at "config.xqm"; - import module namespace console="http://exist-db.org/xquery/console"; -declare option exist:serialize "method=xml media-type=application/xml"; - let $inputDoc := (doc(request:get-attribute('transform.doc')), request:get-data())[1] +let $footer := config:get-property('footer') => config:replace-properties() => serialize(xml) return transform:transform($inputDoc, doc(request:get-attribute('transform.stylesheet')), @@ -18,4 +16,5 @@ return transform:transform($inputDoc, doc(request:get-attribute('transform.style + , , "method=xml media-type=application/xml") \ No newline at end of file diff --git a/properties.xml b/properties.xml index 72b82749..f3936600 100644 --- a/properties.xml +++ b/properties.xml @@ -34,6 +34,12 @@ Avatars of contributors to MerMEId in GitHub +
+ +
diff --git a/resources/css/footer.css b/resources/css/footer.css new file mode 100644 index 00000000..43d45c44 --- /dev/null +++ b/resources/css/footer.css @@ -0,0 +1,48 @@ +/* + * Dedicated CSS file for styling of footer + * to be used both in list view and forms + */ +div.footer, p.footer { + margin: 0 -20px 20px -20px; + padding: 10px 20px; +} + +.footer, .footer a:link, .footer a:visited, .footer a:active { + color: #ccc; +} + +div.footer .version { + margin-top: 12px; + float:right; +} + +div.footer div.dev{ + margin-top: 10px; +} + +div.footer img{ + vertical-align: middle; + margin-left: 10px; +} + +div.footer #dcm-logo{ + height:30px; +} + +div.footer #github-contributors{ + height: 23px; +} + +.footer .nav { + text-align:center; +} + +.footer .nav ul { + padding:0; +} + +.footer .nav li { + list-style-type:none; + margin: 0 2em; + display:inline; +} diff --git a/resources/css/list_style.css b/resources/css/list_style.css index 35d86be3..9e164671 100755 --- a/resources/css/list_style.css +++ b/resources/css/list_style.css @@ -1,3 +1,7 @@ +/* + * Main CSS file used in various places + */ +@import url(footer.css); body { font-size: .8em; font-family: arial, helvetica, sans-serif; @@ -31,38 +35,6 @@ div.nav_bar { border: none; } -div.footer, p.footer { - margin: 0 -20px 20px -20px; - padding: 10px 20px; -} - -.footer, .footer a:link, .footer a:visited, .footer a:active { - color: #ccc; -} - -div.footer .version { - margin-top: 12px; - float:right; -} - -div.footer div.dev{ - margin-top: 10px; -} - -div.footer img{ - vertical-align: middle; - margin-left: 10px; -} - -div.footer #dcm-logo{ - height:30px; -} - -div.footer #github-contributors{ - height: 23px; -} - - h2 { margin-bottom: 0; } diff --git a/testing/src/test/java/mermeid/Common.java b/testing/src/test/java/mermeid/Common.java index 9c9609ff..f045d54d 100644 --- a/testing/src/test/java/mermeid/Common.java +++ b/testing/src/test/java/mermeid/Common.java @@ -32,7 +32,7 @@ public static void enterLogin(){ String loginText = ""; String loginUser = "mermeid"; String loginPass = "mermeid"; - driver.get("http://localhost:8080/modules/list_files.xq"); + driver.get("http://localhost:8080/index.html"); WebDriverWait wait = new WebDriverWait(driver, Duration.ofSeconds(10)); try { diff --git a/testing/src/test/java/mermeid/EditorTest.java b/testing/src/test/java/mermeid/EditorTest.java index daea3242..b57522fa 100644 --- a/testing/src/test/java/mermeid/EditorTest.java +++ b/testing/src/test/java/mermeid/EditorTest.java @@ -33,14 +33,8 @@ public void OpenEditPage(){ String title = driver.getTitle(); System.out.println("Title: " + title); - assertTrue(title.equals("MerMEId – Metadata Editor and Repository for MEI Data")); + assertTrue(title.equals("All documents")); - WebElement button = driver.findElement(By.cssSelector("button")); - String buttonText = button.getText(); - System.out.print("Function `OpenEditPage` log: "); - System.out.println(buttonText); - - assertTrue(buttonText.equals("Try MerMEId")); Common.enterLogin(); WebElement editButton = driver.findElement(By.xpath("//form[@action='http://localhost:8080/forms/edit-work-case.xml'][input/@value='incipit_demo.xml']/button"));