clean, and finalize lodash migration
authorymh <ymh.work@gmail.com>
Sat, 25 Apr 2015 04:37:06 +0200
changeset 434 0d5998b32a7c
parent 433 e457ec945e50
child 435 e529b633c339
clean, and finalize lodash migration
client/js/renderer/basebutton.js
client/js/renderer/baseeditor.js
client/js/renderer/baserepresentation.js
client/js/renderer/edge.js
client/js/renderer/edgeeditbutton.js
client/js/renderer/edgeeditor.js
client/js/renderer/edgeremovebutton.js
client/js/renderer/edgerevertbutton.js
client/js/renderer/miniframe.js
client/js/renderer/nodebutton.js
client/js/renderer/nodeeditbutton.js
client/js/renderer/nodeeditor.js
client/js/renderer/nodeenlargebutton.js
client/js/renderer/nodelinkbutton.js
client/js/renderer/noderemovebutton.js
client/js/renderer/noderepr.js
client/js/renderer/noderevertbutton.js
client/js/renderer/nodeshrinkbutton.js
client/js/renderer/scene.js
client/js/renderer/tempedge.js
client/templates/edgeeditor.html
client/templates/edgeeditor_readonly.html
client/templates/ldtjson-bin/annotationtemplate.html
client/templates/ldtjson-bin/segmenttemplate.html
client/templates/ldtjson-bin/tagtemplate.html
client/templates/list-bin.html
client/templates/main.html
client/templates/nodeeditor.html
client/templates/nodeeditor_readonly.html
client/templates/scene.html
client/templates/wikipedia-bin/resulttemplate.html
--- a/client/js/renderer/basebutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/basebutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -33,7 +33,6 @@
             this.sector.destroy();
         }
     }).value();
-//    });
 
     return _BaseButton;
 
--- a/client/js/renderer/baseeditor.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/baseeditor.js	Sat Apr 25 04:37:06 2015 +0200
@@ -31,7 +31,6 @@
             this.editor_$.remove();
         }
     }).value();
-//    });
 
     /* _BaseEditor End */
 
--- a/client/js/renderer/baserepresentation.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/baserepresentation.js	Sat Apr 25 04:37:06 2015 +0200
@@ -77,7 +77,6 @@
             }
         }
     }).value();
-//    });
 
     /* End of Rkns.Renderer._BaseRepresentation Class */
 
--- a/client/js/renderer/edge.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/edge.js	Sat Apr 25 04:37:06 2015 +0200
@@ -228,7 +228,6 @@
             });
         }
     }).value();
-//    });
 
     return Edge;
 
--- a/client/js/renderer/edgeeditbutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/edgeeditbutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -20,7 +20,6 @@
             }
         }
     }).value();
-//    });
 
     /* EdgeEditButton End */
 
--- a/client/js/renderer/edgeeditor.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/edgeeditor.js	Sat Apr 25 04:37:06 2015 +0200
@@ -10,11 +10,11 @@
     var EdgeEditor = Utils.inherit(BaseEditor);
 
     _(EdgeEditor.prototype).extend({
-    	_init: function() {
-    		BaseEditor.prototype._init.apply(this);
-    		this.template = this.options.templates['templates/edgeeditor.html'];
-    		this.readOnlyTemplate = this.options.templates['templates/edgeeditor_readonly.html'];
-    	},
+        _init: function() {
+          BaseEditor.prototype._init.apply(this);
+          this.template = this.options.templates['templates/edgeeditor.html'];
+          this.readOnlyTemplate = this.options.templates['templates/edgeeditor_readonly.html'];
+        },
         draw: function() {
             var _model = this.source_representation.model,
             _from_model = _model.get("from"),
@@ -57,21 +57,21 @@
             if (this.renderer.isEditable()) {
 
                 var onFieldChange = _.throttle(function() {
-                  _.defer(function() {
-                    if (_this.renderer.isEditable()) {
-                        var _data = {
+                    _.defer(function() {
+                        if (_this.renderer.isEditable()) {
+                            var _data = {
                                 title: _this.editor_$.find(".Rk-Edit-Title").val()
-                        };
-                        if (_this.options.show_edge_editor_uri) {
-                            _data.uri = _this.editor_$.find(".Rk-Edit-URI").val();
+                            };
+                            if (_this.options.show_edge_editor_uri) {
+                                _data.uri = _this.editor_$.find(".Rk-Edit-URI").val();
+                            }
+                            _this.editor_$.find(".Rk-Edit-Goto").attr("href",_data.uri || "#");
+                            _model.set(_data);
+                            paper.view.draw();
+                        } else {
+                            closeEditor();
                         }
-                        _this.editor_$.find(".Rk-Edit-Goto").attr("href",_data.uri || "#");
-                        _model.set(_data);
-                        paper.view.draw();
-                    } else {
-                        closeEditor();
-                    }
-                  });
+                    });
                 },500);
 
                 this.editor_$.on("keyup", function(_e) {
@@ -144,7 +144,6 @@
             paper.view.draw();
         }
     }).value();
-//    });
 
     /* EdgeEditor End */
 
--- a/client/js/renderer/edgeremovebutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/edgeremovebutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -34,7 +34,6 @@
             }
         }
     }).value();
-//    });
 
     /* EdgeRemoveButton End */
 
--- a/client/js/renderer/edgerevertbutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/edgerevertbutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -22,7 +22,7 @@
             }
         }
     }).value();
-//    });
+
     /* EdgeRevertButton End */
 
     return EdgeRevertButton;
--- a/client/js/renderer/miniframe.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/miniframe.js	Sat Apr 25 04:37:06 2015 +0200
@@ -19,7 +19,7 @@
             this.renderer.is_dragging = false;
         }
     }).value();
-//    });
+
 
     /* MiniFrame End */
 
--- a/client/js/renderer/nodebutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/nodebutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -42,7 +42,7 @@
             this.sector.select();
         },
     }).value();
-//    });
+
 
     /* _NodeButton End */
 
--- a/client/js/renderer/nodeeditbutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/nodeeditbutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -24,7 +24,6 @@
             }
         }
     }).value();
-//    });
 
     /* NodeEditButton End */
 
--- a/client/js/renderer/nodeeditor.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/nodeeditor.js	Sat Apr 25 04:37:06 2015 +0200
@@ -202,7 +202,7 @@
             paper.view.draw();
         }
     }).value();
-//    });
+
     /* NodeEditor End */
 
     return NodeEditor;
--- a/client/js/renderer/nodeenlargebutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/nodeenlargebutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -27,7 +27,7 @@
             paper.view.draw();
         }
     }).value();
-//    });
+
     /* NodeEnlargeButton End */
 
     return NodeEnlargeButton;
--- a/client/js/renderer/nodelinkbutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/nodelinkbutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -31,7 +31,6 @@
             }
         }
     }).value();
-//    });
 
     /* NodeLinkButton End */
 
--- a/client/js/renderer/noderemovebutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/noderemovebutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -38,7 +38,7 @@
             }
         }
     }).value();
-//    });
+
     /* NodeRemoveButton End */
 
     return NodeRemoveButton;
--- a/client/js/renderer/noderepr.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/noderepr.js	Sat Apr 25 04:37:06 2015 +0200
@@ -439,7 +439,6 @@
             }
         }
     }).value();
-//    });
 
     return NodeRepr;
 
--- a/client/js/renderer/noderevertbutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/noderevertbutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -26,7 +26,7 @@
             }
         }
     }).value();
-//    });
+
     /* NodeRevertButton End */
 
     return NodeRevertButton;
--- a/client/js/renderer/nodeshrinkbutton.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/nodeshrinkbutton.js	Sat Apr 25 04:37:06 2015 +0200
@@ -26,7 +26,6 @@
             paper.view.draw();
         }
     }).value();
-//    });
 
     /* NodeShrinkButton End */
 
--- a/client/js/renderer/scene.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/scene.js	Sat Apr 25 04:37:06 2015 +0200
@@ -29,7 +29,7 @@
         this.buttons_layer = new paper.Layer();
         this.delete_list = [];
         this.redrawActive = true;
-        
+
         if (_renkan.options.show_minimap) {
             this.minimap = {
                     background_layer: new paper.Layer(),
@@ -1279,7 +1279,6 @@
         save: function() { },
         open: function() { }
     }).value();
-//    });
 
     /* Scene End */
 
--- a/client/js/renderer/tempedge.js	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/js/renderer/tempedge.js	Sat Apr 25 04:37:06 2015 +0200
@@ -92,7 +92,6 @@
             this.line.remove();
         }
     }).value();
-//    });
 
     /* TempEdge Class End */
 
--- a/client/templates/edgeeditor.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/edgeeditor.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,67 +1,67 @@
 <h2>
-	<span class="Rk-CloseX">&times;</span><%-renkan.translate("Edit Edge")%></span>
+    <span class="Rk-CloseX">&times;</span><%-renkan.translate("Edit Edge")%></span>
 </h2>
 <p>
-	<label><%-renkan.translate("Title:")%></label>
-	<input class="Rk-Edit-Title" type="text" value="<%-edge.title%>" />
+    <label><%-renkan.translate("Title:")%></label>
+    <input class="Rk-Edit-Title" type="text" value="<%-edge.title%>" />
 </p>
 <% if (options.show_edge_editor_uri) { %>
-	<p>
-		<label><%-renkan.translate("URI:")%></label>
-		<input class="Rk-Edit-URI" type="text" value="<%-edge.uri%>" />
-		<a class="Rk-Edit-Goto" href="<%-edge.uri%>" target="_blank"></a>
-	</p>
-	<% if (options.properties.length) { %>
-		<p>
-			<label><%-renkan.translate("Choose from vocabulary:")%></label>
-			<select class="Rk-Edit-Vocabulary">
-				<% _(options.properties).each(function(ontology) { %>
-					<option class="Rk-Edit-Vocabulary-Class" value="">
-						<%- renkan.translate(ontology.label) %>
-					</option>
-					<% _(ontology.properties).each(function(property) { var uri = ontology["base-uri"] + property.uri; %>
-						<option class="Rk-Edit-Vocabulary-Property" value="<%- uri %>"
-							<% if (uri === edge.uri) { %> selected<% } %>>
-							<%- renkan.translate(property.label) %>
-						</option>
-					<% }) %>
-				<% }) %>
-			</select>
-		</p>
+    <p>
+        <label><%-renkan.translate("URI:")%></label>
+        <input class="Rk-Edit-URI" type="text" value="<%-edge.uri%>" />
+        <a class="Rk-Edit-Goto" href="<%-edge.uri%>" target="_blank"></a>
+    </p>
+    <% if (options.properties.length) { %>
+        <p>
+            <label><%-renkan.translate("Choose from vocabulary:")%></label>
+            <select class="Rk-Edit-Vocabulary">
+                <% _.each(options.properties, function(ontology) { %>
+                    <option class="Rk-Edit-Vocabulary-Class" value="">
+                        <%- renkan.translate(ontology.label) %>
+                    </option>
+                    <% _.each(ontology.properties, function(property) { var uri = ontology["base-uri"] + property.uri; %>
+                        <option class="Rk-Edit-Vocabulary-Property" value="<%- uri %>"
+                            <% if (uri === edge.uri) { %> selected<% } %>>
+                            <%- renkan.translate(property.label) %>
+                        </option>
+                    <% }) %>
+                <% }) %>
+            </select>
+        </p>
 <% } } %>
 <% if (options.show_edge_editor_color) { %>
-	<div class="Rk-Editor-p">
-		<span class="Rk-Editor-Label"><%-renkan.translate("Edge color:")%></span>
-		<div class="Rk-Edit-ColorPicker-Wrapper">
-			<span class="Rk-Edit-Color" style="background: &lt;%-edge.color%>;">
-				<span class="Rk-Edit-ColorTip"></span>
-			</span>
-			<%= renkan.colorPicker %>
-			<span class="Rk-Edit-ColorPicker-Text"><%- renkan.translate("Choose color") %></span>
-		</div>
-	</div>
+    <div class="Rk-Editor-p">
+        <span class="Rk-Editor-Label"><%-renkan.translate("Edge color:")%></span>
+        <div class="Rk-Edit-ColorPicker-Wrapper">
+            <span class="Rk-Edit-Color" style="background: &lt;%-edge.color%>;">
+                <span class="Rk-Edit-ColorTip"></span>
+            </span>
+            <%= renkan.colorPicker %>
+            <span class="Rk-Edit-ColorPicker-Text"><%- renkan.translate("Choose color") %></span>
+        </div>
+    </div>
 <% } %>
 <% if (options.show_edge_editor_direction) { %>
-	<p>
-		<span class="Rk-Edit-Direction"><%- renkan.translate("Change edge direction") %></span>
-	</p>
+    <p>
+        <span class="Rk-Edit-Direction"><%- renkan.translate("Change edge direction") %></span>
+    </p>
 <% } %>
 <% if (options.show_edge_editor_nodes) { %>
-	<p>
-		<span class="Rk-Editor-Label"><%-renkan.translate("From:")%></span>
-		<span class="Rk-UserColor" style="background: <%-edge.from_color%>;"></span>
-		<%- shortenText(edge.from_title, 25) %>
-	</p>
-	<p>
-		<span class="Rk-Editor-Label"><%-renkan.translate("To:")%></span>
-		<span class="Rk-UserColor" style="background: >%-edge.to_color%>;"></span>
-		<%- shortenText(edge.to_title, 25) %>
-	</p>
+    <p>
+        <span class="Rk-Editor-Label"><%-renkan.translate("From:")%></span>
+        <span class="Rk-UserColor" style="background: <%-edge.from_color%>;"></span>
+        <%- shortenText(edge.from_title, 25) %>
+    </p>
+    <p>
+        <span class="Rk-Editor-Label"><%-renkan.translate("To:")%></span>
+        <span class="Rk-UserColor" style="background: >%-edge.to_color%>;"></span>
+        <%- shortenText(edge.to_title, 25) %>
+    </p>
 <% } %>
 <% if (options.show_edge_editor_creator && edge.has_creator) { %>
-	<p>
-		<span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span>
-		<span class="Rk-UserColor" style="background: &lt;%-edge.created_by_color%>;"></span>
-		<%- shortenText(edge.created_by_title, 25) %>
-	</p>
+    <p>
+        <span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span>
+        <span class="Rk-UserColor" style="background: &lt;%-edge.created_by_color%>;"></span>
+        <%- shortenText(edge.created_by_title, 25) %>
+    </p>
 <% } %>
--- a/client/templates/edgeeditor_readonly.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/edgeeditor_readonly.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,38 +1,38 @@
 <h2>
-	<span class="Rk-CloseX">&times;</span>
-	<% if (options.show_edge_tooltip_color) { %>
-		<span class="Rk-UserColor" style="background: <%- edge.color %>;"></span>
-	<% } %>
-	<span class="Rk-Display-Title">
-		<% if (edge.uri) { %>
-			<a href="<%-edge.uri%>" target="_blank">
-		<% } %>
-		<%-edge.title%>
-		<% if (edge.uri) { %> </a> <% } %>
-	</span>
+    <span class="Rk-CloseX">&times;</span>
+    <% if (options.show_edge_tooltip_color) { %>
+        <span class="Rk-UserColor" style="background: <%- edge.color %>;"></span>
+    <% } %>
+    <span class="Rk-Display-Title">
+        <% if (edge.uri) { %>
+            <a href="<%-edge.uri%>" target="_blank">
+        <% } %>
+        <%-edge.title%>
+        <% if (edge.uri) { %> </a> <% } %>
+    </span>
 </h2>
 <% if (options.show_edge_tooltip_uri && edge.uri) { %>
-	<p class="Rk-Display-URI">
-		<a href="<%-edge.uri%>" target="_blank"><%- edge.short_uri %></a>
-	</p>
+    <p class="Rk-Display-URI">
+        <a href="<%-edge.uri%>" target="_blank"><%- edge.short_uri %></a>
+    </p>
 <% } %>
 <p><%-edge.description%></p>
 <% if (options.show_edge_tooltip_nodes) { %>
-	<p>
-		<span class="Rk-Editor-Label"><%-renkan.translate("From:")%></span>
-		<span class="Rk-UserColor" style="background: <%- edge.from_color %>;"></span>
-		<%- shortenText(edge.from_title, 25) %>
-	</p>
-	<p>
-		<span class="Rk-Editor-Label"><%-renkan.translate("To:")%></span>
-		<span class="Rk-UserColor" style="background: <%- edge.to_color %>;"></span>
-		<%- shortenText(edge.to_title, 25) %>
-	</p>
+    <p>
+        <span class="Rk-Editor-Label"><%-renkan.translate("From:")%></span>
+        <span class="Rk-UserColor" style="background: <%- edge.from_color %>;"></span>
+        <%- shortenText(edge.from_title, 25) %>
+    </p>
+    <p>
+        <span class="Rk-Editor-Label"><%-renkan.translate("To:")%></span>
+        <span class="Rk-UserColor" style="background: <%- edge.to_color %>;"></span>
+        <%- shortenText(edge.to_title, 25) %>
+    </p>
 <% } %>
 <% if (options.show_edge_tooltip_creator && edge.has_creator) { %>
-	<p>
-		<span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span>
-		<span class="Rk-UserColor" style="background: <%- edge.created_by_color %>;"></span>
-		<%- shortenText(edge.created_by_title, 25) %>
-	</p>
+    <p>
+        <span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span>
+        <span class="Rk-UserColor" style="background: <%- edge.created_by_color %>;"></span>
+        <%- shortenText(edge.created_by_title, 25) %>
+    </p>
 <% } %>
--- a/client/templates/ldtjson-bin/annotationtemplate.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/ldtjson-bin/annotationtemplate.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,11 +1,11 @@
 <li class="Rk-Bin-Item" draggable="true"
-	data-image="<%- Rkns.Utils.getFullURL(image) %>"
-	data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/#id=<%=annotationid%>"
-	data-title="<%-title%>" data-description="<%-description%>">
-	
-	<img class="Rk-Ldt-Annotation-Icon" src="<%=image%>" />
-	<h4><%=htitle%></h4>
-	<p><%=hdescription%></p>
-	<p>Start: <%=start%>, End: <%=end%>, Duration: <%=duration%></p>
-	<div class="Rk-Clear"></div>
-</li>
\ No newline at end of file
+    data-image="<%- Rkns.Utils.getFullURL(image) %>"
+    data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/#id=<%=annotationid%>"
+    data-title="<%-title%>" data-description="<%-description%>">
+
+    <img class="Rk-Ldt-Annotation-Icon" src="<%=image%>" />
+    <h4><%=htitle%></h4>
+    <p><%=hdescription%></p>
+    <p>Start: <%=start%>, End: <%=end%>, Duration: <%=duration%></p>
+    <div class="Rk-Clear"></div>
+</li>
--- a/client/templates/ldtjson-bin/segmenttemplate.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/ldtjson-bin/segmenttemplate.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,11 +1,11 @@
 <li class="Rk-Bin-Item" draggable="true"
-	data-image="<%- Rkns.Utils.getFullURL(image) %>"
-	data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/#id=<%=annotationid%>"
-	data-title="<%-title%>" data-description="<%-description%>">
-	
-	<img class="Rk-Ldt-Annotation-Icon" src="<%=image%>" />
-	<h4><%=htitle%></h4>
-	<p><%=hdescription%></p>
-	<p>Start: <%=start%>, End: <%=end%>, Duration: <%=duration%></p>
-	<div class="Rk-Clear"></div>
-</li>
\ No newline at end of file
+    data-image="<%- Rkns.Utils.getFullURL(image) %>"
+    data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/#id=<%=annotationid%>"
+    data-title="<%-title%>" data-description="<%-description%>">
+
+    <img class="Rk-Ldt-Annotation-Icon" src="<%=image%>" />
+    <h4><%=htitle%></h4>
+    <p><%=hdescription%></p>
+    <p>Start: <%=start%>, End: <%=end%>, Duration: <%=duration%></p>
+    <div class="Rk-Clear"></div>
+</li>
--- a/client/templates/ldtjson-bin/tagtemplate.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/ldtjson-bin/tagtemplate.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,9 +1,9 @@
 <li class="Rk-Bin-Item" draggable="true"
-	data-image="<%- Rkns.Utils.getFullURL(static_url+'img/ldt-tag.png') %>"
-	data-uri="<%=ldt_platform%>ldtplatform/ldt/front/search/?search=<%=encodedtitle%>&field=all"
-	data-title="<%-title%>" data-description="Tag '<%-title%>'">
+    data-image="<%- Rkns.Utils.getFullURL(static_url+'img/ldt-tag.png') %>"
+    data-uri="<%=ldt_platform%>ldtplatform/ldt/front/search/?search=<%=encodedtitle%>&field=all"
+    data-title="<%-title%>" data-description="Tag '<%-title%>'">
 
-	<img class="Rk-Ldt-Tag-Icon" src="<%-static_url%>img/ldt-tag.png" />
-	<h4><%=htitle%></h4>
-	<div class="Rk-Clear"></div>
-</li>
\ No newline at end of file
+    <img class="Rk-Ldt-Tag-Icon" src="<%-static_url%>img/ldt-tag.png" />
+    <h4><%=htitle%></h4>
+    <div class="Rk-Clear"></div>
+</li>
--- a/client/templates/list-bin.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/list-bin.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,25 +1,25 @@
 <li class="Rk-Bin-Item Rk-ResourceList-Item" draggable="true"
-	data-uri="<%-url%>" data-title="<%-title%>"
-	data-description="<%-description%>"
-	<% if (image) { %>
-		data-image="<%- Rkns.Utils.getFullURL(image) %>"
-	<% } else { %>
-		data-image=""
-	<% } %>
+    data-uri="<%-url%>" data-title="<%-title%>"
+    data-description="<%-description%>"
+    <% if (image) { %>
+        data-image="<%- Rkns.Utils.getFullURL(image) %>"
+    <% } else { %>
+        data-image=""
+    <% } %>
 ><% if (image) { %>
-	<img class="Rk-ResourceList-Image" src="<%-image%>" />
+    <img class="Rk-ResourceList-Image" src="<%-image%>" />
 <% } %>
 <h4 class="Rk-ResourceList-Title">
-	<% if (url) { %>
-		<a href="<%-url%>" target="_blank">
-	<% } %>
-	<%=htitle%>
-	<% if (url) { %></a><% } %>
-	</h4> 
-	<% if (description) { %>
-		<p class="Rk-ResourceList-Description"><%=hdescription%></p>
-	<% } %>
-	<% if (image) { %>
-		<div style="clear: both;"></div>
-	<% } %>
-</li>
\ No newline at end of file
+    <% if (url) { %>
+        <a href="<%-url%>" target="_blank">
+    <% } %>
+    <%=htitle%>
+    <% if (url) { %></a><% } %>
+    </h4>
+    <% if (description) { %>
+        <p class="Rk-ResourceList-Description"><%=hdescription%></p>
+    <% } %>
+    <% if (image) { %>
+        <div style="clear: both;"></div>
+    <% } %>
+</li>
--- a/client/templates/main.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/main.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,27 +1,27 @@
 <% if (options.show_bins) { %>
-	<div class="Rk-Bins">
-		<div class="Rk-Bins-Head">
-			<h2 class="Rk-Bins-Title"><%- translate("Select contents:")%></h2>
-			<form class="Rk-Web-Search-Form Rk-Search-Form">
-				<input class="Rk-Web-Search-Input Rk-Search-Input" type="search"
-					placeholder="<%- translate('Search the Web') %>" />
-				<div class="Rk-Search-Select">
-					<div class="Rk-Search-Current"></div>
-					<ul class="Rk-Search-List"></ul>
-				</div>
-				<input type="submit" value=""
-					class="Rk-Web-Search-Submit Rk-Search-Submit" title="<%- translate('Search the Web') %>" />
-			</form>
-			<form class="Rk-Bins-Search-Form Rk-Search-Form">
-				<input class="Rk-Bins-Search-Input Rk-Search-Input" type="search"
-					placeholder="<%- translate('Search in Bins') %>" /> <input
-					type="submit" value=""
-					class="Rk-Bins-Search-Submit Rk-Search-Submit"
-					title="<%- translate('Search in Bins') %>" />
-			</form>
-		</div>
-		<ul class="Rk-Bin-List"></ul>
-	</div>
+    <div class="Rk-Bins">
+        <div class="Rk-Bins-Head">
+            <h2 class="Rk-Bins-Title"><%- translate("Select contents:")%></h2>
+            <form class="Rk-Web-Search-Form Rk-Search-Form">
+                <input class="Rk-Web-Search-Input Rk-Search-Input" type="search"
+                    placeholder="<%- translate('Search the Web') %>" />
+                <div class="Rk-Search-Select">
+                    <div class="Rk-Search-Current"></div>
+                    <ul class="Rk-Search-List"></ul>
+                </div>
+                <input type="submit" value=""
+                    class="Rk-Web-Search-Submit Rk-Search-Submit" title="<%- translate('Search the Web') %>" />
+            </form>
+            <form class="Rk-Bins-Search-Form Rk-Search-Form">
+                <input class="Rk-Bins-Search-Input Rk-Search-Input" type="search"
+                    placeholder="<%- translate('Search in Bins') %>" /> <input
+                    type="submit" value=""
+                    class="Rk-Bins-Search-Submit Rk-Search-Submit"
+                    title="<%- translate('Search in Bins') %>" />
+            </form>
+        </div>
+        <ul class="Rk-Bin-List"></ul>
+    </div>
 <% } %> <% if (options.show_editor) { %>
-	<div class="Rk-Render Rk-Render-<% if (options.show_bins) { %>Panel<% } else { %>Full<% } %>"></div>
+    <div class="Rk-Render Rk-Render-<% if (options.show_bins) { %>Panel<% } else { %>Full<% } %>"></div>
 <% } %>
--- a/client/templates/nodeeditor.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/nodeeditor.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,91 +1,91 @@
 <h2>
-	<span class="Rk-CloseX">&times;</span><%-renkan.translate("Edit Node")%></span>
+    <span class="Rk-CloseX">&times;</span><%-renkan.translate("Edit Node")%></span>
 </h2>
 <p>
-	<label><%-renkan.translate("Title:")%></label>
-	<input class="Rk-Edit-Title" type="text" value="<%-node.title%>" />
+    <label><%-renkan.translate("Title:")%></label>
+    <input class="Rk-Edit-Title" type="text" value="<%-node.title%>" />
 </p>
 <% if (options.show_node_editor_uri) { %>
-	<p>
-		<label><%-renkan.translate("URI:")%></label>
-		<input class="Rk-Edit-URI" type="text" value="<%-node.uri%>" />
-		<a class="Rk-Edit-Goto" href="<%-node.uri%>" target="_blank"></a>
-	</p>
+    <p>
+        <label><%-renkan.translate("URI:")%></label>
+        <input class="Rk-Edit-URI" type="text" value="<%-node.uri%>" />
+        <a class="Rk-Edit-Goto" href="<%-node.uri%>" target="_blank"></a>
+    </p>
 <% } %> <% if (options.show_node_editor_description) { %>
-	<p>
-		<label><%-renkan.translate("Description:")%></label>
-		<textarea class="Rk-Edit-Description"><%-node.description%></textarea>
-	</p>
+    <p>
+        <label><%-renkan.translate("Description:")%></label>
+        <textarea class="Rk-Edit-Description"><%-node.description%></textarea>
+    </p>
 <% } %> <% if (options.show_node_editor_size) { %>
-	<p>
-		<span class="Rk-Editor-Label"><%-renkan.translate("Size:")%></span>
-		<a href="#" class="Rk-Edit-Size-Down">-</a>
-		<span class="Rk-Edit-Size-Value"><%-node.size%></span>
-		<a href="#" class="Rk-Edit-Size-Up">+</a>
-	</p>
+    <p>
+        <span class="Rk-Editor-Label"><%-renkan.translate("Size:")%></span>
+        <a href="#" class="Rk-Edit-Size-Down">-</a>
+        <span class="Rk-Edit-Size-Value"><%-node.size%></span>
+        <a href="#" class="Rk-Edit-Size-Up">+</a>
+    </p>
 <% } %> <% if (options.show_node_editor_color) { %>
-	<div class="Rk-Editor-p">
-		<span class="Rk-Editor-Label">
-		<%-renkan.translate("Node color:")%></span>
-		<div class="Rk-Edit-ColorPicker-Wrapper">
-			<span class="Rk-Edit-Color" style="background: <%-node.color%>;">
-				<span class="Rk-Edit-ColorTip"></span>
-			</span>
-			<%= renkan.colorPicker %>
-			<span class="Rk-Edit-ColorPicker-Text"><%- renkan.translate("Choose color") %></span>
-		</div>
-	</div>
+    <div class="Rk-Editor-p">
+        <span class="Rk-Editor-Label">
+        <%-renkan.translate("Node color:")%></span>
+        <div class="Rk-Edit-ColorPicker-Wrapper">
+            <span class="Rk-Edit-Color" style="background: <%-node.color%>;">
+                <span class="Rk-Edit-ColorTip"></span>
+            </span>
+            <%= renkan.colorPicker %>
+            <span class="Rk-Edit-ColorPicker-Text"><%- renkan.translate("Choose color") %></span>
+        </div>
+    </div>
 <% } %> <% if (options.show_node_editor_image) { %>
-	<div class="Rk-Edit-ImgWrap">
-		<div class="Rk-Edit-ImgPreview">
-			<img src="<%-node.image || node.image_placeholder%>" />
-			<% if (node.clip_path) { %>
-				<svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 1 1" preserveAspectRatio="none">
-					<path style="stroke-width: .02; stroke:red; fill-opacity:.3; fill:red;" d="<%- node.clip_path %>" />
-				</svg>
-			<% }%>
-		</div>
-	</div>
-	<p>
-		<label><%-renkan.translate("Image URL:")%></label>
-		<div>
-			<a class="Rk-Edit-Image-Del" href="#"></a>
-			<input class="Rk-Edit-Image" type="text" value='<%-node.image%>' />
-		</div>
-	</p>
+    <div class="Rk-Edit-ImgWrap">
+        <div class="Rk-Edit-ImgPreview">
+            <img src="<%-node.image || node.image_placeholder%>" />
+            <% if (node.clip_path) { %>
+                <svg xmlns="http://www.w3.org/2000/svg" version="1.1" viewbox="0 0 1 1" preserveAspectRatio="none">
+                    <path style="stroke-width: .02; stroke:red; fill-opacity:.3; fill:red;" d="<%- node.clip_path %>" />
+                </svg>
+            <% }%>
+        </div>
+    </div>
+    <p>
+        <label><%-renkan.translate("Image URL:")%></label>
+        <div>
+            <a class="Rk-Edit-Image-Del" href="#"></a>
+            <input class="Rk-Edit-Image" type="text" value='<%-node.image%>' />
+        </div>
+    </p>
 <% if (options.allow_image_upload) { %>
-	<p>
-		<label><%-renkan.translate("Choose Image File:")%></label>
-		<input class="Rk-Edit-Image-File" type="file" accept="image/*" />
-	</p>
+    <p>
+        <label><%-renkan.translate("Choose Image File:")%></label>
+        <input class="Rk-Edit-Image-File" type="file" accept="image/*" />
+    </p>
 <% }%><% } %> <% if (options.show_node_editor_creator && node.has_creator) { %>
-	<p>
-		<span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span>
-		<span class="Rk-UserColor" style="background: <%-node.created_by_color%>;"></span>
-		<%- shortenText(node.created_by_title, 25) %>
-	</p>
+    <p>
+        <span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span>
+        <span class="Rk-UserColor" style="background: <%-node.created_by_color%>;"></span>
+        <%- shortenText(node.created_by_title, 25) %>
+    </p>
 <% } %> <% if (options.change_shapes) { %>
-	<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") %>
-			</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>
-		</select>
-	</p>
+    <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") %>
+            </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>
+        </select>
+    </p>
 <% } %>
--- a/client/templates/nodeeditor_readonly.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/nodeeditor_readonly.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,28 +1,28 @@
 <h2>
-	<span class="Rk-CloseX">&times;</span>
-	<% if (options.show_node_tooltip_color) { %>
-		<span class="Rk-UserColor" style="background: <%-node.color%>;"></span>
-	<% } %>
-	<span class="Rk-Display-Title">
-		<% if (node.uri) { %>
-			<a href="<%-node.uri%>" target="_blank">
-		<% } %>
-		<%-node.title%>
-		<% if (node.uri) { %></a><% } %>
-	</span>
+    <span class="Rk-CloseX">&times;</span>
+    <% if (options.show_node_tooltip_color) { %>
+        <span class="Rk-UserColor" style="background: <%-node.color%>;"></span>
+    <% } %>
+    <span class="Rk-Display-Title">
+        <% if (node.uri) { %>
+            <a href="<%-node.uri%>" target="_blank">
+        <% } %>
+        <%-node.title%>
+        <% if (node.uri) { %></a><% } %>
+    </span>
 </h2>
 <% if (node.uri && options.show_node_tooltip_uri) { %>
-	<p class="Rk-Display-URI">
-		<a href="<%-node.uri%>" target="_blank"><%-node.short_uri%></a>
-	</p>
+    <p class="Rk-Display-URI">
+        <a href="<%-node.uri%>" target="_blank"><%-node.short_uri%></a>
+    </p>
 <% } %> <% if (options.show_node_tooltip_description) { %>
-	<p class="Rk-Display-Description"><%-node.description%></p>
+    <p class="Rk-Display-Description"><%-node.description%></p>
 <% } %> <% if (node.image && options.show_node_tooltip_image) { %>
-	<img class="Rk-Display-ImgPreview" src="<%-node.image%>" />
+    <img class="Rk-Display-ImgPreview" src="<%-node.image%>" />
 <% } %> <% if (node.has_creator && options.show_node_tooltip_creator) { %>
-	<p>
-		<span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span>
-		<span class="Rk-UserColor" style="background: <%-node.created_by_color%>;"></span>
-		<%- shortenText(node.created_by_title, 25) %>
-	</p>
+    <p>
+        <span class="Rk-Editor-Label"><%-renkan.translate("Created by:")%></span>
+        <span class="Rk-UserColor" style="background: <%-node.created_by_color%>;"></span>
+        <%- shortenText(node.created_by_title, 25) %>
+    </p>
 <% } %>
--- a/client/templates/scene.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/scene.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,152 +1,152 @@
 <% if (options.show_top_bar) { %>
-	<div class="Rk-TopBar">
-		<div class="loader"></div>
-		<% if (!options.editor_mode) { %>
-			<h2 class="Rk-PadTitle">
-				<%- project.get("title") || translate("Untitled project")%>
-			</h2>
-		<% } else { %>
-			<input type="text" class="Rk-PadTitle" value="<%- project.get('title') || '' %>" placeholder="<%-translate('Untitled project')%>" />
-		<% } %>
-		<% if (options.show_user_list) { %>
-			<div class="Rk-Users">
-				<div class="Rk-CurrentUser">
-					<% if (options.show_user_color) { %>
-						<div class="Rk-Edit-ColorPicker-Wrapper">
-							<span class="Rk-CurrentUser-Color">
-							<% if (options.user_color_editable) { %>
-								<span class="Rk-Edit-ColorTip"></span>
-							<% } %>
-							</span>
-							<% if (options.user_color_editable) { print(colorPicker) } %>
-						</div>
-					<% } %>
-					<span class="Rk-CurrentUser-Name">&lt;unknown user&gt;</span>
-				</div>
-				<ul class="Rk-UserList"></ul>
-			</div>
-		<% } %>
-		<% if (options.home_button_url) {%>
-			<div class="Rk-TopBar-Separator"></div>
-			<a class="Rk-TopBar-Button Rk-Home-Button" href="<%- options.home_button_url %>">
-				<div class="Rk-TopBar-Tooltip">
-					<div class="Rk-TopBar-Tooltip-Contents">
-						<%- translate(options.home_button_title) %>
-					</div>
-				</div>
-			</a>
-		<% } %>
-		<% if (options.show_fullscreen_button) { %>
-			<div class="Rk-TopBar-Separator"></div>
-			<div class="Rk-TopBar-Button Rk-FullScreen-Button">
-				<div class="Rk-TopBar-Tooltip">
-					<div class="Rk-TopBar-Tooltip-Contents">
-						<%-translate("Full Screen")%>
-					</div>
-				</div>
-			</div>
-		<% } %>
-		<% if (options.editor_mode) { %>
-			<% if (options.show_addnode_button) { %>
-				<div class="Rk-TopBar-Separator"></div>
-				<div class="Rk-TopBar-Button Rk-AddNode-Button">
-					<div class="Rk-TopBar-Tooltip">
-						<div class="Rk-TopBar-Tooltip-Contents">
-							<%-translate("Add Node")%>
-						</div>
-					</div>
-				</div>
-			<% } %>
-			<% if (options.show_addedge_button) { %>
-				<div class="Rk-TopBar-Separator"></div>
-				<div class="Rk-TopBar-Button Rk-AddEdge-Button">
-					<div class="Rk-TopBar-Tooltip">
-						<div class="Rk-TopBar-Tooltip-Contents">
-							<%-translate("Add Edge")%>
-						</div>
-					</div>
-				</div>
-			<% } %>
-			<% if (options.show_export_button) { %>
-				<div class="Rk-TopBar-Separator"></div>
-				<div class="Rk-TopBar-Button Rk-Export-Button">
-					<div class="Rk-TopBar-Tooltip">
-						<div class="Rk-TopBar-Tooltip-Contents">
-							<%-translate("Download Project")%>
-						</div>
-					</div>
-				</div>
-			<% } %>
-			<% if (options.show_save_button) { %>
-				<div class="Rk-TopBar-Separator"></div>
-				<div class="Rk-TopBar-Button Rk-Save-Button">
-					<div class="Rk-TopBar-Tooltip">
-						<div class="Rk-TopBar-Tooltip-Contents"></div>
-					</div>
-				</div>
-			<% } %>
-			<% if (options.show_open_button) { %>
-				<div class="Rk-TopBar-Separator"></div>
-				<div class="Rk-TopBar-Button Rk-Open-Button">
-					<div class="Rk-TopBar-Tooltip">
-						<div class="Rk-TopBar-Tooltip-Contents">
-							<%-translate("Open Project")%>
-						</div>
-					</div>
-				</div>
-			<% } %>
-			<% if (options.show_bookmarklet) { %>
-				<div class="Rk-TopBar-Separator"></div>
-				<a class="Rk-TopBar-Button Rk-Bookmarklet-Button" href="#">
-					<div class="Rk-TopBar-Tooltip">
-						<div class="Rk-TopBar-Tooltip-Contents">
-							<%-translate("Renkan \'Drag-to-Add\' bookmarklet")%>
-						</div>
-					</div>
-				</a>
-				<div class="Rk-TopBar-Separator"></div>
-			<% } %>
-		<% } else { %>
-			<% if (options.show_export_button) { %>
-				<div class="Rk-TopBar-Separator"></div>
-				<div class="Rk-TopBar-Button Rk-Export-Button">
-					<div class="Rk-TopBar-Tooltip">
-						<div class="Rk-TopBar-Tooltip-Contents">
-							<%-translate("Download Project")%>
-						</div>
-					</div>
-				</div>
-				<div class="Rk-TopBar-Separator"></div>
-			<% } %>
-		<% }; %>
-		<% if (options.show_search_field) { %>
-			<form action="#" class="Rk-GraphSearch-Form">
-				<input type="search" class="Rk-GraphSearch-Field" placeholder="<%- translate('Search in graph') %>" />
-			</form>
-			<div class="Rk-TopBar-Separator"></div>
-		<% } %>
-	</div>
+    <div class="Rk-TopBar">
+        <div class="loader"></div>
+        <% if (!options.editor_mode) { %>
+            <h2 class="Rk-PadTitle">
+                <%- project.get("title") || translate("Untitled project")%>
+            </h2>
+        <% } else { %>
+            <input type="text" class="Rk-PadTitle" value="<%- project.get('title') || '' %>" placeholder="<%-translate('Untitled project')%>" />
+        <% } %>
+        <% if (options.show_user_list) { %>
+            <div class="Rk-Users">
+                <div class="Rk-CurrentUser">
+                    <% if (options.show_user_color) { %>
+                        <div class="Rk-Edit-ColorPicker-Wrapper">
+                            <span class="Rk-CurrentUser-Color">
+                            <% if (options.user_color_editable) { %>
+                                <span class="Rk-Edit-ColorTip"></span>
+                            <% } %>
+                            </span>
+                            <% if (options.user_color_editable) { print(colorPicker) } %>
+                        </div>
+                    <% } %>
+                    <span class="Rk-CurrentUser-Name">&lt;unknown user&gt;</span>
+                </div>
+                <ul class="Rk-UserList"></ul>
+            </div>
+        <% } %>
+        <% if (options.home_button_url) {%>
+            <div class="Rk-TopBar-Separator"></div>
+            <a class="Rk-TopBar-Button Rk-Home-Button" href="<%- options.home_button_url %>">
+                <div class="Rk-TopBar-Tooltip">
+                    <div class="Rk-TopBar-Tooltip-Contents">
+                        <%- translate(options.home_button_title) %>
+                    </div>
+                </div>
+            </a>
+        <% } %>
+        <% if (options.show_fullscreen_button) { %>
+            <div class="Rk-TopBar-Separator"></div>
+            <div class="Rk-TopBar-Button Rk-FullScreen-Button">
+                <div class="Rk-TopBar-Tooltip">
+                    <div class="Rk-TopBar-Tooltip-Contents">
+                        <%-translate("Full Screen")%>
+                    </div>
+                </div>
+            </div>
+        <% } %>
+        <% if (options.editor_mode) { %>
+            <% if (options.show_addnode_button) { %>
+                <div class="Rk-TopBar-Separator"></div>
+                <div class="Rk-TopBar-Button Rk-AddNode-Button">
+                    <div class="Rk-TopBar-Tooltip">
+                        <div class="Rk-TopBar-Tooltip-Contents">
+                            <%-translate("Add Node")%>
+                        </div>
+                    </div>
+                </div>
+            <% } %>
+            <% if (options.show_addedge_button) { %>
+                <div class="Rk-TopBar-Separator"></div>
+                <div class="Rk-TopBar-Button Rk-AddEdge-Button">
+                    <div class="Rk-TopBar-Tooltip">
+                        <div class="Rk-TopBar-Tooltip-Contents">
+                            <%-translate("Add Edge")%>
+                        </div>
+                    </div>
+                </div>
+            <% } %>
+            <% if (options.show_export_button) { %>
+                <div class="Rk-TopBar-Separator"></div>
+                <div class="Rk-TopBar-Button Rk-Export-Button">
+                    <div class="Rk-TopBar-Tooltip">
+                        <div class="Rk-TopBar-Tooltip-Contents">
+                            <%-translate("Download Project")%>
+                        </div>
+                    </div>
+                </div>
+            <% } %>
+            <% if (options.show_save_button) { %>
+                <div class="Rk-TopBar-Separator"></div>
+                <div class="Rk-TopBar-Button Rk-Save-Button">
+                    <div class="Rk-TopBar-Tooltip">
+                        <div class="Rk-TopBar-Tooltip-Contents"></div>
+                    </div>
+                </div>
+            <% } %>
+            <% if (options.show_open_button) { %>
+                <div class="Rk-TopBar-Separator"></div>
+                <div class="Rk-TopBar-Button Rk-Open-Button">
+                    <div class="Rk-TopBar-Tooltip">
+                        <div class="Rk-TopBar-Tooltip-Contents">
+                            <%-translate("Open Project")%>
+                        </div>
+                    </div>
+                </div>
+            <% } %>
+            <% if (options.show_bookmarklet) { %>
+                <div class="Rk-TopBar-Separator"></div>
+                <a class="Rk-TopBar-Button Rk-Bookmarklet-Button" href="#">
+                    <div class="Rk-TopBar-Tooltip">
+                        <div class="Rk-TopBar-Tooltip-Contents">
+                            <%-translate("Renkan \'Drag-to-Add\' bookmarklet")%>
+                        </div>
+                    </div>
+                </a>
+                <div class="Rk-TopBar-Separator"></div>
+            <% } %>
+        <% } else { %>
+            <% if (options.show_export_button) { %>
+                <div class="Rk-TopBar-Separator"></div>
+                <div class="Rk-TopBar-Button Rk-Export-Button">
+                    <div class="Rk-TopBar-Tooltip">
+                        <div class="Rk-TopBar-Tooltip-Contents">
+                            <%-translate("Download Project")%>
+                        </div>
+                    </div>
+                </div>
+                <div class="Rk-TopBar-Separator"></div>
+            <% } %>
+        <% }; %>
+        <% if (options.show_search_field) { %>
+            <form action="#" class="Rk-GraphSearch-Form">
+                <input type="search" class="Rk-GraphSearch-Field" placeholder="<%- translate('Search in graph') %>" />
+            </form>
+            <div class="Rk-TopBar-Separator"></div>
+        <% } %>
+    </div>
 <% } %>
 <div class="Rk-Editing-Space<% if (!options.show_top_bar) { %> Rk-Editing-Space-Full<% } %>">
-	<div class="Rk-Labels"></div>
-	<canvas class="Rk-Canvas" <% if (options.resize) { %> resize="" <% } %>></canvas>
-	<div class="Rk-Notifications"></div>
-	<div class="Rk-Editor">
-		<% if (options.show_bins) { %>
-			<div class="Rk-Fold-Bins">&laquo;</div>
-		<% } %>
-		<% if (options.show_zoom) { %>
-			<div class="Rk-ZoomButtons">
-				<div class="Rk-ZoomIn" title="<%-translate('Zoom In')%>"></div>
-				<div class="Rk-ZoomFit" title="<%-translate('Zoom Fit')%>"></div>
-				<div class="Rk-ZoomOut" title="<%-translate('Zoom Out')%>"></div>
-				<% if (options.editor_mode && options.save_view) { %>
-					<div class="Rk-ZoomSave" title="<%-translate('Zoom Save')%>"></div>
-				<% } %>
-				<% if (options.save_view) { %>
-					<div class="Rk-ZoomSetSaved" title="<%-translate('View saved zoom')%>"></div>
-				<% } %>
-			</div>
-		<% } %>
-	</div>
-</div>
\ No newline at end of file
+    <div class="Rk-Labels"></div>
+    <canvas class="Rk-Canvas" <% if (options.resize) { %> resize="" <% } %>></canvas>
+    <div class="Rk-Notifications"></div>
+    <div class="Rk-Editor">
+        <% if (options.show_bins) { %>
+            <div class="Rk-Fold-Bins">&laquo;</div>
+        <% } %>
+        <% if (options.show_zoom) { %>
+            <div class="Rk-ZoomButtons">
+                <div class="Rk-ZoomIn" title="<%-translate('Zoom In')%>"></div>
+                <div class="Rk-ZoomFit" title="<%-translate('Zoom Fit')%>"></div>
+                <div class="Rk-ZoomOut" title="<%-translate('Zoom Out')%>"></div>
+                <% if (options.editor_mode && options.save_view) { %>
+                    <div class="Rk-ZoomSave" title="<%-translate('Zoom Save')%>"></div>
+                <% } %>
+                <% if (options.save_view) { %>
+                    <div class="Rk-ZoomSetSaved" title="<%-translate('View saved zoom')%>"></div>
+                <% } %>
+            </div>
+        <% } %>
+    </div>
+</div>
--- a/client/templates/wikipedia-bin/resulttemplate.html	Sat Apr 25 04:13:53 2015 +0200
+++ b/client/templates/wikipedia-bin/resulttemplate.html	Sat Apr 25 04:37:06 2015 +0200
@@ -1,11 +1,11 @@
 <li class="Rk-Wikipedia-Result Rk-Bin-Item" draggable="true"
-	data-uri="<%-url%>" data-title="Wikipedia: <%-title%>"
-	data-description="<%-description%>"
-	data-image="<%- Rkns.Utils.getFullURL( static_url + 'img/wikipedia.png' ) %>">
-	
-	<img class="Rk-Wikipedia-Icon" src="<%-static_url%>img/wikipedia.png">
-	<h4 class="Rk-Wikipedia-Title">
-		<a href="<%-url%>" target="_blank"><%=htitle%></a>
-	</h4>
-	<p class="Rk-Wikipedia-Snippet"><%=hdescription%></p>
-</li>
\ No newline at end of file
+    data-uri="<%-url%>" data-title="Wikipedia: <%-title%>"
+    data-description="<%-description%>"
+    data-image="<%- Rkns.Utils.getFullURL( static_url + 'img/wikipedia.png' ) %>">
+
+    <img class="Rk-Wikipedia-Icon" src="<%-static_url%>img/wikipedia.png">
+    <h4 class="Rk-Wikipedia-Title">
+        <a href="<%-url%>" target="_blank"><%=htitle%></a>
+    </h4>
+    <p class="Rk-Wikipedia-Snippet"><%=hdescription%></p>
+</li>