diff options
| author | James Moger <james.moger@gitblit.com> | 2012-02-04 00:28:37 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2012-02-04 00:28:37 -0500 |
| commit | ccab3a2abf1f4c3b61e6955afa50b03efdcc707c (patch) | |
| tree | 0c5f62460a6db882ea8404c00412e1bc2c25cd14 /src | |
| parent | 9c4725cba1e4e07c55061afb435d0d4228cf89ba (diff) | |
| download | gitblit-ccab3a2abf1f4c3b61e6955afa50b03efdcc707c.tar.gz gitblit-ccab3a2abf1f4c3b61e6955afa50b03efdcc707c.zip | |
Indicate WORKING COPY on repository pages (issue 49)
Diffstat (limited to 'src')
4 files changed, 14 insertions, 2 deletions
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index 1a8513a5..b5cd5150 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -210,4 +210,6 @@ gb.accessPermissionsForTeamDescription = set team members and grant access to sp gb.federationRepositoryDescription = share this repository with other Gitblit servers
gb.hookScriptsDescription = run Groovy scripts on pushes to this Gitblit server
gb.reset = reset
-gb.pages = pages
\ No newline at end of file +gb.pages = pages
+gb.workingCopy = WORKING COPY
+gb.workingCopyWarning = this repository has a working copy and can not receive pushes
\ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html index c60275ab..d69c7f90 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/com/gitblit/wicket/pages/RepositoryPage.html @@ -37,6 +37,9 @@ <!-- page header -->
<div class="page-header">
+ <div style="float:right;padding-top:5px;">
+ <span class="label important" wicket:id="workingCopy">[working copy]</span>
+ </div>
<h2><span wicket:id="repositoryName">[repository name]</span> <small><span wicket:id="pageName">[page name]</span></small></h2>
</div>
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java index 5f544012..77918ea4 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/com/gitblit/wicket/pages/RepositoryPage.java @@ -153,6 +153,13 @@ public abstract class RepositoryPage extends BasePage { add(new LinkPanel("repositoryName", null, StringUtils.stripDotGit(repositoryName),
SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryName)));
add(new Label("pageName", pageName));
+ if (getRepositoryModel().isBare) {
+ add(new Label("workingCopy").setVisible(false));
+ } else {
+ Label lbl = new Label("workingCopy", getString("gb.workingCopy"));
+ WicketUtils.setHtmlTooltip(lbl, getString("gb.workingCopyWarning"));
+ add(lbl);
+ }
super.setupPage(repositoryName, pageName);
}
diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/com/gitblit/wicket/panels/RepositoriesPanel.java index 4dcdab48..ee6e1191 100644 --- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java +++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.java @@ -155,7 +155,7 @@ public class RepositoriesPanel extends BasePanel { swatch = new Label("repositorySwatch", " ").setEscapeModelStrings(false);
} else {
swatch = new Label("repositorySwatch", "!");
- WicketUtils.setHtmlTooltip(swatch, "This repository has a working copy and can not receive pushes");
+ WicketUtils.setHtmlTooltip(swatch, getString("gb.workingCopyWarning"));
}
WicketUtils.setCssBackground(swatch, entry.toString());
row.add(swatch);
|