diff --git a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml index ea7db0a4..3661cccb 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml @@ -13,15 +13,9 @@ - + - - - - - - diff --git a/wise-webapp/src/main/webapp/css/error.less b/wise-webapp/src/main/webapp/css/error.less new file mode 100644 index 00000000..fc9bdee3 --- /dev/null +++ b/wise-webapp/src/main/webapp/css/error.less @@ -0,0 +1,27 @@ +@import "compatibility.less"; + +div#errorContainer { + padding: 200px; + height: 100vh; + background-color: rgb(252, 235, 192); + text-align:center +} + +div#errorContainer > h1 { + padding-top: 200px; + color: rgb(241, 163, 39); + font-size: 40px; +} + +div#errorContainer > p { + font-size: 25px; +} +div#bottom-logo { + position: fixed; + right: 20px; + bottom: 10px; + background: url(../../images/editor/logo-text-black.svg) no-repeat; + width: 90px; + height: 40px; +} + diff --git a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp b/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp deleted file mode 100644 index 6c650fcd..00000000 --- a/wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp +++ /dev/null @@ -1,32 +0,0 @@ -<%@ page import="java.util.Locale" %> -<%@ page import="org.springframework.context.i18n.LocaleContextHolder" %> -<%@page pageEncoding="UTF-8" %> -<%@include file="/jsp/init.jsp" %> -<% - final Locale locale = LocaleContextHolder.getLocale(); - request.setAttribute("locale", locale.getLanguage()); -%> - - - -<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> - - - - - - - - - - - - - -
- -
- - diff --git a/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp b/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp deleted file mode 100644 index 7b970028..00000000 --- a/wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp +++ /dev/null @@ -1,17 +0,0 @@ -<%@page pageEncoding="UTF-8" %> -<%@include file="/jsp/init.jsp" %> -<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> - - - - - - - - - -
- -
- - \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/errorTemplate.jsp b/wise-webapp/src/main/webapp/jsp/errorTemplate.jsp index c8075e94..bfc47517 100644 --- a/wise-webapp/src/main/webapp/jsp/errorTemplate.jsp +++ b/wise-webapp/src/main/webapp/jsp/errorTemplate.jsp @@ -1,13 +1,45 @@ +<%@page pageEncoding="UTF-8" %> +<%@include file="/jsp/init.jsp" %> + -<%@ page autoFlush="true" buffer="none" %> -<%@ include file="/jsp/init.jsp" %> +<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %> + + -

- -

+ + + + + + <spring:message code="SITE.TITLE"/>- + <c:choose> + <c:when test="${requestScope.viewTitle!=null}"> + ${requestScope.viewTitle} + </c:when> + <c:otherwise> + <spring:message code="${requestScope.title}"/> + </c:otherwise> + </c:choose> + + + + <spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/> + + + <%@ include file="/jsp/pageHeaders.jsf" %> - - - + + +
+

+ +

+

+ +

+
+ + + diff --git a/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp b/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp deleted file mode 100644 index d240fb4c..00000000 --- a/wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp +++ /dev/null @@ -1,49 +0,0 @@ -<%@page pageEncoding="UTF-8" %> -<%@include file="/jsp/init.jsp" %> - - - -
- -
- " id="submitBtn"/> - " id="cancelBtn"/> -
-
- - -
- - - -
\ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp index 3bdd8851..c7241dea 100644 --- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp +++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp @@ -17,7 +17,7 @@ - <%@ include file="/jsp/commonPageHeader.jsf" %> + <%@ include file="/jsp/pageHeaders.jsf" %> - <%@ include file="/jsp/commonPageHeader.jsf" %> + <%@ include file="/jsp/pageHeaders.jsf" %>