From 121cb781d5bfca4d6a20969882b0d825a85e9854 Mon Sep 17 00:00:00 2001 From: Hasdai Pacheco Date: Wed, 13 Dec 2017 12:56:05 -0600 Subject: [PATCH] Fixed bug that prevented template editor from loading when site id contains dashes --- .../jsp/SWBATemplateEdit/fileManager.jsp | 14 +-- .../jsp/SWBATemplateEdit/templateEdit.jsp | 100 +++++++++--------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/main/webapp/swbadmin/jsp/SWBATemplateEdit/fileManager.jsp b/src/main/webapp/swbadmin/jsp/SWBATemplateEdit/fileManager.jsp index cc4fdb9..7491d35 100644 --- a/src/main/webapp/swbadmin/jsp/SWBATemplateEdit/fileManager.jsp +++ b/src/main/webapp/swbadmin/jsp/SWBATemplateEdit/fileManager.jsp @@ -24,11 +24,11 @@ @@ -57,7 +57,7 @@ margin: 0px; } - #elfinder_<%= websiteId %>_<%= templateId %> { + #elfinder_<%= websiteId.replace("-", "_") %>_<%= templateId %> { width: 100%; min-width: 100%; height: 100% !important; @@ -71,6 +71,6 @@ -
+
_<%= templateId %>">
diff --git a/src/main/webapp/swbadmin/jsp/SWBATemplateEdit/templateEdit.jsp b/src/main/webapp/swbadmin/jsp/SWBATemplateEdit/templateEdit.jsp index 0095e9c..71002b9 100644 --- a/src/main/webapp/swbadmin/jsp/SWBATemplateEdit/templateEdit.jsp +++ b/src/main/webapp/swbadmin/jsp/SWBATemplateEdit/templateEdit.jsp @@ -48,31 +48,31 @@ right: 0; } -
+
_<%= templateId %>" data-dojo-type="dijit/layout/BorderContainer" data-dojo-props="gutters:true, liveSplitters:false">
- - - + + + - - - + + + - - - + + + +
- -
+ _<%= templateId %>" accept="text/html" style="display:none"/> +
_<%= templateId %>">
- -
"> +
_<%= templateId %>" title="<%= paramRequest.getLocaleString("lblAddResourceButton") %>">
-
+
_<%= templateId %>">
- - + +