- Remove .htm

- Keep working on export.

wise-webapp/src/main/webapp/jsp/editorHeader.jsp

@@ -13,14 +13,14 @@
                 <div id="headerActions">
                     <spring:message code="WELCOME"/>
                     , ${principal.firstname}
-                    | <a href="${pageContext.request.contextPath}/c/mymaps.htm" title="<spring:message code="MY_WISEMAPS"/>">
+                    | <a href="${pageContext.request.contextPath}/c/maps/" title="<spring:message code="MY_WISEMAPS"/>">
                     <spring:message code="MY_WISEMAPS"/>
                 </a>
-                    | <a href="${pageContext.request.contextPath}/c/settings.htm" rel="moodalbox 400px 250px wizard"
+                    | <a href="${pageContext.request.contextPath}/c/settings" rel="moodalbox 400px 250px wizard"
                          title="<spring:message code="SETTINGS_DETAIL"/>">
                     <spring:message code="SETTINGS"/>
                 </a>
-                    | <a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>">
+                    | <a href="${pageContext.request.contextPath}/c/logout" title="<spring:message code="LOGOUT"/>">
                     <spring:message code="LOGOUT"/>
                 </a>
                 </div>
@@ -28,7 +28,7 @@
             <c:when test="${param.removeSignin!=true}">
                 <div id="signUpHeader">
                     <spring:message code="ALREADY_A_MEMBER"/>
-                    <a href="${pageContext.request.contextPath}/c/login.htm" title="<spring:message code="SIGN_IN"/>">
+                    <a href="${pageContext.request.contextPath}/c/login" title="<spring:message code="SIGN_IN"/>">
                         <spring:message code="SIGN_IN"/>
                     </a>
                 </div>

wise-webapp/src/main/webapp/jsp/embeddedView.jsp

@@ -89,7 +89,7 @@
 <div id="mapContainer">
     <div id="mindplot"></div>
     <div id="embFooter">
-        <a href="${pageContext.request.contextPath}/c/home.htm" target="new">
+        <a href="${pageContext.request.contextPath}/c/home" target="new">
             <div id="logo"></div>
         </a>
 

wise-webapp/src/main/webapp/jsp/embeddedViewError.jsp

@@ -24,7 +24,7 @@
     </p>
     </div>
     <div id="embFooter">
-        <a href="${pageContext.request.contextPath}/c/home.htm" target="new">
+        <a href="${pageContext.request.contextPath}/c/home" target="new">
             <div id="logo"></div>
         </a>
     </div>

wise-webapp/src/main/webapp/jsp/forgotPassword.jsp

@@ -16,7 +16,7 @@
 
                 <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn btn-primary"/>
                 <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
-                       onclick="window.location='<c:url value="c/mymaps.htm"/>'"/>
+                       onclick="window.location='<c:url value="c/maps/"/>'"/>
             </fieldset>
         </form:form>
     </div>
@@ -27,7 +27,7 @@
         <spring:message code="NOT_READY_A_USER"/>
     </b>
     <spring:message code="NOT_READY_A_USER_MESSAGE"/>
-    <a href="userRegistration.htm">
+    <a href="userRegistration">
         <spring:message code="JOIN_NOW"/>
     </a>
 </div>

wise-webapp/src/main/webapp/jsp/gcfPluginNeeded.jsp

@@ -8,6 +8,6 @@
 <div class="installCFG">
     <spring:message code="INSTALL_CFG_REASON"/>
     <br/><br/>
-    <a href="${pageContext.request.contextPath}/c/installCFG.htm?mapId=${mapId}"><spring:message code="INSTALL_CFG_CLICK_HERE"/></a>
+    <a href="${pageContext.request.contextPath}/c/installCFG?mapId=${mapId}"><spring:message code="INSTALL_CFG_CLICK_HERE"/></a>
 </div>
 

wise-webapp/src/main/webapp/jsp/header.jsp

@@ -9,15 +9,15 @@
             <c:when test="${principal != null}">
                 <div id="headerActions">
                     <spring:message code="WELCOME"/>, ${principal.firstname}
-                    | <span><a href="${pageContext.request.contextPath}/c/mymaps.htm"><spring:message code="MY_WISEMAPS"/></a></span>
-                    | <span><a href="${pageContext.request.contextPath}/c/settings.htm" title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
-                    | <span><a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
+                    | <span><a href="${pageContext.request.contextPath}/c/maps/"><spring:message code="MY_WISEMAPS"/></a></span>
+                    | <span><a href="${pageContext.request.contextPath}/c/settings" title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
+                    | <span><a href="${pageContext.request.contextPath}/c/logout" title="<spring:message code="LOGOUT"/>"><spring:message code="LOGOUT"/></a></span>
                 </div>
             </c:when>
             <c:when test="${param.removeSignin!=true}">
                 <div id="headerActions">
                     <spring:message code="ALREADY_A_MEMBER"/>
-                    <span><a href="${pageContext.request.contextPath}/c/login.htm" title="<spring:message code="SIGN_IN"/>">
+                    <span><a href="${pageContext.request.contextPath}/c/login" title="<spring:message code="SIGN_IN"/>">
                         <spring:message code="SIGN_IN"/>
                     </a></span>
                     </div>
@@ -40,12 +40,12 @@
     <div id="headerContent">
         <div id="headerButtons">
             <%--<div id="blogLink">--%>
-                <%--<a href="${pageContext.request.contextPath}/c/blog.htm" title="<spring:message code="BLOG_TITLE"/>">--%>
+                <%--<a href="${pageContext.request.contextPath}/c/blog" title="<spring:message code="BLOG_TITLE"/>">--%>
                     <%--<spring:message code="BLOG"/>--%>
                 <%--</a>--%>
             <%--</div>--%>
         </div>
-        <a href="${pageContext.request.contextPath}/c/home.htm" title="Homepage">
+        <a href="${pageContext.request.contextPath}/c/home" title="Homepage">
             <div id="headerLogo">&nbsp;</div>
         </a>
 

wise-webapp/src/main/webapp/jsp/homepage.jsp

@@ -1,3 +1,3 @@
 <%
-    response.sendRedirect(request.getContextPath() + "/c/mymaps.htm");
+    response.sendRedirect(request.getContextPath() + "/c/maps/");
 %>

wise-webapp/src/main/webapp/jsp/installCFG.jsp

@@ -22,6 +22,6 @@
     CFInstall.check({
         mode: "inline",
         node:"prompt",
-        destination:"${pageContext.request.contextPath}/c/editor.htm?mapId="+getURLParameter("mapId")
+        destination:"${pageContext.request.contextPath}/c/editor?mapId="+getURLParameter("mapId")
     });
 </script>

wise-webapp/src/main/webapp/jsp/login.jsp

@@ -45,14 +45,14 @@
                 </div>
             </fieldset>
         </form>
-        <a href="<c:url value="/c/forgotPassword.htm"/>"><spring:message code="FORGOT_PASSWORD"/></a>
+        <a href="<c:url value="/c/forgotPassword"/>"><spring:message code="FORGOT_PASSWORD"/></a>
     </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/userRegistration.htm">
+    <a href="c/userRegistration">
         <spring:message code="JOIN_NOW"/>
     </a>
 </div>

wise-webapp/src/main/webapp/jsp/mindmapCollaborator.jsp

@@ -1,9 +1,9 @@
 <%@ include file="/jsp/init.jsp" %>
-<c:url value="mymaps.htm" var="shareMap">
+<c:url value="maps/" var="shareMap">
     <c:param name="action" value="removeCollaborator"/>
     <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
 </c:url>
-<c:url value="sharing.htm" var="removeCollaborator">
+<c:url value="sharing" var="removeCollaborator">
     <c:param name="actionId" value="removeCollaborator"/>
     <c:param name="mapId" value="${mindmap.id}"/>
 </c:url>
@@ -13,7 +13,7 @@
 
 <div id="addCollaboratorPanel">
     <form method="post" name="sharingForm"
-          action="${pageContext.request.contextPath}/c/sharing.htm?mapId=${mindmap.id}">
+          action="${pageContext.request.contextPath}/c/sharing?mapId=${mindmap.id}">
 
         <div id="userEmails">
             <h2>

wise-webapp/src/main/webapp/jsp/mindmapCooker.jsp

@@ -3,7 +3,7 @@
 <h1>Mindmap Cooker</h1>
 
 <div>
-    <form action='<c:url value="/c/cooker.htm"/>' method="post">
+    <form action='<c:url value="/c/cooker"/>' method="post">
         <input type="hidden" name="action" value="save"/>
         <input type="hidden" name="mapId" value="${mindmap.id}"/>
         <table>

wise-webapp/src/main/webapp/jsp/mindmapDetail.jsp

@@ -44,11 +44,11 @@
 
                         <li><strong><spring:message code="URL"/>:</strong>
                         <li><input name="url"
-                                   value="http://www.wisemapping.com/c/publicView.htm?mapId=${wisemapDetail.id}"
+                                   value="http://www.wisemapping.com/c/publicView?mapId=${wisemapDetail.id}"
                                    style="width:400px" readonly="readonly"/>
                         </li>
                         <li><strong><spring:message code="BLOG_SNIPPET"/></strong>
-                            <pre>&lt;iframe style="border:0;width:600px;height:400px;border: 1px solid black" src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${wisemapDetail.id}&amp;amzoom=1"&gt;&lt;/iframe&gt;</pre>
+                            <pre>&lt;iframe style="border:0;width:600px;height:400px;border: 1px solid black" src="http://www.wisemapping.com/c/embeddedView?mapId=${wisemapDetail.id}&amp;amzoom=1"&gt;&lt;/iframe&gt;</pre>
                         </li>
                         <li><spring:message code="EMBEDDED_MAP_SIZE"/></li>
                     </ul>

wise-webapp/src/main/webapp/jsp/mindmapEditor.jsp

@@ -6,7 +6,7 @@
 <%--@elvariable id="mapXml" type="com.wisemapping.model.User"--%>
 
 <%@ include file="/jsp/init.jsp" %>
-<c:url value="mymaps.htm" var="shareMap">
+<c:url value="maps/" var="shareMap">
     <c:param name="action" value="collaborator"/>
     <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
 </c:url>
@@ -61,7 +61,7 @@
 
 <div id="actionsContainer"></div>
 <div>
-    <c:url value="mymaps.htm" var="shareMap">
+    <c:url value="maps/" var="shareMap">
         <c:param name="action" value="collaborator"/>
         <c:param name="userEmail" value="${pageContext.request.userPrincipal.name}"/>
     </c:url>
@@ -72,14 +72,14 @@
         <div id="headerActions">
 
             <spring:message code="WELCOME"/>, ${principal.firstname}|<span><a
-                href="${pageContext.request.contextPath}/c/mymaps.htm"><spring:message code="MY_WISEMAPS"/></a></span> |
-            <span><a id="settings" href="${pageContext.request.contextPath}/c/settings.htm"
+                href="${pageContext.request.contextPath}/c/maps/"><spring:message code="MY_WISEMAPS"/></a></span> |
+            <span><a id="settings" href="${pageContext.request.contextPath}/c/settings"
                      title="<spring:message code="SETTINGS_DETAIL"/>"><spring:message code="SETTINGS"/></a></span>
-            | <span><a href="${pageContext.request.contextPath}/c/logout.htm" title="<spring:message code="LOGOUT"/>">
+            | <span><a href="${pageContext.request.contextPath}/c/logout" title="<spring:message code="LOGOUT"/>">
             <spring:message code="LOGOUT"/>
         </a></span>
         </div>
-        <a href="${pageContext.request.contextPath}/c/mymaps.htm">
+        <a href="${pageContext.request.contextPath}/c/maps/">
             <div id="headerLogo"></div>
         </a>
 

wise-webapp/src/main/webapp/jsp/mindmapExport.jsp

@@ -1,125 +1,100 @@
 <%@ include file="/jsp/init.jsp" %>
-<h1>
-    <spring:message code="EXPORT"/>'${mindmap.title}'</h1>
+
+<p>
+    <spring:message code="EXPORT_DETAILS"/>
+</p>
 
 <div>
-    <form method="POST" id="exportForm" name="exportForm" action="<c:url value="/service/transform"/>"
-          style="height:100%;" enctype="application/x-www-form-urlencoded">
-        <input name="svgXml" value="" type="hidden"/>
-        <input name="mapXml" value="" type="hidden"/>
-        <input name="filename" value="${mindmap.title}" type="hidden"/>
-        <table>
-            <tbody>
-            <tr>
-                <td>
-                    <input type="radio" id="svg" name="exportFormat" value="SVG"/>
-                    <label for="svg">
-                        <b>
-                            <spring:message code="SVG_EXPORT_FORMAT"/>
-                        </b>
+    <form method="GET" class="form-horizontal" action="service/maps/${mindmap.id}"
+          enctype="application/x-www-form-urlencoded" id="dialogMainForm">
+        <input name="svgXml" id="svgXml" value="" type="hidden"/>
+        <input name="download" type="hidden" value="mm"/>
+        <fieldset>
+            <label for="freemind">
+                <input type="radio" id="freemind" name="exportFormat" value="mm" checked="checked"/>
+                <strong><spring:message code="FREEMIND_EXPORT_FORMAT"/></strong><br/>
+                <spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
+            </label>
+            <label for="wisemapping">
+                <input type="radio" id="wisemapping" name="exportFormat" value="wxml"/>
+                <strong><spring:message code="WISEMAPPING_EXPORT_FORMAT"/></strong><br/>
+                <spring:message code="WISEMAPPING_EXPORT_FORMAT_DETAILS"/>
+            </label>
+            <label for="svg">
+                <input type="radio" id="svg" name="exportFormat" value="svg"/>
+                <strong><spring:message code="SVG_EXPORT_FORMAT"/></strong><br/>
+                <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
+            </label>
 
-                        <p>
-                            <spring:message code="SVG_EXPORT_FORMAT_DETAILS"/>
-                        </p>
-                    </label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="exportFormat" value="PDF" id="pdf"/>
-                    <label for="pdf">
-                        <b>
-                            <spring:message code="PDF_EXPORT_FORMAT"/>
-                        </b>
+            <label for="pdf">
+                <input type="radio" name="exportFormat" value="pdf" id="pdf"/>
+                <strong><spring:message code="PDF_EXPORT_FORMAT"/></strong><br/>
+                <spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
+            </label>
 
-                        <p>
-                            <spring:message code="PDF_EXPORT_FORMAT_DETAILS"/>
-                        </p>
-                    </label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" id="freemind" name="exportFormat" value="FREEMIND" checked="checked"/>
-                    <label for="freemind">
-                        <b>
-                            <spring:message code="FREEMIND_EXPORT_FORMAT"/>
-                        </b>
+            <label for="img">
+                <input type="radio" name="exportFormat" id="img" value="image"/>
+                <strong><spring:message code="IMG_EXPORT_FORMAT"/></strong><br/>
+                <spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
 
-                        <p>
-                            <spring:message code="FREEMIND_EXPORT_FORMAT_DETAILS"/>
-                        </p>
-                    </label>
-                </td>
-            </tr>
-            <tr>
-                <td>
-                    <input type="radio" name="exportFormat" id="img" value="IMG_EXPORT_FORMAT"/>
-                    <b>
-                        <spring:message code="IMG_EXPORT_FORMAT"/>
-                    </b><select name="imgFormat" id="imgFormat" style="visibility:hidden;margin-left:5px;">
-                    <option>PNG</option>
-                    <option>JPEG</option>
+                <select name="imgFormat" id="imgFormat" style="display:none">
+                    <option value='png'>PNG</option>
+                    <option value='jpeg'>JPEG</option>
                 </select>
-                    <label for="img">
-                        <p>
-                            <spring:message code="IMG_EXPORT_FORMAT_DETAILS"/>
-                        </p>
-                    </label>
-                </td>
-            </tr>
-            <tr>
-                <td style="text-align:center;margin-top:10px;">
-                    <input type="button" id="ok" value="<spring:message code="OK"/>" class="btn-primary">
-                    <input type="button" id="cancel" value="<spring:message code="CANCEL"/>" class="btn-secondary"
-                           onclick="MooDialog.Request.active.close()">
-                </td>
-            </tr>
-            </tbody>
-        </table>
+            </label>
+        </fieldset>
     </form>
 </div>
+<p>
+    <span class="alert alert-info" id="exportInfo"><i class="icon-info-sign"></i> <spring:message
+            code="EXPORT_FORMAT_RESTRICTIONS"/></span>
+</p>
+
 
 <script type="text/javascript">
-    $('img').addEvent('click', function(event) {
-        $('imgFormat').setStyle('visibility', 'visible');
-    });
-    $('pdf').addEvent('click', function(event) {
-        $('imgFormat').setStyle('visibility', 'hidden');
-    });
-    $('svg').addEvent('click', function(event) {
-        $('imgFormat').setStyle('visibility', 'hidden');
-    });
 
-    $('ok').addEvent('click', function(event) {
+    // No way to obtain map svg. Hide panels..
+    if (window.location.pathname.indexOf('exportf') != -1) {
+        $('#exportInfo').hide();
+        $('#freemind,#pdf,#svg').click('click', function(event) {
+            $('#imgFormat').hide();
+        });
 
-        var form = $('exportForm');
+        $('#img').click('click', function(event) {
+            $('#imgFormat').show();
+        });
+    } else {
+        $('#pdf,#svg,#img').parent().hide();
+    }
+
+    function submitDialogForm() {
+        // If the map is opened, use the latest model ...
+        var formatType = $('#dialogMainForm input:checked').attr('value');
+        var form = $('#dialogMainForm');
+
+        // Restore default ..
+        form.attr('action', 'service/maps/${mindmap.id}.' + formatType);
+
+        if (formatType == 'image' || formatType == 'svg' || formatType == 'pdf') {
+
+            // Look for the selected format and append export suffix...
+            if (formatType == 'image') {
+                formatType = $('#dialogMainForm option:selected').attr('value');
+            }
+            // Change to transform url ...
+            form.attr('method', "POST");
+            form.attr('action', 'service/transform.' + formatType);
+
+            // Load page SVG ...
+            var svg = window.parent.document.getElementById('workspaceContainer').innerHTML;
+            $('#svgXml').attr('value', svg);
 
-        // Look for the selected format and append export suffix...
-        var value = $$('input[name=exportFormat]:checked')[0].get('value');
-        var suffix;
-        if (value == 'IMG_EXPORT_FORMAT') {
-            var selected = $('imgFormat');
-            suffix = selected.options[selected.selectedIndex].value;
-        } else {
-            suffix = value;
         }
-        suffix = suffix.toLowerCase();
-        form.action = form.action + "." + suffix;
-
-        // Store SVG o native map...
-        if (suffix == "freemind") {
-            var mindmap = designer.getMindmap();
-            var serializer = mindplot.persistence.XMLSerializerFactory.getSerializerFromMindmap(mindmap);
-            var domMap = serializer.toXML(mindmap);
-            form.mapXml.value = core.Utils.innerXML(domMap);
-        } else {
-            form.svgXml.value = $("workspaceContainer").innerHTML;
-        }
-
-        // Finally, submit map ...
+        $('#dialogMainForm input[name=download]').attr('value', formatType);
         form.submit();
-        MooDialog.Request.active.close();
-    });
+
+        // Close dialog ...
+        $('#export-dialog-modal').modal('hide');
+    }
 
 </script>

wise-webapp/src/main/webapp/jsp/mindmapHistory.jsp

@@ -58,7 +58,7 @@
         %>
     </tbody>
 </table>
-<form name="revertForm" action="<c:url value="history.htm"/>">
+<form name="revertForm" action="<c:url value="history"/>">
     <input type="hidden" name="action" value="revert"/>
     <%        
         if (request.getAttribute("goToMindmapList") != null)

wise-webapp/src/main/webapp/jsp/mindmapImport.jsp

@@ -23,7 +23,7 @@
 
         <input type="submit" value="<spring:message code="IMPORT"/>" class="btn btn-primary"/>
         <input type="button" value="<spring:message code="CANCEL"/>" class="btn"
-               onclick="window.location='/c/mymaps.htm'">
+               onclick="window.location='/c/maps/'">
 
     </form:form>
 </div>

wise-webapp/src/main/webapp/jsp/mindmapList.jsp

@@ -37,15 +37,14 @@
 
 <div style="min-height: 500px">
 
-    <div id="messagesPanel" class="alert alert-error alert-block fade in hide" style="margin-top: 10px">
-        <strong><spring:message code="UNEXPECTED_ERROR"/></strong>
-
-        <p><spring:message code="UNEXPECTED_ERROR_SERVER_ERROR"/></p>
-
-        <div></div>
-    </div>
-
     <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>
+            <p><spring:message code="UNEXPECTED_ERROR_SERVER_ERROR"/></p>
+
+            <div></div>
+        </div>
+
         <div id="foldersContainer">
             <ul class="nav nav-list">
                 <li class="nav-header">Filters</li>
@@ -84,10 +83,12 @@
                         <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="printBtn"><a href="#" onclick="return false"><i class="icon-print"></i> Print</a></li>
                         <li id="publishBtn"><a href="#" onclick="return false"><i class="icon-globe"></i> 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>
+                        <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>
                     </ul>
@@ -247,6 +248,22 @@
             <button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
         </div>
     </div>
+
+    <!-- Export Dialog Config -->
+    <div id="export-dialog-modal" class="modal fade" style="display: none">
+        <div class="modal-header">
+            <button class="close" data-dismiss="modal">x</button>
+            <h3>Export</h3>
+        </div>
+        <div class="modal-body">
+
+        </div>
+        <div class="modal-footer">
+            <button class="btn btn-primary btn-accept" data-loading-text="Exporting...">Export</button>
+            <button class="btn btn-cancel" data-dismiss="modal">Cancel</button>
+        </div>
+    </div>
+
 </div>
 </body>
 </html>

wise-webapp/src/main/webapp/jsp/mindmapPrint.jsp

@@ -114,7 +114,7 @@
     <div id="printLogo"></div>
 
     <div id="embFooter">
-        <a href="${pageContext.request.contextPath}/c/home.htm" target="new">
+        <a href="${pageContext.request.contextPath}/c/home" target="new">
             <div id="footerLogo"></div>
         </a>
 

wise-webapp/src/main/webapp/jsp/mindmapPublicView.jsp

@@ -4,7 +4,7 @@
 </h1>
 
 
-<c:url value="embeddedView.htm?mapId=${mindmap.id}&fullView=true"
+<c:url value="embeddedView?mapId=${mindmap.id}&fullView=true"
        var="embeddedUrl"/>
 
 

wise-webapp/src/main/webapp/jsp/mindmapPublish.jsp

@@ -45,12 +45,12 @@
             </div>
             <label><spring:message code="BLOG_SNIPPET"/></label>
                 <pre id="embedCode">&lt;iframe style="width:600px;height:400px;border: 1px
-solid black" src="http://www.wisemapping.com/c/embeddedView.htm?mapId=${mindmap.id}&zoom=1"&gt; &lt;/iframe&gt;</pre>
+solid black" src="http://www.wisemapping.com/c/embeddedView?mapId=${mindmap.id}&zoom=1"&gt; &lt;/iframe&gt;</pre>
         </div>
 
         <div class="tab-pane fade" id="publicUrlTab">
             <spring:message code="URL"/>:
-            <input name="url" value="http://www.wisemapping.com/c/publicView.htm?mapId=${mindmap.id}"
+            <input name="url" value="http://www.wisemapping.com/c/publicView?mapId=${mindmap.id}"
                    style="width:400px"
                    readonly="readonly"/>
         </div>

wise-webapp/src/main/webapp/jsp/mindmapRename.jsp

@@ -1,36 +0,0 @@
-<%@ include file="/jsp/init.jsp" %>
-<div>
-    <form:form method="post" commandName="renameMap">
-        <table>
-            <tr>
-                <td class="formLabel">
-                    <span class="fieldRequired">*</span>
-                    <spring:message code="NAME"/>
-                    :
-                </td>
-                <td>
-                    <form:input path="title" id="title" tabindex="1"/>
-                    <form:errors path="title" cssClass="errorMsg"/>
-                </td>
-            </tr>
-            <tr>
-                <td class="formLabel">
-                    <spring:message code="DESCRIPTION"/>
-                    :
-                </td>
-                <td>
-                    <form:input path="description" id="description" tabindex="2"/>
-                    <form:errors path="description" 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>

wise-webapp/src/main/webapp/jsp/mindmapShare.jsp

@@ -0,0 +1,39 @@
+<%@ include file="/jsp/init.jsp" %>
+<style type="text/css">
+    #sharingContainer {
+        height: 300px;
+        width: 300px;
+        overflow: scroll;
+    }
+</style>
+
+<p>Who has access</p>
+
+<div id="sharingContainer">
+    <table class="table">
+        <tbody>
+        <tr>
+            <td>Name</td>
+            <td>Email</td>
+            <td><a href="">Action</a></td>
+        </tr>
+        </tbody>
+    </table>
+
+</div>
+
+<form method="post" id="dialogMainForm" action="#" class="well form-inline">
+    <label for="collabEmails" class="control-label">Add People:
+        <input type="text" id="collabEmails" name="collabEmail" placeholder="Enter collaborators emails separared by comas."/>
+    </label>
+</form>
+
+
+<script type="text/javascript">
+
+    // Hook for interaction with the main parent window ...
+    var submitDialogForm = function() {
+        $('#dialogMainForm').submit();
+    }
+</script>
+

wise-webapp/src/main/webapp/jsp/mindmapTags.jsp

@@ -1,36 +0,0 @@
-<%@ include file="/jsp/init.jsp" %>
-<h1><spring:message code="TAG"/>'${tag.mindmapTitle}'</h1>
-
-<h2>
-    <spring:message code="TAGS_MSG"/>
-</h2>
-
-<div>
-    <form:form method="post" commandName="tag">
-
-        <table>
-            <tbody>
-            <tr>
-                <td class="formLabel"> &nbsp;</td>
-                <td>
-                    <form:input path="mindmapTags" id="mindmapTags" tabindex="0"/>
-                    <form:errors path="mindmapTags" cssClass="errorMsg"/>
-                </td>
-            </tr>
-            <tr>
-                <td>&nbsp;</td>
-                <td style="padding: 5px">
-                    <input type="submit" value="<spring:message code="SUBMIT"/>" class="btn-primary">
-                    <input type="button" value="<spring:message code="CANCEL"/>" class="btn-secondary" id="cancelBtn">
-                </td>
-            </tr>
-            </tbody>
-        </table>
-    </form:form>
-</div>
-
-<script type="text/javascript">
-    $('cancelBtn').addEvent('click', function(event) {
-        MooDialog.Request.active.close();
-    });
-</script>

wise-webapp/src/main/webapp/jsp/mindmapViewer.jsp

@@ -25,7 +25,7 @@
 <div>${mindmap.description}</div>
 <div>${mindmap.userRole}</div>
 
-<form method="post" action="<c:url value="sharing.htm"/>">
+<form method="post" action="<c:url value="sharing"/>">
     <input type="hidden" name="action" value="addViewer"/>
     <input type="hidden" name="mapId" value="${mindmap.id}"/>
 
@@ -46,7 +46,7 @@
                             <textarea name="userEmails" id="viewers" tabindex="1" cols="50" rows="5"></textarea><br/>
                             <input type="submit" value="<spring:message code="ADD"/>">
                             <input type="button" value="<spring:message code="CANCEL"/>"
-                                   onclick="window.location='<c:url value="mymaps.htm"/>'">
+                                   onclick="window.location='<c:url value="maps/"/>'">
                         </div>
                     </td>
                     <td>
@@ -77,7 +77,7 @@
     </div>
 </form>
 
-<form name="removeViewerForm" action="<c:url value="sharing.htm"/>">
+<form name="removeViewerForm" action="<c:url value="sharing"/>">
     <input type="hidden" name="action" value="removeViewer"/>
     <input type="hidden" name="mapId" value="${mindmap.id}"/>
     <input type="hidden" name="userEmail" value=""/>

wise-webapp/src/main/webapp/jsp/setting.jsp

@@ -2,13 +2,13 @@
 <div>
     <ul>
         <li><a rel="moodalbox 400px 200px wizard"
-               href="<c:out value="${pageContext.request.contextPath}/c/changePassword.htm"/>"
+               href="<c:out value="${pageContext.request.contextPath}/c/changePassword"/>"
                title="<spring:message code="CHANGE_PASSWORD"/>">
             <spring:message code="CHANGE_PASSWORD"/>
         </a>
         </li>
         <li><a rel="moodalbox 400px 250px wizard"
-               href="<c:out value="${pageContext.request.contextPath}/c/editProfile.htm"/>"
+               href="<c:out value="${pageContext.request.contextPath}/c/editProfile"/>"
                title="<spring:message code="EDIT_PROFILE"/>">
             <spring:message code="EDIT_PROFILE"/>
         </a>

wise-webapp/src/main/webapp/jsp/userRegistration.jsp

@@ -42,7 +42,7 @@
             <div>
                 <p>
                     <spring:message code="TERM_OF_THE_SERVICE"/>
-                    <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="termsOfUse.htm"><spring:message
+                    <spring:message code="WISEMAPPING_ACCOUNT_MESSAGE"/> <a href="c/termsOfUse"><spring:message
                         code="HERE"/></a>
                     <spring:message code="REGISTRATION_CLICK_ADVICE"/>
                 </p>
@@ -51,7 +51,7 @@
             <input type="submit" value="<spring:message code="REGISTER" />" id="submitButton"
                    class="btn btn-primary">
             <input type="button" value="<spring:message code="CANCEL"/>"
-                   onclick="window.location='<c:url value="mymaps.htm"/>'" class="btn">
+                   onclick="window.location='c/<c:url value="maps/"/>'" class="btn">
             </form:form>
     </div>
 </div>

wise-webapp/src/main/webapp/jsp/userRegistrationConfirmation.jsp

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