Merge pull request #31 from ufdada/minor

Merge version 1.6 into master

README.md

@@ -4,6 +4,19 @@ This map editor should make it fairly easy to create and share maps for "War for
 
 Just go to http://ufdada.github.io/wfto-mapeditor/ to start mapping!
 
+### Release 1.6
+#### New Features:
+- Export map as image file
+- Saving and restoring a map draft (continuously).
+  This should prevent lost maps when browser crashes
+
+#### Improvements:
+- Readme-link opens it in a new tab or window
+- Enabled empire tiles
+- Corrected importing when a mapfile was downloaded several tiles (it had a `(<number>)` in it's name)
+- Set filename when importing via Drag and Drop
+- Update version on exporting (should make a new filename)
+
 ### Release 1.5
 #### New Features:
 - Import Google CSV files via Drag and Drop

css/style.css

@@ -73,6 +73,10 @@ td:hover {
 	margin: 2px;
 }
 
+#options select{
+	margin: 2px;
+}
+
 #infoBox {
 	display: none;
 	position: absolute;
@@ -191,4 +195,20 @@ td:hover {
 
 button:disabled img {
 	opacity: 0.4;
+}
+
+#previewCanvas {
+	box-shadow: 0px 0px 5px white;
+	width: 250px;
+	height: 250px;
+	position: fixed;
+	right: 20px;
+	top: 20px;
+}
+
+#preview {
+	box-shadow: 0px 0px 5px white;
+	position: absolute;
+	right: 20px;
+	top: 20px;
 }

index.html

@@ -17,7 +17,7 @@
 </div>
 <div id="toolBox">
 	<input type="button" id="optionButton" value="Options" onclick="toggleOptions(true)" />
-	<button onclick="window.location.href='https://github.com/ufdada/wfto-mapeditor/blob/gh-pages/README.md'">?</button>
+	<button onclick="window.open('https://github.com/ufdada/wfto-mapeditor/blob/gh-pages/README.md', '_blank')">?</button>
 	<button id="undo" onclick="terrain.undo()"><img src="./img/gui/undo.png" alt="Undo" title="Undo"/></button> <button id="redo" onclick="terrain.redo()"><img src="./img/gui/redo.png" alt="Redo" title="Redo"/></button>
 	<!-- here are the tile buttons -->
 	<div id="info">
@@ -46,8 +46,8 @@
 	<fieldset>
 		<legend>New Map</legend>
 		<form onsubmit="newMap();return false;">
-			<input type="text" id="width" placeholder="Width" />*
-			<input type="text" id="height" placeholder="Height" />*
+			Width: <input type="text" id="width" />* <br />
+			Height: <input type="text" id="height" />*
 			<input type="submit" value="Generate" />
 		</form>
 	</fieldset>
@@ -69,7 +69,13 @@
 		<label for="versioning">Versioning: </label><input title="Adds a version number to the name, starting with 001" type="checkbox" onchange="setVersioning(this)" id="versioning" /><br />
 		<p id="versionInfo">Current version: <span id="mapVersion"></span></p>
 		<label for="mapName">Mapname: </label><input type="text" id="mapName" value="Map"/><br />
-		<button id="export" onclick="exportMap()">Export</button>
+		<button id="export" onclick="exportMap()">Export as File</button><br />
+		<label for="imageFormat">Imagetype: </label>
+		<select id="imageFormat">
+			<option value="jpeg" selected="selected">JPEG</option>
+			<option value="png">PNG</option>
+		</select><br />
+		<button id="exportImage" onclick="exportImage()">Export as Image</button>
 		<a href="" id="exportLink" style="display:none"></a>
 	</fieldset>
 	<fieldset id="general">
@@ -102,5 +108,7 @@
 
 	<input style="float: right" type="button" value="Close" onclick="toggleOptions(false)" />
 </div>
+<!-- <canvas id="previewCanvas"></canvas>
+<div id="preview"></div> -->
 </body>
 </html>