This is an automated email from the ASF dual-hosted git repository.
jamesyong pushed a commit to branch trunk
in repository
https://gitbox.apache.org/repos/asf/ofbiz-framework.gitThe following commit(s) were added to refs/heads/trunk by this push:
new f15c037 Fixed: Open FTL File from browser (OFBIZ-12018)
f15c037 is described below
commit f15c037e073b2692f103384bdfe906039b44e1a9
Author: James Yong <
[hidden email]>
AuthorDate: Wed Sep 30 19:16:53 2020 +0800
Fixed: Open FTL File from browser (OFBIZ-12018)
Some named borders were hidden in ecomseo landing page
---
.../ofbiz/widget/renderer/html/HtmlWidgetRenderer.java | 12 ++++++------
themes/common-theme/webapp/common/css/info.css | 10 ----------
2 files changed, 6 insertions(+), 16 deletions(-)
diff --git a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlWidgetRenderer.java b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlWidgetRenderer.java
index 3ec7257..99ee553 100644
--- a/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlWidgetRenderer.java
+++ b/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/html/HtmlWidgetRenderer.java
@@ -79,20 +79,20 @@ public class HtmlWidgetRenderer {
if (!themeBasePathsToExempt.stream().anyMatch(widgetName::contains)) {
// add additional visual label for non-theme ftl
if ("Begin".equals(boundaryType)) {
- return "<div class='info-container'><div class='info-content'>";
- } else if ("End".equals(boundaryType)) {
String fileName = widgetName.substring(widgetName.lastIndexOf("/") + 1);
switch (namedBorderType) {
case SOURCE:
- return "</div><div class='info-overlay'><span class='info-overlay-item info-cursor-none' data-source='" + widgetName + "'>"
+ return "<div class='info-container'><span class='info-overlay-item info-cursor-none' data-source='" + widgetName + "'>"
+ fileName
- + "</span></div></div>";
+ + "</span>";
case LABEL:
- return "</div><div class='info-overlay'><span class='info-overlay-item'>"
+ return "<div class='info-container'><span class='info-overlay-item'>"
+ fileName
- + "</span></div></div>";
+ + "</span>";
default: return "";
}
+ } else if ("End".equals(boundaryType)) {
+ return "</div>";
}
}
return "";
diff --git a/themes/common-theme/webapp/common/css/info.css b/themes/common-theme/webapp/common/css/info.css
index 8dd2ba8..bb271af 100644
--- a/themes/common-theme/webapp/common/css/info.css
+++ b/themes/common-theme/webapp/common/css/info.css
@@ -1,21 +1,11 @@
.info-container {
- display: grid;
-}
-.info-overlay {
color: rgb(165, 42, 42);
justify-items: center;
border: 2px dashed rgba(236, 198, 48, 0.7);
transition: .5s ease-out;
}
-.info-content,
-.info-overlay {
- grid-area: 1 / 1;
-}
.info-overlay-item {
- height: 50%;
background: rgba(255, 213, 70);
- border: 2px dashed rgba(236, 198, 48);
- z-index: 10;
}
.info-cursor {
cursor: pointer;
Locked
