[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10448
Marijan Milicevic pushed new branch bugfix/CMS-10448 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10453
Marijan Milicevic pushed new branch bugfix/CMS-10453 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit] Pushed new branch bugfix/HSTTWO-3808
Marijan Milicevic pushed new branch bugfix/HSTTWO-3808 at cms-community / hippo-site-toolkit ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10240
Marijan Milicevic pushed new branch bugfix/CMS-10240 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10240
Marijan Milicevic deleted branch bugfix/CMS-10240 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy] Pushed new branch bugfix/HIPPLUG-1319
Marijan Milicevic pushed new branch bugfix/HIPPLUG-1319 at cms-community / hippo-plugin-taxonomy ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy][bugfix/HIPPLUG-1319] HIPPLUG-1319 Error log in the console when opening a taxonomy document.
Marijan Milicevic pushed to branch bugfix/HIPPLUG-1319 at cms-community / hippo-plugin-taxonomy Commits: 5465c1c4 by Marijan Milicevic at 2016-09-26T13:09:22+02:00 HIPPLUG-1319 Error log in the console when opening a taxonomy document. - fix NPE by adding property type - - - - - 1 changed file: - demo/content/src/main/resources/taxonomy-demo-namespace.xml Changes: = demo/content/src/main/resources/taxonomy-demo-namespace.xml = --- a/demo/content/src/main/resources/taxonomy-demo-namespace.xml +++ b/demo/content/src/main/resources/taxonomy-demo-namespace.xml @@ -1,4 +1,5 @@ -http://www.jcp.org/jcr/sv/1.0"; sv:name="taxonomydemo"> + +http://www.jcp.org/jcr/sv/1.0"; sv:name="taxonomydemo"> hipposysedit:namespace @@ -734,6 +735,9 @@ taxonomydemo:alternatekeys + +String + View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/commit/5465c1c40e4678f057824ef1a5e0b80e8e47bd1c ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs] Pushed new branch bugfix/HIPPLUG-1396
Marijan Milicevic pushed new branch bugfix/HIPPLUG-1396 at cms-community / hippo-plugin-relateddocs ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-site-toolkit][bugfix/HSTTWO-3808] HSTTWO-3808 ResourceContainer: Don't log warning when resource path is invalid
Marijan Milicevic pushed to branch bugfix/HSTTWO-3808 at cms-community /
hippo-site-toolkit
Commits:
2d1debc4 by Marijan Milicevic at 2016-10-20T11:16:54+02:00
HSTTWO-3808 ResourceContainer: Don't log warning when resource path is
invalid
- just log message at info level
- - - - -
1 changed file:
-
commons/src/main/java/org/hippoecm/hst/core/linking/AbstractResourceContainer.java
Changes:
=
commons/src/main/java/org/hippoecm/hst/core/linking/AbstractResourceContainer.java
=
---
a/commons/src/main/java/org/hippoecm/hst/core/linking/AbstractResourceContainer.java
+++
b/commons/src/main/java/org/hippoecm/hst/core/linking/AbstractResourceContainer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2014 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2010-2016 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -173,12 +173,7 @@ public abstract class AbstractResourceContainer implements
ResourceContainer {
} catch (PathNotFoundException e) {
log.debug("Cannot find resource node for path '{}' beloning to
pathInfo '{}'", actualPath, pathInfo);
} catch (RepositoryException e) {
- final String message = e.getMessage();
- if (log.isDebugEnabled()) {
- log.warn("RepositoryException: '{}'", message);
- } else if (message != null && !message.startsWith("Invalid path:"))
{
- log.warn("RepositoryException: '{}'", message);
- }
+ log.info("RepositoryException: '{}'", e.getMessage());
}
return null;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-site-toolkit/commit/2d1debc40fa04324de92d7a776e1df073c4884a6
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs][bugfix/HIPPLUG-1396] HIPPLUG-1396 Regression: Related Documents - Adding suggested document doesn't r…
Marijan Milicevic pushed to branch bugfix/HIPPLUG-1396 at cms-community /
hippo-plugin-relateddocs
Commits:
21903f8a by Marijan Milicevic at 2016-10-20T12:38:43+02:00
HIPPLUG-1396 Regression: Related Documents - Adding suggested document
doesn't remove it from the list of suggestions.
- remove existing documents from suggestion list
- don't suggest own document
- - - - -
1 changed file:
-
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
=
---
a/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
+++
b/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,8 @@ import javax.jcr.query.RowIterator;
import org.hippoecm.frontend.model.JcrNodeModel;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
-import org.hippoecm.repository.api.HippoQuery;
+import org.hippoecm.repository.api.HippoNode;
+import org.hippoecm.repository.api.HippoNodeType;
import org.onehippo.forge.relateddocs.RelatedDoc;
import org.onehippo.forge.relateddocs.RelatedDocCollection;
import org.onehippo.forge.relateddocs.RelatedDocsNodeType;
@@ -67,17 +68,18 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
nodeModel = new
JcrNodeModel(documentModel.getNode().getNode(RelatedDocsNodeType.NT_RELATEDDOCS));
} catch (PathNotFoundException e) {
//I think when a new document is opened, the document doesn't
contain the "relateddocs" node yet, so we *may* need to create one -- Vijay
-log.info("Relateddocs node for current document not found,
returning empty docs, so creating one." + e.getMessage());
+log.info("Relateddocs node for current document not found,
returning empty docs, so creating one.{}", e.getMessage());
nodeModel = new
JcrNodeModel(documentModel.getNode().addNode(RelatedDocsNodeType.NT_RELATEDDOCS,
RelatedDocsNodeType.NT_RELATEDDOCS));
}
RelatedDocCollection currentCollection = new
RelatedDocCollection(nodeModel);
-Set uuidSet = new HashSet();
+Set uuidSet = new HashSet<>();
for (RelatedDoc r : currentCollection) {
uuidSet.add(r.getUuid());
}
Node docNode = documentModel.getNode();
+Node parentNode = docNode.getParent();
String xpathQuery = createXPathQuery(docNode);
if (log.isDebugEnabled()) {
@@ -99,7 +101,32 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
// retrieve the found document from the repository
try {
Node document = nodeModel.getNode().getSession().getNode(path);
-collection.add(new RelatedDoc(new JcrNodeModel(document),
this.score * myScore));
+Node itsParent = ((HippoNode) document).getCanonicalNode();
+if (parentNode.isSame(itsParent)) {
+if (log.isDebugEnabled()) {
+log.debug("Found parent {}", itsParent.getPath());
+}
+continue;
+}
+if (document.isNodeType(HippoNodeType.NT_HANDLE)) {
+if (uuidSet.contains(document.getIdentifier())) {
+continue;
+}
+if (log.isDebugEnabled()) {
+log.debug("Found related document {}",
document.getPath());
+}
+collection.add(new RelatedDoc(new JcrNodeModel(document),
this.score * myScore));
+} else if (itsParent.isNodeType(HippoNodeType.NT_HANDLE)) {
+if (uuidSet.contains(itsParent.getIdentifier())) {
+continue;
+}
+// exclude prototype stuff: note need to check this
+final JcrNodeModel jcrNodeModel = new
JcrNodeModel(itsParent);
+if
(jcrNodeModel.getNode().getPath().endsWith("hippo:prototype")) {
+continue;
+}
+collection.add(new RelatedDoc(jcrNodeModel, this.score *
myScore));
+}
} catch (RepositoryException e) {
log.error("
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs][bugfix/HIPPLUG-1396] HIPPLUG-1396 Regression: Related Documents - Adding suggested document doesn't r…
Marijan Milicevic pushed to branch bugfix/HIPPLUG-1396 at cms-community /
hippo-plugin-relateddocs
Commits:
df375746 by Marijan Milicevic at 2016-10-20T12:42:15+02:00
HIPPLUG-1396 Regression: Related Documents - Adding suggested document
doesn't remove it from the list of suggestions.
- remove existing documents from suggestion list
- don't suggest own document
- - - - -
1 changed file:
-
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
=
---
a/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
+++
b/addon-cms/src/main/java/org/onehippo/forge/relateddocs/providers/SimilaritySearchRelatedDocsProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -28,7 +28,8 @@ import javax.jcr.query.RowIterator;
import org.hippoecm.frontend.model.JcrNodeModel;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
-import org.hippoecm.repository.api.HippoQuery;
+import org.hippoecm.repository.api.HippoNode;
+import org.hippoecm.repository.api.HippoNodeType;
import org.onehippo.forge.relateddocs.RelatedDoc;
import org.onehippo.forge.relateddocs.RelatedDocCollection;
import org.onehippo.forge.relateddocs.RelatedDocsNodeType;
@@ -67,17 +68,18 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
nodeModel = new
JcrNodeModel(documentModel.getNode().getNode(RelatedDocsNodeType.NT_RELATEDDOCS));
} catch (PathNotFoundException e) {
//I think when a new document is opened, the document doesn't
contain the "relateddocs" node yet, so we *may* need to create one -- Vijay
-log.info("Relateddocs node for current document not found,
returning empty docs, so creating one." + e.getMessage());
+log.info("Relateddocs node for current document not found,
returning empty docs, so creating one.{}", e.getMessage());
nodeModel = new
JcrNodeModel(documentModel.getNode().addNode(RelatedDocsNodeType.NT_RELATEDDOCS,
RelatedDocsNodeType.NT_RELATEDDOCS));
}
RelatedDocCollection currentCollection = new
RelatedDocCollection(nodeModel);
-Set uuidSet = new HashSet();
+Set uuidSet = new HashSet<>();
for (RelatedDoc r : currentCollection) {
uuidSet.add(r.getUuid());
}
Node docNode = documentModel.getNode();
+Node parentNode = docNode.getParent();
String xpathQuery = createXPathQuery(docNode);
if (log.isDebugEnabled()) {
@@ -99,7 +101,32 @@ public class SimilaritySearchRelatedDocsProvider extends
AbstractRelatedDocsProv
// retrieve the found document from the repository
try {
Node document = nodeModel.getNode().getSession().getNode(path);
-collection.add(new RelatedDoc(new JcrNodeModel(document),
this.score * myScore));
+Node itsParent = ((HippoNode) document).getCanonicalNode();
+if (parentNode.isSame(itsParent)) {
+if (log.isDebugEnabled()) {
+log.debug("Found parent {}", itsParent.getPath());
+}
+continue;
+}
+if (document.isNodeType(HippoNodeType.NT_HANDLE)) {
+if (uuidSet.contains(document.getIdentifier())) {
+continue;
+}
+if (log.isDebugEnabled()) {
+log.debug("Found related document {}",
document.getPath());
+}
+collection.add(new RelatedDoc(new JcrNodeModel(document),
this.score * myScore));
+} else if (itsParent.isNodeType(HippoNodeType.NT_HANDLE)) {
+if (uuidSet.contains(itsParent.getIdentifier())) {
+continue;
+}
+// exclude prototype stuff: note need to check this
+final JcrNodeModel jcrNodeModel = new
JcrNodeModel(itsParent);
+if
(jcrNodeModel.getNode().getPath().endsWith("hippo:prototype")) {
+continue;
+}
+collection.add(new RelatedDoc(jcrNodeModel, this.score *
myScore));
+}
} catch (RepositoryException e) {
log.error("
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-958
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-958 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials-components] Pushed new branch feature/ESSCOM-12
Marijan Milicevic pushed new branch feature/ESSCOM-12 at cms-community / hippo-essentials-components ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1045
Marijan Milicevic pushed new branch feature/ESSENTIALS-1045 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials-components] Pushed new branch bugfix/ESSCOM-15
Marijan Milicevic pushed new branch bugfix/ESSCOM-15 at cms-community / hippo-essentials-components ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials-components][bugfix/ESSCOM-15] ESSCOM-15 EssentialsListComponentInfo includeSubTypes is unused
Marijan Milicevic pushed to branch bugfix/ESSCOM-15 at cms-community / hippo-essentials-components Commits: e6470882 by Marijan Milicevic at 2016-12-06T19:57:52+01:00 ESSCOM-15 EssentialsListComponentInfo includeSubTypes is unused - default dhould be true - - - - - 1 changed file: - hst/src/main/java/org/onehippo/cms7/essentials/components/info/EssentialsListComponentInfo.java Changes: = hst/src/main/java/org/onehippo/cms7/essentials/components/info/EssentialsListComponentInfo.java = --- a/hst/src/main/java/org/onehippo/cms7/essentials/components/info/EssentialsListComponentInfo.java +++ b/hst/src/main/java/org/onehippo/cms7/essentials/components/info/EssentialsListComponentInfo.java @@ -29,7 +29,7 @@ public interface EssentialsListComponentInfo extends EssentialsPageable, Essenti ) String getPath(); -@Parameter(name = "includeSubtypes", required = false) +@Parameter(name = "includeSubtypes", defaultValue = "on", required = false) Boolean getIncludeSubtypes(); @Parameter(name = "documentTypes", required = false) View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials-components/commit/e6470882c7585595c147fd0d81503693b9162791 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1046
Marijan Milicevic pushed new branch feature/ESSENTIALS-1046 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype] Pushed new branch feature/ARCHE-520
Marijan Milicevic pushed new branch feature/ARCHE-520 at cms-community / hippo-project-archetype ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10555
Marijan Milicevic pushed new branch bugfix/CMS-10555 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype][master] 2 commits: ARCHE-521 remove redundant web.xml for essentials webapp
Marijan Milicevic pushed to branch master at cms-community / hippo-project-archetype Commits: 33604eae by Bert Leunis at 2016-12-20T10:11:49+01:00 ARCHE-521 remove redundant web.xml for essentials webapp - - - - - efe4aae3 by Marijan Milicevic at 2017-01-23T12:44:43+01:00 Merge branch 'master' into feature/ARCHE-521 - - - - - 1 changed file: - − src/main/resources/archetype-resources/essentials/src/main/webapp/WEB-INF/web.xml Changes: = src/main/resources/archetype-resources/essentials/src/main/webapp/WEB-INF/web.xml deleted = --- a/src/main/resources/archetype-resources/essentials/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - -http://java.sun.com/xml/ns/javaee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; - version="3.0" - id="essentials"> - - essentials-webapp - - org.onehippo.cms7.essentials.rest.config.RestServletListener - - -contextConfigLocation -classpath:applicationContext.xml - - - org.springframework.web.context.ContextLoaderListener - - -REST -REST - org.onehippo.cms7.essentials.servlet.RestServlet -1 - - -REST -/rest/* - - -404 -/WEB-INF/jsp/errors/404.jsp - - -500 -/WEB-INF/jsp/errors/500.jsp - - - -/WEB-INF/jsp/index.jsp - - View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/compare/096aba0dad6d0ff530cf29080922c52b6cebdc02...efe4aae3a8b171b45bd703d46c292c868157d3e3 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-project-archetype][feature/ARCHE-521] 3 commits: ARCHE-519 update link to documentation page
Marijan Milicevic pushed to branch feature/ARCHE-521 at cms-community / hippo-project-archetype Commits: 99962fa2 by Bert Leunis at 2016-12-13T16:07:47+01:00 ARCHE-519 update link to documentation page - - - - - 096aba0d by Tobias Jeger at 2017-01-09T16:02:32+01:00 ARCHE-16 Update copyright year of NOTICE file to 2017 - - - - - efe4aae3 by Marijan Milicevic at 2017-01-23T12:44:43+01:00 Merge branch 'master' into feature/ARCHE-521 - - - - - 2 changed files: - NOTICE - src/main/resources/archetype-resources/conf/context.xml Changes: = NOTICE = --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Hippo CMS7 Project Archetype -Copyright 2010-2016 Hippo B.V., Amsterdam, The Netherlands (http://www.onehippo.com/) +Copyright 2010-2017 Hippo B.V., Amsterdam, The Netherlands (http://www.onehippo.com/) This product includes software developed by: Hippo B.V., Amsterdam, The Netherlands (http://www.onehippo.com/); = src/main/resources/archetype-resources/conf/context.xml = --- a/src/main/resources/archetype-resources/conf/context.xml +++ b/src/main/resources/archetype-resources/conf/context.xml @@ -15,7 +15,7 @@ --> + see: https://www.onehippo.org/library/development/create-a-selenium-test-case.html --> View it on GitLab: https://code.onehippo.org/cms-community/hippo-project-archetype/compare/33604eaeac8b88742014a89488030ad6b18cf127...efe4aae3a8b171b45bd703d46c292c868157d3e3 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1046] ESSENTIALS-1046 Improve handling of missing project.basedir property
Marijan Milicevic pushed to branch feature/ESSENTIALS-1046 at cms-community /
hippo-essentials
Commits:
714672bd by Marijan Milicevic at 2017-02-10T12:32:20+01:00
ESSENTIALS-1046 Improve handling of missing project.basedir property
- log error messages without stacktrace (stacktrace logged only in debug mode)
- - - - -
2 changed files:
-
dashboard/src/main/java/org/onehippo/cms7/essentials/filters/RequirementsCheckFilter.java
-
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/ProjectUtils.java
Changes:
=
dashboard/src/main/java/org/onehippo/cms7/essentials/filters/RequirementsCheckFilter.java
=
---
a/dashboard/src/main/java/org/onehippo/cms7/essentials/filters/RequirementsCheckFilter.java
+++
b/dashboard/src/main/java/org/onehippo/cms7/essentials/filters/RequirementsCheckFilter.java
@@ -52,11 +52,13 @@ public class RequirementsCheckFilter implements Filter {
return;
}
if (!file.isDirectory()) {
-sendRedirect(req, res, "Directory: " + directory + " must be a
directory");
+sendRedirect(req, res, "File: " + directory + " must be a
directory");
return;
}
} catch (IllegalStateException e) {
-log.error("Error processing req", e);
+if (log.isDebugEnabled()) {
+log.error("Error processing request:", e);
+}
sendRedirect(req, res, e.getMessage());
return;
}
@@ -65,6 +67,7 @@ public class RequirementsCheckFilter implements Filter {
private void sendRedirect(final ServletRequest req, final ServletResponse
resp, final String error) throws IOException {
final HttpServletResponse response = (HttpServletResponse) resp;
+log.error(error);
req.setAttribute("error", error);
response.sendError(HttpServletResponse.SC_SERVICE_UNAVAILABLE, error);
}
=
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/ProjectUtils.java
=
---
a/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/ProjectUtils.java
+++
b/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/ProjectUtils.java
@@ -116,7 +116,7 @@ public final class ProjectUtils {
if (System.getProperty(EssentialConst.PROJECT_BASEDIR_PROPERTY) !=
null && !System.getProperty(EssentialConst.PROJECT_BASEDIR_PROPERTY).isEmpty())
{
return System.getProperty(EssentialConst.PROJECT_BASEDIR_PROPERTY);
}
-throw new IllegalStateException("System property 'project.basedir' was
not null or empty. Please start your application with
-D=project.basedir=/project/path");
+throw new IllegalStateException("System property 'project.basedir' was
null or empty. Please start your application with
-D=project.basedir=/project/path");
}
public static String getEssentialsModuleName() {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/commit/714672bd9161fd6cdd545c810b4f2c6b4f71939a
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-10633
Marijan Milicevic pushed new branch feature/CMS-10633 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch feature/CMS-9918
Marijan Milicevic pushed new branch feature/CMS-9918 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/CMS-9918] CMS-9918 When using the search filter in the gallery (or image picker), I want to see thumbnails
Marijan Milicevic pushed to branch feature/CMS-9918 at cms-community / hippo-cms Commits: 645d4b94 by Marijan Milicevic at 2017-03-21T15:21:11+01:00 CMS-9918 When using the search filter in the gallery (or image picker), I want to see thumbnails - move classes from gallery plugin into cms API - pass search scope to the SectionViewer plugin so we can detect when image search is done - - - - - 30 changed files: - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.properties → api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.properties - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/CalendarComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/CalendarComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/LongPropertyComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/LongPropertyComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/MimeTypeComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/MimeTypeComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/PropertyComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/PropertyComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/SizeComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/SizeComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/DatePropertyRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/DatePropertyRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ImageIconRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/ImageIconRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/MimeTypeIconRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/MimeTypeIconRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/PropertyRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/PropertyRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/SizeRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/SizeRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/StringPropertyRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/StringPropertyRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ThumbnailRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/ThumbnailRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-audio-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-audio-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-binary-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-binary-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-doc-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-doc-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-docx-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-docx-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns
[HippoCMS-scm] [Git][cms-community/hippo-cms] Deleted branch bugfix/CMS-10555
Marijan Milicevic deleted branch bugfix/CMS-10555 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10555
Marijan Milicevic pushed new branch bugfix/CMS-10555 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10555] CMS-10555 When uploading multiple images exceeds the page lock timeout not all images are uploaded
Marijan Milicevic pushed to branch bugfix/CMS-10555 at cms-community / hippo-cms
Commits:
e8db6822 by Marijan Milicevic at 2017-03-28T15:48:44+02:00
CMS-10555 When uploading multiple images exceeds the page lock timeout not all
images are uploaded
- make sure images are sent in sequence
- release page lock after image is uploaded
- - - - -
2 changed files:
-
api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/behaviors/AjaxFileUploadBehavior.java
-
api/src/main/resources/org/hippoecm/frontend/plugins/jquery/upload/multiple/fileupload-gallery-config.js
Changes:
=
api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/behaviors/AjaxFileUploadBehavior.java
=
---
a/api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/behaviors/AjaxFileUploadBehavior.java
+++
b/api/src/main/java/org/hippoecm/frontend/plugins/jquery/upload/behaviors/AjaxFileUploadBehavior.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2017 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -22,12 +22,15 @@ import java.util.Map;
import org.apache.commons.lang.StringUtils;
import org.apache.wicket.Application;
+import org.apache.wicket.Page;
+import org.apache.wicket.Session;
import org.apache.wicket.ajax.json.JSONArray;
import org.apache.wicket.ajax.json.JSONException;
import org.apache.wicket.ajax.json.JSONObject;
import org.apache.wicket.behavior.AbstractAjaxBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.upload.FileUpload;
+import org.apache.wicket.page.IPageManager;
import org.apache.wicket.protocol.http.servlet.MultipartServletWebRequest;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -180,6 +183,12 @@ public abstract class AjaxFileUploadBehavior extends
AbstractAjaxBehavior {
}
TextRequestHandler textRequestHandler = new
TextRequestHandler(contentType, encoding, responseContent);
RequestCycle.get().scheduleRequestHandlerAfterCurrent(textRequestHandler);
+// touch page and commit request so page gets released (detached)
+final Session session = Session.get();
+final IPageManager pageManager = session.getPageManager();
+final Page page = container.getPage();
+pageManager.touchPage(page);
+pageManager.commitRequest();
}
private String generateJsonResponse(final Map
uploadedFiles) {
=
api/src/main/resources/org/hippoecm/frontend/plugins/jquery/upload/multiple/fileupload-gallery-config.js
=
---
a/api/src/main/resources/org/hippoecm/frontend/plugins/jquery/upload/multiple/fileupload-gallery-config.js
+++
b/api/src/main/resources/org/hippoecm/frontend/plugins/jquery/upload/multiple/fileupload-gallery-config.js
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2014-2017 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -54,7 +54,9 @@
acceptFileTypes: /(\.)${acceptFileTypes}$/i,
dataType: 'json',
previewMaxWidth: 32,
-previewMaxHeight: 32
+previewMaxHeight: 32,
+limitMultiFileUploads:1,
+sequentialUploads:true
});
})();
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/e8db6822cdb66031de03641d788bf05a8dcc628d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-374
Marijan Milicevic pushed new branch feature/ESSENTIALS-374 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1068 added prototype page definition
Marijan Milicevic pushed to branch master at cms-community / hippo-essentials Commits: 0db3cee8 by Bert Leunis at 2017-05-08T11:19:17+02:00 ESSENTIALS-1068 added prototype page definition - - - - - 2 changed files: - plugins/simple-content/src/main/resources/META-INF/simpleContent_instructions.xml - + plugins/simple-content/src/main/resources/hst/page-prototype/page-prototype-definition.xml Changes: = plugins/simple-content/src/main/resources/META-INF/simpleContent_instructions.xml = --- a/plugins/simple-content/src/main/resources/META-INF/simpleContent_instructions.xml +++ b/plugins/simple-content/src/main/resources/META-INF/simpleContent_instructions.xml @@ -1,6 +1,6 @@ +http://www.jcp.org/jcr/sv/1.0";> + +hst:component + + +hst:prototypemeta + + +Simple Content Page + + +main + + +hst:abstractpages/base + + + + hst:containercomponent + + + Content Page Main + + + hst.vbox + + + \ No newline at end of file View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/0db3cee8e967de04b3f9ce00f5e172520944e194 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] ESSENTIALS-1068 Reintegrate feature/ESSENTIALS-1068
Marijan Milicevic pushed to branch master at cms-community / hippo-essentials Commits: 32a97ac0 by Marijan Milicevic at 2017-05-09T14:29:06+02:00 ESSENTIALS-1068 Reintegrate feature/ESSENTIALS-1068 - - - - - 0 changed files: Changes: View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/commit/32a97ac01e55ae2a9c7accfad2d771d1dd312c86 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch feature/ESSENTIALS-1068
Marijan Milicevic deleted branch feature/ESSENTIALS-1068 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] 2 commits: ESSENTIALS-1062 include feature footer for installed tools also, to show the documentation link
Marijan Milicevic pushed to branch master at cms-community / hippo-essentials Commits: 093602aa by Bert Leunis at 2017-04-14T13:38:34+02:00 ESSENTIALS-1062 include feature footer for installed tools also, to show the documentation link - - - - - 0fb8a569 by Marijan Milicevic at 2017-05-09T15:06:57+02:00 ESSENTIALS-1062 Reintegrate feature/ESSENTIALS-1062 - - - - - 1 changed file: - dashboard/src/main/webapp/directives/essentials-installed-tool.html Changes: = dashboard/src/main/webapp/directives/essentials-installed-tool.html = --- a/dashboard/src/main/webapp/directives/essentials-installed-tool.html +++ b/dashboard/src/main/webapp/directives/essentials-installed-tool.html @@ -1,5 +1,5 @@
[HippoCMS-scm] [Git][cms-community/hippo-essentials-components][master] 2 commits: ESSCOM-19 remove required option & update field label
Marijan Milicevic pushed to branch master at cms-community /
hippo-essentials-components
Commits:
1f34bb10 by Bert Leunis at 2017-04-11T11:38:08+02:00
ESSCOM-19 remove required option & update field label
- - - - -
a8d3b0aa by Marijan Milicevic at 2017-05-09T15:17:31+02:00
ESSCOM-19 Reintegrate feature/ESSCOM-19
- - - - -
3 changed files:
-
hst/src/main/java/org/onehippo/cms7/essentials/components/info/EssentialsFacetsComponentInfo.java
- repository/src/main/resources/componentparameters-translations.json
- repository/src/main/resources/hippoecm-extension.xml
Changes:
=
hst/src/main/java/org/onehippo/cms7/essentials/components/info/EssentialsFacetsComponentInfo.java
=
---
a/hst/src/main/java/org/onehippo/cms7/essentials/components/info/EssentialsFacetsComponentInfo.java
+++
b/hst/src/main/java/org/onehippo/cms7/essentials/components/info/EssentialsFacetsComponentInfo.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2014-2017 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -23,6 +23,6 @@ import org.hippoecm.hst.core.parameters.Parameter;
*/
public interface EssentialsFacetsComponentInfo {
-@Parameter(name = "facetPath", required = true)
+@Parameter(name = "facetPath")
String getFacetPath();
}
=
repository/src/main/resources/componentparameters-translations.json
=
--- a/repository/src/main/resources/componentparameters-translations.json
+++ b/repository/src/main/resources/componentparameters-translations.json
@@ -47,7 +47,7 @@
},
"EssentialsFacetsComponentInfo": {
"en": {
- "facetPath": "Facet path"
+ "facetPath": "Facet path (optional: content path can be
used also)"
}
},
"EssentialsGoogleMapsComponentInfo": {
=
repository/src/main/resources/hippoecm-extension.xml
=
--- a/repository/src/main/resources/hippoecm-extension.xml
+++ b/repository/src/main/resources/hippoecm-extension.xml
@@ -1,6 +1,6 @@
http://www.jcp.org/jcr/sv/1.0";
xmlns:ae="http://www.onehippo.org/jcr/autoexport/1.0";
sv:name="hippo:initialize" ae:id="essentials-module">
-
-
-hippo:initializeitem
-
-
-1000
-
-
-componentparameters-translations.json
-
-
+
+
+ hippo:initializeitem
+
+
+ 1000
+
+
+ componentparameters-translations.json
+
+
+ true
+
+
+ 4.0.0
+
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials-components/compare/3112729ae6ae954c0a0e1e1d6d4f5f1d97615fa0...a8d3b0aac3111a672d33bb449993ae037bb56aaf
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials-components][feature/ESSCOM-18] ESSCOM-18 Remove deprecated code
Marijan Milicevic pushed to branch feature/ESSCOM-18 at cms-community /
hippo-essentials-components
Commits:
b496712b by Marijan Milicevic at 2017-05-09T15:25:52+02:00
ESSCOM-18 Remove deprecated code
- add deprecated annotation and restore method
- - - - -
1 changed file:
-
hst/src/main/java/org/onehippo/cms7/essentials/components/utils/ComponentsUtils.java
Changes:
=
hst/src/main/java/org/onehippo/cms7/essentials/components/utils/ComponentsUtils.java
=
---
a/hst/src/main/java/org/onehippo/cms7/essentials/components/utils/ComponentsUtils.java
+++
b/hst/src/main/java/org/onehippo/cms7/essentials/components/utils/ComponentsUtils.java
@@ -222,6 +222,23 @@ public final class ComponentsUtils {
return defaultValue;
}
+
+/**
+ * Returns an array of values for a public request parameter. For use of
multiple checkboxes
+ *
+ * @param request
+ * @param paramName
+ * @return String[] value of the request parameter. null if the parameter
does not exist or is empty.
+ * @deprecated please use HST native
BaseHstComponent#getPublicRequestParameters()
+ */
+@Deprecated
+public String[] getPublicRequestParameters(final BaseHstComponent comp,
final HstRequest request, final String paramName) {
+
+final Map namespaceLessParameters =
request.getParameterMap("");
+return namespaceLessParameters.get(paramName);
+}
+
+
private ComponentsUtils() {
// prevent instantiation
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials-components/commit/b496712b66cc758d463b3017b4452db2c8325cd9
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials-components][feature/ESSCOM-16] ESSCOM-16 Method org.onehippo.cms7.essentials.components.CommonComponent#getScopeBean is static
Marijan Milicevic pushed to branch feature/ESSCOM-16 at cms-community /
hippo-essentials-components
Commits:
e0b08500 by Marijan Milicevic at 2017-05-09T15:33:13+02:00
ESSCOM-16 Method
org.onehippo.cms7.essentials.components.CommonComponent#getScopeBean is static
- add deprecated annotation
- - - - -
1 changed file:
-
hst/src/main/java/org/onehippo/cms7/essentials/components/utils/ComponentsUtils.java
Changes:
=
hst/src/main/java/org/onehippo/cms7/essentials/components/utils/ComponentsUtils.java
=
---
a/hst/src/main/java/org/onehippo/cms7/essentials/components/utils/ComponentsUtils.java
+++
b/hst/src/main/java/org/onehippo/cms7/essentials/components/utils/ComponentsUtils.java
@@ -231,6 +231,7 @@ public final class ComponentsUtils {
* @return String[] value of the request parameter. null if the parameter
does not exist or is empty.
* @deprecated please use HST native
BaseHstComponent#getPublicRequestParameters()
*/
+@Deprecated
public String[] getPublicRequestParameters(final BaseHstComponent comp,
final HstRequest request, final String paramName) {
final Map namespaceLessParameters =
request.getParameterMap("");
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials-components/commit/e0b0850086b9a5dc8b26987308159105354d2f39
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials-components][master] 3 commits: ESSCOM-16 deprecated the static method
Marijan Milicevic pushed to branch master at cms-community /
hippo-essentials-components
Commits:
68c91670 by Bert Leunis at 2017-02-23T15:34:19+01:00
ESSCOM-16 deprecated the static method
- - - - -
e0b08500 by Marijan Milicevic at 2017-05-09T15:33:13+02:00
ESSCOM-16 Method
org.onehippo.cms7.essentials.components.CommonComponent#getScopeBean is static
- add deprecated annotation
- - - - -
c4eda7f4 by Marijan Milicevic at 2017-05-09T15:34:08+02:00
ESSCOM-16 Reintegrate feature/ESSCOM-16
- - - - -
3 changed files:
- hst/src/main/java/org/onehippo/cms7/essentials/components/CommonComponent.java
-
hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsBlogAuthorPostsComponent.java
-
hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsListComponent.java
Changes:
=
hst/src/main/java/org/onehippo/cms7/essentials/components/CommonComponent.java
=
---
a/hst/src/main/java/org/onehippo/cms7/essentials/components/CommonComponent.java
+++
b/hst/src/main/java/org/onehippo/cms7/essentials/components/CommonComponent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2014-2017 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -223,6 +223,7 @@ public abstract class CommonComponent extends
BaseHstComponent {
*
* @param path document (or folder) path relative to site-root
* @return bean identified by path. Site root bean if path empty or no
corresponding bean.
+ * @deprecated use the non-static {@code doGetScopeBean()} instead.
*/
public static HippoBean getScopeBean(final String path) {
final HstRequestContext context = RequestContextProvider.get();
@@ -240,6 +241,28 @@ public abstract class CommonComponent extends
BaseHstComponent {
return siteBean;
}
+/**
+ * Find HippoBean for given path. If path is null or empty, site root bean
will be returned.
+ *
+ * @param path document (or folder) path relative to site-root.
+ * @return bean identified by path. Site root bean if path empty or no
corresponding bean.
+ */
+public HippoBean doGetScopeBean(final String path) {
+final HstRequestContext context = RequestContextProvider.get();
+final HippoBean siteBean = context.getSiteContentBaseBean();
+
+if (!Strings.isNullOrEmpty(path)) {
+final String myPath = PathUtils.normalizePath(path);
+log.debug("Looking for bean {}", myPath);
+HippoBean scope = siteBean.getBean(myPath);
+if (scope != null) {
+return scope;
+}
+log.warn("Bean was null for selected path: {}", myPath);
+}
+return siteBean;
+}
+
public int getAnyIntParameter(HstRequest request, String parameter, int
defaultValue) {
return SiteUtils.getAnyIntParameter(request, parameter, defaultValue,
this);
}
=
hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsBlogAuthorPostsComponent.java
=
---
a/hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsBlogAuthorPostsComponent.java
+++
b/hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsBlogAuthorPostsComponent.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2014-2017 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -69,7 +69,7 @@ public class EssentialsBlogAuthorPostsComponent extends
EssentialsListComponent
if (scopePath != null && scopePath.startsWith("/")) {
scopePath = SiteUtils.relativePathFrom(scopePath, context);
}
-final HippoBean scopeBean = getScopeBean(scopePath);
+final HippoBean scopeBean = doGetScopeBean(scopePath);
try {
for (AuthorEntry author : authors) {
final HstQuery hstQuery =
ContentBeanUtils.createIncomingBeansQuery(author, scopeBean, getSearchDepth(),
clazz, true);
=
hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsListComponent.java
=
---
a/hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsListComponent.java
+++
b/hst/src/main/java/org/onehippo/cms7/essentials/components/EssentialsListComponent.java
@@ -120,7 +120,7 @@ public class EssentialsListComponent extends
CommonComponent {
}
if (scope == null) {
-scope = ge
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] 4 commits: ESSENTIALS-1063 click on label toggles the checkbox
Marijan Milicevic pushed to branch master at cms-community / hippo-essentials
Commits:
091c8e68 by Bert Leunis at 2017-04-14T13:56:27+02:00
ESSENTIALS-1063 click on label toggles the checkbox
- - - - -
8fd68478 by jasper.floor at 2017-05-09T16:38:24+02:00
ESSENTIALS-1063 label radio
- - - - -
190ec87d by jasper.floor at 2017-05-09T16:57:40+02:00
ESSENTIALS-1063 Merge master changes in feature/ESSENTIALS-1063
- - - - -
316f8d6f by Marijan Milicevic at 2017-05-10T10:47:41+02:00
ESSENTIALS-1063 Reintegrate feature/ESSENTIALS-1063
- - - - -
1 changed file:
-
plugins/bean-writer/src/main/resources/META-INF/resources/tool/beanwriter/beanwriter.html
Changes:
=
plugins/bean-writer/src/main/resources/META-INF/resources/tool/beanwriter/beanwriter.html
=
---
a/plugins/bean-writer/src/main/resources/META-INF/resources/tool/beanwriter/beanwriter.html
+++
b/plugins/bean-writer/src/main/resources/META-INF/resources/tool/beanwriter/beanwriter.html
@@ -27,14 +27,18 @@
-
-{{image}}
-{{image}}
+
+
+{{image}}
+{{image}}
+
-
-Update existing methods so they will use the
selected imageset too.
+
+
+Update existing methods so
they will use the selected imageset too.
+
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/0fb8a569372f6cc9235a95cdf29d28c4f1f33d4e...316f8d6f8e93193096e882b3b9121f7b21c64488
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-translations][master] ESSCOM-19 Make facet path of facets component optional
Marijan Milicevic pushed to branch master at cms-community /
hippo-cms-translations
Commits:
250f0c10 by Marijan Milicevic at 2017-05-10T12:08:07+02:00
ESSCOM-19 Make facet path of facets component optional
- - - - -
2 changed files:
-
hippo-essentials-components/resources/componentparameters-translations.registry.json
- hippo-essentials-components/resources/componentparameters-translations_en.json
Changes:
=
hippo-essentials-components/resources/componentparameters-translations.registry.json
=
---
a/hippo-essentials-components/resources/componentparameters-translations.registry.json
+++
b/hippo-essentials-components/resources/componentparameters-translations.registry.json
@@ -90,8 +90,14 @@
"locales" : null
},
"hippo:hst.componentparameters.org.onehippo.cms7.essentials.components.info.EssentialsFacetsComponentInfo/facetPath"
: {
- "status" : "CLEAN",
- "locales" : null
+ "status" : "UPDATED",
+ "locales" : {
+"de" : "UNRESOLVED",
+"fr" : "UNRESOLVED",
+"nl" : "UNRESOLVED",
+"zh" : "UNRESOLVED",
+"es" : "UNRESOLVED"
+ }
},
"hippo:hst.componentparameters.org.onehippo.cms7.essentials.components.info.EssentialsGoogleMapsComponentInfo/mapType#TERRAIN"
: {
"status" : "CLEAN",
=
hippo-essentials-components/resources/componentparameters-translations_en.json
=
---
a/hippo-essentials-components/resources/componentparameters-translations_en.json
+++
b/hippo-essentials-components/resources/componentparameters-translations_en.json
@@ -27,7 +27,7 @@
"documentDateField": "Field that contains document date (for hiding)",
"documentTypes": "Events document types (comma separated)"
}},
- "EssentialsFacetsComponentInfo": {"en": {"facetPath": "Facet path"}},
+ "EssentialsFacetsComponentInfo": {"en": {"facetPath": "Facet path (optional:
content path can be used also)"}},
"EssentialsGoogleMapsComponentInfo": {"en": {
"mapType#TERRAIN": "Terrain information",
"mapType.help": "The type of map to show",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms-translations/commit/250f0c1009877e35a77f3282ee5494617a89628b
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1072
Marijan Milicevic pushed new branch feature/ESSENTIALS-1072 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/4.2] 2 commits: CMS-10721 search image thumbnails (backport CMS-9918)
Marijan Milicevic pushed to branch release/4.2 at cms-community / hippo-cms Commits: 9e5194be by jasper.floor at 2017-05-04T16:57:21+02:00 CMS-10721 search image thumbnails (backport CMS-9918) - - - - - 559b5800 by Marijan Milicevic at 2017-05-10T16:26:00+02:00 CMS-10721 Back port to 11.2: When using the search filter in the gallery (or image picker), I want to see thumbnails - - - - - 30 changed files: - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.html - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageContainer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/Translations.properties → api/src/main/java/org/hippoecm/frontend/plugins/gallery/Translations.properties - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/FallbackImageGalleryListColumnProvider.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/ImageGalleryColumnProviderPlugin.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/CalendarComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/CalendarComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/LongPropertyComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/LongPropertyComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/MimeTypeComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/MimeTypeComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/PropertyComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/PropertyComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/compare/SizeComparator.java → api/src/main/java/org/hippoecm/frontend/plugins/gallery/compare/SizeComparator.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/DatePropertyRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/DatePropertyRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ImageIconRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/ImageIconRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/MimeTypeIconRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/MimeTypeIconRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/PropertyRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/PropertyRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/SizeRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/SizeRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/StringPropertyRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/StringPropertyRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/ThumbnailRenderer.java → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/ThumbnailRenderer.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-audio-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-audio-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-binary-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-binary-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-doc-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-doc-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res/mimetype-docx-16.png → api/src/main/java/org/hippoecm/frontend/plugins/standards/list/render/res/mimetype-docx-16.png - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/columns/render/res
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/10722] CMS-10722 Back port to 10.2: When using the search filter in the gallery (or ima…
Marijan Milicevic pushed to branch feature/10722 at cms-community / hippo-cms
Commits:
b0a3d22b by Marijan Milicevic at 2017-05-11T14:36:52+02:00
CMS-10722 Back port to 10.2: When using the search filter in the gallery (or
image picker), I want to see thumbnails
- fix css append model
- - - - -
2 changed files:
- api/src/main/styling/styles/_image_gallery.scss
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageGalleryPlugin.java
Changes:
=
api/src/main/styling/styles/_image_gallery.scss
=
--- a/api/src/main/styling/styles/_image_gallery.scss
+++ b/api/src/main/styling/styles/_image_gallery.scss
@@ -33,7 +33,7 @@
&.image-gallery-thumbnails tbody {
tr {
- display: flex;
+ display: inline-block;
&:first-child {
border-top: 1px solid transparent;
}
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageGalleryPlugin.java
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageGalleryPlugin.java
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/ImageGalleryPlugin.java
@@ -27,6 +27,7 @@ import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import
org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDataProvider;
import org.apache.wicket.markup.ComponentTag;
+import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.Model;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
@@ -61,8 +62,12 @@ public class ImageGalleryPlugin extends
ExpandCollapseListingPlugin {
setClassName(DocumentListColumn.DOCUMENT_LIST_CSS_CLASS);
add(CssClass.append("image-gallery"));
-add(CssClass.append(Model.of(mode == LIST ? "image-gallery-list" :
"image-gallery-thumbnails")));
-
+add(CssClass.append(new AbstractReadOnlyModel() {
+@Override
+public String getObject() {
+return mode == LIST ? "image-gallery-list" :
"image-gallery-thumbnails";
+}
+}));
addButton(new GalleryModeButton("listButton", LIST, Icon.LIST_UL));
addButton(new GalleryModeButton("thumbnailsButton", THUMBNAILS,
Icon.THUMBNAILS));
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/b0a3d22b637f98f510247e80e8685ea16961e3e9
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections] Pushed new branch bugfix/HIPPLUG-1460
Marijan Milicevic pushed new branch bugfix/HIPPLUG-1460 at cms-community / hippo-plugin-selections ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][feature/10722] CMS-10722 Back port to 10.2: When using the search filter in the gallery (or ima…
Marijan Milicevic pushed to branch feature/10722 at cms-community / hippo-cms
Commits:
6873b647 by Marijan Milicevic at 2017-05-15T17:24:51+02:00
CMS-10722 Back port to 10.2: When using the search filter in the gallery (or
image picker), I want to see thumbnails
- fix search view css appender
- - - - -
1 changed file:
-
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/browse/list/ImageSearchViewPlugin.java
Changes:
=
perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/browse/list/ImageSearchViewPlugin.java
=
---
a/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/browse/list/ImageSearchViewPlugin.java
+++
b/perspectives/src/main/java/org/hippoecm/frontend/plugins/cms/browse/list/ImageSearchViewPlugin.java
@@ -23,6 +23,7 @@ import javax.jcr.Node;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
//import org.hippoecm.frontend.model.ReadOnlyModel;
+import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.Model;
import org.hippoecm.frontend.plugin.IPluginContext;
import org.hippoecm.frontend.plugin.config.IPluginConfig;
@@ -57,9 +58,13 @@ public final class ImageSearchViewPlugin extends
SearchViewPlugin {
public ImageSearchViewPlugin(final IPluginContext context, final
IPluginConfig config) {
super(context, config);
-
add(CssClass.append("image-gallery"));
-add(CssClass.append(Model.of(mode == LIST ? "image-gallery-list" :
"image-gallery-thumbnails")));
+add(CssClass.append(new AbstractReadOnlyModel() {
+@Override
+public String getObject() {
+return mode == LIST ? "image-gallery-list" :
"image-gallery-thumbnails";
+}
+}));
addButton(new GalleryModeButton("listButton", LIST, Icon.LIST_UL));
addButton(new GalleryModeButton("thumbnailsButton", THUMBNAILS,
Icon.THUMBNAILS));
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/6873b647bfae22f5a4b5a97eca249f5e4a06d8ef
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][feature/ESSENTIALS-1073] ESSENTIALS-1073 Create Essentials plugin for URL Rewriter (enterprise add-on)
Marijan Milicevic pushed to branch feature/ESSENTIALS-1073 at cms-community / hippo-essentials Commits: 41a93451 by Marijan Milicevic at 2017-06-01T13:52:14+02:00 ESSENTIALS-1073 Create Essentials plugin for URL Rewriter (enterprise add-on) - update copyright year - - - - - 2 changed files: - dashboard-dependencies/pom.xml - plugins/pom.xml Changes: = dashboard-dependencies/pom.xml = --- a/dashboard-dependencies/pom.xml +++ b/dashboard-dependencies/pom.xml @@ -1,6 +1,6 @@
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Deleted branch feature/ESSENTIALS-1045-A
Marijan Milicevic deleted branch feature/ESSENTIALS-1045-A at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-1076
Marijan Milicevic pushed new branch feature/ESSENTIALS-1076 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] 2 commits: ESSENTIALS-1076 Add personalization plugins to essentials project
Marijan Milicevic pushed to branch master at cms-community / hippo-essentials Commits: fe83402b by Marijan Milicevic at 2017-06-26T10:46:53+02:00 ESSENTIALS-1076 Add personalization plugins to essentials project - - - - - a6cec0ca by Marijan Milicevic at 2017-06-26T10:48:39+02:00 ESSENTIALS-1076 Reintegrate feature/ESSENTIALS-1076 - - - - - 30 changed files: - dashboard-dependencies/pom.xml - + plugins/bloomreach-connector/pom.xml - + plugins/bloomreach-connector/src/main/java/org/onehippo/cms7/essentials/bloomreach/connector/rest/BloomreachConnectorResource.java - + plugins/bloomreach-connector/src/main/java/org/onehippo/cms7/essentials/bloomreach/connector/rest/ResourceData.java - + plugins/bloomreach-connector/src/main/resources/META-INF/resources/images/bloomreachConnector.png - + plugins/bloomreach-connector/src/main/resources/META-INF/resources/tool/bloomreachConnector/bloomreachConnector.html - + plugins/bloomreach-connector/src/main/resources/META-INF/resources/tool/bloomreachConnector/bloomreachConnector.js - + plugins/bloomreach-connector/src/main/resources/META-INF/web-fragment.xml - + plugins/bloomreach-connector/src/main/resources/bloomreachResourcetemplate.xml - + plugins/bloomreach-connector/src/main/resources/plugin-descriptor.json - + plugins/bloomreach-connector/src/test/resources/log4j2.xml - + plugins/more-like-this/pom.xml - + plugins/more-like-this/src/main/resources/META-INF/moreLikeThisPlugin_instructions.xml - + plugins/more-like-this/src/main/resources/META-INF/resources/feature/moreLikeThisPlugin/moreLikeThisPlugin.html - + plugins/more-like-this/src/main/resources/META-INF/resources/images/bloomreach-more-like-this.png - + plugins/more-like-this/src/main/resources/META-INF/web-fragment.xml - + plugins/more-like-this/src/main/resources/css/product-grid.css - + plugins/more-like-this/src/main/resources/freemarker/bloomreach-more-like-this.ftl - + plugins/more-like-this/src/main/resources/freemarker/bloomreach-more-like-this.properties - + plugins/more-like-this/src/main/resources/freemarker/bloomreach-more-like-this/bloomreach-more-like-this-flow.ftl - + plugins/more-like-this/src/main/resources/hst/bloomreach-more-like-this-freemarker.xml - + plugins/more-like-this/src/main/resources/images/bloomreach-more-like-this.png - + plugins/more-like-this/src/main/resources/plugin-descriptor.json - + plugins/more-like-this/src/main/resources/xml/bloomreach-related-products.xml - plugins/pom.xml - + plugins/products-category/pom.xml - + plugins/products-category/src/main/resources/META-INF/productsCategoryPlugin_instructions.xml - + plugins/products-category/src/main/resources/META-INF/resources/feature/productsCategoryPlugin/productsCategoryPlugin.html - + plugins/products-category/src/main/resources/META-INF/resources/images/bloomreach-products-category.png - + plugins/products-category/src/main/resources/META-INF/web-fragment.xml The diff was not included because it is too large. View it on GitLab: https://code.onehippo.org/cms-community/hippo-essentials/compare/d5f0a4c2308dfe3acf0bf857f1926af1c0a62f45...a6cec0caadb35cb5e8b861b2c957b8a351e81d62 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-1078
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-1078 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][master] 2 commits: ESSENTIALS-1078 Remove unnecessary dependency and default data for Bloomreach connector plugin
Marijan Milicevic pushed to branch master at cms-community / hippo-essentials
Commits:
7a7c1a9e by Marijan Milicevic at 2017-06-26T15:44:49+02:00
ESSENTIALS-1078 Remove unnecessary dependency and default data for Bloomreach
connector plugin
- remove xercesImpl dependency
- use user input for domainKey
- - - - -
7e992fa1 by Marijan Milicevic at 2017-06-26T15:46:13+02:00
ESSENTIALS-1078 Reintegrate bugfix/ESSENTIALS-1078
- - - - -
3 changed files:
- plugins/bloomreach-connector/pom.xml
-
plugins/bloomreach-connector/src/main/java/org/onehippo/cms7/essentials/bloomreach/connector/rest/ResourceData.java
-
plugins/bloomreach-connector/src/main/resources/META-INF/resources/tool/bloomreachConnector/bloomreachConnector.html
Changes:
=
plugins/bloomreach-connector/pom.xml
=
--- a/plugins/bloomreach-connector/pom.xml
+++ b/plugins/bloomreach-connector/pom.xml
@@ -30,12 +30,6 @@
hippo-essentials-plugin-bloomreach-connector
-
-
-
- xerces
- xercesImpl
-
org.onehippo.cms7
hippo-essentials-plugin-sdk-api
=
plugins/bloomreach-connector/src/main/java/org/onehippo/cms7/essentials/bloomreach/connector/rest/ResourceData.java
=
---
a/plugins/bloomreach-connector/src/main/java/org/onehippo/cms7/essentials/bloomreach/connector/rest/ResourceData.java
+++
b/plugins/bloomreach-connector/src/main/java/org/onehippo/cms7/essentials/bloomreach/connector/rest/ResourceData.java
@@ -21,7 +21,7 @@ public class ResourceData {
private String resourceName;
private String realm;
private String authKey;
-private String domainKey = "bloomique_com";
+private String domainKey = "";
private String accountId;
private String fl;
private String baseUrl;
=
plugins/bloomreach-connector/src/main/resources/META-INF/resources/tool/bloomreachConnector/bloomreachConnector.html
=
---
a/plugins/bloomreach-connector/src/main/resources/META-INF/resources/tool/bloomreachConnector/bloomreachConnector.html
+++
b/plugins/bloomreach-connector/src/main/resources/META-INF/resources/tool/bloomreachConnector/bloomreachConnector.html
@@ -62,6 +62,12 @@
+ Domain key:
+
+
+
+
+
Base url:
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-essentials/compare/a6cec0caadb35cb5e8b861b2c957b8a351e81d62...7e992fa1903839260ab913d41eb190a20e2c31dc
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-1081
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-1081 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-1086
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-1086 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release] Pushed new branch feature/CMS-10824
Marijan Milicevic pushed new branch feature/CMS-10824 at cms-community / hippo-cms-release ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms-release][master] 2 commits: CMS-10824 Add CRISP version to the release pom
Marijan Milicevic pushed to branch master at cms-community / hippo-cms-release Commits: 341314bd by Marijan Milicevic at 2017-07-05T16:12:49+02:00 CMS-10824 Add CRISP version to the release pom - - - - - 6619745e by Marijan Milicevic at 2017-07-05T16:16:45+02:00 CMS-10824 Reintegrate feature/CMS-10824 - - - - - 1 changed file: - pom.xml Changes: = pom.xml = --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ 4.0.0-SNAPSHOT 4.0.0-SNAPSHOT 4.0.0-SNAPSHOT - +1.0.0 2.0.0-SNAPSHOT View it on GitLab: https://code.onehippo.org/cms-community/hippo-cms-release/compare/a7ebaf029ec36e8c88aa0d21c2959d0396458e6d...6619745e0312c7fc3163fa7f5766f57ada1c6cc8 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy] Pushed new branch feature/HIPPLUG-1491
Marijan Milicevic pushed new branch feature/HIPPLUG-1491 at cms-community / hippo-plugin-taxonomy --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-plugin-taxonomy/tree/feature/HIPPLUG-1491 You're receiving this email because of your account on code.onehippo.org. ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-taxonomy] Pushed new branch bugfix/HIPPLUG-1263
Marijan Milicevic pushed new branch bugfix/HIPPLUG-1263 at cms-community / hippo-plugin-taxonomy ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch bugfix/REPO-1442
Marijan Milicevic pushed new branch bugfix/REPO-1442 at cms-community / hippo-repository ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][bugfix/REPO-1442] REPO-1442 HardHandleUpdateVisitor: convert document in case version history is missing
Marijan Milicevic pushed to branch bugfix/REPO-1442 at cms-community /
hippo-repository
Commits:
93ab5812 by Marijan Milicevic at 2016-03-02T12:19:57+01:00
REPO-1442 HardHandleUpdateVisitor: convert document in case version history is
missing
- log warning on failed history item removal
- - - - -
1 changed file:
-
upgrade/handlemigration/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryRemover.java
Changes:
=
upgrade/handlemigration/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryRemover.java
=
---
a/upgrade/handlemigration/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryRemover.java
+++
b/upgrade/handlemigration/src/main/java/org/apache/jackrabbit/core/version/VersionHistoryRemover.java
@@ -20,14 +20,25 @@ import javax.jcr.version.VersionHistory;
import org.hippoecm.repository.decorating.SessionDecorator;
import org.hippoecm.repository.decorating.VersionHistoryDecorator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
-public class VersionHistoryRemover {
+public final class VersionHistoryRemover {
-public static void removeVersionHistory(VersionHistory versionHistory)
throws RepositoryException {
-final VersionHistoryImpl versionHistoryImpl = (VersionHistoryImpl)
VersionHistoryDecorator.unwrap(versionHistory);
-final InternalVersionHistoryImpl internalVersionHistory =
(InternalVersionHistoryImpl) versionHistoryImpl.getInternalVersionHistory();
-final InternalVersionManager versionManager =
internalVersionHistory.getVersionManager();
-
versionManager.removeVersionHistory(SessionDecorator.unwrap(versionHistory.getSession()),
internalVersionHistory);
+private static final Logger log =
LoggerFactory.getLogger(VersionHistoryRemover.class);
+
+private VersionHistoryRemover() {
+}
+
+public static void removeVersionHistory(VersionHistory versionHistory) {
+try {
+final VersionHistoryImpl versionHistoryImpl = (VersionHistoryImpl)
VersionHistoryDecorator.unwrap(versionHistory);
+final InternalVersionHistoryImpl internalVersionHistory =
(InternalVersionHistoryImpl) versionHistoryImpl.getInternalVersionHistory();
+final InternalVersionManager versionManager =
internalVersionHistory.getVersionManager();
+
versionManager.removeVersionHistory(SessionDecorator.unwrap(versionHistory.getSession()),
internalVersionHistory);
+} catch (RepositoryException e) {
+log.warn("History item not removed", e);
+}
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/93ab5812602f0fe742b9bb427aee5f032920100f
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-9962
Marijan Milicevic pushed new branch bugfix/CMS-9962 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-9880
Marijan Milicevic pushed new branch bugfix/CMS-9880 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9880] CMS-9880 Cropping is not very user-friendly when working with larger resolution images
Marijan Milicevic pushed to branch bugfix/CMS-9880 at cms-community / hippo-cms
Commits:
12a50fd1 by Marijan Milicevic at 2016-03-10T13:31:59+01:00
CMS-9880 Cropping is not very user-friendly when working with larger resolution
images
- apply on-fly changes
- - - - -
7 changed files:
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.properties
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog_de.properties
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog_fr.properties
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog_nl.properties
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js
Changes:
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html
@@ -29,6 +29,8 @@
+
+
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
@@ -33,10 +33,11 @@ import javax.jcr.RepositoryException;
import org.apache.jackrabbit.JcrConstants;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.form.AjaxCheckBox;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.HiddenField;
import org.apache.wicket.markup.html.panel.EmptyPanel;
import org.apache.wicket.model.IModel;
@@ -82,7 +83,7 @@ public class ImageCropEditorDialog extends
AbstractDialog {
private Dimension configuredDimension;
private Dimension thumbnailDimension;
private float compressionQuality;
-private boolean fitFullScreenSize = true;
+private boolean fitFullScreenSize;
public ImageCropEditorDialog(IModel jcrImageNodeModel,
GalleryProcessor galleryProcessor) {
super(jcrImageNodeModel);
@@ -142,9 +143,7 @@ public class ImageCropEditorDialog extends
AbstractDialog {
Label thumbnailSize = new Label("thumbnail-size", new
StringResourceModel("thumbnail-size", this, null));
thumbnailSize.setOutputMarkupId(true);
add(thumbnailSize);
-
-
-// TODO: get fitFullScreenSize from settings (?)
+//
final ImageCropSettings cropSettings = new
ImageCropSettings(regionField.getMarkupId(),
imagePreviewContainer.getMarkupId(),
originalImageDimension,
@@ -153,7 +152,31 @@ public class ImageCropEditorDialog extends
AbstractDialog {
isUpscalingEnabled,
fitFullScreenSize,
thumbnailSize.getMarkupId(true));
-originalImage.add(new ImageCropBehavior(cropSettings));
+final ImageCropBehavior imageCropBehavior = new
ImageCropBehavior(cropSettings);
+final IModel fitFullScreenSizeModel = new
PropertyModel<>(this, "fitFullScreenSize");
+final AjaxCheckBox fullScreenCheckbox = new
AjaxCheckBox("fit-fullscreen", fitFullScreenSizeModel) {
+private static final long serialVersionUID = 1L;
+
+@Override
+protected void onUpdate(AjaxRequestTarget target) {
+final String updateScript =
imageCropBehavior.getUpdateScript();
+/**
+ * NOTE: this calls widget {@code update()} method,
+ * which dispatches call js call to {@code render()} method
+ */
+target.appendJavaScript(updateScript);
+}
+
+};
+fullScreenCheckbox.setOutputMarkupId(true);
+add(fullScreenCheckbox);
+// add label
+final Label fitFullScreenSizeLabel = new Label("fit-fullscreen-label",
new StringResourceModel("fit-fullscreen", this, null));
+fitFullScreenSize
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9880] CMS-9880 Cropping is not very user-friendly when working with larger resolution images
Marijan Milicevic pushed to branch bugfix/CMS-9880 at cms-community / hippo-cms
Commits:
81a3a9f1 by Marijan Milicevic at 2016-03-10T13:48:48+01:00
CMS-9880 Cropping is not very user-friendly when working with larger resolution
images
- remove log statement
- - - - -
1 changed file:
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js
Changes:
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js
@@ -299,7 +299,7 @@ if (!YAHOO.hippo.ImageCropper) {
calculateRatio: function(me) {
var fs = me.fullScreenMode;
// need this check here because of timing issue:
-// it happens that original size is 0:
+// it happens that original image size is 0 (async loading
issue):
if (!me.initOriginal(me)) {
return;
}
@@ -335,7 +335,6 @@ if (!YAHOO.hippo.ImageCropper) {
},
initOriginal: function(me) {
if (!me.validSize(me)) {
-console.log(" AGAIN ===");
me.original_width = me.originalImage.offsetWidth;
me.original_height = me.originalImage.offsetHeight;
return me.validSize(me);
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/81a3a9f1f39dbf216d64b6ad063ac288d554b861
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9880] CMS-9880 Cropping is not very user-friendly when working with larger resolution images
Marijan Milicevic pushed to branch bugfix/CMS-9880 at cms-community / hippo-cms
Commits:
18394f2c by Marijan Milicevic at 2016-03-10T14:55:15+01:00
CMS-9880 Cropping is not very user-friendly when working with larger resolution
images
- rename label and fields into fitView (fit-view)
- initialize image size in on load statement )_render)
- - - - -
8 changed files:
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.properties
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog_de.properties
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog_fr.properties
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog_nl.properties
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/ImageCropSettings.java
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js
Changes:
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html
@@ -30,7 +30,7 @@
-
+
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java
@@ -83,7 +83,7 @@ public class ImageCropEditorDialog extends
AbstractDialog {
private Dimension configuredDimension;
private Dimension thumbnailDimension;
private float compressionQuality;
-private boolean fitFullScreenSize;
+private boolean fitView;
public ImageCropEditorDialog(IModel jcrImageNodeModel,
GalleryProcessor galleryProcessor) {
super(jcrImageNodeModel);
@@ -150,11 +150,11 @@ public class ImageCropEditorDialog extends
AbstractDialog {
configuredDimension,
thumbnailDimension,
isUpscalingEnabled,
-fitFullScreenSize,
+fitView,
thumbnailSize.getMarkupId(true));
final ImageCropBehavior imageCropBehavior = new
ImageCropBehavior(cropSettings);
-final IModel fitFullScreenSizeModel = new
PropertyModel<>(this, "fitFullScreenSize");
-final AjaxCheckBox fullScreenCheckbox = new
AjaxCheckBox("fit-fullscreen", fitFullScreenSizeModel) {
+final IModel fitViewModel = new PropertyModel<>(this,
"fitView");
+final AjaxCheckBox fitViewCheckbox = new AjaxCheckBox("fit-view",
fitViewModel) {
private static final long serialVersionUID = 1L;
@Override
@@ -168,12 +168,12 @@ public class ImageCropEditorDialog extends
AbstractDialog {
}
};
-fullScreenCheckbox.setOutputMarkupId(true);
-add(fullScreenCheckbox);
+fitViewCheckbox.setOutputMarkupId(true);
+add(fitViewCheckbox);
// add label
-final Label fitFullScreenSizeLabel = new Label("fit-fullscreen-label",
new StringResourceModel("fit-fullscreen", this, null));
-fitFullScreenSizeLabel.setOutputMarkupId(true);
-add(fitFullScreenSizeLabel);
+final Label fitViewLabel = new Label("fit-view-label", new
StringResourceModel("fit-view", this, null));
+fitViewLabel.setOutputMarkupId(true);
+add(fitViewLabel);
originalImage.add(imageCropBehavior);
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.properties
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.properties
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.properties
@@ -3,4 +3,4 @@ preview-title=Preview
preview-description-enabled=Please select which part of the original image you
wish to use.
preview-description-disabled=Please select which part of the original image
you wish to use. The preview cannot be displayed because the thumbnail
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9880] CMS-9962 IE11 throws createStyleSheet error: method not supported
Marijan Milicevic pushed to branch bugfix/CMS-9880 at cms-community / hippo-cms
Commits:
90a3859f by Marijan Milicevic at 2016-03-14T16:01:55+01:00
CMS-9962 IE11 throws createStyleSheet error: method not supported
- add wicket 6.19 IE less than 11 check
- - - - -
1 changed file:
-
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
Changes:
=
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
=
---
a/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
+++
b/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
@@ -151,7 +151,11 @@
});
};
-if (Wicket.Browser.isIELessThan11()) {
+if (Wicket.Browser.isIE()) {
+var lessThan11 = !Wicket.Browser.isSafari() && typeof(document.all)
!== "undefined" && typeof(window.opera) === "undefined";
+if(lessThan11) {
+return;
+}
CKEDITOR_READY.when(function() {
/*
Replace CKEditor's 'appendStyleText' method. IE < 11 chokes on
the original because it calls createStyleSheet()
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/90a3859f2826b271c2a93793b0618c2c41bd958e
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9880] CMS-9962 IE11 throws createStyleSheet error: method not supported
Marijan Milicevic pushed to branch bugfix/CMS-9880 at cms-community / hippo-cms
Commits:
7a168a87 by Marijan Milicevic at 2016-03-14T16:27:10+01:00
CMS-9962 IE11 throws createStyleSheet error: method not supported
- add wicket 6.19 IE less than 11 check
- - - - -
1 changed file:
-
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
Changes:
=
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
=
---
a/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
+++
b/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
@@ -153,7 +153,7 @@
if (Wicket.Browser.isIE()) {
var lessThan11 = !Wicket.Browser.isSafari() && typeof(document.all)
!== "undefined" && typeof(window.opera) === "undefined";
-if(lessThan11) {
+if(!lessThan11) {
return;
}
CKEDITOR_READY.when(function() {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/7a168a877b21301a5fd1ac5984a6f43515ef9106
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9880] 2 commits: Revert "CMS-9962 IE11 throws createStyleSheet error: method not supported"
Marijan Milicevic pushed to branch bugfix/CMS-9880 at cms-community / hippo-cms
Commits:
aaf108b9 by Marijan Milicevic at 2016-03-15T13:01:32+01:00
Revert "CMS-9962 IE11 throws createStyleSheet error: method not
supported"
This reverts commit 7a168a877b21301a5fd1ac5984a6f43515ef9106.
- - - - -
d35a6295 by Marijan Milicevic at 2016-03-15T13:01:42+01:00
Revert "CMS-9962 IE11 throws createStyleSheet error: method not
supported"
This reverts commit 90a3859f2826b271c2a93793b0618c2c41bd958e.
- - - - -
1 changed file:
-
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
Changes:
=
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
=
---
a/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
+++
b/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
@@ -151,11 +151,7 @@
});
};
-if (Wicket.Browser.isIE()) {
-var lessThan11 = !Wicket.Browser.isSafari() && typeof(document.all)
!== "undefined" && typeof(window.opera) === "undefined";
-if(!lessThan11) {
-return;
-}
+if (Wicket.Browser.isIELessThan11()) {
CKEDITOR_READY.when(function() {
/*
Replace CKEditor's 'appendStyleText' method. IE < 11 chokes on
the original because it calls createStyleSheet()
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/7a168a877b21301a5fd1ac5984a6f43515ef9106...d35a6295b8ace8ce6e413768ff37e10cdd963625
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9962] CMS-9962 IE11 throws createStyleSheet error: method not supported
Marijan Milicevic pushed to branch bugfix/CMS-9962 at cms-community / hippo-cms
Commits:
c40c930e by Marijan Milicevic at 2016-03-15T13:05:40+01:00
CMS-9962 IE11 throws createStyleSheet error: method not supported
- add wicket 6.19 IE less than 11 check
- - - - -
1 changed file:
-
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
Changes:
=
richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
=
---
a/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
+++
b/richtext/ckeditor/frontend/src/main/java/org/hippoecm/frontend/plugins/ckeditor/CKEditorPanel.js
@@ -156,7 +156,11 @@
});
};
-if (Wicket.Browser.isIELessThan11()) {
+if (Wicket.Browser.isIE()) {
+var lessThan11 = !Wicket.Browser.isSafari() && typeof(document.all)
!== "undefined" && typeof(window.opera) === "undefined";
+if (!lessThan11) {
+return;
+}
CKEDITOR_READY.when(function() {
/*
Replace CKEditor's 'appendStyleText' method. IE < 11 chokes on
the original because it calls createStyleSheet()
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/c40c930eee590a4fbc55747e118b7f27681d7c9f
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9880] CMS-9880 Cropping is not very user-friendly when working with larger resolution images
Marijan Milicevic pushed to branch bugfix/CMS-9880 at cms-community / hippo-cms Commits: b6e4067b by Marijan Milicevic at 2016-03-17T15:38:23+01:00 CMS-9880 Cropping is not very user-friendly when working with larger resolution images feedback implementation - in ImageCropEditorDialog.html placed the input and label in a new div and styled the div with some additional CSS - clicking the “Fit image into view” also toggles the checkbox - when looking at the image in fullscreen mode with the “fit” feature enabled and resizing the browser, scale the image - updated copyright modification year - - - - - 5 changed files: - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/ImageCropSettings.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/crop-editor-dialog.css - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js Changes: = gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html = --- a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html +++ b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html @@ -1,5 +1,5 @@
[HippoCMS-scm] [Git][cms-community/hippo-cms][release/3.2] 10 commits: CMS-9880 Cropping is not very user-friendly when working with larger resolution images
Marijan Milicevic pushed to branch release/3.2 at cms-community / hippo-cms Commits: 89a89733 by Marijan Milicevic at 2016-03-09T18:25:19+01:00 CMS-9880 Cropping is not very user-friendly when working with larger resolution images - first cut - - - - - 12a50fd1 by Marijan Milicevic at 2016-03-10T13:31:59+01:00 CMS-9880 Cropping is not very user-friendly when working with larger resolution images - apply on-fly changes - - - - - 81a3a9f1 by Marijan Milicevic at 2016-03-10T13:48:48+01:00 CMS-9880 Cropping is not very user-friendly when working with larger resolution images - remove log statement - - - - - 18394f2c by Marijan Milicevic at 2016-03-10T14:55:15+01:00 CMS-9880 Cropping is not very user-friendly when working with larger resolution images - rename label and fields into fitView (fit-view) - initialize image size in on load statement )_render) - - - - - 90a3859f by Marijan Milicevic at 2016-03-14T16:01:55+01:00 CMS-9962 IE11 throws createStyleSheet error: method not supported - add wicket 6.19 IE less than 11 check - - - - - 7a168a87 by Marijan Milicevic at 2016-03-14T16:27:10+01:00 CMS-9962 IE11 throws createStyleSheet error: method not supported - add wicket 6.19 IE less than 11 check - - - - - aaf108b9 by Marijan Milicevic at 2016-03-15T13:01:32+01:00 Revert "CMS-9962 IE11 throws createStyleSheet error: method not supported" This reverts commit 7a168a877b21301a5fd1ac5984a6f43515ef9106. - - - - - d35a6295 by Marijan Milicevic at 2016-03-15T13:01:42+01:00 Revert "CMS-9962 IE11 throws createStyleSheet error: method not supported" This reverts commit 90a3859f2826b271c2a93793b0618c2c41bd958e. - - - - - b6e4067b by Marijan Milicevic at 2016-03-17T15:38:23+01:00 CMS-9880 Cropping is not very user-friendly when working with larger resolution images feedback implementation - in ImageCropEditorDialog.html placed the input and label in a new div and styled the div with some additional CSS - clicking the “Fit image into view” also toggles the checkbox - when looking at the image in fullscreen mode with the “fit” feature enabled and resizing the browser, scale the image - updated copyright modification year - - - - - 76b67059 by Marijan Milicevic at 2016-03-22T10:37:38+01:00 Merge branch 'bugfix/CMS-9880' into local_merge - - - - - 10 changed files: - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.properties - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog_de.properties - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog_fr.properties - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog_nl.properties - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/ImageCropSettings.java - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/crop-editor-dialog.css - gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js - gallery/frontend/src/test/java/org/hippoecm/frontend/plugins/gallery/editor/crop/ImageCropSettingsTest.java Changes: = gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html = --- a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html +++ b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/ImageCropEditorDialog.html @@ -1,5 +1,5 @@
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-802
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-802 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch feature/ESSENTIALS-971
Marijan Milicevic pushed new branch feature/ESSENTIALS-971 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch bugfix/REPO-1473
Marijan Milicevic pushed new branch bugfix/REPO-1473 at cms-community / hippo-repository ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-htmldiff] Pushed new branch bugfix/HTMLDIFF-6
Marijan Milicevic pushed new branch bugfix/HTMLDIFF-6 at cms-community / hippo-htmldiff ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-selections] Pushed new branch feature/HIPPLUG-1291
Marijan Milicevic pushed new branch feature/HIPPLUG-1291 at cms-community / hippo-plugin-selections ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10062
Marijan Milicevic pushed new branch bugfix/CMS-10062 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10062] CMS-10062 Revision Comparision View show doc link field changed incorrectly
Marijan Milicevic pushed to branch bugfix/CMS-10062 at cms-community / hippo-cms
Commits:
84e50c60 by Marijan Milicevic at 2016-04-26T17:20:37+02:00
CMS-10062 Revision Comparision View show doc link field changed incorrectly
- - - - -
1 changed file:
- api/src/main/java/org/hippoecm/frontend/editor/compare/NodeComparer.java
Changes:
=
api/src/main/java/org/hippoecm/frontend/editor/compare/NodeComparer.java
=
--- a/api/src/main/java/org/hippoecm/frontend/editor/compare/NodeComparer.java
+++ b/api/src/main/java/org/hippoecm/frontend/editor/compare/NodeComparer.java
@@ -29,6 +29,7 @@ import org.hippoecm.frontend.editor.ITemplateEngine;
import org.hippoecm.frontend.editor.TemplateEngineException;
import org.hippoecm.frontend.types.IFieldDescriptor;
import org.hippoecm.frontend.types.ITypeDescriptor;
+import org.onehippo.repository.util.JcrConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -187,8 +188,10 @@ public class NodeComparer extends TypedComparer {
}
private ITypeDescriptor getNodeTypeDescriptor(final Node node) throws
RepositoryException {
final ITypeDescriptor configuredType = getType();
-final String nodeTypeName = node.getPrimaryNodeType().getName();
-
+String nodeTypeName = node.getPrimaryNodeType().getName();
+if (nodeTypeName.equals(JcrConstants.NT_FROZEN_NODE)) {
+nodeTypeName =
node.getProperty(JcrConstants.JCR_FROZEN_PRIMARY_TYPE).getString();
+}
if (StringUtils.equals(configuredType.getName(), nodeTypeName)) {
return configuredType;
} else {
@@ -197,7 +200,7 @@ public class NodeComparer extends TypedComparer {
try {
return templateEngine.getType(nodeTypeName);
} catch (TemplateEngineException e) {
-log.error("Cannot obtain node type descriptor of '" +
nodeTypeName + "' from the template engine", e);
+log.error("Cannot obtain node type descriptor of '{}' from
the template engine", nodeTypeName, e);
}
} else {
log.warn("Cannot obtain the type descriptor of the node type
'{}' because the template engine is not set for the field at '{}'. Using the
preconfigured type descriptor '{}'",
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/84e50c607aa0e7250d0a9cab1ac1f274d6acddd0
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-hst-configuration-editor] Pushed new branch bugfix/HSTCONFIGEDIT-196
Marijan Milicevic pushed new branch bugfix/HSTCONFIGEDIT-196 at cms-community / hippo-addon-hst-configuration-editor ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service] Pushed new branch bugfix/CMS-10098
Marijan Milicevic pushed new branch bugfix/CMS-10098 at cms-community / hippo-addon-search-service ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-978
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-978 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-969
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-969 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-965
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-965 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-762
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-762 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-760
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-760 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-sitemap] Pushed new branch bugfix/HIPPLUG-1308
Marijan Milicevic pushed new branch bugfix/HIPPLUG-1308 at cms-community / hippo-plugin-sitemap ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-addon-search-service][bugfix/CMS-10098] CMS-10098 Advanced search: make wildcard search configurable
Marijan Milicevic pushed to branch bugfix/CMS-10098 at cms-community /
hippo-addon-search-service
Commits:
a7fcda7a by Marijan Milicevic at 2016-05-23T16:26:11+02:00
CMS-10098 Advanced search: make wildcard search configurable
- default to true for wildcard search
- - - - -
1 changed file:
-
api/src/main/java/org/onehippo/cms7/services/search/query/constraint/TextConstraint.java
Changes:
=
api/src/main/java/org/onehippo/cms7/services/search/query/constraint/TextConstraint.java
=
---
a/api/src/main/java/org/onehippo/cms7/services/search/query/constraint/TextConstraint.java
+++
b/api/src/main/java/org/onehippo/cms7/services/search/query/constraint/TextConstraint.java
@@ -33,7 +33,7 @@ public final class TextConstraint implements Constraint {
this.property = property;
this.value = value;
this.type = type;
-this.wildcardPostfixEnabled = false;
+this.wildcardPostfixEnabled = true;
this.wildcardPostfixMinLength =
SearchService.DEFAULT_WILDCARD_POSTFIX_LENGTH;
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-addon-search-service/commit/a7fcda7a82f4bba190904ef851b7a1163c7c426d
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10125
Marijan Milicevic pushed new branch bugfix/CMS-10125 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository] Pushed new branch bugfix/REPO-1485
Marijan Milicevic pushed new branch bugfix/REPO-1485 at cms-community / hippo-repository ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-repository][bugfix/REPO-1485] REPO-1485 Revert REPO-1117 - Revert xpath textarea to text input
Marijan Milicevic pushed to branch bugfix/REPO-1485 at cms-community /
hippo-repository
Commits:
eddb985a by Marijan Milicevic at 2016-06-01T14:16:42+02:00
REPO-1485 Revert REPO-1117 - Revert xpath textarea to text input
- - - - -
1 changed file:
- servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
Changes:
=
servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
=
---
a/servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
+++
b/servlets/src/main/resources/org/hippoecm/repository/RepositoryServlet-html.ftl
@@ -44,7 +44,7 @@ ${response.setContentType("text/html;charset=UTF-8")}
.logout { float: right; padding: 4px 10px 0 0;}
.logout a { color: white; font-size: small;}
-.query-input {width: 100%; height: 75px;}
+.query-input {width: 100%;}
.search-params {padding: 20px 0 10px 0;}
.search-params input { margin-bottom: 4px}
@@ -121,14 +121,14 @@ ${response.setContentType("text/html;charset=UTF-8")}
<#--XPATH-->
XPath:
- ${request.getParameter('xpath')!}
+
Limit (XPath query):
<#--SQL-->
SQL:
- ${request.getParameter('sql')!}
+
Limit (SQL query):
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-repository/commit/eddb985aa668bc20efffdb3a53f826549b862b91
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials] Pushed new branch bugfix/ESSENTIALS-983
Marijan Milicevic pushed new branch bugfix/ESSENTIALS-983 at cms-community / hippo-essentials ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-9985
Marijan Milicevic pushed new branch bugfix/CMS-9985 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-9985] CMS-9985 When toggling between “fit image into view” mode and normal mode, the s…
Marijan Milicevic pushed to branch bugfix/CMS-9985 at cms-community / hippo-cms
Commits:
b263e5cb by Marijan Milicevic at 2016-06-14T18:37:33+02:00
CMS-9985 When toggling between “fit image into view” mode and normal mode, the
selection rectangle does not rescale
- resize rectangle when in firt view and keep aspect ratio from resetting to
default
- - - - -
1 changed file:
-
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js
Changes:
=
gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js
=
---
a/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js
+++
b/gallery/frontend/src/main/java/org/hippoecm/frontend/plugins/gallery/editor/crop/hippoimagecropper/hippoimagecropper.js
@@ -35,6 +35,7 @@ if (!YAHOO.hippo.ImageCropper) {
YAHOO.hippo.ImageCropper = function(id, config) {
YAHOO.hippo.ImageCropper.superclass.constructor.apply(this,
arguments);
+this.oldMaskSize = null;
this.container = this.el.parentNode;
this.rendered = false;
this.originalImage = this.el;
@@ -94,6 +95,9 @@ if (!YAHOO.hippo.ImageCropper) {
if (this.fitView) {
this.scaleToFit(this.calculateRatio(this));
} else {
+if(this.oldMaskSize) {
+this.resizeMask(this.oldMaskSize.r,
this.oldMaskSize.w, this.oldMaskSize.h);
+}
this.reset();
}
return;
@@ -130,15 +134,19 @@ if (!YAHOO.hippo.ImageCropper) {
// this phase of the render method should only start after the
image has loaded completely
_render: function() {
+if (this.leftCropArea !== null) {
+this.leftCropAreaRegion = Dom.getRegion(this.leftCropArea);
+}
+var ratio = this.calculateRatio(this);
this.cropper = new YAHOO.widget.ImageCropper(this.id,
{
keyTick: 4,
initialXY: [this.initialX, this.initialY],
-initHeight: this.initialHeight,
-initWidth: this.initialWidth,
+initHeight: this.initialHeight * ratio.r,
+initWidth: this.initialWidth * ratio.r,
ratio: this.fixedDimension === 'both',
-minWidth: this.minimumWidth,
-minHeight: this.minimumHeight,
+minWidth: this.minimumWidth * ratio.r,
+minHeight: this.minimumHeight * ratio.r,
status: this.status
}
);
@@ -147,13 +155,9 @@ if (!YAHOO.hippo.ImageCropper) {
this.updateRegionInputValue(this.cropper.getCropCoords());
this.updatePreviewLabel(this.thumbnailWidth,
this.thumbnailHeight);
-if (this.leftCropArea !== null) {
-this.leftCropAreaRegion = Dom.getRegion(this.leftCropArea);
-}
-
this.subscribe();
if (this.fitView) {
-this.scaleToFit(this.calculateRatio(this));
+this.scaleToFit(ratio);
}
},
@@ -328,8 +332,32 @@ if (!YAHOO.hippo.ImageCropper) {
// fix background behind the mask, so crop result
(preview) is shown properly:
var back = this.cropper._resizeMaskEl;
Dom.setStyle(back, "background-size", ratio.w + 'px ' +
ratio.h + 'px');
+// rescale mask when in fit view, NOTE: fullscreen
rescaling is triggered within render method
+if(this.fitView) {
+var cropCoords = this.cropper.getCropCoords();
+this.oldMaskSize = {r: 1, w: cropCoords.width, h:
cropCoords.height};
+this.resizeMask(ratio.r, cropCoords.width,
cropCoords.height)
+}
}
},
+resizeMask:function(ratio,w,h){
+var cropper = this.cropper;
+var height = h * ratio;
+var width = w * ratio;
+var elResize = cropper.getResizeEl();
+setSize(elResize, width, height, ratio);
+var elMaskAll = cropper.getWrapEl();
+setSize(elMaskAll, width, height, ratio);
+var elMask = cropper.getResizeMaskEl();
+setSize(elMask, wid
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10173
Marijan Milicevic pushed new branch bugfix/CMS-10173 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-9943
Marijan Milicevic pushed new branch bugfix/CMS-9943 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs] Pushed new branch bugfix/HIPPLUG-1327
Marijan Milicevic pushed new branch bugfix/HIPPLUG-1327 at cms-community / hippo-plugin-relateddocs ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-relateddocs][bugfix/HIPPLUG-1327] 2 commits: HIPPLUG-1327 Related Documents - it is possible to add the same item more than once
Marijan Milicevic pushed to branch bugfix/HIPPLUG-1327 at cms-community / hippo-plugin-relateddocs Commits: ad69524a by Marijan Milicevic at 2016-06-28T04:19:47+02:00 HIPPLUG-1327 Related Documents - it is possible to add the same item more than once - don't store duplicate values - - - - - 86932a47 by Marijan Milicevic at 2016-06-28T04:20:10+02:00 HIPPLUG-1327 Related Documents - it is possible to add the same item more than once - update copyright - - - - - 1 changed file: - addon-cms/src/main/java/org/onehippo/forge/relateddocs/RelatedDocCollection.java Changes: = addon-cms/src/main/java/org/onehippo/forge/relateddocs/RelatedDocCollection.java = --- a/addon-cms/src/main/java/org/onehippo/forge/relateddocs/RelatedDocCollection.java +++ b/addon-cms/src/main/java/org/onehippo/forge/relateddocs/RelatedDocCollection.java @@ -1,5 +1,5 @@ /* - * Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com) + * Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -135,6 +135,8 @@ public class RelatedDocCollection implements Cloneable, IDataProviderhttps://code.onehippo.org/cms-community/hippo-plugin-relateddocs/compare/f98c05bb82172ee82b796ec6206c4c4a9b37ea29...86932a470bdf5e78c7a75ec48061ed1921beded4 ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms] Pushed new branch bugfix/CMS-10233
Marijan Milicevic pushed new branch bugfix/CMS-10233 at cms-community / hippo-cms ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-cms][bugfix/CMS-10233] CMS-10233 Copying document (trees) in the console breaks translations
Marijan Milicevic pushed to branch bugfix/CMS-10233 at cms-community / hippo-cms
Commits:
50bf24c4 by Marijan Milicevic at 2016-06-28T16:11:14+02:00
CMS-10233 Copying document (trees) in the console breaks translations
- keep translation id per hippo:handle node and use it as value for child nodes
- - - - -
1 changed file:
-
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/t9ids/GenerateNewTranslationIdsVisitor.java
Changes:
=
console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/t9ids/GenerateNewTranslationIdsVisitor.java
=
---
a/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/t9ids/GenerateNewTranslationIdsVisitor.java
+++
b/console/frontend/src/main/java/org/hippoecm/frontend/plugins/console/menu/t9ids/GenerateNewTranslationIdsVisitor.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011-2013 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2011-2016 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
*/
package org.hippoecm.frontend.plugins.console.menu.t9ids;
+import java.util.AbstractMap;
import java.util.UUID;
import javax.jcr.ItemVisitor;
@@ -27,18 +28,43 @@ import org.hippoecm.frontend.model.JcrHelper;
public class GenerateNewTranslationIdsVisitor implements ItemVisitor {
+private static final String HIPPOTRANSLATION_ID = "hippotranslation:id";
+private static final String HIPPO_HANDLE = "hippo:handle";
+private AbstractMap.SimpleEntry handleTranslationIdPair;
+
@Override
public void visit(Property property) throws RepositoryException {
-if (property.getName().equals("hippotranslation:id")) {
+if (property.getName().equals(HIPPOTRANSLATION_ID)) {
+final String handleId = findHandleId(property);
+if (handleId != null && handleTranslationIdPair != null) {
+final String key = handleTranslationIdPair.getKey();
+if (handleId.equals(key)) {
+property.setValue(handleTranslationIdPair.getValue());
+return;
+}
+}
+// invoked for folders or any other nodes with no handle as parent:
property.setValue(UUID.randomUUID().toString());
}
}
+private String findHandleId(final Property property) throws
RepositoryException {
+final Node handle = property.getParent().getParent();
+if (handle.isNodeType("hippo:handle")) {
+return handle.getIdentifier();
+}
+return null;
+}
+
@Override
public void visit(Node node) throws RepositoryException {
if (!JcrHelper.isVirtualNode(node)) {
-if (node.hasProperty("hippotranslation:id")) {
-visit(node.getProperty("hippotranslation:id"));
+// store id for handle so handle child nodes have same translation
id:
+if (node.isNodeType(HIPPO_HANDLE)) {
+handleTranslationIdPair = new
AbstractMap.SimpleEntry<>(node.getIdentifier(), UUID.randomUUID().toString());
+}
+if (node.hasProperty(HIPPOTRANSLATION_ID)) {
+visit(node.getProperty(HIPPOTRANSLATION_ID));
}
NodeIterator children = node.getNodes();
while (children.hasNext()) {
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/commit/50bf24c455bc421ac6e8f215db5e51fbc1cb7f68
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-essentials][bugfix/ESSENTIALS-978] ESSENTIALS-978 Add option to tell Beanwriter to not override customized getter method
Marijan Milicevic pushed to branch bugfix/ESSENTIALS-978 at cms-community /
hippo-essentials
Commits:
f1e74485 by Marijan Milicevic at 2016-06-28T17:39:12+02:00
ESSENTIALS-978 Add option to tell Beanwriter to not override customized getter
method
- use method instead of bean annotation
- update copyright entries
- - - - -
2 changed files:
-
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/ContentBeansService.java
-
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/JavaSourceUtils.java
Changes:
=
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/ContentBeansService.java
=
---
a/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/ContentBeansService.java
+++
b/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/services/ContentBeansService.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -741,10 +741,12 @@ public class ContentBeansService {
if (existing.contains(name)) {
log.debug("Property already exists {}. Checking if method
signature has changed e.g. single value to multiple", name);
final ExistingMethodsVisitor methodCollection =
JavaSourceUtils.getMethodCollection(beanPath);
-final HippoEssentialsGeneratedObject annotation =
JavaSourceUtils.getHippoGeneratedAnnotation(beanPath);
-final boolean allowUpdate = annotation != null &&
annotation.isAllowModifications();
+
+
final List generatedMethods =
methodCollection.getGeneratedMethods();
for (EssentialsGeneratedMethod generatedMethod : generatedMethods)
{
+final HippoEssentialsGeneratedObject annotation =
JavaSourceUtils.getHippoEssentialsAnnotation(beanPath,
generatedMethod.getMethodDeclaration());
+final boolean allowUpdate = annotation != null &&
annotation.isAllowModifications();
final String internalName = generatedMethod.getInternalName();
if (name.equals(internalName)) {
// check if single/multiple changed:
=
plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/JavaSourceUtils.java
=
---
a/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/JavaSourceUtils.java
+++
b/plugin-sdk/implementation/src/main/java/org/onehippo/cms7/essentials/dashboard/utils/JavaSourceUtils.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2014-2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2014-2016 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -988,6 +988,26 @@ public final class JavaSourceUtils {
return false;
}
+public static HippoEssentialsGeneratedObject
getHippoEssentialsAnnotation(final Path beanPath, final MethodDeclaration node)
{
+@SuppressWarnings({UNCHECKED, RAWTYPES})
+final List modifiers = node.modifiers();
+if (modifiers == null) {
+return null;
+}
+for (Object modifier : modifiers) {
+if (modifier instanceof NormalAnnotation) {
+final NormalAnnotation annotation = (NormalAnnotation)
modifier;
+final Name typeName = annotation.getTypeName();
+final String fullyQualifiedName =
typeName.getFullyQualifiedName();
+if
(!fullyQualifiedName.equals(HippoEssentialsGenerated.class.getSimpleName())
+&&
!fullyQualifiedName.equals(HippoEssentialsGenerated.class.getCanonicalName())) {
+continue;
+}
+return populateGeneratedObject(beanPath, annotation);
+}
+}
+return null;
+}
public static String getHippoEssentialsAnnotation(final MethodDeclaration
node) {
@SuppressWarnings({UNCHECKED, RAWTYPES})
final List modifiers = node.modifiers();
@@ -1044,6 +1064,8 @@ public final class JavaSourceUtils {
private static HippoEssentialsGeneratedObject
populateGeneratedObject(final Path path, final NormalAnnotation annotation) {
final HippoEssentialsGeneratedObject o = new
HippoEssentialsGeneratedObject();
+// set default:
+o.setAllowModifications(true);
o.setFilePath(path);
@SuppressWarnings(RAWTYPES)
final List values = annotation.values()
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll] Pushed new branch bugfix/HIPPLUG-1324
Marijan Milicevic pushed new branch bugfix/HIPPLUG-1324 at cms-community / hippo-plugin-poll ___ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
[HippoCMS-scm] [Git][cms-community/hippo-plugin-poll][bugfix/HIPPLUG-1324] HIPPLUG-1324 Exception thrown when opening Poll document type
Marijan Milicevic pushed to branch bugfix/HIPPLUG-1324 at cms-community /
hippo-plugin-poll
Commits:
197e3753 by Marijan Milicevic at 2016-06-28T20:51:45+02:00
HIPPLUG-1324 Exception thrown when opening Poll document type
- don't fetch parent of root node
- - - - -
1 changed file:
- addon-cms/src/main/java/org/onehippo/forge/poll/cms/PollResultsPlugin.java
Changes:
=
addon-cms/src/main/java/org/onehippo/forge/poll/cms/PollResultsPlugin.java
=
--- a/addon-cms/src/main/java/org/onehippo/forge/poll/cms/PollResultsPlugin.java
+++ b/addon-cms/src/main/java/org/onehippo/forge/poll/cms/PollResultsPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2015 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2015-2016 Hippo B.V. (http://www.onehippo.com)
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -220,7 +220,7 @@ public class PollResultsPlugin extends RenderPlugin
implements IHeaderCo
// find handle parent
Node handle = pollNode;
-while (!handle.isNodeType(HippoNodeType.NT_HANDLE)) {
+while (!handle.getPath().equals("/") &&
!handle.isNodeType(HippoNodeType.NT_HANDLE)) {
handle = handle.getParent();
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-plugin-poll/commit/197e37538dff3c2d474933c8fffe1adbd4e07285
___
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
