vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-25 15:37:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

More minor fixes.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2014-02-09 22:44:58 -03:00
parent c5932dc0f8
commit 8996df4cbb
3 changed files with 388 additions and 355 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wise-webapp/src/main/webapp/css/pageTemplate.css
View File

@ -33,7 +33,8 @@ div#pageContainer {
/* Reduce styles */ /* Reduce styles */
.jumbotron > h1 { .jumbotron > h1 {
font-size: 35px; font-size: 30px;
color: #00008b;
} }
.jumbotron p { .jumbotron p {

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

@ -1,8 +1,10 @@
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
<div id="footerContainer" class="row"> <div id="footerContainer" class="row">
<script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=a47981d6"></script> <script type="text/javascript"
<script type="text/javascript" src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=703b9822"></script> src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=a47981d6"></script>
<script type="text/javascript"
src="https://wisemapping.atlassian.net/s/d41d8cd98f00b204e9800998ecf8427e/en_US-f1g0rh-1988229788/6211/26/1.4.5/_/download/batch/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector/com.atlassian.jira.collector.plugin.jira-issue-collector-plugin:issuecollector.js?collectorId=703b9822"></script>
<script type="text/javascript"> <script type="text/javascript">
window.ATL_JQ_PAGE_PROPS = $.extend(window.ATL_JQ_PAGE_PROPS, { window.ATL_JQ_PAGE_PROPS = $.extend(window.ATL_JQ_PAGE_PROPS, {
@ -28,12 +30,19 @@
</script> </script>
<div class="col-md-1 col-md-offset-2"> <div class="col-md-1 col-md-offset-2">
<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.wisemapping.com" data-text="Check out this site" data-via="wisemapping" data-related="wisemapping">Tweet</a> <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://www.wisemapping.com"
<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script> data-text="Check out this site" data-via="wisemapping" data-related="wisemapping">Tweet</a>
<script>!function (d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0], p = /^http:/.test(d.location) ? 'http' : 'https';
if (!d.getElementById(id)) {
js = d.createElement(s);
js.id = id;
js.src = p + '://platform.twitter.com/widgets.js';
fjs.parentNode.insertBefore(js, fjs);
}
}(document, 'script', 'twitter-wjs');</script>
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<!-- Place this tag where you want the +1 button to render. --> <!-- Place this tag where you want the +1 button to render. -->
<div class="g-plusone" data-href="http://www.wisemapping.com"></div> <div class="g-plusone" data-href="http://www.wisemapping.com"></div>
@ -49,15 +58,13 @@
})(); })();
</script> </script>
</div> </div>
<div class="col-md-4"> <div class="col-md-4" style="text-align: center">
<p style="text-align: center;">
<a href="" id="feedbackBtn"><spring:message code="FEEDBACK"/></a> | <a href="" id="feedbackBtn"><spring:message code="FEEDBACK"/></a> |
<a href="" id="reportIssueBtn"><spring:message code="REPORT_BUG"/></a> | <a href="" id="reportIssueBtn"><spring:message code="REPORT_BUG"/></a> |
<a href="mailto:team@wisemapping.com"><spring:message code="CONTACT_US"/></a> | <a href="mailto:team@wisemapping.com"><spring:message code="CONTACT_US"/></a> |
<a href="https://wisemapping.atlassian.net/wiki/display/WS/License "><spring:message code="LICENSE"/></a><br/> <a href="https://wisemapping.atlassian.net/wiki/display/WS/License "><spring:message
code="LICENSE"/></a><br/>
<a href="http://www.wisemapping.org/"><spring:message code="COPYRIGHT"/></a> <a href="http://www.wisemapping.org/"><spring:message code="COPYRIGHT"/></a>
</p>
</div> </div>
<div class="col-md-1"> <div class="col-md-1">
<form action="https://www.paypal.com/cgi-bin/webscr" method="post"> <form action="https://www.paypal.com/cgi-bin/webscr" method="post">

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

@ -88,7 +88,7 @@
// Customize search action ... // Customize search action ...
$('#mindmapListTable_filter').appendTo("#tableActions"); $('#mindmapListTable_filter').appendTo("#tableActions");
$('#mindmapListTable_filter input').addClass('input-medium search-query form-control'); $('#mindmapListTable_filter input').addClass('input-small search-query form-control');
$('#mindmapListTable_filter input').attr('placeholder', 'Search'); $('#mindmapListTable_filter input').attr('placeholder', 'Search');
$("#mindmapListTable_info").appendTo("#pageInfo"); $("#mindmapListTable_info").appendTo("#pageInfo");
@ -118,33 +118,36 @@
<jsp:param name="showLogout" value="true"/> <jsp:param name="showLogout" value="true"/>
</jsp:include> </jsp:include>
<div class="container">
<div class="row hide" id="messagesPanel" style="margin-top: 20px"> <div class="row hide" id="messagesPanel" style="margin-top: 20px">
<div class="col-md-2"></div> <div class="alert alert-danger alert-block fade in col-md-8 col-md-offset-2">
<div class="alert alert-danger alert-block fade in col-md-8">
<strong><spring:message code="UNEXPECTED_ERROR"/></strong> <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> </div>
<div class="row" style="min-height: 500px"> <div class="row">
<div class="col-md-1"></div>
<div class="col-md-2" id="foldersContainer"> <div class="col-md-2" id="foldersContainer">
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
<li data-filter="all" class="active"><a href="#"><i class="glyphicon glyphicon-inbox glyphicon-white"></i> <spring:message <li data-filter="all" class="active"><a href="#"><i
class="glyphicon glyphicon-inbox glyphicon-white"></i>
<spring:message
code="ALL_MAPS"/></a></li> code="ALL_MAPS"/></a></li>
<li data-filter="my_maps"><a href="#"><i class="glyphicon glyphicon-user"></i> <spring:message code="MY_MAPS"/></a> <li data-filter="my_maps"><a href="#"><i class="glyphicon glyphicon-user"></i> <spring:message
code="MY_MAPS"/></a>
</li> </li>
<li data-filter="shared_with_me"><a href="#"><i class="glyphicon glyphicon-share"></i> <spring:message <li data-filter="shared_with_me"><a href="#"><i class="glyphicon glyphicon-share"></i> <spring:message
code="SHARED_WITH_ME"/></a></li> code="SHARED_WITH_ME"/></a></li>
<li data-filter="starred"><a href="#"><i class="glyphicon glyphicon-star"></i> <spring:message code="STARRED"/></a></li> <li data-filter="starred"><a href="#"><i class="glyphicon glyphicon-star"></i> <spring:message
<li data-filter="public"><a href="#"><i class="glyphicon glyphicon-globe"></i> <spring:message code="PUBLIC_MAPS"/></a> code="STARRED"/></a></li>
<li data-filter="public"><a href="#"><i class="glyphicon glyphicon-globe"></i> <spring:message
code="PUBLIC_MAPS"/></a>
</li> </li>
</ul> </ul>
</div> </div>
<div class="buttonsToolbar btn-toolbar ${requestScope['google.ads.enabled']?'col-md-7':'col-md-8'}"> <div class="buttonsToolbar btn-toolbar ${requestScope['google.ads.enabled']?'col-md-9':'col-md-10'}">
<div id="tableActions"> <div id="tableActions">
<div id="pageInfo"></div> <div id="pageInfo"></div>
<div class="btn-group" id="pageButtons"> <div class="btn-group" id="pageButtons">
@ -154,20 +157,24 @@
</div> </div>
<div class="btn-group"> <div class="btn-group">
<button id="newBtn" class="btn btn-primary"><i class="glyphicon glyphicon-file glyphicon-white"></i> <spring:message <button id="newBtn" class="btn btn-primary"><i class="glyphicon glyphicon-file glyphicon-white"></i>
<spring:message
code="NEW"/></button> code="NEW"/></button>
<button id="importBtn" class="btn btn-primary"><i class="glyphicon glyphicon-upload glyphicon-white"></i> <button id="importBtn" class="btn btn-primary"><i
class="glyphicon glyphicon-upload glyphicon-white"></i>
<spring:message code="IMPORT"/> <spring:message code="IMPORT"/>
</button> </button>
</div> </div>
<div class="btn-group act-multiple" id="deleteBtn" style="display:none"> <div class="btn-group act-multiple" id="deleteBtn" style="display:none">
<button class="btn btn-primary"><i class="glyphicon glyphicon-trash glyphicon-white"></i> <spring:message <button class="btn btn-primary"><i class="glyphicon glyphicon-trash glyphicon-white"></i>
<spring:message
code="DELETE"/></button> code="DELETE"/></button>
</div> </div>
<div id="infoBtn" class="btn-group act-single" style="display:none"> <div id="infoBtn" class="btn-group act-single" style="display:none">
<button class="btn btn-primary"><i class="glyphicon glyphicon-exclamation-sign glyphicon-white"></i> <spring:message <button class="btn btn-primary"><i class="glyphicon glyphicon-exclamation-sign glyphicon-white"></i>
<spring:message
code="INFO"/></button> code="INFO"/></button>
</div> </div>
@ -178,22 +185,27 @@
</button> </button>
<ul class="dropdown-menu"> <ul class="dropdown-menu">
<li id="duplicateBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-plus-sign"></i> <li id="duplicateBtn"><a href="#" onclick="return false"><i
class="glyphicon glyphicon-plus-sign"></i>
<spring:message code="DUPLICATE"/></a></li> <spring:message code="DUPLICATE"/></a></li>
<li id="renameBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-edit"></i> <spring:message <li id="renameBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-edit"></i>
<spring:message
code="RENAME"/></a></li> code="RENAME"/></a></li>
<li id="publishBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-globe"></i> <li id="publishBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-globe"></i>
<spring:message code="PUBLISH"/></a> <spring:message code="PUBLISH"/></a>
</li> </li>
<li id="shareBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-share"></i> <spring:message <li id="shareBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-share"></i>
<spring:message
code="SHARE"/></a></li> code="SHARE"/></a></li>
<li id="exportBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-download"></i> <li id="exportBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-download"></i>
<spring:message <spring:message
code="EXPORT"/></a> code="EXPORT"/></a>
</li> </li>
<li id="printBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-print"></i> <spring:message <li id="printBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-print"></i>
<spring:message
code="PRINT"/></a></li> code="PRINT"/></a></li>
<li id="historyBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-time"></i> <spring:message <li id="historyBtn"><a href="#" onclick="return false"><i class="glyphicon glyphicon-time"></i>
<spring:message
code="HISTORY"/></a> code="HISTORY"/></a>
</li> </li>
</ul> </ul>
@ -223,6 +235,7 @@
</div> </div>
</div> </div>
<jsp:include page="footer.jsp"/> <jsp:include page="footer.jsp"/>
</div>
<div id="dialogsContainer"> <div id="dialogsContainer">
<!-- New map dialog --> <!-- New map dialog -->
@ -240,14 +253,20 @@
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label" for="newTitle"><spring:message code="NAME"/>:</label> <label class="col-md-3 control-label" for="newTitle"><spring:message code="NAME"/>:</label>
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" name="title" id="newTitle" type="text" required="required" placeholder="<spring:message code="MAP_NAME_HINT"/>" autofocus="autofocus" maxlength="255"/> <input class="form-control" name="title" id="newTitle" type="text" required="required"
placeholder="<spring:message code="MAP_NAME_HINT"/>" autofocus="autofocus"
maxlength="255"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="col-md-3 control-label" for="newDec"><spring:message code="DESCRIPTION"/>:</label> <label class="col-md-3 control-label" for="newDec"><spring:message
code="DESCRIPTION"/>:</label>
<div class="col-md-8"> <div class="col-md-8">
<input class="form-control" name="description" id="newDec" type="text" placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" maxlength="255"/> <input class="form-control" name="description" id="newDec" type="text"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" maxlength="255"/>
</div> </div>
</div> </div>
</fieldset> </fieldset>
@ -278,6 +297,7 @@
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label for="title" class="col-md-3 control-label"><spring:message code="NAME"/>: </label> <label for="title" class="col-md-3 control-label"><spring:message code="NAME"/>: </label>
<div class="col-md-8"> <div class="col-md-8">
<input name="title" id="title" type="text" required="required" <input name="title" id="title" type="text" required="required"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" autofocus="autofocus" placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" autofocus="autofocus"
@ -287,9 +307,11 @@
<div class="form-group"> <div class="form-group">
<label for="description" class="col-md-3 control-label"><spring:message <label for="description" class="col-md-3 control-label"><spring:message
code="DESCRIPTION"/>: </label> code="DESCRIPTION"/>: </label>
<div class="col-md-8"> <div class="col-md-8">
<input name="description" id="description" type="text" <input name="description" id="description" type="text"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control" maxlength="255"/> placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control"
maxlength="255"/>
</div> </div>
</div> </div>
</fieldset> </fieldset>
@ -318,6 +340,7 @@
<fieldset> <fieldset>
<div class="form-group"> <div class="form-group">
<label for="renTitle" class="col-md-3 control-label"><spring:message code="NAME"/>: </label> <label for="renTitle" class="col-md-3 control-label"><spring:message code="NAME"/>: </label>
<div class="col-md-8"> <div class="col-md-8">
<input name="title" id="renTitle" required="required" autofocus="autofocus" <input name="title" id="renTitle" required="required" autofocus="autofocus"
class="form-control" maxlength="255"/> class="form-control" maxlength="255"/>
@ -326,6 +349,7 @@
<div class="form-group"> <div class="form-group">
<label for="renDescription" class="col-md-3 control-label"><spring:message <label for="renDescription" class="col-md-3 control-label"><spring:message
code="DESCRIPTION"/>:</label> code="DESCRIPTION"/>:</label>
<div class="col-md-8"> <div class="col-md-8">
<input name="description" class="form-control" id="renDescription" maxlength="255"/> <input name="description" class="form-control" id="renDescription" maxlength="255"/>
</div> </div>
@ -334,7 +358,8 @@
</form> </form>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>"><spring:message <button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>">
<spring:message
code="RENAME"/></button> code="RENAME"/></button>
<button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button> <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
</div> </div>
@ -352,7 +377,8 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<div class="alert alert-block"> <div class="alert alert-block">
<h4 class="alert-heading"><spring:message code="WARNING"/>!</h4><spring:message code="DELETE_MAPS_WARNING"/> <h4 class="alert-heading"><spring:message code="WARNING"/>!</h4><spring:message
code="DELETE_MAPS_WARNING"/>
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
@ -482,6 +508,5 @@
</div> </div>
</div> </div>
</div>
</body> </body>
</html> </html>