diff --git a/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl b/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl index eb42ba9f9..4aaccaa01 100644 --- a/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl +++ b/core/src/main/resources/org/apache/struts2/interceptor/debugging/console.ftl @@ -22,7 +22,7 @@ <@s.script type="text/javascript"> - var baseUrl = "<@s.url value="/struts" includeParams="none"/>"; + var baseUrl = "<@s.url value="/static" includeParams="none"/>"; window.open(baseUrl+"/webconsole.html", 'OGNL Console','width=500,height=450,status=no,toolbar=no,menubar=no'); diff --git a/core/src/main/resources/template/simple/link.ftl b/core/src/main/resources/template/simple/link.ftl index 13d7b4b00..e4847adea 100644 --- a/core/src/main/resources/template/simple/link.ftl +++ b/core/src/main/resources/template/simple/link.ftl @@ -60,4 +60,5 @@ <#include "/${parameters.templateDir}/${parameters.expandTheme}/common-attributes.ftl" /><#rt/> <#include "/${parameters.templateDir}/${parameters.expandTheme}/dynamic-attributes.ftl" /><#rt/> -<#include "/${parameters.templateDir}/${parameters.expandTheme}/nonce.ftl" /><#rt/>/> +<#include "/${parameters.templateDir}/${parameters.expandTheme}/nonce.ftl" /><#rt/> +/> diff --git a/plugins/config-browser/src/main/resources/config-browser/config-styles.css b/plugins/config-browser/src/main/resources/config-browser/config-styles.css deleted file mode 100644 index eae9c223a..000000000 --- a/plugins/config-browser/src/main/resources/config-browser/config-styles.css +++ /dev/null @@ -1,812 +0,0 @@ - diff --git a/plugins/config-browser/src/main/resources/config-browser/config-styles.ftl b/plugins/config-browser/src/main/resources/config-browser/config-styles.ftl new file mode 100644 index 000000000..7a223c469 --- /dev/null +++ b/plugins/config-browser/src/main/resources/config-browser/config-styles.ftl @@ -0,0 +1,710 @@ +<#-- +/* + * 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. + */ +--> + diff --git a/plugins/config-browser/src/main/resources/config-browser/page-header.ftl b/plugins/config-browser/src/main/resources/config-browser/page-header.ftl index ac286130b..ba3827444 100644 --- a/plugins/config-browser/src/main/resources/config-browser/page-header.ftl +++ b/plugins/config-browser/src/main/resources/config-browser/page-header.ftl @@ -24,19 +24,19 @@ ${pageTitle} -<#include "/config-browser/config-styles.css" parse="y"> +<#include "/config-browser/config-styles.ftl" parse="y"> - + + <#if !hideNav??> class="b" <#else>class="a"> - + <#assign row = row + 1>
@@ -94,4 +94,4 @@

${pageTitle}

-
+
diff --git a/plugins/config-browser/src/main/resources/config-browser/showValidators.ftl b/plugins/config-browser/src/main/resources/config-browser/showValidators.ftl index 068198180..98f746256 100644 --- a/plugins/config-browser/src/main/resources/config-browser/showValidators.ftl +++ b/plugins/config-browser/src/main/resources/config-browser/showValidators.ftl @@ -31,15 +31,17 @@
${i.fieldName!"(see expression)"} ${action.stripPackage(i.class)}details + details + <@s.script> + document.getElementById('showValidators_${row}').onclick = function() { + window.open('validatorDetails.${extension}?clazz=${clazz}&context=${context}&selected=${row}', 'Validator Details', 'resizable=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,width=1280,height=800'); + return false; + } + +
-<@s.script> - document.getElementById('show-validators').onclick = function() { - window.open('validatorDetails.${extension}?clazz=${clazz}&context=${context}&selected=${row}', 'Validator Details', 'resizable=yes,toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,width=640,height=480'); - return false; - } - diff --git a/plugins/config-browser/src/main/resources/config-browser/validatorDetails.ftl b/plugins/config-browser/src/main/resources/config-browser/validatorDetails.ftl index 05a945133..e010217fc 100644 --- a/plugins/config-browser/src/main/resources/config-browser/validatorDetails.ftl +++ b/plugins/config-browser/src/main/resources/config-browser/validatorDetails.ftl @@ -21,7 +21,7 @@ <#include "tigris-macros.ftl"> <#assign hideNav = true> <#call startPage pageTitle="Validator Details"/> - +
@@ -34,7 +34,11 @@
Validated Class:${action.stripPackage(clazz)}
Context:${context}
Validator Number:${selected}
${prop.name} <#if prop.value??> <#if prop.value?is_collection>(size = ${prop.value?size})<#foreach v in prop.value>${v.value}, - <#else>${prop.value?string} + <#elseif prop.value?is_date_like> + ${prop.value?datetime} + <#else> + ${prop.value?string} + <#else> null <#if prop.value?? && prop.value?is_collection>(collection)<#else>${prop.type.name}