From 227736841cabf0b6cde6dc3f9191847898dae2d8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 13 Jul 2012 23:05:27 -0400
Subject: [PATCH] Changes to commit page for responsive layout

---
 resources/gitblit.css                            | 9 ++++++---
 src/com/gitblit/wicket/pages/CommitDiffPage.html | 2 +-
 src/com/gitblit/wicket/pages/CommitPage.html     | 6 +++---
 src/com/gitblit/wicket/pages/DocsPage.html       | 2 +-
 src/com/gitblit/wicket/pages/RepositoryPage.html | 2 +-
 src/com/gitblit/wicket/pages/RepositoryPage.java | 6 +++---
 src/com/gitblit/wicket/pages/TagPage.html        | 2 +-
 src/com/gitblit/wicket/panels/SearchPanel.html   | 2 +-
 8 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/resources/gitblit.css b/resources/gitblit.css
index b8792dcd..b51637d2 100644
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -443,10 +443,11 @@ span.login input:focus {
 	color: white;
 }
 
-pre.commit_message {	
+.commit_message {
 	padding: 8px;
 	border: solid #ddd;
 	border-width: 1px 0px 0px;
+	border-radius: 0px;
 }
 
 div.bug_open, span.bug_open {
@@ -720,6 +721,8 @@ table.repositories td.icon img {
 
 table.repositories tr.group {
 	background-color: #ccc;
+	border-left: 1px solid #ccc;
+	border-right: 1px solid #ccc;
 }
 
 table.repositories tr.group td {
@@ -834,8 +837,8 @@ td.date {
 	white-space: nowrap;
 }
 
-span.sha1, span.sha1 a, span.sha1 a span, pre.commit_message {
-	font-family: monospace;
+span.sha1, span.sha1 a, span.sha1 a span, .commit_message {
+	font-family: consolas, monospace;
 	font-size: 13px;
 }
 
diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.html b/src/com/gitblit/wicket/pages/CommitDiffPage.html
index a0fb5591..de39f4ca 100644
--- a/src/com/gitblit/wicket/pages/CommitDiffPage.html
+++ b/src/com/gitblit/wicket/pages/CommitDiffPage.html
@@ -18,7 +18,7 @@
 	<!-- changed paths -->
 	<div style="padding-top:15px;">
 		<!-- commit legend -->
-		<div style="text-align:right;" wicket:id="commitLegend"></div>
+		<div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div>
 	
 		<div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>
 	</div>
diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html
index 354b7ba4..20e6b607 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.html
+++ b/src/com/gitblit/wicket/pages/CommitPage.html
@@ -25,7 +25,7 @@
 		<tr><th><wicket:message key="gb.author">author</wicket:message></th><td><span class="sha1" wicket:id="commitAuthor">[author</span></td></tr>
 		<tr><th></th><td><span class="sha1" wicket:id="commitAuthorDate">[author date]</span></td></tr>
 		<tr><th><wicket:message key="gb.committer">committer</wicket:message></th><td><span class="sha1" wicket:id="commitCommitter">[committer]</span></td></tr>
-		<tr class="hidden-phone"><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr>
+		<tr><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr>
 		<tr class="hidden-phone"><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr>
 		<tr class="hidden-phone"><th><wicket:message key="gb.tree">tree</wicket:message></th>
 			<td><span class="sha1" wicket:id="commitTree">[commit tree]</span>
@@ -49,7 +49,7 @@
 	</div>
 	
 	<!-- full message -->
-	<pre class="commit_message" wicket:id="fullMessage">[commit message]</pre>
+	<div class="commit_message" wicket:id="fullMessage">[commit message]</div>
 
 	<!--  git notes -->
 	<table class="gitnotes">
@@ -68,7 +68,7 @@
 	</table>
 	
 	<!--  commit legend -->
-	<div style="text-align:right;" wicket:id="commitLegend"></div>
+	<div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div>
 	
 	<!-- header -->
 	<div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>
diff --git a/src/com/gitblit/wicket/pages/DocsPage.html b/src/com/gitblit/wicket/pages/DocsPage.html
index 98432b5e..ad93000c 100644
--- a/src/com/gitblit/wicket/pages/DocsPage.html
+++ b/src/com/gitblit/wicket/pages/DocsPage.html
@@ -17,7 +17,7 @@
 			<td><span wicket:id="docName"></span></td>			
 			<td class="size"><span wicket:id="docSize">[doc size]</span></td>
 			<td class="treeLinks">
-				<span class="link">
+				<span class="hidden-phone link">
 					<a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="raw"><wicket:message key="gb.raw"></wicket:message></a> | <a wicket:id="blame"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a>
 				</span>	
 			</td>
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html
index 291ee4cf..3195a937 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.html
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.html
@@ -54,7 +54,7 @@
 		
 		<wicket:fragment wicket:id="workingCopyFragment">
 			<p class="pull-right" style="padding-top:5px;">
-				<span class="alert alert-info" style="padding: 8px 14px 8px 14px;vertical-align: middle;"><i class="icon-exclamation-sign" style="vertical-align: middle;"></i> <span wicket:id="workingCopy" style="font-weight:bold;">[working copy]</span></span>
+				<span class="alert alert-info" style="padding: 8px 14px 8px 14px;vertical-align: middle;"><i class="icon-exclamation-sign" style="vertical-align: middle;"></i>&nbsp;<span class="hidden-phone" wicket:id="workingCopy" style="font-weight:bold;">[working copy]</span></span>
 			</p>
 		</wicket:fragment>
 	</wicket:extend>
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index d6cc51cd..45822e16 100644
--- a/src/com/gitblit/wicket/pages/RepositoryPage.java
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.java
@@ -216,11 +216,11 @@ public abstract class RepositoryPage extends BasePage {
 	}
 
 	protected void addFullText(String wicketId, String text, boolean substituteRegex) {
-		String html;
+		String html = StringUtils.escapeForHtml(text, true);
 		if (substituteRegex) {
 			html = GitBlit.self().processCommitMessage(repositoryName, text);
 		} else {
-			html = StringUtils.breakLinesForHtml(text);
+			html = StringUtils.breakLinesForHtml(html);
 		}
 		add(new Label(wicketId, html).setEscapeModelStrings(false));
 	}
@@ -254,7 +254,7 @@ public abstract class RepositoryPage extends BasePage {
 			setPersonSearchTooltip(nameLink, name, searchType);
 			fullPerson.add(nameLink);
 
-			LinkPanel addressLink = new LinkPanel("personAddress", "list", "<" + address + ">",
+			LinkPanel addressLink = new LinkPanel("personAddress", "hidden-phone list", "<" + address + ">",
 					GitSearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId,
 							address, searchType));
 			setPersonSearchTooltip(addressLink, address, searchType);
diff --git a/src/com/gitblit/wicket/pages/TagPage.html b/src/com/gitblit/wicket/pages/TagPage.html
index b0df3a8a..19f828e3 100644
--- a/src/com/gitblit/wicket/pages/TagPage.html
+++ b/src/com/gitblit/wicket/pages/TagPage.html
@@ -23,7 +23,7 @@
 	</table>
 	
 	<!--  full message -->
-	<pre style="border-bottom:0px;" class="commit_message" wicket:id="fullMessage">[tag full message]</pre>
+	<div style="border-bottom:0px;" class="commit_message" wicket:id="fullMessage">[tag full message]</div>
 	
 	<wicket:fragment wicket:id="fullPersonIdent">
 		<span wicket:id="personName"></span><span wicket:id="personAddress"></span>
diff --git a/src/com/gitblit/wicket/panels/SearchPanel.html b/src/com/gitblit/wicket/panels/SearchPanel.html
index 50f4638d..74af71c5 100644
--- a/src/com/gitblit/wicket/panels/SearchPanel.html
+++ b/src/com/gitblit/wicket/panels/SearchPanel.html
@@ -20,7 +20,7 @@
          		<td class="icon"><img wicket:id="commitIcon" /></td>
          		<td class="message"><table class="nestedTable"><tr><td><span style="vertical-align:middle;" wicket:id="commitShortMessage">[commit short message]</span></td><td><div style="text-align:right;" wicket:id="commitRefs">[commit refs]</div></td></tr></table></td>
          		<td class="rightAlign">
-         			<span class="link">
+         			<span class="hidden-phone link">
 						<a wicket:id="commit"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="commitdiff"><wicket:message key="gb.commitdiff"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a>
 					</span>
 				</td>
-- 
2.39.5