Commit 04af1c36 authored by Jeroen Hoffman's avatar Jeroen Hoffman

CMS-10964 [Back port CMS-10941 to 11.2] Regression: three column layout for...

CMS-10964 [Back port CMS-10941 to 11.2] Regression: three column layout for cms document gives errors

(cherry picked from commit 074b301d)
parent 0a6ed6f1
......@@ -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;
......
/*
* 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;
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment