Set up assets links and base service path for subdomain usage

hbz · Sep 10, 2024 · a02f4c6 · a02f4c6
1 parent f6d7afc
commit a02f4c6
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/app/views/gnd.scala.html b/app/views/gnd.scala.html
@@ -7,16 +7,16 @@
 <html lang="de">
     <head>
         <title>@title</title>
-        <link rel="stylesheet" media="all" href="@controllers.routes.Assets.versioned("stylesheets/bootstrap.min.css")">
-        <link rel="stylesheet" media="all" href="@controllers.routes.Assets.versioned("stylesheets/octicons.css")">
-        <link rel="stylesheet" media="all" href="@controllers.routes.Assets.versioned("stylesheets/jquery-ui.min.css")">
-        <link rel="stylesheet" media="all" href='@controllers.routes.Assets.versioned("stylesheets/font-awesome.min.css")'>
-        <link rel="stylesheet" media="all" href="@controllers.routes.Assets.versioned("stylesheets/main.css")">
-        <link rel="shortcut icon" type="image/png" href="@controllers.routes.Assets.versioned("images/gnd.png")">
-        <script src="@controllers.routes.Assets.versioned("javascripts/jquery-1.10.2.min.js")"></script>
-        <script src="@controllers.routes.Assets.versioned("javascripts/jquery-ui.min.js")"></script>
-        <script src="@controllers.routes.Assets.versioned("javascripts/bootstrap.min.js")"></script>
-         <script src="@controllers.routes.Assets.versioned("javascripts/main.js")"></script>
+        <link rel="stylesheet" media="all" href="../assets/stylesheets/bootstrap.min.css">
+        <link rel="stylesheet" media="all" href="../assets/stylesheets/octicons.css">
+        <link rel="stylesheet" media="all" href="../assets/stylesheets/jquery-ui.min.css">
+        <link rel="stylesheet" media="all" href="../assets/stylesheets/font-awesome.min.css">
+        <link rel="stylesheet" media="all" href="../assets/stylesheets/main.css">
+        <link rel="shortcut icon" type="image/png" href="../assets/images/gnd.png">
+        <script src="../assets/javascripts/jquery-1.10.2.min.js"></script>
+        <script src="../assets/javascripts/jquery-ui.min.js"></script>
+        <script src="../assets/javascripts/bootstrap.min.js"></script>
+         <script src="../assets/javascripts/main.js"></script>
         <meta name="viewport" content="width=device-width, initial-scale=1">
         <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE10">
     </head>
@@ -61,7 +61,7 @@
             <div class="panel panel-default footer-gnd">
               <div class="panel-body">
                 <span class="pull-left">
-                    <img id='small-logo' src='@controllers.routes.Assets.versioned("images/gnd.png")' alt="GND-Logo"/> &nbsp;
+                    <img id='small-logo' src='../assets/images/gnd.png' alt="GND-Logo"/> &nbsp;
                     GND Reconciliation | ein Dienst im <a href='https://gnd.network'>gnd.network</a>
                 </span>
                 <span class="pull-right">

diff --git a/app/views/reconcile.scala.html b/app/views/reconcile.scala.html
@@ -8,8 +8,8 @@
 
 @gnd("GND Reconciliation") {
   <div class='pull-right'>
-    <img src='@controllers.routes.Assets.versioned("images/gnd.png")' height='85px'/>
-    <img src='@controllers.routes.Assets.versioned("images/refine.png")' height='100px'/>
+    <img src='../assets/images/gnd.png' height='85px'/>
+    <img src='../assets/images/refine.png' height='100px'/>
   </div>
 
   <h1>GND Reconciliation</h1>
@@ -18,7 +18,7 @@ <h1>GND Reconciliation</h1>
 
   <p>Dieser Dienst ermöglicht den Abgleich eigener Daten mit der Gemeinsamen Normdatei, insbesondere mit OpenRefine, einem nicht nur im Bibliotheksbereich weitverbreiteten Werkzeug. OpenRefine bietet zahlreiche Funktionalitäten zur Bereinigung und Transformation von Daten, sowie zum Abgleich (Reconciliation) mit externen Datenquellen und zur Anreicherung auf Basis der abgeglichenen Daten. Dieser Dienst stellt die GND als eine solche Datenquelle in OpenRefine bereit. Der Dienst kann zugleich auch in anderen Anwendungen verwendet werden, z. B. im Bibliotheksmanagementsystem Alma über Alma Refine (s. <a href="https://reconciliation-api.github.io/census/clients/">weitere Clients</a>).</p>
 
-  <p>Service-URL: <code>@controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code></p>
+  <p>Service-URL: <code>@controllers.HomeController.config("host")</code></p>
 
   <h2>Daten und Werkzeuge</h2>
 
@@ -48,11 +48,11 @@ <h2>API</h2>
   <h3>Allgemeine API <small>(<a href="https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410">spec</a>)</small></h3>
 
   <p><b>Service</b><br/>
-  <code>curl @controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code>
+  <code>curl @controllers.HomeController.config("host")</code>
   <p><b>JSONP-callback</b><br/>
-  <code>curl @controllers.HomeController.config("host")@routes.Reconcile.main("jsonp")</code>
+  <code>curl @controllers.HomeController.config("host")?callback=jsonp</code>
   <p><b>CORS-header</b><br/>
-  <code>curl --head @controllers.HomeController.config("host")@routes.Reconcile.reconcile() | grep Access-Control-Allow-Origin</code>
+  <code>curl --head @controllers.HomeController.config("host") | grep Access-Control-Allow-Origin</code>
   </p>
 
   <h3>View-API</h3>
@@ -62,9 +62,10 @@ <h3>View-API</h3>
 
   <h3>Query-API <small>(<a href="https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410/#reconciliation-queries">spec</a>)</small></h3>
 
-  @desc("Query: GET", routes.Reconcile.main(queries="{\"q1\":{\"query\":\"Twain, Mark\"}}"))
+  <p><b>Query: GET</b><br/>
+  <a href='@controllers.HomeController.config("host")/?queries={"q1":{"query":"Twain, Mark"}}'>/?queries={"q1":{"query":"Twain, Mark"}}</a>
   <p><b>Query: POST</b><br/>
-  <code>curl --data 'queries={"q1":{"query":"Twain, Mark"}}' @controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code></p>
+  <code>curl --data 'queries={"q1":{"query":"Twain, Mark"}}' @controllers.HomeController.config("host")</code></p>
 
   <h3>Suggest-API <small>(<a href="https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410/#suggest-services">spec</a>)</small></h3>
 
@@ -78,8 +79,9 @@ <h3>Suggest-API <small>(<a href="https://www.w3.org/community/reports/reconcilia
   <h3>Data-extension-API</h3>
 
   @desc("Property-proposals (<a href=\"https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410/#data-extension-property-proposals\">spec</a>)", routes.Reconcile.properties("","Work",""))
-  @desc("Extend: GET (<a href=\"https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410/#data-extension-service\">spec</a>)", routes.Reconcile.main(extend="{\"ids\":[\"1081942517\",\"4791358-7\"],\"properties\":[{\"id\":\"preferredName\"},{\"id\":\"firstAuthor\"}]}"))
+  <p><b>Query: GET (<a href=\"https://www.w3.org/community/reports/reconciliation/CG-FINAL-specs-0.2-20230410/#data-extension-service\">spec</a>)</b><br/>
+  <a href='@controllers.HomeController.config("host")/?extend={"ids":["1081942517","4791358-7"],"properties":[{"id":"preferredName"},{"id":"firstAuthor"}]}'>/?extend={"ids":["1081942517","4791358-7"],"properties":[{"id":"preferredName"},{"id":"firstAuthor"}]}</a>
   <p><b>Extend: POST</b><br/>
-  <code>curl --data 'extend={"ids":["1081942517","4791358-7"],"properties":[{"id":"preferredName"},{"id":"firstAuthor"}]}' @controllers.HomeController.config("host")@routes.Reconcile.reconcile()</code></p>
+  <code>curl --data 'extend={"ids":["1081942517","4791358-7"],"properties":[{"id":"preferredName"},{"id":"firstAuthor"}]}' @controllers.HomeController.config("host")</code></p>
 
 }
diff --git a/conf/application.conf b/conf/application.conf
@@ -1,7 +1,7 @@
 # This is the main configuration file for the application.
 # https://www.playframework.com/documentation/latest/ConfigFile
 
-host : "https://lobid.org"
+host : "https://reconcile.lobid.org"
 
 dontShowOnMainPage: ["1012979-0"]