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 =