@@ -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; | |||
} | |||
@@ -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> |
@@ -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> |
@@ -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> |
@@ -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> <span class="hidden-phone" wicket:id="workingCopy" style="font-weight:bold;">[working copy]</span></span> | |||
</p> | |||
</wicket:fragment> | |||
</wicket:extend> |
@@ -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); |
@@ -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> |
@@ -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> |