# HG changeset patch # User ymh # Date 1429929426 -7200 # Node ID 0d5998b32a7ce26675bf079c84d1e79568156b9e # Parent e457ec945e507991ad1ec5c367ca40650aeb037d clean, and finalize lodash migration diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/basebutton.js --- a/client/js/renderer/basebutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/basebutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -33,7 +33,6 @@ this.sector.destroy(); } }).value(); -// }); return _BaseButton; diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/baseeditor.js --- a/client/js/renderer/baseeditor.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/baseeditor.js Sat Apr 25 04:37:06 2015 +0200 @@ -31,7 +31,6 @@ this.editor_$.remove(); } }).value(); -// }); /* _BaseEditor End */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/baserepresentation.js --- a/client/js/renderer/baserepresentation.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/baserepresentation.js Sat Apr 25 04:37:06 2015 +0200 @@ -77,7 +77,6 @@ } } }).value(); -// }); /* End of Rkns.Renderer._BaseRepresentation Class */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/edge.js --- a/client/js/renderer/edge.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/edge.js Sat Apr 25 04:37:06 2015 +0200 @@ -228,7 +228,6 @@ }); } }).value(); -// }); return Edge; diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/edgeeditbutton.js --- a/client/js/renderer/edgeeditbutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/edgeeditbutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -20,7 +20,6 @@ } } }).value(); -// }); /* EdgeEditButton End */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/edgeeditor.js --- a/client/js/renderer/edgeeditor.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/edgeeditor.js Sat Apr 25 04:37:06 2015 +0200 @@ -10,11 +10,11 @@ var EdgeEditor = Utils.inherit(BaseEditor); _(EdgeEditor.prototype).extend({ - _init: function() { - BaseEditor.prototype._init.apply(this); - this.template = this.options.templates['templates/edgeeditor.html']; - this.readOnlyTemplate = this.options.templates['templates/edgeeditor_readonly.html']; - }, + _init: function() { + BaseEditor.prototype._init.apply(this); + this.template = this.options.templates['templates/edgeeditor.html']; + this.readOnlyTemplate = this.options.templates['templates/edgeeditor_readonly.html']; + }, draw: function() { var _model = this.source_representation.model, _from_model = _model.get("from"), @@ -57,21 +57,21 @@ if (this.renderer.isEditable()) { var onFieldChange = _.throttle(function() { - _.defer(function() { - if (_this.renderer.isEditable()) { - var _data = { + _.defer(function() { + if (_this.renderer.isEditable()) { + var _data = { title: _this.editor_$.find(".Rk-Edit-Title").val() - }; - if (_this.options.show_edge_editor_uri) { - _data.uri = _this.editor_$.find(".Rk-Edit-URI").val(); + }; + if (_this.options.show_edge_editor_uri) { + _data.uri = _this.editor_$.find(".Rk-Edit-URI").val(); + } + _this.editor_$.find(".Rk-Edit-Goto").attr("href",_data.uri || "#"); + _model.set(_data); + paper.view.draw(); + } else { + closeEditor(); } - _this.editor_$.find(".Rk-Edit-Goto").attr("href",_data.uri || "#"); - _model.set(_data); - paper.view.draw(); - } else { - closeEditor(); - } - }); + }); },500); this.editor_$.on("keyup", function(_e) { @@ -144,7 +144,6 @@ paper.view.draw(); } }).value(); -// }); /* EdgeEditor End */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/edgeremovebutton.js --- a/client/js/renderer/edgeremovebutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/edgeremovebutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -34,7 +34,6 @@ } } }).value(); -// }); /* EdgeRemoveButton End */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/edgerevertbutton.js --- a/client/js/renderer/edgerevertbutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/edgerevertbutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -22,7 +22,7 @@ } } }).value(); -// }); + /* EdgeRevertButton End */ return EdgeRevertButton; diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/miniframe.js --- a/client/js/renderer/miniframe.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/miniframe.js Sat Apr 25 04:37:06 2015 +0200 @@ -19,7 +19,7 @@ this.renderer.is_dragging = false; } }).value(); -// }); + /* MiniFrame End */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/nodebutton.js --- a/client/js/renderer/nodebutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/nodebutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -42,7 +42,7 @@ this.sector.select(); }, }).value(); -// }); + /* _NodeButton End */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/nodeeditbutton.js --- a/client/js/renderer/nodeeditbutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/nodeeditbutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -24,7 +24,6 @@ } } }).value(); -// }); /* NodeEditButton End */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/nodeeditor.js --- a/client/js/renderer/nodeeditor.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/nodeeditor.js Sat Apr 25 04:37:06 2015 +0200 @@ -202,7 +202,7 @@ paper.view.draw(); } }).value(); -// }); + /* NodeEditor End */ return NodeEditor; diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/nodeenlargebutton.js --- a/client/js/renderer/nodeenlargebutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/nodeenlargebutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -27,7 +27,7 @@ paper.view.draw(); } }).value(); -// }); + /* NodeEnlargeButton End */ return NodeEnlargeButton; diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/nodelinkbutton.js --- a/client/js/renderer/nodelinkbutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/nodelinkbutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -31,7 +31,6 @@ } } }).value(); -// }); /* NodeLinkButton End */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/noderemovebutton.js --- a/client/js/renderer/noderemovebutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/noderemovebutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -38,7 +38,7 @@ } } }).value(); -// }); + /* NodeRemoveButton End */ return NodeRemoveButton; diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/noderepr.js --- a/client/js/renderer/noderepr.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/noderepr.js Sat Apr 25 04:37:06 2015 +0200 @@ -439,7 +439,6 @@ } } }).value(); -// }); return NodeRepr; diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/noderevertbutton.js --- a/client/js/renderer/noderevertbutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/noderevertbutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -26,7 +26,7 @@ } } }).value(); -// }); + /* NodeRevertButton End */ return NodeRevertButton; diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/nodeshrinkbutton.js --- a/client/js/renderer/nodeshrinkbutton.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/nodeshrinkbutton.js Sat Apr 25 04:37:06 2015 +0200 @@ -26,7 +26,6 @@ paper.view.draw(); } }).value(); -// }); /* NodeShrinkButton End */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/scene.js --- a/client/js/renderer/scene.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/scene.js Sat Apr 25 04:37:06 2015 +0200 @@ -29,7 +29,7 @@ this.buttons_layer = new paper.Layer(); this.delete_list = []; this.redrawActive = true; - + if (_renkan.options.show_minimap) { this.minimap = { background_layer: new paper.Layer(), @@ -1279,7 +1279,6 @@ save: function() { }, open: function() { } }).value(); -// }); /* Scene End */ diff -r e457ec945e50 -r 0d5998b32a7c client/js/renderer/tempedge.js --- a/client/js/renderer/tempedge.js Sat Apr 25 04:13:53 2015 +0200 +++ b/client/js/renderer/tempedge.js Sat Apr 25 04:37:06 2015 +0200 @@ -92,7 +92,6 @@ this.line.remove(); } }).value(); -// }); /* TempEdge Class End */ diff -r e457ec945e50 -r 0d5998b32a7c client/templates/edgeeditor.html --- a/client/templates/edgeeditor.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/edgeeditor.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,67 +1,67 @@

- ×<%-renkan.translate("Edit Edge")%> + ×<%-renkan.translate("Edit Edge")%>

- - + +

<% if (options.show_edge_editor_uri) { %> -

- - - -

- <% if (options.properties.length) { %> -

- - -

+

+ + + +

+ <% if (options.properties.length) { %> +

+ + +

<% } } %> <% if (options.show_edge_editor_color) { %> -
- <%-renkan.translate("Edge color:")%> -
- - - - <%= renkan.colorPicker %> - <%- renkan.translate("Choose color") %> -
-
+
+ <%-renkan.translate("Edge color:")%> +
+ + + + <%= renkan.colorPicker %> + <%- renkan.translate("Choose color") %> +
+
<% } %> <% if (options.show_edge_editor_direction) { %> -

- <%- renkan.translate("Change edge direction") %> -

+

+ <%- renkan.translate("Change edge direction") %> +

<% } %> <% if (options.show_edge_editor_nodes) { %> -

- <%-renkan.translate("From:")%> - - <%- shortenText(edge.from_title, 25) %> -

-

- <%-renkan.translate("To:")%> - - <%- shortenText(edge.to_title, 25) %> -

+

+ <%-renkan.translate("From:")%> + + <%- shortenText(edge.from_title, 25) %> +

+

+ <%-renkan.translate("To:")%> + + <%- shortenText(edge.to_title, 25) %> +

<% } %> <% if (options.show_edge_editor_creator && edge.has_creator) { %> -

- <%-renkan.translate("Created by:")%> - - <%- shortenText(edge.created_by_title, 25) %> -

+

+ <%-renkan.translate("Created by:")%> + + <%- shortenText(edge.created_by_title, 25) %> +

<% } %> diff -r e457ec945e50 -r 0d5998b32a7c client/templates/edgeeditor_readonly.html --- a/client/templates/edgeeditor_readonly.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/edgeeditor_readonly.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,38 +1,38 @@

- × - <% if (options.show_edge_tooltip_color) { %> - - <% } %> - - <% if (edge.uri) { %> - - <% } %> - <%-edge.title%> - <% if (edge.uri) { %> <% } %> - + × + <% if (options.show_edge_tooltip_color) { %> + + <% } %> + + <% if (edge.uri) { %> + + <% } %> + <%-edge.title%> + <% if (edge.uri) { %> <% } %> +

<% if (options.show_edge_tooltip_uri && edge.uri) { %> -

- <%- edge.short_uri %> -

+

+ <%- edge.short_uri %> +

<% } %>

<%-edge.description%>

<% if (options.show_edge_tooltip_nodes) { %> -

- <%-renkan.translate("From:")%> - - <%- shortenText(edge.from_title, 25) %> -

-

- <%-renkan.translate("To:")%> - - <%- shortenText(edge.to_title, 25) %> -

+

+ <%-renkan.translate("From:")%> + + <%- shortenText(edge.from_title, 25) %> +

+

+ <%-renkan.translate("To:")%> + + <%- shortenText(edge.to_title, 25) %> +

<% } %> <% if (options.show_edge_tooltip_creator && edge.has_creator) { %> -

- <%-renkan.translate("Created by:")%> - - <%- shortenText(edge.created_by_title, 25) %> -

+

+ <%-renkan.translate("Created by:")%> + + <%- shortenText(edge.created_by_title, 25) %> +

<% } %> diff -r e457ec945e50 -r 0d5998b32a7c client/templates/ldtjson-bin/annotationtemplate.html --- a/client/templates/ldtjson-bin/annotationtemplate.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/ldtjson-bin/annotationtemplate.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,11 +1,11 @@
  • - - -

    <%=htitle%>

    -

    <%=hdescription%>

    -

    Start: <%=start%>, End: <%=end%>, Duration: <%=duration%>

    -
    -
    • \ No newline at end of file + data-image="<%- Rkns.Utils.getFullURL(image) %>" + data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/#id=<%=annotationid%>" + data-title="<%-title%>" data-description="<%-description%>"> + + +

    <%=htitle%>

    +

    <%=hdescription%>

    +

    Start: <%=start%>, End: <%=end%>, Duration: <%=duration%>

    +
    + diff -r e457ec945e50 -r 0d5998b32a7c client/templates/ldtjson-bin/segmenttemplate.html --- a/client/templates/ldtjson-bin/segmenttemplate.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/ldtjson-bin/segmenttemplate.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,11 +1,11 @@
  • - - -

    <%=htitle%>

    -

    <%=hdescription%>

    -

    Start: <%=start%>, End: <%=end%>, Duration: <%=duration%>

    -
    -
    • \ No newline at end of file + data-image="<%- Rkns.Utils.getFullURL(image) %>" + data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/#id=<%=annotationid%>" + data-title="<%-title%>" data-description="<%-description%>"> + + +

    <%=htitle%>

    +

    <%=hdescription%>

    +

    Start: <%=start%>, End: <%=end%>, Duration: <%=duration%>

    +
    + diff -r e457ec945e50 -r 0d5998b32a7c client/templates/ldtjson-bin/tagtemplate.html --- a/client/templates/ldtjson-bin/tagtemplate.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/ldtjson-bin/tagtemplate.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,9 +1,9 @@
  • + data-image="<%- Rkns.Utils.getFullURL(static_url+'img/ldt-tag.png') %>" + data-uri="<%=ldt_platform%>ldtplatform/ldt/front/search/?search=<%=encodedtitle%>&field=all" + data-title="<%-title%>" data-description="Tag '<%-title%>'"> - -

    <%=htitle%>

    -
    -
    • \ No newline at end of file + +

    <%=htitle%>

    +
    + diff -r e457ec945e50 -r 0d5998b32a7c client/templates/list-bin.html --- a/client/templates/list-bin.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/list-bin.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,25 +1,25 @@
  • - data-image="<%- Rkns.Utils.getFullURL(image) %>" - <% } else { %> - data-image="" - <% } %> + data-uri="<%-url%>" data-title="<%-title%>" + data-description="<%-description%>" + <% if (image) { %> + data-image="<%- Rkns.Utils.getFullURL(image) %>" + <% } else { %> + data-image="" + <% } %> ><% if (image) { %> - + <% } %>

    - <% if (url) { %> - - <% } %> - <%=htitle%> - <% if (url) { %><% } %> -

    - <% if (description) { %> -

    <%=hdescription%>

    - <% } %> - <% if (image) { %> -
    - <% } %> -
    • \ No newline at end of file + <% if (url) { %> + + <% } %> + <%=htitle%> + <% if (url) { %><% } %> + + <% if (description) { %> +

    <%=hdescription%>

    + <% } %> + <% if (image) { %> +
    + <% } %> + diff -r e457ec945e50 -r 0d5998b32a7c client/templates/main.html --- a/client/templates/main.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/main.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,27 +1,27 @@ <% if (options.show_bins) { %> -
    -
    -

    <%- translate("Select contents:")%>

    -
    - -
    -
    -
      -
      - -
      -
      - -
      -
      - -
      +
      +
      +

      <%- translate("Select contents:")%>

      +
      + +
      +
      +
        +
        + +
        +
        + +
        +
        + +
        <% } %> <% if (options.show_editor) { %> -
        +
        <% } %> diff -r e457ec945e50 -r 0d5998b32a7c client/templates/nodeeditor.html --- a/client/templates/nodeeditor.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/nodeeditor.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,91 +1,91 @@

        - ×<%-renkan.translate("Edit Node")%> + ×<%-renkan.translate("Edit Node")%>

        - - + +

        <% if (options.show_node_editor_uri) { %> -

        - - - -

        +

        + + + +

        <% } %> <% if (options.show_node_editor_description) { %> -

        - - -

        +

        + + +

        <% } %> <% if (options.show_node_editor_size) { %> -

        - <%-renkan.translate("Size:")%> - - - <%-node.size%> - + -

        +

        + <%-renkan.translate("Size:")%> + - + <%-node.size%> + + +

        <% } %> <% if (options.show_node_editor_color) { %> -
        - - <%-renkan.translate("Node color:")%> -
        - - - - <%= renkan.colorPicker %> - <%- renkan.translate("Choose color") %> -
        -
        +
        + + <%-renkan.translate("Node color:")%> +
        + + + + <%= renkan.colorPicker %> + <%- renkan.translate("Choose color") %> +
        +
        <% } %> <% if (options.show_node_editor_image) { %> -
        -
        - - <% if (node.clip_path) { %> - - - - <% }%> -
        -
        -

        - -

        - - -
        -

        +
        +
        + + <% if (node.clip_path) { %> + + + + <% }%> +
        +
        +

        + +

        + + +
        +

        <% if (options.allow_image_upload) { %> -

        - - -

        +

        + + +

        <% }%><% } %> <% if (options.show_node_editor_creator && node.has_creator) { %> -

        - <%-renkan.translate("Created by:")%> - - <%- shortenText(node.created_by_title, 25) %> -

        +

        + <%-renkan.translate("Created by:")%> + + <%- shortenText(node.created_by_title, 25) %> +

        <% } %> <% if (options.change_shapes) { %> -

        - - -

        +

        + + +

        <% } %> diff -r e457ec945e50 -r 0d5998b32a7c client/templates/nodeeditor_readonly.html --- a/client/templates/nodeeditor_readonly.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/nodeeditor_readonly.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,28 +1,28 @@

        - × - <% if (options.show_node_tooltip_color) { %> - - <% } %> - - <% if (node.uri) { %> - - <% } %> - <%-node.title%> - <% if (node.uri) { %><% } %> - + × + <% if (options.show_node_tooltip_color) { %> + + <% } %> + + <% if (node.uri) { %> + + <% } %> + <%-node.title%> + <% if (node.uri) { %><% } %> +

        <% if (node.uri && options.show_node_tooltip_uri) { %> -

        - <%-node.short_uri%> -

        +

        + <%-node.short_uri%> +

        <% } %> <% if (options.show_node_tooltip_description) { %> -

        <%-node.description%>

        +

        <%-node.description%>

        <% } %> <% if (node.image && options.show_node_tooltip_image) { %> - + <% } %> <% if (node.has_creator && options.show_node_tooltip_creator) { %> -

        - <%-renkan.translate("Created by:")%> - - <%- shortenText(node.created_by_title, 25) %> -

        +

        + <%-renkan.translate("Created by:")%> + + <%- shortenText(node.created_by_title, 25) %> +

        <% } %> diff -r e457ec945e50 -r 0d5998b32a7c client/templates/scene.html --- a/client/templates/scene.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/scene.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,152 +1,152 @@ <% if (options.show_top_bar) { %> -
        -
        - <% if (!options.editor_mode) { %> -

        - <%- project.get("title") || translate("Untitled project")%> -

        - <% } else { %> - - <% } %> - <% if (options.show_user_list) { %> -
        -
        - <% if (options.show_user_color) { %> -
        - - <% if (options.user_color_editable) { %> - - <% } %> - - <% if (options.user_color_editable) { print(colorPicker) } %> -
        - <% } %> - <unknown user> -
        -
          -
          - <% } %> - <% if (options.home_button_url) {%> -
          - -
          -
          - <%- translate(options.home_button_title) %> -
          -
          -           - <% } %> - <% if (options.show_fullscreen_button) { %> -
          -
          -
          -
          - <%-translate("Full Screen")%> -
          -
          -
          - <% } %> - <% if (options.editor_mode) { %> - <% if (options.show_addnode_button) { %> -
          -
          -
          -
          - <%-translate("Add Node")%> -
          -
          -
          - <% } %> - <% if (options.show_addedge_button) { %> -
          -
          -
          -
          - <%-translate("Add Edge")%> -
          -
          -
          - <% } %> - <% if (options.show_export_button) { %> -
          -
          -
          -
          - <%-translate("Download Project")%> -
          -
          -
          - <% } %> - <% if (options.show_save_button) { %> -
          -
          -
          -
          -
          -
          - <% } %> - <% if (options.show_open_button) { %> -
          -
          -
          -
          - <%-translate("Open Project")%> -
          -
          -
          - <% } %> - <% if (options.show_bookmarklet) { %> -
          - -
          -
          - <%-translate("Renkan \'Drag-to-Add\' bookmarklet")%> -
          -
          -           -
          - <% } %> - <% } else { %> - <% if (options.show_export_button) { %> -
          -
          -
          -
          - <%-translate("Download Project")%> -
          -
          -
          -
          - <% } %> - <% }; %> - <% if (options.show_search_field) { %> -
          - -
          -
          - <% } %> -
          +
          +
          + <% if (!options.editor_mode) { %> +

          + <%- project.get("title") || translate("Untitled project")%> +

          + <% } else { %> + + <% } %> + <% if (options.show_user_list) { %> +
          +
          + <% if (options.show_user_color) { %> +
          + + <% if (options.user_color_editable) { %> + + <% } %> + + <% if (options.user_color_editable) { print(colorPicker) } %> +
          + <% } %> + <unknown user> +
          +
            +
            + <% } %> + <% if (options.home_button_url) {%> +
            + +
            +
            + <%- translate(options.home_button_title) %> +
            +
            +             + <% } %> + <% if (options.show_fullscreen_button) { %> +
            +
            +
            +
            + <%-translate("Full Screen")%> +
            +
            +
            + <% } %> + <% if (options.editor_mode) { %> + <% if (options.show_addnode_button) { %> +
            +
            +
            +
            + <%-translate("Add Node")%> +
            +
            +
            + <% } %> + <% if (options.show_addedge_button) { %> +
            +
            +
            +
            + <%-translate("Add Edge")%> +
            +
            +
            + <% } %> + <% if (options.show_export_button) { %> +
            +
            +
            +
            + <%-translate("Download Project")%> +
            +
            +
            + <% } %> + <% if (options.show_save_button) { %> +
            +
            +
            +
            +
            +
            + <% } %> + <% if (options.show_open_button) { %> +
            +
            +
            +
            + <%-translate("Open Project")%> +
            +
            +
            + <% } %> + <% if (options.show_bookmarklet) { %> +
            + +
            +
            + <%-translate("Renkan \'Drag-to-Add\' bookmarklet")%> +
            +
            +             +
            + <% } %> + <% } else { %> + <% if (options.show_export_button) { %> +
            +
            +
            +
            + <%-translate("Download Project")%> +
            +
            +
            +
            + <% } %> + <% }; %> + <% if (options.show_search_field) { %> +
            + +
            +
            + <% } %> +
            <% } %>
            -
            - resize="" <% } %>> -
            -
            - <% if (options.show_bins) { %> -
            «
            - <% } %> - <% if (options.show_zoom) { %> -
            -
            -
            -
            - <% if (options.editor_mode && options.save_view) { %> -
            - <% } %> - <% if (options.save_view) { %> -
            - <% } %> -
            - <% } %> -
            -
            \ No newline at end of file +
            + resize="" <% } %>> +
            +
            + <% if (options.show_bins) { %> +
            «
            + <% } %> + <% if (options.show_zoom) { %> +
            +
            +
            +
            + <% if (options.editor_mode && options.save_view) { %> +
            + <% } %> + <% if (options.save_view) { %> +
            + <% } %> +
            + <% } %> +
            + diff -r e457ec945e50 -r 0d5998b32a7c client/templates/wikipedia-bin/resulttemplate.html --- a/client/templates/wikipedia-bin/resulttemplate.html Sat Apr 25 04:13:53 2015 +0200 +++ b/client/templates/wikipedia-bin/resulttemplate.html Sat Apr 25 04:37:06 2015 +0200 @@ -1,11 +1,11 @@
          • - - -

            - <%=htitle%> -

            -

            <%=hdescription%>

            -
            • \ No newline at end of file + data-uri="<%-url%>" data-title="Wikipedia: <%-title%>" + data-description="<%-description%>" + data-image="<%- Rkns.Utils.getFullURL( static_url + 'img/wikipedia.png' ) %>"> + + +

            + <%=htitle%> +

            +

            <%=hdescription%>

            +