# HG changeset patch # User ymh # Date 1461248270 -7200 # Node ID e7e699f3cf9714e528ea5d81e6be657b410d5be9 # Parent 13d355fd09bf93374d5aac3f4f20061afd8c547a update version nb diff -r 13d355fd09bf -r e7e699f3cf97 client/bower.json --- a/client/bower.json Thu Apr 21 15:18:19 2016 +0200 +++ b/client/bower.json Thu Apr 21 16:17:50 2016 +0200 @@ -1,6 +1,6 @@ { "name": "renkan", - "version": "0.12.18", + "version": "0.12.19", "authors": [ "IRI " ], diff -r 13d355fd09bf -r e7e699f3cf97 client/package.json --- a/client/package.json Thu Apr 21 15:18:19 2016 +0200 +++ b/client/package.json Thu Apr 21 16:17:50 2016 +0200 @@ -1,6 +1,6 @@ { "name": "renkan", - "version": "0.12.18", + "version": "0.12.19", "description": "Renkan client application", "repository": { "type": "hg", diff -r 13d355fd09bf -r e7e699f3cf97 server/java/build.gradle --- a/server/java/build.gradle Thu Apr 21 15:18:19 2016 +0200 +++ b/server/java/build.gradle Thu Apr 21 16:17:50 2016 +0200 @@ -2,7 +2,7 @@ apply plugin: 'maven' group = 'org.iri_research.renkan' - version = '0.12.18' + version = '0.12.19' gradle.projectsEvaluated { diff -r 13d355fd09bf -r e7e699f3cf97 server/java/pom.xml --- a/server/java/pom.xml Thu Apr 21 15:18:19 2016 +0200 +++ b/server/java/pom.xml Thu Apr 21 16:17:50 2016 +0200 @@ -5,7 +5,7 @@ org.iri_research.renkan renkan pom - 0.12.18 + 0.12.19 Renkan project diff -r 13d355fd09bf -r e7e699f3cf97 server/java/renkan-core/pom.xml --- a/server/java/renkan-core/pom.xml Thu Apr 21 15:18:19 2016 +0200 +++ b/server/java/renkan-core/pom.xml Thu Apr 21 16:17:50 2016 +0200 @@ -6,7 +6,7 @@ org.iri_research.renkan renkan - 0.12.18 + 0.12.19 renkan-core renkan-core diff -r 13d355fd09bf -r e7e699f3cf97 server/java/renkan-management/pom.xml --- a/server/java/renkan-management/pom.xml Thu Apr 21 15:18:19 2016 +0200 +++ b/server/java/renkan-management/pom.xml Thu Apr 21 16:17:50 2016 +0200 @@ -5,7 +5,7 @@ org.iri_research.renkan renkan - 0.12.18 + 0.12.19 renkan-management diff -r 13d355fd09bf -r e7e699f3cf97 server/java/renkan-web/pom.xml --- a/server/java/renkan-web/pom.xml Thu Apr 21 15:18:19 2016 +0200 +++ b/server/java/renkan-web/pom.xml Thu Apr 21 16:17:50 2016 +0200 @@ -5,7 +5,7 @@ org.iri_research.renkan renkan - 0.12.18 + 0.12.19 renkan-web war diff -r 13d355fd09bf -r e7e699f3cf97 server/php/basic/public_html/static/lib/renkan/css/renkan.css --- a/server/php/basic/public_html/static/lib/renkan/css/renkan.css Thu Apr 21 15:18:19 2016 +0200 +++ b/server/php/basic/public_html/static/lib/renkan/css/renkan.css Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ /*! * _____ _ diff -r 13d355fd09bf -r e7e699f3cf97 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 Thu Apr 21 15:18:19 2016 +0200 +++ b/server/php/basic/public_html/static/lib/renkan/css/space-editor.css Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ html { overflow: visible !important; diff -r 13d355fd09bf -r e7e699f3cf97 server/php/basic/public_html/static/lib/renkan/js/renkan.js --- a/server/php/basic/public_html/static/lib/renkan/js/renkan.js Thu Apr 21 15:18:19 2016 +0200 +++ b/server/php/basic/public_html/static/lib/renkan/js/renkan.js Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ this["renkanJST"] = this["renkanJST"] || {}; diff -r 13d355fd09bf -r e7e699f3cf97 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 Thu Apr 21 15:18:19 2016 +0200 +++ b/server/php/basic/public_html/static/lib/renkan/js/renkan.min.js Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ 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_readonly.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;Array.prototype.join;with(obj)__p+='

    \n ×\n ',options.show_edge_tooltip_color&&(__p+='\n \n '),__p+='\n \n ',edge.uri&&(__p+='\n \n '),__p+="\n "+__e(edge.title)+"\n ",edge.uri&&(__p+=" "),__p+="\n \n

    \n",options.show_edge_tooltip_uri&&edge.uri&&(__p+='\n

    \n '+__e(edge.short_uri)+"\n

    \n"),__p+="\n

    "+(null==(__t=edge.description)?"":__t)+"

    \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/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/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+='
  • \n'),__p+='\n

    \n ',url&&(__p+='\n \n '),__p+="\n "+(null==(__t=htitle)?"":__t)+"\n ",url&&(__p+=""),__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
      \n \n
      \n
      \n \n \n
      \n
        \n
        \n'),__p+=" ",options.show_editor&&(__p+='\n
        \n ×\n ',options.show_node_tooltip_color&&(__p+='\n \n '),__p+='\n \n ',node.uri&&(__p+='\n \n '),__p+="\n "+(null==(__t=node.title)?"":__t)+"\n ",node.uri&&(__p+=""),__p+="\n \n\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

        '+(null==(__t=node.description)?"":__t)+"

        \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 '+__e(renkan.translate("Link to the node"))+"\n";return __p},this.renkanJST["templates/nodeeditor_video.html"]=function(obj){obj||(obj={});var __p="",__e=_.escape;Array.prototype.join;with(obj)__p+='

        \n ×\n ',options.show_node_tooltip_color&&(__p+='\n \n '),__p+='\n \n ',node.uri&&(__p+='\n \n '),__p+="\n "+__e(node.title)+"\n ",node.uri&&(__p+=""),__p+="\n \n

        \n",node.uri&&options.show_node_tooltip_uri&&(__p+='\n \n'),__p+='\n '+__e(renkan.translate("Link to the node"))+"\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 ",__p+=options.show_node_editor_title_richtext?'\n

        '+(null==(__t=node.title)?"":__t)+"
        \n ":'\n \n ',__p+="\n

        \n",options.show_node_editor_uri&&(__p+="\n

        \n \n \n \n

        \n'),__p+=" ",options.change_types&&(__p+="\n

        \n \n \n

        \n"),__p+=" ",options.show_node_editor_description&&(__p+="\n

        \n \n ",__p+=options.show_node_editor_description_richtext?'\n

        '+(null==(__t=node.description)?"":__t)+"
        \n ":'\n \n ",__p+="\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 \n \n '),__p+="\n
        \n
        \n

        \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/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 '+__e(translate(options.home_button_title))+"\n
          \n
          \n
          \n "),__p+="\n ",options.show_fullscreen_button&&(__p+='\n
          \n
          \n
          \n
          \n '+__e(translate("Full Screen"))+"\n
          \n
          \n
          \n "),__p+="\n ",options.editor_mode?(__p+="\n ",options.show_addnode_button&&(__p+='\n
          \n
          \n
          \n
          \n '+__e(translate("Add Node"))+"\n
          \n
          \n
          \n "),__p+="\n ",options.show_addedge_button&&(__p+='\n
          \n
          \n
          \n
          \n '+__e(translate("Add Edge"))+"\n
          \n
          \n
          \n "),__p+="\n ",options.show_export_button&&(__p+='\n
          \n
          \n
          \n
          \n '+__e(translate("Download Project"))+"\n
          \n
          \n
          \n "),__p+="\n ",options.show_save_button&&(__p+='\n
          \n
          \n
          \n
          \n
          \n
          \n '),__p+="\n ",options.show_open_button&&(__p+='\n
          \n
          \n
          \n
          \n '+__e(translate("Open Project"))+"\n
          \n
          \n
          \n "),__p+="\n ",options.show_bookmarklet&&(__p+='\n
          \n \n
          \n
          \n '+__e(translate("Renkan 'Drag-to-Add' bookmarklet"))+'\n
          \n
          \n
          \n
          \n '),__p+="\n "):(__p+="\n ",options.show_export_button&&(__p+='\n
          \n
          \n
          \n
          \n '+__e(translate("Download Project"))+'\n
          \n
          \n
          \n
          \n '),__p+="\n "),__p+="\n ",options.show_search_field&&(__p+='\n
          \n \n
          \n
          \n '),__p+="\n
          \n"),__p+='\n
          \n
          \n
          \n ',options.editor_mode&&options.save_view&&(__p+='\n
          \n '),__p+="\n ",options.save_view&&(__p+='\n
          \n ',options.hide_nodes&&(__p+='\n \n '),__p+=" \n "),__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=htitle)?"":__t)+'\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;b.__renkans.push(this),this.options=d.defaults(a,b.defaults,{templates:d.defaults(a.templates,renkanJST)||renkanJST,node_editor_templates:d.defaults(a.node_editor_templates,b.defaults.node_editor_templates)}),this.template=renkanJST["templates/main.html"];var f={};if(d.each(this.options.node_editor_templates,function(a,b){f[b]=e.options.templates[a],delete e.options.templates[a]}),this.options.node_editor_templates=f,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.router=new b.Router,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 g=renkanJST["templates/search.html"],h=this.$.find(".Rk-Search-List"),i=this.$.find(".Rk-Web-Search-Input"),j=this.$.find(".Rk-Web-Search-Form");d.each(this.options.search,function(a,c){b[a.type]&&b[a.type].Search&&e.search_engines.push(new b[a.type].Search(e,a))}),h.html(d(this.search_engines).map(function(a,b){return g({key:b,title:a.getSearchTitle(),className:a.getBgClass()})}).join("")),h.find("li").click(function(){var a=b.$(this);e.setSearchEngine(a.attr("data-key")),j.submit()}),j.submit(function(){if(i.val()){var a=e.search_engine;a.search(i.val())}return!1}),this.$.find(".Rk-Search-Current").mouseenter(function(){h.slideDown()}),this.$.find(".Rk-Search-Select").mouseleave(function(){h.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 k=!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()); diff -r 13d355fd09bf -r e7e699f3cf97 server/python/django/renkanmanager/__init__.py --- a/server/python/django/renkanmanager/__init__.py Thu Apr 21 15:18:19 2016 +0200 +++ b/server/python/django/renkanmanager/__init__.py Thu Apr 21 16:17:50 2016 +0200 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -VERSION = (0, 12, 18, "final", 0) +VERSION = (0, 12, 19, "final", 0) def get_version(): diff -r 13d355fd09bf -r e7e699f3cf97 server/python/django/renkanmanager/static/renkanmanager/lib/renkan/css/renkan.css --- a/server/python/django/renkanmanager/static/renkanmanager/lib/renkan/css/renkan.css Thu Apr 21 15:18:19 2016 +0200 +++ b/server/python/django/renkanmanager/static/renkanmanager/lib/renkan/css/renkan.css Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ /*! * _____ _ diff -r 13d355fd09bf -r e7e699f3cf97 server/python/django/renkanmanager/static/renkanmanager/lib/renkan/css/space-editor.css --- a/server/python/django/renkanmanager/static/renkanmanager/lib/renkan/css/space-editor.css Thu Apr 21 15:18:19 2016 +0200 +++ b/server/python/django/renkanmanager/static/renkanmanager/lib/renkan/css/space-editor.css Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ html { overflow: visible !important; diff -r 13d355fd09bf -r e7e699f3cf97 server/python/django/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.js --- a/server/python/django/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.js Thu Apr 21 15:18:19 2016 +0200 +++ b/server/python/django/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.js Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ this["renkanJST"] = this["renkanJST"] || {}; diff -r 13d355fd09bf -r e7e699f3cf97 server/python/django/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.min.js --- a/server/python/django/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.min.js Thu Apr 21 15:18:19 2016 +0200 +++ b/server/python/django/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.min.js Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ 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_readonly.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;Array.prototype.join;with(obj)__p+='

          \n ×\n ',options.show_edge_tooltip_color&&(__p+='\n \n '),__p+='\n \n ',edge.uri&&(__p+='\n \n '),__p+="\n "+__e(edge.title)+"\n ",edge.uri&&(__p+=" "),__p+="\n \n

          \n",options.show_edge_tooltip_uri&&edge.uri&&(__p+='\n

          \n '+__e(edge.short_uri)+"\n

          \n"),__p+="\n

          "+(null==(__t=edge.description)?"":__t)+"

          \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/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/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+='
        • \n'),__p+='\n

          \n ',url&&(__p+='\n \n '),__p+="\n "+(null==(__t=htitle)?"":__t)+"\n ",url&&(__p+=""),__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
            \n \n
            \n
            \n \n \n
            \n
              \n
              \n'),__p+=" ",options.show_editor&&(__p+='\n
              \n ×\n ',options.show_node_tooltip_color&&(__p+='\n \n '),__p+='\n \n ',node.uri&&(__p+='\n \n '),__p+="\n "+(null==(__t=node.title)?"":__t)+"\n ",node.uri&&(__p+=""),__p+="\n \n

              \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

              '+(null==(__t=node.description)?"":__t)+"

              \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 '+__e(renkan.translate("Link to the node"))+"\n";return __p},this.renkanJST["templates/nodeeditor_video.html"]=function(obj){obj||(obj={});var __p="",__e=_.escape;Array.prototype.join;with(obj)__p+='

              \n ×\n ',options.show_node_tooltip_color&&(__p+='\n \n '),__p+='\n \n ',node.uri&&(__p+='\n \n '),__p+="\n "+__e(node.title)+"\n ",node.uri&&(__p+=""),__p+="\n \n

              \n",node.uri&&options.show_node_tooltip_uri&&(__p+='\n \n'),__p+='\n '+__e(renkan.translate("Link to the node"))+"\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 ",__p+=options.show_node_editor_title_richtext?'\n

              '+(null==(__t=node.title)?"":__t)+"
              \n ":'\n \n ',__p+="\n

              \n",options.show_node_editor_uri&&(__p+="\n

              \n \n \n \n

              \n'),__p+=" ",options.change_types&&(__p+="\n

              \n \n \n

              \n"),__p+=" ",options.show_node_editor_description&&(__p+="\n

              \n \n ",__p+=options.show_node_editor_description_richtext?'\n

              '+(null==(__t=node.description)?"":__t)+"
              \n ":'\n \n ",__p+="\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 \n \n '),__p+="\n
              \n
              \n

              \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/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 '+__e(translate(options.home_button_title))+"\n
                \n
                \n
                \n "),__p+="\n ",options.show_fullscreen_button&&(__p+='\n
                \n
                \n
                \n
                \n '+__e(translate("Full Screen"))+"\n
                \n
                \n
                \n "),__p+="\n ",options.editor_mode?(__p+="\n ",options.show_addnode_button&&(__p+='\n
                \n
                \n
                \n
                \n '+__e(translate("Add Node"))+"\n
                \n
                \n
                \n "),__p+="\n ",options.show_addedge_button&&(__p+='\n
                \n
                \n
                \n
                \n '+__e(translate("Add Edge"))+"\n
                \n
                \n
                \n "),__p+="\n ",options.show_export_button&&(__p+='\n
                \n
                \n
                \n
                \n '+__e(translate("Download Project"))+"\n
                \n
                \n
                \n "),__p+="\n ",options.show_save_button&&(__p+='\n
                \n
                \n
                \n
                \n
                \n
                \n '),__p+="\n ",options.show_open_button&&(__p+='\n
                \n
                \n
                \n
                \n '+__e(translate("Open Project"))+"\n
                \n
                \n
                \n "),__p+="\n ",options.show_bookmarklet&&(__p+='\n
                \n \n
                \n
                \n '+__e(translate("Renkan 'Drag-to-Add' bookmarklet"))+'\n
                \n
                \n
                \n
                \n '),__p+="\n "):(__p+="\n ",options.show_export_button&&(__p+='\n
                \n
                \n
                \n
                \n '+__e(translate("Download Project"))+'\n
                \n
                \n
                \n
                \n '),__p+="\n "),__p+="\n ",options.show_search_field&&(__p+='\n
                \n \n
                \n
                \n '),__p+="\n
                \n"),__p+='\n
                \n
                \n
                \n ',options.editor_mode&&options.save_view&&(__p+='\n
                \n '),__p+="\n ",options.save_view&&(__p+='\n
                \n ',options.hide_nodes&&(__p+='\n \n '),__p+=" \n "),__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=htitle)?"":__t)+'\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;b.__renkans.push(this),this.options=d.defaults(a,b.defaults,{templates:d.defaults(a.templates,renkanJST)||renkanJST,node_editor_templates:d.defaults(a.node_editor_templates,b.defaults.node_editor_templates)}),this.template=renkanJST["templates/main.html"];var f={};if(d.each(this.options.node_editor_templates,function(a,b){f[b]=e.options.templates[a],delete e.options.templates[a]}),this.options.node_editor_templates=f,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.router=new b.Router,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 g=renkanJST["templates/search.html"],h=this.$.find(".Rk-Search-List"),i=this.$.find(".Rk-Web-Search-Input"),j=this.$.find(".Rk-Web-Search-Form");d.each(this.options.search,function(a,c){b[a.type]&&b[a.type].Search&&e.search_engines.push(new b[a.type].Search(e,a))}),h.html(d(this.search_engines).map(function(a,b){return g({key:b,title:a.getSearchTitle(),className:a.getBgClass()})}).join("")),h.find("li").click(function(){var a=b.$(this);e.setSearchEngine(a.attr("data-key")),j.submit()}),j.submit(function(){if(i.val()){var a=e.search_engine;a.search(i.val())}return!1}),this.$.find(".Rk-Search-Current").mouseenter(function(){h.slideDown()}),this.$.find(".Rk-Search-Select").mouseleave(function(){h.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 k=!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()); diff -r 13d355fd09bf -r e7e699f3cf97 server/python/django2/renkanmanager/__init__.py --- a/server/python/django2/renkanmanager/__init__.py Thu Apr 21 15:18:19 2016 +0200 +++ b/server/python/django2/renkanmanager/__init__.py Thu Apr 21 16:17:50 2016 +0200 @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -VERSION = (0, 12, 18, "final", 0) +VERSION = (0, 12, 19, "final", 0) def get_version(): diff -r 13d355fd09bf -r e7e699f3cf97 server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/css/renkan.css --- a/server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/css/renkan.css Thu Apr 21 15:18:19 2016 +0200 +++ b/server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/css/renkan.css Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ /*! * _____ _ diff -r 13d355fd09bf -r e7e699f3cf97 server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/css/space-editor.css --- a/server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/css/space-editor.css Thu Apr 21 15:18:19 2016 +0200 +++ b/server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/css/space-editor.css Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ html { overflow: visible !important; diff -r 13d355fd09bf -r e7e699f3cf97 server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.js --- a/server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.js Thu Apr 21 15:18:19 2016 +0200 +++ b/server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.js Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ this["renkanJST"] = this["renkanJST"] || {}; diff -r 13d355fd09bf -r e7e699f3cf97 server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.min.js --- a/server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.min.js Thu Apr 21 15:18:19 2016 +0200 +++ b/server/python/django2/renkanmanager/static/renkanmanager/lib/renkan/js/renkan.min.js Thu Apr 21 16:17:50 2016 +0200 @@ -24,7 +24,7 @@ * knowledge of the CeCILL-C license and that you accept its terms. */ -/*! renkan - v0.12.18 - Copyright © IRI 2016 */ +/*! renkan - v0.12.19 - Copyright © IRI 2016 */ 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_readonly.html"]=function(obj){obj||(obj={});var __t,__p="",__e=_.escape;Array.prototype.join;with(obj)__p+='

                \n ×\n ',options.show_edge_tooltip_color&&(__p+='\n \n '),__p+='\n \n ',edge.uri&&(__p+='\n \n '),__p+="\n "+__e(edge.title)+"\n ",edge.uri&&(__p+=" "),__p+="\n \n

                \n",options.show_edge_tooltip_uri&&edge.uri&&(__p+='\n

                \n '+__e(edge.short_uri)+"\n

                \n"),__p+="\n

                "+(null==(__t=edge.description)?"":__t)+"

                \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/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/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+='
              • \n'),__p+='\n

                \n ',url&&(__p+='\n \n '),__p+="\n "+(null==(__t=htitle)?"":__t)+"\n ",url&&(__p+=""),__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
                  \n \n
                  \n
                  \n \n \n
                  \n
                    \n
                    \n'),__p+=" ",options.show_editor&&(__p+='\n
                    \n ×\n ',options.show_node_tooltip_color&&(__p+='\n \n '),__p+='\n \n ',node.uri&&(__p+='\n \n '),__p+="\n "+(null==(__t=node.title)?"":__t)+"\n ",node.uri&&(__p+=""),__p+="\n \n

                    \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

                    '+(null==(__t=node.description)?"":__t)+"

                    \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 '+__e(renkan.translate("Link to the node"))+"\n";return __p},this.renkanJST["templates/nodeeditor_video.html"]=function(obj){obj||(obj={});var __p="",__e=_.escape;Array.prototype.join;with(obj)__p+='

                    \n ×\n ',options.show_node_tooltip_color&&(__p+='\n \n '),__p+='\n \n ',node.uri&&(__p+='\n \n '),__p+="\n "+__e(node.title)+"\n ",node.uri&&(__p+=""),__p+="\n \n

                    \n",node.uri&&options.show_node_tooltip_uri&&(__p+='\n \n'),__p+='\n '+__e(renkan.translate("Link to the node"))+"\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 ",__p+=options.show_node_editor_title_richtext?'\n

                    '+(null==(__t=node.title)?"":__t)+"
                    \n ":'\n \n ',__p+="\n

                    \n",options.show_node_editor_uri&&(__p+="\n

                    \n \n \n \n

                    \n'),__p+=" ",options.change_types&&(__p+="\n

                    \n \n \n

                    \n"),__p+=" ",options.show_node_editor_description&&(__p+="\n

                    \n \n ",__p+=options.show_node_editor_description_richtext?'\n

                    '+(null==(__t=node.description)?"":__t)+"
                    \n ":'\n \n ",__p+="\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 \n \n '),__p+="\n
                    \n
                    \n

                    \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/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 '+__e(translate(options.home_button_title))+"\n
                      \n
                      \n
                      \n "),__p+="\n ",options.show_fullscreen_button&&(__p+='\n
                      \n
                      \n
                      \n
                      \n '+__e(translate("Full Screen"))+"\n
                      \n
                      \n
                      \n "),__p+="\n ",options.editor_mode?(__p+="\n ",options.show_addnode_button&&(__p+='\n
                      \n
                      \n
                      \n
                      \n '+__e(translate("Add Node"))+"\n
                      \n
                      \n
                      \n "),__p+="\n ",options.show_addedge_button&&(__p+='\n
                      \n
                      \n
                      \n
                      \n '+__e(translate("Add Edge"))+"\n
                      \n
                      \n
                      \n "),__p+="\n ",options.show_export_button&&(__p+='\n
                      \n
                      \n
                      \n
                      \n '+__e(translate("Download Project"))+"\n
                      \n
                      \n
                      \n "),__p+="\n ",options.show_save_button&&(__p+='\n
                      \n
                      \n
                      \n
                      \n
                      \n
                      \n '),__p+="\n ",options.show_open_button&&(__p+='\n
                      \n
                      \n
                      \n
                      \n '+__e(translate("Open Project"))+"\n
                      \n
                      \n
                      \n "),__p+="\n ",options.show_bookmarklet&&(__p+='\n
                      \n \n
                      \n
                      \n '+__e(translate("Renkan 'Drag-to-Add' bookmarklet"))+'\n
                      \n
                      \n
                      \n
                      \n '),__p+="\n "):(__p+="\n ",options.show_export_button&&(__p+='\n
                      \n
                      \n
                      \n
                      \n '+__e(translate("Download Project"))+'\n
                      \n
                      \n
                      \n
                      \n '),__p+="\n "),__p+="\n ",options.show_search_field&&(__p+='\n
                      \n \n
                      \n
                      \n '),__p+="\n
                      \n"),__p+='\n
                      \n
                      \n
                      \n ',options.editor_mode&&options.save_view&&(__p+='\n
                      \n '),__p+="\n ",options.save_view&&(__p+='\n
                      \n ',options.hide_nodes&&(__p+='\n \n '),__p+=" \n "),__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=htitle)?"":__t)+'\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;b.__renkans.push(this),this.options=d.defaults(a,b.defaults,{templates:d.defaults(a.templates,renkanJST)||renkanJST,node_editor_templates:d.defaults(a.node_editor_templates,b.defaults.node_editor_templates)}),this.template=renkanJST["templates/main.html"];var f={};if(d.each(this.options.node_editor_templates,function(a,b){f[b]=e.options.templates[a],delete e.options.templates[a]}),this.options.node_editor_templates=f,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.router=new b.Router,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 g=renkanJST["templates/search.html"],h=this.$.find(".Rk-Search-List"),i=this.$.find(".Rk-Web-Search-Input"),j=this.$.find(".Rk-Web-Search-Form");d.each(this.options.search,function(a,c){b[a.type]&&b[a.type].Search&&e.search_engines.push(new b[a.type].Search(e,a))}),h.html(d(this.search_engines).map(function(a,b){return g({key:b,title:a.getSearchTitle(),className:a.getBgClass()})}).join("")),h.find("li").click(function(){var a=b.$(this);e.setSearchEngine(a.attr("data-key")),j.submit()}),j.submit(function(){if(i.val()){var a=e.search_engine;a.search(i.val())}return!1}),this.$.find(".Rk-Search-Current").mouseenter(function(){h.slideDown()}),this.$.find(".Rk-Search-Select").mouseleave(function(){h.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 k=!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());