# HG changeset patch
# User rougeronj
# Date 1433944845 -7200
# Node ID e3537f6de1124fbd7967bb19956929012b8dd6f9
# Parent 4f9aa2f4af8cd193f3378e56b60bdf5a2019111b# Parent fd2b5a7ec356132ffd5b5115c9663cd46f37dfa9
Merge with fd2b5a7ec356132ffd5b5115c9663cd46f37dfa9
diff -r 4f9aa2f4af8c -r e3537f6de112 .hgtags
--- a/.hgtags Wed Jun 10 16:00:16 2015 +0200
+++ b/.hgtags Wed Jun 10 16:00:45 2015 +0200
@@ -60,3 +60,4 @@
276042cb477ce5ae118aa30108781b65715c745a V00.08.07
e529b633c3399d6b3471b76c2638a0a9d1463539 V00.09
ad484b4b50507b658c8adde9bd2ac615ce831141 V00.09.01
+c72ac00eb2f9e1ba5641cbf9232187b98377a943 V00.10
diff -r 4f9aa2f4af8c -r e3537f6de112 client/bower.json
--- a/client/bower.json Wed Jun 10 16:00:16 2015 +0200
+++ b/client/bower.json Wed Jun 10 16:00:45 2015 +0200
@@ -1,6 +1,6 @@
{
"name": "renkan",
- "version": "0.9.1",
+ "version": "0.10.0",
"authors": [
"IRI "
],
diff -r 4f9aa2f4af8c -r e3537f6de112 client/js/i18n.js
--- a/client/js/i18n.js Wed Jun 10 16:00:16 2015 +0200
+++ b/client/js/i18n.js Wed Jun 10 16:00:45 2015 +0200
@@ -87,8 +87,8 @@
"Triangle": "Triangle",
"Zoom Fit": "Ajuster le Zoom",
"Download Project": "Télécharger le projet",
- "Zoom Save": "Sauver le Zoom",
- "View saved zoom": "Restaurer le Zoom",
+ "Save view": "Sauver la vue",
+ "View saved view": "Restaurer la Vue",
"Renkan \'Drag-to-Add\' bookmarklet": "Renkan \'Deplacer-Pour-Ajouter\' Signet",
"(unknown user)":"(non authentifié)",
"":"",
diff -r 4f9aa2f4af8c -r e3537f6de112 client/js/renderer/edgeeditor.js
--- a/client/js/renderer/edgeeditor.js Wed Jun 10 16:00:16 2015 +0200
+++ b/client/js/renderer/edgeeditor.js Wed Jun 10 16:00:45 2015 +0200
@@ -70,10 +70,9 @@
_data.uri = _this.editor_$.find(".Rk-Edit-URI").val();
}
if (_this.options.show_node_editor_style) {
- var dash = _this.editor_$.find(".Rk-Edit-Dash").is(':checked');
- _data.style = _.assign( ((_model.has("style") && _.clone(_model.get("style"))) || {}), {dash: dash});
- var arrow = _this.editor_$.find(".Rk-Edit-Arrow").is(':checked');
- _data.style = _.assign( ((_model.has("style") && _.clone(_model.get("style"))) || {}), {arrow: arrow});
+ var dash = _this.editor_$.find(".Rk-Edit-Dash").is(':checked'),
+ arrow = _this.editor_$.find(".Rk-Edit-Arrow").is(':checked');
+ _data.style = _.assign( ((_model.has("style") && _.clone(_model.get("style"))) || {}), {dash: dash, arrow: arrow});
}
_this.editor_$.find(".Rk-Edit-Goto").attr("href",_data.uri || "#");
_model.set(_data);
diff -r 4f9aa2f4af8c -r e3537f6de112 client/js/renderer/shapebuilder.js
--- a/client/js/renderer/shapebuilder.js Wed Jun 10 16:00:16 2015 +0200
+++ b/client/js/renderer/shapebuilder.js Wed Jun 10 16:00:45 2015 +0200
@@ -76,7 +76,10 @@
return new paper.Path.RegularPolygon([0,0], 3, 1);
},
getImageShape: function(center, radius) {
- return new paper.Path.RegularPolygon(center, 3, radius);
+ var shape = new paper.Path.RegularPolygon([0,0], 3, 1);
+ shape.scale(radius);
+ shape.translate(center);
+ return shape;
}
},
"svg": function(path){
diff -r 4f9aa2f4af8c -r e3537f6de112 client/package.json
--- a/client/package.json Wed Jun 10 16:00:16 2015 +0200
+++ b/client/package.json Wed Jun 10 16:00:45 2015 +0200
@@ -1,6 +1,6 @@
{
"name": "renkan",
- "version": "0.9.1",
+ "version": "0.10.0",
"description": "Renkan client application",
"repository": {
"type": "hg",
diff -r 4f9aa2f4af8c -r e3537f6de112 client/templates/scene.html
--- a/client/templates/scene.html Wed Jun 10 16:00:16 2015 +0200
+++ b/client/templates/scene.html Wed Jun 10 16:00:45 2015 +0200
@@ -141,10 +141,10 @@
<% if (options.editor_mode && options.save_view) { %>
-
+
<% } %>
<% if (options.save_view) { %>
-
+
<% } %>
diff -r 4f9aa2f4af8c -r e3537f6de112 server/java/build.gradle
--- a/server/java/build.gradle Wed Jun 10 16:00:16 2015 +0200
+++ b/server/java/build.gradle Wed Jun 10 16:00:45 2015 +0200
@@ -2,7 +2,7 @@
apply plugin: 'maven'
group = 'org.iri_research.renkan'
- version = '0.9.1'
+ version = '0.10.0'
gradle.projectsEvaluated {
diff -r 4f9aa2f4af8c -r e3537f6de112 server/java/pom.xml
--- a/server/java/pom.xml Wed Jun 10 16:00:16 2015 +0200
+++ b/server/java/pom.xml Wed Jun 10 16:00:45 2015 +0200
@@ -5,7 +5,7 @@
org.iri_research.renkan
renkan
pom
- 0.9.1
+ 0.10.0
Renkan project
diff -r 4f9aa2f4af8c -r e3537f6de112 server/php/basic/public_html/static/lib/renkan/css/renkan.css
--- a/server/php/basic/public_html/static/lib/renkan/css/renkan.css Wed Jun 10 16:00:16 2015 +0200
+++ b/server/php/basic/public_html/static/lib/renkan/css/renkan.css Wed Jun 10 16:00:45 2015 +0200
@@ -24,7 +24,7 @@
* knowledge of the CeCILL-C license and that you accept its terms.
*/
-/*! renkan - v0.9.1 - Copyright © IRI 2015 */
+/*! renkan - v0.10.0 - Copyright © IRI 2015 */
/*!
* _____ _
diff -r 4f9aa2f4af8c -r e3537f6de112 server/php/basic/public_html/static/lib/renkan/css/renkan.min.css
--- a/server/php/basic/public_html/static/lib/renkan/css/renkan.min.css Wed Jun 10 16:00:16 2015 +0200
+++ b/server/php/basic/public_html/static/lib/renkan/css/renkan.min.css Wed Jun 10 16:00:45 2015 +0200
@@ -24,7 +24,7 @@
* knowledge of the CeCILL-C license and that you accept its terms.
*/
-/*! renkan - v0.9.1 - Copyright © IRI 2015 */
+/*! renkan - v0.10.0 - Copyright © IRI 2015 */
/*!
diff -r 4f9aa2f4af8c -r e3537f6de112 server/php/basic/public_html/static/lib/renkan/css/space-editor.css
--- a/server/php/basic/public_html/static/lib/renkan/css/space-editor.css Wed Jun 10 16:00:16 2015 +0200
+++ b/server/php/basic/public_html/static/lib/renkan/css/space-editor.css Wed Jun 10 16:00:45 2015 +0200
@@ -24,7 +24,7 @@
* knowledge of the CeCILL-C license and that you accept its terms.
*/
-/*! renkan - v0.9.1 - Copyright © IRI 2015 */
+/*! renkan - v0.10.0 - Copyright © IRI 2015 */
html {
overflow: visible !important;
diff -r 4f9aa2f4af8c -r e3537f6de112 server/php/basic/public_html/static/lib/renkan/css/space-editor.min.css
--- a/server/php/basic/public_html/static/lib/renkan/css/space-editor.min.css Wed Jun 10 16:00:16 2015 +0200
+++ b/server/php/basic/public_html/static/lib/renkan/css/space-editor.min.css Wed Jun 10 16:00:45 2015 +0200
@@ -24,7 +24,7 @@
* knowledge of the CeCILL-C license and that you accept its terms.
*/
-/*! renkan - v0.9.1 - Copyright © IRI 2015 */
+/*! renkan - v0.10.0 - Copyright © IRI 2015 */
html{overflow:visible!important}body{font-family:Arial,Helvetica,sans-serif;background:#F6F6F6;color:#333}.clearer{display:block;clear:both;height:1px}h1{margin-bottom:5px;padding:0 15px;background:#333;color:#fff;font-weight:700;font-size:30px;line-height:60px}.right{width:301px;position:absolute;top:10px;right:10px}.main{margin:10px 330px 10px 20px}.blue-button{display:inline-block;padding:4px 6px;color:#fff;text-decoration:none;border-radius:4px;background:-moz-linear-gradient(top,#6080c0,#2040a0);background:-webkit-linear-gradient(top,#6080c0,#2040a0);box-shadow:1px 1px 2px gray}.blue-button:hover{background:-moz-linear-gradient(top,#2040a0,#6080c0);background:-webkit-linear-gradient(top,#2040a0,#6080c0)}.update-preview{text-align:center;display:block;margin-bottom:10px;font-size:24px;font-weight:700;line-height:34px}#preview{position:relative;border-left:1px solid #000;border-bottom:1px solid #000;width:300px;height:800px;border-radius:4px;overflow:hidden;margin-bottom:10px}.section-title{font-size:20px;font-weight:700;margin:20px 0 5px}.first-level-list{margin:5px 0}.add-item{margin:5px 0;font-size:22px;font-weight:700;line-height:18px}.add-item:hover:after{float:right;font-size:14px;font-weight:400;line-height:18px;margin-left:4px}.add-search-engine:hover:after{content:"Add Search Engine"}.add-resource:hover:after{content:"Add Resource"}.add-bin:hover:after{content:"Add Bin"}.item{padding:5px;margin:5px 0;border-radius:4px;font-size:12px;background:-moz-linear-gradient(top,#ffcc8f,#fff0d0);background:-webkit-linear-gradient(top,#ffcc8f,#fff0d0);box-shadow:1px 1px 2px gray}.remove-item{float:right;font-size:22px;line-height:18px;height:18px;margin:0 0 2px -10px;font-weight:700}.setting{float:left;width:260px;margin:2px 15px 2px 2px;line-height:24px;min-height:24px}.setting label{float:left;display:block;width:100px;font-weight:700}.display-value{float:left;display:block;width:160px}.edit-value{width:160px;display:none;border:1px solid #ccc;border-radius:3px}input.edit-value,textarea.edit-value{width:154px;padding:2px}textarea.edit-value{resize:vertical;height:72px}.item-editing .display-value{display:none}.item-editing .edit-value{display:inline-block}.resource-list-title{clear:both;width:100%;font-size:16px;font-weight:700;margin:5px 0 0}.resource{display:block;clear:both;padding:5px;margin:5px;border-radius:4px;background:-moz-linear-gradient(top,#ff8f00,#ffcc8f);background:-webkit-linear-gradient(top,#ff8f00,#ffcc8f);box-shadow:1px 1px 2px gray}.resource .display-value{display:inline-block}.resource .edit-value,.resource.resource-editing .display-value{display:none}.resource.resource-editing .edit-value{display:inline-block}
\ No newline at end of file
diff -r 4f9aa2f4af8c -r e3537f6de112 server/php/basic/public_html/static/lib/renkan/js/renkan.js
--- a/server/php/basic/public_html/static/lib/renkan/js/renkan.js Wed Jun 10 16:00:16 2015 +0200
+++ b/server/php/basic/public_html/static/lib/renkan/js/renkan.js Wed Jun 10 16:00:45 2015 +0200
@@ -24,7 +24,7 @@
* knowledge of the CeCILL-C license and that you accept its terms.
*/
-/*! renkan - v0.9.1 - Copyright © IRI 2015 */
+/*! renkan - v0.10.0 - Copyright © IRI 2015 */
this["renkanJST"] = this["renkanJST"] || {};
diff -r 4f9aa2f4af8c -r e3537f6de112 server/php/basic/public_html/static/lib/renkan/js/renkan.min.js
--- a/server/php/basic/public_html/static/lib/renkan/js/renkan.min.js Wed Jun 10 16:00:16 2015 +0200
+++ b/server/php/basic/public_html/static/lib/renkan/js/renkan.min.js Wed Jun 10 16:00:45 2015 +0200
@@ -24,7 +24,7 @@
* knowledge of the CeCILL-C license and that you accept its terms.
*/
-/*! renkan - v0.9.1 - Copyright © IRI 2015 */
+/*! renkan - v0.10.0 - Copyright © IRI 2015 */
this.renkanJST=this.renkanJST||{},this.renkanJST["templates/colorpicker.html"]=function(obj){obj||(obj={});{var __t,__p="";_.escape}with(obj)__p+='';return __p},this.renkanJST["templates/edgeeditor.html"]=function(obj){obj||(obj={});{var __t,__p="",__e=_.escape;Array.prototype.join}with(obj)__p+='\n ×'+__e(renkan.translate("Edit Edge"))+"\n
\n\n \n \n
\n',options.show_edge_editor_uri&&(__p+="\n \n \n \n \n
\n ',options.properties.length&&(__p+="\n \n \n \n
\n")),__p+="\n",options.show_edge_editor_style&&(__p+='\n \n ',options.show_edge_editor_style_color&&(__p+='\n
\n
'+__e(renkan.translate("Edge color:"))+'\n
\n \n \n \n '+(null==(__t=renkan.colorPicker)?"":__t)+'\n '+__e(renkan.translate("Choose color"))+"\n
\n
\n "),__p+="\n ",options.show_edge_editor_style_dash&&(__p+='\n
\n '+__e(renkan.translate("Dash:"))+'\n \n
\n "),__p+="\n ",options.show_edge_editor_style_thickness&&(__p+='\n
\n
'+__e(renkan.translate("Thickness:"))+'\n
-\n
'+__e(edge.thickness)+'\n
+\n
\n '),__p+="\n ",options.show_edge_editor_style_arrow&&(__p+='\n
\n '+__e(renkan.translate("Arrow:"))+'\n \n
\n "),__p+="\n
\n"),__p+="\n",options.show_edge_editor_direction&&(__p+='\n \n '+__e(renkan.translate("Change edge direction"))+"\n
\n"),__p+="\n",options.show_edge_editor_nodes&&(__p+='\n \n '+__e(renkan.translate("From:"))+'\n \n '+__e(shortenText(edge.from_title,25))+'\n
\n \n '+__e(renkan.translate("To:"))+'\n \n '+__e(shortenText(edge.to_title,25))+"\n
\n"),__p+="\n",options.show_edge_editor_creator&&edge.has_creator&&(__p+='\n \n '+__e(renkan.translate("Created by:"))+'\n \n '+__e(shortenText(edge.created_by_title,25))+"\n
\n"),__p+="\n";return __p},this.renkanJST["templates/edgeeditor_readonly.html"]=function(obj){obj||(obj={});{var __p="",__e=_.escape;Array.prototype.join}with(obj)__p+='\n",options.show_edge_tooltip_uri&&edge.uri&&(__p+='\n \n '+__e(edge.short_uri)+"\n
\n"),__p+="\n"+__e(edge.description)+"
\n",options.show_edge_tooltip_nodes&&(__p+='\n \n '+__e(renkan.translate("From:"))+'\n \n '+__e(shortenText(edge.from_title,25))+'\n
\n \n '+__e(renkan.translate("To:"))+'\n \n '+__e(shortenText(edge.to_title,25))+"\n
\n"),__p+="\n",options.show_edge_tooltip_creator&&edge.has_creator&&(__p+='\n \n '+__e(renkan.translate("Created by:"))+'\n \n '+__e(shortenText(edge.created_by_title,25))+"\n
\n"),__p+="\n";return __p},this.renkanJST["templates/ldtjson-bin/annotationtemplate.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;with(obj)__p+='\n\n
\n '+(null==(__t=htitle)?"":__t)+"
\n "+(null==(__t=hdescription)?"":__t)+"
\n Start: "+(null==(__t=start)?"":__t)+", End: "+(null==(__t=end)?"":__t)+", Duration: "+(null==(__t=duration)?"":__t)+'
\n \n\n';return __p},this.renkanJST["templates/ldtjson-bin/segmenttemplate.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;with(obj)__p+='\n\n
\n '+(null==(__t=htitle)?"":__t)+"
\n "+(null==(__t=hdescription)?"":__t)+"
\n Start: "+(null==(__t=start)?"":__t)+", End: "+(null==(__t=end)?"":__t)+", Duration: "+(null==(__t=duration)?"":__t)+'
\n \n\n';return __p},this.renkanJST["templates/ldtjson-bin/tagtemplate.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;with(obj)__p+='\n\n
\n '+(null==(__t=htitle)?"":__t)+'
\n \n\n';return __p},this.renkanJST["templates/list-bin.html"]=function(obj){obj||(obj={});{var __t,__p="",__e=_.escape;Array.prototype.join}with(obj)__p+='",image&&(__p+='\n
\n'),__p+='\n\n ",description&&(__p+='\n '+(null==(__t=hdescription)?"":__t)+"
\n "),__p+="\n ",image&&(__p+='\n \n '),__p+="\n\n";return __p},this.renkanJST["templates/main.html"]=function(obj){obj||(obj={});{var __p="",__e=_.escape;Array.prototype.join}with(obj)options.show_bins&&(__p+='\n \n
\n
'+__e(translate("Select contents:"))+'
\n
\n
\n
\n
\n
\n'),__p+=" ",options.show_editor&&(__p+='\n \n'),__p+="\n";return __p},this.renkanJST["templates/nodeeditor.html"]=function(obj){obj||(obj={});{var __t,__p="",__e=_.escape;Array.prototype.join}with(obj)__p+='\n\n ×'+__e(renkan.translate("Edit Node"))+"\n
\n\n \n \n
\n',options.show_node_editor_uri&&(__p+="\n \n \n \n \n
\n'),__p+=" ",options.show_node_editor_description&&(__p+="\n \n \n \n
\n"),__p+=" ",options.show_node_editor_size&&(__p+='\n \n '+__e(renkan.translate("Size:"))+'\n -\n '+__e(node.size)+'\n +\n
\n'),__p+=" ",options.show_node_editor_style&&(__p+='\n \n ',options.show_node_editor_style_color&&(__p+='\n
\n
\n '+__e(renkan.translate("Node color:"))+'\n
\n \n \n \n '+(null==(__t=renkan.colorPicker)?"":__t)+'\n '+__e(renkan.translate("Choose color"))+"\n
\n
\n "),__p+="\n ",options.show_node_editor_style_dash&&(__p+='\n
\n '+__e(renkan.translate("Dash:"))+'\n \n
\n "),__p+="\n ",options.show_node_editor_style_thickness&&(__p+='\n
\n
'+__e(renkan.translate("Thickness:"))+'\n
-\n
'+__e(node.thickness)+'\n
+\n
\n '),__p+="\n
\n"),__p+=" ",options.show_node_editor_image&&(__p+='\n \n
\n
+')
\n ',node.clip_path&&(__p+='\n
\n '),__p+="\n
\n
\n \n \n
\n
\n",options.allow_image_upload&&(__p+="\n \n \n \n
\n')),__p+=" ",options.show_node_editor_creator&&node.has_creator&&(__p+='\n \n '+__e(renkan.translate("Created by:"))+'\n \n '+__e(shortenText(node.created_by_title,25))+"\n
\n"),__p+=" ",options.change_shapes&&(__p+="\n \n \n \n
\n"),__p+="\n";return __p},this.renkanJST["templates/nodeeditor_readonly.html"]=function(obj){obj||(obj={});{var __p="",__e=_.escape;Array.prototype.join}with(obj)__p+='\n",node.uri&&options.show_node_tooltip_uri&&(__p+='\n \n '+__e(node.short_uri)+"\n
\n"),__p+=" ",options.show_node_tooltip_description&&(__p+='\n '+__e(node.description)+"
\n"),__p+=" ",node.image&&options.show_node_tooltip_image&&(__p+='\n
\n'),__p+=" ",node.has_creator&&options.show_node_tooltip_creator&&(__p+='\n \n '+__e(renkan.translate("Created by:"))+'\n \n '+__e(shortenText(node.created_by_title,25))+"\n
\n"),__p+="\n";return __p},this.renkanJST["templates/scene.html"]=function(obj){function print(){__p+=__j.call(arguments,"")}obj||(obj={});var __p="",__e=_.escape,__j=Array.prototype.join;with(obj)options.show_top_bar&&(__p+='\n \n
\n ',__p+=options.editor_mode?'\n
\n ':'\n
\n '+__e(project.get("title")||translate("Untitled project"))+"\n
\n ",__p+="\n ",options.show_user_list&&(__p+='\n
\n
\n ',options.show_user_color&&(__p+='\n
\n \n ',options.user_color_editable&&(__p+='\n \n '),__p+="\n \n ",options.user_color_editable&&print(colorPicker),__p+="\n
\n "),__p+='\n
<unknown user>\n
\n
\n
\n '),__p+="\n ",options.home_button_url&&(__p+='\n
\n
\n \n \n "),__p+="\n ",options.show_fullscreen_button&&(__p+='\n
\n
\n "),__p+="\n ",options.editor_mode?(__p+="\n ",options.show_addnode_button&&(__p+='\n
\n
\n "),__p+="\n ",options.show_addedge_button&&(__p+='\n
\n
\n "),__p+="\n ",options.show_export_button&&(__p+='\n
\n
\n "),__p+="\n ",options.show_save_button&&(__p+='\n
\n
\n '),__p+="\n ",options.show_open_button&&(__p+='\n
\n
\n "),__p+="\n ",options.show_bookmarklet&&(__p+='\n
\n
\n \n \n
\n '),__p+="\n "):(__p+="\n ",options.show_export_button&&(__p+='\n
\n
\n
\n '),__p+="\n "),__p+="\n ",options.show_search_field&&(__p+='\n
\n
\n '),__p+="\n
\n"),__p+='\n\n
\n
\n
\n
\n ',options.show_bins&&(__p+='\n
«
\n '),__p+="\n ",options.show_zoom&&(__p+='\n
\n "),__p+="\n
\n
\n";return __p},this.renkanJST["templates/search.html"]=function(obj){obj||(obj={});{var __t,__p="";_.escape}with(obj)__p+=''+(null==(__t=title)?"":__t)+"";return __p},this.renkanJST["templates/wikipedia-bin/resulttemplate.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;with(obj)__p+='\n\n
\n \n '+(null==(__t=hdescription)?"":__t)+"
\n\n";return __p},function(a){"use strict";"object"!=typeof a.Rkns&&(a.Rkns={});var b=a.Rkns,c=b.$=a.jQuery,d=b._=a._;b.pickerColors=["#8f1919","#a80000","#d82626","#ff0000","#e87c7c","#ff6565","#f7d3d3","#fecccc","#8f5419","#a85400","#d87f26","#ff7f00","#e8b27c","#ffb265","#f7e5d3","#fee5cc","#8f8f19","#a8a800","#d8d826","#feff00","#e8e87c","#feff65","#f7f7d3","#fefecc","#198f19","#00a800","#26d826","#00ff00","#7ce87c","#65ff65","#d3f7d3","#ccfecc","#198f8f","#00a8a8","#26d8d8","#00feff","#7ce8e8","#65feff","#d3f7f7","#ccfefe","#19198f","#0000a8","#2626d8","#0000ff","#7c7ce8","#6565ff","#d3d3f7","#ccccfe","#8f198f","#a800a8","#d826d8","#ff00fe","#e87ce8","#ff65fe","#f7d3f7","#feccfe","#000000","#242424","#484848","#6d6d6d","#919191","#b6b6b6","#dadada","#ffffff"],b.__renkans=[];var e=b._BaseBin=function(a,c){if("undefined"!=typeof a){this.renkan=a,this.renkan.$.find(".Rk-Bin-Main").hide(),this.$=b.$("").addClass("Rk-Bin").appendTo(a.$.find(".Rk-Bin-List")),this.title_icon_$=b.$("").addClass("Rk-Bin-Title-Icon").appendTo(this.$);var d=this;b.$("").attr({href:"#",title:a.translate("Close bin")}).addClass("Rk-Bin-Close").html("×").appendTo(this.$).click(function(){return d.destroy(),a.$.find(".Rk-Bin-Main:visible").length||a.$.find(".Rk-Bin-Main:last").slideDown(),a.resizeBins(),!1}),b.$("").attr({href:"#",title:a.translate("Refresh bin")}).addClass("Rk-Bin-Refresh").appendTo(this.$).click(function(){return d.refresh(),!1}),this.count_$=b.$("").addClass("Rk-Bin-Count").appendTo(this.$),this.title_$=b.$("
").addClass("Rk-Bin-Title").appendTo(this.$),this.main_$=b.$("").addClass("Rk-Bin-Main").appendTo(this.$).html('
'+a.translate("Loading, please wait")+"
"),this.title_$.html(c.title||"(new bin)"),this.renkan.resizeBins(),c.auto_refresh&&window.setInterval(function(){d.refresh()},c.auto_refresh)}};e.prototype.destroy=function(){this.$.detach(),this.renkan.resizeBins()};var f=b.Renkan=function(a){var e=this;if(b.__renkans.push(this),this.options=d.defaults(a,b.defaults,{templates:renkanJST}),this.template=renkanJST["templates/main.html"],d.each(this.options.property_files,function(a){b.$.getJSON(a,function(a){e.options.properties=e.options.properties.concat(a)})}),this.read_only=this.options.read_only||!this.options.editor_mode,this.project=new b.Models.Project,this.dataloader=new b.DataLoader.Loader(this.project,this.options),this.setCurrentUser=function(a,b){this.project.addUser({_id:a,title:b}),this.current_user=a,this.renderer.redrawUsers()},"undefined"!=typeof this.options.user_id&&(this.current_user=this.options.user_id),this.$=b.$("#"+this.options.container),this.$.addClass("Rk-Main").html(this.template(this)),this.tabs=[],this.search_engines=[],this.current_user_list=new b.Models.UsersList,this.current_user_list.on("add remove",function(){this.renderer&&this.renderer.redrawUsers()}),this.colorPicker=function(){var a=renkanJST["templates/colorpicker.html"];return'
'+b.pickerColors.map(function(b){return a({c:b})}).join("")+"
"}(),this.options.show_editor&&(this.renderer=new b.Renderer.Scene(this)),this.options.search.length){var f=renkanJST["templates/search.html"],g=this.$.find(".Rk-Search-List"),h=this.$.find(".Rk-Web-Search-Input"),i=this.$.find(".Rk-Web-Search-Form");d.each(this.options.search,function(a){b[a.type]&&b[a.type].Search&&e.search_engines.push(new b[a.type].Search(e,a))}),g.html(d(this.search_engines).map(function(a,b){return f({key:b,title:a.getSearchTitle(),className:a.getBgClass()})}).join("")),g.find("li").click(function(){var a=b.$(this);e.setSearchEngine(a.attr("data-key")),i.submit()}),i.submit(function(){if(h.val()){var a=e.search_engine;a.search(h.val())}return!1}),this.$.find(".Rk-Search-Current").mouseenter(function(){g.slideDown()}),this.$.find(".Rk-Search-Select").mouseleave(function(){g.hide()}),this.setSearchEngine(0)}else this.$.find(".Rk-Web-Search-Form").detach();d.each(this.options.bins,function(a){b[a.type]&&b[a.type].Bin&&e.tabs.push(new b[a.type].Bin(e,a))});var j=!1;this.$.find(".Rk-Bins").on("click",".Rk-Bin-Title,.Rk-Bin-Title-Icon",function(){var a=b.$(this).siblings(".Rk-Bin-Main");a.is(":hidden")&&(e.$.find(".Rk-Bin-Main").slideUp(),a.slideDown())}),this.options.show_editor&&this.$.find(".Rk-Bins").on("mouseover",".Rk-Bin-Item",function(){var a=b.$(this);if(a&&c(a).attr("data-uri")){var f=e.project.get("nodes").where({uri:c(a).attr("data-uri")});d.each(f,function(a){e.renderer.highlightModel(a)})}}).mouseout(function(){e.renderer.unhighlightAll()}).on("mousemove",".Rk-Bin-Item",function(){try{this.dragDrop()}catch(a){}}).on("touchstart",".Rk-Bin-Item",function(){j=!1}).on("touchmove",".Rk-Bin-Item",function(a){a.preventDefault();var b=a.originalEvent.changedTouches[0],c=e.renderer.canvas_$.offset(),d=e.renderer.canvas_$.width(),f=e.renderer.canvas_$.height();if(b.pageX>=c.left&&b.pageX
=c.top&&b.pageY1?a:null);c.source!==k&&(k=c.source,d.each(e.tabs,function(a){a.render(c)}))}}),this.$.find(".Rk-Bins-Search-Form").submit(function(){return!1})};f.prototype.translate=function(a){return b.i18n[this.options.language]&&b.i18n[this.options.language][a]?b.i18n[this.options.language][a]:this.options.language.length>2&&b.i18n[this.options.language.substr(0,2)]&&b.i18n[this.options.language.substr(0,2)][a]?b.i18n[this.options.language.substr(0,2)][a]:a},f.prototype.onStatusChange=function(){this.renderer.onStatusChange()},f.prototype.setSearchEngine=function(a){this.search_engine=this.search_engines[a],this.$.find(".Rk-Search-Current").attr("class","Rk-Search-Current "+this.search_engine.getBgClass());for(var b=this.search_engine.getBgClass().split(" "),c="",d=0;d';return __p},this.renkanJST["templates/edgeeditor.html"]=function(obj){obj||(obj={});{var __t,__p="",__e=_.escape;Array.prototype.join}with(obj)__p+='\n ×'+__e(renkan.translate("Edit Edge"))+"\n
\n\n \n \n
\n',options.show_edge_editor_uri&&(__p+="\n \n \n \n \n
\n ',options.properties.length&&(__p+="\n \n \n \n
\n")),__p+="\n",options.show_edge_editor_style&&(__p+='\n \n ',options.show_edge_editor_style_color&&(__p+='\n
\n
'+__e(renkan.translate("Edge color:"))+'\n
\n \n \n \n '+(null==(__t=renkan.colorPicker)?"":__t)+'\n '+__e(renkan.translate("Choose color"))+"\n
\n
\n "),__p+="\n ",options.show_edge_editor_style_dash&&(__p+='\n
\n '+__e(renkan.translate("Dash:"))+'\n \n
\n "),__p+="\n ",options.show_edge_editor_style_thickness&&(__p+='\n
\n
'+__e(renkan.translate("Thickness:"))+'\n
-\n
'+__e(edge.thickness)+'\n
+\n
\n '),__p+="\n ",options.show_edge_editor_style_arrow&&(__p+='\n
\n '+__e(renkan.translate("Arrow:"))+'\n \n
\n "),__p+="\n
\n"),__p+="\n",options.show_edge_editor_direction&&(__p+='\n \n '+__e(renkan.translate("Change edge direction"))+"\n
\n"),__p+="\n",options.show_edge_editor_nodes&&(__p+='\n \n '+__e(renkan.translate("From:"))+'\n \n '+__e(shortenText(edge.from_title,25))+'\n
\n \n '+__e(renkan.translate("To:"))+'\n \n '+__e(shortenText(edge.to_title,25))+"\n
\n"),__p+="\n",options.show_edge_editor_creator&&edge.has_creator&&(__p+='\n \n '+__e(renkan.translate("Created by:"))+'\n \n '+__e(shortenText(edge.created_by_title,25))+"\n
\n"),__p+="\n";return __p},this.renkanJST["templates/edgeeditor_readonly.html"]=function(obj){obj||(obj={});{var __p="",__e=_.escape;Array.prototype.join}with(obj)__p+='\n",options.show_edge_tooltip_uri&&edge.uri&&(__p+='\n \n '+__e(edge.short_uri)+"\n
\n"),__p+="\n"+__e(edge.description)+"
\n",options.show_edge_tooltip_nodes&&(__p+='\n \n '+__e(renkan.translate("From:"))+'\n \n '+__e(shortenText(edge.from_title,25))+'\n
\n \n '+__e(renkan.translate("To:"))+'\n \n '+__e(shortenText(edge.to_title,25))+"\n
\n"),__p+="\n",options.show_edge_tooltip_creator&&edge.has_creator&&(__p+='\n \n '+__e(renkan.translate("Created by:"))+'\n \n '+__e(shortenText(edge.created_by_title,25))+"\n
\n"),__p+="\n";return __p},this.renkanJST["templates/ldtjson-bin/annotationtemplate.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;with(obj)__p+='\n\n
\n '+(null==(__t=htitle)?"":__t)+"
\n "+(null==(__t=hdescription)?"":__t)+"
\n Start: "+(null==(__t=start)?"":__t)+", End: "+(null==(__t=end)?"":__t)+", Duration: "+(null==(__t=duration)?"":__t)+'
\n \n\n';return __p},this.renkanJST["templates/ldtjson-bin/segmenttemplate.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;with(obj)__p+='\n\n
\n '+(null==(__t=htitle)?"":__t)+"
\n "+(null==(__t=hdescription)?"":__t)+"
\n Start: "+(null==(__t=start)?"":__t)+", End: "+(null==(__t=end)?"":__t)+", Duration: "+(null==(__t=duration)?"":__t)+'
\n \n\n';return __p},this.renkanJST["templates/ldtjson-bin/tagtemplate.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;with(obj)__p+='\n\n
\n '+(null==(__t=htitle)?"":__t)+'
\n \n\n';return __p},this.renkanJST["templates/list-bin.html"]=function(obj){obj||(obj={});{var __t,__p="",__e=_.escape;Array.prototype.join}with(obj)__p+='",image&&(__p+='\n
\n'),__p+='\n\n ",description&&(__p+='\n '+(null==(__t=hdescription)?"":__t)+"
\n "),__p+="\n ",image&&(__p+='\n \n '),__p+="\n\n";return __p},this.renkanJST["templates/main.html"]=function(obj){obj||(obj={});{var __p="",__e=_.escape;Array.prototype.join}with(obj)options.show_bins&&(__p+='\n \n
\n
'+__e(translate("Select contents:"))+'
\n
\n
\n
\n
\n
\n'),__p+=" ",options.show_editor&&(__p+='\n \n'),__p+="\n";return __p},this.renkanJST["templates/nodeeditor.html"]=function(obj){obj||(obj={});{var __t,__p="",__e=_.escape;Array.prototype.join}with(obj)__p+='\n\n ×'+__e(renkan.translate("Edit Node"))+"\n
\n\n \n \n
\n',options.show_node_editor_uri&&(__p+="\n \n \n \n \n
\n'),__p+=" ",options.show_node_editor_description&&(__p+="\n \n \n \n
\n"),__p+=" ",options.show_node_editor_size&&(__p+='\n \n '+__e(renkan.translate("Size:"))+'\n -\n '+__e(node.size)+'\n +\n
\n'),__p+=" ",options.show_node_editor_style&&(__p+='\n \n ',options.show_node_editor_style_color&&(__p+='\n
\n
\n '+__e(renkan.translate("Node color:"))+'\n
\n \n \n \n '+(null==(__t=renkan.colorPicker)?"":__t)+'\n '+__e(renkan.translate("Choose color"))+"\n
\n
\n "),__p+="\n ",options.show_node_editor_style_dash&&(__p+='\n
\n '+__e(renkan.translate("Dash:"))+'\n \n
\n "),__p+="\n ",options.show_node_editor_style_thickness&&(__p+='\n
\n
'+__e(renkan.translate("Thickness:"))+'\n
-\n
'+__e(node.thickness)+'\n
+\n
\n '),__p+="\n
\n"),__p+=" ",options.show_node_editor_image&&(__p+='\n \n
\n
+')
\n ',node.clip_path&&(__p+='\n
\n '),__p+="\n
\n
\n \n \n
\n \n",options.allow_image_upload&&(__p+="\n \n \n \n
\n')),__p+=" ",options.show_node_editor_creator&&node.has_creator&&(__p+='\n \n '+__e(renkan.translate("Created by:"))+'\n \n '+__e(shortenText(node.created_by_title,25))+"\n
\n"),__p+=" ",options.change_shapes&&(__p+="\n \n \n \n
\n"),__p+="\n";return __p},this.renkanJST["templates/nodeeditor_readonly.html"]=function(obj){obj||(obj={});{var __p="",__e=_.escape;Array.prototype.join}with(obj)__p+='\n",node.uri&&options.show_node_tooltip_uri&&(__p+='\n \n '+__e(node.short_uri)+"\n
\n"),__p+=" ",options.show_node_tooltip_description&&(__p+='\n '+__e(node.description)+"
\n"),__p+=" ",node.image&&options.show_node_tooltip_image&&(__p+='\n
\n'),__p+=" ",node.has_creator&&options.show_node_tooltip_creator&&(__p+='\n \n '+__e(renkan.translate("Created by:"))+'\n \n '+__e(shortenText(node.created_by_title,25))+"\n
\n"),__p+="\n";return __p},this.renkanJST["templates/scene.html"]=function(obj){function print(){__p+=__j.call(arguments,"")}obj||(obj={});var __p="",__e=_.escape,__j=Array.prototype.join;with(obj)options.show_top_bar&&(__p+='\n \n
\n ',__p+=options.editor_mode?'\n
\n ':'\n
\n '+__e(project.get("title")||translate("Untitled project"))+"\n
\n ",__p+="\n ",options.show_user_list&&(__p+='\n
\n
\n ',options.show_user_color&&(__p+='\n
\n \n ',options.user_color_editable&&(__p+='\n \n '),__p+="\n \n ",options.user_color_editable&&print(colorPicker),__p+="\n
\n "),__p+='\n
<unknown user>\n
\n
\n
\n '),__p+="\n ",options.home_button_url&&(__p+='\n
\n
\n \n \n "),__p+="\n ",options.show_fullscreen_button&&(__p+='\n
\n
\n "),__p+="\n ",options.editor_mode?(__p+="\n ",options.show_addnode_button&&(__p+='\n
\n
\n "),__p+="\n ",options.show_addedge_button&&(__p+='\n
\n
\n "),__p+="\n ",options.show_export_button&&(__p+='\n
\n
\n "),__p+="\n ",options.show_save_button&&(__p+='\n
\n
\n '),__p+="\n ",options.show_open_button&&(__p+='\n
\n
\n "),__p+="\n ",options.show_bookmarklet&&(__p+='\n
\n
\n \n \n
\n '),__p+="\n "):(__p+="\n ",options.show_export_button&&(__p+='\n
\n
\n
\n '),__p+="\n "),__p+="\n ",options.show_search_field&&(__p+='\n
\n
\n '),__p+="\n
\n"),__p+='\n\n
\n
\n
\n
\n ',options.show_bins&&(__p+='\n
«
\n '),__p+="\n ",options.show_zoom&&(__p+='\n
\n "),__p+="\n
\n
\n";return __p},this.renkanJST["templates/search.html"]=function(obj){obj||(obj={});{var __t,__p="";_.escape}with(obj)__p+=''+(null==(__t=title)?"":__t)+"";return __p},this.renkanJST["templates/wikipedia-bin/resulttemplate.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;with(obj)__p+='\n\n
\n \n '+(null==(__t=hdescription)?"":__t)+"
\n\n";return __p},function(a){"use strict";"object"!=typeof a.Rkns&&(a.Rkns={});var b=a.Rkns,c=b.$=a.jQuery,d=b._=a._;b.pickerColors=["#8f1919","#a80000","#d82626","#ff0000","#e87c7c","#ff6565","#f7d3d3","#fecccc","#8f5419","#a85400","#d87f26","#ff7f00","#e8b27c","#ffb265","#f7e5d3","#fee5cc","#8f8f19","#a8a800","#d8d826","#feff00","#e8e87c","#feff65","#f7f7d3","#fefecc","#198f19","#00a800","#26d826","#00ff00","#7ce87c","#65ff65","#d3f7d3","#ccfecc","#198f8f","#00a8a8","#26d8d8","#00feff","#7ce8e8","#65feff","#d3f7f7","#ccfefe","#19198f","#0000a8","#2626d8","#0000ff","#7c7ce8","#6565ff","#d3d3f7","#ccccfe","#8f198f","#a800a8","#d826d8","#ff00fe","#e87ce8","#ff65fe","#f7d3f7","#feccfe","#000000","#242424","#484848","#6d6d6d","#919191","#b6b6b6","#dadada","#ffffff"],b.__renkans=[];var e=b._BaseBin=function(a,c){if("undefined"!=typeof a){this.renkan=a,this.renkan.$.find(".Rk-Bin-Main").hide(),this.$=b.$("").addClass("Rk-Bin").appendTo(a.$.find(".Rk-Bin-List")),this.title_icon_$=b.$("").addClass("Rk-Bin-Title-Icon").appendTo(this.$);var d=this;b.$("").attr({href:"#",title:a.translate("Close bin")}).addClass("Rk-Bin-Close").html("×").appendTo(this.$).click(function(){return d.destroy(),a.$.find(".Rk-Bin-Main:visible").length||a.$.find(".Rk-Bin-Main:last").slideDown(),a.resizeBins(),!1}),b.$("").attr({href:"#",title:a.translate("Refresh bin")}).addClass("Rk-Bin-Refresh").appendTo(this.$).click(function(){return d.refresh(),!1}),this.count_$=b.$("").addClass("Rk-Bin-Count").appendTo(this.$),this.title_$=b.$("
").addClass("Rk-Bin-Title").appendTo(this.$),this.main_$=b.$("").addClass("Rk-Bin-Main").appendTo(this.$).html('
'+a.translate("Loading, please wait")+"
"),this.title_$.html(c.title||"(new bin)"),this.renkan.resizeBins(),c.auto_refresh&&window.setInterval(function(){d.refresh()},c.auto_refresh)}};e.prototype.destroy=function(){this.$.detach(),this.renkan.resizeBins()};var f=b.Renkan=function(a){var e=this;if(b.__renkans.push(this),this.options=d.defaults(a,b.defaults,{templates:renkanJST}),this.template=renkanJST["templates/main.html"],d.each(this.options.property_files,function(a){b.$.getJSON(a,function(a){e.options.properties=e.options.properties.concat(a)})}),this.read_only=this.options.read_only||!this.options.editor_mode,this.project=new b.Models.Project,this.dataloader=new b.DataLoader.Loader(this.project,this.options),this.setCurrentUser=function(a,b){this.project.addUser({_id:a,title:b}),this.current_user=a,this.renderer.redrawUsers()},"undefined"!=typeof this.options.user_id&&(this.current_user=this.options.user_id),this.$=b.$("#"+this.options.container),this.$.addClass("Rk-Main").html(this.template(this)),this.tabs=[],this.search_engines=[],this.current_user_list=new b.Models.UsersList,this.current_user_list.on("add remove",function(){this.renderer&&this.renderer.redrawUsers()}),this.colorPicker=function(){var a=renkanJST["templates/colorpicker.html"];return'
'+b.pickerColors.map(function(b){return a({c:b})}).join("")+"
"}(),this.options.show_editor&&(this.renderer=new b.Renderer.Scene(this)),this.options.search.length){var f=renkanJST["templates/search.html"],g=this.$.find(".Rk-Search-List"),h=this.$.find(".Rk-Web-Search-Input"),i=this.$.find(".Rk-Web-Search-Form");d.each(this.options.search,function(a){b[a.type]&&b[a.type].Search&&e.search_engines.push(new b[a.type].Search(e,a))}),g.html(d(this.search_engines).map(function(a,b){return f({key:b,title:a.getSearchTitle(),className:a.getBgClass()})}).join("")),g.find("li").click(function(){var a=b.$(this);e.setSearchEngine(a.attr("data-key")),i.submit()}),i.submit(function(){if(h.val()){var a=e.search_engine;a.search(h.val())}return!1}),this.$.find(".Rk-Search-Current").mouseenter(function(){g.slideDown()}),this.$.find(".Rk-Search-Select").mouseleave(function(){g.hide()}),this.setSearchEngine(0)}else this.$.find(".Rk-Web-Search-Form").detach();d.each(this.options.bins,function(a){b[a.type]&&b[a.type].Bin&&e.tabs.push(new b[a.type].Bin(e,a))});var j=!1;this.$.find(".Rk-Bins").on("click",".Rk-Bin-Title,.Rk-Bin-Title-Icon",function(){var a=b.$(this).siblings(".Rk-Bin-Main");a.is(":hidden")&&(e.$.find(".Rk-Bin-Main").slideUp(),a.slideDown())}),this.options.show_editor&&this.$.find(".Rk-Bins").on("mouseover",".Rk-Bin-Item",function(){var a=b.$(this);if(a&&c(a).attr("data-uri")){var f=e.project.get("nodes").where({uri:c(a).attr("data-uri")});d.each(f,function(a){e.renderer.highlightModel(a)})}}).mouseout(function(){e.renderer.unhighlightAll()}).on("mousemove",".Rk-Bin-Item",function(){try{this.dragDrop()}catch(a){}}).on("touchstart",".Rk-Bin-Item",function(){j=!1}).on("touchmove",".Rk-Bin-Item",function(a){a.preventDefault();var b=a.originalEvent.changedTouches[0],c=e.renderer.canvas_$.offset(),d=e.renderer.canvas_$.width(),f=e.renderer.canvas_$.height();if(b.pageX>=c.left&&b.pageX
=c.top&&b.pageY1?a:null);c.source!==k&&(k=c.source,d.each(e.tabs,function(a){a.render(c)}))}}),this.$.find(".Rk-Bins-Search-Form").submit(function(){return!1})};f.prototype.translate=function(a){return b.i18n[this.options.language]&&b.i18n[this.options.language][a]?b.i18n[this.options.language][a]:this.options.language.length>2&&b.i18n[this.options.language.substr(0,2)]&&b.i18n[this.options.language.substr(0,2)][a]?b.i18n[this.options.language.substr(0,2)][a]:a},f.prototype.onStatusChange=function(){this.renderer.onStatusChange()},f.prototype.setSearchEngine=function(a){this.search_engine=this.search_engines[a],this.$.find(".Rk-Search-Current").attr("class","Rk-Search-Current "+this.search_engine.getBgClass());for(var b=this.search_engine.getBgClass().split(" "),c="",d=0;d