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/RepositoryPage.html | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html index 291ee4c..63a894d 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/com/gitblit/wicket/pages/RepositoryPage.html @@ -21,7 +21,7 @@ <div class="nav-collapse" wicket:id="navPanel"></div> - <a class="hidden-phone hidden-tablet brand" style="text-decoration: none;" wicket:id="syndication"> + <a class="hidden-phone hidden-tablet brand" style="text-decoration: none;" wicket:id="syndication" wicket:message="title:gb.feed"> <img style="border:0px;vertical-align:middle;" src="feed_16x16.png"></img> </a> @@ -42,9 +42,18 @@ <!-- page header --> <div class="pageTitle"> <div class="row"> - <div wicket:id="workingCopy"></div> - <div class="span9"> - <h2><span wicket:id="repositoryName">[repository name]</span> <small><span wicket:id="pageName">[page name]</span></small></h2> + <div class="controls"> + <span wicket:id="workingCopyIndicator"></span> + <span class="hidden-phone hidden-tablet" wicket:id="forksProhibitedIndicator"></span> + <div class="hidden-phone btn-group pull-right"> + <!-- future spot for other repo buttons --> + <a class="btn btn-info" wicket:id="myForkLink"><img style="border:0px;vertical-align:middle;" src="fork_16x16.png"></img> <wicket:message key="gb.myFork"></wicket:message></a> + <a class="btn btn-info" wicket:id="forkLink"><img style="border:0px;vertical-align:middle;" src="fork_16x16.png"></img> <wicket:message key="gb.fork"></wicket:message></a> + </div> + </div> + <div class="span7"> + <div><span class="project" wicket:id="projectTitle">[project title]</span>/<span class="repository" wicket:id="repositoryName">[repository name]</span> <span class="hidden-phone"><span wicket:id="pageName">[page name]</span></span></div> + <span wicket:id="originRepository">[origin repository]</span> </div> </div> </div> @@ -52,11 +61,22 @@ <wicket:child /> </div> - <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> - </p> + <wicket:fragment wicket:id="originFragment"> + <p class="originRepository"><wicket:message key="gb.forkedFrom">[forked from]</wicket:message> <span wicket:id="originRepository">[origin repository]</span></p> </wicket:fragment> + + <wicket:fragment wicket:id="workingCopyFragment"> + <div class="pull-right" style="padding-top:0px;margin-bottom:0px;padding-left:5px"> + <span class="alert alert-info" style="padding: 6px 14px 6px 14px;vertical-align: middle;"><i class="icon-exclamation-sign"></i> <span class="hidden-phone" wicket:id="workingCopy" style="font-weight:bold;">[working copy]</span></span> + </div> + </wicket:fragment> + + <wicket:fragment wicket:id="forksProhibitedFragment"> + <div class="pull-right" style="padding-top:0px;margin-bottom:0px;padding-left:5px"> + <span class="alert alert-error" style="padding: 6px 14px 6px 14px;vertical-align: middle;"><i class="icon-ban-circle"></i> <span class="hidden-phone" wicket:id="forksProhibited" style="font-weight:bold;">[forks prohibited]</span></span> + </div> + </wicket:fragment> + </wicket:extend> </body> </html> \ No newline at end of file -- Gitblit v1.9.1