Ate Douma pushed to branch feature/translations-psp1 at cms / hippo-plugin-content-blocks
Commits: 892d8bc8 by Unico Hommes at 2015-10-06T09:56:02+00:00 HIPPLUG-1200 rollback changes from release preparation of content-blocks-2.1.0-translations-1 - - - - - 534c0204 by Joeri de Gooijer at 2015-10-08T10:06:45+00:00 HIPPLUG-1202: make content blocks look like mulitple compounds - - - - - 4ca17f2e by Arthur Bogaart at 2015-10-12T14:12:13+00:00 HIPPLUG-1202: Merged from branch 2.0.x - - - - - d1c5f681 by Arthur Bogaart at 2015-10-12T14:25:46+00:00 HIPPLUG-1202: Fixed issue by scoping offending CSS rule to direct descendants of contentpickers-blocks - - - - - c6a2c329 by Arent-Jan Banck at 2015-10-13T10:10:39+00:00 CMS-16: Bump internal dependency properties to use the current (snapshot) versions - - - - - 4de0fdf3 by Arent-Jan Banck at 2015-10-13T12:14:56+00:00 CMS-9583: prepare branch hippo-plugin-content-blocks-2.1.x - - - - - 676defbd by Arent-Jan Banck at 2015-10-13T12:15:01+00:00 CMS-9583: prepare for next development iteration - - - - - 6b2e3798 by Arent-Jan Banck at 2015-10-13T15:55:27+00:00 CMS-16: Bump internal dependency properties to use the current (snapshot) 10.2 versions - - - - - 26d867f5 by Joeri de Gooijer at 2015-10-26T16:26:13+00:00 HIPPLUG-1212: Content block buttons now wrap and have nice spacing when wrapped - - - - - 16986994 by Joeri de Gooijer at 2015-10-27T11:10:15+00:00 HIPPLUG-1212: Add prefixes to flexwrap - - - - - 813b1e01 by Joeri de Gooijer at 2015-12-28T20:12:19+00:00 HIPPLUG-1222: Add additional subfield class - - - - - fd66eaf0 by Mathijs den Burger at 2016-01-05T14:37:18+00:00 HIPPLUG-1222: use similar markup as normal compound fields for content blocks in edit mode This way the CMS styling for invalid compound fields can be reused for content blocks. - - - - - 5f6fd56f by Arent-Jan Banck at 2016-01-08T14:30:11+00:00 CMS-9856: Update copyright year to 2016 - - - - - 306e9576 by Saimir Muco at 2016-01-11T13:50:10+00:00 HIPPLUG-1241 use the new NodeComparer with TemplateEngine support - - - - - d184b5d6 by Arthur Bogaart at 2016-01-25T14:10:54+00:00 HIPPLUG-1256: Bump version of parent POM to 27.4 and remove duplicate <groupId/> element - - - - - 2c467cb5 by Arent-Jan Banck at 2016-01-26T13:00:31+00:00 CMS-9899: prepare branch hippo-plugin-content-blocks-2.2.x - - - - - 766c9150 by Arent-Jan Banck at 2016-01-26T13:00:36+00:00 CMS-9899: prepare for next development iteration - - - - - 2f11f5d9 by Ate Douma at 2016-01-27T13:36:01+00:00 CMS-9905: Update and align project pom parent and other dependency version references across all product projects - - - - - c1a92736 by Ate Douma at 2016-02-16T00:52:06+01:00 HIPPLUG-1200 merge master in translations-psp1 branch ignoring master (-s ours) Earlier 'merge points' in svn turned out to be not properly recorded/migrated to Git, so for Git nothing had been merged so far. To remedy this, an empty merge (merge strategy -s ours) from master (1698699) is added joining the two trees again 'as if'. - - - - - cc39f626 by Ate Douma at 2016-02-16T00:59:55+01:00 HIPPLUG-1200 merge changes from master - - - - - 4 changed files: - NOTICE - pom.xml - src/main/java/org/onehippo/forge/contentblocks/ContentBlocksFieldPlugin.html - src/main/java/org/onehippo/forge/contentblocks/model/ContentBlockComparer.java Changes: ===================================== NOTICE ===================================== --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Hippo Plugin Content Blocks -Copyright 2009-2015 Hippo B.V. (http://www.onehippo.com) +Copyright 2009-2016 Hippo B.V. (http://www.onehippo.com) This product includes software developed by: Hippo B.V., Amsterdam, The Netherlands (http://www.onehippo.com/); ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- - Copyright 2010-2015 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. @@ -20,26 +20,27 @@ <parent> <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-cms7-project</artifactId> - <version>27.2</version> + <version>28-SNAPSHOT</version> </parent> <inceptionYear>2009</inceptionYear> <name>Hippo Plugin Content Blocks</name> <description>Hippo Plugin Content Blocks</description> + <groupId>org.onehippo.cms7</groupId> <artifactId>hippo-plugin-content-blocks</artifactId> - <version>2.x-translations-1.0-SNAPSHOT</version> + <version>3.0.0-translations-psp1-SNAPSHOT</version> <packaging>jar</packaging> <scm> - <connection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/content-blocks/branches/content-blocks-2.1.0-translations-1</connection> - <developerConnection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/content-blocks/branches/content-blocks-2.1.0-translations-1</developerConnection> - <url>https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/content-blocks/branches/content-blocks-2.1.0-translations-1</url> + <connection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/content-blocks/trunk/</connection> + <developerConnection>scm:svn:https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/content-blocks/trunk/</developerConnection> + <url>https://svn.onehippo.org/repos/hippo/hippo-cms7/plugins/content-blocks/trunk/</url> </scm> <properties> - <hippo.repository.version>3.0.0</hippo.repository.version> - <hippo.cms.version>3.x-translations-1.0-SNAPSHOT</hippo.cms.version> + <hippo.repository.version>4.0.0-translations-psp1-SNAPSHOT</hippo.repository.version> + <hippo.cms.version>4.0.0-translations-psp1-SNAPSHOT</hippo.cms.version> </properties> <repositories> ===================================== src/main/java/org/onehippo/forge/contentblocks/ContentBlocksFieldPlugin.html ===================================== --- a/src/main/java/org/onehippo/forge/contentblocks/ContentBlocksFieldPlugin.html +++ b/src/main/java/org/onehippo/forge/contentblocks/ContentBlocksFieldPlugin.html @@ -1,5 +1,5 @@ <!-- - Copyright 2010-2015 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. @@ -58,16 +58,18 @@ </wicket:fragment> <wicket:fragment wicket:id="edit-fragment"> - <div class="content-block-title"> - <span wicket:id="itemTitle">[ item title ]</span> - </div> - <div class="contentpicker-blocks"> - <div class="hippo-editor-field-subfield-controls" wicket:id="controls"> - <a class="up-link" wicket:id="up"><span wicket:id="up-icon"></span></a> - <a class="down-link" wicket:id="down"><span wicket:id="down-icon"></span></a> - <a class="remove-link" wicket:id="remove"><span wicket:id="remove-icon"></span></a> + <div class="hippo-editor-field"> + <div class="content-block-title"> + <span wicket:id="itemTitle">[ item title ]</span> + </div> + <div class="hippo-editor-field-subfield contentpicker-blocks"> + <div class="hippo-editor-field-subfield-controls" wicket:id="controls"> + <a class="up-link" wicket:id="up"><span wicket:id="up-icon"></span></a> + <a class="down-link" wicket:id="down"><span wicket:id="down-icon"></span></a> + <a class="remove-link" wicket:id="remove"><span wicket:id="remove-icon"></span></a> + </div> + <div wicket:id="item"></div> </div> - <div wicket:id="item"></div> </div> </wicket:fragment> @@ -75,7 +77,7 @@ <div class="content-block-title"> <span wicket:id="itemTitle">[ item title ]</span> </div> - <div class="contentpicker-blocks"> + <div class="hippo-editor-field-subfield contentpicker-blocks"> <div wicket:id="item"></div> </div> </wicket:fragment> ===================================== src/main/java/org/onehippo/forge/contentblocks/model/ContentBlockComparer.java ===================================== --- a/src/main/java/org/onehippo/forge/contentblocks/model/ContentBlockComparer.java +++ b/src/main/java/org/onehippo/forge/contentblocks/model/ContentBlockComparer.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2013 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. @@ -30,8 +30,6 @@ import org.slf4j.LoggerFactory; * @version "$Id$" */ public class ContentBlockComparer implements IComparer<Node> { - private static final long serialVersionUID = 1L; - static final Logger log = LoggerFactory.getLogger(ContentBlockComparer.class); private ITemplateEngine engine; @@ -51,8 +49,8 @@ public class ContentBlockComparer implements IComparer<Node> { if (!baseNode.getPrimaryNodeType().getName().equals(targetNode.getPrimaryNodeType().getName())) { return false; } - ITypeDescriptor type = engine.getType(baseNode.getPrimaryNodeType().getName()); - NodeComparer comparer = new NodeComparer(type); + final ITypeDescriptor type = engine.getType(baseNode.getPrimaryNodeType().getName()); + final NodeComparer comparer = new NodeComparer(type, engine); return comparer.areEqual(baseNode, targetNode); } catch (RepositoryException ex) { log.error(ex.getMessage(), ex); @@ -68,8 +66,8 @@ public class ContentBlockComparer implements IComparer<Node> { return 0; } try { - ITypeDescriptor type = engine.getType(node.getPrimaryNodeType().getName()); - NodeComparer comparer = new NodeComparer(type); + final ITypeDescriptor type = engine.getType(node.getPrimaryNodeType().getName()); + final NodeComparer comparer = new NodeComparer(type, engine); return comparer.getHashCode(node); } catch (RepositoryException ex) { log.error(ex.getMessage(), ex); View it on GitLab: https://code.onehippo.org/cms/hippo-plugin-content-blocks/compare/427c7fd951a5311f41adaaee91180a8b612ca41f...cc39f6267556186cbd38eb22b2215f2807c4e640
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn
