You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by je...@apache.org on 2018/08/27 15:22:05 UTC
[sling-org-apache-sling-app-cms] branch SLING-7858 updated (de91b9e
-> 7e621f7)
This is an automated email from the ASF dual-hosted git repository.
jeb pushed a change to branch SLING-7858
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from de91b9e Merge branch 'SLING-7858' of https://github.com/apache/sling-org-apache-sling-app-cms.git into SLING-7858
new be68da9 initial changes to support bulma
new 7e621f7 component changes to support bulma
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ui/src/main/frontend/src/js/scripts.js | 6 +-
ui/src/main/frontend/src/scss/bulma.scss | 3 +
ui/src/main/frontend/src/scss/styles.scss | 144 ---------------------
.../components/cms/columns/publish/publish.jsp | 10 +-
.../cms/contentactions/contentactions.jsp | 13 +-
.../cms/contentbreadcrumb/contentbreadcrumb.jsp | 56 ++++----
.../components/cms/contentnav/contentnav.jsp | 62 ++++-----
.../components/cms/contenttable/contenttable.jsp | 74 +++++------
.../components/cms/staticnav/staticnav.jsp | 20 +--
.../libs/sling-cms/components/pages/base/body.jsp | 36 +++---
.../libs/sling-cms/components/pages/base/nav.jsp | 28 ++--
.../libs/sling-cms/content/site/sites.json | 2 +
12 files changed, 168 insertions(+), 286 deletions(-)
[sling-org-apache-sling-app-cms] 02/02: component changes to
support bulma
Posted by je...@apache.org.
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
commit 7e621f73cc2d6e77d4b0c12f4db1441673007fe7
Author: Jason E Bailey <je...@apache.org>
AuthorDate: Mon Aug 27 09:48:33 2018 -0400
component changes to support bulma
---
ui/src/main/frontend/src/js/scripts.js | 6 +-
ui/src/main/frontend/src/scss/bulma.scss | 3 +
ui/src/main/frontend/src/scss/styles.scss | 144 ---------------------
.../components/cms/columns/publish/publish.jsp | 10 +-
.../cms/contentactions/contentactions.jsp | 13 +-
.../cms/contentbreadcrumb/contentbreadcrumb.jsp | 15 ++-
.../components/cms/contenttable/contenttable.jsp | 2 +-
.../libs/sling-cms/components/pages/base/nav.jsp | 8 +-
.../libs/sling-cms/content/site/sites.json | 2 +
9 files changed, 32 insertions(+), 171 deletions(-)
diff --git a/ui/src/main/frontend/src/js/scripts.js b/ui/src/main/frontend/src/js/scripts.js
index ca3ecfa..4d4bd92 100644
--- a/ui/src/main/frontend/src/js/scripts.js
+++ b/ui/src/main/frontend/src/js/scripts.js
@@ -451,9 +451,9 @@ Sling.CMS = {
Sling.CMS.ext['table'] = {
decorate: function($ctx) {
$ctx.find('table tr').click(function(el){
- $('#Actions-Target > *').appendTo('tr.active .Cell-Actions')
- $('tr').removeClass('active');
- $(this).addClass('active');
+ $('#Actions-Target > *').appendTo('tr.is-selected .Cell-Actions')
+ $('tr').removeClass('is-selected');
+ $(this).addClass('is-selected');
$(this).find('.Cell-Actions > *').appendTo('#Actions-Target')
});
}
diff --git a/ui/src/main/frontend/src/scss/bulma.scss b/ui/src/main/frontend/src/scss/bulma.scss
index d3dde18..33790c6 100644
--- a/ui/src/main/frontend/src/scss/bulma.scss
+++ b/ui/src/main/frontend/src/scss/bulma.scss
@@ -15,4 +15,7 @@
* limitations under the License.
*/
@charset "utf-8";
+$navbar-height: 5rem;
+$navbar-item-img-max-height: 4rem;
+
@import "../../node_modules/bulma/bulma.sass";
diff --git a/ui/src/main/frontend/src/scss/styles.scss b/ui/src/main/frontend/src/scss/styles.scss
index e576a4e..3571d06 100644
--- a/ui/src/main/frontend/src/scss/styles.scss
+++ b/ui/src/main/frontend/src/scss/styles.scss
@@ -18,83 +18,18 @@
*/
- a.Button {
- display: inline-block;
- padding: 8px 12px;
- color: white;
- background-color: #00678c;
- border: 0;
- margin: .1em;
- text-decoration: none;
- height: 38px;
- min-width: 38px;
- text-align: center;
-}
.autocomplete-suggestion b {
color: #00678c;
}
-
-ul.Breadcrumb {
- margin-top: 2em;
- margin-bottom: .2em;
-}
-
-.Breadcrumb li {
- display: inline-block;
-}
-
-.Breadcrumb li:after {
- content: ">";
-}
-
-.Breadcrumb li:last-child:after {
- content: "";
-}
-
-.Checkbox-Label {
- width:100%;
- display:block;
-}
-
-.Cell-Pad {
- padding: 4em 1em 1em 1em;
-}
-
.Col-id {
width: 2em;
}
-
-.Editor-Page {
- background-color: white;
-}
-
-.Editor-Page form {
- padding: 1em;
-}
-
-.Field-Group {
- margin: 1em 0;
-}
-
-.Field-Input a.Button {
- height: 30px;
- padding: 8px 9px;
-}
-
-.Field-Input .jam:before {
- font-size: 12px;
-}
-
.Hide {
display:none;
}
-.jam:before {
- font-size:18px;
-}
-
.Modal {
display: none;
position: fixed;
@@ -132,32 +67,6 @@ ul.Breadcrumb {
cursor: move;
}
-.Nav-Header {
- font-weight: bold;
- padding: .2em 0;
-}
-
-.Nav-Item {
- border-bottom: 1px solid silver;
- padding: .2em;
-}
-
-.Nav-Item:last-child {
- border-bottom: none;
-}
-
-.Nav-Item a {
- display: inline-block;
- width: 100%;
-}
-
-.Nav-Item a:hover {
- text-decoration: none;
-}
-
-.Nav-Item:hover, .Nav-Item.Active {
- background-color: #ccc;
-}
.note-group-select-from-files {
display: none;
@@ -193,56 +102,3 @@ ul.Breadcrumb {
background-color: #f9f9f9;
padding: .5em;
}
-
-table {
- table-layout: fixed;
- width: 100%;
- white-space: nowrap;
- border-spacing: 0;
- border-collapse: separate;
-}
-
-table td, table th {
- padding: .2em;
- white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
-}
-
-td.Cell-Actions {
- white-space: normal;
- overflow: auto;
-}
-
-thead {
- text-align: left;
- background-color: #999;
- color: white;
-}
-
-tbody tr:hover, tbody tr.active {
- background-color: lightgray;
-}
-
-@media (min-width: 62em) {
-
- .Col-lastModified {
- width: 13em;
- }
-
- .Col-published {
- width: 6em;
- }
-
- .Col-type {
- width: 4em;
- }
-
- .Content-Actions {
- background-color: #ccc;
- padding: .5em;
- position: fixed;
- top: 0px;
- width: 100%;
- }
-}
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp
index 427e240..c771788 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/publish/publish.jsp
@@ -17,16 +17,16 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<td class="Cell-Publish" data-value="${sling:getRelativeResource(resource,'jcr:content').valueMap.published ? 0 : 1}">
+<td data-value="${sling:getRelativeResource(resource,'jcr:content').valueMap.published ? 0 : 1}">
<c:choose>
<c:when test="${sling:getRelativeResource(resource,'jcr:content').valueMap.published}">
- <a class="Button Fetch-Modal" href="/cms/shared/unpublish.html${resource.path}" title="Content Published" data-title="Unpublish" data-path=".Main-Content form">
- ✓
+ <a class="button is-success is-outlined Fetch-Modal" href="/cms/shared/unpublish.html${resource.path}" title="Content Published" data-title="Unpublish" data-path=".Main-Content form">
+ <i class="jam jam-check"></i>
</a>
</c:when>
<c:otherwise>
- <a class="Button Fetch-Modal" href="/cms/shared/publish.html${resource.path}" title="Content Not Published" data-title="Publish" data-path=".Main-Content form">
- ✗
+ <a class="button is-warning is-outlined Fetch-Modal" href="/cms/shared/publish.html${resource.path}" title="Content Not Published" data-title="Publish" data-path=".Main-Content form">
+ <i class="jam jam-check"></i>
</a>
</c:otherwise>
</c:choose>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentactions/contentactions.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentactions/contentactions.jsp
index 7558810..a1c7aee 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentactions/contentactions.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentactions/contentactions.jsp
@@ -17,10 +17,11 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
- <div class="Content-Actions">
- <c:forEach var="action" items="${sling:listChildren(sling:getRelativeResource(resource,'actions'))}" varStatus="status">
- <c:if test="${!status.first}"> | </c:if><a class="Button Fetch-Modal" data-title="Add ${action.valueMap.label}" data-path=".Main-Content form" href="${action.valueMap.prefix}${slingRequest.requestPathInfo.suffix}">+ ${action.valueMap.label}</a>
- </c:forEach>
- <span id="Actions-Target">
- </span>
+ <%@include file="/libs/sling-cms/global.jsp"%>
+ <div class="buttons has-addons">
+ <c:forEach var="action" items="${sling:listChildren(sling:getRelativeResource(resource,'actions'))}" varStatus="status">
+ <a class="button Fetch-Modal" data-title="Add ${action.valueMap.label}" data-path=".Main-Content form" href="${action.valueMap.prefix}${slingRequest.requestPathInfo.suffix}">+ ${action.valueMap.label}</a>
+ </c:forEach>
+ <span id="Actions-Target">
+ </span>
</div>
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp
index 4e7d055..1c31382 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp
@@ -18,7 +18,7 @@
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
<sling:getParent resource="${slingRequest.requestPathInfo.suffixResource}" var="root" level="${resource.valueMap.depth}" />
-<span class="breadcrumb has-bullet-separator" aria-label="breadcrumbs">
+<nav class="breadcrumb" aria-label="breadcrumbs">
<ul>
<li>
<a href="${resource.valueMap.prefix}${root.path}">
@@ -41,10 +41,11 @@
</a>
</li>
</c:if>
- <li>
- <form method="get" class="content-filter">
- <label for="filter" class="Hide">Filter</label>
- <input type="text" placeholder="Filter..." />
- </form>
- </li>
</ul>
+<a href="#">
+<form method="get" class="content-filter">
+ <label for="filter" class="Hide">Filter</label>
+ <input type="text" placeholder="Filter..." />
+</form>
+</a>
+</nav>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
index 9a19fdf..ef4c5ba 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
@@ -17,7 +17,7 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<table class="sortable table">
+<table class="sortable table is-fullwidth is-striped">
<thead>
<tr>
<th class="sortable__header Col-id" data-attribute="id">
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
index af0aea5..36aefb8 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
@@ -20,11 +20,9 @@
<nav class="navbar" role="navigation" aria-label="main mavigation">
<div class="navbar-brand">
<a class="navbar-item" href="http://sling.apache.org" >
- <img style="max-height:2rem" src="/static/clientlibs/sling-cms/img/sling-logo.svg" width="100" alt="Apache Sling"/>
+ <img src="/static/clientlibs/sling-cms/img/sling-logo.svg" width="100" alt="Apache Sling"/>
</a>
-<h1 class="navbar-item">
- <a href="/cms/start.html" title="CMS Home"><span class="icon"><i class="jam jam-home-f"></i></span></a>
-</h1>
+<a href="/cms/start.html" class="navbar-item" title="CMS Home"><span class="icon"><i class="jam jam-home-f"></i></span></a>
<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false">
<span aria-hidden="true"></span>
<span aria-hidden="true"></span>
@@ -33,7 +31,7 @@
</div>
<div class="navbar-menu">
<div class="navbar-end">
-<a class="navbar-item " href="/system/sling/logout" title="Logout of Apache Sling CMS"><i class="jam jam-log-out"></i><span> ${resourceResolver.userID}</span></a>
+<a class="navbar-item " href="/system/sling/logout" title="Logout of Apache Sling CMS"><span>${resourceResolver.userID} </span><i class="jam jam-log-out"></i></a>
</div>
</div>
</nav>
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json
index aa2f56d..dc5b53c 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/site/sites.json
@@ -14,11 +14,13 @@
"page": {
"jcr:primaryType": "nt:unstructured",
"label": "Site",
+ "icon" : "jam jam-document",
"prefix": "/cms/site/create.html"
},
"folder": {
"jcr:primaryType": "nt:unstructured",
"label": "Site Group",
+ "icon" : "jam jam-document-f",
"prefix": "/cms/site/creategroup.html"
}
}
[sling-org-apache-sling-app-cms] 01/02: initial changes to support
bulma
Posted by je...@apache.org.
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
commit be68da91d683b318d42a36465ee5945ffb31d920
Author: JE Bailey <ja...@sas.com>
AuthorDate: Mon Aug 27 08:52:24 2018 -0400
initial changes to support bulma
---
.../cms/contentbreadcrumb/contentbreadcrumb.jsp | 55 ++++++++--------
.../components/cms/contentnav/contentnav.jsp | 62 +++++++++---------
.../components/cms/contenttable/contenttable.jsp | 74 +++++++++++-----------
.../components/cms/staticnav/staticnav.jsp | 20 +++---
.../libs/sling-cms/components/pages/base/body.jsp | 36 ++++++-----
.../libs/sling-cms/components/pages/base/nav.jsp | 28 +++++---
6 files changed, 148 insertions(+), 127 deletions(-)
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp
index 651fc93..4e7d055 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentbreadcrumb/contentbreadcrumb.jsp
@@ -18,30 +18,33 @@
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
<sling:getParent resource="${slingRequest.requestPathInfo.suffixResource}" var="root" level="${resource.valueMap.depth}" />
-<ul class="Breadcrumb">
- <li class="Breadcrumb-Item">
- <a href="${resource.valueMap.prefix}${root.path}">
- <sling:encode value="${root.valueMap['jcr:title'] != null ? root.valueMap['jcr:title'] : root.valueMap['jcr:content/jcr:title']}" default="${root.name}" mode="HTML" />
- </a>
- </li>
- <c:if test="${site.path != slingRequest.requestPathInfo.suffix && site.path != slingRequest.requestPathInfo.suffixResource.parent.path}">
- <c:forEach var="parent" items="${sling:getParents(slingRequest.requestPathInfo.suffixResource,(resource.valueMap.depth + 1))}">
- <li class="Breadcrumb-Item">
- <a href="${resource.valueMap.prefix}${parent.path}">
- <sling:encode value="${parent.valueMap['jcr:title'] != null ? parent.valueMap['jcr:title'] : parent.valueMap['jcr:content/jcr:title']}" default="${parent.name}" mode="HTML" />
- </a>
- </li>
- </c:forEach>
- </c:if>
- <c:if test="${root.path != slingRequest.requestPathInfo.suffix}">
- <li class="Breadcrumb-Item">
- <sling:encode value="${slingRequest.requestPathInfo.suffixResource.valueMap['jcr:title'] != null ? slingRequest.requestPathInfo.suffixResource.valueMap['jcr:title'] : slingRequest.requestPathInfo.suffixResource.valueMap['jcr:content/jcr:title']}" default="${slingRequest.requestPathInfo.suffixResource.name}" mode="HTML" />
- </li>
- </c:if>
- <li class="Pull-Right">
- <form method="get" class="content-filter">
- <label for="filter" class="Hide">Filter</label>
- <input type="text" placeholder="Filter..." />
- </form>
- </li>
+<span class="breadcrumb has-bullet-separator" aria-label="breadcrumbs">
+<ul>
+ <li>
+ <a href="${resource.valueMap.prefix}${root.path}">
+ <sling:encode value="${root.valueMap['jcr:title'] != null ? root.valueMap['jcr:title'] : root.valueMap['jcr:content/jcr:title']}" default="${root.name}" mode="HTML" />
+ </a>
+ </li>
+ <c:if test="${site.path != slingRequest.requestPathInfo.suffix && site.path != slingRequest.requestPathInfo.suffixResource.parent.path}">
+ <c:forEach var="parent" items="${sling:getParents(slingRequest.requestPathInfo.suffixResource,(resource.valueMap.depth + 1))}">
+ <li>
+ <a href="${resource.valueMap.prefix}${parent.path}">
+ <sling:encode value="${parent.valueMap['jcr:title'] != null ? parent.valueMap['jcr:title'] : parent.valueMap['jcr:content/jcr:title']}" default="${parent.name}" mode="HTML" />
+ </a>
+ </li>
+ </c:forEach>
+ </c:if>
+ <c:if test="${root.path != slingRequest.requestPathInfo.suffix}">
+ <li class="is-active">
+ <a href="#">
+ <sling:encode value="${slingRequest.requestPathInfo.suffixResource.valueMap['jcr:title'] != null ? slingRequest.requestPathInfo.suffixResource.valueMap['jcr:title'] : slingRequest.requestPathInfo.suffixResource.valueMap['jcr:content/jcr:title']}" default="${slingRequest.requestPathInfo.suffixResource.name}" mode="HTML" />
+ </a>
+ </li>
+ </c:if>
+ <li>
+ <form method="get" class="content-filter">
+ <label for="filter" class="Hide">Filter</label>
+ <input type="text" placeholder="Filter..." />
+ </form>
+ </li>
</ul>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentnav/contentnav.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentnav/contentnav.jsp
index d306ac4..71b693b 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentnav/contentnav.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contentnav/contentnav.jsp
@@ -18,33 +18,35 @@
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
<sling:findResources var="content" query="${properties.query}" language="JCR-SQL2" />
-<h3 class="Nav-Header Toggle-Hidden" data-target="#Nav-${fn:replace(properties.title,' ','-')}">${properties.title}</h3>
-<ul class="Nav ${fn:startsWith(slingRequest.requestURI, properties.prefix) ? '' : 'Hide'}" id="Nav-${fn:replace(properties.title,' ','-')}">
- <c:forEach var="item" items="${content}">
- <c:set var="prefixPath" value="${item.path}/" />
- <li class="Nav-Item ${(fn:startsWith(slingRequest.requestPathInfo.suffix, prefixPath) || slingRequest.requestPathInfo.suffix == item.path) ? 'Active' : ''}">
- <a href="${properties.itemPrefix}${item.path}" title="View ${item.valueMap['jcr:title']}">
- <c:choose>
- <c:when test="${sling:getRelativeResource(item,'jcr:content') != null}">
- <sling:encode value="${sling:getRelativeResource(item,'jcr:content').valueMap['jcr:title']}" mode="HTML" />
- </c:when>
- <c:when test="${not empty item.valueMap['jcr:title']}">
- <sling:encode value="${item.valueMap['jcr:title']}" mode="HTML" />
- </c:when>
- <c:otherwise>
- <sling:encode value="${item.name}" mode="HTML" />
- </c:otherwise>
- </c:choose>
- </a>
- </li>
- </c:forEach>
- <c:choose>
- <c:when test="${not empty properties.createTitle}">
- <c:set var="createTitle" value="${properties.createTitle}" />
- </c:when>
- <c:otherwise>
- <c:set var="createTitle" value="${properties.title}" />
- </c:otherwise>
- </c:choose>
- <li class="Nav-Item"><a href="${properties.createPath}" title="Create a new ${createTitle}" class="Fetch-Modal" data-title="Create ${createTitle}" data-path=".Main-Content form">+ ${createTitle}</a></li>
-</ul>
\ No newline at end of file
+<aside class="container is-fluid menu">
+<a class="menu-label Toggle-Hidden" data-target="#Nav-${fn:replace(properties.title,' ','-')}">${properties.title}</a>
+<ul class="menu-list ${fn:startsWith(slingRequest.requestURI, properties.prefix) ? '' : 'Hide'}" id="Nav-${fn:replace(properties.title,' ','-')}">
+ <c:forEach var="item" items="${content}">
+ <c:set var="prefixPath" value="${item.path}/" />
+ <li class="${(fn:startsWith(slingRequest.requestPathInfo.suffix, prefixPath) || slingRequest.requestPathInfo.suffix == item.path) ? 'is-active' : ''}">
+ <a href="${properties.itemPrefix}${item.path}" title="View ${item.valueMap['jcr:title']}">
+ <c:choose>
+ <c:when test="${sling:getRelativeResource(item,'jcr:content') != null}">
+ <sling:encode value="${sling:getRelativeResource(item,'jcr:content').valueMap['jcr:title']}" mode="HTML" />
+ </c:when>
+ <c:when test="${not empty item.valueMap['jcr:title']}">
+ <sling:encode value="${item.valueMap['jcr:title']}" mode="HTML" />
+ </c:when>
+ <c:otherwise>
+ <sling:encode value="${item.name}" mode="HTML" />
+ </c:otherwise>
+ </c:choose>
+ </a>
+ </li>
+ </c:forEach>
+ <c:choose>
+ <c:when test="${not empty properties.createTitle}">
+ <c:set var="createTitle" value="${properties.createTitle}" />
+ </c:when>
+ <c:otherwise>
+ <c:set var="createTitle" value="${properties.title}" />
+ </c:otherwise>
+ </c:choose>
+ <li><a href="${properties.createPath}" title="Create a new ${createTitle}" data-title="Create ${createTitle}" data-path=".Main-Content form"><span class="icon is-small"><i class="jam jam-plus"></i></a></li>
+</ul>
+</aside>
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
index 9b4d233..9a19fdf 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/contenttable/contenttable.jsp
@@ -17,41 +17,41 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<table class="sortable">
- <thead>
- <tr>
- <th class="sortable__header Col-id" data-attribute="id">
- #
- <span class="sortable__indicator"></span>
- </th>
- <c:forEach var="column" items="${sling:listChildren(sling:getRelativeResource(resource,'columns'))}">
- <th class="${column.name == 'actions' ? 'Hide' : '' } sortable__header Col-${column.name}" data-attribute="${column.name}">
- <sling:encode value="${column.valueMap.title}" mode="HTML" />
- <span class="sortable__indicator"></span>
- </th>
- </c:forEach>
- </tr>
- </thead>
- <tbody>
- <c:set var="parentPath" value="${slingRequest.requestPathInfo.suffix}${not empty properties.appendSuffix ? properties.appendSuffix : ''}" />
- <c:set var="count" value="1" />
- <c:forEach var="child" items="${sling:listChildren(sling:getResource(resourceResolver, parentPath))}">
- <sling:getResource var="typeConfig" base="${resource}" path="types/${child.valueMap['jcr:primaryType']}" />
- <c:if test="${typeConfig != null && !fn:contains(child.name,':')}">
- <tr class="sortable__row" data-resource="${child.path}" data-type="${typeConfig.path}">
- <td class="Cell-Static" title="# ${status.index + 1}}" data-sort-value="<fmt:formatNumber pattern="0000" value="${count}" />">
- ${count}
- </td>
- <c:forEach var="column" items="${sling:listChildren(sling:getRelativeResource(typeConfig,'columns'))}">
- <c:set var="configPath" value="columns/${column.name}"/>
- <c:set var="colConfig" value="${sling:getRelativeResource(typeConfig,configPath)}" scope="request" />
- <c:if test="${colConfig != null}">
- <sling:include path="${child.path}" resourceType="${colConfig.valueMap['sling:resourceType']}" />
- </c:if>
- </c:forEach>
- </tr>
- <c:set var="count" value="${count + 1}" />
- </c:if>
- </c:forEach>
- </tbody>
+<table class="sortable table">
+ <thead>
+ <tr>
+ <th class="sortable__header Col-id" data-attribute="id">
+ #
+ <span class="sortable__indicator"></span>
+ </th>
+ <c:forEach var="column" items="${sling:listChildren(sling:getRelativeResource(resource,'columns'))}">
+ <th class="${column.name == 'actions' ? 'Hide' : '' } sortable__header Col-${column.name}" data-attribute="${column.name}">
+ <sling:encode value="${column.valueMap.title}" mode="HTML" />
+ <span class="sortable__indicator"></span>
+ </th>
+ </c:forEach>
+ </tr>
+ </thead>
+ <tbody>
+ <c:set var="parentPath" value="${slingRequest.requestPathInfo.suffix}${not empty properties.appendSuffix ? properties.appendSuffix : ''}" />
+ <c:set var="count" value="1" />
+ <c:forEach var="child" items="${sling:listChildren(sling:getResource(resourceResolver, parentPath))}">
+ <sling:getResource var="typeConfig" base="${resource}" path="types/${child.valueMap['jcr:primaryType']}" />
+ <c:if test="${typeConfig != null && !fn:contains(child.name,':')}">
+ <tr class="sortable__row" data-resource="${child.path}" data-type="${typeConfig.path}">
+ <td class="Cell-Static" title="# ${status.index + 1}}" data-sort-value="<fmt:formatNumber pattern="0000" value="${count}" />">
+ ${count}
+ </td>
+ <c:forEach var="column" items="${sling:listChildren(sling:getRelativeResource(typeConfig,'columns'))}">
+ <c:set var="configPath" value="columns/${column.name}"/>
+ <c:set var="colConfig" value="${sling:getRelativeResource(typeConfig,configPath)}" scope="request" />
+ <c:if test="${colConfig != null}">
+ <sling:include path="${child.path}" resourceType="${colConfig.valueMap['sling:resourceType']}" />
+ </c:if>
+ </c:forEach>
+ </tr>
+ <c:set var="count" value="${count + 1}" />
+ </c:if>
+ </c:forEach>
+ </tbody>
</table>
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp
index 9e77c0d..14fc237 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/staticnav/staticnav.jsp
@@ -17,15 +17,17 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<h3 class="Nav-Header Toggle-Hidden" data-target="#${fn:replace(properties.title,' ','-')}-Nav">${properties.title}</h3>
+<div class="container is-fluid menu">
+<a class="menu-label Toggle-Hidden" data-target="#${fn:replace(properties.title,' ','-')}-Nav">${properties.title}</a>
<c:set var="hidden" value="Hide" />
<c:forEach var="item" items="${sling:listChildren(sling:getRelativeResource(resource,'links'))}">
- <c:if test="${fn:startsWith(slingRequest.requestURI,item.valueMap.link)}">
- <c:set var="hidden" value="" />
- </c:if>
+ <c:if test="${fn:startsWith(slingRequest.requestURI,item.valueMap.link)}">
+ <c:set var="hidden" value="" />
+ </c:if>
</c:forEach>
-<ul id="${fn:replace(properties.title,' ','-')}-Nav" class="${hidden}">
- <c:forEach var="item" items="${sling:listChildren(sling:getRelativeResource(resource,'links'))}">
- <li class="Nav-Item ${fn:startsWith(slingRequest.requestURI,item.valueMap.link) ? 'active' : ''}"><a href="${item.valueMap.link}">${item.valueMap.text}</a></li>
- </c:forEach>
-</ul>
\ No newline at end of file
+<ul id="${fn:replace(properties.title,' ','-')}-Nav" class="menu-list ${hidden}">
+ <c:forEach var="item" items="${sling:listChildren(sling:getRelativeResource(resource,'links'))}">
+ <li class="${fn:startsWith(slingRequest.requestURI,item.valueMap.link) ? 'active' : ''}"><a href="${item.valueMap.link}">${item.valueMap.text}</a></li>
+ </c:forEach>
+</ul>
+</div>
\ 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 e3e0d19..51770c1 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,20 +17,24 @@
* under the License.
*/ --%>
<%@include file="/libs/sling-cms/global.jsp"%>
-<body class="cms">
- <div class="Grid Fit-Small Home-Grid">
- <div class="Gradient"></div>
- <nav class="Cell Cell-Pad Small-20">
- <sling:call script="nav.jsp" />
- </nav>
- <div class="Cell Small-5"></div>
- <div class="Cell Main-Content ${properties.center ? 'Align-Center' : '' }">
- <div class="Grid">
- <main class="Cell Cell-Pad Small-100">
- <sling:call script="content.jsp" />
- </main>
- </div>
- </div>
- </div>
- <sling:call script="scripts.jsp" />
+<body class="layout-documentation page-components">
+ <section class="container is-fluid">
+ <sling:call script="nav.jsp" />
+ </section>
+ <section class="container is-fluid">
+ </section>
+ <section>
+ <div class="columns">
+ <div class="column is-one-quarter">
+ <sling:include path="/mnt/overlay/sling-cms/content/start/jcr:content/nav" resourceType="sling-cms/components/general/container" />
+ </div>
+ <div class="column">
+ <main>
+ <sling:call script="content.jsp" />
+ </main>
+ </div>
+ </div>
+ </div>
+ </section>
+ <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/base/nav.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
index 80e4b53..af0aea5 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/pages/base/nav.jsp
@@ -16,14 +16,24 @@
* specific language governing permissions and limitations
* under the License.
*/ --%>
- <%@include file="/libs/sling-cms/global.jsp"%>
-<a class="Cell-Pad" href="http://sling.apache.org" target="_blank" title="Visit the Apache Sling website">
- <img src="/static/clientlibs/sling-cms/img/sling-logo.svg" alt="Apache Sling Logo"/>
+<%@include file="/libs/sling-cms/global.jsp"%>
+<nav class="navbar" role="navigation" aria-label="main mavigation">
+<div class="navbar-brand">
+<a class="navbar-item" href="http://sling.apache.org" >
+ <img style="max-height:2rem" src="/static/clientlibs/sling-cms/img/sling-logo.svg" width="100" alt="Apache Sling"/>
</a>
-<h1>
- <a href="/cms/start.html">
- CMS
- </a>
+<h1 class="navbar-item">
+ <a href="/cms/start.html" title="CMS Home"><span class="icon"><i class="jam jam-home-f"></i></span></a>
</h1>
-<sling:include path="/mnt/overlay/sling-cms/content/start/jcr:content/nav" resourceType="sling-cms/components/general/container" />
-<div><a href="/system/sling/logout" title="Logout of Apache Sling">Logout, ${resourceResolver.userID}</a></div>
\ No newline at end of file
+<a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false">
+ <span aria-hidden="true"></span>
+ <span aria-hidden="true"></span>
+ <span aria-hidden="true"></span>
+</a>
+</div>
+<div class="navbar-menu">
+<div class="navbar-end">
+<a class="navbar-item " href="/system/sling/logout" title="Logout of Apache Sling CMS"><i class="jam jam-log-out"></i><span> ${resourceResolver.userID}</span></a>
+</div>
+</div>
+</nav>
\ No newline at end of file