Commit 35e28e86 authored by  JosephK's avatar JosephK

Diff Framindmap 4.0.2 / Wisemapping 4.0.3

parent 554b1b33
/* HEADER STYLES */
html,body {
margin: 0;
padding: 0;
height: 100%;
}
body {
background:#eee;
}
.ombre {
background:#fff;
-webkit-box-shadow: -4px 6px 9px rgba(50, 50, 50, 0.5);
-moz-box-shadow: -4px 6px 9px rgba(50, 50, 50, 0.5);
box-shadow: -4px 6px 9px rgba(50, 50, 50, 0.5);
margin-bottom: 20px;
}
.trait {
background-color: #EEE;
height: 11px;
margin:15px 0px;
border:none;
}
#map-table {
margin-left:-10px;
}
main, header, footer {
padding : 10px 30px;
}
main {
padding-bottom:25px;
}
.jumbotron {
background:transparent;
}
#header {
margin-top: 0;
/* height: 78px;
width: 100%;*/
background: transparent;
/* border-bottom: 1px solid #bbb4d6;
position: absolute;
top: 0;
left: 0;*/
}
#headerToolbar {
height: 35px;
/* width: 100%;
background-color: #171a17;
border-top: 1px solid #999999;
border-bottom: 1px solid #424141;*/
color: #666;
}
#headerContent {
/* width: 800px;
height: 78px;*/
position: relative;
top: 0;
left: 0;
margin: auto;
}
#headerLogo {
margin-top: 23px;
height: 80px;
width: 160px;
background: url("../images/logo-medium.png") no-repeat;
position: absolute;
top: 0;
left: -50px;
}
#headerContent h1 {
font-family: "DejaVu Sans","Verdana","Geneva","sans serif";
font-weight: bold;
font-size:50px;
}
#headerContent a {
text-decoration:none;
}
#headerButtons {
position: absolute;
top: 65px;
left: 150px;
}
#aboutLink, #faqLink, #feedbackLink, #logoutLink {
float: right;
z-index: 300;
}
div#headerButtons a {
float: left;
color: #666;
padding: 0 10px;
text-decoration: none;
font-weight: bold;
font-size: 120%;
white-space: nowrap;
}
div#headerTitle {
float: left;
font-weight: bold;
font-size: 15px;
margin-right: 5px;
margin-left: 5px;
}
span#headerSubTitle {
font-weight: lighter;
font-size: 12px;
}
div#headerButtons a:hover {
/*text-decoration: underline;*/
color: #777;
}
div#headerButtons activelink a, div#headerButtons activelink a:hover {
text-decoration: none;
border-top: 0;
border-bottom: 0;
}
#headerLogo {
cursor: pointer;
}
div#headerActions {
padding: 7px 0;
/* position: absolute;
right: 0;
z-index: 50;
margin-right: 80px;*/
text-align:right;
color:#767676;
margin-right:-15px;
}
div#headerActions a {
color:#666;
padding:10px 15px;
text-decoration:none;
font-weight:bold;
}
div#headerActions a:hover,
div#headerActions a:focus {
color: white;
background-color:#767676;
text-decoration:none;
}
This diff is collapsed.
This diff is collapsed.
<%@page pageEncoding="UTF-8" %>
<%@ include file="/jsp/init.jsp" %>
<!DOCTYPE HTML>
<p><spring:message code="KEYBOARD_SHORTCUTS_MSG"/></p>
<style type="text/css">
#keyboardTable {
font-family: Arial, verdana, serif;
font-size: 13px;
}
#keyboardTable td {
padding: 3px;
white-space: nowrap;
}
#keyboardTable th {
padding: 5px;
white-space: nowrap;
}
#keyboardTable th {
background-color: #000000;
color: #ffffff;
}
</style>
<div id="keyboardTable">
<table>
<colgroup>
<col width="40%"/>
<col width="30%"/>
<col width="30%"/>
</colgroup>
<thead>
<tr>
<th><spring:message code="ACTION"/></th>
<th>Windows - Linux</th>
<th>Mac OS X</th>
</tr>
</thead>
<tbody>
<tr>
<td><spring:message code="SAVE_CHANGES"/></td>
<td>Ctrl + s</td>
<td>⌘ + s</td>
</tr>
<tr>
<td><spring:message code="CREATE_SIBLING_TOPIC"/></td>
<td>Enter</td>
<td>Enter</td>
</tr>
<tr>
<td><spring:message code="CREATE_CHILD_TOPIC"/></td>
<td>Insert / Tab</td>
<td>⌘ + Enter / Tab</td>
</tr>
<tr>
<td><spring:message code="DELETE_TOPIC"/></td>
<td>Delete</td>
<td>Delete</td>
</tr>
<tr>
<td><spring:message code="EDIT_TOPIC_TEXT"/></td>
<td><spring:message code="JUST_START_TYPING"/> | F2</td>
<td><spring:message code="JUST_START_TYPING"/> | F2</td>
</tr>
<tr>
<td><spring:message code="MULTIPLE_LINES"/></td>
<td>Ctrl + Enter</td>
<td>⌘ + Enter</td>
</tr>
<tr>
<td><spring:message code="COPY_AND_PASTE_TOPICS"/></td>
<td>Ctrl + c/Ctrl + v</td>
<td>⌘ + c/⌘ + v</td>
</tr>
<tr>
<td><spring:message code="COLLAPSE_CHILDREN"/></td>
<td>Space bar</td>
<td>Space bar</td>
</tr>
<tr>
<td><spring:message code="TOPIC_NAVIGATION"/></td>
<td><spring:message code="ARROW_KEYS"/></td>
<td><spring:message code="ARROW_KEYS"/></td>
</tr>
<tr>
<td><spring:message code="SELECT_MULTIPLE_NODES"/></td>
<td>Ctrl + Mouse Click</td>
<td>Ctrl + Mouse Click</td>
</tr>
<tr>
<td><spring:message code="UNDO_EDITION"/></td>
<td>Ctrl + z</td>
<td>⌘ + z</td>
</tr>
<tr>
<td><spring:message code="REDO_EDITION"/></td>
<td>Ctrl + Shift + z</td>
<td>⌘ + Shift + z</td>
</tr>
<tr>
<td><spring:message code="SELECT_ALL_TOPIC"/></td>
<td>Ctrl + a</td>
<td>⌘ + a</td>
</tr>
<tr>
<td><spring:message code="CANCEL_TEXT_CHANGES"/></td>
<td>Esc</td>
<td>Esc</td>
</tr>
<tr>
<td><spring:message code="DESELECT_ALL_TOPIC"/></td>
<td>Ctrl + Shift + a</td>
<td>⌘ + Shift + a</td>
</tr>
<tr>
<td><spring:message code="CHANGE_TEXT_ITALIC"/></td>
<td>Ctrl + i</td>
<td>⌘ + i</td>
</tr>
<tr>
<td><spring:message code="CHANGE_TEXT_BOLD"/></td>
<td>Ctrl + b</td>
<td>⌘ + b</td>
</tr>
</tbody>
</table>
</div>
\ No newline at end of file
......@@ -58,14 +58,6 @@
var persistence = mindplot.PersistenceManager.getInstance();
var mindmap = mindmap = persistence.load(mapId);
designer.loadMap(mindmap);
$('zoomIn').addEvent('click', function () {
designer.zoomIn();
});
$('zoomOut').addEvent('click', function () {
designer.zoomOut();
});
});
</script>
</head>
......
......@@ -149,4 +149,4 @@
$('#export-dialog-modal').modal('hide');
}
</script>
</script>
\ No newline at end of file
<%@page pageEncoding="UTF-8" %>
<%@include file="/jsp/init.jsp" %>
<div>
<p class="alert alert-info"><spring:message code="IMPORT_MINDMAP_INFO"/></p>
<form method="POST" enctype="multipart/form-data" action="#" id="dialogMainForm" class="form-horizontal">
<div class="errorMessage"></div>
<fieldset>
<div class="form-group">
<label for="mapFile" class="control-label col-md-2 "><spring:message code="MIND_FILE"/>: </label>
<div class="col-md-10">
<input type="file" name="file" id="mapFile" required="required" class="form-control"/>
</div>
</div>
<div class="form-group">
<label for="title" class="control-label col-md-2 "><spring:message code="NAME"/>: </label>
<div class="col-md-10">
<input type="text" id="title" name="title" required="required"
placeholder="<spring:message code="MAP_NAME_HINT"/>"
class="form-control" maxlength="255"/>
</div>
</div>
<div class="form-group">
<label for="description" class="control-label col-md-2"><spring:message code="DESCRIPTION"/>: </label>
<div class="col-md-10">
<textarea type="text" name="description" id="description"
placeholder="<spring:message code="MAP_DESCRIPTION_HINT"/>" class="form-control" maxlength="255"></textarea>
</div>
</div>
</fieldset>
</form>
</div>
<script type="text/javascript">
// Save status on click ...
var contentType = null;
var fileContent = null;
$('#cancelButton').click(function () {
window.location = 'c/maps/';
});
$('#dialogMainForm').submit(function (event) {
// Load form parameters ...
var title = $('#dialogMainForm #title').attr('value');
title = title == undefined ? "" : title;
var description = $('#dialogMainForm #description').attr('value');
description = description == undefined ? "" : description;
// Save status on click ...
jQuery.ajax("c/restful/maps?title=" + encodeURI(title) + "&description=" + encodeURI(description),
{
async:false,
data:fileContent,
type:'POST',
dataType:'json',
contentType:contentType,
success:function (data, textStatus, jqXHR) {
var resourceId = jqXHR.getResponseHeader("ResourceId");
window.location = "c/maps/" + resourceId + "/edit";
},
error:function (jqXHR, textStatus, errorThrown) {
if (jqXHR.status == 400) {
var errors = JSON.parse(jqXHR.responseText);
// Mark fields with errors ...
var fieldErrors = errors.fieldErrors;
if (fieldErrors) {
for (var fieldName in fieldErrors) {
// Mark the field with errors ...
var message = fieldErrors[fieldName];
var inputField = $("#dialogMainForm input[name='" + fieldName + "']");
$("#dialogMainForm").find(".errorMessage").text(message).addClass("alert alert-danger");
inputField.parent().addClass('error');
}
}
var globalErrors = errors.globalErrors;
if (globalErrors) {
for (var error in globalErrors) {
// Mark the field with errors ...
$("#dialogMainForm").find(".errorMessage").text(error).addClass("alert alert-danger");
inputField.parent().addClass('error');
}
}
} else {
console.log(errorThrown);
console.log(jqXHR);
$('#messagesPanel div').text(errorThrown).parent().show();
}
}
});
event.preventDefault();
});
$('#dialogMainForm #mapFile').change(function (event) {
var file = event.target.files[0];
var reader = new FileReader();
var title = file.name;
title = title.substring(0, title.lastIndexOf("."));
$('#dialogMainForm #title').attr('value', jQuery.camelCase(title));
// Closure to capture the file information.
reader.onload = (function (event) {
fileContent = event.target.result;
contentType = file.name.lastIndexOf(".wxml") != -1 ? "application/xml" : "application/freemind";
});
// Read in the image file as a data URL.
reader.readAsText(file);
});
// Hook for interaction with the main parent window ...
var submitDialogForm = function () {
$('#dialogMainForm').submit();
}
</script>
\ No newline at end of file
......@@ -90,14 +90,6 @@
var persistence = mindplot.PersistenceManager.getInstance();
var mindmap = mindmap = persistence.load(mapId);
designer.loadMap(mindmap);
$('zoomIn').addEvent('click', function () {
designer.zoomIn();
});
$('zoomOut').addEvent('click', function () {
designer.zoomOut();
});
});
var $_url = window.location.href;
......
This diff is collapsed.
......@@ -33,7 +33,6 @@
<script type="text/javascript" src="bootstrap/js/bootstrap.min.js"></script>
<script src="js/less.js" type="text/javascript"></script>
</head>
<body>
<script src="https://framasoft.org/nav/nav.js" type="text/javascript"></script>
......
......@@ -10,5 +10,5 @@
</p>
<p>
Si vous rencontrez un problème pour recevoir cet email, contactez-nous depuis <a href="http://contact.framasoft.org">ce formulaire</a>.
Si vous rencontrez un problème pour recevoir cet email, contactez-nous depuis <a href="http://contact.framasoft.org/#framindmap">ce formulaire</a>.
</p>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment