Skip to content

The Unified and Autonomous Development Platform

Minor css tunes

Robin Shenc241faa5d238
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index c98451ebf2..6eb6d46230 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -23,10 +23,10 @@
<table wicket:id="issues" class="table"></table>
</div>
</div>
- <wicket:fragment wicket:id="titleFrag">
+ <wicket:fragment wicket:id="summaryFrag">
+ <span wicket:id="state" class="state"></span>
<span wicket:id="number" class="number"></span>
<a wicket:id="title" class="title"><span wicket:id="label"></span></a>
- <span wicket:id="state" class="state"></span>
</wicket:fragment>
<wicket:fragment wicket:id="listFieldsFrag">
<div class="issue-list-fields">
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index 645a4620de..9002474f8c 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -52,7 +52,6 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.setting.GlobalIssueSetting;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.IssueConstants;
import io.onedev.server.util.IssueField;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.IssueQueryBehavior;
@@ -494,13 +493,13 @@ public abstract class IssueListPanel extends GenericPanel<String> {
});
}
- columns.add(new AbstractColumn<Issue, Void>(Model.of(IssueConstants.FIELD_TITLE)) {
+ columns.add(new AbstractColumn<Issue, Void>(Model.of("Summary")) {
@Override
public void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,
IModel<Issue> rowModel) {
Issue issue = rowModel.getObject();
- Fragment fragment = new Fragment(componentId, "titleFrag", IssueListPanel.this);
+ Fragment fragment = new Fragment(componentId, "summaryFrag", IssueListPanel.this);
fragment.add(new Label("number", "#" + issue.getNumber()));
OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);
QueryPosition position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)issuesTable.getItemCount(),
@@ -516,7 +515,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {
@Override
public String getCssClass() {
- return "issue";
+ return "summary";
}
});
diff --git a/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
index a53ef7778c..e12801470c 100644
--- a/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
+++ b/core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css
@@ -27,10 +27,13 @@
.issue-list>.head>.others>*:last-child {
margin-right: 0;
}
-.issue-list>.body td.title>div>* {
- margin-right: 4px;
+.issue-list>.body td.summary>div>* {
+ margin-right: 8px;
}
-.issue-list>.body td.title .number {
+.issue-list>.body td.summary>div>*:last-child {
+ margin-right: 0;
+}
+.issue-list>.body td.summary .number {
font-weight: bold;
}
.issue-list>.body td.submitter,
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html
index 837e787a3f..c51fc5ce7e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.html
@@ -24,10 +24,10 @@
</div>
</div>
</div>
- <wicket:fragment wicket:id="titleFrag">
+ <wicket:fragment wicket:id="summaryFrag">
+ <span wicket:id="status" class="status"></span>
<span wicket:id="number" class="number"></span>
<a wicket:id="title" class="title"><span wicket:id="label"></span></a>
- <span wicket:id="status" class="status"></span>
</wicket:fragment>
<wicket:fragment wicket:id="sourceFrag">
<a wicket:id="link"></a>
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
index 59596670f7..25cf9af451 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/PullRequestListPage.java
@@ -52,7 +52,6 @@ import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.util.PullRequestConstants;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.behavior.PullRequestQueryBehavior;
import io.onedev.server.web.component.branch.BranchLink;
@@ -356,7 +355,7 @@ public class PullRequestListPage extends ProjectPage {
});
- columns.add(new AbstractColumn<PullRequest, Void>(Model.of(PullRequestConstants.FIELD_TITLE)) {
+ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Summary")) {
@Override
public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {
@@ -365,7 +364,7 @@ public class PullRequestListPage extends ProjectPage {
QueryPosition position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),
(int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());
- Fragment fragment = new Fragment(componentId, "titleFrag", PullRequestListPage.this);
+ Fragment fragment = new Fragment(componentId, "summaryFrag", PullRequestListPage.this);
fragment.add(new Label("number", "#" + request.getNumber()));
Link<Void> link = new BookmarkablePageLink<Void>("title", PullRequestActivitiesPage.class,
PullRequestActivitiesPage.paramsOf(rowModel.getObject(), position));
@@ -377,7 +376,7 @@ public class PullRequestListPage extends ProjectPage {
@Override
public String getCssClass() {
- return "title";
+ return "summary";
}
});
diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css
index 83a563ecd5..01985068db 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/list/pull-request-list.css
@@ -26,10 +26,13 @@
width: 4px;
padding: 0;
}
-#request-list>.main>.body td.title>div>* {
- margin-right: 4px;
+#request-list>.main>.body td.summary>div>* {
+ margin-right: 8px;
}
-#request-list>.main>.body td.title .number {
+#request-list>.main>.body td.summary>div>*:last-child {
+ margin-right: 0;
+}
+#request-list>.main>.body td.summary .number {
font-weight: bold;
}
#request-list>.main>.body tr.request.new td.new-indicator {
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
index b47194918b..623b8841c4 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html
@@ -1,2 +1,3 @@
<wicket:extend>
+ <a wicket:id="test">test</a>
</wicket:extend>
\ No newline at end of file
diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
index 03fa904b5e..4907f3ba53 100644
--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java
@@ -3,6 +3,7 @@ package io.onedev.server.web.page.test;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.web.page.base.BasePage;
@@ -17,6 +18,14 @@ public class TestPage extends BasePage {
@Override
protected void onInitialize() {
super.onInitialize();
+
+ add(new Link<Void>("test") {
+
+ @Override
+ public void onClick() {
+ }
+
+ });
}
@Override
diff --git a/product/system/conf/hibernate.properties b/product/system/conf/hibernate.properties
index 8ed8972861..4dfd5dee4d 100644
--- a/product/system/conf/hibernate.properties
+++ b/product/system/conf/hibernate.properties
@@ -109,7 +109,6 @@ hibernate.hikari.leakDetectionThreshold=1800000
hibernate.show_sql=false
hibernate.format_sql=true
-hibernate.use_sql_comments=true
javax.persistence.validation.mode=none
hibernate.validator.apply_to_ddl=false