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 16c7700a9ca35fdb128ffbd33accf62fd5b0a294 Author: Dan Klco <[email protected]> AuthorDate: Tue Oct 20 16:58:47 2020 -0400 UI tweak - improving the error pages when not logged in --- .../libs/sling-cms/components/pages/error/body.jsp | 51 ++++++++++++++++++++++ .../sling-cms/components/pages/error/error.jsp | 23 ++++++++++ 2 files changed, 74 insertions(+) diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/body.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/body.jsp new file mode 100644 index 0000000..192f29f --- /dev/null +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/body.jsp @@ -0,0 +1,51 @@ +<%-- /* + * 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. + */ --%> +<%@include file="/libs/sling-cms/global.jsp"%> +<body class="cms"> + <div class="gradient"></div> + <div class="main-section has-background-light"> + <c:choose> + <c:when test="${resourceResolver.userID == 'anonymous'}"> + <div class="columns is-centered is-vcentered" style="min-height: calc(100vh - 85px)"> + <div class="column is-two-thirds-tablet is-half-desktop is-one-third-widescreen"> + <div class="box mt-6"> + <img src="/static/clientlibs/sling-cms/img/sling-logo.svg" width="100" alt="Apache Sling CMS" class="pb-3"> + <sling:call script="content.jsp" /> + </div> + </div> + </div> + </c:when> + <c:otherwise> + <sling:call script="nav.jsp" /> + <div class="columns"> + <div class="column is-2 sidebar is-full-height"> + <sling:include + path="/mnt/overlay/sling-cms/content/start/jcr:content/nav" + resourceType="sling-cms/components/general/container" /> + </div> + <div class="column has-background-white-bis is-full-height"> + <div class="Main-Content"> <sling:call + script="content.jsp" /> </div> + </div> + </div> + </c:otherwise> + </c:choose> + </div> + <sling:call script="scripts.jsp" /> +</body> \ No newline at end of file diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/error.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/error.jsp new file mode 100644 index 0000000..db32cd5 --- /dev/null +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/error.jsp @@ -0,0 +1,23 @@ +<%-- /* + * 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. + */ --%> + <%@include file="/libs/sling-cms/global.jsp"%> +<html lang="en"> + <sling:call script="head.jsp" /> + <sling:call script="body.jsp" /> +</html>
