Changes to commit page for responsive layout

diff --git a/resources/gitblit.css b/resources/gitblit.css
index b8792dcd5fe380af4acb42b15bcd0c8a8b27e5a8..b51637d2e7b131704834ace1e0ec94775fbecdfa 100644 (file)
--- a/resources/gitblit.css
+++ b/resources/gitblit.css
@@ -443,10 +443,11 @@ span.login input:focus {
        color: white;\r
 }\r
 \r
-pre.commit_message {   \r
+.commit_message {\r
        padding: 8px;\r
        border: solid #ddd;\r
        border-width: 1px 0px 0px;\r
+       border-radius: 0px;\r
 }\r
 \r
 div.bug_open, span.bug_open {\r
@@ -720,6 +721,8 @@ table.repositories td.icon img {
 \r
 table.repositories tr.group {\r
        background-color: #ccc;\r
+       border-left: 1px solid #ccc;\r
+       border-right: 1px solid #ccc;\r
 }\r
 \r
 table.repositories tr.group td {\r
@@ -834,8 +837,8 @@ td.date {
        white-space: nowrap;\r
 }\r
 \r
-span.sha1, span.sha1 a, span.sha1 a span, pre.commit_message {\r
-       font-family: monospace;\r
+span.sha1, span.sha1 a, span.sha1 a span, .commit_message {\r
+       font-family: consolas, monospace;\r
        font-size: 13px;\r
 }\r
 \r

diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.html b/src/com/gitblit/wicket/pages/CommitDiffPage.html
index a0fb5591bc2acca5e25ed7e4a21a9f12394a0163..de39f4ca5b65cbd97362cd89ae30fe776534d5ce 100644 (file)
--- a/src/com/gitblit/wicket/pages/CommitDiffPage.html
+++ b/src/com/gitblit/wicket/pages/CommitDiffPage.html
@@ -18,7 +18,7 @@
        <!-- changed paths -->\r
        <div style="padding-top:15px;">\r
                <!-- commit legend -->\r
-               <div style="text-align:right;" wicket:id="commitLegend"></div>\r
+               <div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div>\r
        \r
                <div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>\r
        </div>\r

diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html
index 354b7ba4f3209d20ac5515c137f073513e3442c8..20e6b60793c17dc605668c7be98ed55c19db1ea9 100644 (file)
--- 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>\r
                <tr><th></th><td><span class="sha1" wicket:id="commitAuthorDate">[author date]</span></td></tr>\r
                <tr><th><wicket:message key="gb.committer">committer</wicket:message></th><td><span class="sha1" wicket:id="commitCommitter">[committer]</span></td></tr>\r
-               <tr class="hidden-phone"><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr>\r
+               <tr><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr>\r
                <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>\r
                <tr class="hidden-phone"><th><wicket:message key="gb.tree">tree</wicket:message></th>\r
                        <td><span class="sha1" wicket:id="commitTree">[commit tree]</span>\r
@@ -49,7 +49,7 @@
        </div>\r
        \r
        <!-- full message -->\r
-       <pre class="commit_message" wicket:id="fullMessage">[commit message]</pre>\r
+       <div class="commit_message" wicket:id="fullMessage">[commit message]</div>\r
 \r
        <!--  git notes -->\r
        <table class="gitnotes">\r
@@ -68,7 +68,7 @@
        </table>\r
        \r
        <!--  commit legend -->\r
-       <div style="text-align:right;" wicket:id="commitLegend"></div>\r
+       <div class="hidden-phone" style="text-align:right;" wicket:id="commitLegend"></div>\r
        \r
        <!-- header -->\r
        <div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div>\r

diff --git a/src/com/gitblit/wicket/pages/DocsPage.html b/src/com/gitblit/wicket/pages/DocsPage.html
index 98432b5e4b3f3413d63e4486740b1285f0fdab79..ad93000c1a5d421f781b82da04dd4444019ef070 100644 (file)
--- 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>                      \r
                        <td class="size"><span wicket:id="docSize">[doc size]</span></td>\r
                        <td class="treeLinks">\r
-                               <span class="link">\r
+                               <span class="hidden-phone link">\r
                                        <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>\r
                                </span> \r
                        </td>\r

diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html
index 291ee4cf7841e138e028c8cd96a7e9dd4fbc2e1d..3195a937b407c56603b1b2bda25369078efbd257 100644 (file)
--- a/src/com/gitblit/wicket/pages/RepositoryPage.html
+++ b/src/com/gitblit/wicket/pages/RepositoryPage.html
@@ -54,7 +54,7 @@
                \r
                <wicket:fragment wicket:id="workingCopyFragment">\r
                        <p class="pull-right" style="padding-top:5px;">\r
-                               <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>\r
+                               <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>\r
                        </p>\r
                </wicket:fragment>\r
        </wicket:extend>\r

diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java
index d6cc51cd9368f7b9ef7eee8fe9a2e4f6d47d14e0..45822e16cc1a82bfc1d37267f7ebc93b4ca06c56 100644 (file)
--- 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 {
        }\r
 \r
        protected void addFullText(String wicketId, String text, boolean substituteRegex) {\r
-               String html;\r
+               String html = StringUtils.escapeForHtml(text, true);\r
                if (substituteRegex) {\r
                        html = GitBlit.self().processCommitMessage(repositoryName, text);\r
                } else {\r
-                       html = StringUtils.breakLinesForHtml(text);\r
+                       html = StringUtils.breakLinesForHtml(html);\r
                }\r
                add(new Label(wicketId, html).setEscapeModelStrings(false));\r
        }\r
@@ -254,7 +254,7 @@ public abstract class RepositoryPage extends BasePage {
                        setPersonSearchTooltip(nameLink, name, searchType);\r
                        fullPerson.add(nameLink);\r
 \r
-                       LinkPanel addressLink = new LinkPanel("personAddress", "list", "<" + address + ">",\r
+                       LinkPanel addressLink = new LinkPanel("personAddress", "hidden-phone list", "<" + address + ">",\r
                                        GitSearchPage.class, WicketUtils.newSearchParameter(repositoryName, objectId,\r
                                                        address, searchType));\r
                        setPersonSearchTooltip(addressLink, address, searchType);\r

diff --git a/src/com/gitblit/wicket/pages/TagPage.html b/src/com/gitblit/wicket/pages/TagPage.html
index b0df3a8a3431aa82d38c7ebacbef3d4bcafc4f5f..19f828e30ce517dae9743973fcb3a3cf7e20ac65 100644 (file)
--- a/src/com/gitblit/wicket/pages/TagPage.html
+++ b/src/com/gitblit/wicket/pages/TagPage.html
@@ -23,7 +23,7 @@
        </table>\r
        \r
        <!--  full message -->\r
-       <pre style="border-bottom:0px;" class="commit_message" wicket:id="fullMessage">[tag full message]</pre>\r
+       <div style="border-bottom:0px;" class="commit_message" wicket:id="fullMessage">[tag full message]</div>\r
        \r
        <wicket:fragment wicket:id="fullPersonIdent">\r
                <span wicket:id="personName"></span><span wicket:id="personAddress"></span>\r

diff --git a/src/com/gitblit/wicket/panels/SearchPanel.html b/src/com/gitblit/wicket/panels/SearchPanel.html
index 50f4638d0c718cd1ae8fc2a79dde66462592128d..74af71c5c13c4d4803b5e5829a45319725d3adfe 100644 (file)
--- 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>\r
                        <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>\r
                        <td class="rightAlign">\r
-                               <span class="link">\r
+                               <span class="hidden-phone link">\r
                                                <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>\r
                                        </span>\r
                                </td>\r