You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2014/10/24 13:42:04 UTC
[01/10] ISIS-537 Extract common markup in the parent classes (WIP)
Repository: isis
Updated Branches:
refs/heads/master 1766c7b11 -> 67e2c7be1
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.html
deleted file mode 100644
index facefb3..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="jodaLocalDateTimePanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
index 6a83b7b..e7caecf 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDateTimePanel.java
@@ -20,6 +20,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.jodatime;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.joda.time.LocalDateTime;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldDatePickerAbstract;
@@ -42,4 +44,9 @@ public class JodaLocalDateTimePanel extends ScalarPanelTextFieldDatePickerAbstra
protected TextField<LocalDateTime> createTextField(final String id) {
return new TextFieldWithDateTimePicker<>(id, new TextFieldValueModel<LocalDateTime>(this), cls, converter);
}
+
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("jodaLocalDateTimePanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html
deleted file mode 100644
index e469780..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="bytePanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
index bb85b0c..7bf40da 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converter.ByteConverter;
@@ -52,4 +54,9 @@ public class BytePanel extends ScalarPanelTextFieldNumeric<Byte> {
};
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("bytePanel");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.html
deleted file mode 100644
index 8d0c65e..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="characterPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
index 61217d0..cffc3cd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/CharacterPanel.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
@@ -34,4 +36,8 @@ public class CharacterPanel extends ScalarPanelTextFieldParseableAbstract {
super(id, ID_SCALAR_VALUE, scalarModel);
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("characterPanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html
deleted file mode 100644
index 4a66212..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="doublePanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
index 32cff69..dad10bf 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converter.DoubleConverter;
@@ -52,4 +54,9 @@ public class DoublePanel extends ScalarPanelTextFieldNumeric<Double> {
};
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("doublePanel");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html
deleted file mode 100644
index 53bf1a8..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="floatPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
index a411934..0e4f58e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converter.FloatConverter;
@@ -52,5 +54,10 @@ public class FloatPanel extends ScalarPanelTextFieldNumeric<Float> {
};
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("floatPanel");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html
deleted file mode 100644
index 4014176..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="integerPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
index a0829e5..9eb0bee 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converter.IntegerConverter;
@@ -52,4 +54,9 @@ public class IntegerPanel extends ScalarPanelTextFieldNumeric<Integer> {
};
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("integerPanel");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html
deleted file mode 100644
index 4b0ecfe..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="longPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
index 6879f18..9d1b548 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converter.LongConverter;
@@ -52,4 +54,9 @@ public class LongPanel extends ScalarPanelTextFieldNumeric<Long> {
};
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("longPanel");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html
deleted file mode 100644
index 623d562..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="shortPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
index 7e7494d..d548a3a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
import org.apache.wicket.util.convert.converter.ShortConverter;
@@ -53,4 +55,9 @@ public class ShortPanel extends ScalarPanelTextFieldNumeric<Short> {
};
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("shortPanel");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.html
deleted file mode 100644
index 9591369..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="multiLineStringPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <textarea name="scalarValue" wicket:id="scalarValue" class="form-control"></textarea>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
index 431b98f..1d60c7a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
@@ -21,8 +21,10 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.string;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.facets.SingleIntValueFacet;
@@ -62,7 +64,14 @@ public class MultiLineStringPanel extends ScalarPanelTextFieldParseableAbstract
getModel().setObjectAsString(object);
}
}
- });
+ }) {
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ tag.setName("textarea");
+ tag.remove("type");
+ super.onComponentTag(tag);
+ }
+ };
final MultiLineFacet multiLineFacet = getModel().getFacet(MultiLineFacet.class);
@@ -79,6 +88,11 @@ public class MultiLineStringPanel extends ScalarPanelTextFieldParseableAbstract
return textField;
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("multiLineStringPanel");
+ }
+
private Component setAttribute(final TextArea<String> textField, final String attributeName, final int i) {
return textField.add(AttributeModifier.replace(attributeName, ""+i));
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.html
deleted file mode 100644
index 74a1a2b..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="stringPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
index 4441150..b832a17 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/StringPanel.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.string;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
@@ -36,6 +38,11 @@ public class StringPanel extends ScalarPanelTextFieldParseableAbstract {
}
@Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("stringPanel");
+ }
+
+ @Override
protected void addSemantics() {
super.addSemantics();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.html
deleted file mode 100644
index 78e135e..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="valuePanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-9">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
index b54e495..fd3641a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/value/ValuePanel.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.value;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Value;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
@@ -46,4 +48,8 @@ public class ValuePanel extends ScalarPanelTextFieldParseableAbstract {
super.addSemantics();
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("valuePanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
index 0f24bd2..304ac92 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
@@ -22,11 +22,6 @@
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
xml:lang="en"
lang="en">
- <head>
- <wicket:link>
- <!--<link href="ValueChoicesSelect2Panel.css" rel="stylesheet" type="text/css"/>-->
- </wicket:link>
- </head>
<body>
<wicket:panel>
<div class="valueChoicesSelect2Panel scalarNameAndValueComponentType">
@@ -42,7 +37,7 @@
</label>
</div>
</div>
- <label wicket:id="scalarIfCompact"></label>
+ <span wicket:id="scalarIfCompact"></span>
</div>
</wicket:panel>
</body>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
index 7ad5e1f..fd802d5 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
@@ -19,7 +19,7 @@
.mandatory.scalarName:after,
.mandatory.collectionName:after {
- content: " *";
+ /*content: " *";*/
font-weight:bold;
color: #c2270d;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index e72fdd8..f2f18e8 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -90,4 +90,3 @@ label {
th > a > div > strong {
float: left;
}
-
[04/10] git commit: ISIS-537 Improve the markup of ReferencePanel and
IsisBlobOrClobPanelAbstract
Posted by da...@apache.org.
ISIS-537 Improve the markup of ReferencePanel and IsisBlobOrClobPanelAbstract
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1802a6dd
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1802a6dd
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1802a6dd
Branch: refs/heads/master
Commit: 1802a6ddc2ea689b74fcf9246441931e756d63ad
Parents: 3f30504
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Oct 23 18:10:00 2014 +0300
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 24 12:30:54 2014 +0100
----------------------------------------------------------------------
.../actions/ActionParametersFormPanel.html | 2 +-
.../components/scalars/ScalarPanelAbstract.html | 2 +-
.../scalars/ScalarPanelTextFieldAbstract.java | 3 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.html | 32 +++++++++-----------
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 13 ++++----
.../scalars/primitive/BooleanPanel.java | 4 +--
.../scalars/reference/ReferencePanel.html | 32 +++++++++-----------
.../scalars/reference/ReferencePanel.java | 12 +++-----
.../components/widgets/bootstrap/FormGroup.java | 30 ++++++++++++++++++
.../valuechoices/ValueChoicesSelect2Panel.java | 4 +--
.../wicket/ui/pages/bootstrap-overrides.css | 15 +++++++--
11 files changed, 91 insertions(+), 58 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
index a5c0b1f..34b8050 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<div class="actionParametersForm inputForm">
- <form wicket:id="inputForm" method="post">
+ <form wicket:id="inputForm" method="post" class="form-inline">
<fieldset class="inputFormTable parameters">
<div wicket:id="parameters" class="parameter">
<div wicket:id="scalarNameAndValue">[scalar]</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
index b0f1799..20acf9a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
@@ -26,7 +26,7 @@
<wicket:panel>
<div class="scalarNameAndValueComponentType" wicket:id="scalarTypeContainer">
<div class="form-group" wicket:id="scalarIfRegular">
- <label wicket:id="scalarName" class="scalarName">[Label text]</label>
+ <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
<span class="scalarValueWrapper">
<wicket:child/>
<span wicket:id="feedback" class="help-block"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 4ff96b4..827d7f7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -39,6 +39,7 @@ import org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacet;
import org.apache.isis.core.metamodel.facets.propparam.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
/**
@@ -142,7 +143,7 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
final String name = getModel().getName();
textField.setLabel(Model.of(name));
- final WebMarkupContainer scalarNameAndValue = new WebMarkupContainer(ID_SCALAR_IF_REGULAR);
+ final FormGroup scalarNameAndValue = new FormGroup(ID_SCALAR_IF_REGULAR, textField);
textFieldFragment.add(textField);
scalarNameAndValue.add(textFieldFragment);
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
index a31d16a..324a46c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
@@ -21,31 +21,29 @@
<body>
<wicket:panel>
<div class="isisBlobPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <div class="col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <img class="scalarImage text-center" width="200px" wicket:id="scalarImage"/>
- <span class="scalarValue text-right">
+ <div class="form-group" wicket:id="scalarIfRegular">
+ <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
+ <span class="scalarValueWrapper">
+ <img class="scalarImage text-center" width="200px" wicket:id="scalarImage"/>
+ <span class="scalarValue text-right">
- <span class="uploadFile help-block">
- <input type="file" name="scalarValue" wicket:id="scalarValue" />
- </span>
-
- <a class="download btn btn-xs btn-default" wicket:id="scalarIfRegularDownload"><span class="downloadTitle">Download</span></a>
- <span class="fileName" wicket:id="fileName"></span>
+ <span class="uploadFile help-block">
+ <input type="file" name="scalarValue" wicket:id="scalarValue" />
</span>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </div>
+
+ <a class="download btn btn-xs btn-default" wicket:id="scalarIfRegularDownload"><span class="downloadTitle">Download</span></a>
+ <span class="fileName" wicket:id="fileName"></span>
+ </span>
+ <span wicket:id="feedback" class="help-block"></span>
+ <span wicket:id="additionalLinks"></span>
+ </span>
</div>
<span wicket:id="scalarIfCompact">
<a wicket:id="scalarIfCompactDownload"><span class="fileName" wicket:id="fileNameIfCompact"></span></a>
</span>
-
</div>
+
</wicket:panel>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index e369e93..1132dd3 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -32,7 +32,6 @@ import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.extensions.markup.html.image.resource.ThumbnailImageResource;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.FormComponentLabel;
import org.apache.wicket.markup.html.form.upload.FileUpload;
import org.apache.wicket.markup.html.form.upload.FileUploadField;
import org.apache.wicket.markup.html.image.Image;
@@ -50,6 +49,7 @@ import org.apache.isis.core.commons.lang.CloseableExtensions;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
+import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.util.Components;
public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> extends ScalarPanelAbstract {
@@ -72,22 +72,21 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
private Image wicketImage;
private FileUploadField fileUploadField;
- private Label fileNameLabel;
protected enum InputFieldVisibility {
VISIBLE, NOT_VISIBLE;
}
@Override
- protected FormComponentLabel addComponentForRegular() {
+ protected FormGroup addComponentForRegular() {
fileUploadField = createFileUploadField(ID_SCALAR_VALUE);
fileUploadField.setLabel(Model.of(getModel().getName()));
- final FormComponentLabel labelIfRegular = new FormComponentLabel(ID_SCALAR_IF_REGULAR, fileUploadField);
+ final FormGroup labelIfRegular = new FormGroup(ID_SCALAR_IF_REGULAR, fileUploadField);
labelIfRegular.add(fileUploadField);
final Label scalarName = new Label(ID_SCALAR_NAME, getModel().getName());
- add(scalarName);
+ labelIfRegular.add(scalarName);
wicketImage = asWicketImage(ID_IMAGE);
if(wicketImage != null) {
@@ -223,8 +222,8 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
private void updateRegularFormComponents(final InputFieldVisibility visibility) {
MarkupContainer formComponent = (MarkupContainer) getComponentForRegular();
formComponent.get(ID_SCALAR_VALUE).setVisible(visibility == InputFieldVisibility.VISIBLE);
-
- fileNameLabel = updateFileNameLabel(ID_FILE_NAME, formComponent);
+
+ Label fileNameLabel = updateFileNameLabel(ID_FILE_NAME, formComponent);
// the visibility of download link is intentionally 'backwards';
// if in edit mode then do NOT show
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index b156851..d30e468 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -32,6 +32,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
+import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
/**
@@ -63,8 +64,7 @@ public class BooleanPanel extends ScalarPanelAbstract {
checkBox.setLabel(Model.of(name));
- final MarkupContainer labelIfRegular = new MarkupContainer(ID_SCALAR_IF_REGULAR) {
- };
+ final FormGroup labelIfRegular = new FormGroup(ID_SCALAR_IF_REGULAR, checkBox);
labelIfRegular.add(checkBox);
if(getModel().isRequired()) {
labelIfRegular.add(new CssClassAppender("mandatory"));
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
index 85286ad..bab101a 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
@@ -25,24 +25,22 @@
<body>
<wicket:panel>
<div class="referencePanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" class="scalarIfRegular" style="width: 100%">
- <span class="entityLink">
- <div class="entityLinkSelect2Panel entityLinkComponentType">
- <div class="wrapper">
- <span class="autoCompletePlaceholder">
- <span wicket:id="entityLink">link or drop down</span>
- <span wicket:id="entityIconAndTitle">[icon and title]</span>
- </span>
- <div class="clearfix"></div>
- </div>
+ <div class="form-group" wicket:id="scalarIfRegular">
+ <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
+ <span class="scalarValueWrapper">
+ <span class="entityLink">
+ <div class="entityLinkSelect2Panel entityLinkComponentType">
+ <div class="wrapper">
+ <span class="autoCompletePlaceholder">
+ <span wicket:id="entityLink">link or drop down</span>
+ <span wicket:id="entityIconAndTitle">[icon and title]</span>
+ </span>
+ <span class="clearfix"></span>
</div>
- </span>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
+ </div>
+ </span>
+ <span wicket:id="feedback" class="help-block"></span>
+ <span wicket:id="additionalLinks"></span>
</span>
</div>
<label wicket:id="scalarIfCompact" class="scalarIfCompact">
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index d6bc22f..e1a5d41 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -50,6 +50,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.ObjectAdapterMementoProviderAbstract;
+import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2ChoiceUtil;
import org.apache.isis.viewer.wicket.ui.components.widgets.entitysimplelink.EntityLinkSimplePanel;
import org.apache.isis.viewer.wicket.ui.util.Components;
@@ -63,15 +64,10 @@ public class ReferencePanel extends ScalarPanelAbstract {
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_IF_REGULAR = "scalarIfRegular";
- private static final String ID_SCALAR_NAME = "scalarName";
-
private static final String ID_AUTO_COMPLETE = "autoComplete";
private static final String ID_ENTITY_ICON_TITLE = "entityIconAndTitle";
// private static final String ID_ENTITY_ICON_TITLE_AND_COPYLINK = "entityIconTitleAndCopylink";
- private static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
-
private EntityLinkSelect2Panel entityLink;
Select2Choice<ObjectAdapterMemento> select2Field;
@@ -109,7 +105,7 @@ public class ReferencePanel extends ScalarPanelAbstract {
// First called as a side-effect of {@link #beforeRender()}
@Override
- protected FormComponentLabel addComponentForRegular() {
+ protected FormGroup addComponentForRegular() {
final ScalarModel scalarModel = getModel();
final String name = scalarModel.getName();
@@ -120,7 +116,7 @@ public class ReferencePanel extends ScalarPanelAbstract {
entityLink.setOutputMarkupId(true);
entityLink.setLabel(Model.of(name));
- final FormComponentLabel labelIfRegular = new FormComponentLabel(ID_SCALAR_IF_REGULAR, entityLink);
+ final FormGroup labelIfRegular = new FormGroup(ID_SCALAR_IF_REGULAR, entityLink);
labelIfRegular.add(entityLink);
final String describedAs = getModel().getDescribedAs();
@@ -129,7 +125,7 @@ public class ReferencePanel extends ScalarPanelAbstract {
}
final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(entityLink));
- addOrReplace(scalarName);
+ labelIfRegular.add(scalarName);
addOrReplace(labelIfRegular);
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
new file mode 100644
index 0000000..55ef2dd
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/bootstrap/FormGroup.java
@@ -0,0 +1,30 @@
+package org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap;
+
+import de.agilecoders.wicket.core.util.Attributes;
+
+import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.form.FormComponent;
+
+/**
+ *
+ */
+public class FormGroup extends WebMarkupContainer {
+
+ private final FormComponent<?> formComponent;
+
+ public FormGroup(String id, FormComponent<?> formComponent) {
+ super(id);
+
+ this.formComponent = formComponent;
+ }
+
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+
+ if (!formComponent.isValid()) {
+ Attributes.addClass(tag, "has-error");
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index 762894c..dfae2e8 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -28,7 +28,6 @@ import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
-import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -39,6 +38,7 @@ import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModelWithPending;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.widgets.ObjectAdapterMementoProviderAbstract;
+import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2ChoiceUtil;
import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
@@ -108,7 +108,7 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
final String name = getModel().getName();
select2Field.setLabel(Model.of(name));
- final MarkupContainer labelIfRegular = new WebMarkupContainer(ID_SCALAR_IF_REGULAR);
+ final FormGroup labelIfRegular = new FormGroup(ID_SCALAR_IF_REGULAR, select2Field);
final String describedAs = getModel().getDescribedAs();
if(describedAs != null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/1802a6dd/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index 1d5fe46..f007da0 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -91,18 +91,19 @@ th > a > div > strong {
float: left;
}
+/* Labels on the right START */
.form-inline .form-group {
width: 100%;
}
.form-inline label {
- width: 33%;
+ width: 30%;
float: left;
padding-top: 9px;
}
.form-inline .scalarValueWrapper {
- width: 66%;
+ width: 70%;
float: right;
}
@@ -110,6 +111,14 @@ th > a > div > strong {
width: 100%;
}
+.form-inline .scalarValueWrapper .form-control.file-caption {
+ width: 69%;
+}
+
+.form-inline .scalarValueWrapper .file-input .input-group-btn {
+ display: inline;
+}
+
.form-inline .scalarValueWrapper .input-group {
width: 100%;
}
@@ -124,3 +133,5 @@ th > a > div > strong {
vertical-align: -webkit-baseline-middle;
vertical-align: middle;
}
+
+/* Labels on the right END */
[03/10] git commit: ISIS-537 Further simplification of ScalarPanels'
markup. Use inheritance and fragments to reduce the number of the HTML files
to minimum
Posted by da...@apache.org.
ISIS-537 Further simplification of ScalarPanels' markup. Use inheritance and fragments to reduce the number of the HTML files to minimum
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/3f305041
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/3f305041
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/3f305041
Branch: refs/heads/master
Commit: 3f3050414cdef080eb2fe57702d0e94d827e990a
Parents: 830154f
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Oct 23 16:33:31 2014 +0300
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 24 12:30:52 2014 +0100
----------------------------------------------------------------------
.../entity/properties/EntityPropertiesForm.java | 9 ++++
.../components/scalars/ScalarPanelAbstract.html | 57 ++++++++++++++++++++
.../components/scalars/ScalarPanelAbstract.java | 36 ++++++++++++-
.../scalars/ScalarPanelTextFieldAbstract.html | 28 ++++++----
.../scalars/ScalarPanelTextFieldAbstract.java | 23 ++++----
.../ScalarPanelTextFieldDatePickerAbstract.html | 41 --------------
.../ScalarPanelTextFieldDatePickerAbstract.java | 16 ++++--
.../scalars/ScalarPanelTextFieldNumeric.java | 9 ++--
.../scalars/jodatime/JodaLocalDatePanel.html | 45 ----------------
.../scalars/primitive/BooleanPanel.html | 14 ++---
.../scalars/primitive/BooleanPanel.java | 16 ++----
.../components/scalars/primitive/BytePanel.java | 1 -
.../scalars/primitive/ShortPanel.java | 2 -
.../scalars/string/MultiLineStringPanel.java | 19 +++----
.../valuechoices/ValueChoicesSelect2Panel.html | 18 +++----
.../valuechoices/ValueChoicesSelect2Panel.java | 22 +++-----
.../wicket/ui/pages/bootstrap-overrides.css | 34 ++++++++++++
17 files changed, 217 insertions(+), 173 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
index c77fded..9598f6b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
@@ -18,6 +18,8 @@
*/
package org.apache.isis.viewer.wicket.ui.components.entity.properties;
+import de.agilecoders.wicket.core.util.Attributes;
+
import java.util.List;
import java.util.Map;
import org.apache.wicket.Component;
@@ -26,6 +28,7 @@ import org.apache.wicket.Session;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+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.form.Button;
@@ -256,6 +259,12 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> {
return Filters.and(ObjectAssociation.Filters.PROPERTIES, ObjectAssociation.Filters.dynamicallyVisible(getAuthenticationSession(), adapter, where));
}
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ super.onComponentTag(tag);
+
+ Attributes.addClass(tag, "form-inline");
+ }
abstract class AjaxButtonWithOnError extends AjaxButton {
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
new file mode 100644
index 0000000..b0f1799
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.html
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:wicket="http://wicket.apache.org"
+ xml:lang="en"
+ lang="en">
+ <body>
+ <wicket:panel>
+ <div class="scalarNameAndValueComponentType" wicket:id="scalarTypeContainer">
+ <div class="form-group" wicket:id="scalarIfRegular">
+ <label wicket:id="scalarName" class="scalarName">[Label text]</label>
+ <span class="scalarValueWrapper">
+ <wicket:child/>
+ <span wicket:id="feedback" class="help-block"></span>
+ <span wicket:id="additionalLinks"></span>
+ </span>
+ </div>
+ <wicket:container wicket:id="scalarIfCompact"></wicket:container>
+ </div>
+
+ <wicket:fragment wicket:id="compactAsInputText">
+ <input type="text" class="form-control" wicket:id="scalarIfCompact"/>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="compactAsInputCheckbox">
+ <input type="checkbox" class="form-control" wicket:id="scalarIfCompact"/>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="compactAsLabel">
+ <label wicket:id="scalarIfCompact"/>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="compactAsSpan">
+ <span wicket:id="scalarIfCompact"></span>
+ </wicket:fragment>
+
+ </wicket:panel>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 05f8612..2fad9fb 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -34,6 +34,7 @@ import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.LabeledWebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Where;
@@ -63,10 +64,23 @@ import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> implements ScalarModelProvider {
private static final long serialVersionUID = 1L;
-
+
+ protected static final String ID_SCALAR_IF_REGULAR = "scalarIfRegular";
+ protected static final String ID_SCALAR_NAME = "scalarName";
+ protected static final String ID_SCALAR_VALUE = "scalarValue";
+
+ protected static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
+
private static final String ID_ADDITIONAL_LINKS = "additionalLinks";
private static final String ID_FEEDBACK = "feedback";
+ public enum CompactType {
+ INPUT_TEXT,
+ INPUT_CHECKBOX,
+ LABEL,
+ SPAN
+ }
+
public enum Rendering {
/**
* Does not show labels, eg for use in tables
@@ -128,6 +142,26 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
this.scalarModel = scalarModel;
}
+ protected Fragment getCompactFragment(CompactType type) {
+ Fragment compactFragment;
+ switch (type) {
+ case INPUT_TEXT:
+ compactFragment = new Fragment("scalarIfCompact", "compactAsInputText", ScalarPanelAbstract.this);
+ break;
+ case INPUT_CHECKBOX:
+ compactFragment = new Fragment("scalarIfCompact", "compactAsInputCheckbox", ScalarPanelAbstract.this);
+ break;
+ case LABEL:
+ compactFragment = new Fragment("scalarIfCompact", "compactAsLabel", ScalarPanelAbstract.this);
+ break;
+ case SPAN:
+ default:
+ compactFragment = new Fragment("scalarIfCompact", "compactAsSpan", ScalarPanelAbstract.this);
+ break;
+ }
+ return compactFragment;
+ }
+
protected Rendering getRendering() {
return Rendering.renderingFor(getModel().getRenderingHint());
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
index 4808f09..fba5b53 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
@@ -23,16 +23,24 @@
xml:lang="en"
lang="en">
<body>
- <wicket:panel>
- <div class="scalarNameAndValueComponentType" wicket:id="scalarTypeContainer">
- <div class="form-group" wicket:id="scalarIfRegular">
- <label wicket:id="scalarName" class="scalarName">[Label text]</label>
- <input type="text" name="scalarValue" class="form-control scalarValue" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
+ <wicket:extend>
+ <wicket:container wicket:id="scalarValueContainer"/>
+
+ <wicket:fragment wicket:id="text">
+ <input type="text" name="scalarValue" class="form-control scalarValue" wicket:id="scalarValue" />
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="textarea">
+ <textarea name="scalarValue" class="form-control scalarValue" wicket:id="scalarValue"></textarea>
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="date">
+ <div class="input-group date">
+ <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
</div>
- <span wicket:id="scalarIfCompact"></span>
- </div>
- </wicket:panel>
+ </wicket:fragment>
+
+ </wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 00e534e..4ff96b4 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -30,6 +30,7 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -49,16 +50,10 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
private static final long serialVersionUID = 1L;
private static final String ID_SCALAR_TYPE_CONTAINER = "scalarTypeContainer";
- private static final String ID_SCALAR_IF_REGULAR = "scalarIfRegular";
- private static final String ID_SCALAR_NAME = "scalarName";
-
- protected static final String ID_SCALAR_VALUE = "scalarValue";
-
- protected static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
protected final Class<T> cls;
- private WebMarkupContainer scalarTypeContainer;
+ protected WebMarkupContainer scalarTypeContainer;
private AbstractTextComponent<T> textField;
public ScalarPanelTextFieldAbstract(final String id, final ScalarModel scalarModel, final Class<T> cls) {
@@ -142,17 +137,23 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
private MarkupContainer createFormComponentLabel() {
+ Fragment textFieldFragment = createTextFieldFragment("scalarValueContainer");
final AbstractTextComponent<T> textField = getTextField();
final String name = getModel().getName();
textField.setLabel(Model.of(name));
final WebMarkupContainer scalarNameAndValue = new WebMarkupContainer(ID_SCALAR_IF_REGULAR);
-
- scalarNameAndValue.add(textField);
+
+ textFieldFragment.add(textField);
+ scalarNameAndValue.add(textFieldFragment);
return scalarNameAndValue;
}
+ protected Fragment createTextFieldFragment(String id) {
+ return new Fragment(id, "text", ScalarPanelTextFieldAbstract.this);
+ }
+
protected void addStandardSemantics() {
textField.setRequired(getModel().isRequired());
setTextFieldSizeAndMaxLengthIfSpecified(textField);
@@ -191,8 +192,10 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
*/
@Override
protected Component addComponentForCompact() {
+ Fragment compactFragment = getCompactFragment(CompactType.SPAN);
final Label labelIfCompact = new Label(ID_SCALAR_IF_COMPACT, getModel().getObjectAsString());
- scalarTypeContainer.addOrReplace(labelIfCompact);
+ compactFragment.add(labelIfCompact);
+ scalarTypeContainer.addOrReplace(compactFragment);
return labelIfCompact;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.html
deleted file mode 100644
index 94289db..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="scalarNameAndValueComponentType" wicket:id="scalarTypeContainer">
- <div class="form-group" wicket:id="scalarIfRegular">
- <label wicket:id="scalarName" class="scalarName">[Label text]</label>
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
index 106bf3b..63d1cf9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.java
@@ -27,6 +27,7 @@ import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.validation.IValidatable;
@@ -72,6 +73,11 @@ public abstract class ScalarPanelTextFieldDatePickerAbstract<T extends Serializa
}
@Override
+ protected Fragment createTextFieldFragment(String id) {
+ return new Fragment(id, "date", ScalarPanelTextFieldDatePickerAbstract.this);
+ }
+
+ @Override
protected void addSemantics() {
super.addSemantics();
@@ -80,22 +86,24 @@ public abstract class ScalarPanelTextFieldDatePickerAbstract<T extends Serializa
protected Component addComponentForCompact() {
+ Fragment compactFragment = getCompactFragment(CompactType.INPUT_TEXT);
final AbstractTextComponent<T> textField = createTextField(ID_SCALAR_IF_COMPACT);
final IModel<T> model = textField.getModel();
final T object = model.getObject();
model.setObject(object);
textField.setEnabled(false);
-
-
+
// adding an amount because seemed to truncate in tables in certain circumstances
final int lengthAdjust =
getLengthAdjustHint() != null ? getLengthAdjustHint() : 1;
final String dateTimePattern = converter.getDateTimePattern(getLocale());
final int length = dateTimePattern.length() + lengthAdjust;
textField.add(new AttributeModifier("size", Model.of("" + length)));
-
- addOrReplace(textField);
+
+ compactFragment.add(textField);
+
+ scalarTypeContainer.addOrReplace(compactFragment);
return textField;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
index 8984527..92b120d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
@@ -23,6 +23,7 @@ import java.io.Serializable;
import org.apache.wicket.Component;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -49,15 +50,17 @@ public abstract class ScalarPanelTextFieldNumeric<T extends Serializable> extend
}
protected Component addComponentForCompact() {
+ Fragment compactFragment = getCompactFragment(CompactType.INPUT_TEXT);
final AbstractTextComponent<T> textField = createTextField(ID_SCALAR_IF_COMPACT);
final IModel<T> model = textField.getModel();
- final T object = (T) model.getObject();
+ final T object = model.getObject();
model.setObject(object);
textField.setEnabled(false);
setTextFieldSizeAndMaxLengthIfSpecified(textField);
-
- addOrReplace(textField);
+
+ compactFragment.add(textField);
+ scalarTypeContainer.addOrReplace(compactFragment);
return textField;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.html
deleted file mode 100644
index b9ae5d3..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="jodaLocalDatePanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
index 25a4b76..7588583 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
@@ -25,15 +25,11 @@
<body>
<wicket:panel>
<div class="booleanPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="checkbox" name="scalarValue" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
+ <div class="form-group" wicket:id="scalarIfRegular">
+ <label wicket:id="scalarName" class="scalarName">[Label text]</label>
+ <input type="checkbox" name="scalarValue" class="form-control scalarValue" wicket:id="scalarValue" />
+ <span wicket:id="feedback" class="help-block"></span>
+ <span wicket:id="additionalLinks"></span>
</div>
<input type="checkbox" wicket:id="scalarIfCompact" />
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index 1f114bf..b156851 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -24,9 +24,9 @@ import de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkboxx.Che
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.FormComponentLabel;
import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
@@ -49,12 +49,6 @@ public class BooleanPanel extends ScalarPanelAbstract {
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_IF_REGULAR = "scalarIfRegular";
- private static final String ID_SCALAR_NAME = "scalarName";
- private static final String ID_SCALAR_VALUE = "scalarValue";
-
- private static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
-
private CheckBoxX checkBox;
public BooleanPanel(final String id, final ScalarModel scalarModel) {
@@ -62,14 +56,15 @@ public class BooleanPanel extends ScalarPanelAbstract {
}
@Override
- protected FormComponentLabel addComponentForRegular() {
+ protected MarkupContainer addComponentForRegular() {
final String name = getModel().getName();
checkBox = createCheckBox(ID_SCALAR_VALUE);
checkBox.setLabel(Model.of(name));
- final FormComponentLabel labelIfRegular = new FormComponentLabel(ID_SCALAR_IF_REGULAR, checkBox);
+ final MarkupContainer labelIfRegular = new MarkupContainer(ID_SCALAR_IF_REGULAR) {
+ };
labelIfRegular.add(checkBox);
if(getModel().isRequired()) {
labelIfRegular.add(new CssClassAppender("mandatory"));
@@ -81,7 +76,7 @@ public class BooleanPanel extends ScalarPanelAbstract {
}
final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(checkBox));
- addOrReplace(scalarName);
+ labelIfRegular.add(scalarName);
addOrReplace(labelIfRegular);
@@ -91,7 +86,6 @@ public class BooleanPanel extends ScalarPanelAbstract {
return labelIfRegular;
}
-
/**
* Mandatory hook method to build the component to render the model when in
* {@link Rendering#COMPACT compact} format.
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
index 7bf40da..a44b121 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
@@ -58,5 +58,4 @@ public class BytePanel extends ScalarPanelTextFieldNumeric<Byte> {
protected IModel<String> getScalarPanelType() {
return Model.of("bytePanel");
}
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
index d548a3a..5a26a16 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
@@ -36,7 +36,6 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldValueModel;
public class ShortPanel extends ScalarPanelTextFieldNumeric<Short> {
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_VALUE = "scalarValue";
public ShortPanel(final String id, final ScalarModel scalarModel) {
super(id, scalarModel, Short.class);
@@ -59,5 +58,4 @@ public class ShortPanel extends ScalarPanelTextFieldNumeric<Short> {
protected IModel<String> getScalarPanelType() {
return Model.of("shortPanel");
}
-
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
index 1d60c7a..b475cd1 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
@@ -21,9 +21,9 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.string;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
-import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextArea;
+import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
@@ -40,8 +40,6 @@ public class MultiLineStringPanel extends ScalarPanelTextFieldParseableAbstract
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_VALUE = "scalarValue";
-
public MultiLineStringPanel(final String id, final ScalarModel scalarModel) {
super(id, ID_SCALAR_VALUE, scalarModel);
}
@@ -64,15 +62,7 @@ public class MultiLineStringPanel extends ScalarPanelTextFieldParseableAbstract
getModel().setObjectAsString(object);
}
}
- }) {
- @Override
- protected void onComponentTag(ComponentTag tag) {
- tag.setName("textarea");
- tag.remove("type");
- super.onComponentTag(tag);
- }
- };
-
+ });
final MultiLineFacet multiLineFacet = getModel().getFacet(MultiLineFacet.class);
setAttribute(textField, "rows", multiLineFacet.numberOfLines());
@@ -89,6 +79,11 @@ public class MultiLineStringPanel extends ScalarPanelTextFieldParseableAbstract
}
@Override
+ protected Fragment createTextFieldFragment(String id) {
+ return new Fragment(id, "textarea", MultiLineStringPanel.this);
+ }
+
+ @Override
protected IModel<String> getScalarPanelType() {
return Model.of("multiLineStringPanel");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
index 304ac92..a615e28 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
@@ -25,16 +25,14 @@
<body>
<wicket:panel>
<div class="valueChoicesSelect2Panel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <div class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="choicesPlaceholder">
- <input wicket:id="valueId" type="hidden" class="choices form-control select2-remote" style="width: 100%"/>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
+ <div class="form-group" wicket:id="scalarIfRegular">
+ <label wicket:id="scalarName" class="scalarName">[Label text]</label>
+ <div class="scalarValueWrapper">
+ <div class="choicesPlaceholder">
+ <input wicket:id="scalarValue" type="hidden" class="choices form-control select2-remote" style="width: 100%"/>
+ </div>
+ <span wicket:id="feedback" class="help-block"></span>
+ <span wicket:id="additionalLinks"></span>
</div>
</div>
<span wicket:id="scalarIfCompact"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index c143f80..762894c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -26,9 +26,10 @@ import com.vaynberg.wicket.select2.ChoiceProvider;
import com.vaynberg.wicket.select2.Select2Choice;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.FormComponentLabel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
@@ -45,13 +46,6 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
private static final long serialVersionUID = 1L;
- private static final String ID_SCALAR_IF_REGULAR = "scalarIfRegular";
- private static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
-
- private static final String ID_SCALAR_NAME = "scalarName";
-
- private static final String ID_VALUE_ID = "valueId";
-
private Select2Choice<ObjectAdapterMemento> select2Field;
private ObjectAdapterMemento pending;
@@ -61,14 +55,14 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
}
@Override
- protected FormComponentLabel addComponentForRegular() {
+ protected MarkupContainer addComponentForRegular() {
final IModel<ObjectAdapterMemento> modelObject = ScalarModelWithPending.Util.createModel(this);
final ObjectAdapter[] actionArgsHint = getScalarModel().getActionArgsHint();
// same pattern as in EntityLinkSelect2Panel
if(select2Field == null) {
- select2Field = Select2ChoiceUtil.newSelect2Choice(ID_VALUE_ID, modelObject, getScalarModel());
+ select2Field = Select2ChoiceUtil.newSelect2Choice(ID_SCALAR_VALUE, modelObject, getScalarModel());
setChoices(actionArgsHint);
addStandardSemantics();
} else {
@@ -76,7 +70,7 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
}
- final FormComponentLabel labelIfRegular = createFormComponentLabel();
+ final MarkupContainer labelIfRegular = createFormComponentLabel();
if(getModel().isRequired()) {
labelIfRegular.add(new CssClassAppender("mandatory"));
}
@@ -84,7 +78,7 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
addOrReplace(labelIfRegular);
final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(select2Field));
- addOrReplace(scalarName);
+ labelIfRegular.addOrReplace(scalarName);
addFeedbackTo(labelIfRegular, select2Field);
addAdditionalLinksTo(labelIfRegular);
@@ -110,11 +104,11 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
select2Field.setRequired(required);
}
- protected FormComponentLabel createFormComponentLabel() {
+ protected MarkupContainer createFormComponentLabel() {
final String name = getModel().getName();
select2Field.setLabel(Model.of(name));
- final FormComponentLabel labelIfRegular = new FormComponentLabel(ID_SCALAR_IF_REGULAR, select2Field);
+ final MarkupContainer labelIfRegular = new WebMarkupContainer(ID_SCALAR_IF_REGULAR);
final String describedAs = getModel().getDescribedAs();
if(describedAs != null) {
http://git-wip-us.apache.org/repos/asf/isis/blob/3f305041/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index f2f18e8..1d5fe46 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -90,3 +90,37 @@ label {
th > a > div > strong {
float: left;
}
+
+.form-inline .form-group {
+ width: 100%;
+}
+
+.form-inline label {
+ width: 33%;
+ float: left;
+ padding-top: 9px;
+}
+
+.form-inline .scalarValueWrapper {
+ width: 66%;
+ float: right;
+}
+
+.form-inline .scalarValueWrapper .form-control {
+ width: 100%;
+}
+
+.form-inline .scalarValueWrapper .input-group {
+ width: 100%;
+}
+
+.form-inline .scalarValueWrapper .input-group .input-group-addon {
+ width: 1%;
+}
+
+.form-inline .choicesPlaceholder {
+ display: inline-block;
+ width: 100%;
+ vertical-align: -webkit-baseline-middle;
+ vertical-align: middle;
+}
[02/10] git commit: ISIS-537 Extract common markup in the parent
classes (WIP)
Posted by da...@apache.org.
ISIS-537 Extract common markup in the parent classes (WIP)
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/830154f6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/830154f6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/830154f6
Branch: refs/heads/master
Commit: 830154f629d4a13cbad2f6bd897682970c91e406
Parents: 1766c7b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Oct 23 09:22:28 2014 +0300
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 24 12:30:51 2014 +0100
----------------------------------------------------------------------
.../components/collection/CollectionPanel.html | 4 +-
.../components/collection/CollectionPanel.java | 4 +-
.../collections/EntityCollectionsPanel.html | 4 +-
.../components/scalars/ScalarPanelAbstract.java | 6 +--
.../scalars/ScalarPanelTextFieldAbstract.html | 38 +++++++++++++++++
.../scalars/ScalarPanelTextFieldAbstract.java | 36 +++++++++++-----
.../ScalarPanelTextFieldDatePickerAbstract.html | 41 ++++++++++++++++++
.../scalars/isisapplib/IsisColorPanel.html | 40 -----------------
.../scalars/isisapplib/IsisColorPanel.java | 7 +++
.../scalars/isisapplib/IsisDatePanel.html | 43 -------------------
.../scalars/isisapplib/IsisDatePanel.java | 9 ++--
.../scalars/isisapplib/IsisDateTimePanel.html | 40 -----------------
.../scalars/isisapplib/IsisDateTimePanel.java | 7 +++
.../scalars/isisapplib/IsisMoneyPanel.html | 40 -----------------
.../scalars/isisapplib/IsisMoneyPanel.java | 7 +++
.../scalars/isisapplib/IsisPasswordPanel.html | 42 ------------------
.../scalars/isisapplib/IsisPasswordPanel.java | 16 ++++++-
.../scalars/isisapplib/IsisPercentagePanel.html | 40 -----------------
.../scalars/isisapplib/IsisPercentagePanel.java | 7 +++
.../scalars/isisapplib/IsisTimePanel.html | 43 -------------------
.../scalars/isisapplib/IsisTimePanel.java | 7 +++
.../scalars/isisapplib/IsisTimeStampPanel.html | 43 -------------------
.../scalars/isisapplib/IsisTimeStampPanel.java | 7 +++
.../scalars/jdkdates/JavaSqlDatePanel.html | 45 --------------------
.../scalars/jdkdates/JavaSqlDatePanel.java | 6 +++
.../scalars/jdkdates/JavaSqlTimePanel.html | 44 -------------------
.../scalars/jdkdates/JavaSqlTimePanel.java | 7 +++
.../scalars/jdkdates/JavaSqlTimestampPanel.html | 45 --------------------
.../scalars/jdkdates/JavaSqlTimestampPanel.java | 6 +++
.../scalars/jdkdates/JavaUtilDatePanel.html | 45 --------------------
.../scalars/jdkdates/JavaUtilDatePanel.java | 6 +++
.../jdkmath/JavaMathBigDecimalPanel.html | 42 ------------------
.../jdkmath/JavaMathBigDecimalPanel.java | 7 +++
.../jdkmath/JavaMathBigIntegerPanel.html | 42 ------------------
.../jdkmath/JavaMathBigIntegerPanel.java | 7 +++
.../scalars/jodatime/JodaDateTimePanel.html | 45 --------------------
.../scalars/jodatime/JodaDateTimePanel.java | 7 +++
.../scalars/jodatime/JodaLocalDatePanel.java | 6 +++
.../jodatime/JodaLocalDateTimePanel.html | 45 --------------------
.../jodatime/JodaLocalDateTimePanel.java | 7 +++
.../components/scalars/primitive/BytePanel.html | 42 ------------------
.../components/scalars/primitive/BytePanel.java | 7 +++
.../scalars/primitive/CharacterPanel.html | 42 ------------------
.../scalars/primitive/CharacterPanel.java | 6 +++
.../scalars/primitive/DoublePanel.html | 42 ------------------
.../scalars/primitive/DoublePanel.java | 7 +++
.../scalars/primitive/FloatPanel.html | 42 ------------------
.../scalars/primitive/FloatPanel.java | 7 +++
.../scalars/primitive/IntegerPanel.html | 42 ------------------
.../scalars/primitive/IntegerPanel.java | 7 +++
.../components/scalars/primitive/LongPanel.html | 42 ------------------
.../components/scalars/primitive/LongPanel.java | 7 +++
.../scalars/primitive/ShortPanel.html | 42 ------------------
.../scalars/primitive/ShortPanel.java | 7 +++
.../scalars/string/MultiLineStringPanel.html | 42 ------------------
.../scalars/string/MultiLineStringPanel.java | 16 ++++++-
.../components/scalars/string/StringPanel.html | 42 ------------------
.../components/scalars/string/StringPanel.java | 7 +++
.../ui/components/scalars/value/ValuePanel.html | 42 ------------------
.../ui/components/scalars/value/ValuePanel.java | 6 +++
.../valuechoices/ValueChoicesSelect2Panel.html | 7 +--
.../viewer/wicket/ui/pages/PageAbstract.css | 2 +-
.../wicket/ui/pages/bootstrap-overrides.css | 1 -
63 files changed, 311 insertions(+), 1139 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html
index ab8ac51..8ffda40 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.html
@@ -25,9 +25,7 @@
<body>
<wicket:panel>
<div class="collectionPanel collectionNameAndContentsComponentType">
- <div wicket:id="collection">
- <span class="collectionContents" wicket:id="collectionContents"/>
- </div>
+ <div class="collectionContents" wicket:id="collectionContents"></div>
<span wicket:id="feedback"></span>
<div wicket:id="actionPromptModalWindow"></div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
index fc7a465..9dc3702 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collection/CollectionPanel.java
@@ -87,11 +87,9 @@ public class CollectionPanel extends PanelAbstract<EntityCollectionModel> implem
}
private void buildGui() {
- final WebMarkupContainer markupContainer = new WebMarkupContainer(ID_COLLECTION);
- collectionContents = getComponentFactoryRegistry().addOrReplaceComponent(markupContainer, ComponentType.COLLECTION_CONTENTS, getModel());
+ collectionContents = getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.COLLECTION_CONTENTS, getModel());
addOrReplace(new ComponentFeedbackPanel(ID_FEEDBACK, collectionContents));
- addOrReplace(markupContainer);
}
public Label createLabel(final String id, final String collectionName) {
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
index 71e2095..90fdc22 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.html
@@ -23,7 +23,9 @@
<div class="entityCollectionsPanel entityCollectionsComponentType">
<div wicket:id="collections" class="myBlockContainer">
<div wicket:id="collectionGroup" class="panel panel-default">
- <div wicket:id="collectionName" class="panel-heading">[collection name]</div>
+ <div class="panel-heading">
+ <span wicket:id="collectionName" class="panel-title">[collection name]</span>
+ </div>
<div wicket:id="collection" class="collection panel-body">
[collection]
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index d793759..05f8612 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -33,9 +33,7 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.form.FormComponentLabel;
import org.apache.wicket.markup.html.form.LabeledWebMarkupContainer;
-import org.apache.wicket.markup.html.panel.ComponentFeedbackPanel;
import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Where;
@@ -257,7 +255,7 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
* Mandatory hook method to build the component to render the model when in
* {@link Rendering#REGULAR regular} format.
*/
- protected abstract FormComponentLabel addComponentForRegular();
+ protected abstract MarkupContainer addComponentForRegular();
protected abstract Component addComponentForCompact();
@@ -265,7 +263,7 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
markupContainer.addOrReplace(new NotificationPanel(ID_FEEDBACK, component, new ComponentFeedbackMessageFilter(component)));
}
- protected void addAdditionalLinksTo(final FormComponentLabel labelIfRegular) {
+ protected void addAdditionalLinksTo(final MarkupContainer labelIfRegular) {
final List<LinkAndLabel> entityActions;
if(scalarModel.getKind() == ScalarModel.Kind.PROPERTY) {
final ObjectAdapterMemento parentMemento = scalarModel.getParentObjectAdapterMemento();
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
new file mode 100644
index 0000000..4808f09
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.html
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:wicket="http://wicket.apache.org"
+ xml:lang="en"
+ lang="en">
+ <body>
+ <wicket:panel>
+ <div class="scalarNameAndValueComponentType" wicket:id="scalarTypeContainer">
+ <div class="form-group" wicket:id="scalarIfRegular">
+ <label wicket:id="scalarName" class="scalarName">[Label text]</label>
+ <input type="text" name="scalarValue" class="form-control scalarValue" wicket:id="scalarValue" />
+ <span wicket:id="feedback" class="help-block"></span>
+ <span wicket:id="additionalLinks"></span>
+ </div>
+ <span wicket:id="scalarIfCompact"></span>
+ </div>
+ </wicket:panel>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 856b867..00e534e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -24,11 +24,13 @@ import java.io.Serializable;
import com.google.common.base.Strings;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
+import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
-import org.apache.wicket.markup.html.form.FormComponentLabel;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.facets.SingleIntValueFacet;
@@ -46,6 +48,7 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
private static final long serialVersionUID = 1L;
+ private static final String ID_SCALAR_TYPE_CONTAINER = "scalarTypeContainer";
private static final String ID_SCALAR_IF_REGULAR = "scalarIfRegular";
private static final String ID_SCALAR_NAME = "scalarName";
@@ -54,7 +57,8 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
protected static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
protected final Class<T> cls;
-
+
+ private WebMarkupContainer scalarTypeContainer;
private AbstractTextComponent<T> textField;
public ScalarPanelTextFieldAbstract(final String id, final ScalarModel scalarModel, final Class<T> cls) {
@@ -62,6 +66,16 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
this.cls = cls;
}
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ scalarTypeContainer = new WebMarkupContainer(ID_SCALAR_TYPE_CONTAINER);
+ scalarTypeContainer.add(new CssClassAppender(getScalarPanelType()));
+ addOrReplace(scalarTypeContainer);
+
+ }
+
protected AbstractTextComponent<T> getTextField() {
return textField;
}
@@ -79,15 +93,15 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
}
@Override
- protected FormComponentLabel addComponentForRegular() {
+ protected MarkupContainer addComponentForRegular() {
textField = createTextFieldForRegular();
textField.setOutputMarkupId(true);
addStandardSemantics();
addSemantics();
- final FormComponentLabel labelIfRegular = createFormComponentLabel();
- addOrReplace(labelIfRegular);
+ final MarkupContainer labelIfRegular = createFormComponentLabel();
+ scalarTypeContainer.add(labelIfRegular);
final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(textField));
@@ -102,7 +116,7 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
}
}
- addOrReplace(scalarName);
+ labelIfRegular.add(scalarName);
final String describedAs = getModel().getDescribedAs();
if(describedAs != null) {
@@ -114,8 +128,8 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
return labelIfRegular;
}
-
-
+
+ protected abstract IModel<String> getScalarPanelType();
/**
* Optional hook method
@@ -127,12 +141,12 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
- private FormComponentLabel createFormComponentLabel() {
+ private MarkupContainer createFormComponentLabel() {
final AbstractTextComponent<T> textField = getTextField();
final String name = getModel().getName();
textField.setLabel(Model.of(name));
- final FormComponentLabel scalarNameAndValue = new FormComponentLabel(ID_SCALAR_IF_REGULAR, textField);
+ final WebMarkupContainer scalarNameAndValue = new WebMarkupContainer(ID_SCALAR_IF_REGULAR);
scalarNameAndValue.add(textField);
@@ -178,7 +192,7 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
@Override
protected Component addComponentForCompact() {
final Label labelIfCompact = new Label(ID_SCALAR_IF_COMPACT, getModel().getObjectAsString());
- addOrReplace(labelIfCompact);
+ scalarTypeContainer.addOrReplace(labelIfCompact);
return labelIfCompact;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.html
new file mode 100644
index 0000000..94289db
--- /dev/null
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldDatePickerAbstract.html
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xml:lang="en"
+ lang="en">
+ <body>
+ <wicket:panel>
+ <div class="scalarNameAndValueComponentType" wicket:id="scalarTypeContainer">
+ <div class="form-group" wicket:id="scalarIfRegular">
+ <label wicket:id="scalarName" class="scalarName">[Label text]</label>
+ <div class="input-group date">
+ <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
+ <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
+ </div>
+ <span wicket:id="feedback" class="help-block"></span>
+ <span wicket:id="additionalLinks"></span>
+ </div>
+ <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
+ </div>
+ </wicket:panel>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.html
deleted file mode 100644
index 49ef924..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="isisColorPanel scalarNameAndValueComponentType row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
index 5e8870b..382b521 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisColorPanel.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
@@ -35,6 +37,11 @@ public class IsisColorPanel extends ScalarPanelTextFieldParseableAbstract {
}
@Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("isisColorPanel");
+ }
+
+ @Override
protected void addSemantics() {
super.addSemantics();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.html
deleted file mode 100644
index 6c43852..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="isisDatePanel scalarNameAndValueComponentType row">
- <span wicket:id="scalarName" class="scalarName">[Label text]</span>
- <span class="scalarValue">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- <input type="text" wicket:id="scalarIfCompact"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.java
index 5e043aa..f3edc00 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDatePanel.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.applib.value.Date;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldDatePickerAbstract;
@@ -35,7 +37,8 @@ public class IsisDatePanel extends ScalarPanelTextFieldDatePickerAbstract<org.ap
init(new DateConverterForApplibDate(getSettings(), getAdjustBy()));
}
-
-
-
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("isisDatePanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.html
deleted file mode 100644
index 558d2fd..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="isisDateTimePanel scalarNameAndValueComponentType row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- <input type="text" wicket:id="scalarIfCompact"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.java
index 306ee47..b62e9bf 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisDateTimePanel.java
@@ -20,6 +20,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.applib.value.DateTime;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldDatePickerAbstract;
@@ -42,4 +44,9 @@ public class IsisDateTimePanel extends ScalarPanelTextFieldDatePickerAbstract<or
protected TextField<org.apache.isis.applib.value.DateTime> createTextField(final String id) {
return new TextFieldWithDateTimePicker<>(id, new TextFieldValueModel<org.apache.isis.applib.value.DateTime>(this), cls, converter);
}
+
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("isisDateTimePanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.html
deleted file mode 100644
index 8505b77..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="isisMoneyPanel scalarNameAndValueComponentType row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
index 0ea2916..7f677a7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisMoneyPanel.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.applib.value.Money;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
@@ -36,6 +38,11 @@ public class IsisMoneyPanel extends ScalarPanelTextFieldParseableAbstract {
}
@Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("isisMoneyPanel");
+ }
+
+ @Override
protected void addSemantics() {
super.addSemantics();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.html
deleted file mode 100644
index 08da1c3..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="isisPasswordPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="password" name="scalarValue" class="form-control" wicket:id="scalarValue"/>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java
index 5a8d9ed..a9b5cda 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPasswordPanel.java
@@ -19,8 +19,12 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
+import de.agilecoders.wicket.core.util.Attributes;
+
+import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.PasswordTextField;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.applib.value.Password;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -61,11 +65,21 @@ public class IsisPasswordPanel extends ScalarPanelTextFieldParseableAbstract {
getModel().setObjectAsString(object);
}
}
- });
+ }) {
+ @Override
+ protected void onComponentTag(ComponentTag tag) {
+ Attributes.set(tag, "type", "password");
+ super.onComponentTag(tag);
+ }
+ };
passwordField.setResetPassword(false);
return passwordField;
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("isisPasswordPanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.html
deleted file mode 100644
index 50b912a..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.html
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="isisPercentagePanel scalarNameAndValueComponentType row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
index 9f6cedc..c514400 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisPercentagePanel.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.applib.value.Percentage;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
@@ -37,6 +39,11 @@ public class IsisPercentagePanel extends ScalarPanelTextFieldParseableAbstract {
}
@Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("isisPercentagePanel");
+ }
+
+ @Override
protected void addSemantics() {
super.addSemantics();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.html
deleted file mode 100644
index 19d4e8c..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="isisTimePanel scalarNameAndValueComponentType row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java
index 4bcc56d..b021346 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimePanel.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
@@ -35,6 +37,11 @@ public class IsisTimePanel extends ScalarPanelTextFieldParseableAbstract {
}
@Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("isisTimePanel");
+ }
+
+ @Override
protected void addSemantics() {
super.addSemantics();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.html
deleted file mode 100644
index ac83697..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="isisTimeStampPanel scalarNameAndValueComponentType row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.java
index cac7951..c52547c 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisTimeStampPanel.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.applib.value.TimeStamp;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
@@ -36,6 +38,11 @@ public class IsisTimeStampPanel extends ScalarPanelTextFieldParseableAbstract {
}
@Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("isisTimeStampPanel");
+ }
+
+ @Override
protected void addSemantics() {
super.addSemantics();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.html
deleted file mode 100644
index 7bceb03..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="javaSqlDatePanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
index 4b96661..9e69ffa 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlDatePanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates;
import java.sql.Date;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldDatePickerAbstract;
@@ -36,4 +38,8 @@ public class JavaSqlDatePanel extends ScalarPanelTextFieldDatePickerAbstract<jav
init(new DateConverterForJavaSqlDate(getSettings(), getAdjustBy()));
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("javaSqlDatePanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.html
deleted file mode 100644
index f4448d7..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="javaSqlTimePanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- </label>
- </span>
- </div>
- <label wicket:id="scalarIfCompact"></label>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
index f5b3b04..294d3cd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimePanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates;
import java.sql.Time;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
@@ -37,6 +39,11 @@ public class JavaSqlTimePanel extends ScalarPanelTextFieldParseableAbstract {
}
@Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("javaSqlTimePanel");
+ }
+
+ @Override
protected void addSemantics() {
super.addSemantics();
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.html
deleted file mode 100644
index 071fae2..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="javaSqlTimestampPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
index d6a93e4..fbe8b03 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaSqlTimestampPanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldDatePickerAbstract;
@@ -41,4 +43,8 @@ public class JavaSqlTimestampPanel extends ScalarPanelTextFieldDatePickerAbstrac
return +3;
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("javaSqlTimestampPanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.html
deleted file mode 100644
index 9be0aab..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="javaUtilDatePanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
index 798faca..1cfef94 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkdates/JavaUtilDatePanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.jdkdates;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldDatePickerAbstract;
@@ -36,4 +38,8 @@ public class JavaUtilDatePanel extends ScalarPanelTextFieldDatePickerAbstract<ja
init(new DateConverterForJavaUtilDate(getSettings(), getAdjustBy()));
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("javaUtilDatePanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html
deleted file mode 100644
index efdcb0c..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="javaMathBigDecimalPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
index e5d7cec..2b71c34 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
@@ -22,6 +22,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath;
import java.math.BigDecimal;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
@@ -44,6 +46,11 @@ public class JavaMathBigDecimalPanel extends ScalarPanelTextFieldNumeric<BigDeci
final ScalarModel model = getModel();
return new BigDecimalTextField(id, newTextFieldValueModel(), cls, model, converter);
}
+
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("javaMathBigDecimalPanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.html
deleted file mode 100644
index d2513b3..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="javaMathBigIntegerPanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <input type="text" name="scalarValue" class="form-control" wicket:id="scalarValue" />
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
index 7946a72..3c70d04 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
@@ -23,6 +23,8 @@ import java.math.BigInteger;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -55,4 +57,9 @@ public class JavaMathBigIntegerPanel extends ScalarPanelTextFieldNumeric<BigInte
};
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("javaMathBigIntegerPanel");
+ }
+
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.html
deleted file mode 100644
index 7546300..0000000
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.html
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div class="jodaDateTimePanel scalarNameAndValueComponentType">
- <div class="row">
- <span wicket:id="scalarName" class="scalarName col-xs-3">[Label text]</span>
- <span class="scalarValue col-xs-9">
- <label wicket:id="scalarIfRegular" style="width: 100%">
- <div class="input-group date">
- <input type="text" name="scalarValue" wicket:id="scalarValue" class="form-control"/>
- <span class="input-group-addon"><i class="fa fa-calendar"></i></span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="additionalLinks"></span>
- </label>
- </span>
- </div>
- <input type="text" wicket:id="scalarIfCompact" class="form-control"/>
- </div>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
index 747cf8a..681eadd 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaDateTimePanel.java
@@ -20,6 +20,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.jodatime;
import org.apache.wicket.markup.html.form.TextField;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.joda.time.DateTime;
import org.joda.time.LocalDateTime;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -43,4 +45,9 @@ public class JodaDateTimePanel extends ScalarPanelTextFieldDatePickerAbstract<Da
protected TextField<DateTime> createTextField(final String id) {
return new TextFieldWithDateTimePicker<>(id, new TextFieldValueModel<DateTime>(this), cls, converter);
}
+
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("jodaDateTimePanel");
+ }
}
http://git-wip-us.apache.org/repos/asf/isis/blob/830154f6/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
index 135e458..8d33bae 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jodatime/JodaLocalDatePanel.java
@@ -19,6 +19,8 @@
package org.apache.isis.viewer.wicket.ui.components.scalars.jodatime;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
import org.joda.time.LocalDate;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -36,4 +38,8 @@ public class JodaLocalDatePanel extends ScalarPanelTextFieldDatePickerAbstract<L
init(new DateConverterForJodaLocalDate(getSettings(), getAdjustBy()));
}
+ @Override
+ protected IModel<String> getScalarPanelType() {
+ return Model.of("jodaDateTimePanel");
+ }
}
[05/10] git commit: ISIS-537 Fix the comment about CSS region. The
rules are about making the label on the left, not right
Posted by da...@apache.org.
ISIS-537 Fix the comment about CSS region. The rules are about making the label on the left, not right
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/e1963484
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/e1963484
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/e1963484
Branch: refs/heads/master
Commit: e19634842ce8611bbf096bf774620e7abccbbaf9
Parents: 1802a6d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 24 11:27:17 2014 +0300
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 24 12:30:55 2014 +0100
----------------------------------------------------------------------
.../org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/e1963484/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index f007da0..b809842 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -91,7 +91,7 @@ th > a > div > strong {
float: left;
}
-/* Labels on the right START */
+/* Labels on the left START */
.form-inline .form-group {
width: 100%;
}
[07/10] git commit: ISIS-537 Remove commented out CSS rules about
colors in CssMenuPanel.css
Posted by da...@apache.org.
ISIS-537 Remove commented out CSS rules about colors in CssMenuPanel.css
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9b090880
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9b090880
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9b090880
Branch: refs/heads/master
Commit: 9b090880112186a3da18f1cb15b9b82797baf5c6
Parents: c8f4e9d
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 24 13:44:27 2014 +0300
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 24 12:30:59 2014 +0100
----------------------------------------------------------------------
.../components/widgets/cssmenu/CssMenuPanel.css | 74 ++------------------
1 file changed, 4 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9b090880/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
index 3df38e1..080e4a6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
@@ -20,14 +20,6 @@
line-height: 3px;
}
-.cssMenuPanel .menuh {
- /*font-family: arial, helvetica, sans-serif;*/
- /*float: left;*/
- /*margin-top: 0.1em;*/
- /*background: repeat-x scroll center center;*/
- /*width: 100%;*/
-}
-
.cssMenuPanel .menuh .small {
float: none;
display: inline;
@@ -41,9 +33,8 @@
.menuh a,.menuh p {
text-align: left;
display: block;
- /*border: 1px #00477F solid;*/
white-space: nowrap;
- margin: 0em;
+ margin: 0;
padding: 1px;
padding-right: 1.6em;
padding-left: 0.4em;
@@ -51,18 +42,6 @@
cursor: default;
}
-.cssMenuPanel .menuh a:link,.cssMenuPanel .menuh a:visited,.cssMenuPanel .menuh a:active,.cssMenuPanel .menuh p
- {
- /*color: #00477F;*/
- /*background-color: #EEEEEE;*/
- /*text-decoration: none;*/
-}
-
-.cssMenuPanel .menuh a:hover,.cssMenuPanel .menuh p:hover {
- /*color: #D7E7F5;*/
- /*background-color: #407098;*/
-}
-
.cssMenuPanel .menuh a:hover {
text-decoration: underline;
}
@@ -128,7 +107,6 @@
}
.cssMenuPanel li.cssSubMenuItem p.disabled {
- /*color: lightgray;*/
cursor: not-allowed;
}
@@ -174,13 +152,11 @@
.groupedActions .cssMenuPanel .menuh a:visited,
.groupedActions .cssMenuPanel .menuh a:active,
.groupedActions .cssMenuPanel .menuh p {
- /*background-color: #F0EFEA;*/
- /*color: #46423C;*/
display: block;
float: left;
height: 30px;
line-height: 30px;
- padding:0px 10px;
+ padding:0 10px;
font-weight:bold;
/*text-transform:uppercase;*/
font-size:0.85em;
@@ -190,12 +166,6 @@
text-decoration:none;
}
-.groupedActions .cssMenuPanel .menuh a:hover,.groupedActions .cssMenuPanel .menuh p:hover
- {
- /*color: #000;*/
- /*background-color:#FFFFFF;*/
-}
-
.entityActions .cssMenuPanel li.cssMenuItemPanel>p.top-parent {
display: none;
}
@@ -225,7 +195,7 @@
.entityActions .cssMenuPanel .menuh li p {
float:left;
display:block;
- margin-left:0px;
+ margin-left:0;
}
.entityActions .cssMenuPanel .menuh a,
@@ -238,13 +208,11 @@
.entityActions .cssMenuPanel .menuh a:visited,
.entityActions .cssMenuPanel .menuh a:active,
.entityActions .cssMenuPanel .menuh p {
- /*background-color: #F0EFEA;*/
- /*color: #46423C;*/
display: block;
float: left;
height: 30px;
line-height: 30px;
- padding:0px 10px;
+ padding:0 10px;
font-weight:bold;
/*text-transform:uppercase;*/
font-size:0.85em;
@@ -254,19 +222,6 @@
text-decoration:none;
}
-.entityActions .cssMenuPanel .menuh a:focus {
- /*text-decoration: underline;*/
-}
-
-.entityActions .cssMenuPanel .menuh a:hover,.entityActions .cssMenuPanel .menuh p:hover {
- /*color: #000;*/
-}
-
-.entityActions .cssMenuPanel .menuh a:hover,.entityActions .cssMenuPanel .menuh p:hover:not(.disabled) {
- /*color: #FFF;*/
- /*background-color:#20B5C2;*/
-}
-
.additionalLinkList {
float:left;
margin:0;
@@ -286,7 +241,6 @@
.additionalLinkList li a,
.additionalLinkList li em {
- /*background-color: #F0EFEA;*/
border-radius: 4px 4px 4px 4px;
display: block;
float: left;
@@ -299,30 +253,10 @@
/*text-transform: uppercase;*/
}
-.additionalLinkList li a {
- /*color: #46423C;*/
-}
-
-
-.additionalLinkList li a:hover {
- /*background-color:#20B5C2;*/
- /*color:#FFFFFF;*/
-}
-
-/* em = disabled */
-.additionalLinkList li em {
- /*color: lightgrey;*/
-}
-
.additionalLinkList li em:hover {
- /*color: black;*/
cursor: default;
}
.entityActions a.prototype span {
- /*color: #DBDB4D;*/
font-style: italic;
}
-.entityActions a.prototype {
- /*background-color: #20B5C2;*/
-}
[09/10] git commit: ISIS-537 Fix the javadoc of CssClassFaFacet
Posted by da...@apache.org.
ISIS-537 Fix the javadoc of CssClassFaFacet
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/266f71a0
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/266f71a0
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/266f71a0
Branch: refs/heads/master
Commit: 266f71a01d438157b4792ff12cb701722b1b37c3
Parents: 0618035
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 24 13:53:03 2014 +0300
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 24 12:31:01 2014 +0100
----------------------------------------------------------------------
.../facets/members/cssclassfa/cssclass/CssClassFaFacet.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/266f71a0/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/cssclass/CssClassFaFacet.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/cssclass/CssClassFaFacet.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/cssclass/CssClassFaFacet.java
index 388d47c..6546395 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/cssclass/CssClassFaFacet.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/members/cssclassfa/cssclass/CssClassFaFacet.java
@@ -26,7 +26,7 @@ import org.apache.isis.core.metamodel.facets.SingleStringValueFacet;
*
* <p>
* In the standard Apache Isis Programming Model, corresponds to annotating the
- * member with <tt>@CssClassFA</tt>.
+ * member with <tt>{@literal @}{@link org.apache.isis.applib.annotation.CssClassFa CssClassFa}</tt>.
*/
public interface CssClassFaFacet extends SingleStringValueFacet {
}
[08/10] git commit: ISIS-537 Remove "display: inline-block" for
.dropdown-menu>li>a.menuLink" so that the hover colors the whole line
Posted by da...@apache.org.
ISIS-537 Remove "display: inline-block" for .dropdown-menu>li>a.menuLink" so that the hover colors the whole line
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/0618035b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/0618035b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/0618035b
Branch: refs/heads/master
Commit: 0618035be15a196a6a164f1034b9e0cc2ad81f26
Parents: 9b09088
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 24 13:49:25 2014 +0300
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 24 12:31:00 2014 +0100
----------------------------------------------------------------------
.../ui/components/widgets/cssmenu/ApplicationActionsPanel.css | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/0618035b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
index 4d877b7..09b63ee 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.css
@@ -70,8 +70,7 @@
}
.dropdown-menu > li > a.menuLink {
- display: inline-block;
- padding-left: 0px;
+ padding-left: 0;
}
.dropdown-menu > li > span.fa {
[10/10] git commit: ISIS-537 Use bg-warning for prototype application
actions
Posted by da...@apache.org.
ISIS-537 Use bg-warning for prototype application actions
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/67e2c7be
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/67e2c7be
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/67e2c7be
Branch: refs/heads/master
Commit: 67e2c7be1a13db682cd1467fde1693bf17aa5e4d
Parents: 266f71a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 24 14:20:25 2014 +0300
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 24 12:31:03 2014 +0100
----------------------------------------------------------------------
.../components/widgets/cssmenu/ApplicationActionsPanel.java | 3 +++
.../wicket/ui/components/widgets/cssmenu/CssMenuItem.java | 7 +++++--
2 files changed, 8 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/67e2c7be/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
index 5134c54..b4338b7 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/ApplicationActionsPanel.java
@@ -111,6 +111,9 @@ public class ApplicationActionsPanel extends Panel {
if (!menuItem.isEnabled()) {
listItem.add(new CssClassNameAppender("disabled"));
}
+ if (menuItem.isPrototyping()) {
+ listItem.add(new CssClassNameAppender("bg-warning"));
+ }
leafItem.add(subMenuItemLink);
listItem.add(leafItem);
http://git-wip-us.apache.org/repos/asf/isis/blob/67e2c7be/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
index 4be4b6b..153b76e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuItem.java
@@ -193,7 +193,10 @@ public class CssMenuItem implements Serializable {
public void setPrototyping(boolean prototype) {
this.prototype = prototype;
-
+ }
+
+ public boolean isPrototyping() {
+ return prototype;
}
private CssMenuItem(final String name) {
@@ -470,4 +473,4 @@ public class CssMenuItem implements Serializable {
}
-}
\ No newline at end of file
+}
[06/10] git commit: ISIS-537 Use for the additional links in
AdditionalLinksPanel. Add some space at the bottom to draw a line between
them
Posted by da...@apache.org.
ISIS-537 Use <ul> for the additional links in AdditionalLinksPanel. Add some space at the bottom to draw a line between them
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c8f4e9d7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c8f4e9d7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c8f4e9d7
Branch: refs/heads/master
Commit: c8f4e9d7ba7cab9694bec28891d80442b826ba28
Parents: e196348
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Oct 24 11:45:36 2014 +0300
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Fri Oct 24 12:30:56 2014 +0100
----------------------------------------------------------------------
.../ui/components/additionallinks/AdditionalLinksPanel.html | 8 ++++----
.../wicket/ui/components/widgets/cssmenu/CssMenuPanel.css | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/c8f4e9d7/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.html
index 8e61dce..5dcc2fb 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/additionallinks/AdditionalLinksPanel.html
@@ -24,14 +24,14 @@
lang="en">
<body>
<wicket:panel>
- <span wicket:id="additionalLinkList" class="additionalLinkList">
- <span wicket:id="additionalLinkItem" class="additionalLinkItem">
+ <ul wicket:id="additionalLinkList" class="additionalLinkList">
+ <li wicket:id="additionalLinkItem" class="additionalLinkItem">
<a href="#" wicket:id="additionalLink" class="btn btn-sm btn-default">
<span wicket:id="additionalLinkFontAwesome"/>
<span wicket:id="additionalLinkTitle" class="additionalLinkItem">[link title]</span>
</a>
- </span>
- </span>
+ </li>
+ </ul>
</wicket:panel>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/c8f4e9d7/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
index f9968c8..3df38e1 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
@@ -277,6 +277,7 @@
.additionalLinkList li {
float:left;
margin-right:10px;
+ margin-bottom: 2px;
}
.additionalLinkList li em {