From 9ab5cc754c62ac9f7aa58b1f64fda7532cdad05b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 13 Apr 2011 15:53:19 -0400
Subject: [PATCH] Html and Css simplifications.
---
src/com/gitblit/wicket/pages/TreePage.java | 1
src/com/gitblit/wicket/panels/TagsPanel.html | 4 +-
src/com/gitblit/wicket/pages/TagPage.html | 2
src/com/gitblit/wicket/pages/TreePage.html | 10 ++--
src/com/gitblit/wicket/pages/CommitPage.html | 20 +++++++---
src/com/gitblit/wicket/BasePage.java | 2
src/com/gitblit/wicket/resources/gitblit.css | 25 ++++--------
src/com/gitblit/wicket/panels/LogPanel.html | 7 ++-
src/com/gitblit/wicket/pages/CommitDiffPage.html | 4 +-
src/com/gitblit/wicket/pages/CommitPage.java | 2 +
src/com/gitblit/wicket/pages/TicGitTicketPage.html | 2
src/com/gitblit/wicket/pages/TagPage.java | 21 +++++++---
src/com/gitblit/wicket/panels/BranchesPanel.html | 4 +-
13 files changed, 59 insertions(+), 45 deletions(-)
diff --git a/src/com/gitblit/wicket/BasePage.java b/src/com/gitblit/wicket/BasePage.java
index 7a512d6..3121804 100644
--- a/src/com/gitblit/wicket/BasePage.java
+++ b/src/com/gitblit/wicket/BasePage.java
@@ -39,7 +39,7 @@
siteName = Constants.NAME;
}
add(new Label("siteName", siteName));
- add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class, new PageParameters("p=" + repositoryName)));
+ add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class, WicketUtils.newRepositoryParameter(repositoryName)));
add(new Label("pageName", pageName));
// footer
diff --git a/src/com/gitblit/wicket/pages/CommitDiffPage.html b/src/com/gitblit/wicket/pages/CommitDiffPage.html
index 2759de8..af731a0 100644
--- a/src/com/gitblit/wicket/pages/CommitDiffPage.html
+++ b/src/com/gitblit/wicket/pages/CommitDiffPage.html
@@ -23,9 +23,9 @@
<tr wicket:id="changedPath">
<td class="path"><span wicket:id="pathName">[commit path]</span></td>
<td>
- <div class="link">
+ <span class="link">
<a wicket:id="patch"><wicket:message key="gb.patch"></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>
- </div>
+ </span>
</td>
</tr>
</table>
diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html
index a65c588..a639f4a 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.html
+++ b/src/com/gitblit/wicket/pages/CommitPage.html
@@ -25,10 +25,18 @@
<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>
+ <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><td><span class="sha1" wicket:id="commitTree">[commit tree]</span></td></tr>
+ <tr><th><wicket:message key="gb.parent">parent</wicket:message></th>
+ <td>
+ <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>
+ </span>
+ </td>
+ </tr>
</table>
<!-- full message -->
@@ -39,9 +47,9 @@
<tr wicket:id="changedPath">
<td class="path"><span wicket:id="pathName">[commit path]</span></td>
<td>
- <div class="link">
+ <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>
- </div>
+ </span>
</td>
</tr>
</table>
diff --git a/src/com/gitblit/wicket/pages/CommitPage.java b/src/com/gitblit/wicket/pages/CommitPage.java
index d906f07..7e3403d 100644
--- a/src/com/gitblit/wicket/pages/CommitPage.java
+++ b/src/com/gitblit/wicket/pages/CommitPage.java
@@ -67,6 +67,8 @@
public void populateItem(final Item<String> item) {
String entry = item.getModelObject();
item.add(new LinkPanel("commitParent", "list", entry, CommitPage.class, newCommitParameter(entry)));
+ item.add(new BookmarkablePageLink<Void>("view", CommitPage.class, newCommitParameter(entry)));
+ item.add(new BookmarkablePageLink<Void>("diff", CommitDiffPage.class, newCommitParameter(entry)));
}
};
add(parentsView);
diff --git a/src/com/gitblit/wicket/pages/TagPage.html b/src/com/gitblit/wicket/pages/TagPage.html
index 4eb3b4b..42a7585 100644
--- a/src/com/gitblit/wicket/pages/TagPage.html
+++ b/src/com/gitblit/wicket/pages/TagPage.html
@@ -15,7 +15,7 @@
<!-- commit info -->
<table class="plain">
- <tr><th><wicket:message key="gb.object">object</wicket:message></th><td><span wicket:id="tagId">[tag id]</span></td></tr>
+ <tr><th><wicket:message key="gb.object">object</wicket:message></th><td><span class="sha1" wicket:id="tagId">[tag id]</span></td></tr>
<tr><th><wicket:message key="gb.author">author</wicket:message></th><td><span wicket:id="tagAuthor">[tag author]</span></td></tr>
<tr><th></th><td><span wicket:id="tagDate">[tag date]</span></td></tr>
</table>
diff --git a/src/com/gitblit/wicket/pages/TagPage.java b/src/com/gitblit/wicket/pages/TagPage.java
index 622c2b1..e6f2fd6 100644
--- a/src/com/gitblit/wicket/pages/TagPage.java
+++ b/src/com/gitblit/wicket/pages/TagPage.java
@@ -23,16 +23,25 @@
List<RefModel> tags = JGitUtils.getTags(r, -1);
RevCommit c = JGitUtils.getCommit(r, objectId);
- String name = c.getName();
+ RefModel tagRef = null;
+ // determine tag
for (RefModel tag:tags) {
- if (tag.getName().equals(objectId)) {
- name = tag.getDisplayName();
+ if (tag.getName().equals(objectId) || tag.getObjectId().getName().equals(objectId)) {
+ tagRef = tag;
+ break;
}
}
- add(new LinkPanel("commit", "title", name, CommitPage.class, newCommitParameter()));
-
- add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class, newCommitParameter(c.getName())));
+ if (tagRef == null) {
+ // point to commit
+ add(new LinkPanel("commit", "title", c.getShortMessage(), CommitPage.class, newCommitParameter()));
+ add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class, newCommitParameter(c.getName())));
+ } else {
+ // TODO commit or tree or blob?
+ add(new LinkPanel("commit", "title", tagRef.getDisplayName(), CommitPage.class, newCommitParameter()));
+ add(new LinkPanel("tagId", "list", c.getName(), CommitPage.class, newCommitParameter(c.getName())));
+ }
+
add(new Label("tagAuthor", JGitUtils.getDisplayName(c.getAuthorIdent())));
add(WicketUtils.createTimestampLabel("tagDate", c.getAuthorIdent().getWhen(), getTimeZone()));
diff --git a/src/com/gitblit/wicket/pages/TicGitTicketPage.html b/src/com/gitblit/wicket/pages/TicGitTicketPage.html
index 47fa87b..1746266 100644
--- a/src/com/gitblit/wicket/pages/TicGitTicketPage.html
+++ b/src/com/gitblit/wicket/pages/TicGitTicketPage.html
@@ -15,7 +15,7 @@
<!-- ticket info -->
<table class="plain">
- <tr><th><wicket:message key="gb.ticketId">ticket id</wicket:message></th><td class="sha1"><span wicket:id="ticketId">[ticket id]</span></td></tr>
+ <tr><th><wicket:message key="gb.ticketId">ticket id</wicket:message></th><td><span class="sha1" wicket:id="ticketId">[ticket id]</span></td></tr>
<tr><th><wicket:message key="gb.ticketAssigned">assigned</wicket:message></th><td><span wicket:id=ticketHandler>[ticket title]</span></td></tr>
<tr><th><wicket:message key="gb.ticketOpenDate">open date</wicket:message></th><td><span wicket:id="ticketOpenDate">[ticket open date]</span></td></tr>
<tr><th><wicket:message key="gb.ticketState">state</wicket:message></th><td><span wicket:id="ticketState">[ticket state]</span></td></tr>
diff --git a/src/com/gitblit/wicket/pages/TreePage.html b/src/com/gitblit/wicket/pages/TreePage.html
index 85fbdfc..add03eb 100644
--- a/src/com/gitblit/wicket/pages/TreePage.html
+++ b/src/com/gitblit/wicket/pages/TreePage.html
@@ -33,16 +33,16 @@
<!-- tree links -->
<wicket:fragment wicket:id="treeLinks">
- <div class="link">
+ <span class="link">
<a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a>
- </div>
+ </span>
</wicket:fragment>
<!-- blob links -->
<wicket:fragment wicket:id="blobLinks">
- <div class="link">
- <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="raw"><wicket:message key="gb.raw"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a>
- </div>
+ <span class="link">
+ <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="raw"><wicket:message key="gb.raw"></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>
</wicket:fragment>
</wicket:extend>
diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java
index 2bea987..d83939e 100644
--- a/src/com/gitblit/wicket/pages/TreePage.java
+++ b/src/com/gitblit/wicket/pages/TreePage.java
@@ -82,6 +82,7 @@
Fragment links = new Fragment("pathLinks", "blobLinks", this);
links.add(new BookmarkablePageLink<Void>("view", BlobPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
links.add(new BookmarkablePageLink<Void>("raw", RawPage.class, WicketUtils.newPathParameter(repositoryName, entry.commitId, entry.path)));
+ links.add(new BookmarkablePageLink<Void>("blame", BlobPage.class).setEnabled(false));
links.add(new BookmarkablePageLink<Void>("history", BlobPage.class).setEnabled(false));
item.add(links);
}
diff --git a/src/com/gitblit/wicket/panels/BranchesPanel.html b/src/com/gitblit/wicket/panels/BranchesPanel.html
index 78774f2..76c3e09 100644
--- a/src/com/gitblit/wicket/panels/BranchesPanel.html
+++ b/src/com/gitblit/wicket/panels/BranchesPanel.html
@@ -17,9 +17,9 @@
<td><span wicket:id="branchName">[branch name]</span></td>
<td><span wicket:id="branchType">[branch type]</span></td>
<td class="rightAlign">
- <div class="link">
+ <span class="link">
<a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a>
- </div>
+ </span>
</td>
</tr>
</tbody>
diff --git a/src/com/gitblit/wicket/panels/LogPanel.html b/src/com/gitblit/wicket/panels/LogPanel.html
index e12d1b8..0a746ba 100644
--- a/src/com/gitblit/wicket/panels/LogPanel.html
+++ b/src/com/gitblit/wicket/panels/LogPanel.html
@@ -17,9 +17,10 @@
<td class="author"><span wicket:id="commitAuthor">[commit author]</span></td>
<td><div wicket:id="commitShortMessage">[commit short message]</div></td>
<td class="rightAlign"><div wicket:id="commitRefs">[commit refs]</div></td>
- <td class="rightAlign"><div 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> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a>
- </div>
+ <td class="rightAlign">
+ <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> | <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a>
+ </span>
</td>
</tr>
</tbody>
diff --git a/src/com/gitblit/wicket/panels/TagsPanel.html b/src/com/gitblit/wicket/panels/TagsPanel.html
index 8b90655..0255a72 100644
--- a/src/com/gitblit/wicket/panels/TagsPanel.html
+++ b/src/com/gitblit/wicket/panels/TagsPanel.html
@@ -16,9 +16,9 @@
<td><b><span wicket:id="tagName">[tag name]</span></b></td>
<td><span wicket:id="tagDescription">[tag description]</span></td>
<td class="rightAlign">
- <div class="link">
+ <span class="link">
<a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="commit"><wicket:message key="gb.commit"></wicket:message></a> | <a wicket:id="log"><wicket:message key="gb.log"></wicket:message></a>
- </div>
+ </span>
</td>
</tr>
</tbody>
diff --git a/src/com/gitblit/wicket/resources/gitblit.css b/src/com/gitblit/wicket/resources/gitblit.css
index da0c317..bb99350 100644
--- a/src/com/gitblit/wicket/resources/gitblit.css
+++ b/src/com/gitblit/wicket/resources/gitblit.css
@@ -87,26 +87,15 @@
padding: 0px 0px 15px 5px;
}
-div.link {
- padding: 2px 5px;
+span.link, span.link a {
font-family: sans-serif;
font-size: 11px;
}
-div.link span {
- font-family: inherit;
- font-size: inherit;
-}
-
-div.link a {
- font-family: inherit;
- font-size: inherit;
-}
-
-div.link em, div.link span em {
+span.link em, div.link span em {
font-style: normal;
- font-family: inherit;
- font-size: inherit;
+ font-family: sans-serif;
+ font-size: 11px;
}
div.page_header {
@@ -311,6 +300,10 @@
border-right: 1px solid #bbb;
}
+table.pretty td {
+ padding: 2px 4px;
+}
+
table.repositories {
width:100%;
}
@@ -388,7 +381,7 @@
font-style: italic;
}
-td.sha1, td.sha1 span {
+span.sha1, span.sha1 a, span.sha1 a span {
font-family: monospace;
font-size: 13px;
}
--
Gitblit v1.9.1