Skip to content

The Unified and Autonomous Development Platform

Vertically align checkbox and label

Robin Shen989d191d0d84
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/HeaderSelector.html b/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/HeaderSelector.html
index f7da336d99..17152d1a90 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/HeaderSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/HeaderSelector.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input type="checkbox" wicket:id="checkbox"></input>
+ <input type="checkbox" wicket:id="checkbox">
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/RowSelector.html b/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/RowSelector.html
index f7da336d99..17152d1a90 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/RowSelector.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/datatable/selectioncolumn/RowSelector.html
@@ -1,3 +1,3 @@
<wicket:panel>
- <input type="checkbox" wicket:id="checkbox"></input>
+ <input type="checkbox" wicket:id="checkbox">
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html
index bc63b94436..51e32a0f8a 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/bean/BeanPropertyEditor.html
@@ -1,6 +1,10 @@
<wicket:panel>
<wicket:enclosure child:id="enable">
- <input wicket:id="enable" type="checkbox" class="enable">
+ <div class="checkbox">
+ <label>
+ <input wicket:id="enable" type="checkbox" class="enable">
+ </label>
+ </div>
</wicket:enclosure>
<div wicket:id="beanEditor"></div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.html b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.html
index c8bc5c3cb7..ab33a977f4 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/bool/BooleanPropertyEditor.html
@@ -1,3 +1,7 @@
<wicket:panel>
- <input wicket:id="input" type="checkbox"></input>
+ <div class="checkbox">
+ <label>
+ <input wicket:id="input" type="checkbox">
+ </label>
+ </div>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/editable.js b/server-core/src/main/java/io/onedev/server/web/editable/editable.js
index bdd2b733da..b89a7567be 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/editable.js
+++ b/server-core/src/main/java/io/onedev/server/web/editable/editable.js
@@ -17,20 +17,18 @@ onedev.server.editable = {
},
onBeanEditorPropertyContainerDomReady: function(containerId) {
var $container = $("#" + containerId);
- $container.find(".value>input[type=checkbox]").each(function() {
- var $input = $(this);
- $input.css("margin-right", "8px");
- $input.css("vertical-align", "text-top");
- var $label = $input.parent().prev("label.name");
- $label.attr("for", $input.attr("id")).insertAfter($input);
+ $container.find("div.value>.checkbox").each(function() {
+ var $checkbox = $(this);
+ var $label = $checkbox.parent().prev("label.name");
+ $checkbox.children("label").append($label.children("span").text());
+ $label.remove();
});
- $container.find(".value>div>input[type=checkbox]").each(function() {
- var $input = $(this);
- $input.css("margin-right", "8px");
- $input.css("vertical-align", "text-top");
- $label = $input.parent().parent().prev("label.name");
- $label.attr("for", $input.attr("id")).insertAfter($input);
+ $container.find("td.value>div>.checkbox").each(function() {
+ var $checkbox = $(this);
+ var $td = $checkbox.parent().parent().prev("td.name");
+ $checkbox.children("label").append($td.children("span").text());
+ $td.empty();
});
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
index 74fd32a854..d80047194f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.html
@@ -5,8 +5,11 @@
<span wicket:id="name" class="name"></span>
<a wicket:id="edit" title="Edit this executor"><i class="fa fa-pencil"></i></a>
<a wicket:id="delete" title="Delete this executor"><i class="fa fa-trash"></i></a>
- <input wicket:id="enable" type="checkbox">
- <label wicket:id="enableLabel">Enable</label>
+ <div class="checkbox">
+ <label>
+ <input wicket:id="enable" type="checkbox"> Enable
+ </label>
+ </div>
</div>
<div class="panel-body">
<div wicket:id="executor"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
index b66fc572a9..99b9fd6fc0 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/jobexecutor/JobExecutorPanel.java
@@ -8,8 +8,6 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
@@ -98,8 +96,7 @@ abstract class JobExecutorPanel extends Panel {
});
- AjaxCheckBox enableCheck;
- add(enableCheck = new AjaxCheckBox("enable", Model.of(getExecutor().isEnabled())) {
+ add(new AjaxCheckBox("enable", Model.of(getExecutor().isEnabled())) {
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -108,15 +105,6 @@ abstract class JobExecutorPanel extends Panel {
target.add(JobExecutorPanel.this);
}
- });
- add(new WebMarkupContainer("enableLabel") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.put("for", enableCheck.getMarkupId(true));
- }
-
});
add(BeanContext.view("executor", getExecutor()).setOutputMarkupId(true));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index 93250e2654..95d64df821 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -648,3 +648,7 @@ td.ellipsis {
color: #999;
}
+.panel-heading .checkbox {
+ display: inline-block;
+ margin: 0;
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html
index 7703b68a1c..22bcafb50c 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/search/advanced/AdvancedSearchPanel.html
@@ -16,57 +16,57 @@
<wicket:fragment wicket:id="symbolSearchFrag">
<div wicket:id="term" class="form-group">
<label>Search For</label>
- <input wicket:id="term" name="searchFor" class="form-control" type="text"></input>
+ <input wicket:id="term" name="searchFor" class="form-control" type="text">
<p class="help-block">(* = any string, ? = any character)</p>
<div wicket:id="feedback"></div>
</div>
<div class="form-group">
- <label class="checkbox-inline"><input wicket:id="caseSensitive" type="checkbox"></input> Case sensitive</label>
+ <label class="checkbox-inline"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
</div>
<div class="form-group">
<label>File name patterns (separated by comma)</label>
- <input wicket:id="fileNames" class="form-control" type="text" placeholder="File name patterns such as *.java, *.c"></input>
+ <input wicket:id="fileNames" class="form-control" type="text" placeholder="File name patterns such as *.java, *.c">
</div>
<wicket:enclosure child="insideCurrentDir">
<div class="form-group">
- <label class="checkbox-inline"><input wicket:id="insideCurrentDir" type="checkbox"></input> Search inside current tree</label>
+ <label class="checkbox-inline"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
</div>
</wicket:enclosure>
</wicket:fragment>
<wicket:fragment wicket:id="fileSearchFrag">
<div wicket:id="term" class="form-group">
<label>Search For</label>
- <input wicket:id="term" name="searchFor" class="form-control" type="text"></input>
+ <input wicket:id="term" name="searchFor" class="form-control" type="text">
<p class="help-block">(* = any string, ? = any character)</p>
<div wicket:id="feedback"></div>
</div>
<div class="form-group">
- <label class="checkbox-inline"><input wicket:id="caseSensitive" type="checkbox"></input> Case sensitive</label>
+ <label class="checkbox-inline"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
</div>
<wicket:enclosure child="insideCurrentDir">
<div class="form-group">
- <label class="checkbox-inline"><input wicket:id="insideCurrentDir" type="checkbox"></input> Search inside current tree</label>
+ <label class="checkbox-inline"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
</div>
</wicket:enclosure>
</wicket:fragment>
<wicket:fragment wicket:id="textSearchFrag">
<div wicket:id="term" class="form-group">
<label>Search For</label>
- <input wicket:id="term" name="searchFor" class="form-control" type="text"></input>
+ <input wicket:id="term" name="searchFor" class="form-control" type="text">
<div wicket:id="feedback"></div>
</div>
<div class="form-group">
- <label class="checkbox-inline"><input wicket:id="regex" type="checkbox"></input> Regular expression</label>
- <label class="checkbox-inline"><input wicket:id="wholeWord" type="checkbox"></input> Whole word</label>
- <label class="checkbox-inline"><input wicket:id="caseSensitive" type="checkbox"></input> Case sensitive</label>
+ <label class="checkbox-inline"><input wicket:id="regex" type="checkbox"> Regular expression</label>
+ <label class="checkbox-inline"><input wicket:id="wholeWord" type="checkbox"> Whole word</label>
+ <label class="checkbox-inline"><input wicket:id="caseSensitive" type="checkbox"> Case sensitive</label>
</div>
<div class="form-group">
<label>File name patterns (separated by comma)</label>
- <input wicket:id="fileNames" class="form-control" type="text" placeholder="File name patterns such as *.java, *.c"></input>
+ <input wicket:id="fileNames" class="form-control" type="text" placeholder="File name patterns such as *.java, *.c">
</div>
<wicket:enclosure child="insideCurrentDir">
<div class="form-group">
- <label class="checkbox-inline"><input wicket:id="insideCurrentDir" type="checkbox"></input> Search inside current tree</label>
+ <label class="checkbox-inline"><input wicket:id="insideCurrentDir" type="checkbox"> Search inside current tree</label>
</div>
</wicket:enclosure>
</wicket:fragment>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
index 64b3d3f492..1200419631 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.html
@@ -7,9 +7,13 @@
<div class="title clearfix">
<label class="pull-left">Base</label>
<wicket:enclosure child="compareWithMergeBase">
- <input wicket:id="compareWithMergeBase" type="checkbox" class="pull-left">
- <span class="pull-left">common ancestor</span>
- <span wicket:id="mergeBaseTooltip" class="pull-left"><i class="fa fa-question-circle"></i></span>
+ <div class="pull-left checkbox">
+ <label>
+ <input wicket:id="compareWithMergeBase" type="checkbox">
+ common ancestor
+ <span wicket:id="mergeBaseTooltip"><i class="fa fa-question-circle"></i></span>
+ </label>
+ </div>
</wicket:enclosure>
</div>
<div wicket:id="leftRevSelector" class="selector"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
index d16e1e42d5..e6c1e7d01a 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/revision-compare.css
@@ -20,14 +20,14 @@
border-top: none;
border-bottom: none;
}
+#revision-compare>.revisions .revision .title .checkbox {
+ margin: 0 0 0 16px;
+}
#revision-compare>.revisions .revision .title label {
font-size: 16px;
color: #888;
font-weight: normal;
}
-#revision-compare>.revisions .revision .title input {
- margin-left: 16px;
-}
#revision-compare>.revisions .revision .title span {
color: #888;
margin-left: 4px;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html
index b2b97821f2..e8c56f835e 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.html
@@ -4,8 +4,9 @@
<span class="drag-indicator"><i class="fa fa-reorder"></i></span>
<a wicket:id="edit" title="Edit this protection"><i class="fa fa-pencil"></i></a>
<a wicket:id="delete" title="Delete this protection"><i class="fa fa-trash"></i></a>
- <input wicket:id="enable" type="checkbox">
- <label wicket:id="enableLabel">Enable</label>
+ <div class="checkbox">
+ <label><input wicket:id="enable" type="checkbox"> Enable</label>
+ </div>
</div>
<div class="panel-body">
<div wicket:id="protection"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
index ca10328bef..0d91153b1d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/branchprotection/BranchProtectionPanel.java
@@ -6,8 +6,6 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
@@ -74,8 +72,7 @@ abstract class BranchProtectionPanel extends Panel {
});
- AjaxCheckBox enableCheck;
- add(enableCheck = new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
+ add(new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -84,15 +81,6 @@ abstract class BranchProtectionPanel extends Panel {
target.add(BranchProtectionPanel.this);
}
- });
- add(new WebMarkupContainer("enableLabel") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.put("for", enableCheck.getMarkupId(true));
- }
-
});
add(BeanContext.view("protection", protection).setOutputMarkupId(true));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html
index f3a7a0927c..629f3025de 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.html
@@ -4,8 +4,9 @@
<span class="drag-indicator"><i class="fa fa-reorder"></i></span>
<a wicket:id="edit" title="Edit this protection"><i class="fa fa-pencil"></i></a>
<a wicket:id="delete" title="Delete this protection"><i class="fa fa-trash"></i></a>
- <input wicket:id="enable" type="checkbox">
- <label wicket:id="enableLabel">Enable</label>
+ <div class="checkbox">
+ <label><input wicket:id="enable" type="checkbox"> Enable</label>
+ </div>
</div>
<div class="panel-body">
<div wicket:id="protection"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
index e9541ce44d..3a292dc071 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/tagprotection/TagProtectionPanel.java
@@ -6,8 +6,6 @@ import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.ComponentTag;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.panel.Panel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
@@ -74,8 +72,7 @@ abstract class TagProtectionPanel extends Panel {
});
- AjaxCheckBox enableCheck;
- add(enableCheck = new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
+ add(new AjaxCheckBox("enable", Model.of(protection.isEnabled())) {
@Override
protected void onUpdate(AjaxRequestTarget target) {
@@ -84,15 +81,6 @@ abstract class TagProtectionPanel extends Panel {
target.add(TagProtectionPanel.this);
}
- });
- add(new WebMarkupContainer("enableLabel") {
-
- @Override
- protected void onComponentTag(ComponentTag tag) {
- super.onComponentTag(tag);
- tag.put("for", enableCheck.getMarkupId(true));
- }
-
});
add(AttributeAppender.append("class", new LoadableDetachableModel<String>() {