Search result background color for odd rows fix

fixes #2082

Author: ahornace

src/org/opensolaris/opengrok/search/Results.java

@@ -18,7 +18,7 @@
  */
 
 /*
- * Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2005, 2018, Oracle and/or its affiliates. All rights reserved.
  * Portions Copyright 2011 Jens Elkner.
  * Portions Copyright (c) 2017-2018, Chris Fraire <[email protected]>.
  */
@@ -171,6 +171,8 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
 
         RuntimeEnvironment env = RuntimeEnvironment.getInstance();
 
+        boolean evenRow = true;
+        out.write("<tbody class=\"search-result\">");
         for (Map.Entry<String, ArrayList<Integer>> entry :
                 createMap(sh.searcher, sh.hits, start, end).entrySet()) {
             String parent = entry.getKey();
@@ -190,8 +192,7 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
                     && (messages = Util.messagesToJson(p,
                             RuntimeEnvironment.MESSAGES_MAIN_PAGE_TAG
                     )).size() > 0) {
-                out.write(" <a ");
-                out.write("href=\"" + xrefPrefix + "/" + p.getName() + "\">");
+                out.write(" <a href=\"" + xrefPrefix + "/" + p.getName() + "\">");
                 out.write("<span class=\"important-note important-note-rounded\" data-messages='" + messages + "'>!</span>");
                 out.write("</a>");
             }
@@ -205,26 +206,19 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
                 Document doc = sh.searcher.doc(docId);
                 String rpath = doc.get(QueryBuilder.PATH);
                 String rpathE = Util.URIEncodePath(rpath);
-                DateFormat df;
-                out.write("<tr>");
+                if (evenRow) {
+                    out.write("<tr class=\"search-result-even-row\">");
+                } else {
+                    out.write("<tr>");
+                }
+                evenRow = !evenRow;
                 Util.writeHAD(out, sh.contextPath, rpathE, false);
                 out.write("<td class=\"f\"><a href=\"");
                 out.write(xrefPrefixE);
                 out.write(rpathE);
                 out.write("\"");
                 if (env.isLastEditedDisplayMode()) {
-                    try {
-                        // insert last edited date if possible
-                        df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
-                        String dd = df.format(DateTools.stringToDate(doc.get("date")));
-                        out.write(" class=\"result-annotate\" title=\"");
-                        out.write("Last modified: ");
-                        out.write(dd);
-                        out.write("\"");
-                    } catch (ParseException ex) {
-                        LOGGER.log(
-                                Level.WARNING, "An error parsing date information", ex);
-                    }
+                    printLastEditedDate(out, doc);
                 }
                 out.write(">");
                 out.write(htmlize(rpath.substring(rpath.lastIndexOf('/') + 1)));
@@ -253,6 +247,20 @@ public static void prettyPrint(Writer out, SearchHelper sh, int start,
                 out.write("</tt></td></tr>\n");
             }
         }
+        out.write("</tbody>");
+    }
+
+    private static void printLastEditedDate(final Writer out, final Document doc) throws IOException {
+        try {
+            DateFormat df = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT);
+            String dd = df.format(DateTools.stringToDate(doc.get("date")));
+            out.write(" class=\"result-annotate\" title=\"");
+            out.write("Last modified: ");
+            out.write(dd);
+            out.write("\"");
+        } catch (ParseException ex) {
+            LOGGER.log(Level.WARNING, "An error parsing date information", ex);
+        }
     }
 
     private static void printPlain(PrintPlainFinalArgs fargs, Document doc,

web/default/style.css

@@ -56,7 +56,12 @@ thead {
     background-color: #c5d5a9;
 }
 
-tbody tr:nth-child(EVEN) { /* alternate color for odd rows */
+/* alternate color for odd rows, search-result class handles this by itself */
+tbody:not(.search-result) tr:nth-child(EVEN) {
+    background-color: #e8e8f0;
+}
+
+.search-result-even-row {
     background-color: #e8e8f0;
 }