--- a/client/templates/nodeeditor.html	Mon Jun 01 11:53:03 2015 +0200
+++ b/client/templates/nodeeditor.html	Tue Jun 02 00:39:47 2015 +0200
@@ -23,8 +23,9 @@
         <span class="Rk-Edit-Size-Value"><%-node.size%></span>
         <a href="#" class="Rk-Edit-Size-Up">+</a>
     </p>
-<% } %> <% if (options.show_node_editor_color) { %>
+<% } %> <% if (options.show_node_editor_style) { %>
     <div class="Rk-Editor-p">
+      <div id="Rk-Editor-p-color">
         <span class="Rk-Editor-Label">
         <%-renkan.translate("Node color:")%></span>
         <div class="Rk-Edit-ColorPicker-Wrapper">
@@ -34,6 +35,11 @@
             <%= renkan.colorPicker %>
             <span class="Rk-Edit-ColorPicker-Text"><%- renkan.translate("Choose color") %></span>
         </div>
+      </div>
+      <div id="Rk-Editor-p-dash">
+        <span class="Rk-Editor-Label"><%-renkan.translate("Dash:")%></span>
+        <input type="checkbox" name="Rk-Edit-Dash" class="Rk-Edit-Dash" <%- node.dash %> />
+      </div>
     </div>
 <% } %> <% if (options.show_node_editor_image) { %>
     <div class="Rk-Edit-ImgWrap">
@@ -68,27 +74,11 @@
     <p>
         <label><%-renkan.translate("Shapes available")%>:</label>
         <select class="Rk-Edit-Shape">
-            <option class="Rk-Edit-Vocabulary-Property" value="circle"<% if (node.shape === "circle") { %> selected<% } %>>
-                <%- renkan.translate("Circle") %>
-            </option>
-            <option class="Rk-Edit-Vocabulary-Property" value="rectangle"<% if (node.shape === "rectangle") { %> selected<% } %>>
-                <%- renkan.translate("Square") %>
-            </option>
-            <option class="Rk-Edit-Vocabulary-Property" value="diamond"<% if (node.shape === "diamond") { %> selected<% } %>>
-                <%- renkan.translate("Diamond") %>
+          <% _.each(shapes, function(shape) { %>
+            <option class="Rk-Edit-Vocabulary-Property" value="<%- shape %>"<% if (node.shape === shape) { %> selected<% } %>>
+                <%- renkan.translate(shape.charAt(0).toUpperCase() + shape.substring(1)) %>
             </option>
-            <option class="Rk-Edit-Vocabulary-Property" value="polygon"<% if (node.shape === "polygon") { %> selected<% } %>>
-                <%- renkan.translate("Hexagone") %>
-            </option>
-            <option class="Rk-Edit-Vocabulary-Property" value="ellipse"<% if (node.shape === "ellipse") { %> selected<% } %>>
-                <%- renkan.translate("Ellipse") %>
-            </option>
-            <option class="Rk-Edit-Vocabulary-Property" value="star"<% if (node.shape === "star") { %> selected<% } %>>
-                <%- renkan.translate("Star") %>
-            </option>
-            <option class="Rk-Edit-Vocabulary-Property" value="cloud"<% if (node.shape === "cloud") { %> selected<% } %>>
-                <%- renkan.translate("Cloud") %>
-            </option>
+          <% }); %>
         </select>
     </p>
 <% } %>