Jeroen Hoffman pushed to branch master at cms-community / hippo-cms
Commits:
c9a46833 by Bert Leunis at 2017-10-09T17:00:26+02:00
CMS-10941 also provide transition icon for more exotic transitions
- - - - -
2b96bbf0 by Bert Leunis at 2017-10-10T09:58:16+02:00
CMS-10941 add styling classes for 40% wide column, left aligned
- - - - -
a0b4cdfa by Jeroen Hoffman at 2017-10-23T15:10:08+02:00
CMS-10941 Merge branch 'master' into bugfix/CMS-10941
- - - - -
074b301d by Jeroen Hoffman at 2017-10-24T10:27:38+02:00
CMS-10941 more informative log warning
- - - - -
93e5cca2 by Jeroen Hoffman at 2017-10-24T10:30:53+02:00
CMS-10941 Reintegrate branch 'bugfix/CMS-10941' into master
- - - - -
2 changed files:
- api/src/main/styling/styles/_editor.scss
-
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
Changes:
=====================================
api/src/main/styling/styles/_editor.scss
=====================================
--- a/api/src/main/styling/styles/_editor.scss
+++ b/api/src/main/styling/styles/_editor.scss
@@ -40,6 +40,12 @@
float: right;
}
+ .col40 {
+ padding-right: 16px;
+ width: 40%;
+ float: left;
+ }
+
.col70 {
padding-right: 16px;
width: 70%;
@@ -54,6 +60,7 @@
.col20,
.col30,
+ .col40,
.col70,
.col80 {
box-sizing: border-box;
=====================================
editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
=====================================
---
a/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
+++
b/editor/frontend/src/main/java/org/hippoecm/frontend/editor/builder/RenderPluginEditorPlugin.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2008-2016 Hippo B.V. (http://www.onehippo.com)
+ * Copyright 2008-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.
@@ -490,20 +490,24 @@ public class RenderPluginEditorPlugin extends
RenderPlugin implements ILayoutAwa
}
private Icon getTransitionIconByName(final String name) {
- switch (name) {
- case "up": {
- return Icon.CHEVRON_UP_CIRCLE;
- }
- case "down": {
- return Icon.CHEVRON_DOWN_CIRCLE;
- }
- case "left": {
- return Icon.CHEVRON_LEFT_CIRCLE;
- }
- case "right": {
- return Icon.CHEVRON_RIGHT_CIRCLE;
+ if (name != null) {
+ final String[] split = StringUtils.split(name, " ");
+ switch (split[split.length - 1]) {
+ case "up": {
+ return Icon.CHEVRON_UP_CIRCLE;
+ }
+ case "down": {
+ return Icon.CHEVRON_DOWN_CIRCLE;
+ }
+ case "left": {
+ return Icon.CHEVRON_LEFT_CIRCLE;
+ }
+ case "right": {
+ return Icon.CHEVRON_RIGHT_CIRCLE;
+ }
}
}
- return null;
+ log.warn("Undetermined transition icon by name '{}'; the name should
be, or have as last word: 'up', 'down', 'left' or 'right'. Returning default
icon.", name);
+ return Icon.EXCLAMATION_CIRCLE;
}
}
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/40ce3065373b56eff4b58f861444b7d19cc5b074...93e5cca2a53c622bfacefa1b0e89c0aa93bacd71
---
View it on GitLab:
https://code.onehippo.org/cms-community/hippo-cms/compare/40ce3065373b56eff4b58f861444b7d19cc5b074...93e5cca2a53c622bfacefa1b0e89c0aa93bacd71
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
