This is an automated email from the ASF dual-hosted git repository. dklco pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit b6e2d14de88f4400096f838981f9675d2d8745a9 Author: Dan Klco <[email protected]> AuthorDate: Tue Jul 10 15:20:25 2018 -0400 Moving the edit clientlibs to /static and fixing the z-index to display over top of bootstrap 4 --- ui/src/main/frontend/src/scss/styles.scss | 2 +- .../components/cms/pageeditbar/pageeditbar.jsp | 2 +- .../components/editor/scripts/finalize.jsp | 2 +- .../sling-cms/components/editor/scripts/init.jsp | 2 +- ....sling.engine.impl.auth.SlingAuthenticator.json | 3 +- .../clientlibs/sling-cms-editor/editor.css | 65 +++++++++++----------- .../clientlibs/sling-cms-editor/editor.js | 0 7 files changed, 37 insertions(+), 39 deletions(-) diff --git a/ui/src/main/frontend/src/scss/styles.scss b/ui/src/main/frontend/src/scss/styles.scss index ea893de..07cdca7 100644 --- a/ui/src/main/frontend/src/scss/styles.scss +++ b/ui/src/main/frontend/src/scss/styles.scss @@ -73,7 +73,7 @@ ul.Breadcrumb { .Modal { display: none; position: fixed; - z-index: 1000; + z-index: 1002; left: 0; top: 0; width: 100%; diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp index 191962c..f004a75 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/pageeditbar/pageeditbar.jsp @@ -17,7 +17,7 @@ * under the License. */ --%> <%@include file="/libs/sling-cms/global.jsp"%> -<link rel="stylesheet" href="/etc/clientlibs/sling-cms-editor/editor.css" /> +<link rel="stylesheet" href="/static/clientlibs/sling-cms-editor/editor.css" /> <sling:call script="/libs/sling-cms/components/editor/scripts/init.jsp" /> <div class="Sling-CMS__edit-bar"> <a href="/cms/start.html" target="_blank" class="Sling-CMS__component-title" target="Sling CMS"> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp index 8b97700..52cad1d 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/finalize.jsp @@ -18,7 +18,7 @@ */ --%> <%@include file="/libs/sling-cms/global.jsp"%> <c:if test="${cmsEditEnabled == 'true'}"> - <script src="/etc/clientlibs/sling-cms-editor/editor.js"></script> + <script src="/static/clientlibs/sling-cms-editor/editor.js"></script> <div class="Sling-CMS__modal-background"> <div class="Sling-CMS__modal-box"> <div class="Sling-CMS__modal-frame-header"> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/init.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/init.jsp index 60e51e3..1722b61 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/init.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/scripts/init.jsp @@ -18,7 +18,7 @@ */ --%> <%@include file="/libs/sling-cms/global.jsp"%> <c:if test="${cmsEditEnabled == 'true'}"> - <link rel="stylesheet" href="/etc/clientlibs/sling-cms-editor/editor.css" /> + <link rel="stylesheet" href="/static/clientlibs/sling-cms-editor/editor.css" /> <c:if test="${not empty properties.availableTypes}"> <c:set var="availableTypes" value="${properties.availableTypes}" scope="request" /> </c:if> diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.engine.impl.auth.SlingAuthenticator.json b/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.engine.impl.auth.SlingAuthenticator.json index 4e93201..9caf9e3 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.engine.impl.auth.SlingAuthenticator.json +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/install/org.apache.sling.engine.impl.auth.SlingAuthenticator.json @@ -7,7 +7,6 @@ "/apps", "/etc", "/home", - "/var", - "-/etc/clientlibs" + "/var" ] } \ No newline at end of file diff --git a/ui/src/main/resources/jcr_root/etc/clientlibs/sling-cms-editor/editor.css b/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.css similarity index 70% rename from ui/src/main/resources/jcr_root/etc/clientlibs/sling-cms-editor/editor.css rename to ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.css index 24d690b..5a84ba8 100644 --- a/ui/src/main/resources/jcr_root/etc/clientlibs/sling-cms-editor/editor.css +++ b/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.css @@ -15,10 +15,9 @@ * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - */ - + */ .Sling-CMS__component { - border: 1px solid rgba(0,0,0,0); + border: 1px solid rgba(0, 0, 0, 0); } .Sling-CMS__component:hover { @@ -28,25 +27,24 @@ .Sling-CMS__component-title { padding: 0 10px; } - - + .Sling-CMS__edit-bar { width: 100%; height: 38px; padding: .2em; background-color: silver; - line-height: 12px; - font-family: "Open Sans", arial, sans-serif; + line-height: 12px; + font-family: "Open Sans", arial, sans-serif; } .Sling-CMS__edit-button { - display: inline-block; - padding: 8px 12px; - color: white; - background-color: #00678c; - border: 0; - margin: .1em; - text-decoration: none; + display: inline-block; + padding: 8px 12px; + color: white; + background-color: #00678c; + border: 0; + margin: .1em; + text-decoration: none; } .Sling-CMS__logo { @@ -54,25 +52,26 @@ } .Sling-CMS__modal-background { - display: none; - position: fixed; - left: 0; - top: 0; - width: 100%; - height: 100%; - overflow: auto; - background-color: rgb(0,0,0); - background-color: rgba(0,0,0,0.3); + display: none; + position: fixed; + left: 0; + top: 0; + width: 100%; + height: 100%; + overflow: auto; + background-color: rgb(0, 0, 0); + background-color: rgba(0, 0, 0, 0.3); + z-index: 1001; } .Sling-CMS__modal-box { - background-color: white; - margin: 3em auto; - padding: 2em; - border: 1px solid gray; - width: 85%; - z-index: 1; - max-width: 900px; + background-color: white; + margin: 3em auto; + padding: 2em; + border: 1px solid gray; + width: 85%; + z-index: 1001; + max-width: 900px; } .Sling-CMS__modal-frame-container { @@ -84,7 +83,7 @@ .Sling-CMS__modal-frame { position: absolute; - top:0; + top: 0; left: 0; width: 100%; height: 100%; @@ -92,7 +91,7 @@ } .Sling-CMS__modal-close { - float:right; + float: right; } .Sling-CMS__page-wrapper-frame { @@ -108,5 +107,5 @@ padding: 0; overflow: hidden; z-index: 998; - padding-top: 8px; + padding-top: 8px; } \ No newline at end of file diff --git a/ui/src/main/resources/jcr_root/etc/clientlibs/sling-cms-editor/editor.js b/ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.js similarity index 100% rename from ui/src/main/resources/jcr_root/etc/clientlibs/sling-cms-editor/editor.js rename to ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.js
