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-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 4a708ea  Fixing the site config listing and adding the shared actions 
to the site header
4a708ea is described below

commit 4a708eaec57d91ab5cfebdca2a9094e149ca6d40
Author: Dan Klco <[email protected]>
AuthorDate: Tue Feb 6 21:51:03 2018 -0500

    Fixing the site config listing and adding the shared actions to the site
    header
---
 .../components/cms/siteheader/siteheader.jsp       |  9 +++++----
 .../libs/sling-cms/content/config/list.json        | 23 +++++++---------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git 
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/siteheader/siteheader.jsp
 
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/siteheader/siteheader.jsp
index a00cb1b..55c2b31 100644
--- 
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/siteheader/siteheader.jsp
+++ 
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/siteheader/siteheader.jsp
@@ -18,12 +18,13 @@
  */ --%>
  <%@include file="/libs/sling-cms/global.jsp"%>
 <sling:getParent resource="${slingRequest.requestPathInfo.suffixResource}" 
var="site" level="2" />
+<div class="Pull-Right">
+       <a class="Fetch-Modal Button" data-title="Edit Site" 
data-path=".Main-Content form" href="/cms/site/edit.html${site.path}" 
title="Edit Site">&#x270f;</a>
+       <a class="Fetch-Modal Button" data-title="Move / Copy Site" 
data-path=".Main-Content form" href="/cms/shared/movecopy.html${site.path}" 
title="Delete Site">&#x21c6;</a>
+       <a class="Fetch-Modal Button" data-title="Delete Site" 
data-path=".Main-Content form" href="/cms/shared/delete.html${site.path}" 
title="Delete Site">&times;</a>
+</div>
 <h2>
        <sling:encode value="${site.valueMap['jcr:title']}" mode="HTML" />
-       <div class="Pull-Right">
-               <a class="Fetch-Modal Button" data-title="Edit Site" 
data-path=".Main-Content form" href="/cms/site/edit.html${site.path}" 
title="Edit Site">&#x270f;</a>
-               <a class="Fetch-Modal Button" data-title="Configure Site" 
data-path=".Main-Content form" 
href="/cms/site/configure.html/etc/config/${site.name}" title="Configure 
Site">&#x1030e;</a>
-       </div>
 </h2>
 <p>
        <sling:encode value="${site.valueMap['jcr:description']}" mode="HTML" />
diff --git 
a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/list.json 
b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/list.json
index f8a22b4..2a588d3 100644
--- a/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/list.json
+++ b/cms/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/list.json
@@ -40,10 +40,6 @@
                                                "jcr:primaryType": 
"nt:unstructured",
                                                "title": "Last Modified"
                                        },
-                                       "lastModifiedBy": {
-                                               "jcr:primaryType": 
"nt:unstructured",
-                                               "title": "Last Modified By"
-                                       },
                                        "actions": {
                                                "jcr:primaryType": 
"nt:unstructured",
                                                "title": "Actions"
@@ -57,27 +53,22 @@
                                                        "jcr:primaryType": 
"nt:unstructured",
                                                        "name": {
                                                                
"jcr:primaryType": "nt:unstructured",
-                                                               "link": false,
-                                                               "type": "Name"
+                                                               
"sling:resourceType": "sling-cms/components/cms/columns/name",
+                                                               "link": false
                                                        },
                                                        "title": {
                                                                
"jcr:primaryType": "nt:unstructured",
-                                                               "property": 
"jcr:title",
-                                                               "type": "String"
+                                                               
"sling:resourceType": "sling-cms/components/cms/columns/text",
+                                                               "property": 
"jcr:title"
                                                        },
                                                        "lastModified": {
                                                                
"jcr:primaryType": "nt:unstructured",
-                                                               "property": 
"jcr:lastModified",
-                                                               "type": "Date"
-                                                       },
-                                                       "lastModifiedBy": {
-                                                               
"jcr:primaryType": "nt:unstructured",
-                                                               "property": 
"jcr:lastModifiedBy",
-                                                               "type": "String"
+                                                               
"sling:resourceType": "sling-cms/components/cms/columns/lastmodified",
+                                                               "subPath": ""
                                                        },
                                                        "actions": {
                                                                
"jcr:primaryType": "nt:unstructured",
-                                                               "type": 
"Actions",
+                                                               
"sling:resourceType": "sling-cms/components/cms/columns/actions",
                                                                "edit": {
                                                                        
"jcr:primaryType": "nt:unstructured",
                                                                        
"modal": false,

-- 
To stop receiving notification emails like this one, please contact
[email protected].

Reply via email to