Remove Voyant 1 button

Take some tool config values out of browse controller Remove BMBF logo from images Add 2020 in footer

Remove Voyant 1 button
Take some tool config values out of browse controller Remove BMBF logo from images Add 2020 in footer
66210d3b · Stefan Funk · Ubbo Veentjer · 7c03cac8 · 66210d3b · 66210d3b
Commit 66210d3b authored Feb 20, 2020 by Stefan Funk 🐧 Committed by Ubbo Veentjer Feb 20, 2020
--- a/src/main/java/info/textgrid/rep/browse/BrowseController.java
+++ b/src/main/java/info/textgrid/rep/browse/BrowseController.java
@@ -166,6 +166,8 @@ public class BrowseController {

      }

+/*
+      // Switchboard TEST
      try {
        String xml4switchboard = URLEncoder.encode(tgrepConfig.getTextgridHost() + "/1.0/tgcrud-public/rest/" + id + "/data", "UTF-8");
        //tools.add(new ViewMode("Switchboard XML", "https://switchboard.clarin-dev.eu/#/textgridrep/"+xml4switchboard+"/text%2Fxml", false));
@@ -182,31 +184,31 @@ public class BrowseController {
        // TODO Auto-generated catch block
        e.printStackTrace();
      }
+*/

-      tools.add(new ViewMode("Voyant v1", "#", false, "digivoy-button"));
-      tools.add(new ViewMode("Voyant v2", "#", false, "digivoy2-button"));
-
-      // tools.add(new ViewMode("DigiVoy Extended", "/digivoy_conf/-/digivoy_conf/"+id, false));
+      // Voyant
+      tools.add(new ViewMode("Voyant", tgrepConfig.getToolVoyantHost() + "/?input=" + tgrepConfig.getTextgridHost() + "/1.0/tgcrud-public/rest/" + id + "/data", false, "digivoy-button"));

+      // Mirador
      if (hasIiifManifest(metadata.getObject().getGeneric().getGenerated().getProject().getId())) {
-        tools.add(new ViewMode("Mirador",
-            tgrepConfig.getTextgridHost() + "/1.0/iiif/mirador/?uri=" + id, false));
+        tools.add(new ViewMode("Mirador", tgrepConfig.getToolMiradorHost() + "/?uri=" + id, false));
        tools.add(new ViewMode(
            "<img style='margin-top:2px; height: 21px;' title='Drop icon on Mirador to open manifest' src='https://textgridlab.org/1.0/iiif/manifests/img/iiif-logo.svg'>",
-            tgrepConfig.getTextgridHost() + "/1.0/iiif/manifests/" + id + "/manifest.json", false));
+            tgrepConfig.getTextgridHost() + "/1.0/iiif/manifests/" + id + "/manifest.json", false
+        ));
      }
-      tools.add(new ViewMode("Annotate",
-          "https://annotation.de.dariah.eu/AnnotationViewer/data.html?uri=" + id, false,
-          "annotation-button"));

+      // Annotate
+      tools.add(new ViewMode("Annotate", tgrepConfig.getToolAnnotateHost() + "/data.html?uri=" + id, false, "annotation-button"));

      model.addAttribute("tools", tools);
+    }

-    } else if (format.contains("image")) {
+    // Digilib
+    else if (format.contains("image")) {
      model.addAttribute("image", true);
      List<ViewMode> tools = new ArrayList<ViewMode>();
-      tools.add(new ViewMode("Digilib",
-          tgrepConfig.getTextgridHost() + "/1.0/tgrep/digilib/digilib.html?fn=" + id, false));
+      tools.add(new ViewMode("Digilib", tgrepConfig.getToolDigilibHost() + "/digilib.html?fn=" + id, false));
      model.addAttribute("tools", tools);
    }

@@ -217,6 +219,7 @@ public class BrowseController {
     * if(Utils.userWantsAnnotation(userId)) { model.addAttribute("annotationEnabled", true);
     * model.addAttribute("annotationToken", this.generateToken(prefs, eppn, userName)); }
     */
+
    return "browse";
  }


--- a/src/main/java/info/textgrid/rep/service/tgsearch/TgrepConfigurationService.java
+++ b/src/main/java/info/textgrid/rep/service/tgsearch/TgrepConfigurationService.java
@@ -9,20 +9,57 @@ public class TgrepConfigurationService {

  @Value("${textgrid.host}")
  private String textgridHost;
+  @Value("${tool.voyant.host}")
+  private String toolVoyantHost;
+  @Value("${tool.annotate.host}")
+  private String toolAnnotateHost;
+  @Value("${tool.mirador.host}")
+  private String toolMiradorHost;
+  @Value("${tool.digilib.host}")
+  private String toolDigilibHost;

  public String getTextgridHost() {
    return textgridHost;
  }
-
  public void setTextgridHost(String textgridHost) {
    this.textgridHost = textgridHost;
  }

-  @PostConstruct
-  public void postConstruct() {
+  public String getToolVoyantHost() {
+    return toolVoyantHost;
+  }
+  public void setToolVoyantHost(String toolVoyantHost) {
+    this.toolVoyantHost = toolVoyantHost;
+  }

-    System.out.println("--------tghost: "+textgridHost);
+  public String getToolAnnotateHost() {
+    return toolAnnotateHost;
+  }
+  public void setToolAnnotateHost(String toolAnnotateHost) {
+    this.toolAnnotateHost = toolAnnotateHost;
+  }

+  public String getToolMiradorHost() {
+    return toolMiradorHost;
+  }
+  public void setToolMiradorHost(String toolMiradorHost) {
+    this.toolMiradorHost = toolMiradorHost;
+  }
+
+  public String getToolDigilibHost() {
+    return toolDigilibHost;
+  }
+  public void setToolDigilibHost(String toolDigilibHost) {
+    this.toolDigilibHost = toolDigilibHost;
+  }
+
+  @PostConstruct
+  public void postConstruct() {
+    System.out.println("--------textgrid host: " + textgridHost);
+    System.out.println("--------voyant host: " + toolVoyantHost);
+    System.out.println("--------annotate host: " + toolAnnotateHost);
+    System.out.println("--------mirador host: " + toolMiradorHost);
+    System.out.println("--------digilib host: " + toolDigilibHost);
  }

 }
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
 # spring specific
-
 spring.mvc.view.prefix: /WEB-INF/jsp/
 spring.mvc.view.suffix: .jsp

 # textgrid defaults
-textgrid.host: http://dev.textgridlab.org
+textgrid.host: https://textgridlab.org

+# tool defaults
+tool.voyant.host: https://voyant-tools.org
+tool.annotate.host: https://annotation.de.dariah.eu/AnnotationViewer
+tool.mirador.host: https://textgridlab.org/1.0/iiif/mirador
+tool.digilib.host: https://textgridlab.org/1.0/tgrep/digilib
--- a/src/main/resources/static/images/bmbf-logo.svg
+++ b/src/main/resources/static/images/bmbf-logo.svg
-<svg xmlns="http://www.w3.org/2000/svg" width="124.214" height="86.378" viewBox="0 0 124.214 86.378"><path d="M42.98 56.473c0 .94-.618 1.31-1.11 1.31-.65 0-.964-.46-.964-1.142v-3.92h-.918v4.313c0 .963.537 1.456 1.523 1.456.594 0 1.132-.28 1.435-.796h.034v.683h.973c-.034-.393-.056-.784-.056-1.176v-4.48h-.918v3.753zM49.542 58.376v-3.92c0-1.12-.303-1.848-1.512-1.848-.73 0-1.154.2-1.512.84h-.044v-.728H45.5c.033.393.054.783.054 1.177v4.48h.92v-3.35c0-.773.145-1.67 1.153-1.67.784 0 .997.494.997 1.1v3.92h.918zM54.055 55.318c0 1.142 0 2.42-1.03 2.42-1.153 0-1.153-1.233-1.153-2.084 0-1.512.135-2.296 1.12-2.296 1.018 0 1.063 1.21 1.063 1.96zm0-2.028h-.033c-.314-.446-.706-.682-1.243-.682-1.827 0-1.872 1.623-1.872 3.035 0 2.486.918 2.845 1.826 2.845.593 0 .985-.258 1.298-.785h.022v.673h.918V50.29h-.918v3zM59.868 58.376V54.68h2.822v-.897h-2.822v-2.598h2.978v-.895h-4.01v8.086h1.032M65.667 57.738c-.953 0-1.188-.66-1.188-2.5 0-1.545.48-1.88 1.187-1.88.705 0 1.187.335 1.187 1.88 0 1.84-.235 2.5-1.187 2.5zm0 .75c1.198 0 2.15-.358 2.15-2.856 0-1.658-.19-3.023-2.15-3.023s-2.15 1.364-2.15 3.022c0 2.498.95 2.856 2.15 2.856zM70.17 52.72h-.92v5.656h.92V55.04c0-.764.257-1.537 1.274-1.537.168 0 .326.035.494.058v-.95c-.896 0-1.365.1-1.746.962h-.023v-.852zM76.525 56.763c0-1.724-2.824-1.702-2.824-2.7 0-.49.384-.76.876-.76.582 0 .896.313.885.906h1.02c.08-1.12-.782-1.602-1.79-1.602-1.592 0-1.95.952-1.95 1.545 0 1.69 2.823 1.714 2.823 2.722 0 .583-.426.863-.977.863-.928 0-.94-.763-.94-1.087h-1.04c-.035 1.3.73 1.838 1.95 1.838 1.117 0 1.97-.48 1.97-1.725zM81.595 54.533c.057-1.266-.605-1.925-1.736-1.925-1.96 0-2.15 1.365-2.15 3.023 0 2.5.952 2.857 2.15 2.857.628 0 1.815-.403 1.78-1.994h-.963c.033 1.02-.605 1.244-.818 1.244-.952 0-1.187-.66-1.187-2.5 0-1.545.48-1.88 1.186-1.88.347 0 .806.247.784 1.175h.95zM87.105 58.376v-4.01c0-1.276-.537-1.758-1.5-1.758-.738 0-1.164.18-1.533.84h-.045V50.29h-.918v8.086h.917V55.05c0-.952.234-1.69 1.152-1.69.784 0 1.007.492 1.007 1.187v3.83h.918zM91.744 56.473c0 .94-.615 1.31-1.11 1.31-.65 0-.962-.46-.962-1.142v-3.92h-.918v4.313c0 .963.537 1.456 1.523 1.456.594 0 1.13-.28 1.434-.796h.034v.683h.975c-.036-.393-.058-.784-.058-1.176v-4.48h-.918v3.753zM98.306 58.376v-3.92c0-1.12-.303-1.848-1.512-1.848-.727 0-1.152.2-1.512.84h-.045v-.728h-.973c.03.393.055.783.055 1.177v4.48h.917v-3.35c0-.773.146-1.67 1.154-1.67.784 0 .997.494.997 1.1v3.92h.92zM102.843 55.52c0 .785.033 2.095-1.074 2.095-.685 0-1.1-.425-1.1-2.24 0-.75.034-2.004 1.075-2.004 1.153 0 1.098 1.31 1.098 2.15zm-.02-2.106h-.024c-.26-.548-.728-.806-1.32-.806-.46 0-1.77.167-1.77 2.767 0 1.68.3 3 1.835 3 .492 0 1.008-.257 1.242-.704h.035v1.177c0 .582-.348.975-.986.975-.504 0-.852-.29-.86-.818h-1.032c-.078 1.042.773 1.512 1.713 1.512 1.242 0 2.084-.302 2.084-1.567v-6.23h-.917v.694zM39.585 40.72v.694h.873v4.962h.92v-4.962h1.142v-.694h-1.143v-.963c0-.46.167-.874 1.143-.808v-.66c-.135-.023-.248-.034-.438-.034-.817 0-1.624.224-1.624 1.367v1.097h-.873zM44.935 38.604h-1.053v1.164h1.053v-1.164zm1.972 0h-1.054v1.164h1.054v-1.164zm-.482 5.87c0 .94-.616 1.31-1.11 1.31-.647 0-.96-.46-.96-1.143v-3.92h-.92v4.313c0 .963.538 1.456 1.523 1.456.593 0 1.13-.28 1.434-.796h.034v.683h.974c-.033-.393-.055-.784-.055-1.176v-4.48h-.92v3.753zM49.953 40.72h-.918v5.656h.918V43.04c0-.764.258-1.537 1.278-1.537.17 0 .324.035.493.058v-.95c-.896 0-1.367.1-1.748.962h-.022v-.852zM55.546 42.59h1.098c1.053 0 1.847.224 1.847 1.513 0 .593-.39 1.378-1.488 1.378h-1.456v-2.89zm0-3.405h1.456c.863 0 1.243.55 1.243 1.22 0 .786-.392 1.28-1.198 1.29h-1.5v-2.51zm1.568 7.19c.917 0 2.43-.2 2.43-2.272 0-1.108-.504-1.804-1.657-1.938v-.055c1.042-.235 1.388-.908 1.388-1.917 0-.155-.045-.637-.325-1.075-.302-.447-.683-.827-1.803-.827h-2.63v8.087h2.597zM61.936 40.72h-.918v5.656h.918V40.72zm-.975-1.446h1.032v-.984h-1.03v.984zM64.533 38.29h-.918v8.086h.918V38.29M69.113 43.318c0 1.142 0 2.42-1.03 2.42-1.155 0-1.155-1.233-1.155-2.084 0-1.512.135-2.296 1.12-2.296 1.02 0 1.065 1.21 1.065 1.96zm0-2.028h-.035c-.313-.446-.704-.682-1.242-.682-1.825 0-1.87 1.623-1.87 3.035 0 2.486.918 2.845 1.825 2.845.595 0 .986-.258 1.302-.785h.02v.673h.92V38.29h-.92v3zM74.748 44.473c0 .94-.617 1.31-1.11 1.31-.65 0-.962-.46-.962-1.142v-3.92h-.92v4.313c0 .963.537 1.456 1.523 1.456.593 0 1.132-.28 1.433-.796h.035v.683h.973c-.032-.393-.056-.784-.056-1.176v-4.48h-.916v3.753zM81.31 46.376v-3.92c0-1.12-.303-1.848-1.512-1.848-.73 0-1.154.2-1.512.84h-.046v-.728h-.973c.033.393.057.783.057 1.177v4.48h.916v-3.35c0-.773.146-1.67 1.154-1.67.785 0 .998.494.998 1.1v3.92h.918zM85.847 43.52c0 .785.033 2.095-1.076 2.095-.683 0-1.097-.425-1.097-2.24 0-.75.033-2.004 1.076-2.004 1.152 0 1.097 1.31 1.097 2.15zm-.023-2.106h-.02c-.26-.548-.73-.806-1.323-.806-.458 0-1.77.167-1.77 2.767 0 1.68.304 3 1.837 3 .492 0 1.008-.257 1.244-.704h.034v1.176c0 .583-.348.976-.984.976-.506 0-.854-.292-.863-.818h-1.03c-.08 1.04.772 1.512 1.714 1.512 1.243 0 2.083-.302 2.083-1.567v-6.23h-.918v.694zM41.053 30.59h1.098c1.054 0 1.85.224 1.85 1.513 0 .593-.393 1.378-1.49 1.378h-1.457v-2.89zm0-3.405h1.457c.86 0 1.243.55 1.243 1.22 0 .786-.393 1.28-1.2 1.29h-1.5v-2.51zm1.567 7.19c.92 0 2.43-.2 2.43-2.272 0-1.108-.502-1.804-1.657-1.938v-.055c1.042-.235 1.39-.908 1.39-1.917 0-.155-.045-.637-.325-1.075-.302-.447-.683-.827-1.803-.827h-2.633v8.087h2.598zM49.382 32.473c0 .94-.617 1.31-1.11 1.31-.648 0-.963-.46-.963-1.142v-3.92h-.918v4.313c0 .963.537 1.456 1.522 1.456.593 0 1.13-.28 1.433-.796h.035v.683h.973c-.033-.393-.055-.784-.055-1.176v-4.48h-.917v3.753zM55.945 34.376v-3.92c0-1.12-.303-1.848-1.513-1.848-.728 0-1.153.2-1.51.84h-.046v-.728h-.974c.034.393.057.783.057 1.177v4.48h.916v-3.35c0-.773.146-1.67 1.154-1.67.784 0 .997.494.997 1.1v3.92h.918zM60.458 31.318c0 1.142 0 2.42-1.03 2.42-1.153 0-1.153-1.233-1.153-2.084 0-1.512.134-2.296 1.12-2.296 1.018 0 1.063 1.21 1.063 1.96zm0-2.028h-.033c-.313-.446-.706-.682-1.243-.682-1.826 0-1.87 1.623-1.87 3.035 0 2.486.917 2.845 1.825 2.845.593 0 .985-.258 1.298-.785h.022v.673h.92V26.29h-.92v3zM63.75 31.15c.012-1.567.494-1.848 1.077-1.848.67 0 1.13.2 1.13 1.848h-2.206zm3.183.695v-.48c0-1.87-.404-2.756-2.016-2.756-1.96 0-2.15 1.364-2.15 3.022 0 2.498.95 2.856 2.15 2.856 1.187 0 1.96-.57 1.97-1.825H65.88c-.034.57-.36 1.075-.985 1.075-.717 0-1.143-.314-1.143-1.894h3.18zM71.996 32.763c0-1.724-2.822-1.702-2.822-2.7 0-.49.38-.76.873-.76.582 0 .896.313.885.906h1.02c.078-1.12-.785-1.602-1.793-1.602-1.59 0-1.95.952-1.95 1.545 0 1.69 2.824 1.714 2.824 2.722 0 .583-.426.863-.975.863-.93 0-.942-.763-.942-1.087h-1.042c-.034 1.3.727 1.838 1.95 1.838 1.118 0 1.97-.482 1.97-1.725zM77.123 34.376v-3.808c0-.213.043-.773.314-.997.244-.2.346-.212.693-.212.74 0 .896.526.896 1.098v3.92h.918v-4.3c0-1.334-.953-1.468-1.545-1.468-.517 0-1.032.122-1.345.728-.215-.515-.81-.728-1.322-.728-.66 0-1.143.213-1.41.817H74.3v-.705h-.975c.033.393.057.783.057 1.177v4.48h.918v-3.81c0-.212.045-.55.213-.83.135-.212.516-.38.795-.38.74 0 .895.527.895 1.1v3.92h.92zM82.486 28.72h-.918v5.656h.918V28.72zm-.975-1.446h1.032v-.984h-1.03v.984zM88.14 34.376v-3.92c0-1.12-.3-1.848-1.512-1.848-.73 0-1.152.2-1.512.84h-.045v-.728h-.974c.033.393.055.783.055 1.177v4.48h.92v-3.35c0-.773.147-1.67 1.155-1.67.783 0 .996.494.996 1.1v3.92h.92zM90.683 28.72h-.918v5.656h.918V28.72zm-.975-1.446h1.03v-.984h-1.03v.984zM95.902 32.763c0-1.724-2.824-1.702-2.824-2.7 0-.49.38-.76.873-.76.585 0 .9.313.886.906h1.02c.08-1.12-.784-1.602-1.792-1.602-1.59 0-1.95.952-1.95 1.545 0 1.69 2.825 1.714 2.825 2.722 0 .583-.43.863-.976.863-.932 0-.94-.763-.94-1.087H91.98c-.03 1.3.73 1.838 1.95 1.838 1.118 0 1.972-.482 1.972-1.725zM96.515 28.72v.694h.928v4.02c0 .65.393 1.01 1.266 1.01.302 0 .604-.068.907-.092v-.704c-.2.022-.348.045-.414.045-.84 0-.84-.46-.84-.818v-3.46h1.23v-.695h-1.23v-1.5l-.92.413v1.087h-.928zM101.35 31.15c.01-1.567.49-1.848 1.075-1.848.672 0 1.13.2 1.13 1.848h-2.206zm3.18.695v-.48c0-1.87-.4-2.756-2.015-2.756-1.96 0-2.15 1.364-2.15 3.022 0 2.498.95 2.856 2.15 2.856 1.186 0 1.96-.57 1.97-1.825h-1.007c-.035.57-.357 1.075-.984 1.075-.72 0-1.145-.314-1.145-1.894h3.18zM106.804 28.72h-.918v5.656h.918V31.04c0-.764.258-1.537 1.277-1.537.17 0 .325.035.493.058v-.95c-.896 0-1.365.1-1.746.962h-.023v-.852zM110.472 28.72h-.92v5.656h.92V28.72zm-.974-1.446h1.03v-.984h-1.03v.984zM115.083 32.473c0 .94-.613 1.31-1.107 1.31-.65 0-.963-.46-.963-1.142v-3.92h-.918v4.313c0 .963.537 1.456 1.523 1.456.594 0 1.13-.28 1.434-.796h.03v.683h.978c-.035-.393-.057-.784-.057-1.176v-4.48h-.92v3.753zM121.39 34.376v-3.808c0-.213.045-.773.314-.997.246-.2.346-.212.693-.212.74 0 .896.526.896 1.098v3.92h.92v-4.3c0-1.334-.953-1.468-1.547-1.468-.516 0-1.03.122-1.344.728-.213-.515-.807-.728-1.322-.728-.66 0-1.143.213-1.41.817h-.023v-.705h-.975c.035.393.057.783.057 1.177v4.48h.917v-3.81c0-.212.045-.55.213-.83.135-.212.516-.38.797-.38.736 0 .895.527.895 1.1v3.92h.918z"/><path fill="#F8D200" d="M29.393 66.377h3.543v20h-3.543v-20"/><path fill="#E30613" d="M29.393 46.307h3.543v20.07h-3.543v-20.07"/><path d="M29.393 26.377h3.543v20h-3.543v-20M9.16 46.38zm.002.01zm-.002 0zm0-.014zm9.18-16.617c0-1.14-.828-2.042-1.12-2.297l-.21.048c.31.38.858 1.014.858 1.854 0 1.652-1.747 3.09-3.74 3.115.015.17.014.32.014.447 0 .236-.015.468-.043.692 2.26-.042 4.24-1.88 4.24-3.86zm-3.118 13.68c-.966 0-1.175-.1-1.43-.1-.164 0-.32.015-.32.246 0 .16.182.396.345.52.227-.227.54-.275 1.042-.275.234 0 .555.047.697.065-.02.14-.048.32-.048.572 0 .133.004.288.004.452 0 .568-.083.87-.282 1.1.043.026.157.05.226.05.37 0 .464-.188.464-1.148 0-.29.023-.56.023-.628.517.395 1.043 1.098 1.043 1.606.168-.087.367-.342.367-.533 0-.347-.58-.862-1.193-1.484.085-.02.313-.086.5-.086.483 0 .874.08 1.1.348.09-.098.165-.392.165-.558 0-.29-.166-.28-.286-.28-.513 0-1.147.08-1.602.156-.165-.22-1.218-1.645-1.49-2.404-.08-.028-.14-.05-.27-.05-.253 0-.32.176-.384.418.58.704 1.14 1.47 1.328 2.013zM9.458 41.43c-.065-.242-.13-.42-.383-.42-.13 0-.19.023-.268.05-.275.76-1.327 2.185-1.493 2.405-.453-.075-1.09-.155-1.602-.155-.12 0-.287-.01-.287.28 0 .165.074.46.165.557.226-.268.617-.348 1.1-.348.187 0 .414.065.5.086-.615.622-1.194 1.138-1.194 1.484 0 .19.2.446.368.533 0-.51.527-1.212 1.042-1.606 0 .07.024.338.024.628 0 .96.095 1.148.464 1.148.067 0 .182-.023.226-.05-.2-.23-.283-.53-.283-1.1 0-.165.006-.32.006-.453 0-.253-.03-.433-.05-.572.142-.02.463-.064.7-.064.5 0 .813.05 1.04.275.164-.123.345-.357.345-.52 0-.23-.155-.246-.32-.246-.254 0-.462.1-1.43.1.193-.543.75-1.308 1.33-2.012zM5.486 29.363c0-.84.547-1.474.856-1.853l-.208-.048c-.293.255-1.12 1.156-1.12 2.296 0 1.994 2.007 3.846 4.29 3.86-.024-.216-.04-.445-.04-.692 0-.153.007-.305.02-.446-2.017 0-3.798-1.45-3.798-3.117zm6.134-1.536c.104-.24.244-.523.244-.836 0-.864-.717-1.276-1.677-1.276-.493 0-.742.16-.742.32s.163.51.226.62c.178-.08.5-.174.685-.174.658 0 1.15.74 1.265 1.347zm.472-1.106c.562.11.944-.606.41-.734.075.236-.284.403-.284.403s-.137-.317.04-.498c-.326-.16-.408.034-.415.235.128.172.21.372.25.594zm1.817 4.914c.09.006.174.01.264.01 1.58 0 3.147-1.02 3.147-2.33 0-.698-.313-1.187-.7-1.728-.23.038-.436.06-.6.06-.715 0-1.103-.384-1.13-.76 0-.34.275-.597.703-.597.665 0 1.876.62 3.097.62-.12.092-.32.188-.56.277.714.645 1.192 1.508 1.375 2.43l1.87 2.995c.315.5.98 1.482 1.98 2.25-1.21 0-2.013.028-3.036-1.59l-.96-1.534c-.07.198-.158.392-.26.58l1.907 3.054c.318.505.974 1.48 1.98 2.25-1.21 0-2.012.03-3.036-1.59l-1.64-2.627c-.124.13-.253.258-.39.38l2.317 3.708c.32.508.973 1.478 1.98 2.25-1.21 0-2.013.028-3.037-1.59l-2.257-3.614c-.15.094-.3.184-.458.27l2.755 4.41c.318.506.972 1.478 1.98 2.25-1.21 0-2.014.028-3.036-1.59l-2.838-4.543c-.168.065-.34.126-.512.182l3.208 5.133c.312.497.982 1.483 1.978 2.25-1.21 0-2.013.027-3.035-1.592l-3.418-5.47-.104.02c-.093.295-.157.57-.157.847 0 1.72 1.128 3.236 2.482 4.408-.087.037-.238.052-.378.052-.278 0-.46-.017-.587-.038.315.713.988 1.633 1.33 2.11.442-.08 1.087-.144 1.51-.144.44 0 .49.26.49.49 0 .4-.19.723-.406.9-.082-.207-.247-.48-1.063-.48l-.083.003c.24.266.987.87.987 1.356 0 .32-.353.804-.82.804.03-.104.025-.2.025-.27 0-.395-.35-.855-.643-1.177.006.096.003.085.003.197 0 .93-.083 1.358-.675 1.358-.29 0-.49-.16-.56-.206.384-.354.405-.633.405-1.154l-.003-.45c0-.12 0-.276.02-.392-.212-.03-.296-.028-.46-.028 0 0-.84-.066-1.04.37-.23-.208-.56-.503-.56-.83 0-.216.102-.46.534-.46.164 0 .68.103 1.11.103-.114-.257-.63-1.01-1.076-1.56-.068.212-.174.443-.41.63-.03-.353-.237-1.464-.788-2.113-.064.438-.15.89-.15 1.84 0 2.313.556 4.022 1.737 4.35-.153.27-.478.51-.815.51-.432 0-.667-.49-.908-.952-.125.342-.47 1.174-.816 1.174s-.69-.833-.815-1.175c-.24.462-.476.95-.91.95-.335 0-.66-.24-.813-.508 1.18-.327 1.737-2.036 1.737-4.35 0-.95-.086-1.4-.15-1.84-.55.65-.757 1.76-.79 2.113-.233-.187-.34-.418-.407-.63-.446.55-.96 1.303-1.078 1.56.433 0 .947-.1 1.11-.1.433 0 .535.242.535.457 0 .328-.332.623-.56.83-.202-.436-1.04-.37-1.04-.37-.164 0-.25 0-.46.03.018.114.02.27.02.39l-.007.453c0 .52.02.8.404 1.154-.068.047-.27.206-.56.206-.59 0-.675-.428-.675-1.358 0-.112-.004-.102.004-.197-.295.32-.643.782-.643 1.176 0 .072-.004.168.024.272-.465 0-.818-.482-.818-.804 0-.487.747-1.09.985-1.357l-.082-.002c-.816 0-.982.273-1.063.48-.218-.178-.406-.5-.406-.9 0-.23.05-.49.49-.49.423 0 1.067.063 1.51.143.34-.476 1.013-1.395 1.328-2.11-.126.022-.307.04-.586.04-.14 0-.292-.016-.377-.053 1.353-1.172 2.48-2.69 2.48-4.408 0-.276-.063-.553-.157-.85l-.103-.018-3.418 5.47c-1.022 1.62-1.825 1.592-3.035 1.592.996-.766 1.665-1.752 1.978-2.25l3.21-5.134c-.173-.056-.343-.116-.512-.182L5.19 39.88c-1.023 1.62-1.827 1.59-3.035 1.59 1.007-.77 1.66-1.743 1.978-2.25l2.756-4.41c-.16-.086-.31-.176-.46-.27l-2.257 3.613c-1.023 1.62-1.825 1.59-3.036 1.59 1.007-.77 1.662-1.74 1.98-2.25l2.315-3.706c-.136-.123-.266-.25-.388-.38l-1.642 2.627c-1.024 1.62-1.826 1.59-3.036 1.59 1.005-.77 1.662-1.746 1.98-2.25l1.906-3.054c-.1-.19-.19-.383-.26-.58l-.96 1.533C2.01 34.89 1.208 34.863 0 34.863c1-.768 1.664-1.75 1.98-2.25l1.87-2.994c.18-.924.66-1.787 1.374-2.432-.24-.09-.44-.186-.56-.276 1.22 0 2.43-.62 3.095-.62.43 0 .704.255.704.594-.026.377-.415.76-1.13.76-.163 0-.37-.02-.6-.06-.386.542-.7 1.03-.7 1.73 0 1.31 1.566 2.33 3.148 2.33.09 0 .174-.005.264-.01.313-1.062.98-1.758 1.512-2.44-.64-.23-1.35-.838-1.35-1.112.08-.047 1.304.338 1.43.372.027.007.053.01.083 0 .15-.045.273-.263.273-.285-.13-.02-.898-.12-1.423-.31-.398-.147-.6-.41-.6-.512.127-.02.613.234 1.326.234.263 0 .315-.01.577-.043-.184-.44-.53-.81-.918-.81-.157 0-.5.1-.785.24-.2-.308-.374-.715-.374-.937 0-.262.26-.57.992-.57.205 0 .396.02.574.052.142.026.262.06.39.11-.01-.02-.015-.058-.015-.094 0-.1.092-.207.436-.207.603 0 1.22.197 1.978.197.196 0 .33-.006.443-.054-.048.15-.26.373-.456.553.12.164.434.56.434 1.202 0 1.03-.68 1.88-.68 2.922.002.62.478 1.165.62 1.49z"/><g><path d="M42.434 2.674c0-.595-.245-.917-.896-.917-.203 0-.93.035-.93 1.092v1.707c0 1.106.32 1.386.93 1.386.462 0 .77-.126.903-.224V4.206h-.93v-.56h1.575v2.457c-.413.224-.896.378-1.547.378-1.07 0-1.59-.553-1.59-1.953V2.87c0-1.008.52-1.652 1.59-1.652 1.092 0 1.61.4 1.568 1.456h-.672zM44.29 6.377V1.323h2.603v.56h-1.96v1.624h1.82v.56h-1.82v1.75h2.002v.56H44.29zM47.74 6.377V1.323h2.506v.56h-1.862v1.624h1.764v.56h-1.764v2.31h-.644zM50.875 4.53V2.87c0-1.008.518-1.652 1.59-1.652 1.07 0 1.588.644 1.588 1.652v1.66c0 1.4-.518 1.952-1.59 1.952-1.07 0-1.588-.553-1.588-1.953zm1.31-3.802h-.658V0h.658v.728zm1.21 3.83v-1.71c0-1.056-.727-1.09-.93-1.09-.203 0-.93.034-.93 1.09v1.71c0 1.105.32 1.385.93 1.385.61 0 .93-.28.93-1.386zm.022-3.83h-.658V0h.657v.728zM55.804 4.053v2.324h-.644V1.323h1.743c.896 0 1.21.63 1.21 1.26 0 .595-.328 1.05-.923 1.155v.014c.58.09.79.287.826 1.302.007.217.077 1.008.175 1.323h-.67c-.183-.35-.14-1.008-.197-1.68-.05-.616-.546-.644-.763-.644h-.756zm0-.56h.966c.462 0 .686-.4.686-.84 0-.364-.182-.77-.68-.77h-.972v1.61zM59.08 1.323h1.554c.644 0 1.106.23 1.358.77.203.427.224 1.435.224 1.596 0 1.077-.098 1.7-.308 2.036-.273.434-.784.65-1.666.65H59.08V1.324zm.644 4.494h.61c.895 0 1.224-.336 1.224-1.512V3.283c0-1.022-.315-1.4-.987-1.4h-.846v3.934zM63.343 6.377V1.323h2.604v.56h-1.96v1.624h1.82v.56h-1.82v1.75h2.002v.56h-2.647zM67.473 4.053v2.324h-.644V1.323h1.742c.896 0 1.21.63 1.21 1.26 0 .595-.328 1.05-.923 1.155v.014c.58.09.79.287.825 1.302.007.217.077 1.008.175 1.323h-.672c-.182-.35-.14-1.008-.196-1.68-.05-.616-.546-.644-.763-.644h-.757zm0-.56h.966c.46 0 .685-.4.685-.84 0-.364-.182-.77-.68-.77h-.972v1.61zM73.57 1.323v.56h-1.33v4.494h-.645V1.883h-1.33v-.56h3.304zM77.545 6.377h-.77l-1.463-5.054h.7l1.155 4.445h.014l1.184-4.445h.658l-1.477 5.054zM79.66 4.53V2.87c0-1.008.518-1.652 1.59-1.652 1.07 0 1.588.644 1.588 1.652v1.66c0 1.4-.518 1.952-1.59 1.952-1.07 0-1.588-.553-1.588-1.953zm2.52.027V2.85c0-1.058-.73-1.093-.932-1.093s-.93.035-.93 1.092v1.707c0 1.106.32 1.386.93 1.386s.93-.28.93-1.386zM84.566 6.377h-.602V1.323h1.043l1.274 4.242h.015l1.288-4.242h1.064v5.054h-.644V1.883h-.014l-1.415 4.494h-.61L84.58 1.883h-.014v4.494z"/></g></svg>
\ No newline at end of file
--- a/src/main/webapp/WEB-INF/jsp/base/foot.jsp
+++ b/src/main/webapp/WEB-INF/jsp/base/foot.jsp
@@ -11,7 +11,7 @@
        <li><a href="https://creativecommons.org/licenses/by/4.0/deed.de">CC BY 4.0</a></li>
      </ul>
      <ul>
-        <li><span>&copy; TextGrid 2019</span></li>
+        <li><span>&copy; TextGrid 2020</span></li>
      </ul>
    </div>
    <div class="tg footer_right">
@@ -32,11 +32,6 @@
              <img class="tg footer_logo" src="/images/tei-logo.svg" alt="TEI - Text Encoding Initiative" width="59" height="65">
            </a>
          </li>
-          <li>
-            <a href="http://bmbf.de/" target="_blank">
-              <img class="tg footer_logo -tall" src="/images/bmbf-logo.svg" alt="Gefrdert vom BMBF - Bundesministerium fr Bildung und Forschung" width="124" height="86">
-            </a>
-          </li>
        </ul>
      </div>
    </div>

--- a/src/main/webapp/WEB-INF/jsp/browse.jsp
+++ b/src/main/webapp/WEB-INF/jsp/browse.jsp
@@ -4,9 +4,8 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib uri="http://textgrid.info/rep/utils" prefix="utils" %>

-<!-- 
+<!--
 <portlet:defineObjects />
-
 <portlet:resourceURL id="addToBasket" var="addToBasketUrl" ></portlet:resourceURL>
 <portlet:resourceURL id="removeFromBasket" var="removeFromBasketUrl" ></portlet:resourceURL>
 -->
@@ -24,33 +23,7 @@ iframe {
 <script type="text/javascript">

 document.addEventListener("DOMContentLoaded", function(event) {
-	$(document).on('click', '.digivoy-button', function(e) {
-
-		e.preventDefault();
-
-        var toolUrl = 'https://voyant.de.dariah.eu/voyant';
-		var documentLinks = [];
-		var settings_serialized = "target="+encodeURIComponent('${textgridHost}/voyant')+"%2F&e=castList&e=desc&e=figure&e=head&e=note&e=speaker&e=stage&e=title";
-
-		documentLinks.push(filteredTGCrudDataLink('${textgridUri}', settings_serialized));
-		sendToVoyant(toolUrl, documentLinks.join('\n'));
-	});
-
-	$(document).on('click', '.digivoy2-button', function(e) {
-
-		e.preventDefault();
-
-        var toolUrl = 'https://voyant.de.dariah.eu/voyant2';
-        //var toolUrl = 'http://voyant.de.dariah.eu/voyant2';
-		var documentLinks = [];
-		var settings_serialized = "target="+encodeURIComponent('${textgridHost}/voyant2')+"%2F&e=castList&e=desc&e=figure&e=head&e=note&e=speaker&e=stage&e=title";
-
-		documentLinks.push(filteredTGCrudDataLink('${textgridUri}', settings_serialized));
-		sendToVoyant2(toolUrl, documentLinks.join('\n'));
-	});
-
 	$("#htmlIframe").contents().find("body").attr("style","margin-left: 0");
-
 });


@@ -122,19 +95,6 @@ document.addEventListener("DOMContentLoaded", function(event) {

 		<aside class="tgrep sidebar">

-	<!--
-			<h:panelGroup rendered="${browseBean.id != null}" layout="block" class="egal">
-				<strong>Metadata</strong><br/>
-	  	   		<a href="https://textgridlab.org/1.0/tgcrud-public/rest/${browseBean.metadata.object.generic.generated.textgridUri.value}/metadata">raw metadata</a>
-				<hr/>
-				<strong>Tools</strong><br/>
-				<a href="#">Voyant</a><br/>
-				<a href="#">Digilib</a><br/>
-				<a href="#">Mirador</a><br/>
-				<a href="#">DFG-Viewer</a><br/>
-			</h:panelGroup>
-	-->
-
 			<section class="tgrep sidebar_panel">
 				<h3 class="tgrep sidebar_subheading">${i18n['metadata']}</h3>
 				<!-- TODO: each for agent, pid, etc -->
@@ -322,7 +282,7 @@ document.addEventListener("DOMContentLoaded", function(event) {
 			        tileSources: "${textgridHost}/1.0/digilib/rest/IIIF/${metadata.object.generic.generated.textgridUri.value}/info.json"
 			    });
 			 </script>
-			  <!-- 
+			  <!--
 				<img src="${textgridHost}/1.0/digilib/rest/IIIF/${metadata.object.generic.generated.textgridUri.value}/full/,1500/0/native.jpg"/>
 				-->
 			</c:when>
@@ -379,4 +339,4 @@ document.addEventListener("DOMContentLoaded", function(event) {

 </div>

-<%@ include file="base/foot.jsp" %>
\ No newline at end of file
+<%@ include file="base/foot.jsp" %>
--- a/src/main/webapp/WEB-INF/jsp/components/js-incl.jsp
+++ b/src/main/webapp/WEB-INF/jsp/components/js-incl.jsp
 <script type="text/javascript">
-	
+
 	document.addEventListener("DOMContentLoaded", function(event) {

 		$(document).on('click', '.-add-to-shelf', function(e) {
@@ -40,77 +40,4 @@

 	});

-
-	/* DIGIVOY */
-	
-	function filteredTGCrudDataLink(id, query) {
-		var link = "http://localhost:8080/xsltws/filter?id="+id+"&i=teiHeader";
-		if (query) {
-			link += "&"+query;
-		}
-		return link;
-	}
-	
-	function sendToVoyant(toolUrl, documentUrl)
-	{
-		var voyantURL = "https://voyant.de.dariah.eu/voyant/";
-		$.ajax({
-			url: voyantURL + "trombone/",
-			data: {
-				input: documentUrl,
-				// DIGIVOY-34: only text, no stuff like notes or speakers
-				xmlContentXpath: "/*[local-name()='TEI']/*[local-name()='text']/*[local-name()='body']",
-				// DIGIVOY-33: extract title information from TEI
-				xmlTitleXpath: "/*[local-name()='TEI']/*[local-name()='teiHeader']/*[local-name()='fileDesc']/*[local-name()='titleStmt']/*[local-name()='title']",
-				// DIGIVOY-33: extract author information from TEI
-				xmlAuthorXpath: "/*[local-name()='TEI']/*[local-name()='teiHeader']/*[local-name()='fileDesc']/*[local-name()='sourceDesc']/*[local-name()='biblFull']/*[local-name()='titleStmt']/*[local-name()='author']",
-				// DIGIVOY-33: extract publication time
-				xmlTimeXpath: "/*[local-name()='TEI']/*[local-name()='teiHeader']/*[local-name()='fileDesc']/*[local-name()='sourceDesc']/*[local-name()='biblFull']/*[local-name()='publicationStmt']/*[local-name()='date']/attribute::*[local-name()='when']",
-				timePattern: "yyyy",
-				timeLocaleLanguage: "de",
-				timeLocaleCountry: "DE",
-			},
-			dataType: 'json',
-			success: function(json) {
-				window.open(toolUrl+'?corpus='+json.corpusId+'&stopList=stop.de.german.txt', '_self', false);
-			},
-	        error: function(xhr, txt){
-	            $('#searchresults').append('<li class="error">' + txt + '</li>');
-	        }
-		});
-	}
-	
-	function sendToVoyant2(toolUrl, documentUrl)
-	{
-		var voyant2URL = "https://voyant.de.dariah.eu/voyant2/";
-		$.ajax({
-			url: voyant2URL + "trombone",
-			data: {
-				input: documentUrl,
-				// DIGIVOY-34: only text, no stuff like notes or speakers
-				xmlContentXpath: "/*[local-name()='TEI']/*[local-name()='text']/*[local-name()='body']",
-				// DIGIVOY-33: extract title information from TEI
-				xmlTitleXpath: "/*[local-name()='TEI']/*[local-name()='teiHeader']/*[local-name()='fileDesc']/*[local-name()='titleStmt']/*[local-name()='title']",
-				// DIGIVOY-33: extract author information from TEI
-				xmlAuthorXpath: "/*[local-name()='TEI']/*[local-name()='teiHeader']/*[local-name()='fileDesc']/*[local-name()='sourceDesc']/*[local-name()='biblFull']/*[local-name()='titleStmt']/*[local-name()='author']",
-				// DIGIVOY-33: extract publication time
-				xmlTimeXpath: "/*[local-name()='TEI']/*[local-name()='teiHeader']/*[local-name()='fileDesc']/*[local-name()='sourceDesc']/*[local-name()='biblFull']/*[local-name()='publicationStmt']/*[local-name()='date']/attribute::*[local-name()='when']",
-				timePattern: "yyyy",
-				timeLocaleLanguage: "de",
-				timeLocaleCountry: "DE",
-				tool: "corpus.CorpusMetadata",
-				palette: "default",
-			},
-			dataType: 'json',
-			success: function(json) {
-				console.log(json);
-				window.open(toolUrl+'?corpus='+json.corpus.metadata.id+'&stopList=stop.de.german.txt', '_self', false);
-			},
-	        error: function(xhr, txt){
-	            $('#searchresults').append('<li class="error">' + txt + '</li>');
-	        }
-		});
-	}
-	
-	
-</script>
\ No newline at end of file
+</script>