From b932aab97767f8bec43908497646054c81bf9c86 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 23 Sep 2013 09:52:48 -0400 Subject: [PATCH] Fix commit log css for branch graphs --- src/main/java/com/gitblit/wicket/pages/BlobPage.java | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/BlobPage.java b/src/main/java/com/gitblit/wicket/pages/BlobPage.java index f6e9998..b9f6430 100644 --- a/src/main/java/com/gitblit/wicket/pages/BlobPage.java +++ b/src/main/java/com/gitblit/wicket/pages/BlobPage.java @@ -32,11 +32,14 @@ import com.gitblit.Keys; import com.gitblit.utils.JGitUtils; import com.gitblit.utils.StringUtils; +import com.gitblit.wicket.CacheControl; import com.gitblit.wicket.ExternalImage; import com.gitblit.wicket.WicketUtils; +import com.gitblit.wicket.CacheControl.LastModified; import com.gitblit.wicket.panels.CommitHeaderPanel; import com.gitblit.wicket.panels.PathBreadcrumbsPanel; +@CacheControl(LastModified.BOOT) public class BlobPage extends RepositoryPage { protected String fileExtension; @@ -171,7 +174,7 @@ sb.append("<!-- start nums column -->"); sb.append("<td id=\"nums\">"); sb.append("<pre>"); - String numPattern = "<span id=\"L{0}\" class=\"num\">{0}</span>\n"; + String numPattern = "<span id=\"L{0}\" class=\"jump\"></span><a href=\"#L{0}\">{0}</a>\n"; for (int i = 0; i < lines.length; i++) { sb.append(MessageFormat.format(numPattern, "" + (i + 1))); } @@ -191,10 +194,13 @@ sb.append("<table width=\"100%\"><tbody>"); - String linePattern = "<tr class=\"{0}\"><td><a href=\"#L{2}\">{1}</a>\r</tr>"; + String linePattern = "<tr class=\"{0}\"><td><div><span class=\"line\">{1}</span></div>\r</tr>"; for (int i = 0; i < lines.length; i++) { String line = lines[i].replace('\r', ' '); String cssClass = (i % 2 == 0) ? "even" : "odd"; + if (StringUtils.isEmpty(line.trim())) { + line = " "; + } sb.append(MessageFormat.format(linePattern, cssClass, line, "" + (i + 1))); } sb.append("</tbody></table></pre>"); -- Gitblit v1.9.1