Skip to content

The Unified and Autonomous Development Platform

Do some cleanup in branches and tags page

robin shen3ed920ffc469
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html
index 765e26e2fd..4495a50f72 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.html
@@ -29,7 +29,6 @@
<a wicket:id="hashLink" class="hash btn btn-default btn-xs"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-default btn-xs"><i class="fa fa-clipboard"></i></a>
</span>
- <span wicket:id="contributor"></span>
<a wicket:id="messageLink" class="message"><span wicket:id="message"></span></a>
</div>
</td>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java
index ec23c73908..91456017d9 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/branches/ProjectBranchesPage.java
@@ -63,7 +63,6 @@ import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
import com.gitplex.server.web.component.branchchoice.BranchChoiceProvider;
import com.gitplex.server.web.component.branchchoice.BranchSingleChoice;
-import com.gitplex.server.web.component.contributorpanel.ContributorPanel;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
import com.gitplex.server.web.component.modal.ModalLink;
import com.gitplex.server.web.component.modal.ModalPanel;
@@ -431,7 +430,6 @@ public class ProjectBranchesPage extends ProjectPage {
item.add(link);
item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(lastCommit.name()))));
- item.add(new ContributorPanel("contributor", lastCommit.getAuthorIdent(), lastCommit.getCommitterIdent(), true));
link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);
link.add(new Label("message", lastCommit.getShortMessage()));
item.add(link);
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.html b/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.html
index 11087cfef9..dab2c372e4 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.html
@@ -22,7 +22,6 @@
<a wicket:id="hashLink" class="hash btn btn-default btn-xs"><span wicket:id="hash"></span></a>
<a wicket:id="copyHash" class="btn btn-default btn-xs"><i class="fa fa-clipboard"></i></a>
</span>
- <span wicket:id="contributor"></span>
<a wicket:id="messageLink" class="message"><span wicket:id="message"></span></a>
</div>
</td>
@@ -39,12 +38,7 @@
</div>
</div>
<wicket:fragment wicket:id="annotatedFrag">
- <wicket:enclosure child="date">
- <span class="middot"></span>
- <span wicket:id="date"></span>
- </wicket:enclosure>
<wicket:enclosure child="author">
- <span class="middot"></span>
<a wicket:id="author"></a>
</wicket:enclosure>
<a wicket:id="messageToggle" class="ellipsis-expander"><i class="fa fa-ellipsis-h"></i></a>
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.java b/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.java
index 8c831fbd8c..f18c1e009e 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/tags/ProjectTagsPage.java
@@ -39,7 +39,6 @@ import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.util.StringUtils;
import com.gitplex.server.web.behavior.OnTypingDoneBehavior;
import com.gitplex.server.web.behavior.clipboard.CopyClipboardBehavior;
-import com.gitplex.server.web.component.contributorpanel.ContributorPanel;
import com.gitplex.server.web.component.link.ArchiveMenuLink;
import com.gitplex.server.web.component.link.UserLink;
import com.gitplex.server.web.component.link.ViewStateAwarePageLink;
@@ -50,7 +49,6 @@ import com.gitplex.server.web.page.project.NoBranchesPage;
import com.gitplex.server.web.page.project.ProjectPage;
import com.gitplex.server.web.page.project.blob.ProjectBlobPage;
import com.gitplex.server.web.page.project.commit.CommitDetailPage;
-import com.gitplex.server.web.util.DateUtils;
import com.gitplex.server.web.util.ajaxlistener.ConfirmListener;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@@ -260,10 +258,8 @@ public class ProjectTagsPage extends ProjectPage {
Fragment fragment = new Fragment("annotated", "annotatedFrag", ProjectTagsPage.this);
if (revTag.getTaggerIdent() != null) {
fragment.add(new UserLink("author", revTag.getTaggerIdent()));
- fragment.add(new Label("date", DateUtils.formatDate(revTag.getTaggerIdent().getWhen())));
} else {
fragment.add(new WebMarkupContainer("author").setVisible(false));
- fragment.add(new WebMarkupContainer("date").setVisible(false));
}
Label message = new Label("message", revTag.getFullMessage());
message.setOutputMarkupId(true);
@@ -286,8 +282,6 @@ public class ProjectTagsPage extends ProjectPage {
item.add(link);
item.add(new WebMarkupContainer("copyHash").add(new CopyClipboardBehavior(Model.of(commit.name()))));
- item.add(new ContributorPanel("contributor", commit.getAuthorIdent(), commit.getCommitterIdent(), true));
-
link = new ViewStateAwarePageLink<Void>("messageLink", CommitDetailPage.class, params);
link.add(new Label("message", commit.getShortMessage()));
item.add(link);
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/tags/project-tags.css b/web/src/main/java/com/gitplex/server/web/page/project/tags/project-tags.css
index ab4b7cb98e..0a3e392772 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/tags/project-tags.css
+++ b/web/src/main/java/com/gitplex/server/web/page/project/tags/project-tags.css
@@ -13,6 +13,7 @@
#repo-tags .annotated {
color: #999;
font-size: 12px;
+ margin-left: 8px;
}
#repo-tags .annotated a {
color: #666;