You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/05/04 16:44:06 UTC
[isis] branch master updated: ISIS-3033: remove superfluous wrapping div for date-picker
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 301a270b43 ISIS-3033: remove superfluous wrapping div for date-picker
301a270b43 is described below
commit 301a270b4313b2dbe35672652e58f01df1b334c9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Wed May 4 18:44:00 2022 +0200
ISIS-3033: remove superfluous wrapping div for date-picker
- fixes input field to width 100%
---
.../ScalarPanelFormFieldAbstract-debug.html | 221 ---------------------
.../scalars/ScalarPanelFormFieldAbstract.html | 10 +-
.../blobclob/_IsisBlobOrClobPanelAbstract.html | 87 --------
3 files changed, 4 insertions(+), 314 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract-debug.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract-debug.html
deleted file mode 100644
index de88a4424b..0000000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract-debug.html
+++ /dev/null
@@ -1,221 +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" xml:lang="en" lang="en">
-<body>
- <wicket:panel>
- <div wicket:id="scalarTypeContainer"
- class="scalarNameAndValueComponentType">
-
- <!-- regular frame -->
- <div class="form-group" wicket:id="scalarIfRegular">
-
- <label wicket:id="scalarName"
- class="scalarName col-form-label">[Label text]</label>
- <span class="scalarValueWrapper">
- <div class="scalarPlaceholder">
-
- <wicket:container
- wicket:id="container-fieldFrame" />
-
- <span wicket:id="associatedActionLinksRight"
- class="associatedActionLinksRight">[drop down]</span>
- </div>
- <span wicket:id="feedback" class="form-text"/>
- <span wicket:id="associatedActionLinksBelow"/>
- </span>
- <div class="clearfix"/>
- </div>
-
- <!-- prompt form frame -->
- <div wicket:id="scalarIfRegularInlinePromptForm"
- class="inlinePromptForm">
- <div>
- <span>[inline edit form]</span>
- </div>
- </div>
-
- <!-- compact frame -->
- <wicket:container
- wicket:id="scalarIfCompact"/>
-
- </div>
-
- <!-- FIELD FRAME FRAGMENTS -->
-
- <wicket:fragment wicket:id="fragment-fieldFrame-withLink">
- <label wicket:id="debugLabel" style="font-size: x-small; color: burlywood;">[Debug text]</label>
- <span class="scalarValueInput">
- <span class="editing">
-
- <div wicket:id="scalarValueInlinePromptLink"
- class="scalarValueInlinePromptLink">
-
- <span style="color: blue;">λ</span>
- <!-- output format -->
- <wicket:container
- wicket:id="container-scalarValue"/>
-
- </div>
-
- <a wicket:id="editProperty"
- href="##" class="edit btn btn-sm btn-link">
- <span class="editIcon fa fa-edit"/>
- </a>
-
- </span>
- </span>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-fieldFrame-withoutLink">
- <label wicket:id="debugLabel" style="font-size: x-small; color: burlywood;">[Debug text]</label>
- <span class="scalarValueInput">
- <span class="editing">
-
- <!-- input format (when editing or action dialog or read-only) -->
- <div>
- <span style="color: purple;">α</span>
- <wicket:container
- wicket:id="container-scalarValue" />
- </div>
-
- </span>
- </span>
- </wicket:fragment>
-
- <!-- INPUT FRAGMENTS -->
-
- <wicket:fragment wicket:id="fragment-input-text">
- <input wicket:id="scalarValue"
- type="text" name="scalarValue"
- class="form-control form-control-sm scalarValue"/>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-input-textarea">
- <textarea wicket:id="scalarValue" name="scalarValue"
- class="form-control form-control-sm scalarValue"
- data-isis-focus="true" />
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-input-checkbox">
- <input wicket:id="scalarValue" type="checkbox" name="scalarValue"
- class="scalarValue"/>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-input-file">
- <span class="uploadFile form-text">
- <input wicket:id="scalarValue" type="file" name="scalarValue"/>
- </span>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-input-date">
- <div class="date">
- <input wicket:id="scalarValue"
- type="text" name="scalarValue"
- class="form-control form-control-sm scalarValue"/>
- </div>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-input-select">
- <select wicket:id="scalarValue"
- class="choices form-control-sm select2-remote"/>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-input-select2">
- <span class="autoCompletePlaceholder">
-<!-- <span wicket:id="entityIconAndTitle">[icon and title]</span> -->
- <span wicket:id="entityLink">link or drop down</span>
- </span>
- <span wicket:id="entityTitleIfNull">(none)</span>
- </wicket:fragment>
-
- <!-- PROMPT FRAGMENTS -->
-
- <wicket:fragment wicket:id="fragment-prompt-editicon">
- <button wicket:id="scalarValue" class="edit btn btn-sm btn-link">
- <span class="editIcon fa fa-edit"/>
- </button>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-prompt-label">
- <span wicket:id="scalarValue"/>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-prompt-textarea">
- <textarea wicket:id="scalarValue"
- class="form-control form-control-sm scalarPrompt" readonly="true"/>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-prompt-checkboxYes">
- <label class="fs-4" style="color: green;"><i
- class="fa-regular fa-check-square"></i></label>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-prompt-checkboxNo">
- <label class="fs-4"><i
- class="fa-regular fa-square"></i></label>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-prompt-checkboxIntermediate">
- <label class="fs-4" style="color: silver;"><i
- class="fa-regular fa-square-minus"></i></label>
- </wicket:fragment>
-
- <!-- COMPACT FRAGMENTS -->
-
- <wicket:fragment wicket:id="fragment-compact-checkboxYes">
- <label class="fs-5" style="color: green;"><i
- class="fa-regular fa-check-square"></i></label>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-compact-checkboxNo">
- <label class="fs-5"><i
- class="fa-regular fa-square"></i></label>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-compact-checkboxIntermediate">
- <label class="fs-5" style="color: silver;"><i
- class="fa-regular fa-square-minus"></i></label>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-compact-label">
- <span wicket:id="scalarValue"/>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-compact-badge">
- <div class="badge bg-light">
- <span wicket:id="scalarValue"></span>
- </div>
- </wicket:fragment>
-
- <wicket:fragment wicket:id="fragment-compact-entityLink">
- <div class="scalarValue">
- <div class="entityLink"
- wicket:id="entityLink"
- >[property or parameter value]</div>
- </div>
- </wicket:fragment>
-
-
- </wicket:panel>
-</body>
-</html>
-
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
index 85ee5ab596..a54bacb6a0 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.html
@@ -98,7 +98,7 @@
<span class="scalarValueInput input-group">
<!-- input format (when editing or action dialog) -->
<wicket:container
- wicket:id="container-scalarValue" />
+ wicket:id="container-scalarValue"/>
<span class="position-absolute top-0 end-0" style="z-index: 20;">
<div class="btn-group btn-group-sm shadow" role="group">
@@ -137,11 +137,9 @@
</wicket:fragment>
<wicket:fragment wicket:id="fragment-input-date">
- <div class="date">
- <input wicket:id="scalarValue"
- type="text" name="scalarValue"
- class="form-control form-control-sm scalarValue"/>
- </div>
+ <input wicket:id="scalarValue"
+ type="text" name="scalarValue"
+ class="form-control form-control-sm scalarValue"/>
</wicket:fragment>
<wicket:fragment wicket:id="fragment-input-select">
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/_IsisBlobOrClobPanelAbstract.html b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/_IsisBlobOrClobPanelAbstract.html
deleted file mode 100644
index fd2009b165..0000000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/_IsisBlobOrClobPanelAbstract.html
+++ /dev/null
@@ -1,87 +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.
--->
-<html xmlns:wicket="http://wicket.apache.org">
- <body>
- <wicket:panel>
-
- <div class="scalarNameAndValueComponentType"
- wicket:id="scalarTypeContainer">
-
- <div class="form-group"
- wicket:id="scalarIfRegular">
-
- <label wicket:id="scalarName"
- class="scalarName col-form-label">[Label text]</label>
-
- <span class="scalarValueWrapper">
-
- <div class="scalarPlaceholder">
-
- <span class="scalarValueInput">
- <span class="editing">
-
- <img wicket:id="scalarImage"
- class="scalarImage text-center" width="200px"/>
- <span class="scalarValue text-right">
-
- <span class="uploadFile form-text">
- <input type="file" name="scalarValue" wicket:id="scalarValue" />
- </span>
- <a wicket:id="scalarIfRegularClear" class="btn btn-primary btn-sm">
- <span class="clearTitle">Clear</span>
- </a>
-
- <span class="fileName" wicket:id="fileName">[filename]</span>
-
- <a href="##"
- class="download btn btn-sm btn-link"
- wicket:id="scalarIfRegularDownload">
- <span class="downloadIcon fa fa-download"></span>
- </a>
-
- <a href="##"
- class="edit btn btn-sm btn-link"
- wicket:id="editProperty">
- <span class="editIcon fa fa-edit"></span>
- </a>
-
- </span>
-
- </span>
- </span>
- <span class="associatedActionLinksRight"
- wicket:id="associatedActionLinksRight">[drop down]
- </span>
- </div>
- <span wicket:id="feedback" class="form-text"></span>
- <span wicket:id="associatedActionLinksBelow"></span>
- </span>
- <div class="clearfix"/>
- </div>
- <span wicket:id="scalarIfCompact">
- <a wicket:id="scalarIfCompactDownload">
- <!-- <span class="fileName" wicket:id="fileNameIfCompact"></span> -->
- </a>
- </span>
- </div>
-
- </wicket:panel>
- </body>
-</html>