From f4ee9d96b8137774b124eb89ff53671066d0c0a1 Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Wed, 18 Nov 2020 21:14:29 +0100 Subject: [PATCH] More form group components --- .../components/bootstrap/formGroupColor.xhtml | 48 +++++++++++ .../components/bootstrap/formGroupDate.xhtml | 60 ++++++++++++++ .../components/bootstrap/formGroupEmail.xhtml | 82 ++++++++++++++++++ .../components/bootstrap/formGroupFile.xhtml | 69 +++++++++++++++ .../bootstrap/formGroupNumber.xhtml | 47 ++++------- .../bootstrap/formGroupPassword.xhtml | 75 +++++++++++++++++ .../components/bootstrap/formGroupRange.xhtml | 68 +++++++++++++++ .../bootstrap/formGroupSearch.xhtml | 74 +++++++++++++++++ .../components/bootstrap/formGroupTel.xhtml | 78 +++++++++++++++++ .../components/bootstrap/formGroupText.xhtml | 5 +- .../bootstrap/formGroupTextarea.xhtml | 69 +++++++++++++++ .../components/bootstrap/formGroupTime.xhtml | 61 ++++++++++++++ .../components/bootstrap/formGroupUrl.xhtml | 83 +++++++++++++++++++ .../ui/admin/categories/category-form.xhtml | 74 +++++++++++++++-- 14 files changed, 854 insertions(+), 39 deletions(-) create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupColor.xhtml create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupDate.xhtml create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupEmail.xhtml create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupFile.xhtml create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupPassword.xhtml create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRange.xhtml create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSearch.xhtml create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTel.xhtml create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTextarea.xhtml create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTime.xhtml create mode 100644 ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupUrl.xhtml diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupColor.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupColor.xhtml new file mode 100644 index 000000000..d03a66e42 --- /dev/null +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupColor.xhtml @@ -0,0 +1,48 @@ + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ + + diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupDate.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupDate.xhtml new file mode 100644 index 000000000..d4c920c1d --- /dev/null +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupDate.xhtml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupEmail.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupEmail.xhtml new file mode 100644 index 000000000..00b0d5b92 --- /dev/null +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupEmail.xhtml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ + + + + diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupFile.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupFile.xhtml new file mode 100644 index 000000000..f0984a644 --- /dev/null +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupFile.xhtml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ + + diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml index ed31d82a2..693717010 100644 --- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupNumber.xhtml @@ -1,9 +1,6 @@ + xmlns:cc="http://xmlns.jcp.org/jsf/composite"> -
-            step = #{cc.attrs.step}
-            step = #{(not empty cc.attrs.step) ? cc.attrs.step : null}
-            step not empty? #{not empty cc.attrs.step}
-        
-
-
- - - - - #{cc.attrs.help} - -
- +
+ + + + #{cc.attrs.help} +
diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupPassword.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupPassword.xhtml new file mode 100644 index 000000000..ca9e387f8 --- /dev/null +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupPassword.xhtml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ + + + diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRange.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRange.xhtml new file mode 100644 index 000000000..aec116750 --- /dev/null +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupRange.xhtml @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ + diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSearch.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSearch.xhtml new file mode 100644 index 000000000..447e953bd --- /dev/null +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupSearch.xhtml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ + + diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTel.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTel.xhtml new file mode 100644 index 000000000..21c89fc3c --- /dev/null +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTel.xhtml @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ + + + + + diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml index a25af17ba..ad68cfeca 100644 --- a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupText.xhtml @@ -1,9 +1,6 @@ + xmlns:cc="http://xmlns.jcp.org/jsf/composite"> + + + + + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ + diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTime.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTime.xhtml new file mode 100644 index 000000000..7c7907051 --- /dev/null +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupTime.xhtml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ + diff --git a/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupUrl.xhtml b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupUrl.xhtml new file mode 100644 index 000000000..8a5cbc55a --- /dev/null +++ b/ccm-core/src/main/resources/META-INF/resources/components/bootstrap/formGroupUrl.xhtml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + +
+ + + + #{cc.attrs.help} + +
+
+ + + + + + diff --git a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml index 846ea9b5d..39b376562 100644 --- a/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml +++ b/ccm-core/src/main/resources/WEB-INF/views/org/libreccm/ui/admin/categories/category-form.xhtml @@ -5,20 +5,20 @@ xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:ui="http://xmlns.jcp.org/jsf/facelets"> - + - + - +

#{AdminMessages['categories.label']}

- +
+ + + + + + + + + + + +

ToDo

- +