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

Merge branch 'master' into db-purge

Browse Source 
Conflicts:
	wise-webapp/src/main/webapp/WEB-INF/classes/log4j.properties
This commit is contained in:
Paulo Gustavo Veiga
2012-11-05 20:40:54 -03:00
parent c86bd15382 29e397ab3f
commit fe8516bb94
32 changed files with 220 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@
<html>
<head>
<base href="${baseURL}/">
<base href="${requestScope['site.baseurl']}/">
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">
<![endif]-->

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

@@ -2,6 +2,3 @@
<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<c:set var="baseURL" value="${fn:replace(pageContext.request.requestURL, pageContext.request.requestURI, pageContext.request.contextPath)}" />

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

@@ -11,7 +11,7 @@
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
<html>
<head>
<base href="${baseURL}/">
<base href="${requestScope['site.baseurl']}/">
<title><spring:message code="SITE.TITLE"/> - <c:out value="${mindmap.title}"/></title>
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">

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

@@ -11,7 +11,7 @@
<html>
<head>
<base href="${baseURL}/">
<base href="{requestScope['site.baseurl']}/">
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
<!--[if lt IE 9]>

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

@@ -5,7 +5,7 @@
<html lang="en">
<head>
<base href="${baseURL}/">
<base href="${requestScope['site.baseurl']}/">
<title><spring:message code="SITE.TITLE"/> - <spring:message code="MY_WISEMAPS"/></title>
<!--[if lt IE 9]>
<meta http-equiv="X-UA-Compatible" content="chrome=1">

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

@@ -10,7 +10,7 @@
<html>
<head>
<base href="${baseURL}/">
<base href="${requestScope['site.baseurl']}/">
<title><spring:message code="SITE.TITLE"/> - ${mindmap.title} </title>
<!--[if lt IE 9]>

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

@@ -10,7 +10,7 @@
<html>
<head>
<base href="${baseURL}/">
<base href="${requestScope['site.baseurl']}/">
<title>
<spring:message code="SITE.TITLE"/>-
<c:choose>