From b0e164283fee6f993589cce849ba1fc7d294e89d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 19 Oct 2012 22:47:33 -0400 Subject: [PATCH] New permissions UI for EditUser and EditTeam (issue 36) --- src/com/gitblit/wicket/pages/CommitPage.html | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html index 4012314..20e6b60 100644 --- a/src/com/gitblit/wicket/pages/CommitPage.html +++ b/src/com/gitblit/wicket/pages/CommitPage.html @@ -15,9 +15,10 @@ <!-- commit header --> <div wicket:id="commitHeader">[commit header]</div> - <!-- Author Gravatar --> - <span style="float:right;vertical-align: top;" wicket:id="authorAvatar" /> + <div class="row"> + + <div class="span10"> <!-- commit info --> <table class="plain"> <tr><th><wicket:message key="gb.refs">refs</wicket:message></th><td><div wicket:id="refsPanel">[references]</div></td></tr> @@ -25,14 +26,14 @@ <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><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr> - <tr><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr> - <tr><th><wicket:message key="gb.tree">tree</wicket:message></th> + <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> <span class="link"> <a wicket:id="treeLink"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="zipLink"><wicket:message key="gb.zip"></wicket:message></a> </span> </td></tr> - <tr><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th> + <tr class="hidden-phone"><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th> <td> <span wicket:id="commitParents"> <span class="sha1" wicket:id="commitParent">[commit parents]</span> @@ -43,9 +44,12 @@ </td> </tr> </table> + </div> + + </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"> @@ -64,17 +68,17 @@ </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"><wicket:message key="gb.changedFiles">[changed files]</wicket:message></div> + <div class="header"><i class="icon-file"></i> <wicket:message key="gb.changedFiles">[changed files]</wicket:message></div> <!-- changed paths --> <table class="pretty"> <tr wicket:id="changedPath"> <td class="changeType"><span wicket:id="changeType">[change type]</span></td> <td class="path"><span wicket:id="pathName">[commit path]</span></td> - <td class="rightAlign"> + <td class="hidden-phone rightAlign"> <span class="link"> <a wicket:id="diff"><wicket:message key="gb.diff"></wicket:message></a> | <a wicket:id="view"><wicket:message key="gb.view"></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> -- Gitblit v1.9.1