zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Google Crome Frame support.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-06-21 22:18:04 -03:00
parent a5bf5b8d57
commit 10e869ab70
23 changed files with 99 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wise-webapp/src/main/webapp/jsp/GCFInstall.jsp Normal file
View File

@@ -0,0 +1,17 @@
<%@ page autoFlush="true" buffer="none" %>
<%@ include file="/jsp/init.jsp" %>
<div style="position:relative;">
<div id="prompt">
<!-- if IE without GCF, prompt goes here -->
</div>
</div>
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
<script type="text/javascript">
CFInstall.check({
mode: "inline",
node:"prompt",
destination:"c/maps/"
});
</script>

11
wise-webapp/src/main/webapp/jsp/GCFPluginRequired.jsp Normal file
View File

@@ -0,0 +1,11 @@
<%@ page autoFlush="true" buffer="none" %>
<%@ include file="/jsp/init.jsp" %>
<h2><spring:message code="INSTALL_CFG"/></h2>
<p><spring:message code="INSTALL_CFG_REASON"/></p>
<div>
<a href="c/GCFInstall"><spring:message code="INSTALL_CFG_CLICK_HERE"/></a>
</div>

6
wise-webapp/src/main/webapp/jsp/dialogFullTemplate.jsp
View File

@@ -1,3 +1,5 @@
<!DOCTYPE HTML>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ include file="/jsp/init.jsp" %>
@@ -8,7 +10,9 @@
<head>
<base href="${pageContext.request.contextPath}/"/>
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<![endif]-->
<script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/>

2
wise-webapp/src/main/webapp/jsp/dialogTemplate.jsp
View File

@@ -1,3 +1,5 @@
<!DOCTYPE HTML>
<%@ taglib uri="http://tiles.apache.org/tags-tiles" prefix="tiles" %>
<%@ include file="/jsp/init.jsp" %>

41
wise-webapp/src/main/webapp/jsp/editorHeader.jsp
View File

@@ -1,41 +0,0 @@
<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core_rt" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<div id="editorHeader">
<div id="headerToolbar">
<c:if test="${mindmap != null}">
<div id="headerTitle">${mindmap.title}<span id="headerSubTitle">&nbsp;<spring:message
code='EDITOR.LAST_SAVED' arguments='${mindmap.lastModifierUser}'/></span></div>
</c:if>
<c:choose>
<c:when test="${principal != null}">
<div id="headerActions">
<spring:message code="WELCOME"/>
, ${principal.firstname}
| <a href="${pageContext.request.contextPath}/c/maps/" title="<spring:message code="MY_WISEMAPS"/>">
<spring:message code="MY_WISEMAPS"/>
</a>
| <a href="${pageContext.request.contextPath}/c/settings" rel="moodalbox 400px 250px wizard"
title="<spring:message code="ACCOUNT_DETAIL"/>">
<spring:message code="ACCOUNT"/>
</a>
| <a href="${pageContext.request.contextPath}/c/logout" title="<spring:message code="LOGOUT"/>">
<spring:message code="LOGOUT"/>
</a>
</div>
</c:when>
<c:when test="${param.removeSignin!=true}">
<div id="signUpHeader">
<spring:message code="ALREADY_A_MEMBER"/>
<a href="${pageContext.request.contextPath}/c/login" title="<spring:message code="SIGN_IN"/>">
<spring:message code="SIGN_IN"/>
</a>
</div>
</c:when>
</c:choose>
</div>
</div>
<div id="headerLoading">
<spring:message code="LOADING_MSG"/>
</div>

6
wise-webapp/src/main/webapp/jsp/errorTemplate.jsp
View File

@@ -1,3 +1,5 @@
<!DOCTYPE HTML>
<%@ page import="org.apache.log4j.Logger" %>
<%@ page autoFlush="true" buffer="none" %>
<%@ include file="/jsp/init.jsp" %>
@@ -5,9 +7,9 @@
<%!
final Logger logger = Logger.getLogger("com.wisemapping");
%>
<h1>
<h2>
<spring:message code="${requestScope.title}"/>
</h1>
</h2>
<p style="font-weight:bold;">
<spring:message code="${requestScope.details}"/>

13
wise-webapp/src/main/webapp/jsp/gcfPluginNeeded.jsp
View File

@@ -1,13 +0,0 @@
<%@ page import="org.apache.log4j.Logger" %>
<%@ page autoFlush="true" buffer="none" %>
<%@ include file="/jsp/init.jsp" %>
<%!
final Logger logger = Logger.getLogger("com.wisemapping");
%>
<div class="installCFG">
<spring:message code="INSTALL_CFG_REASON"/>
<br/><br/>
<a href="${pageContext.request.contextPath}/c/installCFG?mapId=${mapId}"><spring:message code="INSTALL_CFG_CLICK_HERE"/></a>
</div>

6
wise-webapp/src/main/webapp/jsp/init.jsp
View File

@@ -10,10 +10,4 @@
<%
User user = Utils.getUser(false);
request.setAttribute("principal", user);
UserAgent userAgent = null;
final HttpSession session = request.getSession();
if (session != null) {
userAgent = (UserAgent) session.getAttribute(BrowserSupportInterceptor.USER_AGENT);
}
%>

23
wise-webapp/src/main/webapp/jsp/installCFG.jsp
View File

@@ -1,23 +0,0 @@
<%@ page autoFlush="true" buffer="none" %>
<%@ include file="/jsp/init.jsp" %>
<div style="position:relative;">
<div id="prompt">
<!-- if IE without GCF, prompt goes here -->
</div>
</div>
<script type="text/javascript"
src="http://ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script>
<script type="text/javascript">
function getURLParameter(name) {
return unescape(
(RegExp(name + '=' + '(.+?)(&|$)').exec(location.search)||[,null])[1]
);
}
CFInstall.check({
mode: "inline",
node:"prompt",
destination:"${pageContext.request.contextPath}/c/editor?mapId="+getURLParameter("mapId")
});
</script>

2
wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
View File

@@ -11,11 +11,9 @@
<base href="${pageContext.request.contextPath}/"/>
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
<meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<![endif]-->
<link rel="stylesheet/less" type="text/css" href="css/editor.less"/>
<script type='text/javascript' src='js/mootools-core.js'></script>
<script type='text/javascript' src='js/mootools-more.js'></script>

5
wise-webapp/src/main/webapp/jsp/mindmapList.jsp
View File

@@ -6,11 +6,14 @@
<base href="${pageContext.request.contextPath}/"/>
<title><spring:message code="SITE.TITLE"/></title>
<meta http-equiv="Content-type" content="text/html; charset=utf-8"/>
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<![endif]-->
<link rel="icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
<link rel="shortcut icon" href="${pageContext.request.contextPath}/images/favicon.ico" type="image/x-icon"/>
<link rel="stylesheet/less" type="text/css" href="css/mymaps.less"/>
<link rel="stylesheet/less" type="text/css" href="css/mindmapList.less"/>
<script type="text/javascript" language="javascript" src="js/jquery-1.7.2.min.js"></script>
<script type="text/javascript" language="javascript" src="bootstrap/js/bootstrap.js"></script>

1
wise-webapp/src/main/webapp/jsp/template.jsp
View File

@@ -36,7 +36,6 @@
<jsp:include page="header.jsp"/>
<div class="pageBody">
<div class="pageBodyContent">
<tiles:insertAttribute name="body"/>
</div>