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

Remove the loading text from dialog ...

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2012-07-01 17:56:31 -03:00
parent 7752ac0dc1
commit 0cb142d3fd
16 changed files with 124 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,9 +3,9 @@
<div>
<ul class="nav nav-tabs">
<li class="active"><a href="#changeUserPanel" data-toggle="pill"><spring:message code="GENERAL"/>:</a></li>
<li><a href="#changePasswordPanel" data-toggle="pill"><spring:message code="SECURITY"/>:</a></li>
<li><a href="#languagePanel" data-toggle="pill"><spring:message code="LANGUAGE"/>:</a></li>
<li class="active"><a href="#changeUserPanel" data-toggle="pill"><spring:message code="GENERAL"/></a></li>
<li><a href="#changePasswordPanel" data-toggle="pill"><spring:message code="SECURITY"/></a></li>
<li><a href="#languagePanel" data-toggle="pill"><spring:message code="LANGUAGE"/></a></li>
</ul>
<div class="tab-content">

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

@@ -1,5 +1,11 @@
<%@ page import="java.util.Locale" %>
<%@ page import="org.springframework.context.i18n.LocaleContextHolder" %>
<%@page pageEncoding="UTF-8" %>
<%@include file="/jsp/init.jsp" %>
<%
final Locale locale = LocaleContextHolder.getLocale();
request.setAttribute("locale", locale.getLanguage());
%>
<!DOCTYPE HTML>
@@ -19,6 +25,8 @@
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap.min.css"/>
<link rel="stylesheet" type="text/css" href="bootstrap/css/bootstrap-responsive.min.css"/>
<script type="text/javascript" language="javascript" src="js/jquery.timeago.js"></script>
<script type="text/javascript" language="javascript" src="js/jquery.timeago.${locale}.js"></script>
<body>
<div style="padding-top:20px">
<tiles:insertAttribute name="body"/>

4
wise-webapp/src/main/webapp/jsp/iframeWrapper.jsp
View File

@@ -6,8 +6,8 @@
<div>
<iframe src='${url}' style="border: 0;width: 100%;height:100%" id="dialogContentIframe"></iframe>
<div style="float: right;margin-right: 25px">
<input type="button" class="btn-primary" value="Accept" id="submitBtn"/>
<input type="button" class="btn-secondary" value="Cancel" id="cancelBtn"/>
<input type="button" class="btn-primary" value="<spring:message code="ACCEPT"/>" id="submitBtn"/>
<input type="button" class="btn-secondary" value="<spring:message code="CANCEL"/>" id="cancelBtn"/>
</div>
</div>

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

@@ -9,13 +9,6 @@
<%--@elvariable id="editorTryMode" type="java.lang.Boolean"--%>
<%--@elvariable id="editorTryMode" type="java.lang.String"--%>
<%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
<%
User user = Utils.getUser();
if (user != null) {
request.setAttribute("principal", user);
}
%>
<html>
<head>
<base href="${baseURL}/">
@@ -34,7 +27,7 @@
<script type="text/javascript">
$(document).addEvent('loadcomplete', function(resource) {
$(document).addEvent('loadcomplete', function (resource) {
var mapId = '${mindmap.id}';
var mapXml = '${mindmap.xmlAsJsLiteral}';
@@ -70,13 +63,13 @@
<div id="headerInfo">
<div id="headerActions">
<spring:message code="WELCOME"/>, ${principal.firstname}|<span><a
href="c/maps/"><spring:message code="MY_WISEMAPS"/></a></span> |
<spring:message code="WELCOME"/>, ${principal.firstname} | <span><a href="c/maps/"><spring:message
code="MY_WISEMAPS"/></a></span> |
<%--<span><a id="settings" href="c/settings"--%>
<%--title="<spring:message code="ACCOUNT_DETAIL"/>"><spring:message code="ACCOUNT"/></a></span> |--%>
<%--title="<spring:message code="ACCOUNT_DETAIL"/>"><spring:message code="ACCOUNT"/></a></span> |--%>
<span><a href="c/logout" title="<spring:message code="LOGOUT"/>">
<spring:message code="LOGOUT"/>
</a></span>
<spring:message code="LOGOUT"/>
</a></span>
</div>
<a href="c/maps/">
<div id="headerLogo"></div>

7
wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp
View File

@@ -16,8 +16,8 @@
<div id="historyContainer">
<table class="table table-condensed" id="historyTable">
<colgroup>
<col width="50%"/>
<col width="30%"/>
<col width="40%"/>
<col width="40%"/>
<col width="10%"/>
<col width="10%"/>
</colgroup>
@@ -67,4 +67,7 @@
console.l(textStatus);
}
});
var submitDialogForm = function () {
}
</script>

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

@@ -26,6 +26,7 @@
<!-- Update timer plugging -->
<script type="text/javascript" language="javascript" src="js/jquery.timeago.js"></script>
<script type="text/javascript" language="javascript" src="js/jquery.timeago.${locale}.js"></script>
<script type="text/javascript" language="javascript">
@@ -78,8 +79,11 @@
],
bAutoWidth:false,
oLanguage:{
"sLengthMenu":"<spring:message code="SHOW_REGISTERS"/>",
"sSearch":"",
"sInfo":"_START_-_END_ of _TOTAL_",
"sZeroRecords": "<spring:message code="NO_MATCHING_FOUND"/>",
"sLoadingRecords":"<spring:message code="LOADING"/>",
"sInfo":"<spring:message code="TABLE_ROWS"/>",
"sEmptyTable":"<spring:message code="NO_SEARCH_RESULT"/>"
},
bStateSave:true