diff options
| author | James Moger <james.moger@gitblit.com> | 2011-04-04 16:13:11 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2011-04-04 16:13:11 -0400 |
| commit | fc84260e4238fda10842c1bd3b9fb0cb74b95426 (patch) | |
| tree | 8cdb945c3679678a0c4aa32d2f179c5097a70da1 /src/com/gitblit | |
| parent | 8aadfad0de588bc7b1aecd9c3327ec5c44607179 (diff) | |
| download | gitblit-fc84260e4238fda10842c1bd3b9fb0cb74b95426.tar.gz gitblit-fc84260e4238fda10842c1bd3b9fb0cb74b95426.zip | |
Dropped log links, created new stylesheet, added activity graph.
Diffstat (limited to 'src/com/gitblit')
32 files changed, 260 insertions, 288 deletions
diff --git a/src/com/gitblit/utils/JGitUtils.java b/src/com/gitblit/utils/JGitUtils.java index 673c9870..31b56777 100644 --- a/src/com/gitblit/utils/JGitUtils.java +++ b/src/com/gitblit/utils/JGitUtils.java @@ -5,6 +5,8 @@ import java.io.File; import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -35,10 +37,10 @@ import org.eclipse.jgit.treewalk.filter.PathFilterGroup; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.gitblit.wicket.models.Metric;
import com.gitblit.wicket.models.PathModel;
import com.gitblit.wicket.models.RefModel;
-
public class JGitUtils {
/** Prefix for notes refs */
@@ -204,7 +206,7 @@ public class JGitUtils { public static List<PathModel> getFilesInPath(Repository r, String basePath, RevCommit commit) {
List<PathModel> list = new ArrayList<PathModel>();
- final TreeWalk walk = new TreeWalk(r);
+ final TreeWalk walk = new TreeWalk(r);
try {
walk.addTree(commit.getTree());
if (basePath != null && basePath.length() > 0) {
@@ -214,7 +216,7 @@ public class JGitUtils { boolean foundFolder = false;
while (walk.next()) {
if (!foundFolder && walk.isSubtree()) {
- walk.enterSubtree();
+ walk.enterSubtree();
}
if (walk.getPathString().equals(basePath)) {
foundFolder = true;
@@ -264,7 +266,7 @@ public class JGitUtils { return list;
}
- private static PathModel getPathModel(TreeWalk walk, String basePath, RevCommit commit) {
+ private static PathModel getPathModel(TreeWalk walk, String basePath, RevCommit commit) {
String name;
long size = 0;
if (basePath == null) {
@@ -310,7 +312,6 @@ public class JGitUtils { return FileMode.TREE.equals(mode);
}
-
public static List<RevCommit> getRevLog(Repository r, int maxCount) {
List<RevCommit> list = new ArrayList<RevCommit>();
try {
@@ -427,4 +428,29 @@ public class JGitUtils { }
return null;
}
+
+ public static List<Metric> getDateMetrics(Repository r) {
+ final Map<String, Metric> map = new HashMap<String, Metric>();
+ try {
+ DateFormat df = new SimpleDateFormat("yyyy-MM");
+ Git git = new Git(r);
+ Iterable<RevCommit> revlog = git.log().call();
+ for (RevCommit rev : revlog) {
+ Date d = getCommitDate(rev);
+ String p = df.format(d);
+ if (!map.containsKey(p))
+ map.put(p, new Metric(p));
+ map.get(p).count++;
+ }
+ } catch (Throwable t) {
+ LOGGER.error("Failed to mine log history for metrics", t);
+ }
+ List<String> keys = new ArrayList<String>(map.keySet());
+ Collections.sort(keys);
+ List<Metric> metrics = new ArrayList<Metric>();
+ for (String key:keys) {
+ metrics.add(map.get(key));
+ }
+ return metrics;
+ }
}
diff --git a/src/com/gitblit/wicket/GitBlitWebApp.java b/src/com/gitblit/wicket/GitBlitWebApp.java index d971cb77..86b6ba6e 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.java +++ b/src/com/gitblit/wicket/GitBlitWebApp.java @@ -32,7 +32,6 @@ import com.gitblit.wicket.pages.AboutPage; import com.gitblit.wicket.pages.BlobPage;
import com.gitblit.wicket.pages.CommitPage;
import com.gitblit.wicket.pages.HeadsPage;
-import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.RepositoriesPage;
import com.gitblit.wicket.pages.ShortLogPage;
import com.gitblit.wicket.pages.SummaryPage;
@@ -64,7 +63,6 @@ public class GitBlitWebApp extends WebApplication { mount(new MixedParamUrlCodingStrategy("/about", AboutPage.class, new String[] { }));
mount(new MixedParamUrlCodingStrategy("/summary", SummaryPage.class, new String[] { "p" }));
mount(new MixedParamUrlCodingStrategy("/shortlog", ShortLogPage.class, new String[] { "p", "h" }));
- mount(new MixedParamUrlCodingStrategy("/log", LogPage.class, new String[] { "p", "h" }));
mount(new MixedParamUrlCodingStrategy("/tags", TagsPage.class, new String[] { "p" }));
mount(new MixedParamUrlCodingStrategy("/heads", HeadsPage.class, new String[] { "p" }));
mount(new MixedParamUrlCodingStrategy("/commit", CommitPage.class, new String[] { "p", "h" }));
diff --git a/src/com/gitblit/wicket/WicketUtils.java b/src/com/gitblit/wicket/WicketUtils.java index 1d85a80b..e46a473a 100644 --- a/src/com/gitblit/wicket/WicketUtils.java +++ b/src/com/gitblit/wicket/WicketUtils.java @@ -1,32 +1,20 @@ package com.gitblit.wicket;
-import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
-import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.behavior.SimpleAttributeModifier;
public class WicketUtils {
public static void setCssClass(Component container, String value) {
- container.add(newAttributeModifier("class", value));
+ container.add(new SimpleAttributeModifier("class", value));
}
public static void setCssStyle(Component container, String value) {
- container.add(newAttributeModifier("style", value));
+ container.add(new SimpleAttributeModifier("style", value));
}
public static void setHtmlTitle(Component container, String value) {
- container.add(newAttributeModifier("title", value));
- }
-
- private static AttributeModifier newAttributeModifier(String attrib, final String value) {
- return new AttributeModifier(attrib, true, new AbstractReadOnlyModel<String>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getObject() {
- return value;
- }
- });
+ container.add(new SimpleAttributeModifier("title", value));
}
public static String breakLines(String string) {
diff --git a/src/com/gitblit/wicket/models/Metric.java b/src/com/gitblit/wicket/models/Metric.java new file mode 100644 index 00000000..a5efb139 --- /dev/null +++ b/src/com/gitblit/wicket/models/Metric.java @@ -0,0 +1,15 @@ +package com.gitblit.wicket.models;
+
+import java.io.Serializable;
+
+public class Metric implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ public String name;
+ public double count;
+
+ public Metric(String name) {
+ this.name = name;
+ }
+}
\ No newline at end of file diff --git a/src/com/gitblit/wicket/models/PathModel.java b/src/com/gitblit/wicket/models/PathModel.java index 3fa0f633..cd44730a 100644 --- a/src/com/gitblit/wicket/models/PathModel.java +++ b/src/com/gitblit/wicket/models/PathModel.java @@ -40,6 +40,15 @@ public class PathModel implements Serializable, Comparable<PathModel> { @Override
public int compareTo(PathModel o) {
- return path.compareTo(o.path);
+ boolean isTree = isTree();
+ boolean otherTree = o.isTree();
+ if (isTree && otherTree) {
+ return path.compareTo(o.path);
+ } else if (!isTree && !otherTree) {
+ return path.compareTo(o.path);
+ } else if (isTree && !otherTree) {
+ return -1;
+ }
+ return 1;
}
}
diff --git a/src/com/gitblit/wicket/pages/BlobPage.java b/src/com/gitblit/wicket/pages/BlobPage.java index 979bb261..cfbfaa40 100644 --- a/src/com/gitblit/wicket/pages/BlobPage.java +++ b/src/com/gitblit/wicket/pages/BlobPage.java @@ -20,7 +20,7 @@ import com.gitblit.wicket.panels.PathBreadcrumbsPanel; public class BlobPage extends RepositoryPage {
public BlobPage(PageParameters params) {
- super(params, "blob");
+ super(params, "view");
final String blobPath = params.getString("f", null);
@@ -29,7 +29,7 @@ public class BlobPage extends RepositoryPage { // blob page links
add(new Label("historyLink", "history"));
- add(new Label("rawLink", "raw"));
+ add(new Label("rawLink", "download"));
add(new Label("headLink", "HEAD"));
add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));
diff --git a/src/com/gitblit/wicket/pages/CommitPage.html b/src/com/gitblit/wicket/pages/CommitPage.html index a493e047..c2edbea3 100644 --- a/src/com/gitblit/wicket/pages/CommitPage.html +++ b/src/com/gitblit/wicket/pages/CommitPage.html @@ -9,38 +9,32 @@ <!-- commit nav links -->
<div class="page_nav2">
- (parent: <span wicket:id="parentLink"></span>) | <span wicket:id="patchLink"></span>
+ parent: <span wicket:id="parentLink"></span> | <span wicket:id="patchLink"></span>
</div>
<!-- shortlog header -->
<div class="header" wicket:id="shortlog"></div>
- <!-- Refs -->
- <div wicket:id="refsPanel"></div>
-
<!-- commit info -->
- <div class="title_text">
- <table class="object_header">
- <tr><td>author</td><td><span wicket:id="commitAuthor">Message goes here</span></td></tr>
- <tr><td></td><td><span wicket:id="commitAuthorDate">Message goes here</span></td></tr>
- <tr><td>committer</td><td><span wicket:id="commitCommitter">Message goes here</span></td></tr>
- <tr><td></td><td><span wicket:id="commitCommitterDate">Message goes here</span></td></tr>
- <tr><td>commit</td><td class="sha1"><span wicket:id="commitId">Message goes here</span></td></tr>
- <tr><td>tree</td><td class="sha1"><span wicket:id="commitTree">Message goes here</span></td></tr>
- <tr><td>parent</td><td class="sha1"><span wicket:id="commitParents">
+ <table class="plain">
+ <tr><th>refs</th><td><div wicket:id="refsPanel"></div></td></tr>
+ <tr><th>author</th><td><span wicket:id="commitAuthor">Message goes here</span></td></tr>
+ <tr><th></th><td><span wicket:id="commitAuthorDate">Message goes here</span></td></tr>
+ <tr><th>committer</th><td><span wicket:id="commitCommitter">Message goes here</span></td></tr>
+ <tr><th></th><td><span wicket:id="commitCommitterDate">Message goes here</span></td></tr>
+ <tr><th>commit</th><td class="sha1"><span wicket:id="commitId">Message goes here</span></td></tr>
+ <tr><th>tree</th><td class="sha1"><span wicket:id="commitTree">Message goes here</span></td></tr>
+ <tr><th>parent</th><td class="sha1"><span wicket:id="commitParents">
<div wicket:id="commitParent">Message goes here</div></span></td></tr>
</table>
- </div>
<!-- full message -->
- <div class="page_body" wicket:id="fullMessage"></div>
+ <div class="commit_message" wicket:id="fullMessage"></div>
<!-- changed paths -->
- <div class="list_head"></div>
- <table class="diff_tree">
+ <table class="pretty">
<tr wicket:id="changedPath">
- <td class="path"><span wicket:id="pathName"></span></td>
- <td></td>
+ <td class="path"><span wicket:id="pathName"></span></td>
<td><span wicket:id="pathLinks"></span></td>
</tr>
</table>
diff --git a/src/com/gitblit/wicket/pages/HeadsPage.html b/src/com/gitblit/wicket/pages/HeadsPage.html index cd914363..ed99c894 100644 --- a/src/com/gitblit/wicket/pages/HeadsPage.html +++ b/src/com/gitblit/wicket/pages/HeadsPage.html @@ -8,9 +8,8 @@ <div wicket:id="pageLinks"></div>
<!-- shortlog -->
- <div class="header" wicket:id="summary"></div>
-
- <table class="heads">
+ <div class="header" wicket:id="summary"></div>
+ <table>
<tbody>
<tr wicket:id="head">
<td><i><span wicket:id="headDate"></span></i></td>
diff --git a/src/com/gitblit/wicket/pages/LogPage.html b/src/com/gitblit/wicket/pages/LogPage.html deleted file mode 100644 index 3c1b54b9..00000000 --- a/src/com/gitblit/wicket/pages/LogPage.html +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<html xmlns="http://www.w3.org/1999/xhtml" >
-<body>
- <!-- page header -->
- <div wicket:id="pageHeader"></div>
-
- <!-- page nav links -->
- <div wicket:id="pageLinks"></div>
-
- <!-- summary header -->
- <div class="header" wicket:id="summary"></div>
-
- <!-- log -->
- <div wicket:id="commit">
- <div class="header">
- <b><span class="age" wicket:id="timeAgo"></span></b>
- <span wicket:id="link"></span>
- </div>
- <div wicket:id="commitRefs"></div>
- <div class="title_text">
- <div class="log_link">commit | commitdiff | tree</div>
- <span wicket:id="commitAuthor"></span>
- <span wicket:id="commitDate"></span>
- </div>
- <div class="log_body" wicket:id="fullMessage"></div>
- </div>
-
- <div wicket:id="navigator"></div>
-
- <!-- footer -->
- <div wicket:id="pageFooter"></div>
-</body>
-</html>
\ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/LogPage.java b/src/com/gitblit/wicket/pages/LogPage.java deleted file mode 100644 index 325596ab..00000000 --- a/src/com/gitblit/wicket/pages/LogPage.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.gitblit.wicket.pages;
-
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.markup.repeater.data.ListDataProvider;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import com.gitblit.utils.JGitUtils;
-import com.gitblit.utils.Utils;
-import com.gitblit.wicket.GitBlitWebApp;
-import com.gitblit.wicket.GitBlitWebSession;
-import com.gitblit.wicket.LinkPanel;
-import com.gitblit.wicket.RepositoryPage;
-import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.panels.RefsPanel;
-
-
-public class LogPage extends RepositoryPage {
-
- public LogPage(PageParameters params) {
- super(params, "log");
-
- Repository r = getRepository();
- final Map<ObjectId, List<String>> allRefs = JGitUtils.getAllRefs(r);
- List<RevCommit> commits = JGitUtils.getRevLog(r, 100);
- r.close();
-
- add(new LinkPanel("summary", "title", repositoryName, SummaryPage.class, newRepositoryParameter()));
-
- // log
- ListDataProvider<RevCommit> dp = new ListDataProvider<RevCommit>(commits);
- DataView<RevCommit> logView = new DataView<RevCommit>("commit", dp) {
- private static final long serialVersionUID = 1L;
-
- public void populateItem(final Item<RevCommit> item) {
- final RevCommit entry = item.getModelObject();
- final Date date = JGitUtils.getCommitDate(entry);
-
- item.add(new Label("timeAgo", Utils.timeAgo(date)));
-
- item.add(new LinkPanel("link", "title", entry.getShortMessage(), CommitPage.class, newCommitParameter(entry.getName())));
-
- item.add(new RefsPanel("commitRefs", entry, allRefs));
-
- String author = entry.getAuthorIdent().getName();
- item.add(createAuthorLabel("commitAuthor", author));
-
- item.add(new Label("commitDate", GitBlitWebSession.get().formatDateTimeLong(date)));
-
- item.add(new Label("fullMessage", WicketUtils.breakLines(entry.getFullMessage())).setEscapeModelStrings(false));
- }
- };
- logView.setItemsPerPage(GitBlitWebApp.PAGING_ITEM_COUNT);
- add(logView);
- add(new PagingNavigator("navigator", logView));
-
- // footer
- addFooter();
- }
-}
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.html b/src/com/gitblit/wicket/pages/RepositoriesPage.html index 6a3054f1..0a7b2706 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.html +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.html @@ -2,15 +2,13 @@ <html xmlns="http://www.w3.org/1999/xhtml" >
<body>
<div wicket:id="pageHeader"></div>
- <div class="index_include" wicket:id="indexInclude"></div>
-
- <table class="project_list">
+ <div class="repositories_message" wicket:id="indexInclude"></div>
+ <table class="repositories">
<tr>
<th wicket:id="orderByRepository">Repository</th>
<th wicket:id="orderByDescription">Description</th>
<th wicket:id="orderByOwner">Owner</th>
<th wicket:id="orderByDate">Last Change</th>
- <th></th>
</tr>
<tbody>
<tr wicket:id="repository">
@@ -18,7 +16,6 @@ <td><div class="list" wicket:id="repositoryDescription"></div></td>
<td><i><span wicket:id="repositoryOwner"></span></i></td>
<td><span wicket:id="repositoryLastChange"></span></td>
- <td></td>
</tr>
</tbody>
</table>
diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java index 1c880d9f..50bcba28 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.java +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java @@ -63,7 +63,7 @@ public class RepositoriesPage extends BasePage { add(newSort("orderByOwner", SortBy.owner, dp, dataView));
add(newSort("orderByDate", SortBy.date, dp, dataView));
- add(new PageFooter("pageFooter"));
+ add(new PageFooter("pageFooter", ""));
}
protected enum SortBy {
diff --git a/src/com/gitblit/wicket/pages/ShortLogPage.html b/src/com/gitblit/wicket/pages/ShortLogPage.html index b10e90d6..5afc6cdb 100644 --- a/src/com/gitblit/wicket/pages/ShortLogPage.html +++ b/src/com/gitblit/wicket/pages/ShortLogPage.html @@ -8,22 +8,19 @@ <div wicket:id="pageLinks"></div>
<!-- shortlog -->
- <div class="header" wicket:id="summary"></div>
-
- <table class="project_list">
+ <div style="margin-top:5px;" class="header" wicket:id="summary"></div>
+ <table class="pretty">
<tbody>
<tr wicket:id="commit">
- <td><span wicket:id="commitDate"></span></td>
- <td><i><span wicket:id="commitAuthor"></span></i></td>
+ <td class="date"><span wicket:id="commitDate"></span></td>
+ <td class="author"><span wicket:id="commitAuthor"></span></td>
<td><div wicket:id="commitShortMessage"></div></td>
<td><div wicket:id="commitRefs"></div></td>
<td><span wicket:id="commitLinks"></span></td>
</tr>
- <tr>
- <td colspan="4"><div wicket:id="navigator"></div></td>
- </tr>
</tbody>
</table>
+ <div class="pager" wicket:id="navigator"></div>
<!-- footer -->
<div wicket:id="pageFooter"></div>
diff --git a/src/com/gitblit/wicket/pages/SummaryPage.html b/src/com/gitblit/wicket/pages/SummaryPage.html index 3eab0a1e..be001432 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.html +++ b/src/com/gitblit/wicket/pages/SummaryPage.html @@ -7,70 +7,76 @@ <!-- page nav links -->
<div wicket:id="pageLinks"></div>
- <!-- repository info -->
- <div class="title"> </div>
- <table class="projects_list">
- <tr id="metadata_desc"><td>description</td><td><span wicket:id="repositoryDescription">Message goes here</span></td></tr>
- <tr id="metadata_owner"><td>owner</td><td><span wicket:id="repositoryOwner">Message goes here</span></td></tr>
- <tr id="metadata_lchange"><td>last change</td><td><span wicket:id="repositoryLastChange">Message goes here</span></td></tr>
- <tr class="metadata_url"><td>URL</td><td><span wicket:id="repositoryCloneUrl">Message goes here</span></td></tr>
- </table>
-
-
- <!-- shortlog -->
- <div class="header" wicket:id="shortlog"></div>
+ <div>
+ <!-- Repository Activity Chart -->
+ <div style="width:50%;float:right;">
+ <img style="padding-top:8px;" wicket:id="commitsChart" />
+ </div>
- <table class="project_list">
+ <!-- Repository info -->
+ <div style="width:50%;">
+ <table class="plain">
+ <tr><th>description</th><td><span wicket:id="repositoryDescription">Message goes here</span></td></tr>
+ <tr><th>owner</th><td><span wicket:id="repositoryOwner">Message goes here</span></td></tr>
+ <tr><th>last change</th><td><span wicket:id="repositoryLastChange">Message goes here</span></td></tr>
+ <tr><th>URL</th><td><span wicket:id="repositoryCloneUrl">Message goes here</span></td></tr>
+ </table>
+ </div>
+ </div>
+
+ <!-- shortlog -->
+ <div class="header" wicket:id="shortlog"></div>
+ <table style="width:100%" class="pretty">
<tbody>
<tr wicket:id="commit">
- <td><span wicket:id="commitDate"></span></td>
- <td><i><span wicket:id="commitAuthor"></span></i></td>
+ <td class="date"><span wicket:id="commitDate"></span></td>
+ <td class="author"><span wicket:id="commitAuthor"></span></td>
<td><div wicket:id="commitShortMessage"></div></td>
<td><div wicket:id="commitRefs"></div></td>
<td><span wicket:id="commitLinks"></span></td>
</tr>
-
- <tr>
- <td colspan="4"><div wicket:id="shortlogMore"></div></td>
- </tr>
</tbody>
</table>
+ <div class="pager" wicket:id="shortlogMore"></div>
-
- <!-- tags -->
- <div class="header" wicket:id="tags"></div>
+ <!-- Open additional graphs body -->
+ <div style="width:25%;float:right;">
+ </div>
- <table class="project_list">
- <tbody>
- <tr wicket:id="tag">
- <td><i><span wicket:id="tagDate"></span></i></td>
- <td><div wicket:id="tagName"></div></td>
- <td><div wicket:id="tagDescription"></div></td>
- <td><span wicket:id="tagLinks"></span></td>
- </tr>
-
- <tr>
- <td colspan="4"><div wicket:id="tagsMore"></div></td>
- </tr>
- </tbody>
- </table>
+ <!-- Open Tags and Heads body -->
+ <div style="width:65%">
+
+ <!-- tags -->
+ <div class="header" wicket:id="tags"></div>
+ <table style="width:100%" class="pretty">
+ <tbody>
+ <tr wicket:id="tag">
+ <td class="date"><span wicket:id="tagDate"></span></td>
+ <td><b><div wicket:id="tagName"></div></b></td>
+ <td><div wicket:id="tagDescription"></div></td>
+ <td><span wicket:id="tagLinks"></span></td>
+ </tr>
+ </tbody>
+ </table>
+ <div class="pager" wicket:id="tagsMore"></div>
<!-- heads -->
- <div class="header" wicket:id="heads"></div>
-
- <table class="heads">
+ <div class="header" wicket:id="heads"></div>
+ <table style="width:100%" class="pretty">
<tbody>
- <tr wicket:id="head">
- <td><i><span wicket:id="headDate"></span></i></td>
- <td><div wicket:id="headName"></div></td>
- <td><span wicket:id="headLinks"></span></td>
- </tr>
- </tbody>
+ <tr wicket:id="head">
+ <td class="date"><span wicket:id="headDate"></span></td>
+ <td><div wicket:id="headName"></div></td>
+ <td><span wicket:id="headLinks"></span></td>
+ </tr>
+ </tbody>
</table>
-
-
+
+ <!-- Close Tags and Heads Body -->
+ </div>
+
<!-- footer -->
- <div wicket:id="pageFooter"></div>
+ <div style="clear:both;" wicket:id="pageFooter"></div>
</body>
</html>
\ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java index 84e78b4e..318e3c95 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.java +++ b/src/com/gitblit/wicket/pages/SummaryPage.java @@ -1,11 +1,13 @@ package com.gitblit.wicket.pages;
+import java.awt.Dimension;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.ContextImage;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
@@ -13,19 +15,27 @@ import org.eclipse.jgit.lib.ObjectId; import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
+import com.codecommit.wicket.AbstractChartData;
+import com.codecommit.wicket.Chart;
+import com.codecommit.wicket.ChartAxis;
+import com.codecommit.wicket.ChartAxisType;
+import com.codecommit.wicket.ChartProvider;
+import com.codecommit.wicket.ChartType;
+import com.codecommit.wicket.IChartData;
+import com.gitblit.StoredSettings;
import com.gitblit.utils.JGitUtils;
import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.WicketUtils;
+import com.gitblit.wicket.models.Metric;
import com.gitblit.wicket.models.RefModel;
import com.gitblit.wicket.panels.HeadLinksPanel;
import com.gitblit.wicket.panels.RefsPanel;
import com.gitblit.wicket.panels.ShortLogLinksPanel;
import com.gitblit.wicket.panels.TagLinksPanel;
-
public class SummaryPage extends RepositoryPage {
public SummaryPage(PageParameters params) {
@@ -82,7 +92,7 @@ public class SummaryPage extends RepositoryPage { }
};
add(shortlogView);
- add(new LinkPanel("shortlogMore", "link", "...", ShortLogPage.class, newRepositoryParameter()));
+ add(new LinkPanel("shortlogMore", "link", "more...", ShortLogPage.class, newRepositoryParameter()));
// tags
List<RefModel> tags = JGitUtils.getTags(r, summaryCount);
@@ -115,7 +125,8 @@ public class SummaryPage extends RepositoryPage { }
};
add(tagView);
- add(new LinkPanel("tagsMore", "link", "...", TagsPage.class, newRepositoryParameter()));
+ add(new LinkPanel("tagsMore", "link", "more...", TagsPage.class, newRepositoryParameter()));
+
// heads
List<RefModel> heads = JGitUtils.getHeads(r, summaryCount);
add(new LinkPanel("heads", "title", "heads", HeadsPage.class, newRepositoryParameter()));
@@ -140,10 +151,74 @@ public class SummaryPage extends RepositoryPage { };
add(headsView);
+ // Display an activity line graph
+ insertActivityGraph(r);
+
// close the repository
r.close();
// footer
addFooter();
}
+
+ private void insertActivityGraph(Repository r) {
+ if (StoredSettings.getBoolean("generateActivityGraph", true)) {
+ List<Metric> dates = JGitUtils.getDateMetrics(r);
+ IChartData data = getChartData(dates);
+
+ ChartProvider provider = new ChartProvider(new Dimension(400, 80), ChartType.LINE, data);
+ ChartAxis dateAxis = new ChartAxis(ChartAxisType.BOTTOM);
+ dateAxis.setLabels(new String[] { dates.get(0).name, dates.get(dates.size() / 2).name, dates.get(dates.size() - 1).name });
+ provider.addAxis(dateAxis);
+
+ ChartAxis commitAxis = new ChartAxis(ChartAxisType.LEFT);
+ commitAxis.setLabels(new String[] { "", String.valueOf((int) maxValue(dates)) });
+ provider.addAxis(commitAxis);
+
+ add(new Chart("commitsChart", provider));
+ } else {
+ add(new ContextImage("commitsChart", "blank.png"));
+ }
+ }
+
+ protected IChartData getChartData(List<Metric> results) {
+ final double[] counts = new double[results.size()];
+ int i = 0;
+ double max = 0;
+ for (Metric m : results) {
+ counts[i++] = m.count;
+ max = Math.max(max, m.count);
+ }
+ final double dmax = max;
+ IChartData data = new AbstractChartData() {
+ private static final long serialVersionUID = 1L;
+
+ public double[][] getData() {
+ return new double[][] { counts };
+ }
+
+ public double getMax() {
+ return dmax;
+ }
+ };
+ return data;
+ }
+
+ protected String[] getNames(List<Metric> results) {
+ String[] names = new String[results.size()];
+ for (int i = 0; i < results.size(); i++) {
+ names[i] = results.get(i).name;
+ }
+ return names;
+ }
+
+ protected double maxValue(List<Metric> metrics) {
+ double max = Double.MIN_VALUE;
+ for (Metric m : metrics) {
+ if (m.count > max) {
+ max = m.count;
+ }
+ }
+ return max;
+ }
}
diff --git a/src/com/gitblit/wicket/pages/TagPage.html b/src/com/gitblit/wicket/pages/TagPage.html index ae2c99c2..60411858 100644 --- a/src/com/gitblit/wicket/pages/TagPage.html +++ b/src/com/gitblit/wicket/pages/TagPage.html @@ -11,16 +11,14 @@ <div class="header" wicket:id="commit"></div>
<!-- commit info -->
- <div class="title_text">
- <table class="object_header">
- <tr><td>object</td><td><span wicket:id="tagId">Message goes here</span></td></tr>
- <tr><td>author</td><td><span wicket:id="tagAuthor">Message goes here</span></td></tr>
- <tr><td></td><td><span wicket:id="tagDate">Message goes here</span></td></tr>
+ <table>
+ <tr><th>object</th><td><span wicket:id="tagId">Message goes here</span></td></tr>
+ <tr><th>author</th><td><span wicket:id="tagAuthor">Message goes here</span></td></tr>
+ <tr><th></th><td><span wicket:id="tagDate">Message goes here</span></td></tr>
</table>
- </div>
<!-- full message -->
- <div class="page_body" wicket:id="fullMessage"></div>
+ <div class="commit_message" wicket:id="fullMessage"></div>
<!-- footer -->
<div wicket:id="pageFooter"></div>
diff --git a/src/com/gitblit/wicket/pages/TagsPage.html b/src/com/gitblit/wicket/pages/TagsPage.html index 314eec77..a3f7d399 100644 --- a/src/com/gitblit/wicket/pages/TagsPage.html +++ b/src/com/gitblit/wicket/pages/TagsPage.html @@ -8,19 +8,15 @@ <div wicket:id="pageLinks"></div>
<!-- shortlog -->
- <div class="header" wicket:id="summary"></div>
-
- <table class="tags">
+ <div class="header" wicket:id="summary"></div>
+ <table>
<tbody>
<tr wicket:id="tag">
- <td><i><span wicket:id="tagDate"></span></i></td>
- <td><div wicket:id="tagName"></div></td>
+ <td class="date"><span wicket:id="tagDate"></span></td>
+ <td><b><div wicket:id="tagName"></div></b></td>
<td><div wicket:id="tagDescription"></div></td>
<td><span wicket:id="tagLinks"></span></td>
</tr>
- <tr>
- <td colspan="4"><div wicket:id="navigator"></div></td>
- </tr>
</tbody>
</table>
diff --git a/src/com/gitblit/wicket/pages/TagsPage.java b/src/com/gitblit/wicket/pages/TagsPage.java index 85c0455c..012d712b 100644 --- a/src/com/gitblit/wicket/pages/TagsPage.java +++ b/src/com/gitblit/wicket/pages/TagsPage.java @@ -4,14 +4,12 @@ import java.util.List; import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
import org.apache.wicket.markup.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
import org.apache.wicket.markup.repeater.data.ListDataProvider;
import org.eclipse.jgit.lib.Repository;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.RepositoryPage;
import com.gitblit.wicket.models.RefModel;
@@ -54,9 +52,7 @@ public class TagsPage extends RepositoryPage { counter++;
}
};
- tagView.setItemsPerPage(GitBlitWebApp.PAGING_ITEM_COUNT);
add(tagView);
- add(new PagingNavigator("navigator", tagView));
// footer
addFooter();
diff --git a/src/com/gitblit/wicket/pages/TreePage.html b/src/com/gitblit/wicket/pages/TreePage.html index e01049c6..197ac945 100644 --- a/src/com/gitblit/wicket/pages/TreePage.html +++ b/src/com/gitblit/wicket/pages/TreePage.html @@ -18,13 +18,12 @@ <!-- breadcrumbs -->
<div wicket:id="breadcrumbs"></div>
- <!-- changed paths -->
- <div class="list_head"></div>
- <table class="diff_tree">
+ <!-- changed paths -->
+ <table class="pretty">
<tr wicket:id="changedPath">
- <td class="mode"><span wicket:id="pathPermissions"></span></td>
- <td class="size"><span wicket:id="pathSize"></span></td>
<td><span wicket:id="pathName"></span></td>
+ <td class="size"><span wicket:id="pathSize"></span></td>
+ <td class="mode"><span wicket:id="pathPermissions"></span></td>
<td><span wicket:id="treeLinks"></span></td>
</tr>
</table>
diff --git a/src/com/gitblit/wicket/pages/TreePage.java b/src/com/gitblit/wicket/pages/TreePage.java index a608bdda..cce18be2 100644 --- a/src/com/gitblit/wicket/pages/TreePage.java +++ b/src/com/gitblit/wicket/pages/TreePage.java @@ -38,10 +38,8 @@ public class TreePage extends RepositoryPage { add(new LinkPanel("shortlog", "title", commit.getShortMessage(), CommitPage.class, newCommitParameter()));
// breadcrumbs
- if (basePath == null || basePath.trim().length() == 0) {
- add(new Label("breadcrumbs", "").setVisible(false));
- } else {
- add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, basePath, commitId));
+ add(new PathBreadcrumbsPanel("breadcrumbs", repositoryName, basePath, commitId));
+ if (basePath != null && basePath.trim().length() > 0) {
paths.add(0, PathModel.getParentPath(basePath, commitId));
}
@@ -58,13 +56,13 @@ public class TreePage extends RepositoryPage { item.add(new Label("pathPermissions", JGitUtils.getPermissionsFromMode(entry.mode)));
if (entry.isParentPath) {
// parent .. path
- item.add(new Label("pathSize", "").setVisible(false));
+ item.add(new Label("pathSize", ""));
item.add(new LinkPanel("pathName", null, entry.name, TreePage.class, newPathParameter(entry.path)));
- item.add(new Label("treeLinks", "").setVisible(false));
+ item.add(new Label("treeLinks", ""));
} else {
if (entry.isTree()) {
// folder/tree link
- item.add(new Label("pathSize", "-"));
+ item.add(new Label("pathSize", ""));
item.add(new LinkPanel("pathName", null, entry.name, TreePage.class, newPathParameter(entry.path)));
} else {
// blob link
diff --git a/src/com/gitblit/wicket/panels/HeadLinksPanel.html b/src/com/gitblit/wicket/panels/HeadLinksPanel.html index 4849e8e2..04c6659d 100644 --- a/src/com/gitblit/wicket/panels/HeadLinksPanel.html +++ b/src/com/gitblit/wicket/panels/HeadLinksPanel.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<wicket:panel>
<div class="link">
- <span wicket:id="shortlog"></span> | <span wicket:id="log"></span> | <span wicket:id="tree"></span>
+ <span wicket:id="shortlog"></span> | <span wicket:id="tree"></span>
</div>
</wicket:panel>
</html>
\ No newline at end of file diff --git a/src/com/gitblit/wicket/panels/HeadLinksPanel.java b/src/com/gitblit/wicket/panels/HeadLinksPanel.java index 4f4c9d7e..eeb2ae41 100644 --- a/src/com/gitblit/wicket/panels/HeadLinksPanel.java +++ b/src/com/gitblit/wicket/panels/HeadLinksPanel.java @@ -6,7 +6,6 @@ import org.apache.wicket.markup.html.panel.Panel; import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.models.RefModel;
-import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.ShortLogPage;
@@ -17,7 +16,6 @@ public class HeadLinksPanel extends Panel { public HeadLinksPanel(String id, String repositoryName, RefModel tag) {
super(id);
add(new LinkPanel("shortlog", null, "shortlog", ShortLogPage.class, new PageParameters("p=" + repositoryName + ",h=" + tag.getName())));
- add(new LinkPanel("log", null, "log", LogPage.class, new PageParameters("p=" + repositoryName + ",h=" + tag.getName())));
add(new Label("tree", "tree"));
}
}
\ No newline at end of file diff --git a/src/com/gitblit/wicket/panels/PageFooter.html b/src/com/gitblit/wicket/panels/PageFooter.html index e2e708d7..305b6bce 100644 --- a/src/com/gitblit/wicket/panels/PageFooter.html +++ b/src/com/gitblit/wicket/panels/PageFooter.html @@ -2,11 +2,10 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<wicket:panel>
<div class="page_footer">
- <div class="cachetime"><span wicket:id="cacheTime"></span></div>
- <div class="page_footer_text"><span wicket:id="footerText"></span></div>
- <div class="page_footer_text" style="text-align:right">
+ <div style="float:right">
<a title="about git:blit" href="about">About Git:Blit</a>
</div>
+ <div wicket:id="footerText"></div>
</div>
</wicket:panel>
</html>
\ No newline at end of file diff --git a/src/com/gitblit/wicket/panels/PageFooter.java b/src/com/gitblit/wicket/panels/PageFooter.java index 91a1f57c..b727408c 100644 --- a/src/com/gitblit/wicket/panels/PageFooter.java +++ b/src/com/gitblit/wicket/panels/PageFooter.java @@ -1,12 +1,9 @@ package com.gitblit.wicket.panels;
-import java.util.Date;
-
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import com.gitblit.StoredSettings;
-import com.gitblit.wicket.GitBlitWebSession;
public class PageFooter extends Panel {
@@ -18,8 +15,7 @@ public class PageFooter extends Panel { }
public PageFooter(String id, String description) {
- super(id);
- add(new Label("cacheTime", "Page Last Updated: " + GitBlitWebSession.get().formatDateTimeLong(new Date())));
+ super(id);
add(new Label("footerText", description));
if (StoredSettings.getBoolean("aggressiveGC", false)) {
System.gc();
diff --git a/src/com/gitblit/wicket/panels/PageHeader.html b/src/com/gitblit/wicket/panels/PageHeader.html index 83edb994..982a897c 100644 --- a/src/com/gitblit/wicket/panels/PageHeader.html +++ b/src/com/gitblit/wicket/panels/PageHeader.html @@ -4,12 +4,11 @@ <head>
<title wicket:id="title">Message goes here</title>
<link rel="stylesheet" type="text/css" href="gitblit.css"/>
- <link rel="stylesheet" type="text/css" href="gitweb.css"/>
<link rel="shortcut icon" href="git-favicon.png" type="image/png" />
</head>
<div class="page_header">
- <a title="gitblit homepage" href="http://gitblit.com/"><img src="gitblt-logo.png" width="91" height="31" alt="gitblit" class="logo"/></a><a href="/"><span wicket:id="siteName">name</span></a> / <span wicket:id="repositoryName">name</span> <span wicket:id="pageName">name</span>
+ <a title="gitblit homepage" href="http://gitblit.com/"><img src="gitblt_25.png" width="79" height="25" alt="gitblit" class="logo"/></a><a href="/"><span wicket:id="siteName">name</span></a> / <span wicket:id="repositoryName">name</span> <span wicket:id="pageName">name</span>
</div>
</wicket:panel>
</html>
\ No newline at end of file diff --git a/src/com/gitblit/wicket/panels/PageLinksPanel.html b/src/com/gitblit/wicket/panels/PageLinksPanel.html index 66c3ce7a..18e271ea 100644 --- a/src/com/gitblit/wicket/panels/PageLinksPanel.html +++ b/src/com/gitblit/wicket/panels/PageLinksPanel.html @@ -3,7 +3,7 @@ <wicket:panel>
<!-- page nav links -->
<div class="page_nav">
- <span wicket:id="summary"></span> | <span wicket:id="shortlog"></span> | <span wicket:id="log"></span> | <span wicket:id="commit"></span> | <span wicket:id="commitdiff"></span> | <span wicket:id="tree"></span>
+ <span wicket:id="summary"></span> | <span wicket:id="shortlog"></span> | <span wicket:id="commit"></span> | <span wicket:id="commitdiff"></span> | <span wicket:id="tree"></span>
</div>
</wicket:panel>
</html>
\ No newline at end of file diff --git a/src/com/gitblit/wicket/panels/PageLinksPanel.java b/src/com/gitblit/wicket/panels/PageLinksPanel.java index f72b8800..7447e760 100644 --- a/src/com/gitblit/wicket/panels/PageLinksPanel.java +++ b/src/com/gitblit/wicket/panels/PageLinksPanel.java @@ -6,7 +6,6 @@ import org.apache.wicket.markup.html.panel.Panel; import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.pages.CommitPage;
-import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.ShortLogPage;
import com.gitblit.wicket.pages.SummaryPage;
import com.gitblit.wicket.pages.TreePage;
@@ -32,13 +31,6 @@ public class PageLinksPanel extends Panel { add(new LinkPanel("shortlog", null, "shortlog", ShortLogPage.class, new PageParameters("p=" + repositoryName)));
}
- // log
- if (pageName.equals("log")) {
- add(new Label("log", pageName));
- } else {
- add(new LinkPanel("log", null, "log", LogPage.class, new PageParameters("p=" + repositoryName)));
- }
-
// commit
if (pageName.equals("commit")) {
add(new Label("commit", pageName));
diff --git a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java b/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java index 5ce356a2..a8a5c285 100644 --- a/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java +++ b/src/com/gitblit/wicket/panels/PathBreadcrumbsPanel.java @@ -14,7 +14,6 @@ import org.apache.wicket.markup.repeater.data.ListDataProvider; import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.pages.TreePage;
-
public class PathBreadcrumbsPanel extends Panel {
private static final long serialVersionUID = 1L;
@@ -26,14 +25,16 @@ public class PathBreadcrumbsPanel extends Panel { List<BreadCrumb> crumbs = new ArrayList<BreadCrumb>();
crumbs.add(new BreadCrumb("[" + repositoryName + "]", ROOT, false));
- String[] paths = pathName.split("/");
- StringBuilder sb = new StringBuilder();
-
- for (int i = 0; i < paths.length; i++) {
- String path = paths[i];
- sb.append(path);
- crumbs.add(new BreadCrumb(path, sb.toString(), (i == (paths.length - 1))));
- sb.append("/");
+ if (pathName != null && pathName.length() > 0) {
+ String[] paths = pathName.split("/");
+ StringBuilder sb = new StringBuilder();
+
+ for (int i = 0; i < paths.length; i++) {
+ String path = paths[i];
+ sb.append(path);
+ crumbs.add(new BreadCrumb(path, sb.toString(), (i == (paths.length - 1))));
+ sb.append("/");
+ }
}
ListDataProvider<BreadCrumb> crumbsDp = new ListDataProvider<BreadCrumb>(crumbs);
@@ -49,20 +50,20 @@ public class PathBreadcrumbsPanel extends Panel { }
item.add(new LinkPanel("pathLink", null, entry.name, TreePage.class, new PageParameters(parameters)));
- item.add(new Label("pathSeparator", entry.isLeaf ? "":"/"));
+ item.add(new Label("pathSeparator", entry.isLeaf ? "" : "/"));
}
};
add(pathsView);
}
private class BreadCrumb implements Serializable {
-
+
private static final long serialVersionUID = 1L;
-
+
final String name;
final String path;
final boolean isLeaf;
-
+
BreadCrumb(String name, String path, boolean isLeaf) {
this.name = name;
this.path = path;
diff --git a/src/com/gitblit/wicket/panels/PathLinksPanel.java b/src/com/gitblit/wicket/panels/PathLinksPanel.java index fa8bdca6..c29124be 100644 --- a/src/com/gitblit/wicket/panels/PathLinksPanel.java +++ b/src/com/gitblit/wicket/panels/PathLinksPanel.java @@ -16,7 +16,7 @@ public class PathLinksPanel extends Panel { public PathLinksPanel(String id, String repositoryName, PathModel path) {
super(id);
add(new Label("diff", "diff"));
- add(new LinkPanel("blob", null, "blob", BlobPage.class, new PageParameters("p=" + repositoryName + ",h=" + path.commitId + ",f=" + path.path)));
+ add(new LinkPanel("blob", null, "view", BlobPage.class, new PageParameters("p=" + repositoryName + ",h=" + path.commitId + ",f=" + path.path)));
add(new Label("history", "history"));
}
}
\ No newline at end of file diff --git a/src/com/gitblit/wicket/panels/TagLinksPanel.html b/src/com/gitblit/wicket/panels/TagLinksPanel.html index 30934085..98191a36 100644 --- a/src/com/gitblit/wicket/panels/TagLinksPanel.html +++ b/src/com/gitblit/wicket/panels/TagLinksPanel.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd">
<wicket:panel>
<div class="link">
- <span wicket:id="commit"></span> | <span wicket:id="shortlog"></span> | <span wicket:id="log"></span>
+ <span wicket:id="commit"></span> | <span wicket:id="shortlog"></span>
</div>
</wicket:panel>
</html>
\ No newline at end of file diff --git a/src/com/gitblit/wicket/panels/TagLinksPanel.java b/src/com/gitblit/wicket/panels/TagLinksPanel.java index 73a9c3ae..8011716d 100644 --- a/src/com/gitblit/wicket/panels/TagLinksPanel.java +++ b/src/com/gitblit/wicket/panels/TagLinksPanel.java @@ -6,7 +6,6 @@ import org.apache.wicket.markup.html.panel.Panel; import com.gitblit.wicket.LinkPanel;
import com.gitblit.wicket.models.RefModel;
import com.gitblit.wicket.pages.CommitPage;
-import com.gitblit.wicket.pages.LogPage;
import com.gitblit.wicket.pages.ShortLogPage;
@@ -18,6 +17,5 @@ public class TagLinksPanel extends Panel { super(id);
add(new LinkPanel("commit", null, "commit", CommitPage.class, new PageParameters("p=" + repositoryName + ",h=" + tag.getCommitId().getName())));
add(new LinkPanel("shortlog", null, "shortlog", ShortLogPage.class, new PageParameters("p=" + repositoryName + ",h=" + tag.getName())));
- add(new LinkPanel("log", null, "log", LogPage.class, new PageParameters("p=" + repositoryName + ",h=" + tag.getName())));
}
}
\ No newline at end of file diff --git a/src/com/gitblit/wicket/panels/TreeLinksPanel.java b/src/com/gitblit/wicket/panels/TreeLinksPanel.java index 21da66c9..ce918b9e 100644 --- a/src/com/gitblit/wicket/panels/TreeLinksPanel.java +++ b/src/com/gitblit/wicket/panels/TreeLinksPanel.java @@ -19,11 +19,11 @@ public class TreeLinksPanel extends Panel { if (path.isTree()) {
add(new LinkPanel("link", null, "tree", TreePage.class, new PageParameters("p=" + repositoryName + ",h=" + path.commitId + ",f=" + path.path)));
add(new Label("history", "history"));
- add(new Label("raw", "").setVisible(false));
+ add(new Label("raw", ""));
} else {
- add(new LinkPanel("link", null, "blob", BlobPage.class, new PageParameters("p=" + repositoryName + ",h=" + path.commitId + ",f=" + path.path)));
+ add(new LinkPanel("link", null, "view", BlobPage.class, new PageParameters("p=" + repositoryName + ",h=" + path.commitId + ",f=" + path.path)));
add(new Label("history", "history"));
- add(new Label("raw", "raw"));
+ add(new Label("raw", "download"));
}
}
}
\ No newline at end of file |