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 <[email protected]> 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" } }
