UI issues fixed.

lightadmin-core/src/main/java/org/lightadmin/core/config/domain/unit/DomainConfigurationUnitType.java

@@ -1,55 +1,60 @@
-/*
- * Copyright 2012-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.lightadmin.core.config.domain.unit;
-
-import static java.lang.String.format;
-
-public enum DomainConfigurationUnitType {
-
-    SCREEN_CONTEXT("screenContext"),
-    CONFIGURATION("configuration"),
-    LIST_VIEW("listView"),
-    SHOW_VIEW("showView"),
-    FORM_VIEW("formView"),
-    QUICK_VIEW("quickView"),
-    SCOPES("scopes"),
-    FILTERS("filters"),
-    SIDEBARS("sidebars");
-
-    private final String name;
-
-    private DomainConfigurationUnitType(final String name) {
-        this.name = name;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public static DomainConfigurationUnitType forName(String name) {
-        for (DomainConfigurationUnitType domainConfigurationUnitType : values()) {
-            if (domainConfigurationUnitType.getName().equals(name)) {
-                return domainConfigurationUnitType;
-            }
-        }
-        throw new IllegalArgumentException(format("Configuration Unit for name %s not defined!", name));
-    }
-
-    @Override
-    public String toString() {
-        return getName();
-    }
+/*
+ * Copyright 2012-2014 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.lightadmin.core.config.domain.unit;
+
+import static java.lang.String.format;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+public enum DomainConfigurationUnitType {
+
+    SCREEN_CONTEXT("screenContext"),
+    CONFIGURATION("configuration"),
+    LIST_VIEW("listView"),
+    SHOW_VIEW("showView"),
+    FORM_VIEW("formView"),
+    QUICK_VIEW("quickView"),
+    SCOPES("scopes"),
+    FILTERS("filters"),
+    SIDEBARS("sidebars");
+
+    private final String name;
+
+    @JsonCreator
+    private DomainConfigurationUnitType(final String name) {
+        this.name = name;
+    }
+
+    @JsonValue
+    public String getName() {
+        return name;
+    }
+
+    public static DomainConfigurationUnitType forName(String name) {
+        for (DomainConfigurationUnitType domainConfigurationUnitType : values()) {
+            if (domainConfigurationUnitType.getName().equals(name)) {
+                return domainConfigurationUnitType;
+            }
+        }
+        throw new IllegalArgumentException(format("Configuration Unit for name %s not defined!", name));
+    }
+
+    @Override
+    public String toString() {
+        return getName();
+    }
 }

lightadmin-core/src/main/resources/META-INF/resources/views/sections/top-navigation-section.jsp

@@ -1,69 +1,70 @@
-<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
-
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="light" uri="http://www.lightadmin.org/tags" %>
-<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
-<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
-
-<tiles:importAttribute name="lightAdminConfiguration" ignore="true"/>
-
-<spring:message code="back.to.site" var="back_to_site"/>
-
-<div id="topNav">
-    <div class="fixed">
-        <div class="wrapper">
-            <div class="userNav" style="float:left;">
-                <ul>
-                    <li>
-                        <a href="<c:out value='${lightAdminConfiguration.backToSiteUrl}'/>" title="${back_to_site}">
-                            <img src="<light:url value='/images/icons/topnav/mainWebsite.png'/>" alt=""><span>${back_to_site}</span>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-
-            <sec:authorize access="isAuthenticated()">
-                <div class="welcome">
-                    <a href="#" title="">
-                        <img src="<light:url value='/images/userPic.png'/>" alt=""/></a>
-                    <span>Hello, <c:choose>
-                        <c:when test="principal.username">
-                            <sec:authentication property="principal.username"/>
-                        </c:when>
-                        <c:otherwise>
-                            <sec:authentication property="principal"/>
-                        </c:otherwise>
-                    </c:choose>!</span>
-                </div>
-                <div class="userNav">
-                    <ul>
-                        <li><a href="<c:out value='${lightAdminConfiguration.securityLogoutUrl}'/>" title=""><img
-                                src="<light:url value='/images/icons/topnav/logout.png'/>"
-                                alt=""/><span>Logout</span></a></li>
-                    </ul>
-                </div>
-            </sec:authorize>
-
-            <div class="userNav">
-                <ul>
-                    <li>
-                        <a href="<c:out value='${lightAdminConfiguration.helpUrl}'/>"><img src="<light:url value='/images/icons/topnav/help.png'/>" alt=""><span>Help</span></a>
-                    </li>
-                </ul>
-            </div>
-
-            <c:if test="${lightAdminConfiguration.demoMode}">
-                <div class="userNav">
-                    <iframe allowtransparency="true" frameborder="0" scrolling="no"
-                            src="https://platform.twitter.com/widgets/tweet_button.html?lang=en&url=http%3A%2F%2Flightadmin.org&related=lightadm_team&text=%23LightAdmin%20-%20Pluggable%20%23CRUD%20administration%20UI%20library%20for%20%23SpringBoot%20on%20top%20of%20%23SpringData,%20%23JPA%20and%20%23REST"
-                            style="width:130px; height:20px; position: relative; right: -35px; top: 8px;"></iframe>
-                </div>
-
-                <a id="fork-me" href="https://github.com/la-team/light-admin" style="position: absolute;right: 0;top: 0;z-index: 1;"><img src="<light:url value='/images/fork-me-on-github.png'/>" alt="Fork me on GitHub"></a>
-            </c:if>
-
-            <div class="fix"></div>
-        </div>
-    </div>
+<%@ page contentType="text/html;charset=UTF-8" language="java" pageEncoding="UTF-8" %>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="light" uri="http://www.lightadmin.org/tags" %>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ taglib prefix="tiles" uri="http://tiles.apache.org/tags-tiles" %>
+
+<tiles:importAttribute name="lightAdminConfiguration" ignore="true"/>
+
+<spring:message code="back.to.site" var="back_to_site"/>
+
+<div id="topNav">
+    <div class="fixed">
+        <div class="wrapper">
+            <div class="userNav" style="float:left;">
+                <ul>
+                    <li>
+                        <a href="<c:out value='${lightAdminConfiguration.backToSiteUrl}'/>" title="${back_to_site}">
+                            <img src="<light:url value='/images/icons/topnav/mainWebsite.png'/>" alt=""><span>${back_to_site}</span>
+                        </a>
+                    </li>
+                </ul>
+            </div>
+
+            <sec:authorize access="isAuthenticated()">
+            <sec:authentication var="principal" property="principal" />
+                <div class="welcome">
+                    <a href="#" title="">
+                        <img src="<light:url value='/images/userPic.png'/>" alt=""/></a>
+                    <span>Hello, <c:choose>
+                        <c:when test="${not empty principal.username}">
+                            <sec:authentication property="principal.username"/>
+                        </c:when>
+                        <c:otherwise>
+                            <sec:authentication property="principal"/>
+                        </c:otherwise>
+                    </c:choose>!</span>
+                </div>
+                <div class="userNav">
+                    <ul>
+                        <li><a href="<c:out value='${lightAdminConfiguration.securityLogoutUrl}'/>" title=""><img
+                                src="<light:url value='/images/icons/topnav/logout.png'/>"
+                                alt=""/><span>Logout</span></a></li>
+                    </ul>
+                </div>
+            </sec:authorize>
+
+            <div class="userNav">
+                <ul>
+                    <li>
+                        <a href="<c:out value='${lightAdminConfiguration.helpUrl}'/>"><img src="<light:url value='/images/icons/topnav/help.png'/>" alt=""><span>Help</span></a>
+                    </li>
+                </ul>
+            </div>
+
+            <c:if test="${lightAdminConfiguration.demoMode}">
+                <div class="userNav">
+                    <iframe allowtransparency="true" frameborder="0" scrolling="no"
+                            src="https://platform.twitter.com/widgets/tweet_button.html?lang=en&url=http%3A%2F%2Flightadmin.org&related=lightadm_team&text=%23LightAdmin%20-%20Pluggable%20%23CRUD%20administration%20UI%20library%20for%20%23SpringBoot%20on%20top%20of%20%23SpringData,%20%23JPA%20and%20%23REST"
+                            style="width:130px; height:20px; position: relative; right: -35px; top: 8px;"></iframe>
+                </div>
+
+                <a id="fork-me" href="https://github.com/la-team/light-admin" style="position: absolute;right: 0;top: 0;z-index: 1;"><img src="<light:url value='/images/fork-me-on-github.png'/>" alt="Fork me on GitHub"></a>
+            </c:if>
+
+            <div class="fix"></div>
+        </div>
+    </div>
 </div>