You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2018/11/19 16:15:42 UTC
[sling-org-apache-sling-app-cms] branch master updated (04320c5 ->
8bc06db)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from 04320c5 Merge branch 'master' of git@github.com:apache/sling-org-apache-sling-app-cms.git
new 5202d46 Adding missing label
new e035069 Updating so that the cancel / submit buttons are disabled when the form submits
new 31ab18b Setting the background for the modal and gracefully aborting the Ajax requiest / resetting state when the background is clicked
new 8bc06db Wrapping the version table in a table-container div so it scrolls
The 4 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/cms.modal.js | 6 +-
.../components/cms/i18ntable/i18ntable.jsp | 120 ++++++++++----------
.../components/cms/optimizefile/optimizefile.jsp | 24 ++--
.../cms/versionmanager/versionmanager.jsp | 126 +++++++++++----------
.../components/editor/slingform/slingform.jsp | 15 ++-
.../libs/sling-cms/content/config/create.json | 1 +
6 files changed, 155 insertions(+), 137 deletions(-)
[sling-org-apache-sling-app-cms] 01/04: Adding missing label
Posted by dk...@apache.org.
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 5202d462701ca7a34ce1ce71515f7b386d327f7b
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Nov 19 10:53:52 2018 -0500
Adding missing label
---
ui/src/main/resources/jcr_root/libs/sling-cms/content/config/create.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/create.json b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/create.json
index a65634e..5ba58af 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/create.json
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/content/config/create.json
@@ -50,6 +50,7 @@
"type": {
"jcr:primaryType": "nt:unstructured",
"sling:resourceType": "sling-cms/components/editor/fields/select",
+ "label": "Configuration Type",
"name": "sling:resourceType",
"optionsScript": "/libs/sling-cms/components/editor/scripts/configResourceTypeOptions.jsp",
"required": true
[sling-org-apache-sling-app-cms] 04/04: Wrapping the version table
in a table-container div so it scrolls
Posted by dk...@apache.org.
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 8bc06db4776cb90cec7af8204a8384c94c5918e2
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Nov 19 11:15:45 2018 -0500
Wrapping the version table in a table-container div so it scrolls
---
.../cms/versionmanager/versionmanager.jsp | 94 +++++++++++-----------
1 file changed, 48 insertions(+), 46 deletions(-)
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp
index df3c682..6b62413 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp
@@ -52,54 +52,56 @@
</c:otherwise>
</c:choose>
<div class="version-container">
- <table class="table" data-sort="false" data-paginate="false">
- <thead>
- <tr>
- <th>Version</th>
- <th>Created</th>
- <th>Successors</th>
- <th>Predecessors</th>
- <th>Restore</th>
- </tr>
- </thead>
- <tbody class="load-versions">
- <c:forEach var="version" items="${sling:adaptTo(slingRequest.requestPathInfo.suffixResource,'org.apache.sling.cms.core.models.VersionInfo').versions}" varStatus="status">
+ <div class="table-container">
+ <table class="table" data-sort="false" data-paginate="false">
+ <thead>
<tr>
- <td>
- ${version.name}
- </td>
- <td>
- <fmt:formatDate value="${version.created.time}" type="both" dateStyle="long" timeStyle="long" />
- </td>
- <td>
- <c:forEach var="successor" items="${version.successors}">
- ${successor.name}<br/>
- </c:forEach>
- </td>
- <td>
- <c:forEach var="predecessor" items="${version.predecessors}">
- ${predecessor.name}<br/>
- </c:forEach>
- </td>
- <td>
- <c:if test="${!status.first}">
- <form method="post" action="${slingRequest.requestPathInfo.suffix}" enctype="multipart/form-data" class="Form-Ajax" data-add-date="false">
- <fieldset class="form-wrapper field">
- <input type="hidden" name=":operation" value="restore" />
- <input type="hidden" name=":version" value="${version.name}" />
- <div class="Field-Group">
- <button type="submit" class="button" title="Restore the content to ${version.name}">
- Restore Version
- </button>
- </div>
- </fieldset>
- </form>
- </c:if>
- </td>
+ <th>Version</th>
+ <th>Created</th>
+ <th>Successors</th>
+ <th>Predecessors</th>
+ <th>Restore</th>
</tr>
- </c:forEach>
- </tbody>
- </table>
+ </thead>
+ <tbody class="load-versions">
+ <c:forEach var="version" items="${sling:adaptTo(slingRequest.requestPathInfo.suffixResource,'org.apache.sling.cms.core.models.VersionInfo').versions}" varStatus="status">
+ <tr>
+ <td>
+ ${version.name}
+ </td>
+ <td>
+ <fmt:formatDate value="${version.created.time}" type="both" dateStyle="long" timeStyle="long" />
+ </td>
+ <td>
+ <c:forEach var="successor" items="${version.successors}">
+ ${successor.name}<br/>
+ </c:forEach>
+ </td>
+ <td>
+ <c:forEach var="predecessor" items="${version.predecessors}">
+ ${predecessor.name}<br/>
+ </c:forEach>
+ </td>
+ <td>
+ <c:if test="${!status.first}">
+ <form method="post" action="${slingRequest.requestPathInfo.suffix}" enctype="multipart/form-data" class="Form-Ajax" data-add-date="false">
+ <fieldset class="form-wrapper field">
+ <input type="hidden" name=":operation" value="restore" />
+ <input type="hidden" name=":version" value="${version.name}" />
+ <div class="Field-Group">
+ <button type="submit" class="button" title="Restore the content to ${version.name}">
+ Restore Version
+ </button>
+ </div>
+ </fieldset>
+ </form>
+ </c:if>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+ </div>
</div>
</div>
\ No newline at end of file
[sling-org-apache-sling-app-cms] 03/04: Setting the background for
the modal and gracefully aborting the Ajax requiest / resetting state when
the background is clicked
Posted by dk...@apache.org.
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 31ab18b2d8a0a25d5686cb20c0430f76c4d70e58
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Nov 19 11:15:27 2018 -0500
Setting the background for the modal and gracefully aborting the Ajax
requiest / resetting state when the background is clicked
---
ui/src/main/frontend/src/js/cms.modal.js | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/ui/src/main/frontend/src/js/cms.modal.js b/ui/src/main/frontend/src/js/cms.modal.js
index ca72de5..862ecc5 100644
--- a/ui/src/main/frontend/src/js/cms.modal.js
+++ b/ui/src/main/frontend/src/js/cms.modal.js
@@ -32,7 +32,7 @@
getModal: function (title, link, button) {
var modal = document.createElement('div');
modal.classList.add('modal');
- modal.innerHTML = '<div class="box"><h3>Loading...</h3><div class="loader is-loading"></div></div>';
+ modal.innerHTML = '<div class="modal-background"></div><div class="modal-content"><div class="box"><h3>Loading...</h3><div class="loader is-loading"></div></div></div>';
document.querySelector('body').appendChild(modal);
var request = new XMLHttpRequest();
@@ -45,6 +45,10 @@
modal.innerHTML = request.responseText;
}
};
+ modal.querySelector('.modal-background').addEventListener('click', function(){
+ request.abort();
+ button.removeAttribute('disabled');
+ });
modal.classList.add('is-active');
request.send();
}
[sling-org-apache-sling-app-cms] 02/04: Updating so that the cancel
/ submit buttons are disabled when the form submits
Posted by dk...@apache.org.
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 e03506914e3025fcae96a8378b44c8ee92155c88
Author: Dan Klco <dk...@apache.org>
AuthorDate: Mon Nov 19 10:54:52 2018 -0500
Updating so that the cancel / submit buttons are disabled when the form
submits
---
.../components/cms/i18ntable/i18ntable.jsp | 120 +++++++++++----------
.../components/cms/optimizefile/optimizefile.jsp | 24 +++--
.../cms/versionmanager/versionmanager.jsp | 50 +++++----
.../components/editor/slingform/slingform.jsp | 15 ++-
4 files changed, 110 insertions(+), 99 deletions(-)
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/i18ntable/i18ntable.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/i18ntable/i18ntable.jsp
index 6c732ee..467bef1 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/i18ntable/i18ntable.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/i18ntable/i18ntable.jsp
@@ -19,67 +19,69 @@
<%@include file="/libs/sling-cms/global.jsp"%>
<c:forEach var="language" items="${sling:listChildren(slingRequest.requestPathInfo.suffixResource)}">
- <c:if test="${firstChild == null && not empty language.valueMap['jcr:language']}">
- <c:set var="firstChild" value="${language}" />
- </c:if>
+ <c:if test="${firstChild == null && not empty language.valueMap['jcr:language']}">
+ <c:set var="firstChild" value="${language}" />
+ </c:if>
</c:forEach>
<nav class="level">
- <div class="level-left">
- <div class="level-item">
- <a class="Button Fetch-Modal" data-title="Add Entry" data-path=".Main-Content form" href="/cms/i18n/entry/create.html${firstChild.path}">+ Entry</a>
- </div>
- </div>
+ <div class="level-left">
+ <div class="level-item">
+ <a class="Button Fetch-Modal" data-title="Add Entry" data-path=".Main-Content form" href="/cms/i18n/entry/create.html${firstChild.path}">+ Entry</a>
+ </div>
+ </div>
</nav>
<form method="post" action="${slingRequest.requestPathInfo.suffix}" enctype="multipart/form-data" class="Form-Ajax" data-add-date="false">
- <input type="hidden" name="_charset_" value="utf-8" />
- <table class="table is-fullwidth is-striped">
- <thead>
- <tr>
- <th class="Column-key">
- Key
- </th>
- <c:forEach var="language" items="${sling:listChildren(slingRequest.requestPathInfo.suffixResource)}">
- <c:if test="${not empty language.valueMap['jcr:language']}">
- <th class="Column-${language.valueMap['jcr:language']}">
- <sling:adaptTo adaptable="${language}" adaptTo="org.apache.sling.cms.core.models.LocaleResource" var="localeResource" />
- <sling:encode value="${localeResource.locale.displayLanguage}" mode="HTML" /> <sling:encode value="${localeResource.locale.displayCountry}" mode="HTML" />
- <br/>
- <small>(<sling:encode value="${language.valueMap['jcr:language']}" mode="HTML" />)</small>
- </th>
- </c:if>
- </c:forEach>
- </tr>
- </thead>
- <tbody>
- <sling:adaptTo var="helper" adaptable="${slingRequest.requestPathInfo.suffixResource}" adaptTo="org.apache.sling.cms.core.models.i18nHelper" />
- <c:forEach var="key" items="${helper.keys}">
- <tr>
- <td>
- <sling:encode value="${key}" mode="HTML" />
- </td>
- <c:forEach var="language" items="${sling:listChildren(slingRequest.requestPathInfo.suffixResource)}">
- <c:if test="${not empty language.valueMap['jcr:language']}">
- <td>
- <c:set var="keyfound" value="false" />
- <c:forEach var="entry" items="${sling:listChildren(language)}">
- <c:if test="${entry.valueMap['sling:key'] == key}">
- <c:set var="keyfound" value="true" />
- <input name="${language.name}/${entry.name}/sling:message" class="input" type="text" value="${sling:encode(entry.valueMap['sling:message'],'HTML_ATTR')}" />
- <input name="${language.name}/${entry.name}/sling:key" type="hidden" value="${key}" />
- </c:if>
- </c:forEach>
- <c:if test="${keyfound == 'false'}">
- <c:set var="rand" value="${helper.random}" />
- <input name="${language.name}/entry_${rand}/sling:message" class="input" type="text" value="" />
- <input name="${language.name}/entry_${rand}/sling:key" type="hidden" value="${key}" />
- <input name="${language.name}/entry_${rand}/jcr:primaryType" type="hidden" value="sling:MessageEntry" />
- </c:if>
- </td>
- </c:if>
- </c:forEach>
- </tr>
- </c:forEach>
- </tbody>
- </table>
- <button class="button is-primary">Save i18n Dictionary</button>
+ <fieldset class="form-wrapper field">
+ <input type="hidden" name="_charset_" value="utf-8" />
+ <table class="table is-fullwidth is-striped">
+ <thead>
+ <tr>
+ <th class="Column-key">
+ Key
+ </th>
+ <c:forEach var="language" items="${sling:listChildren(slingRequest.requestPathInfo.suffixResource)}">
+ <c:if test="${not empty language.valueMap['jcr:language']}">
+ <th class="Column-${language.valueMap['jcr:language']}">
+ <sling:adaptTo adaptable="${language}" adaptTo="org.apache.sling.cms.core.models.LocaleResource" var="localeResource" />
+ <sling:encode value="${localeResource.locale.displayLanguage}" mode="HTML" /> <sling:encode value="${localeResource.locale.displayCountry}" mode="HTML" />
+ <br/>
+ <small>(<sling:encode value="${language.valueMap['jcr:language']}" mode="HTML" />)</small>
+ </th>
+ </c:if>
+ </c:forEach>
+ </tr>
+ </thead>
+ <tbody>
+ <sling:adaptTo var="helper" adaptable="${slingRequest.requestPathInfo.suffixResource}" adaptTo="org.apache.sling.cms.core.models.i18nHelper" />
+ <c:forEach var="key" items="${helper.keys}">
+ <tr>
+ <td>
+ <sling:encode value="${key}" mode="HTML" />
+ </td>
+ <c:forEach var="language" items="${sling:listChildren(slingRequest.requestPathInfo.suffixResource)}">
+ <c:if test="${not empty language.valueMap['jcr:language']}">
+ <td>
+ <c:set var="keyfound" value="false" />
+ <c:forEach var="entry" items="${sling:listChildren(language)}">
+ <c:if test="${entry.valueMap['sling:key'] == key}">
+ <c:set var="keyfound" value="true" />
+ <input name="${language.name}/${entry.name}/sling:message" class="input" type="text" value="${sling:encode(entry.valueMap['sling:message'],'HTML_ATTR')}" />
+ <input name="${language.name}/${entry.name}/sling:key" type="hidden" value="${key}" />
+ </c:if>
+ </c:forEach>
+ <c:if test="${keyfound == 'false'}">
+ <c:set var="rand" value="${helper.random}" />
+ <input name="${language.name}/entry_${rand}/sling:message" class="input" type="text" value="" />
+ <input name="${language.name}/entry_${rand}/sling:key" type="hidden" value="${key}" />
+ <input name="${language.name}/entry_${rand}/jcr:primaryType" type="hidden" value="sling:MessageEntry" />
+ </c:if>
+ </td>
+ </c:if>
+ </c:forEach>
+ </tr>
+ </c:forEach>
+ </tbody>
+ </table>
+ <button class="button is-primary">Save i18n Dictionary</button>
+ </fieldset>
</form>
\ No newline at end of file
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/optimizefile/optimizefile.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/optimizefile/optimizefile.jsp
index 31270db..e0881b1 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/optimizefile/optimizefile.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/optimizefile/optimizefile.jsp
@@ -51,11 +51,13 @@
</dd>
</dl>
<form action="${slingRequest.requestPathInfo.suffix}" class="Form-Ajax" method="post">
- <input type="hidden" name=":operation" value="fileoptim:optimize" />
- <button type="submit" class="button is-primary">
- Optimize
- </button>
- <button type="button" class="button close">Cancel</button>
+ <fieldset class="form-wrapper field">
+ <input type="hidden" name=":operation" value="fileoptim:optimize" />
+ <button type="submit" class="button is-primary">
+ Optimize
+ </button>
+ <button type="button" class="button close">Cancel</button>
+ </fieldset>
</form>
</c:when>
<c:when test="${optimizer.optimized}">
@@ -75,11 +77,13 @@
</dd>
</dl>
<form action="${slingRequest.requestPathInfo.suffix}" class="Form-Ajax" method="post">
- <input type="hidden" name=":operation" value="fileoptim:restore" />
- <button type="submit" class="button is-primary">
- Restore Original
- </button>
- <button type="button" class="button close">Cancel</button>
+ <fieldset class="form-wrapper field">
+ <input type="hidden" name=":operation" value="fileoptim:restore" />
+ <button type="submit" class="button is-primary">
+ Restore Original
+ </button>
+ <button type="button" class="button close">Cancel</button>
+ </fieldset>
</form>
</c:when>
<c:otherwise>
diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp
index 7ac0a56..df3c682 100644
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp
+++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/versionmanager/versionmanager.jsp
@@ -25,25 +25,29 @@
<c:choose>
<c:when test="${versionable == 'true'}">
<form method="post" action="${slingRequest.requestPathInfo.suffix}" enctype="multipart/form-data" class="Form-Ajax" data-add-date="false">
- <input type="hidden" name=":operation" value="checkpoint" />
- <div class="Field-Group">
- <button type="submit" class="button is-primary" title="Create a new version for the content">
- Create Version
- </button>
- </div>
+ <fieldset class="form-wrapper field">
+ <input type="hidden" name=":operation" value="checkpoint" />
+ <div class="Field-Group">
+ <button type="submit" class="button is-primary" title="Create a new version for the content">
+ Create Version
+ </button>
+ </div>
+ </fieldset>
</form>
</c:when>
<c:otherwise>
<form method="post" action="${slingRequest.requestPathInfo.suffix}" enctype="multipart/form-data" class="Form-Ajax" data-add-date="false">
- <input type="hidden" name=":autoCheckout" value="true">
- <input type="hidden" name=":autoCheckin" value="true">
- <input type="hidden" name="jcr:mixinTypes@TypeHint" value="Type[]">
- <input type="hidden" name="jcr:mixinTypes" value="mix:versionable">
- <div class="Field-Group">
- <button type="submit" class="button is-primary" title="Make the content versionable">
- Make Versionable
- </button>
- </div>
+ <fieldset class="form-wrapper field">
+ <input type="hidden" name=":autoCheckout" value="true">
+ <input type="hidden" name=":autoCheckin" value="true">
+ <input type="hidden" name="jcr:mixinTypes@TypeHint" value="Type[]">
+ <input type="hidden" name="jcr:mixinTypes" value="mix:versionable">
+ <div class="Field-Group">
+ <button type="submit" class="button is-primary" title="Make the content versionable">
+ Make Versionable
+ </button>
+ </div>
+ </fieldset>
</form>
</c:otherwise>
</c:choose>
@@ -80,13 +84,15 @@
<td>
<c:if test="${!status.first}">
<form method="post" action="${slingRequest.requestPathInfo.suffix}" enctype="multipart/form-data" class="Form-Ajax" data-add-date="false">
- <input type="hidden" name=":operation" value="restore" />
- <input type="hidden" name=":version" value="${version.name}" />
- <div class="Field-Group">
- <button type="submit" class="button" title="Restore the content to ${version.name}">
- Restore Version
- </button>
- </div>
+ <fieldset class="form-wrapper field">
+ <input type="hidden" name=":operation" value="restore" />
+ <input type="hidden" name=":version" value="${version.name}" />
+ <div class="Field-Group">
+ <button type="submit" class="button" title="Restore the content to ${version.name}">
+ Restore Version
+ </button>
+ </div>
+ </fieldset>
</form>
</c:if>
</td>
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 1da599f..616bd24 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
@@ -25,13 +25,12 @@
data-callback="${properties.callback}">
<fieldset class="form-wrapper field">
<input type="hidden" name="_charset_" value="utf-8" />
- <sling:include path="fields"
- resourceType="sling-cms/components/general/container" />
+ <sling:include path="fields" resourceType="sling-cms/components/general/container" />
+ <button type="submit" class="button is-primary">
+ <sling:encode value="${properties.button}" default="Save" mode="HTML" />
+ </button>
+ <c:if test="${properties.skipcancel != true}">
+ <button type="button" class="button close">Cancel</button>
+ </c:if>
</fieldset>
- <button type="submit" class="button is-primary">
- <sling:encode value="${properties.button}" default="Save" mode="HTML" />
- </button>
- <c:if test="${properties.skipcancel != true}">
- <button type="button" class="button close">Cancel</button>
- </c:if>
</form>
\ No newline at end of file