Rnaiser: Design part one

pom.xml

@@ -108,6 +108,11 @@
             <artifactId>jquery</artifactId>
             <version>3.7.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.webjars</groupId>
+            <artifactId>jquery-ui</artifactId>
+            <version>1.13.2</version>
+        </dependency>
         <dependency>
             <groupId>org.webjars</groupId>
             <artifactId>jQuery-Autocomplete</artifactId>
@@ -201,6 +206,25 @@
                             </artifactItems>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>unpack-jquery-ui</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                            <silent>true</silent>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.webjars</groupId>
+                                    <artifactId>jquery-ui</artifactId>
+                                    <version>1.13.2</version>
+                                    <type>jar</type>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
                     <execution>
                         <id>unpack-jquery-autocomplete</id>
                         <phase>generate-resources</phase>
@@ -274,7 +298,7 @@
                 </executions>
             </plugin>
             <!-- Configure the maven-surefire-plugin and maven-failsafe-plugin to be at version 2.22.2 so that they can run JUnit5 -->
-            <plugin>
+             <plugin>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>2.22.2</version>
             </plugin>

src/main/java/de/uni_tuebingen/ub/nppm/servlet/AbstractServlet.java

@@ -65,10 +65,16 @@ protected String getNavigationTitle() {
     abstract protected String getFooterTemplate();
 
     protected void processRequest(HttpServletRequest request, HttpServletResponse response) throws Exception {
+        // Since the header is very large using the UB navigation,
+        // we need to increase the buffer size so no packages will be sent
+        // during rendering the navigation. Else it would not be possible to
+        // send a redirect when rendering the content, e.g. if "gast/einzelbeleg" page is called
+        // without an ID.
+        response.setBufferSize(1024*1024);
         request.setCharacterEncoding("UTF-8");
         initRequest(request);
         response.setContentType("text/html; charset=UTF-8");
-        response.setCharacterEncoding("UTF-8");        
+        response.setCharacterEncoding("UTF-8");
         addResponseHeader(request, response);
         generatePage(request, response);
         addResponseFooter(request, response);

src/main/java/de/uni_tuebingen/ub/nppm/servlet/gast/ErweiterteSucheServlet.java

@@ -11,6 +11,11 @@ protected String getTitle() {
         return "freie_suche"; // "Impressum" does not yet exist in DB
     }
 
+    @Override
+    protected String getNavigationTitle() {
+        return "freie_suche";
+    }
+
     @Override
     protected void generatePage(HttpServletRequest request, HttpServletResponse response) throws Exception {
         RequestDispatcher rd = request.getRequestDispatcher("freie_suche.jsp");
@@ -29,6 +34,6 @@ protected List<String> getAdditionalJavaScript() {
         js.add("../layout/BubbleTooltips.js");
         return js;
     }
-    
-    
+
+
 }

src/main/webapp/forms/array.combined.jsp

@@ -59,7 +59,7 @@
             if (count % 2 == 0) {
                 out.println("<tr>");
             } else {
-                out.println("<tr bgcolor='#AACCDD'>");
+                out.println("<tr bgcolor='#AACCDD'>"); 
             }
 
             for (int j = 0; j < combinedFeldtypen.length; j++) {

src/main/webapp/forms/autocomplete.jsp

@@ -9,8 +9,9 @@
         }
         out.println("/>");
 
+        // Instead of the "autocomplete" function we use the "devbridgeAutocomplete" function from jQuery-Autocomplete to avoid known issues / naming conflicts with jQuery UI.
         out.println("<script>");
-        out.println("$(\"#" + datenfeld + "\").autocomplete({serviceUrl: \""+ Utils.getBaseUrl(request) + "/ajax\", params: {action: \"autocomplete\", form:\"" + auswahlherkunft + "\", field:\"" + formularAttribut + "\"}});");
+        out.println("$(\"#" + datenfeld + "\").devbridgeAutocomplete({serviceUrl: \""+ Utils.getBaseUrl(request) + "/ajax\", params: {action: \"autocomplete\", form:\"" + auswahlherkunft + "\", field:\"" + formularAttribut + "\"}});");
         out.println("</script>");
         if (!tooltip.equals("")) {
             out.println("<a href=\"javascript:return false;\" style=\"text-decoration:none;color:gray;\" title=\"" + tooltip + "\"> ? </a>");

src/main/webapp/functions.jsp

@@ -179,7 +179,7 @@ String getBelegformLinked(String einzelbelegID, String belegform) throws Excepti
     if (dmghUrl[0].isEmpty()) {
         return belegform;
     }
-    return String.format("<a href='%s' title='%s'>%s</a>", dmghUrl[0], dmghUrl[1], belegform);
+    return String.format("<a class=\"ut-link\" href='%s' title='%s'>%s</a>", dmghUrl[0], dmghUrl[1], belegform);
 }
 
 %>

src/main/webapp/gast/einfache_suche.jsp

@@ -25,8 +25,6 @@
     </TITLE>
     <link rel="stylesheet" href="layout/layout.css" type="text/css">
     <script src="../javascript/funktionen.js" type="text/javascript"></script>
-    <script src="../webjars/jquery/3.7.1/jquery.min.js" type="text/javascript"></script>
-    <script src="../webjars/jQuery-Autocomplete/1.4.10/jquery.autocomplete.min.js" type="text/javascript"></script>
 
  </HEAD>