More translated resources ...

2012-06-30 14:20:09 -03:00
parent 43aa3e2aea
commit 7b6293dc46
12 changed files with 386 additions and 411 deletions
--- a/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
+++ b/wise-webapp/src/main/webapp/jsp/accountSettings.jsp
@@ -3,9 +3,9 @@

 <div>
    <ul class="nav nav-tabs">
-        <li class="active"><a href="#changeUserPanel" data-toggle="pill">General</a></li>
-        <li><a href="#changePasswordPanel" data-toggle="pill">Security</a></li>
-        <li><a href="#languagePanel" data-toggle="pill">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">
--- a/wise-webapp/src/main/webapp/jsp/login.jsp
+++ b/wise-webapp/src/main/webapp/jsp/login.jsp
@@ -13,13 +13,8 @@

 <div id="loginContent">
    <div class="loginNews">
-        <h1>What is New: </h1>
-        <ul>
-            <li>New User Interface</li>
-            <li>FreeMind 0.9 Update</li>
-            <li>Improved HTML 5.0 Support</li>
-            <li>Firefox 12 officially supported</li>
-        </ul>
+        <h1><spring:message code="WHAT_IS_NEW"/>: </h1>
+        <spring:message code="WHAT_IS_NEW_DETAILS"/>
    </div>

    <div id="login" class="fform">
@@ -69,7 +64,7 @@

 <c:if test="${isHsql== 'true'}">
    <div class="alert alert-info">
-       <span class="label label-important">Warning</span> <spring:message code="NO_PRODUCTION_DATABASE_CONFIGURED"/>&nbsp;<a
-            href="http://www.wisemapping.org/documentation/configu">here</a>.
+       <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>
 </c:if>
--- a/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp
@@ -5,8 +5,8 @@
 <div>
    <ul class="nav nav-tabs">
        <li class="active"><a href="#general" data-toggle="pill">General</a></li>
-        <li><a href="#collaborators" data-toggle="pill">Shared</a></li>
-        <li><a href="#publish" data-toggle="pill">Publish</a></li>
+        <li><a href="#collaborators" data-toggle="pill"><spring:message code="SHARED"/></a></li>
+        <li><a href="#publish" data-toggle="pill"><spring:message code="PUBLIC"/></a></li>
    </ul>

    <div class="tab-content">
--- a/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp
@@ -1,3 +1,5 @@
+<%@ page import="com.wisemapping.security.Utils" %>
+<%@ page import="com.wisemapping.model.User" %>
 <%@page pageEncoding="UTF-8" %>
 <%@ include file="/jsp/init.jsp" %>

@@ -7,6 +9,12 @@
 <%--@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(true);
+    if (user != null) {
+        request.setAttribute("principal", user);
+    }
+%>

 <html>
 <head>
--- a/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
+++ b/wise-webapp/src/main/webapp/jsp/mindmapList.jsp
@@ -29,8 +29,86 @@


    <script type="text/javascript" language="javascript">
-        var principalEmail = '${principal.email}';
-    </script>
+        $(function () {
+            $('#mindmapListTable').dataTable({
+                bProcessing:true,
+                sAjaxSource:"../service/maps/",
+                sAjaxDataProp:'mindmapsInfo',
+                fnInitComplete:function () {
+                    $('#mindmapListTable tbody').change(updateStatusToolbar);
+                    callbackOnTableInit();
+                },
+                aoColumns:[
+                    {
+                        sTitle:'<input type="checkbox" id="selectAll"/>',
+                        sWidth:"60px",
+                        sClass:"select",
+                        bSortable:false,
+                        bSearchable:false,
+                        mDataProp:"starred",
+                        bUseRendered:false,
+                        fnRender:function (obj) {
+                            return '<input type="checkbox"/><span class="' + (obj.aData.starred ? 'starredOn' : 'starredOff') + '"></span>';
+                        }
+                    },
+                    {
+                        sTitle:"<spring:message code="NAME"/>",
+                        sWidth:"270px",
+                        bUseRendered:false,
+                        mDataProp:"title",
+                        fnRender:function (obj) {
+                            return '<a href="c/maps/' + obj.aData.id + '/edit">' + obj.aData.title + '</a>';
+                        }
+                    },
+                    {
+                        sTitle:"Creator",
+                        mDataProp:"creator"
+                    },
+                    {
+                        bSearchable:false,
+                        sTitle:"<spring:message code="LAST_UPDATE"/>",
+                        bUseRendered:false,
+                        sType:"date",
+                        mDataProp:"lastModificationTime",
+                        fnRender:function (obj) {
+                            var time = obj.aData.lastModificationTime;
+                            return '<abbr class="timeago" title="' + time + '">' + jQuery.timeago(time) + '</abbr>' + ' ' + '<span style="color: #777;font-size: 75%;padding-left: 5px;">' + obj.aData.lastModifierUser + '</span>';
+                        }
+                    }
+                ],
+                bAutoWidth:false,
+                oLanguage:{
+                    "sSearch":"",
+                    "sInfo":"_START_-_END_ of _TOTAL_",
+                    "sEmptyTable":"<spring:message code="NO_SEARCH_RESULT"/>"
+                },
+                bStateSave:true
+            });
+
+            // Customize search action ...
+            $('#mindmapListTable_filter').appendTo("#tableActions");
+            $('#mindmapListTable_filter input').addClass('input-medium search-query');
+            $('#mindmapListTable_filter input').attr('placeholder', 'Search');
+            $("#mindmapListTable_info").appendTo("#pageInfo");
+
+            // Re-arrange pagination actions ...
+            $("#tableFooter").appendTo("#mindmapListTable_wrapper");
+            $("#mindmapListTable_length").appendTo("#tableFooter");
+            $('#mindmapListTable_length select').addClass('span1');
+
+
+            $('input:checkbox[id="selectAll"]').click(function () {
+                $("#mindmapListTable").dataTableExt.selectAllMaps();
+            });
+
+            // Hack for changing the pagination buttons ...
+            $('#nPageBtn').click(function () {
+                $('#mindmapListTable_next').click();
+            });
+            $('#pPageBtn').click(function () {
+                $('#mindmapListTable_previous').click();
+            });
+        });    </script>

 </head>
 <body>
@@ -52,7 +130,7 @@

        <div id="foldersContainer">
            <ul class="nav nav-list">
-                <li class="nav-header">Filters</li>
+                <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>
@@ -70,36 +148,46 @@
            <div id="buttonsToolbar" class="btn-toolbar">

                <div class="btn-group">
-                    <button id="newBtn" class="btn btn-primary"><i class="icon-file icon-white"></i> New</button>
-                    <button id="importBtn" class="btn btn-primary"><i class="icon-upload icon-white"></i> Import
+                    <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> Delete</button>
+                    <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> Info</button>
+                    <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> More
+                        <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>
-                            Duplicate</a></li>
-                        <li id="renameBtn"><a href="#" onclick="return false"><i class="icon-edit"></i> Rename</a></li>
-                        <li id="publishBtn"><a href="#" onclick="return false"><i class="icon-globe"></i> Publish</a>
+                            <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> Share</a></li>
-                        <li id="exportBtn"><a href="#" onclick="return false"><i class="icon-download"></i> Export</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 id="printBtn"><a href="#" onclick="return false"><i class="icon-print"></i> Print</a></li>
-                        <li id="historyBtn"><a href="#" onclick="return false"><i class="icon-time"></i> History</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>
@@ -123,208 +211,210 @@


 <div id="dialogsContainer">
-    <!-- New map dialog -->
-    <div id="new-dialog-modal" title="Add new map" class="modal fade">
-        <div class="modal-header">
-            <button class="close" data-dismiss="modal">x</button>
-            <h3><spring:message code="NEW_MAP_MSG"/></h3>
-        </div>
-        <div class="modal-body">
-            <div class="errorMessage"></div>
-            <form class="form-horizontal">
-                <fieldset>
-                    <div class="control-group">
-                        <label class="control-label" for="newTitle"><spring:message code="NAME"/>:</label>
-                        <input class="control" name="title" id="newTitle" type="text" required="required"
-                               placeholder="Name of the new map to create" autofocus="autofocus"/>
-                    </div>
-                    <div class="control-group">
-                        <label class="control-label" for="newDec"><spring:message code="DESCRIPTION"/>:</label>
-                        <input class="control" name="description" id="newDec" type="text"
-                               placeholder="Some description for your map"/>
-                    </div>
-                </fieldset>
-            </form>
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary btn-accept" data-loading-text="Saving ..."><spring:message
-                    code="CREATE"/></button>
-            <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
+<!-- New map dialog -->
+<div id="new-dialog-modal" title="<spring:message code="ADD_NEW_MAP"/>" class="modal fade">
+    <div class="modal-header">
+        <button class="close" data-dismiss="modal">x</button>
+        <h3><spring:message code="NEW_MAP_MSG"/></h3>
+    </div>
+    <div class="modal-body">
+        <div class="errorMessage"></div>
+        <form class="form-horizontal">
+            <fieldset>
+                <div class="control-group">
+                    <label class="control-label" for="newTitle"><spring:message code="NAME"/>:</label>
+                    <input class="control" name="title" id="newTitle" type="text" required="required"
+                           placeholder="<spring:message code="MAP_NAME_HINT"/>" autofocus="autofocus"/>
+                </div>
+                <div class="control-group">
+                    <label class="control-label" for="newDec"><spring:message code="DESCRIPTION"/>:</label>
+                    <input class="control" name="description" id="newDec" type="text"
+                           placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>"/>
+                </div>
+            </fieldset>
+        </form>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary btn-accept" data-loading-text="<spring:message
+                code="SAVING"/>"><spring:message
+                code="CREATE"/></button>
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
+    </div>
+</div>
+
+<!-- Duplicate map dialog -->
+<div id="duplicate-dialog-modal" class="modal fade">
+    <div class="modal-header">
+        <button class="close" data-dismiss="modal">x</button>
+        <h3 id="dupDialogTitle"></h3>
+    </div>
+    <div class="modal-body">
+        <div class="errorMessage"></div>
+        <form class="form-horizontal">
+            <fieldset>
+                <div class="control-group">
+                    <label for="title" class="control-label"><spring:message code="NAME"/>: </label>
+                    <input name="title" id="title" type="text" required="required"
+                           placeholder="Name of the new map to create" autofocus="autofocus"
+                           class="control"/>
+                </div>
+                <div class="control-group">
+                    <label for="description" class="control-label"><spring:message
+                            code="DESCRIPTION"/>: </label>
+                    <input name="description" id="description" type="text"
+                           placeholder="Some description for your map" class="control"/>
+                </div>
+            </fieldset>
+        </form>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>">
+            <spring:message code="DUPLICATE"/></button>
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
+    </div>
+</div>
+
+<!-- Rename map dialog -->
+<div id="rename-dialog-modal" class="modal fade">
+    <div class="modal-header">
+        <button class="close" data-dismiss="modal">x</button>
+        <h3 id="renameDialogTitle"><spring:message
+                code="RENAME"/></h3>
+    </div>
+    <div class="modal-body">
+        <div class="errorMessage"></div>
+        <form class="form-horizontal">
+            <fieldset>
+                <div class="control-group">
+                    <label for="renTitle" class="control-label"><spring:message code="NAME"/>: </label>
+                    <input name="title" id="renTitle" required="required" autofocus="autofocus"
+                           class="control"/>
+                </div>
+                <div class="control-group">
+                    <label for="renDescription" class="control-label"><spring:message
+                            code="DESCRIPTION"/>:</label>
+                    <input name="description" class="control" id="renDescription"/>
+                </div>
+            </fieldset>
+        </form>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>"><spring:message
+                code="RENAME"/></button>
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
+    </div>
+</div>
+
+<!-- Delete map dialog -->
+<div id="delete-dialog-modal" class="modal fade">
+    <div class="modal-header">
+        <button class="close" data-dismiss="modal">x</button>
+        <h3><spring:message code="DELETE_MINDMAP"/></h3>
+    </div>
+    <div class="modal-body">
+        <div class="alert alert-block">
+            <h4 class="alert-heading"><spring:message code="WARNING"/>!</h4><spring:message code="DELETE_MAPS_WARNING"/>
        </div>
    </div>
-
-    <!-- Duplicate map dialog -->
-    <div id="duplicate-dialog-modal" class="modal fade">
-        <div class="modal-header">
-            <button class="close" data-dismiss="modal">x</button>
-            <h3 id="dupDialogTitle"></h3>
-        </div>
-        <div class="modal-body">
-            <div class="errorMessage"></div>
-            <form class="form-horizontal">
-                <fieldset>
-                    <div class="control-group">
-                        <label for="title" class="control-label"><spring:message code="NAME"/>: </label>
-                        <input name="title" id="title" type="text" required="required"
-                               placeholder="Name of the new map to create" autofocus="autofocus"
-                               class="control"/>
-                    </div>
-                    <div class="control-group">
-                        <label for="description" class="control-label"><spring:message
-                                code="DESCRIPTION"/>: </label>
-                        <input name="description" id="description" type="text"
-                               placeholder="Some description for your map" class="control"/>
-                    </div>
-                </fieldset>
-            </form>
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/> ...">
-                <spring:message code="DUPLICATE"/></button>
-            <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
-        </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary btn-accept" data-loading-text="Saving ..."><spring:message
+                code="DELETE"/></button>
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
    </div>
+</div>

-    <!-- Rename map dialog -->
-    <div id="rename-dialog-modal" class="modal fade">
-        <div class="modal-header">
-            <button class="close" data-dismiss="modal">x</button>
-            <h3 id="renameDialogTitle"></h3>
-        </div>
-        <div class="modal-body">
-            <div class="errorMessage"></div>
-            <form class="form-horizontal">
-                <fieldset>
-                    <div class="control-group">
-                        <label for="renTitle" class="control-label"><spring:message code="NAME"/>: </label>
-                        <input name="title" id="renTitle" required="required" autofocus="autofocus"
-                               class="control"/>
-                    </div>
-                    <div class="control-group">
-                        <label for="renDescription" class="control-label"><spring:message
-                                code="DESCRIPTION"/>:</label>
-                        <input name="description" class="control" id="renDescription"/>
-                    </div>
-                </fieldset>
-            </form>
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary btn-accept" data-loading-text="Saving ..."><spring:message
-                    code="RENAME"/></button>
-            <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
-        </div>
+<!-- Info map dialog -->
+<div id="info-dialog-modal" class="modal fade">
+    <div class="modal-header">
+        <button class="close" data-dismiss="modal">x</button>
+        <h3><spring:message code="INFO"/></h3>
    </div>
+    <div class="modal-body">

-    <!-- Delete map dialog -->
-    <div id="delete-dialog-modal" class="modal fade">
-        <div class="modal-header">
-            <button class="close" data-dismiss="modal">x</button>
-            <h3><spring:message code="DELETE_MINDMAP"/></h3>
-        </div>
-        <div class="modal-body">
-            <div class="alert alert-block">
-                <h4 class="alert-heading">Warning!</h4>Deleted mindmap can not be recovered. Do you want to
-                continue ?.
-            </div>
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary btn-accept" data-loading-text="Saving ..."><spring:message
-                    code="DELETE"/></button>
-            <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
-        </div>
    </div>
-
-    <!-- Info map dialog -->
-    <div id="info-dialog-modal" class="modal fade">
-        <div class="modal-header">
-            <button class="close" data-dismiss="modal">x</button>
-            <h3><spring:message code="INFO"/></h3>
-        </div>
-        <div class="modal-body">
-
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
-        </div>
+    <div class="modal-footer">
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
    </div>
+</div>

-    <!-- Publish Dialog Config -->
-    <div id="publish-dialog-modal" class="modal fade">
-        <div class="modal-header">
-            <button class="close" data-dismiss="modal">x</button>
-            <h3><spring:message code="PUBLISH"/></h3>
-        </div>
-        <div class="modal-body">
-
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>...">
-                <spring:message code="ACCEPT"/></button>
-            <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
-        </div>
+<!-- Publish Dialog Config -->
+<div id="publish-dialog-modal" class="modal fade">
+    <div class="modal-header">
+        <button class="close" data-dismiss="modal">x</button>
+        <h3><spring:message code="PUBLISH"/></h3>
    </div>
+    <div class="modal-body">

-    <!-- Export Dialog Config -->
-    <div id="export-dialog-modal" class="modal fade">
-        <div class="modal-header">
-            <button class="close" data-dismiss="modal">x</button>
-            <h3><spring:message code="EXPORT"/></h3>
-        </div>
-        <div class="modal-body">
-
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary btn-accept" data-loading-text="Exporting..."><spring:message
-                    code="EXPORT"/></button>
-            <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
-        </div>
    </div>
-
-    <!-- Import Dialog Config -->
-    <div id="import-dialog-modal" class="modal fade">
-        <div class="modal-header">
-            <button class="close" data-dismiss="modal">x</button>
-            <h3><spring:message code="IMPORT"/></h3>
-        </div>
-        <div class="modal-body">
-
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary btn-accept" data-loading-text="Importing..."><spring:message
-                    code="IMPORT"/></button>
-            <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
-        </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>...">
+            <spring:message code="ACCEPT"/></button>
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
    </div>
+</div>

-    <!-- Share Dialog Config -->
-    <div id="share-dialog-modal" class="modal fade">
-        <div class="modal-header">
-            <button class="close" data-dismiss="modal">x</button>
-            <h3><spring:message code="SHARE"/></h3>
-        </div>
-        <div class="modal-body">
-
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/> ...">
-                <spring:message code="ACCEPT"/></button>
-            <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
-        </div>
+<!-- Export Dialog Config -->
+<div id="export-dialog-modal" class="modal fade">
+    <div class="modal-header">
+        <button class="close" data-dismiss="modal">x</button>
+        <h3><spring:message code="EXPORT"/></h3>
    </div>
+    <div class="modal-body">

-    <!-- History Dialog Config -->
-    <div id="history-dialog-modal" class="modal fade">
-        <div class="modal-header">
-            <button class="close" data-dismiss="modal">x</button>
-            <h3><spring:message code="HISTORY"/></h3>
-        </div>
-        <div class="modal-body">
-
-        </div>
-        <div class="modal-footer">
-            <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
-        </div>
    </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary btn-accept" data-loading-text="Exporting..."><spring:message
+                code="EXPORT"/></button>
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
+    </div>
+</div>
+
+<!-- Import Dialog Config -->
+<div id="import-dialog-modal" class="modal fade">
+    <div class="modal-header">
+        <button class="close" data-dismiss="modal">x</button>
+        <h3><spring:message code="IMPORT"/></h3>
+    </div>
+    <div class="modal-body">
+
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary btn-accept" data-loading-text="<spring:message
+                    code="IMPORTING"/>"><spring:message
+                code="IMPORT"/></button>
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
+    </div>
+</div>
+
+<!-- Share Dialog Config -->
+<div id="share-dialog-modal" class="modal fade">
+    <div class="modal-header">
+        <button class="close" data-dismiss="modal">x</button>
+        <h3><spring:message code="SHARE"/></h3>
+    </div>
+    <div class="modal-body">
+
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary btn-accept" data-loading-text="<spring:message code="SAVING"/>">
+            <spring:message code="ACCEPT"/></button>
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CANCEL"/></button>
+    </div>
+</div>
+
+<!-- History Dialog Config -->
+<div id="history-dialog-modal" class="modal fade">
+    <div class="modal-header">
+        <button class="close" data-dismiss="modal">x</button>
+        <h3><spring:message code="HISTORY"/></h3>
+    </div>
+    <div class="modal-body">
+
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-cancel" data-dismiss="modal"><spring:message code="CLOSE"/></button>
+    </div>
+</div>
 </div>
 </body>
 </html>
--- a/wise-webapp/src/main/webapp/jsp/userChangePassword.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userChangePassword.jsp
@@ -1,39 +0,0 @@
-<%@page pageEncoding="UTF-8" %>
-<%@include file="/jsp/init.jsp" %>
-
-<div>
-    <form:form method="post" commandName="changePassword">
-        <table>
-            <tr>
-                <td class="formLabel">
-                    <span class="fieldRequired">*</span>
-                    <spring:message code="PASSWORD"/>
-                    :
-                </td>
-                <td>
-                    <form:password path="password" id="password" tabindex="1"/>
-                    <form:errors path="password" cssClass="errorMsg"/>
-                </td>
-            </tr>
-            <tr>
-                <td class="formLabel">
-                    <span class="fieldRequired">*</span>
-                    <spring:message code="RETYPE_PASSWORD"/>
-                    :
-                </td>
-                <td>
-                    <form:password path="retryPassword" id="retryPassword" tabindex="2"/>
-                    <form:errors path="retryPassword" cssClass="errorMsg"/>
-                </td>
-            </tr>
-            <tr>
-                <td>&nbsp;</td>
-                <td>
-                    <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
-                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-primary"
-                           onclick="MOOdalBox.close();">
-                </td>
-            </tr>
-        </table>
-    </form:form>
-</div>
--- a/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userForgotPassword.jsp
@@ -22,7 +22,7 @@
                <label for="email"><spring:message code="EMAIL"/></label>
                <input id="email" type="email" required="required" name="email"/>

-                <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary"  data-loading-text="Seding ..."/>
+                <input type="submit" value="<spring:message code="SEND_ME_A_NEW_PASSWORD"/>" class="btn btn-primary"  data-loading-text="<spring:message code="SENDING"/>"/>
                <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
                       onclick="window.location='<c:url value="c/maps/"/>'"/>
            </fieldset>
--- a/wise-webapp/src/main/webapp/jsp/userForgotPasswordError.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userForgotPasswordError.jsp
@@ -1,7 +1,6 @@
 <%@page pageEncoding="UTF-8" %>
 <%@include file="/jsp/init.jsp" %>

-<h2>The email is not register or you account is not active yet.</h2>
+<h2><spring:message code="ACCOUNT_DOES_NOT_EXISTS"/></h2>

-<p>If the problem persist please send us an email to <a
-        href="mailto:support@wisemapping.com">support@wisemapping.com </a></p>
+<p><spring:message code="ACCOUNT_DOES_NOT_EXISTS_SUPPORT"/></p>
--- a/wise-webapp/src/main/webapp/jsp/userRegistrationSuccess.jsp
+++ b/wise-webapp/src/main/webapp/jsp/userRegistrationSuccess.jsp
@@ -2,12 +2,10 @@
 <%@include file="/jsp/init.jsp" %>

 <div>
-    <h2 style="font-weight:bold;">Thanks for signing up!</h2>
+    <h2 style="font-weight:bold;"><spring:message code="THANKS_FOR_SIGN_UP"/></h2>
    <c:if test="${confirmByEmail==true}">
        <p>
-            You will receive a confirmation message shortly from WiseMapping. This message will ask you to activate your
-            WiseMapping account.
-            Please select the link to activate and start creating and sharing maps.
+            <spring:message code="SIGN_UP_CONFIRMATION_EMAIL"/>
        </p>
        <br/>

@@ -23,8 +21,7 @@
    </c:if>
    <c:if test="${confirmByEmail==false}">
        <p>
-            Your account has been created successfully, click <a href="c/login">here</a> to sign in and start enjoying
-            WiseMapping.
+            <spring:message code="SIGN_UP_SUCCESS"/>
        </p>
    </c:if>
 </div>