From 27ae9095639bb228a1b7ff86a3ebe4264abf05be Mon Sep 17 00:00:00 2001 From: mschaefers <mschaefers@scoop-gmbh.de> Date: Thu, 29 Nov 2012 12:33:09 -0500 Subject: [PATCH] feature: when using LdapUserService one can configure Gitblit to fetch all users from ldap that can possibly login. This allows to see newly generated LDAP users instantly in Gitblit. By now an LDAP user had to log in once to appear in GitBlit. --- src/com/gitblit/wicket/pages/CommitPage.html | 100 +++++++++++++++++++++++++++++++++++++------------- 1 files changed, 74 insertions(+), 26 deletions(-) diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html index 0614c06..20e6b60 100644 --- a/src/com/gitblit/wicket/pages/CommitPage.html +++ b/src/com/gitblit/wicket/pages/CommitPage.html @@ -7,44 +7,92 @@ <body> <wicket:extend> - <!-- page nav links --> - <div wicket:id="pageLinks">[page links]</div> - <!-- commit nav links --> <div class="page_nav2"> - <wicket:message key="gb.parent"></wicket:message>: <span wicket:id="parentLink">[parent link]</span> | <span wicket:id="patchLink">[patch link]</span> | <span wicket:id="commitdiffLink">[commitdiff link]</span> + <wicket:message key="gb.parent"></wicket:message>: <span wicket:id="parentLink">[parent link]</span> | <a wicket:id="patchLink"><wicket:message key="gb.patch"></wicket:message></a> | <span wicket:id="commitdiffLink">[commitdiff link]</span> </div> - <!-- shortlog header --> - <div class="header" wicket:id="shortlog">[shortlog header]</div> + <!-- commit header --> + <div wicket:id="commitHeader">[commit header]</div> + <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> - <tr><th><wicket:message key="gb.author">author</wicket:message></th><td><span wicket:id="commitAuthor">[author</span></td></tr> - <tr><th></th><td><span wicket:id="commitAuthorDate">[author date]</span></td></tr> - <tr><th><wicket:message key="gb.committer">committer</wicket:message></th><td><span wicket:id="commitCommitter">[committer]</span></td></tr> - <tr><th></th><td><span wicket:id="commitCommitterDate">[commit date]</span></td></tr> - <tr><th><wicket:message key="gb.commit">commit</wicket:message></th><td class="sha1"><span wicket:id="commitId">[commit id]</span></td></tr> - <tr><th><wicket:message key="gb.tree">tree</wicket:message></th><td class="sha1"><span wicket:id="commitTree">[commit tree]</span></td></tr> - <tr><th><wicket:message key="gb.parent">parent</wicket:message></th><td class="sha1"><span wicket:id="commitParents"> - <div wicket:id="commitParent">[commit parents]</div></span></td></tr> - </table> - - <!-- full message --> - <div class="commit_message" wicket:id="fullMessage">[commit message]</div> - - <!-- changed paths --> - <table style="border-top:1px solid #bbb;" class="pretty"> - <tr wicket:id="changedPath"> - <td class="path"><span wicket:id="pathName">[commit path]</span></td> + <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><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> + <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 class="hidden-phone"><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th> <td> - <div 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="history"><wicket:message key="gb.history"></wicket:message></a> - </div> + <span wicket:id="commitParents"> + <span class="sha1" wicket:id="commitParent">[commit parents]</span> + <span class="link"> + <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="diff"><wicket:message key="gb.diff"></wicket:message></a> + </span><br/> + </span> </td> </tr> </table> + </div> + + </div> + + <!-- full message --> + <div class="commit_message" wicket:id="fullMessage">[commit message]</div> + + <!-- git notes --> + <table class="gitnotes"> + <tr wicket:id="notes"> + <td class="info"> + <table> + <tr><td><span wicket:id="refName"></span></td></tr> + <tr><td><span class="sha1" wicket:id="authorName"></span></td></tr> + <tr><td><span class="sha1" wicket:id="authorDate"></span></td></tr> + </table> + <!-- Note Author Gravatar --> + <span style="vertical-align: top;" wicket:id="noteAuthorAvatar" /> + </td> + <td class="message"><span class="sha1" wicket:id="noteContent"></span></td> + </tr> + </table> + + <!-- commit legend --> + <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> + + <!-- 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="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> + </td> + </tr> + </table> + + <wicket:fragment wicket:id="fullPersonIdent"> + <span wicket:id="personName"></span><span wicket:id="personAddress"></span> + </wicket:fragment> + + <wicket:fragment wicket:id="partialPersonIdent"> + <span wicket:id="personName"></span> + </wicket:fragment> </wicket:extend> </body> -- Gitblit v1.9.1