Restore zebra stripping, added line hovering, fix overflow (issue 130)

diff --git a/resources/gitblit.css b/resources/gitblit.css
index bbd3c0c260758f69828292dba8e3da135d871788..fc948b64dce608ad84b8c92ac1d6b80521db8445 100644 (file)
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -163,8 +163,9 @@ th {
 }\r
 \r
 div.sourceview {\r
-       overflow: auto;\r
+       overflow: hidden;\r
 }\r
+\r
 pre.prettyprint ol {\r
        padding-left:25px;\r
 }\r
@@ -178,29 +179,68 @@ pre.prettyprint ol {
     vertical-align:top;\r
 }\r
 \r
+#nums pre {\r
+    white-space: pre;\r
+}\r
+\r
+#nums pre, #lines pre {\r
+       margin: 0;      \r
+}\r
+\r
+#lines pre {\r
+       padding: 0px !important;        \r
+       border: 0px !important;\r
+       white-space: nowrap;\r
+}\r
+\r
 /* CSS trick to workaround #link topOfWindow offset problem */\r
-#lines .line {\r
+#nums .num {\r
     border-top: 160px solid transparent;\r
     margin-top: -160px;\r
     -webkit-background-clip: padding-box;\r
     -moz-background-clip: padding;\r
     background-clip: padding-box;\r
+\r
+    color: #888;\r
 }\r
 \r
-#lines span:target {\r
+#nums span:target {\r
        background-color: #ffffbf;\r
+       color: black;\r
+       font-weight: bold;\r
+       border-bottom: 1px solid red;\r
 }\r
 \r
-#nums pre {\r
-    white-space: pre;\r
+#lines table {\r
+       margin: 0;\r
 }\r
 \r
-#lines pre {\r
-       padding: 0px 5px !important;\r
-       border: 0px !important;\r
-       white-space: nowrap;\r
+#lines td {\r
+       padding: 0;\r
+}\r
+\r
+#lines a {\r
+       padding-left: 5px;\r
+}\r
+\r
+#lines a:hover {\r
+       background-color: #ffffbf;\r
+       text-decoration: none;\r
+}\r
+\r
+#lines tr:hover {\r
+       background-color: #ffffbf;\r
+}\r
+#lines .odd {\r
+       background-color: white;\r
+}\r
+\r
+#lines .even {\r
+       background-color: #fafafa;\r
 }\r
 \r
+\r
+\r
 h1 small, h2 small, h3 small, h4 small, h5 small, h6 small {\r
     color: #888;\r
 }\r

diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java
index ebe539f27d908d043ea635dd1cec005090b5b9cf..f4d6e5b6d5b3c95782c433a1a26570c5b7c5fd1d 100644 (file)
--- a/src/com/gitblit/wicket/pages/BlobPage.java
+++ b/src/com/gitblit/wicket/pages/BlobPage.java
@@ -131,7 +131,7 @@ public class BlobPage extends RepositoryPage {
                        } else {\r
                                // plain text\r
                                String source = JGitUtils.getStringContent(r, commit.getTree(), blobPath, encodings);\r
-                               String table = generateSourceTable(source, false);\r
+                               String table = generateSourceView(source, false);\r
                                add(new Label("blobText", table).setEscapeModelStrings(false));\r
                                add(new Image("blobImage").setVisible(false));\r
                        }\r
@@ -149,7 +149,7 @@ public class BlobPage extends RepositoryPage {
                sb.append("<!-- start nums column -->");\r
                sb.append("<td id=\"nums\">");\r
                sb.append("<pre>");\r
-               String numPattern = "<a href=\"#L{0}\">{0}</a>\n";\r
+               String numPattern = "<span id=\"L{0}\" class=\"num\">{0}</span>\n";\r
                for (int i = 0; i < lines.length; i++) {\r
                        sb.append(MessageFormat.format(numPattern, "" + (i + 1)));\r
                }\r
@@ -166,59 +166,17 @@ public class BlobPage extends RepositoryPage {
                        sb.append("<pre class=\"plainprint\">");\r
                }\r
                lines = StringUtils.escapeForHtml(source, true).split("\n");\r
-               for (int i = 0; i < lines.length; i++) {\r
-                       sb.append(MessageFormat.format("<span id=\"L{0}\" class=\"line\">", "" + (i + 1)));\r
-                       sb.append(lines[i]);\r
-                       sb.append("</span>");\r
-               }\r
-               sb.append("</pre>");\r
-               sb.append("</div>");\r
-               sb.append("</td>");\r
-               sb.append("<!-- end lines column -->");\r
-               \r
-               sb.append("</tr></tbody></table>");\r
-               sb.append("<!-- end blob table -->");\r
-               \r
-               return sb.toString();\r
-       }\r
-       \r
-       protected String generateSourceTable(String source, boolean prettyPrint) {\r
-               String [] lines = source.split("\n");\r
-               \r
-               // be careful adding line breaks to this method\r
-               // GoogleCode Prettify is sensitive\r
-               StringBuilder sb = new StringBuilder();\r
-               sb.append("<!-- start blob table -->");\r
-               sb.append("<table width=\"100%\"><tbody><tr>");\r
                \r
-               // nums column\r
-               sb.append("<!-- start nums column -->");\r
-               sb.append("<td id=\"nums\">");\r
-               sb.append("<pre><table width=\"100%\"><tbody>");\r
-               String numPattern = "<tr><td id=\"L{0}\"><a href=\"#L{0}\">{0}</a></td></tr>";\r
-               for (int i = 0; i < lines.length; i++) {\r
-                       sb.append(MessageFormat.format(numPattern, "" + (i + 1)));\r
-               }\r
-               sb.append("<!-- end nums column -->");\r
-               sb.append("</tbody></table></pre>");\r
-               sb.append("</td>");\r
-               \r
-               sb.append("<!-- start lines column -->");\r
-               sb.append("<td id=\"lines\">");\r
-               if (prettyPrint) {\r
-                       sb.append("<pre style=\"border: 0px;\" class=\"prettyprint\">");\r
-               } else {\r
-                       sb.append("<pre class=\"plainprint\">");\r
-               }\r
                sb.append("<table width=\"100%\"><tbody>");\r
                \r
-               String linePattern = "<tr class=\"{0}\"><td>{1}</tr>";\r
+               String linePattern = "<tr class=\"{0}\"><td><a href=\"#L{2}\">{1}</a></tr>";\r
                for (int i = 0; i < lines.length; i++) {\r
-                       String l = StringUtils.escapeForHtml(lines[i], true);\r
                        String cssClass = (i % 2 == 0) ? "even" : "odd";\r
-                       sb.append(MessageFormat.format(linePattern, cssClass, l));\r
+                       sb.append(MessageFormat.format(linePattern, cssClass, lines[i], "" + (i + 1)));\r
                }\r
                sb.append("</tbody></table></pre>");\r
+               sb.append("</pre>");\r
+               sb.append("</div>");\r
                sb.append("</td>");\r
                sb.append("<!-- end lines column -->");\r
                \r