Merge pull request #51 from hbz/ui

UI changes for different issues
hbz · Oct 20, 2023 · 2de253b · 2de253b
2 parents cf84435 + 7400f1a
commit 2de253b
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/app/views/main.scala.html b/app/views/main.scala.html
@@ -42,19 +42,21 @@
                       <li @if(title=="RPB - Ergebnisliste"){class="active"}>
                         <a href="@nwbib.routes.Application.search()">Suche</a>
                       </li>
+                      <li @if(title=="NWBib - Erweiterte Suche"){class="active"}>
+                        <a href="@nwbib.routes.Application.advanced()">Erweiterte Suche</a>
+                      </li>
+                      @*
                       <li @if(title=="NWBib - Themensuche"){class="active"}>
                         <a href="@nwbib.routes.Application.topics()">Themensuche</a>
                       </li>
+                      *@
                       <li @if(title.contains("Raumsystematik")){class="active"}>
                         <a href="@nwbib.routes.Application.spatial()">Regionen</a>
                       </li>
                       <li @if(title.contains("Sachsystematik")){class="active"}>
                         <a href="@nwbib.routes.Application.subjects()">Sachgebiete</a>
                       </li>
                       @*
-                      <li @if(title=="NWBib - Erweiterte Suche"){class="active"}>
-                        <a href="@nwbib.routes.Application.advanced()">Erweiterte Suche</a>
-                      </li>
                       <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown">Ergänzende Suche<b class="caret"></b></a>
                         <ul class="dropdown-menu">

diff --git a/app/views/tags/facets.scala.html b/app/views/tags/facets.scala.html
@@ -132,11 +132,11 @@
   <div id="issued-div"> <a id="issued-link" style="display:none" href="@nwbib.routes.Application.search(q,person,name,subject,id,publisher,issued,medium,nwbibspatial,nwbibsubject,from,size,owner,t,sortParam,location=location,word=word,corporation=corporation,raw=raw)">Anwenden</a> </div>
   </div>
   <br/>
-  <div class="row facet"><div class="col-md-12">@facets("Publikationstypen", Application.TYPE_FIELD, t, "dropup")</div></div>
-  <div class="row facet"><div class="col-md-12">@facets("Medientypen", Application.MEDIUM_FIELD, medium, "dropup")</div></div>
+  <div class="row facet"><div class="col-md-12">@facets("Regionen", Application.NWBIB_SPATIAL_FIELD, nwbibspatial)</div></div>
   <div class="row facet"><div class="col-md-12">@facets("Sachgebiete", Application.RPB_SUBJECT_FIELD, nwbibsubject)</div></div>
   <div class="row facet"><div class="col-md-12">@facets("Schlagwörter", Application.SUBJECT_FIELD, if(!urisOnly(subject).isEmpty) urisOnly(subject) else "", "dropup")</div></div>
-  <div class="row facet"><div class="col-md-12">@facets("Regionen", Application.NWBIB_SPATIAL_FIELD, nwbibspatial)</div></div>
+  <div class="row facet"><div class="col-md-12">@facets("Publikationstypen", Application.TYPE_FIELD, t, "dropup")</div></div>
+  <div class="row facet"><div class="col-md-12">@facets("Medientypen", Application.MEDIUM_FIELD, medium, "dropup")</div></div>
   @*
   <p/>
   <div id="coverage"><p class="h5">@facetToggle("coverage-map"){Raumbezug} @facetLabel(location, locationLabel(location.split("\\|")(0)))</p>

diff --git a/conf/nwbib.conf b/conf/nwbib.conf
@@ -1,5 +1,5 @@
-nwbib.api="http://staging.lobid.org/resources/search"
-indexUrlFormat="http://staging.lobid.org/resources/search?q=rpbId:%s&format=json"
+nwbib.api="http://quaoar1:1990/resources/search"
+indexUrlFormat="http://quaoar1:1990/resources/search?q=rpbId:%s&format=json"
 item.api="http://lobid.org/items"
 hbz01.api="http://lobid.org/hbz01"
 orgs.api="http://lobid.org/organisations"