Skip to content

The Unified and Autonomous Development Platform

More bug fixes for styles and mobiles

Robin Shenab282aef1228
diff --git a/core/src/main/java/io/onedev/server/model/support/CommitMessageTransformSetting.java b/core/src/main/java/io/onedev/server/model/support/CommitMessageTransformSetting.java
index 33600c6ffa..239a870042 100644
--- a/core/src/main/java/io/onedev/server/model/support/CommitMessageTransformSetting.java
+++ b/core/src/main/java/io/onedev/server/model/support/CommitMessageTransformSetting.java
@@ -27,8 +27,8 @@ public class CommitMessageTransformSetting implements Serializable {
}
@Editable(order=200, description="Specify replacement for above matches, for the example "
- + "issue key pattern above, you may use <tt>&lt;a href='http://track.example.com/browse/$1'&gt;$1&lt;/a&gt;</tt> to "
- + "replace issue keys with issue links. Here <tt>$n</tt> represents nth capturing group in <tt>search for</tt> "
+ + "issue key pattern above, you may use <tt>&lt;a href='http://track.example.com/browse/\\$1'&gt;\\$1&lt;/a&gt;</tt> to "
+ + "replace issue keys with issue links. Here <tt>\\$n</tt> represents nth capturing group in <tt>search for</tt> "
+ "pattern")
@NotEmpty
public String getReplaceWith() {
diff --git a/core/src/main/java/io/onedev/server/util/GroovyUtils.java b/core/src/main/java/io/onedev/server/util/GroovyUtils.java
index de11dddf73..56006f9030 100644
--- a/core/src/main/java/io/onedev/server/util/GroovyUtils.java
+++ b/core/src/main/java/io/onedev/server/util/GroovyUtils.java
@@ -3,14 +3,13 @@ package io.onedev.server.util;
import java.util.HashMap;
import java.util.Map;
-import org.unbescape.java.JavaEscape;
-
import com.google.common.collect.MapMaker;
import groovy.lang.Binding;
import groovy.lang.GroovyClassLoader;
import groovy.lang.Script;
import io.onedev.server.exception.ScriptException;
+import io.onedev.utils.StringUtils;
public class GroovyUtils {
@@ -72,7 +71,7 @@ public class GroovyUtils {
public static String evalGString(String gstring, Map<String, Object> variables) {
if (gstring.contains("$"))
- return evalScript("\"" + JavaEscape.escapeJava(gstring) + "\"", variables).toString();
+ return evalScript("\"" + StringUtils.replace(gstring, "\"", "\\\"") + "\"", variables).toString();
else
return gstring;
}
diff --git a/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js b/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js
index d12caec455..f7d852e4d9 100644
--- a/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js
+++ b/core/src/main/java/io/onedev/server/web/component/sidebar/sidebar.js
@@ -4,11 +4,17 @@ onedev.server.sidebar = {
var $tabs = $sidebar.children(".tabs");
var $miniToggle = $sidebar.children(".mini-toggle");
- var ps = new PerfectScrollbar($tabs[0]);
-
- $(window).resize(function() {
- ps.update();
- });
+ // Sometimes we have sidebar positioned absolutely in order not to occupy
+ // screen estates on mobile devices. In this case, we also disable the
+ // perfect scrollbar as container applied with perfect scrollbar can not
+ // be panned on mobile
+ if ($sidebar.css("position") == "fixed") {
+ var ps = new PerfectScrollbar($tabs[0]);
+
+ $(window).resize(function() {
+ ps.update();
+ });
+ }
function onMiniToggled() {
var $links = $sidebar.find("ul>li>a");
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html b/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html
index 4b4d498a45..c2d3bba848 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/admin/mailsetting/MailSettingPage.html
@@ -2,8 +2,8 @@
<form wicket:id="mailSetting" class="mail-setting leave-confirm">
<div wicket:id="editor"></div>
<div class="actions">
- <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save setting"></input>
- <input wicket:id="test" type="submit" class="btn btn-primary" value="Send test mail"></input>
+ <input wicket:id="save" type="submit" class="btn btn-primary dirty-aware" value="Save setting">
+ <input wicket:id="test" type="submit" class="btn btn-primary" value="Send test mail">
</div>
</form>
</wicket:extend>
diff --git a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
index 3933796964..20b2ea68ea 100644
--- a/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/admin/user/UserPage.java
@@ -40,7 +40,7 @@ public abstract class UserPage extends AdministrationPage {
protected void onInitialize() {
super.onInitialize();
- add(new SideBar("userSidebar", "user.miniSidebar") {
+ add(new SideBar("userSidebar", null) {
@Override
protected Component newHead(String componentId) {
diff --git a/core/src/main/java/io/onedev/server/web/page/base/BasePage.html b/core/src/main/java/io/onedev/server/web/page/base/BasePage.html
index d38a6d1909..ef5bfa5945 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/BasePage.html
+++ b/core/src/main/java/io/onedev/server/web/page/base/BasePage.html
@@ -6,7 +6,7 @@
<title wicket:id="pageTitle">OneDev</title>
<meta wicket:id="pageRefresh" http-equiv="refresh"/>
<meta name="Author" content="OneDev Pty." />
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <meta name="viewport" content="width=device-width, height=device-height, initial-scale=1.0, minimum-scale=1.0">
<meta wicket:id="robots" name="robots">
<link rel="icon" href="/img/favicon.ico" type="image/x-icon"/>
<link rel="apple-touch-icon" href="/img/apple-touch-icon.png"/>
diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.css b/core/src/main/java/io/onedev/server/web/page/base/base.css
index f8b48268dc..8fc6b18249 100644
--- a/core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -231,6 +231,9 @@ form>.test-feedback {
.viewer .type-selector, .viewer .no-elements, .editor .no-elements {
font-style: italic;
}
+.editable .bean.list>thead>tr>th {
+ border-bottom: 2px solid #E0E0E0;
+}
.editable .viewer .bean.list>thead>tr>th {
font-size: 12px;
padding-top: 0;
@@ -240,6 +243,9 @@ form>.test-feedback {
.editable table.bean.list>thead>tr>th, .editable table.bean.list>tbody>tr>td {
padding: 5px 10px 5px 0;
}
+.editable table.bean.list>tbody>tr:first-child>td {
+ padding-top: 10px;
+}
.editable table.bean.list>thead>tr>th.actions, .editable table.bean.list>tbody>tr>td.actions {
padding-right: 0;
padding-left: 10px;
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html b/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html
index 79a2313fc7..c1c93db150 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.html
@@ -1,9 +1,8 @@
<wicket:extend>
<form wicket:id="commitMessageTransformSetting" class="commit-message-transform leave-confirm">
- <label>Enable</label>
<div wicket:id="editor"></div>
<div class="actions">
- <input type="submit" class="btn btn-primary dirty-aware" value="Save setting"></input>
+ <input type="submit" class="btn btn-primary dirty-aware" value="Save setting">
</div>
<div class="help-block">
<i class="fa fa-info-circle"></i> Check this to tell OneDev how to transform commit message for displaying.
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java b/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java
index ae739f4914..9cfd40f68e 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformPage.java
@@ -1,18 +1,12 @@
package io.onedev.server.web.page.project.setting.commitmessagetransform;
-import java.io.Serializable;
-
import org.apache.wicket.Session;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.model.IModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.OneDev;
import io.onedev.server.manager.ProjectManager;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.support.CommitMessageTransformSetting;
-import io.onedev.server.web.editable.PropertyDescriptor;
-import io.onedev.server.web.editable.bean.BeanPropertyEditor;
+import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.project.setting.ProjectSettingPage;
@SuppressWarnings("serial")
@@ -26,33 +20,22 @@ public class CommitMessageTransformPage extends ProjectSettingPage {
protected void onInitialize() {
super.onInitialize();
+ CommitMessageTransformSettingHolder bean = new CommitMessageTransformSettingHolder();
+ bean.setCommitMessageTransformSetting(getProject().getCommitMessageTransformSetting());
+
Form<?> form = new Form<Void>("commitMessageTransformSetting") {
@Override
protected void onSubmit() {
super.onSubmit();
+ getProject().setCommitMessageTransformSetting(bean.getCommitMessageTransformSetting());
OneDev.getInstance(ProjectManager.class).save(getProject());
Session.get().success("Commit message transform setting is updated");
}
};
- form.add(new BeanPropertyEditor("editor", new PropertyDescriptor(Project.class, "commitMessageTransformSetting"), new IModel<Serializable>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public Serializable getObject() {
- return getProject().getCommitMessageTransformSetting();
- }
-
- @Override
- public void setObject(Serializable object) {
- getProject().setCommitMessageTransformSetting((CommitMessageTransformSetting) object);
- }
-
- }));
+
+ form.add(BeanContext.editBean("editor", bean));
add(form);
}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformSettingHolder.java b/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformSettingHolder.java
new file mode 100644
index 0000000000..7adce41b1e
--- /dev/null
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/commitmessagetransform/CommitMessageTransformSettingHolder.java
@@ -0,0 +1,24 @@
+package io.onedev.server.web.page.project.setting.commitmessagetransform;
+
+import java.io.Serializable;
+
+import io.onedev.server.model.support.CommitMessageTransformSetting;
+import io.onedev.server.web.editable.annotation.Editable;
+
+@Editable
+public class CommitMessageTransformSettingHolder implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private CommitMessageTransformSetting commitMessageTransformSetting;
+
+ @Editable(name="Enable")
+ public CommitMessageTransformSetting getCommitMessageTransformSetting() {
+ return commitMessageTransformSetting;
+ }
+
+ public void setCommitMessageTransformSetting(CommitMessageTransformSetting commitMessageTransformSetting) {
+ this.commitMessageTransformSetting = commitMessageTransformSetting;
+ }
+
+}
diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
index 754ec64ee3..1edca961d8 100644
--- a/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/project-setting.css
@@ -5,6 +5,9 @@
/* make it absolute as we do not want to make it stay fixed to occupy screen space on mobile screen */
position: absolute;
z-index: 0;
+ /* use hacks below to make the sidebar extend to the screen bottom even if body does not reach to the bottom */
+ margin-bottom: -10000px;
+ padding-bottom: 10000px;
width: 260px;
}
#project-setting>.sidebar>.tabs>li>a {