diff options
| author | James Moger <james.moger@gitblit.com> | 2011-09-29 20:52:50 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-09-29 20:52:50 -0400 |
| commit | 1f59156d03229aac15623e82dd6a85aaaa104919 (patch) | |
| tree | 9434a4af60ebc1ecb1a7ee3c4877b62d426c0216 /src | |
| parent | 5b5b31f125c33973aebbae28226163c716d2d332 (diff) | |
| download | gitblit-1f59156d03229aac15623e82dd6a85aaaa104919.tar.gz gitblit-1f59156d03229aac15623e82dd6a85aaaa104919.zip | |
Updating web ui to use Twitter's Bootstrap toolkit.
Diffstat (limited to 'src')
16 files changed, 97 insertions, 59 deletions
diff --git a/src/com/gitblit/wicket/pages/BasePage.html b/src/com/gitblit/wicket/pages/BasePage.html index aaf3a353..3fa1a4d5 100644 --- a/src/com/gitblit/wicket/pages/BasePage.html +++ b/src/com/gitblit/wicket/pages/BasePage.html @@ -7,20 +7,14 @@ <!-- Head -->
<wicket:head>
<title wicket:id="title">[page title]</title>
- <link rel="stylesheet" type="text/css" href="gitblit.css"/>
+ <link rel="stylesheet" href="bootstrap.130.css"/>
+ <link rel="stylesheet" type="text/css" href="bootstrap.gb.css"/>
<link rel="icon" href="gitblt-favicon.png" type="image/png" />
</wicket:head>
- <body>
- <!-- page header -->
- <div class="page_header">
- <a title="gitblit homepage" href="http://gitblit.com/">
- <img src="gitblt_25.png" width="79" height="25" alt="gitblit" class="logo"/>
- </a>
- <span>
- <span wicket:id="siteName">[site name]</span> / <span wicket:id="repositoryName">[repository name]</span> <span wicket:id="pageName">[page name]</span>
- </span>
- </div>
+ <body style="padding-top: 40px;">
+ <div class="container">
+ <div class="content">
<!-- page content -->
<wicket:child />
@@ -32,6 +26,8 @@ </div>
<div wicket:id="userPanel">[user panel]</div>
</div>
+ </div>
+ </div>
</body>
<!-- user fragment -->
diff --git a/src/com/gitblit/wicket/pages/BasePage.java b/src/com/gitblit/wicket/pages/BasePage.java index 0169c8e3..ebb4e897 100644 --- a/src/com/gitblit/wicket/pages/BasePage.java +++ b/src/com/gitblit/wicket/pages/BasePage.java @@ -87,21 +87,11 @@ public abstract class BasePage extends WebPage { }
protected void setupPage(String repositoryName, String pageName) {
-
if (repositoryName != null && repositoryName.trim().length() > 0) {
add(new Label("title", getServerName() + " - " + repositoryName));
} else {
add(new Label("title", getServerName()));
}
- // header
- String siteName = GitBlit.getString(Keys.web.siteName, Constants.NAME);
- if (siteName == null || siteName.trim().length() == 0) {
- siteName = Constants.NAME;
- }
- add(new LinkPanel("siteName", null, siteName, RepositoriesPage.class, null));
- add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class,
- WicketUtils.newRepositoryParameter(repositoryName)));
- add(new Label("pageName", pageName));
// Feedback panel for info, warning, and non-fatal error messages
add(new FeedbackPanel("feedback"));
diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/com/gitblit/wicket/pages/EditRepositoryPage.html index c33184da..4a9690b1 100644 --- a/src/com/gitblit/wicket/pages/EditRepositoryPage.html +++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.html @@ -30,7 +30,7 @@ <tr><td style="padding-top:10px;" colspan="2"><hr></hr></td></tr>
<tr><th><wicket:message key="gb.federationStrategy"></wicket:message></th><td class="edit"><select wicket:id="federationStrategy" tabindex="11" /></td></tr>
<tr><th style="vertical-align: top;"><wicket:message key="gb.federationSets"></wicket:message></th><td style="padding:2px;"><span wicket:id="federationSets"></span></td></tr>
- <tr><th></th><td class="editButton"><input type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" tabindex="12" /> <input type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="13" /></td></tr>
+ <tr><th></th><td class="editButton"><input class="btn primary" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" tabindex="12" /> <input class="btn" type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="13" /></td></tr>
</tbody>
</table>
</form>
diff --git a/src/com/gitblit/wicket/pages/EditUserPage.html b/src/com/gitblit/wicket/pages/EditUserPage.html index d36bf5a6..2f90bbfa 100644 --- a/src/com/gitblit/wicket/pages/EditUserPage.html +++ b/src/com/gitblit/wicket/pages/EditUserPage.html @@ -21,7 +21,7 @@ <tr><th><wicket:message key="gb.canAdmin"></wicket:message></th><td class="edit"><input type="checkbox" wicket:id="canAdmin" tabindex="6" /> <i><wicket:message key="gb.canAdminDescription"></wicket:message></i></td></tr>
<tr><th><wicket:message key="gb.excludeFromFederation"></wicket:message></th><td class="edit"><input type="checkbox" wicket:id="excludeFromFederation" tabindex="7" /> <i><wicket:message key="gb.excludeFromFederationDescription"></wicket:message></i></td></tr>
<tr><th style="vertical-align: top;"><wicket:message key="gb.restrictedRepositories"></wicket:message></th><td style="padding:2px;"><span wicket:id="repositories"></span></td></tr>
- <tr><th></th><td class="editButton"><input type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" tabindex="8" /> <input type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="9" /></td></tr>
+ <tr><th></th><td class="editButton"><input class="btn primary" type="submit" value="Save" wicket:message="value:gb.save" wicket:id="save" tabindex="8" /> <input class="btn" type="submit" value="Cancel" wicket:message="value:gb.cancel" wicket:id="cancel" tabindex="9" /></td></tr>
</tbody>
</table>
</form>
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.html b/src/com/gitblit/wicket/pages/RepositoriesPage.html index a0c58c9e..6aa55de9 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.html +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.html @@ -9,12 +9,23 @@ <body>
<wicket:extend>
- <!-- Filler div -->
- <div style="padding-top:18px;"></div>
-
- <div style="text-align:center;padding-bottom:5px;" wicket:id="feedback">[Feedback Panel]</div>
+<div class="topbar">
+ <div class="fill">
+ <div class="container">
+ <a class="brand" title="gitblit homepage" href="http://gitblit.com/">
+ <img src="gitblt_25.png" width="79" height="25" alt="gitblit" class="logo"/>
+ </a>
+<form class="pull-right" action="">
+<input class="input-small" type="text" placeholder="Username">
+<input class="input-small" type="password" placeholder="Password">
+<button class="btn primary" type="submit">Sign in</button>
+</form>
+</div>
+</div>
+</div>
+ <div style="text-align:center;padding-top:5px;" wicket:id="feedback">[Feedback Panel]</div>
- <div class="markdown" style="margin-top:-0.5em;padding-bottom:5px;" wicket:id="repositoriesMessage">[repositories message]</div>
+ <div class="markdown" style="margin-top:-1em;padding-bottom:5px;" wicket:id="repositoriesMessage">[repositories message]</div>
<div wicket:id="repositoriesPanel">[repositories panel]</div>
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.html b/src/com/gitblit/wicket/pages/RepositoryPage.html index e793a1e9..8a8b177e 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.html +++ b/src/com/gitblit/wicket/pages/RepositoryPage.html @@ -8,24 +8,42 @@ <wicket:extend>
<!-- page header bar -->
<div>
- <!-- floating search form on right -->
- <div class="search">
- <form wicket:id="searchForm">
- <select wicket:id="searchType"/>
- <input type="text" id="searchBox" wicket:id="searchBox" size="25" value=""/>
+ <!-- page nav links -->
+ <div class="topbar">
+ <div class="fill">
+ <div class="container">
+ <a class="brand" title="gitblit homepage" href="http://gitblit.com/">
+ <img src="gitblt_25.png" width="79" height="25" alt="gitblit" class="logo"/>
+ </a>
+ <ul class="nav">
+ <li><a wicket:id="repositories"><wicket:message key="gb.repositories"></wicket:message></a></li>
+ <li><a wicket:id="summary"><wicket:message key="gb.summary"></wicket:message></a></li>
+ <li><a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a></li>
+ <li><a wicket:id="branches"><wicket:message key="gb.branches"></wicket:message></a></li>
+ <li><a wicket:id="tags"><wicket:message key="gb.tags"></wicket:message></a></li>
+ <li><a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a></li>
+ <li wicket:id="extra"><span wicket:id="extraLink"></span></li>
+ <li><a style="text-decoration: none;" wicket:id="syndication">
+ <img style="border:0px;vertical-align:middle;" src="feed_16x16.png"></img></a>
+ </li>
+ </ul>
+ <form class="pull-right" wicket:id="searchForm">
+ <div class="search">
+ <select class="small" wicket:id="searchType"/>
+ <input type="text" id="searchBox" wicket:id="searchBox" value=""/>
+ </div>
</form>
+ </div>
</div>
-
- <!-- page nav links -->
- <div class="page_nav">
- <a style="text-decoration: none;" wicket:id="syndication">
- <img style="border:0px;vertical-align:middle;" src="feed_16x16.png"></img>
- </a>
- <a wicket:id="summary"><wicket:message key="gb.summary"></wicket:message></a> | <a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a> | <a wicket:id="branches"><wicket:message key="gb.branches"></wicket:message></a> | <a wicket:id="tags"><wicket:message key="gb.tags"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> <span wicket:id="extra"><span wicket:id="extraSeparator"></span><span wicket:id="extraLink"></span></span>
</div>
</div>
- <div style="text-align:center;" wicket:id="feedback">[Feedback Panel]</div>
+ <div style="text-align:center;padding-top:5px;" wicket:id="feedback">[Feedback Panel]</div>
+
+ <!-- page header -->
+ <div class="page-header">
+ <h2><span wicket:id="repositoryName">[repository name]</span> <small><span wicket:id="pageName">[page name]</span></small></h2>
+ </div>
<!-- page content -->
<wicket:child />
diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java index 7062e3b3..af29f591 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/com/gitblit/wicket/pages/RepositoryPage.java @@ -69,6 +69,7 @@ public abstract class RepositoryPage extends BasePage { private static final long serialVersionUID = 1L;
{
+ put("repositories", new PageRegistration("gb.repositories", RepositoriesPage.class, false));
put("summary", new PageRegistration("gb.summary", SummaryPage.class));
put("log", new PageRegistration("gb.log", LogPage.class));
put("branches", new PageRegistration("gb.branches", BranchesPage.class));
@@ -93,6 +94,7 @@ public abstract class RepositoryPage extends BasePage { RepositoryModel model = getRepositoryModel();
// standard page links
+ addRegisteredPageLink("repositories");
addRegisteredPageLink("summary");
addRegisteredPageLink("log");
addRegisteredPageLink("branches");
@@ -133,7 +135,6 @@ public abstract class RepositoryPage extends BasePage { public void populateItem(final Item<String> item) {
String extra = item.getModelObject();
PageRegistration pageReg = registeredPages.get(extra);
- item.add(new Label("extraSeparator", " | "));
item.add(new LinkPanel("extraLink", null, getString(pageReg.translationKey),
pageReg.pageClass, WicketUtils.newRepositoryParameter(repositoryName))
.setEnabled(!extra.equals(pageWicketId)));
@@ -155,6 +156,15 @@ public abstract class RepositoryPage extends BasePage { // set stateless page preference
setStatelessHint(true);
}
+
+ @Override
+ protected void setupPage(String repositoryName, String pageName) {
+ add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class,
+ WicketUtils.newRepositoryParameter(repositoryName)));
+ add(new Label("pageName", pageName));
+
+ super.setupPage(repositoryName, pageName);
+ }
public String getLinkWicketId(String pageName) {
for (String wicketId : registeredPages.keySet()) {
@@ -172,15 +182,20 @@ public abstract class RepositoryPage extends BasePage { if (!StringUtils.isEmpty(wicketId)) {
Component c = get(wicketId);
if (c != null) {
- c.setEnabled(false);
+ //c.setEnabled(false);
+ WicketUtils.setCssClass(c, "active");
}
}
}
private void addRegisteredPageLink(String key) {
PageRegistration pageReg = registeredPages.get(key);
- add(new BookmarkablePageLink<Void>(key, pageReg.pageClass,
- WicketUtils.newRepositoryParameter(repositoryName)));
+ if (pageReg.repositoryLink) {
+ add(new BookmarkablePageLink<Void>(key, pageReg.pageClass,
+ WicketUtils.newRepositoryParameter(repositoryName)));
+ } else {
+ add(new BookmarkablePageLink<Void>(key, pageReg.pageClass));
+ }
}
protected void addSyndicationDiscoveryLink() {
@@ -335,10 +350,16 @@ public abstract class RepositoryPage extends BasePage { final String translationKey;
final Class<? extends BasePage> pageClass;
+ final boolean repositoryLink;
PageRegistration(String translationKey, Class<? extends BasePage> pageClass) {
+ this(translationKey, pageClass, true);
+ }
+
+ PageRegistration(String translationKey, Class<? extends BasePage> pageClass, boolean repositoryLink) {
this.translationKey = translationKey;
this.pageClass = pageClass;
+ this.repositoryLink = repositoryLink;
}
}
diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.html b/src/com/gitblit/wicket/panels/BranchesPanel.html index c58f42ef..01fb8bac 100644 --- a/src/com/gitblit/wicket/panels/BranchesPanel.html +++ b/src/com/gitblit/wicket/panels/BranchesPanel.html @@ -8,7 +8,7 @@ <wicket:panel>
<!-- header -->
- <div class="header"><img style="vertical-align: top;" src="commit_branch_16x16.png"></img><span wicket:id="branches">[branches header]</span></div>
+ <div class="header"><img style="vertical-align: middle;" src="commit_branch_16x16.png"></img><span wicket:id="branches">[branches header]</span></div>
<table class="pretty">
<tbody>
diff --git a/src/com/gitblit/wicket/panels/FederationProposalsPanel.html b/src/com/gitblit/wicket/panels/FederationProposalsPanel.html index e451b7c5..89324d56 100644 --- a/src/com/gitblit/wicket/panels/FederationProposalsPanel.html +++ b/src/com/gitblit/wicket/panels/FederationProposalsPanel.html @@ -10,7 +10,7 @@ <table class="repositories">
<tr>
<th class="left">
- <img style="vertical-align: top; border: 1px solid #888; background-color: white;" src="federated_16x16.png"/>
+ <img style="vertical-align: middle; border: 1px solid #888; background-color: white;" src="federated_16x16.png"/>
<wicket:message key="gb.proposals">[proposals]</wicket:message>
</th>
<th><wicket:message key="gb.received">[received]</wicket:message></th>
diff --git a/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.html b/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.html index 6fab778f..fbc6f6cb 100644 --- a/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.html +++ b/src/com/gitblit/wicket/panels/FederationRegistrationsPanel.html @@ -10,7 +10,7 @@ <table class="repositories">
<tr>
<th class="left">
- <img style="vertical-align: top; border: 1px solid #888; background-color: white;" src="federated_16x16.png"/>
+ <img style="vertical-align: middle; border: 1px solid #888; background-color: white;" src="federated_16x16.png"/>
<wicket:message key="gb.registrations">[registrations]</wicket:message>
</th>
<th><wicket:message key="gb.name">[name]</wicket:message></th>
diff --git a/src/com/gitblit/wicket/panels/FederationTokensPanel.html b/src/com/gitblit/wicket/panels/FederationTokensPanel.html index 06c1869a..dc5307bb 100644 --- a/src/com/gitblit/wicket/panels/FederationTokensPanel.html +++ b/src/com/gitblit/wicket/panels/FederationTokensPanel.html @@ -15,7 +15,7 @@ <table class="repositories">
<tr>
<th class="left">
- <img style="vertical-align: top; border: 1px solid #888; background-color: white;" src="federated_16x16.png"/>
+ <img style="vertical-align: middle; border: 1px solid #888; background-color: white;" src="federated_16x16.png"/>
<wicket:message key="gb.tokens">[tokens]</wicket:message>
</th>
<th></th>
diff --git a/src/com/gitblit/wicket/panels/LogPanel.html b/src/com/gitblit/wicket/panels/LogPanel.html index 712a6628..700f66a1 100644 --- a/src/com/gitblit/wicket/panels/LogPanel.html +++ b/src/com/gitblit/wicket/panels/LogPanel.html @@ -8,7 +8,7 @@ <wicket:panel>
<!-- header -->
- <div class="header"><img style="vertical-align: top;" src="commit_changes_16x16.png"></img><span wicket:id="header">[log header]</span></div>
+ <div class="header"><img style="vertical-align: middle;" src="commit_changes_16x16.png"></img><span wicket:id="header">[log header]</span></div>
<table class="pretty">
<tbody>
<tr wicket:id="commit">
diff --git a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.html b/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.html index bd4b7921..c51ceac8 100644 --- a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.html +++ b/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.html @@ -7,9 +7,11 @@ <wicket:panel>
<!-- page path links -->
<div class="page_path">
- <span wicket:id="path">
- <span wicket:id="pathLink"></span> <span wicket:id="pathSeparator"></span>
- </span>
+ <ul class="breadcrumb">
+ <li wicket:id="path">
+ <span wicket:id="pathLink"></span> <span class="divider" wicket:id="pathSeparator"></span>
+ </li>
+ </ul>
</div>
</wicket:panel>
</html>
\ No newline at end of file diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.html b/src/com/gitblit/wicket/panels/RepositoriesPanel.html index 8d64f54b..11484e23 100644 --- a/src/com/gitblit/wicket/panels/RepositoriesPanel.html +++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.html @@ -21,7 +21,7 @@ <wicket:fragment wicket:id="adminLinks">
<!-- page nav links -->
<div class="admin_nav">
- <img style="vertical-align: top;" src="add_16x16.png"/>
+ <img style="vertical-align: middle;" src="add_16x16.png"/>
<a wicket:id="newRepository">
<wicket:message key="gb.newRepository"></wicket:message>
</a>
@@ -39,7 +39,7 @@ <wicket:fragment wicket:id="flatRepositoryHeader">
<tr>
<th class="left" wicket:id="orderByRepository">
- <img style="vertical-align: top; border: 1px solid #888;" src="gitweb-favicon.png"/>
+ <img style="vertical-align: middle; border: 1px solid #888;" src="gitweb-favicon.png"/>
<wicket:message key="gb.repository">Repository</wicket:message>
</th>
<th wicket:id="orderByDescription"><wicket:message key="gb.description">Description</wicket:message></th>
@@ -54,7 +54,7 @@ <wicket:fragment wicket:id="groupRepositoryHeader">
<tr>
<th class="left">
- <img style="vertical-align: top; border: 1px solid #888;" src="gitweb-favicon.png"/>
+ <img style="vertical-align: middle; border: 1px solid #888;" src="gitweb-favicon.png"/>
<wicket:message key="gb.repository">Repository</wicket:message>
</th>
<th><wicket:message key="gb.description">Description</wicket:message></th>
diff --git a/src/com/gitblit/wicket/panels/TagsPanel.html b/src/com/gitblit/wicket/panels/TagsPanel.html index 86eedd60..c9c19a37 100644 --- a/src/com/gitblit/wicket/panels/TagsPanel.html +++ b/src/com/gitblit/wicket/panels/TagsPanel.html @@ -8,7 +8,7 @@ <wicket:panel>
<!-- tags -->
- <div class="header"><img style="vertical-align: top;" src="tag_16x16.png"></img><span wicket:id="header">[tags header]</span></div>
+ <div class="header"><img style="vertical-align: middle;" src="tag_16x16.png"></img><span wicket:id="header">[tags header]</span></div>
<table class="pretty">
<tbody>
<tr wicket:id="tag">
diff --git a/src/com/gitblit/wicket/panels/UsersPanel.html b/src/com/gitblit/wicket/panels/UsersPanel.html index eed2a887..c81a3fd9 100644 --- a/src/com/gitblit/wicket/panels/UsersPanel.html +++ b/src/com/gitblit/wicket/panels/UsersPanel.html @@ -12,7 +12,7 @@ <table class="repositories">
<tr>
<th class="left">
- <img style="vertical-align: top; border: 1px solid #888; background-color: white;" src="user_16x16.png"/>
+ <img style="vertical-align: middle; border: 1px solid #888; background-color: white;" src="user_16x16.png"/>
<wicket:message key="gb.username">[username]</wicket:message>
</th>
<th class="right"></th>
@@ -28,7 +28,7 @@ <wicket:fragment wicket:id="adminLinks">
<!-- page nav links -->
<div class="admin_nav">
- <img style="vertical-align: top;" src="add_16x16.png"/>
+ <img style="vertical-align: middle;" src="add_16x16.png"/>
<a wicket:id="newUser">
<wicket:message key="gb.newUser"></wicket:message>
</a>
|