This is an automated email from the ASF dual-hosted git repository.
jeb pushed a commit to branch SLING-7858
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
The following commit(s) were added to refs/heads/SLING-7858 by this push:
new 02cf9fd additional component changes
02cf9fd is described below
commit 02cf9fd94c8459afd5da92daadbd8cd37cde3db4
Author: JE Bailey <[email protected]>
AuthorDate: Tue Aug 28 09:01:18 2018 -0400
additional component changes
---
.../apache/sling/cms/core/models/BaseField.java | 46 ++++++++
ui/src/main/frontend/src/js/scripts.js | 18 ++-
ui/src/main/frontend/src/scss/_grid.scss | 125 ---------------------
ui/src/main/frontend/src/scss/form.scss | 75 -------------
ui/src/main/frontend/src/scss/index.scss | 105 -----------------
ui/src/main/frontend/src/scss/styles.scss | 42 -------
.../sling-cms/components/cms/getform/getform.jsp | 4 +-
.../components/editor/fields/base/base.jsp | 10 +-
.../components/editor/fields/file/field.jsp | 4 +-
.../sling-cms/components/editor/fields/path.json | 3 +-
.../components/editor/fields/path/field.jsp | 36 ------
.../components/editor/fields/path/path.jsp | 65 +++++++++++
.../components/editor/fields/repeating/field.jsp | 4 +-
.../components/editor/fields/select/field.jsp | 2 +-
.../components/editor/fields/text/field.jsp | 2 +-
.../components/editor/fields/textarea/field.jsp | 2 +-
.../components/editor/slingform/slingform.jsp | 6 +-
.../libs/sling-cms/components/pages/base/body.jsp | 4 +-
.../libs/sling-cms/components/pages/error/nav.jsp | 19 ++--
19 files changed, 148 insertions(+), 424 deletions(-)
diff --git a/core/src/main/java/org/apache/sling/cms/core/models/BaseField.java
b/core/src/main/java/org/apache/sling/cms/core/models/BaseField.java
new file mode 100644
index 0000000..526dadc
--- /dev/null
+++ b/core/src/main/java/org/apache/sling/cms/core/models/BaseField.java
@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+package org.apache.sling.cms.core.models;
+
+import javax.inject.Inject;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.models.annotations.Default;
+import org.apache.sling.models.annotations.Model;
+
+@Model(adaptables = SlingHttpServletRequest.class)
+public class BaseField {
+
+ @Inject
+ private boolean required;
+
+ @Inject
+ private boolean disabled;
+
+ @Inject
+ @Default(values="")
+ private String label;
+
+ public boolean getRequired() {
+ return required;
+ }
+
+ public boolean getDisabled() {
+ return disabled;
+ }
+
+}
diff --git a/ui/src/main/frontend/src/js/scripts.js
b/ui/src/main/frontend/src/js/scripts.js
index 4d4bd92..37c48b6 100644
--- a/ui/src/main/frontend/src/js/scripts.js
+++ b/ui/src/main/frontend/src/js/scripts.js
@@ -47,23 +47,21 @@ Sling.CMS = {
window.scrollTo(0, 0);
},
confirmMessage: function(title, message, cb){
- var $modal = $('<div class="Modal"><div
class="Modal-Content Draggable"><div class="Modal-Header">'+title+'</div><div
class="Modal-Body">'+message+'</div><div class="Modal-Footer"><button
type="button" class="Modal-Close">OK</button></div></div>');
+ var $modal = $('<div class="modal"><div
class="modal-background"></div><div class="modal-card"><div
class="modal-card-head Draggable">'+title+'</div><div
class="modal-card-body">'+message+'</div><div class="Modal-Footer"><button
type="button" class="modal-close">OK</button></div></div>');
$('body').append($modal);
- $modal.css('display','block');
- Sling.CMS.decorate($modal);
- $modal.find('.Modal-Close').click(function(){
+ $modal.addClass('is-active');
+ $modal.find('.modal-close').click(function(){
$modal.css('display','none').remove();
cb();
});
return $modal;
},
fetchModal: function(title, link, path, complete){
- var $modal = $('<div class="Modal"><div
class="Modal-Content Draggable"><div class="Modal-Header">'+title+'<button
type="button" class="Modal-Close Pull-Right">x</button></div><div
class="Modal-Body"></div></div>');
+ var $modal = $('<div class="modal"><div
class="modal-background"></div><div class="modal-card Draggable"><div
class="modal-card-head">'+title+'<button type="button"
class="modal-close">x</button></div><div
class="modal-card-body""></div></div>');
$('body').append($modal);
- $modal.find('.Modal-Body').load(link + " "
+path,function(){
- $modal.css('display','block');
- Sling.CMS.decorate($modal);
-
$modal.find('.Modal-Close').click(function(){
+ $modal.addClass('is-active');
+ $modal.find('.modal-card-body').load(link + " "
+path,function(){
+
$modal.find('.modal-close').click(function(){
$modal.css('display','none').remove();
return false;
});
@@ -233,7 +231,7 @@ Sling.CMS = {
// mouse button down over the element
element.addEventListener('mousedown',
function(evt){
console.log('mousedown');
-
if(document.querySelector('.Modal-Body').contains(evt.target)){
+
if(document.querySelector('.modal-body').contains(evt.target)){
return;
}
mouseX = evt.clientX;
diff --git a/ui/src/main/frontend/src/scss/_grid.scss
b/ui/src/main/frontend/src/scss/_grid.scss
deleted file mode 100755
index 267360e..0000000
--- a/ui/src/main/frontend/src/scss/_grid.scss
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * 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.
- */
-@mixin Cell ($size) {
- // Specific sizing for cells in 5% increments.
- .Cell {
- @for $i from 1 through 20 {
- &.#{$size}-#{$i*5} {
- flex: 0 0 #{$i*5}#{'%'};
- }
- }
- }
-}
-
-@mixin Fit ($size) {
- // Proportionally space cells rather than wrapping
- &.Fit-#{$size} {
- >.Cell {
- -webkit-box-flex: 1;
- -webkit-flex: 1;
- -ms-flex: 1;
- flex: 1;
- }
- }
-}
-
-// Default grid behavior
-.Grid {
- display: flex;
- flex-wrap: wrap;
- justify-content: center;
-
- // Add gutters to a grid
- &.Gutter {
- margin: 0 -1rem 0 -1rem;
-
- >.Cell {
- padding: 0 1rem 0 1rem;
- }
- }
-
- // Grid Vertical Alignment
- &.Align-Top {
- align-items: flex-start;
- }
- &.Align-Bottom {
- align-items: flex-end;
- }
- &.Align-Center {
- align-items: center;
- }
-
- // Default cell behavior
- .Cell {
- // Cell sizing, full-width by default for responsive
- -webkit-box-flex: 0;
- -webkit-flex: 0 0 100%;
- -ms-flex: 0 0 100%;
- flex: 0 0 100%;
-
- // Per Cell Alignment
- &.Align-Top {
- align-self: flex-start;
- }
- &.Align-Bottom {
- align-self: flex-end;
- }
- &.Align-Center {
- align-self: center;
- }
- }
-
- $display-size: "Mobile";
- @include Fit($display-size);
- @include Cell($display-size);
-}
-
-// Small devices (Landscape phones, 544px)
-@media (min-width: 34em) {
- .Grid {
- $display-size: "Small";
- @include Fit($display-size);
- @include Cell($display-size);
- }
-}
-
-// Medium devices (Tablets, 768px)
-@media (min-width: 48em) {
- .Grid {
- $display-size: "Medium";
- @include Fit($display-size);
- @include Cell($display-size);
- }
-}
-
-// Large devices (Desktops, 992px)
-@media (min-width: 62em) {
- .Grid {
- $display-size: "Large";
- @include Cell($display-size);
- @include Fit($display-size);
- }
-}
-
-// Extra large devices (Large desktops, 1200px)
-@media (min-width: 75em) {
- .Grid {
- $display-size: "Extra";
- @include Cell($display-size);
- @include Fit($display-size);
- }
-}
\ No newline at end of file
diff --git a/ui/src/main/frontend/src/scss/form.scss
b/ui/src/main/frontend/src/scss/form.scss
deleted file mode 100755
index 2c281e1..0000000
--- a/ui/src/main/frontend/src/scss/form.scss
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * 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.
- */
-
-fieldset {
- background-color: #f9f9f9;
- border: 1px solid #ccc;
-}
-
-input[type="submit"],
-input[type="reset"],
-input[type="button"],
-button {
- display: inline-block;
- padding: 8px 12px;
- color: white;
- background-color: #00678c;
- border: 0;
-}
-
-
-input[type="submit"]:disabled,
-input[type="reset"]:disabled,
-input[type="button"]:disabled,
-button:disabled {
- background-color: gray;
-}
-
-input,
-select,
-textarea {
- border: 1px solid #ccc;
- box-shadow: inset 0 .5px .5px #ccc;
- background-color: #fff;
- border-radius: 1px;
- vertical-align: middle;
- padding: 0.5em 0.6em;
- margin-bottom: 1em;
- width: 100%;
- height: 32px;
-}
-
-input:disabled,
-select:disabled,
-textarea:disabled {
- background-color: #e2e2e2;
-}
-
-input[type="checkbox"] {
- border: 0;
- box-shadow: none;
- width: 20px;
-}
-
-
-textarea {
- height: 200px;
-}
-
-.error {
- color:red;
-}
\ No newline at end of file
diff --git a/ui/src/main/frontend/src/scss/index.scss
b/ui/src/main/frontend/src/scss/index.scss
index 105ff9b..0edfa12 100755
--- a/ui/src/main/frontend/src/scss/index.scss
+++ b/ui/src/main/frontend/src/scss/index.scss
@@ -15,108 +15,3 @@
* limitations under the License.
*/
@import 'fonts';
-@import 'grid';
-
-* {
- box-sizing: border-box;
-}
-
-body {
- margin: 0;
- font-family: 'Open Sans', Helvetica, Arial;
- font-weight: 300;
- color: rgb(128,128,128);
- position: relative;
- height: 100%;
-}
-
-h1 {
- font-weight: 300;
- font-size: 2.4em;
- color: rgb(96,96,96);
-}
-
-h2 {
- font-weight: 400;
- font-size: 2em;
- color: rgb(96,96,96);
-}
-
-p {
- line-height: 1.8em;
-}
-
-a {
- color: rgb(0,103,140);
- text-decoration: none;
-
- &:hover {
- text-decoration: underline;
- }
-
- img {
- border: none;
- }
-}
-
-.Home-Grid {
- min-height: 100%;
-
- .Gradient {
- flex: 0 0 100%;
- height: 16px;
- background: url('../img/gradient.jpg') no-repeat;
- background-size: cover;
-
- @media (min-width: 48em) {
- flex: 0 0 16px;
- height: auto;
- }
- }
-
- .Logos {
- padding: 10% 20% 2% 20%;
-
- @media (min-width: 48em) {
- padding: 6%;
- }
- }
-
- #sling-logo {
- display: block;
- margin-bottom: 32px;
- margin-right: -8%; // Account for the TM offset
-
- @media (min-width: 48em) {
- margin-bottom: 180px;
- }
- }
-
- #asf-logo {
- display: block;
- }
-
- .Main-Content {
- padding: 0 16px;
-
- @media (min-width: 48em) {
- padding: 0 16px 0 0;
- }
-
- @media (min-width: 62em) {
- padding: 0;
- }
- }
-
- ul {
- margin: 0;
- padding: 0;
- list-style: none;
- line-height: 1.8em;
- margin-bottom: 1em;
- }
-
- #Logout {
- display: none;
- }
-}
\ No newline at end of file
diff --git a/ui/src/main/frontend/src/scss/styles.scss
b/ui/src/main/frontend/src/scss/styles.scss
index 3571d06..c56b4a1 100644
--- a/ui/src/main/frontend/src/scss/styles.scss
+++ b/ui/src/main/frontend/src/scss/styles.scss
@@ -22,52 +22,10 @@
.autocomplete-suggestion b {
color: #00678c;
}
-.Col-id {
- width: 2em;
-}
-
.Hide {
display:none;
}
-.Modal {
- display: none;
- position: fixed;
- z-index: 1002;
- left: 0;
- top: 0;
- width: 100%;
- height: 100%;
- overflow: auto;
- background-color: rgb(0,0,0);
- background-color: rgba(0,0,0,0.3);
-}
-
-.Modal-Body {
- padding: 0 2em 1em 2em;
-}
-
-.Modal-Content {
- background-color: white;
- margin: 5em auto;
- border: 1px solid #999;
- width: 95%;
- max-width: 700px;
- position: relative;
-}
-
-.Modal-Footer {
- padding: 1em;
-}
-
-.Modal-Header {
- font-weight: bold;
- font-size: large;
- padding: 1em;
- cursor: move;
-}
-
-
.note-group-select-from-files {
display: none;
}
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/getform/getform.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/getform/getform.jsp
index 1984464..b61d585 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/getform/getform.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/getform/getform.jsp
@@ -27,7 +27,7 @@
</c:otherwise>
</c:choose>
<form method="get" action="${action}" class="Get-Form"
data-target="${properties.target}" data-load="${properties.load}">
- <fieldset class="Form-Ajax__wrapper">
+ <div class="Form-Ajax__wrapper">
<input type="hidden" name="_charset_" value="utf-8" />
<sling:include path="fields"
resourceType="sling-cms/components/general/container" />
<div class="Field-Group">
@@ -35,5 +35,5 @@
<sling:encode value="${properties.button}"
mode="HTML" />
</button>
</div>
- </fieldset>
+ </div>
</form>
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/base/base.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/base/base.jsp
index bdc0c01..e26e016 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/base/base.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/base/base.jsp
@@ -37,14 +37,14 @@
<c:set var="disabled" value="" scope="request" />
</c:otherwise>
</c:choose>
-<div class="Field-Group">
+<div class="field">
<c:if test="${not empty properties.label}">
- <label for="${properties.name}">
+ <label class="label" for="${properties.name}">
<sling:encode value="${properties.label}" mode="HTML" />
<c:if test="${properties.required}"><span
class="error">*</span></c:if>
</label>
</c:if>
- <div class="Field-Input">
- <sling:call script="field.jsp" />
- </div>
+ <div class="control">
+ <sling:call script="field.jsp" />
+ </div>
</div>
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/file/field.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/file/field.jsp
index 0c8b12c..814f488 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/file/field.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/file/field.jsp
@@ -26,7 +26,7 @@
</c:otherwise>
</c:choose>
<div class="repeating">
- <fieldset disabled="disabled" class="repeating__template Hide">
+ <div disabled="disabled" class="repeating__template Hide">
<div class="repeating__item Grid">
<div class="Cell Mobile-80">
<input type="file" name="${properties.name}"
${required} accept="${accepts}" />
@@ -35,7 +35,7 @@
<button class="repeating__remove">-</button>
</div>
</div>
- </fieldset>
+ </div>
<div class="repeating__container">
<div class="repeating__item Grid">
<div class="Cell Mobile-80">
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path.json
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path.json
index b061241..87a0fc2 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path.json
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path.json
@@ -1,4 +1,3 @@
{
- "jcr:primaryType": "sling:Component",
- "sling:resourceSuperType" : "sling-cms/components/editor/fields/base"
+ "jcr:primaryType": "sling:Component"
}
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/field.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/field.jsp
deleted file mode 100644
index baf2036..0000000
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/field.jsp
+++ /dev/null
@@ -1,36 +0,0 @@
-<%-- /*
- * 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"%>
-<c:choose>
- <c:when test="${properties.hidesearch != true}">
- <div class="Grid">
- <div class="Cell Mobile-80">
- <input class="Field-Path" type="text"
name="${properties.name}" value="${editProperties[properties.name]}"
${required} ${disabled} data-type="${properties.type}"
data-base="${properties.basePath}" autocomplete="off" />
- </div>
- <div class="Cell Mobile-20">
- <a href="/cms/shared/search.html" class="Button
Fetch-Modal Search-Button" data-title="Search" data-path=".Main-Content > .Grid
> .Cell > *">
- <span class="jam jam-search"></span>
- </a>
- </div>
- </div>
- </c:when>
- <c:otherwise>
- <input class="Field-Path" type="text" name="${properties.name}"
value="${editProperties[properties.name]}" ${required} ${disabled}
data-type="${properties.type}" data-base="${properties.basePath}"
autocomplete="off" />
- </c:otherwise>
-</c:choose>
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/path.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/path.jsp
new file mode 100644
index 0000000..9209777
--- /dev/null
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/path.jsp
@@ -0,0 +1,65 @@
+<%-- /*
+ * 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"%>
+<c:if test="${slingRequest.requestPathInfo.suffix != null}">
+ <sling:getResource path="${slingRequest.requestPathInfo.suffix}"
var="editedResource" />
+ <c:set var="editProperties"
value="${sling:adaptTo(editedResource,'org.apache.sling.api.resource.ValueMap')}"
scope="request"/>
+</c:if>
+<c:choose>
+ <c:when test="${properties.required}">
+ <c:set var="required" value="required='required'" scope="request" />
+ </c:when>
+ <c:otherwise>
+ <c:set var="required" value="" scope="request" />
+ </c:otherwise>
+</c:choose>
+<c:choose>
+ <c:when test="${properties.disabled}">
+ <c:set var="disabled" value="disabled='disabled'" scope="request" />
+ </c:when>
+ <c:otherwise>
+ <c:set var="disabled" value="" scope="request" />
+ </c:otherwise>
+</c:choose>
+<c:if test="${not empty properties.label}">
+ <label class="label" for="${properties.name}">
+ <sling:encode value="${properties.label}" mode="HTML" />
+ <c:if test="${properties.required}"><span class="error">*</span></c:if>
+ </label>
+</c:if>
+<div class="field has-addons">
+<c:choose>
+ <c:when test="${properties.hidesearch != true}">
+ <div class="control">
+ <input class="Field-Path input" type="text"
name="${properties.name}" value="${editProperties[properties.name]}"
${required} ${disabled} data-type="${properties.type}"
data-base="${properties.basePath}" autocomplete="off" />
+ </div>
+ <div class="control">
+ <a href="/cms/shared/search.html" class="Button Fetch-Modal
Search-Button" data-title="Search" data-path=".Main-Content > .Grid > .Cell >
*">
+ <span class="jam jam-search"></span>
+ </a>
+ </div>
+ </c:when>
+ <c:otherwise>
+ <div class="control">
+ <input class="Field-Path" type="text" name="${properties.name}"
value="${editProperties[properties.name]}" ${required} ${disabled}
data-type="${properties.type}" data-base="${properties.basePath}"
autocomplete="off" />
+ </div>
+ </c:otherwise>
+</c:choose>
+
+</div>
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
index 45f3431..26401fe 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/repeating/field.jsp
@@ -18,7 +18,7 @@
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
<div class="repeating">
- <fieldset disabled="disabled" class="repeating__template Hide">
+ <div disabled="disabled" class="repeating__template Hide">
<div class="repeating__item Grid">
<div class="Cell Mobile-80">
<input type="${properties.type}" value=""
name="${properties.name}" ${required} ${disabled} />
@@ -27,7 +27,7 @@
<button class="repeating__remove">-</button>
</div>
</div>
- </fieldset>
+ </div>
<div class="repeating__container">
<c:forEach var="value"
items="${editProperties[properties.name]}">
<div class="repeating__item Grid">
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/select/field.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/select/field.jsp
index 9e61058..fda824a 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/select/field.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/select/field.jsp
@@ -20,7 +20,7 @@
<c:if test="${properties.multiple == true}">
<c:set var="multiple" value="multiple = \"multiple\"" />
</c:if>
-<select class="form-control" name="${properties.name}" ${required} ${disabled}
${multiple}>
+<select class="form-control" class="select" name="${properties.name}"
${required} ${disabled} ${multiple}>
<c:choose>
<c:when test="${not empty properties.options}">
<c:forEach var="option" items="${properties.options}">
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/text/field.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/text/field.jsp
index e922110..ce757de 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/text/field.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/text/field.jsp
@@ -17,4 +17,4 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<input type="${not empty properties.type ? properties.type : 'text'}"
name="${properties.name}" value="${not empty editProperties[properties.name] ?
editProperties[properties.name] : properties.defaultValue}" ${required}
${disabled} />
\ No newline at end of file
+<input type="${not empty properties.type ? properties.type : 'text'}"
class="input" name="${properties.name}" value="${not empty
editProperties[properties.name] ? editProperties[properties.name] :
properties.defaultValue}" ${required} ${disabled} />
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/textarea/field.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/textarea/field.jsp
index c0d2aef..94a2db0 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/textarea/field.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/textarea/field.jsp
@@ -17,4 +17,4 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<textarea name="${properties.name}" ${required} ${disabled}>${not empty
editProperties[properties.name] ? editProperties[properties.name] :
properties.defaultValue}</textarea>
\ No newline at end of file
+<textarea class="textarea" name="${properties.name}" ${required}
${disabled}>${not empty editProperties[properties.name] ?
editProperties[properties.name] : properties.defaultValue}</textarea>
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp
index dd14a96..0621b52 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/slingform/slingform.jsp
@@ -18,13 +18,13 @@
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
<form method="post"
action="${slingRequest.requestPathInfo.suffix}${properties.actionSuffix}"
enctype="multipart/form-data" class="Form-Ajax"
data-add-date="${properties.addDate != false}">
- <fieldset class="Form-Ajax__wrapper">
+ <div class="Form-Ajax__wrapper field">
<input type="hidden" name="_charset_" value="utf-8" />
<sling:include path="fields"
resourceType="sling-cms/components/general/container" />
<div class="Field-Group">
- <button type="submit" class="btn btn-success"
title="<sling:encode value="${properties.button}" mode="HTML_ATTR" />">
+ <button type="submit" class="button is-primary"
title="<sling:encode value="${properties.button}" mode="HTML_ATTR" />">
<sling:encode value="${properties.button}"
mode="HTML" />
</button>
</div>
- </fieldset>
+ </div>
</form>
\ No newline at end of file
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/body.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/body.jsp
index 51770c1..4ab02b6 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/body.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/body.jsp
@@ -17,7 +17,7 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<body class="layout-documentation page-components">
+<body class="cms">
<section class="container is-fluid">
<sling:call script="nav.jsp" />
</section>
@@ -29,7 +29,7 @@
<sling:include path="/mnt/overlay/sling-cms/content/start/jcr:content/nav"
resourceType="sling-cms/components/general/container" />
</div>
<div class="column">
- <main>
+ <main class="Main-Content">
<sling:call script="content.jsp" />
</main>
</div>
diff --git
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/nav.jsp
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/nav.jsp
index cc94304..89c9e57 100644
---
a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/nav.jsp
+++
b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/error/nav.jsp
@@ -17,14 +17,13 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<a class="Cell-Pad" href="https://sling.apache.org"; target="_blank"
title="Visit the Apache Sling website">
- <img src="/content/starter/img/sling-logo.svg" alt="Apache Sling Logo"/>
+<nav class="navbar" role="navigation" aria-label="main mavigation">
+<div class="navbar-brand">
+<a class="navbar-item" href="http://sling.apache.org"; >
+ <img src="/static/clientlibs/sling-cms/img/sling-logo.svg" width="100"
alt="Apache Sling"/>
</a>
-<h1>
- <a href="/cms/start.html">
- CMS
- </a>
-</h1>
-<a class="Cell-Pad" href="https://apache.org"; target="_blank" id="asf-logo"
title="Visit the Apache Software Foundation website">
- <img src="/content/starter/img/asf-logo.svg" alt="Apache Software
Foundation Logo">
-</a>
\ No newline at end of file
+<a href="/cms/start.html" class="navbar-item" title="CMS Home"><span
class="icon"><i class="jam jam-home-f"></i></span></a>
+</div>
+<div class="navbar-menu">
+</div>
+</nav>
\ No newline at end of file
