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/09/05 17:57:03 UTC

[sling-org-apache-sling-app-cms] branch master updated (9fc6b9e -> 9299915)

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 9fc6b9e  Fixing where the site group editor wasn't opening
     add df2ccb8  initial commit of bulma
     add a33a8f3  initial commit of bulma
     add de91b9e  Merge branch 'SLING-7858' of https://github.com/apache/sling-org-apache-sling-app-cms.git into SLING-7858
     add be68da9  initial changes to support bulma
     add 7e621f7  component changes to support bulma
     add 02cf9fd  additional component changes
     add 2d8d2ac  Merging latest code from master
     add 44bc9ee  re-added grid for login
     add c394eb4  Updating to add model for the left column
     add e8e4ad4  Skipping the FED build from Eclipse and updating FED versions
     add b303ffc  dataTable added, adjustments to layout, validating functionality
     add 5eaf05c  cleaning up editor
     add ca65490  merging latest changes
     add 9a9d0f6  Fixing where the site group editor wasn't opening
     add 1f31ae5  Merging from master
     add 6ce7251  Fixing the path suggestions and field display without the search button
     add be0d678  Fixing the success button style
     add 3600c1b  Fixing the path suggestions
     add 6a1a18f  Updating to show indicators on the tables and removing the unneeded table sorting code
     add 0281a48  Got the version manager and taxonomy working, cleaning up instances of old hide mixin
     add c351416  Removing the extra column and fixing the search feature
     add a2c172a  Fixing an issue where the page content can be created blank due to a race condition
     add df3497f  Merge branch 'master' into SLING-7858
     add d58be70  Fixed the editor to work and fixing a number of different components / fields
     add a954d42  Adding the gradient in
     add ffee2b2  Fixing delete icon on the i18n screen
     add 58039fe  Supporting at least a resonable login screen, making it look more 'apache-ish' and fixing the button on the file properties editor
     add ff4bbeb  Fixing the layout in tablet and handling the background scrolling
     add 64594b2  Updating the publish column to display a close icon if a resource is not published
     add 05443d9  Fixing an issue where the page edit buttons dissappear on mobile
     add ac140a5  Fixing a number of SonarQube violations
     add f96ea78  file upload styling
     add 9299915  Merge branch 'SLING-7858' of github.com:apache/sling-org-apache-sling-app-cms into SLING-7858

No new revisions were added by this update.

Summary of changes:
 .../java/org/apache/sling/cms/core/CMSUtils.java   |  10 +-
 .../core/internal/filters/CMSSecurityFilter.java   |   6 +-
 .../core/internal/filters/EditIncludeFilter.java   |  47 ++--
 .../cms/core/internal/filters/LocaleFilter.java    |  21 +-
 .../cms/core/internal/filters/PublishFilter.java   |   4 +-
 .../internal/operations/BulkReplaceOperation.java  |  27 ++-
 .../operations/PropertyHintNodeNameGenerator.java  |  20 +-
 .../operations/UpdateReferencesPostOperation.java  |  29 ++-
 .../core/internal/rewriter/HTML5Serializer.java    |  10 +-
 .../rewriter/ReferenceMappingTransformer.java      |   7 +-
 .../cms/core/internal/servlets/CMSPageServlet.java |   4 +-
 .../internal/servlets/PathSuggestionServlet.java   |  14 +-
 .../models/{LocaleList.java => BaseField.java}     |  94 ++++----
 .../apache/sling/cms/core/models/Component.java    |  27 ++-
 .../sling/cms/core/models/ComponentManager.java    |   6 +-
 .../apache/sling/cms/core/models/ErrorHandler.java |  57 ++---
 .../apache/sling/cms/core/models/LocaleList.java   |   2 +-
 .../sling/cms/core/models/LocaleResource.java      |   2 +-
 .../org/apache/sling/cms/core/models/Page.java     |  23 +-
 .../apache/sling/cms/core/models/PageTemplate.java |   2 +-
 .../sling/cms/core/models/PageTemplateManager.java |  12 +-
 .../apache/sling/cms/core/models/References.java   |   6 +-
 .../org/apache/sling/cms/core/models/Site.java     |  17 +-
 .../apache/sling/cms/core/models/i18nHelper.java   |   2 +-
 .../usergenerated/UserGeneratedContentService.java |   2 +-
 .../impl/UserGeneratedContentServiceImpl.java      |   7 +-
 ui/pom.xml                                         |  45 +++-
 ui/src/main/frontend/gulpfile.js                   | 103 +++++++--
 ui/src/main/frontend/package.json                  |  17 +-
 ui/src/main/frontend/src/img/gradient.jpg          | Bin 24313 -> 9562 bytes
 ui/src/main/frontend/src/js/{scripts.js => cms.js} | 163 +++++---------
 .../sling-cms-editor => frontend/src/js}/editor.js |  29 +--
 ui/src/main/frontend/src/scss/_grid.scss           |   0
 .../src/main/frontend/src/scss/_overrides.scss     |  37 +--
 ui/src/main/frontend/src/scss/cms.scss             | 104 +++++++++
 ui/src/main/frontend/src/scss/editor.scss          |  68 ++++++
 ui/src/main/frontend/src/scss/form.scss            |  75 -------
 .../frontend/src/scss/{index.scss => starter.scss} |   0
 ui/src/main/frontend/src/scss/styles.scss          | 248 ---------------------
 .../components/cms/columns/actions/actions.jsp     |   6 +-
 .../cms/columns/lastmodified/lastmodified.jsp      |   2 +-
 .../cms/columns/localetitle/localetitle.jsp        |   2 +-
 .../sling-cms/components/cms/columns/name/name.jsp |   2 +-
 .../components/cms/columns/publish/publish.jsp     |  10 +-
 .../components/cms/columns/static/static.jsp       |   2 +-
 .../sling-cms/components/cms/columns/text/text.jsp |   2 +-
 .../cms/contentactions/contentactions.jsp          |  24 +-
 .../cms/contentbreadcrumb/contentbreadcrumb.jsp    |  50 ++---
 .../components/cms/contentnav/contentnav.jsp       |  62 +++---
 .../components/cms/contenttable/contenttable.jsp   |  72 +++---
 .../cms/fileeditorinclude/fileeditorinclude.jsp    |   2 +-
 .../sling-cms/components/cms/getform/getform.jsp   |   6 +-
 .../components/cms/i18ntable/i18ntable.jsp         |  16 +-
 .../components/cms/pageeditbar/actions/actions.jsp |  26 ++-
 .../components/cms/pageeditbar/pageeditbar.jsp     |  20 +-
 .../components/cms/pageeditor/pageeditor.jsp       |   4 +-
 .../components/cms/staticnav/staticnav.jsp         |  22 +-
 .../cms/versionmanager/versionmanager.jsp          |  36 +--
 .../components/editor/fields/base/base.jsp         |  12 +-
 .../components/editor/fields/button/button.jsp     |   4 +-
 .../components/editor/fields/file/field.jsp        |  52 +++--
 .../sling-cms/components/editor/fields/path.json   |   3 +-
 .../components/editor/fields/path/field.jsp        |  36 ---
 .../components/editor/fields/path/path.jsp         |  66 ++++++
 .../editor/fields/references/references.jsp        |  26 +--
 .../components/editor/fields/repeating/field.jsp   |  32 +--
 .../components/editor/fields/select/field.jsp      |   6 +-
 .../editor/fields/siblingselect/siblingselect.jsp  |  78 +++----
 .../components/editor/fields/taxonomy/field.jsp    |  27 ++-
 .../components/editor/fields/text/field.jsp        |   2 +-
 .../components/editor/fields/textarea/field.jsp    |   2 +-
 .../components/editor/scripts/finalize.jsp         |  23 +-
 .../sling-cms/components/editor/scripts/init.jsp   |   2 +-
 .../components/editor/slingform/slingform.jsp      |   6 +-
 .../components/general/container/container.jsp     |  19 +-
 .../libs/sling-cms/components/pages/base/body.jsp  |  32 +--
 .../libs/sling-cms/components/pages/base/nav.jsp   |  28 ++-
 .../libs/sling-cms/components/pages/error/nav.jsp  |  19 +-
 .../libs/sling-cms/content/i18n/dictionary.json    |   2 +-
 .../libs/sling-cms/content/site/sites.json         |   2 +
 .../jcr_root/libs/sling-cms/content/start.json     |   2 +-
 .../static/clientlibs/sling-cms-editor/editor.css  | 126 -----------
 .../static/clientlibs/sling-cms-editor/loader.gif  | Bin 673 -> 0 bytes
 83 files changed, 1151 insertions(+), 1169 deletions(-)
 copy core/src/main/java/org/apache/sling/cms/core/models/{LocaleList.java => BaseField.java} (62%)
 rename ui/src/main/frontend/src/js/{scripts.js => cms.js} (76%)
 rename ui/src/main/{resources/jcr_root/static/clientlibs/sling-cms-editor => frontend/src/js}/editor.js (78%)
 mode change 100755 => 100644 ui/src/main/frontend/src/scss/_grid.scss
 copy core/src/main/java/org/apache/sling/cms/core/models/SiteManager.java => ui/src/main/frontend/src/scss/_overrides.scss (65%)
 create mode 100644 ui/src/main/frontend/src/scss/cms.scss
 create mode 100644 ui/src/main/frontend/src/scss/editor.scss
 delete mode 100755 ui/src/main/frontend/src/scss/form.scss
 rename ui/src/main/frontend/src/scss/{index.scss => starter.scss} (100%)
 mode change 100755 => 100644
 delete mode 100644 ui/src/main/frontend/src/scss/styles.scss
 delete mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/field.jsp
 create mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/editor/fields/path/path.jsp
 delete mode 100644 ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/editor.css
 delete mode 100644 ui/src/main/resources/jcr_root/static/clientlibs/sling-cms-editor/loader.gif