You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2021/04/18 14:09:50 UTC
[isis] 04/11: Reworking clearfix show/hide
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch 2617_wicketstuff.bs4
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 9c7a6a4c57a0d834a40cd2134dac540862f86d7f
Author: mwhesse <mw...@gmail.com>
AuthorDate: Sat Apr 17 19:29:10 2021 +0700
Reworking clearfix show/hide
---
.../applib/layout/grid/bootstrap3/BS3ClearFix.java | 30 ++++++++++++++++++++-
.../layout/grid/bootstrap3/BS3ClearFixHidden.java | 6 ++---
.../layout/grid/bootstrap3/BS3ClearFixVisible.java | 15 +++--------
.../isis/applib/layout/grid/bootstrap3/Size.java | 31 +++++++---------------
.../applib/layout/grid/bootstrap3/SizeSpan.java | 10 ++++++-
core/pom.xml | 16 +----------
6 files changed, 53 insertions(+), 55 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
index eedeaa5..0015536 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFix.java
@@ -18,12 +18,40 @@
*/
package org.apache.isis.applib.layout.grid.bootstrap3;
+import org.apache.isis.applib.layout.grid.bootstrap3.BS3ClearFix.CssDisplay;
+
/**
* @since 1.x {@index}
*/
public abstract class BS3ClearFix extends BS3RowContent {
-
+
private static final long serialVersionUID = 1L;
+
+ public enum CssDisplay {
+ NONE,
+ BLOCK,
+ INLINE,
+ INLINE_BLOCK,
+ GRID,
+ TABLE,
+ TABLE_CELL,
+ TABLE_ROW,
+ FLEX,
+ INLINE_FLEX;
+
+ public String toCssClassFragment() {
+ return name().toLowerCase().replace('_', '-');
+ }
+ }
+ protected String getDisplayFragment(CssDisplay displayValue, Size breakpoint) {
+ switch(breakpoint) {
+ case XS:
+ return String.format("d-%s", displayValue.toCssClassFragment());
+ default:
+ return String.format("d-%s-%s", breakpoint.toCssClassFragment(), displayValue.toCssClassFragment());
+ }
+ }
+
public abstract String toCssClass();
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java
index e64d81f..55283da 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixHidden.java
@@ -43,9 +43,7 @@ public class BS3ClearFixHidden extends BS3ClearFix {
@Override
public String toCssClass() {
- return "clearfix "
- + getSize().toCssDNoneClassFragment() +
- (getCssClass() != null? " " + getCssClass(): "");
+ return "clearfix " + getDisplayFragment(CssDisplay.NONE, getSize())
+ + (getCssClass() != null? " " + getCssClass(): "");
}
-
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java
index 9de23c0..c2df7ef 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/BS3ClearFixVisible.java
@@ -22,6 +22,8 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import org.apache.isis.applib.layout.grid.bootstrap3.BS3ClearFix.CssDisplay;
+
/**
* One of the <a href="http://getbootstrap.com/css/#responsive-utilities">Responsive utility classes</a>.
*
@@ -42,16 +44,6 @@ public class BS3ClearFixVisible extends BS3ClearFix {
private static final long serialVersionUID = 1L;
- public enum CssDisplay {
- BLOCK,
- INLINE,
- INLINE_BLOCK;
-
- public String toCssClassFragment() {
- return name().toLowerCase().replace('_', '-');
- }
- }
-
private CssDisplay cssDisplay;
@@ -68,8 +60,7 @@ public class BS3ClearFixVisible extends BS3ClearFix {
@Override
public String toCssClass() {
return "clearfix "
- + getSize().toCssDBlockClassFragment()
- // + "-" + getCssDisplay().toCssClassFragment()
+ + getDisplayFragment(getCssDisplay(), getSize())
+ (getCssClass() != null? " " + getCssClass(): "");
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java
index 1459376..015c42e 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/Size.java
@@ -24,28 +24,15 @@ package org.apache.isis.applib.layout.grid.bootstrap3;
* @since 1.x {@index}
*/
public enum Size {
- XS(""),
- SM("sm-"),
- MD("md-"),
- LG("lg-"),
- XL("xl-"),
- XXL("xxl-");
+ XS,
+ SM,
+ MD,
+ LG,
+ XL,
+ XXL;
- final String bsPrefix;
- private Size(String bsPrefix) {
- this.bsPrefix = bsPrefix;
- }
-
- public String toCssSpanClassFragment(int span) {
- return String.format("%s%d", bsPrefix, span);
- }
-
- public String toCssDNoneClassFragment() {
- return String.format("d-%snone", bsPrefix);
- }
-
- public String toCssDBlockClassFragment() {
- return String.format("d-%sblock", bsPrefix);
+ public String toCssClassFragment() {
+ return name().toLowerCase();
}
-
+
}
diff --git a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java
index 1f63c72..a5b9813 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/layout/grid/bootstrap3/SizeSpan.java
@@ -99,7 +99,15 @@ public class SizeSpan implements Serializable {
if(Boolean.TRUE.equals(offset)) {
buf.append("offset-").append(span);
} else {
- buf.append("col-").append(size.toCssSpanClassFragment(span));
+ buf.append("col-");
+ switch(size) {
+ case XS:
+ buf.append("" + span);
+ break;
+ default:
+ buf.append(size.toCssClassFragment()).append("-").append("" + span);
+ break;
+ }
}
return buf;
}
diff --git a/core/pom.xml b/core/pom.xml
index 4fc88f8..f3a85d5 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -183,7 +183,6 @@
<wicket.version>8.11.0</wicket.version>
<wicket-bootstrap.version>3.0.0-M17</wicket-bootstrap.version> <!-- de.agilecoders.wicket:wicket-bootstrap... -->
- <wicket-bootstrap-datetimepicker.version>4.17.47</wicket-bootstrap-datetimepicker.version>
<wicket-fullcalendar.version>4.2</wicket-fullcalendar.version>
<wicket-source.version>7.0.0</wicket-source.version>
<wicket-webjars.version>2.0.19</wicket-webjars.version>
@@ -1451,20 +1450,7 @@
<artifactId>jquery-ui</artifactId>
<version>${jquery-ui.version}</version>
</dependency>
-
- <!-- TODO: when used, move exclusions down -->
- <dependency>
- <groupId>org.webjars</groupId>
- <artifactId>Eonasdan-bootstrap-datetimepicker</artifactId>
- <version>${wicket-bootstrap-datetimepicker.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.webjars</groupId>
- <artifactId>momentjs</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
+
<dependency>
<groupId>org.webjars</groupId>
<artifactId>select2</artifactId>