diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java b/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java index ea5ffe94..04615bad 100644 --- a/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/MindmapEditorController.java @@ -41,23 +41,26 @@ public class MindmapEditorController extends BaseMultiActionController { ModelAndView view; - UserAgent userAgent = UserAgent.create(httpServletRequest); - if(userAgent.needsGCF()){ - view = new ModelAndView("installCFG"); - } - else{ final String mindmapId = httpServletRequest.getParameter(MINDMAP_ID_PARAMETER); final int mapId = Integer.parseInt(mindmapId); - final MindMap mindmap = getMindmapService().getMindmapById(mapId); - // Mark as try mode... - view = new ModelAndView("mindmapEditor", "mindmap", mindmap); - view.addObject("editorTryMode", false); - final boolean showHelp = isWelcomeMap(mindmap); - view.addObject("showHelp", showHelp); - final String xmlMap = mindmap.getNativeXmlAsJsLiteral(); - view.addObject(MAP_XML_PARAM, xmlMap); - view.addObject("user", Utils.getUser()); + UserAgent userAgent = UserAgent.create(httpServletRequest); + if(userAgent.needsGCF()){ + view = new ModelAndView("gcfPluginNeeded"); + view.addObject(MINDMAP_ID_PARAMETER, mindmapId); + } + else{ + + final MindMap mindmap = getMindmapService().getMindmapById(mapId); + + // Mark as try mode... + view = new ModelAndView("mindmapEditor", "mindmap", mindmap); + view.addObject("editorTryMode", false); + final boolean showHelp = isWelcomeMap(mindmap); + view.addObject("showHelp", showHelp); + final String xmlMap = mindmap.getNativeXmlAsJsLiteral(); + view.addObject(MAP_XML_PARAM, xmlMap); + view.addObject("user", Utils.getUser()); } return view; } diff --git a/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java b/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java index be55599f..86ed234c 100644 --- a/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java +++ b/wise-webapp/src/main/java/com/wisemapping/controller/PublicPagesController.java @@ -52,6 +52,10 @@ public class PublicPagesController extends BaseMultiActionController { return new ModelAndView("privacyPolicy"); } + public ModelAndView installCFG(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { + return new ModelAndView("installCFG"); + } + public ModelAndView home(HttpServletRequest httpServletRequest, HttpServletResponse httpServletResponse) throws Exception { return new ModelAndView("homepage"); } diff --git a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties index b36cb68f..7ad7081c 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties +++ b/wise-webapp/src/main/webapp/WEB-INF/classes/messages.properties @@ -323,10 +323,9 @@ NO_HISTORY_RESULTS= No History Information was found. HISTORY_INFO = Here is the list of the last revisions of you map. REVERT=revert SAMPLE_MAPS=Sample Maps -INSTALL_CFG=Install Google Chrome Frame -INSTALL_CFG_REASON = Since you are using Internet Explorer 8 or previous, you need to install Google Chrome Frame. This is a plugin made by Google that will allow you to see SVG in your browser. -INSTALL_CFG_BROWSERS=This plug in is not necessary for Internet Explorer 9, or any other browser. -INSTALL_CFG_CLICK_HERE=To download click here +INSTALL_CFG=Google Chrome Frame Plugin Needed +INSTALL_CFG_REASON =

You need to install the Google Chrome Frame Plugin


We used to support IE 7/8 by rendering VML instead of SVG. In a few words, VML was the SVG equivalent in the Microsoft world, and we have invested a lot of energy in VML during several years solving several performance and instability issues among others things. Since Internet Explorer 9 has support for HTML 5.0 (thus SVG support), we decided to deprecate the support of VML. The side effect of this is that all users using Internet Explorer 7/8 will have to install a plugin from google that enables the display of HTML 5.0 webpages.

+INSTALL_CFG_CLICK_HERE=To install Google Chrome Frame Plugin click here INVALID_EMAIL_ERROR = The e-mail was not verified BROWSER_NOT_SUPPOERTED= Current Browser is not supported. 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 1e5f317d..4c493350 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/defs/definitions.xml @@ -16,7 +16,6 @@ - @@ -35,6 +34,16 @@ + + + + + + + + + + diff --git a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml index b7e6e683..9e729918 100644 --- a/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml +++ b/wise-webapp/src/main/webapp/WEB-INF/wisemapping-servlet.xml @@ -71,6 +71,7 @@ tryEditor + installCFG @@ -313,6 +314,7 @@ importMapController newMapController historyController + homeController diff --git a/wise-webapp/src/main/webapp/css/common.css b/wise-webapp/src/main/webapp/css/common.css index b4c83e1d..1f9a8169 100644 --- a/wise-webapp/src/main/webapp/css/common.css +++ b/wise-webapp/src/main/webapp/css/common.css @@ -587,3 +587,26 @@ span.fieldRequired { #keyboardTable tr { padding: 5px; } + + +div.installCFG { + width:100%; + font-size:130%; +} + +div.installCFG h1{ + width:100%; + font-size:130%; +} + +div.installCFG h2{ + font-size:100%; + border-bottom:0 solid black; +} + +.chromeFrameInstallDefaultStyle { + position:relative; + left:0; + top:0; + margin:0; +} \ No newline at end of file diff --git a/wise-webapp/src/main/webapp/jsp/gcfPluginNeeded.jsp b/wise-webapp/src/main/webapp/jsp/gcfPluginNeeded.jsp new file mode 100644 index 00000000..f3b3a158 --- /dev/null +++ b/wise-webapp/src/main/webapp/jsp/gcfPluginNeeded.jsp @@ -0,0 +1,13 @@ +<%@ page import="org.apache.log4j.Logger" %> +<%@ page autoFlush="true" buffer="none" %> +<%@ include file="/jsp/init.jsp" %> + +<%! + final Logger logger = Logger.getLogger("com.wisemapping"); +%> +
+ +

+ +
+ diff --git a/wise-webapp/src/main/webapp/jsp/installCFG.jsp b/wise-webapp/src/main/webapp/jsp/installCFG.jsp index 04334820..f048aff5 100644 --- a/wise-webapp/src/main/webapp/jsp/installCFG.jsp +++ b/wise-webapp/src/main/webapp/jsp/installCFG.jsp @@ -1,62 +1,27 @@ - -<%@page pageEncoding="UTF-8"%> -<%@ taglib prefix="tiles" uri="http://struts.apache.org/tags-tiles" %> +<%@ page import="org.apache.log4j.Logger" %> +<%@ page autoFlush="true" buffer="none" %> <%@ include file="/jsp/init.jsp" %> - - - - <spring:message code="SITE.TITLE"/> - - - <spring:message code="INSTALL_CFG"/> - - - - - - - - - - - - - -
- -
-
- -

- -

-
-
- -
- -
- +<%! + final Logger logger = Logger.getLogger("com.wisemapping"); +%> +
+
+
+ - - - \ No newline at end of file + \ No newline at end of file