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

- Change to start using bootstrap grid

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-09-10 23:51:53 -03:00
parent 6efc068a6c
commit 3fb746f79b
23 changed files with 316 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
wise-webapp/src/main/webapp/jsp/footer.jsp
View File

@@ -1,9 +1,10 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<div id="footer">
<div><a href="https://twitter.com/share" class="twitter-share-button" data-via="wisemapping"
data-related="wisemapping">Tweet</a>
<div class="row" id="footer">
<div class="span1 offset3">
<a href="https://twitter.com/share" class="twitter-share-button" data-via="wisemapping"
data-related="wisemapping">Tweet</a>
<script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0];
if (!d.getElementById(id)) {
@@ -13,8 +14,8 @@
fjs.parentNode.insertBefore(js, fjs);
}
}(document, "script", "twitter-wjs");</script>
<!-- Place this tag in your head or just before your close body tag -->
</div>
<div class="span1">
<script type="text/javascript" src="https://apis.google.com/js/plusone.js">
{
parsetags: 'explicit'
@@ -27,17 +28,17 @@
<!-- Place this render call where appropriate -->
<script type="text/javascript">gapi.plusone.go();</script>
</div>
<div style="width: 240px; padding: 0 40px;">
<p>
<div class="span4">
<p style="text-align: center;">
<a href="https://groups.google.com/d/forum/wisemapping-support"><spring:message code="SUPPORT"/></a> |
<a href="mailto:feedback@wisemapping.com"><spring:message code="FEEDBACK"/></a> |
<a href="mailto:dev@wisemapping.com"><spring:message code="CONTACT_US"/></a>
<a href="mailto:dev@wisemapping.com"><spring:message code="CONTACT_US"/></a> |
<a href="http://www.wisemapping.org/license"><spring:message code="LICENSE"/></a><br/>
<a href="http://www.wisemapping.org/"><spring:message code="COPYRIGHT"/></a>
</p>
</div>
<div style="padding: 0 20px">
<div class="span1">
<form action="https://www.paypal.com/cgi-bin/webscr" method="post">
<input type="hidden" name="cmd" value="_s-xclick"/>
<input type="image" src="https://www.paypal.com/en_US/i/btn/x-click-but04.gif" name="submit"
@@ -47,30 +48,30 @@
value="-----BEGIN PKCS7-----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-----END PKCS7-----"/>
</form>
</div>
<div>
<div class="span1">
<a href="http://www.w3.org/html/logo/">
<img src="http://www.w3.org/html/logo/badge/html5-badge-h-graphics.png" width="66" height="32"
alt="HTML5 Powered with Graphics, 3D &amp; Effects"
title="HTML5 Powered with Graphics, 3D &amp; Effects">
</a>
</div>
</div>
<c:if test="${requestScope['google.analytics.enabled']}">
<script type="text/javascript">
<c:if test="${requestScope['google.analytics.enabled']}">
<script type="text/javascript">
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '${requestScope['google.analytics.account']}']);
_gaq.push(['_setDomainName', 'wisemapping.com']);
_gaq.push(['_trackPageview']);
var _gaq = _gaq || [];
_gaq.push(['_setAccount', '${requestScope['google.analytics.account']}']);
_gaq.push(['_setDomainName', 'wisemapping.com']);
_gaq.push(['_trackPageview']);
(function () {
var ga = document.createElement('script');
ga.type = 'text/javascript';
ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();
</script>
</c:if>
</div>
(function () {
var ga = document.createElement('script');
ga.type = 'text/javascript';
ga.async = true;
ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
var s = document.getElementsByTagName('script')[0];
s.parentNode.insertBefore(ga, s);
})();
</script>
</c:if>

40
wise-webapp/src/main/webapp/jsp/login.jsp
View File

@@ -4,20 +4,21 @@
<%--@elvariable id="isHsql" type="boolean"--%>
<script type="text/javascript" language="javascript">
$(function() {
$('.btn-primary').click(function() {
$(function () {
$('.btn-primary').click(function () {
$(this).button("loading");
});
});
</script>
<div id="loginContent">
<div class="loginNews">
<h1><spring:message code="WHAT_IS_NEW"/>: </h1>
<spring:message code="WHAT_IS_NEW_DETAILS"/>
<div id="row-fluid">
<div class="span1"></div>
<div class="span5" style="margin-top: 20px">
<h1><spring:message code="WELCOME_TO_WISEMAPPING"/></h1>
<spring:message code="WELCOME_DETAILS"/>
</div>
<div id="login" class="fform">
<div class="span1"></div>
<div id="login" class="fform span4">
<h1>
<spring:message code="SIGN_IN"/>
</h1>
@@ -54,17 +55,22 @@
</div>
</div>
<div id="register">
<b><spring:message code="NOT_READY_A_USER"/></b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
<a href="c/user/registration">
<spring:message code="JOIN_NOW"/>
</a>
<div class="row-fluid">
<div id="register" class="span12">
<b><spring:message code="NOT_READY_A_USER"/></b>
<spring:message code="NOT_READY_A_USER_MESSAGE"/>
<a href="c/user/registration">
<spring:message code="JOIN_NOW"/>
</a>
</div>
</div>
<c:if test="${isHsql== 'true'}">
<div class="alert alert-info">
<span class="label label-important"><spring:message code="WARNING"/></span> <spring:message code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
href="http://www.wisemapping.org/documentation/configu"><spring:message code="HERE"/></a>.
<div class="row-fluid">
<div class="alert alert-info span offset12">
<span class="label label-important"><spring:message code="WARNING"/></span> <spring:message
code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
href="http://www.wisemapping.org/documentation/configu"><spring:message code="HERE"/></a>.
</div>
</div>
</c:if>

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

@@ -3,7 +3,7 @@
<!DOCTYPE HTML>
<html>
<html lang="en">
<head>
<base href="${baseURL}/">
<title><spring:message code="SITE.TITLE"/> - <spring:message code="MY_WISEMAPS"/></title>
@@ -99,7 +99,7 @@
// Re-arrange pagination actions ...
$("#tableFooter").appendTo("#mindmapListTable_wrapper");
$("#mindmapListTable_length").appendTo("#tableFooter");
$('#mindmapListTable_length select').addClass('span1');
$('#mindmapListTable_length select').attr("style", "width:60px;");
$('input:checkbox[id="selectAll"]').click(function () {
@@ -122,99 +122,114 @@
<jsp:param name="showLogout" value="true"/>
</jsp:include>
<div style="min-height: 500px">
<div id="mindmapListContainer">
<div id="messagesPanel" class="alert alert-error alert-block fade in hide" style="margin-top: 10px">
<strong><spring:message code="UNEXPECTED_ERROR"/></strong>
<div class="row-fluid hide" id="messagesPanel" style="margin-top: 20px">
<div class="span2"></div>
<div class="alert alert-error alert-block fade in span8">
<strong><spring:message code="UNEXPECTED_ERROR"/></strong>
<p><spring:message code="UNEXPECTED_ERROR_SERVER_ERROR"/></p>
<p><spring:message code="UNEXPECTED_ERROR_SERVER_ERROR"/></p>
<div></div>
<div></div>
</div>
</div>
<div class="row-fluid" style="min-height: 500px">
<div class="span1"></div>
<div class="span2" id="foldersContainer">
<ul class="nav nav-list">
<li class="nav-header"><spring:message code="FILTERS"/></li>
<li data-filter="all" class="active"><a href="#"><i class="icon-inbox icon-white"></i> <spring:message
code="ALL_MAPS"/></a></li>
<li data-filter="my_maps"><a href="#"><i class="icon-user"></i> <spring:message code="MY_MAPS"/></a>
</li>
<li data-filter="shared_with_me"><a href="#"><i class="icon-share"></i> <spring:message
code="SHARED_WITH_ME"/></a></li>
<li data-filter="starred"><a href="#"><i class="icon-star"></i> <spring:message code="STARRED"/></a>
</li>
<li data-filter="public"><a href="#"><i class="icon-globe"></i> <spring:message code="PUBLIC_MAPS"/></a>
</li>
</ul>
</div>
<div class="buttonsToolbar btn-toolbar ${requestScope['google.ads.enabled']?'span7':'span8'}">
<div id="tableActions">
<div id="pageInfo"></div>
<div class="btn-group" id="pageButtons">
<button class="btn" id="pPageBtn"><strong>&lt;</strong></button>
<button class="btn" id="nPageBtn"><strong>&gt;</strong></button>
</div>
</div>
<div id="foldersContainer">
<ul class="nav nav-list">
<li class="nav-header"><spring:message code="FILTERS"/></li>
<li data-filter="all" class="active"><a href="#"><i class="icon-inbox icon-white"></i> <spring:message
code="ALL_MAPS"/></a></li>
<li data-filter="my_maps"><a href="#"><i class="icon-user"></i> <spring:message code="MY_MAPS"/></a>
<div class="btn-group">
<button id="newBtn" class="btn btn-primary"><i class="icon-file icon-white"></i> <spring:message
code="NEW"/></button>
<button id="importBtn" class="btn btn-primary"><i class="icon-upload icon-white"></i>
<spring:message code="IMPORT"/>
</button>
</div>
<div class="btn-group act-multiple" id="deleteBtn" style="display:none">
<button class="btn btn-primary"><i class="icon-trash icon-white"></i> <spring:message
code="DELETE"/></button>
</div>
<div id="infoBtn" class="btn-group act-single" style="display:none">
<button class="btn btn-primary"><i class="icon-exclamation-sign icon-white"></i> <spring:message
code="INFO"/></button>
</div>
<div id="actionsBtn" class="btn-group act-single" style="display:none">
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<i class="icon-asterisk icon-white"></i> <spring:message code="MORE"/>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li id="duplicateBtn"><a href="#" onclick="return false"><i class="icon-plus-sign"></i>
<spring:message code="DUPLICATE"/></a></li>
<li id="renameBtn"><a href="#" onclick="return false"><i class="icon-edit"></i> <spring:message
code="RENAME"/></a></li>
<li id="publishBtn"><a href="#" onclick="return false"><i class="icon-globe"></i>
<spring:message code="PUBLISH"/></a>
</li>
<li data-filter="shared_with_me"><a href="#"><i class="icon-share"></i> <spring:message
code="SHARED_WITH_ME"/></a></li>
<li data-filter="starred"><a href="#"><i class="icon-star"></i> <spring:message code="STARRED"/></a>
<li id="shareBtn"><a href="#" onclick="return false"><i class="icon-share"></i> <spring:message
code="SHARE"/></a></li>
<li id="exportBtn"><a href="#" onclick="return false"><i class="icon-download"></i>
<spring:message
code="EXPORT"/></a>
</li>
<li data-filter="public"><a href="#"><i class="icon-globe"></i> <spring:message code="PUBLIC_MAPS"/></a>
<li id="printBtn"><a href="#" onclick="return false"><i class="icon-print"></i> <spring:message
code="PRINT"/></a></li>
<li id="historyBtn"><a href="#" onclick="return false"><i class="icon-time"></i> <spring:message
code="HISTORY"/></a>
</li>
</ul>
</div>
<div style="width: 78%;float: left;">
<div id="buttonsToolbar" class="btn-toolbar">
<div class="btn-group">
<button id="newBtn" class="btn btn-primary"><i class="icon-file icon-white"></i> <spring:message
code="NEW"/></button>
<button id="importBtn" class="btn btn-primary"><i class="icon-upload icon-white"></i>
<spring:message code="IMPORT"/>
</button>
</div>
<div class="btn-group act-multiple" id="deleteBtn" style="display:none">
<button class="btn btn-primary"><i class="icon-trash icon-white"></i> <spring:message
code="DELETE"/></button>
</div>
<div id="infoBtn" class="btn-group act-single" style="display:none">
<button class="btn btn-primary"><i class="icon-exclamation-sign icon-white"></i> <spring:message
code="INFO"/></button>
</div>
<div id="actionsBtn" class="btn-group act-single" style="display:none">
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
<i class="icon-asterisk icon-white"></i> <spring:message code="MORE"/>
<span class="caret"></span>
</button>
<ul class="dropdown-menu">
<li id="duplicateBtn"><a href="#" onclick="return false"><i class="icon-plus-sign"></i>
<spring:message code="DUPLICATE"/></a></li>
<li id="renameBtn"><a href="#" onclick="return false"><i class="icon-edit"></i> <spring:message
code="RENAME"/></a></li>
<li id="publishBtn"><a href="#" onclick="return false"><i class="icon-globe"></i>
<spring:message code="PUBLISH"/></a>
</li>
<li id="shareBtn"><a href="#" onclick="return false"><i class="icon-share"></i> <spring:message
code="SHARE"/></a></li>
<li id="exportBtn"><a href="#" onclick="return false"><i class="icon-download"></i>
<spring:message
code="EXPORT"/></a>
</li>
<li id="printBtn"><a href="#" onclick="return false"><i class="icon-print"></i> <spring:message
code="PRINT"/></a></li>
<li id="historyBtn"><a href="#" onclick="return false"><i class="icon-time"></i> <spring:message
code="HISTORY"/></a>
</li>
</ul>
</div>
<div id="tableActions" class="btn-toolbar">
<div class="btn-group" id="pageButtons">
<button class="btn" id="pPageBtn"><strong>&lt;</strong></button>
<button class="btn" id="nPageBtn"><strong>&gt;</strong></button>
</div>
<div id="pageInfo"></div>
</div>
</div>
<div id="map-table">
<table class="table" id="mindmapListTable"></table>
<div id="tableFooter" class="form-inline"></div>
</div>
<div id="map-table">
<table class="table" id="mindmapListTable"></table>
<div id="tableFooter" class="form-inline"></div>
</div>
</div>
<div class="span1">
<c:if test="${requestScope['google.ads.enabled']}">
<script type="text/javascript"><!--
google_ad_client = "ca-pub-7564778578019285";
/* WiseMapping Mindmap List */
google_ad_slot = "4071968444";
google_ad_width = 120;
google_ad_height = 440;
//-->
</script>
<div style="margin-top:5px;">
<script type="text/javascript"
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
</c:if>
</div>
</div>
<div style="border-top: 1px solid #000000">
<jsp:include page="footer.jsp"/>
</div>
<jsp:include page="footer.jsp"/>
<div id="dialogsContainer">
<!-- New map dialog -->
@@ -421,22 +436,5 @@
</div>
</div>
</div>
<c:if test="${requestScope['google.ads.enabled']}">
<script type="text/javascript"><!--
google_ad_client = "ca-pub-7564778578019285";
/* WiseMapping Mindmap List */
google_ad_slot = "4071968444";
google_ad_width = 120;
google_ad_height = 460;
//-->
</script>
<div style="position:absolute;right: 9px;top: 90px">
<script type="text/javascript"
src="http://pagead2.googlesyndication.com/pagead/show_ads.js">
</script>
</div>
</c:if>
</body>
</html>

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

@@ -34,8 +34,9 @@
<jsp:include page="header.jsp"/>
<div class="pageBody">
<div class="pageBodyContent">
<div class="pageBody row-fluid">
<div class="span2"></div>
<div class="pageBodyContent span8">
<tiles:insertAttribute name="body"/>
</div>
</div>