The Unified and Autonomous Development Platform
Improve request list and code comment list page style
robin shen1944010ffadb
diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.html b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.htmlindex 096a1f9eb6..79033656f8 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.html+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.html@@ -21,17 +21,15 @@</tr></table><wicket:fragment wicket:id="commentFrag">- <div class="first-line">- <a wicket:id="title" class="title"><span wicket:id="label"></span></a>- </div>- <div class="second-line">- commented by+ <div class="title">+ <a wicket:id="avatar" class="avatar"></a><a wicket:id="user" class="user"></a>- on+ commented on<a wicket:id="file" class="file"><span wicket:id="label"></span></a><span wicket:id="date"></span></div>- <div wicket:id="lastEvent" class="third-line">+ <div wicket:id="content" class="content"></div>+ <div wicket:id="lastEvent" class="last-event"><a wicket:id="user" class="user"></a><span wicket:id="description"></span><span wicket:id="date"></span>diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.javaindex eae0d2599f..a378f9b941 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java+++ b/web/src/main/java/com/gitplex/server/web/component/comment/CodeCommentListPanel.java@@ -36,6 +36,7 @@ import org.hibernate.criterion.Restrictions;import com.gitplex.server.GitPlex;import com.gitplex.server.manager.CodeCommentManager;import com.gitplex.server.manager.CodeCommentRelationManager;+import com.gitplex.server.manager.MarkdownManager;import com.gitplex.server.model.CodeComment;import com.gitplex.server.model.CodeCommentRelation;import com.gitplex.server.model.Project;@@ -44,8 +45,8 @@ import com.gitplex.server.model.User;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.security.SecurityUtils;-import com.gitplex.server.util.StringUtils;import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.link.UserLink;import com.gitplex.server.web.editable.BeanContext;import com.gitplex.server.web.page.project.ProjectPage;@@ -59,8 +60,6 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.navigation.BootstrapPagi@SuppressWarnings("serial")public abstract class CodeCommentListPanel extends Panel {- private static final int TITLE_LEN = 100;-private final IModel<CodeCommentFilter> filterOptionModel;public CodeCommentListPanel(String id, IModel<CodeCommentFilter> filterOptionModel) {@@ -136,17 +135,9 @@ public abstract class CodeCommentListPanel extends Panel {String componentId, IModel<CodeComment> rowModel) {CodeComment comment = rowModel.getObject();Fragment fragment = new Fragment(componentId, "commentFrag", CodeCommentListPanel.this);- Link<Void> titleLink = new Link<Void>("title") {-- @Override- public void onClick() {- openComment(rowModel.getObject());- }-- };- titleLink.add(new Label("label", StringUtils.abbreviate(comment.getContent(), TITLE_LEN)));- fragment.add(titleLink);- fragment.add(new UserLink("user", User.getForDisplay(comment.getUser(), comment.getUserName())));+ User userForDisplay = User.getForDisplay(comment.getUser(), comment.getUserName());+ fragment.add(new AvatarLink("avatar", userForDisplay));+ fragment.add(new UserLink("user", userForDisplay));Link<Void> fileLink = new Link<Void>("file") {@@ -161,12 +152,15 @@ public abstract class CodeCommentListPanel extends Panel {fragment.add(new Label("date", DateUtils.formatAge(comment.getDate())));+ MarkdownManager markdownManager = GitPlex.getInstance(MarkdownManager.class);+ fragment.add(new Label("content", markdownManager.render(comment.getContent(), null, true)).setEscapeModelStrings(false));+WebMarkupContainer lastEventContainer = new WebMarkupContainer("lastEvent");if (comment.getLastEvent() != null) {String description = comment.getLastEvent().getType();lastEventContainer.add(new Label("description", description));- User userForDisplay = User.getForDisplay(comment.getLastEvent().getUser(),+ userForDisplay = User.getForDisplay(comment.getLastEvent().getUser(),comment.getLastEvent().getUserName());lastEventContainer.add(new UserLink("user", userForDisplay));lastEventContainer.add(new Label("date", DateUtils.formatAge(comment.getLastEvent().getDate())));diff --git a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.cssindex 09dfd9e64e..0c1ae6004b 100644--- a/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css+++ b/web/src/main/java/com/gitplex/server/web/component/comment/code-comment.css@@ -21,33 +21,42 @@border: 1px solid #DDD;}.code-comments td.comment {- color: #888;- padding: 8px 8px 0 8px;+ padding: 20px 20px 0 20px;border-left: 4px solid white;}.code-comments td.comment.new {border-left: 4px solid #4667EE;}.code-comments td.comment>div {- padding-bottom: 8px;- border-bottom: 1px dotted #BBB;+ padding-bottom: 20px;+ border-bottom: 2px dotted #BBB;}.code-comments td.result tr:last-child td.comment>div {border-bottom: none;}-.code-comments td.comment a.title {- font-weight: bold;+.code-comments td.comment>div>.title {+ color: #888;font-size: 16px;- color: #444;- margin-right: 4px;+ margin-bottom: 8px;+}+.code-comments td.comment>div>.content {+ margin-left: 20px;+ color: #666;+ font-size: 13px;+}+.code-comments td.comment>div>.last-event {+ color: #888;+ margin-left: 20px;}-.code-comments td.comment .user, .code-comments td.comment .file {+.code-comments td.comment>div>.title a, .code-comments td.comment>div>.last-event a {color: #444;}-.code-comments td.comment .second-line, .code-comments td.comment .third-line {- margin-top: 2px;++.code-comments td.comment>div>.title>.file {+ font-weight: bold;}+.code-comments td.result .norecords-td {padding: 20px;font-size: 20px;diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.html b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.htmlindex eb3a3d893b..6388feff58 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.html+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.html@@ -24,22 +24,20 @@</table></div><wicket:fragment wicket:id="requestFrag">- <div class="first-line clearfix">- <a wicket:id="title" class="title pull-left"></a>+ <div class="title clearfix">+ <a wicket:id="submitter" class="avatar pull-left"></a>+ <a wicket:id="text" class="text pull-left"></a><span wicket:id="number" class="number pull-left"></span>+ <span wicket:id="status" class="status pull-right"></span>+ </div>+ <div class="additional-info"><span class="branches pull-left"><a wicket:id="target" class="branch"></a><span class="fa fa-long-arrow-left"></span><a wicket:id="source" class="branch"></a></span>- <span wicket:id="status" class="status pull-right"></span>- </div>- <div class="second-line">- <a wicket:id="submitter" class="user"></a>- submitted- <span wicket:id="date"></span><span wicket:id="lastEvent">- ,+ <span class="middot"></span><a wicket:id="user"></a><span wicket:id="description"></span><span wicket:id="date"></span>diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.javaindex 3e9733f8ca..c1dd0d43a9 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/RequestListPage.java@@ -38,6 +38,7 @@ import com.gitplex.server.model.User;import com.gitplex.server.persistence.dao.Dao;import com.gitplex.server.persistence.dao.EntityCriteria;import com.gitplex.server.web.WebConstants;+import com.gitplex.server.web.component.avatar.AvatarLink;import com.gitplex.server.web.component.floating.FloatingPanel;import com.gitplex.server.web.component.link.BranchLink;import com.gitplex.server.web.component.link.UserLink;@@ -265,8 +266,10 @@ public class RequestListPage extends ProjectPage {String componentId, final IModel<PullRequest> rowModel) {PullRequest request = rowModel.getObject();Fragment fragment = new Fragment(componentId, "requestFrag", RequestListPage.this);+ User userForDisplay = User.getForDisplay(request.getSubmitter(), request.getSubmitterName());+ fragment.add(new AvatarLink("submitter", userForDisplay));fragment.add(new Label("number", "#" + request.getNumber()));- fragment.add(new ViewStateAwarePageLink<Void>("title", RequestOverviewPage.class,+ fragment.add(new ViewStateAwarePageLink<Void>("text", RequestOverviewPage.class,RequestOverviewPage.paramsOf(request)) {@Override@@ -277,33 +280,29 @@ public class RequestListPage extends ProjectPage {});fragment.add(new RequestStatusPanel("status", rowModel));- fragment.add(new UserLink("submitter", User.getForDisplay(request.getSubmitter(),- request.getSubmitterName())));fragment.add(new BranchLink("target", request.getTarget(), null));if (request.getSource() != null)fragment.add(new BranchLink("source", request.getSource(), request));elsefragment.add(new Label("source").setVisible(false));- fragment.add(new Label("date", DateUtils.formatAge(request.getSubmitDate())));-WebMarkupContainer lastEventContainer = new WebMarkupContainer("lastEvent");if (request.getLastEvent() != null) {String description = request.getLastEvent().getType();if (description.startsWith("there are")) {lastEventContainer.add(new WebMarkupContainer("user").setVisible(false));} else {- User userForDisplay = User.getForDisplay(request.getLastEvent().getUser(),+ userForDisplay = User.getForDisplay(request.getLastEvent().getUser(),request.getLastEvent().getUserName());lastEventContainer.add(new UserLink("user", userForDisplay));}lastEventContainer.add(new Label("description", description));lastEventContainer.add(new Label("date", DateUtils.formatAge(request.getLastEvent().getDate())));} else {- lastEventContainer.add(new WebMarkupContainer("user"));- lastEventContainer.add(new WebMarkupContainer("description"));- lastEventContainer.add(new WebMarkupContainer("date"));- lastEventContainer.setVisible(false);+ lastEventContainer.add(new UserLink("user", User.getForDisplay(request.getSubmitter(),+ request.getSubmitterName())));+ lastEventContainer.add(new Label("description", "submitted"));+ lastEventContainer.add(new Label("date", DateUtils.formatAge(request.getSubmitDate())));}fragment.add(lastEventContainer);diff --git a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/request-list.css b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/request-list.cssindex a1ea7cd967..11867e93cd 100644--- a/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/request-list.css+++ b/web/src/main/java/com/gitplex/server/web/page/project/pullrequest/requestlist/request-list.css@@ -28,49 +28,51 @@}#request-list td.request {color: #888;- padding: 8px 8px 0 8px;+ padding: 12px 12px 0 12px;border-left: 4px solid white;}-#request-list td.request img.avatar {- width: 20px;- height: 20px;- vertical-align: text-top;-}#request-list td.request.new {border-left: 4px solid #4667EE;}#request-list td.request>div {- padding-bottom: 8px;- border-bottom: 1px dotted #BBB;+ padding-bottom: 12px;+ border-bottom: 2px dotted #BBB;}#request-list td.result tr:last-child td.request>div {border-bottom: none;}-#request-list td.request a.title {- font-weight: bold;++#request-list td.request .title {+ margin-right: 4px;font-size: 16px;- color: #444;+}+#request-list td.request .title a {+ color: #333;+}++#request-list td.request .title>* {margin-right: 8px;}-#request-list td.request .number {- font-size: 16px;- margin-right: 8px;+#request-list td.request .title>.status {+ margin-right: 0;}+#request-list td.request .branches {- margin-left: 12px;white-space: nowrap;}-#request-list td.request a.branch {- color: #444;- font-size: 16px;-}-#request-list td.request .second-line {- margin-top: 2px;+#request-list td.request .additional-info {+ margin-top: 4px;+ margin-left: 20px;}-#request-list td.request .second-line a {+#request-list td.request .additional-info a {color: #444;}+#request-list td.request .additional-info .middot {+ margin-left: 8px;+ margin-right: 8px;+}+#request-list td.result .norecords-td {padding: 20px;font-size: 20px;