--- a/client/js/i18n.js Fri Mar 29 12:03:58 2013 +0100
+++ b/client/js/i18n.js Fri Mar 29 18:19:47 2013 +0100
@@ -64,6 +64,8 @@
"Dragged resource": "Ressource glisée-déposée",
"Search the Web": "Rechercher en ligne",
"Search in Bins": "Rechercher dans les chutiers",
+ "Close bin": "Fermer le chutier",
+ "Refresh bin": "Rafraîchir le chutier",
"(untitled)": "(sans titre)",
"Select contents:": "Sélectionner des contenus :",
"Drag items from this website, drop them in Renkan": "Glissez des éléments de ce site web vers Renkan",
--- a/client/js/main.js Fri Mar 29 12:03:58 2013 +0100
+++ b/client/js/main.js Fri Mar 29 18:19:47 2013 +0100
@@ -51,16 +51,26 @@
var _this = this;
Rkns.$('<a>')
- .attr("href","#")
+ .attr({
+ href: "#",
+ title: _renkan.translate("Close bin")
+ })
.addClass("Rk-Bin-Close")
.html('×')
.appendTo(this.$)
.click(function() {
_this.destroy();
+ if (!_renkan.$.find(".Rk-Bin-Main:visible").length) {
+ _renkan.$.find(".Rk-Bin-Main:last").slideDown();
+ }
+ _renkan.resizeBins();
return false;
});
Rkns.$('<a>')
- .attr("href","#")
+ .attr({
+ href: "#",
+ title: _renkan.translate("Refresh bin")
+ })
.addClass("Rk-Bin-Refresh")
.appendTo(this.$)
.click(function() {
@@ -226,9 +236,9 @@
'<% if (options.show_bins) { %><div class="Rk-Bins"><div class="Rk-Bins-Head"><h2 class="Rk-Bins-Title"><%- translate("Select contents:")%></h2>'
+ '<form class="Rk-Web-Search-Form Rk-Search-Form"><input class="Rk-Web-Search-Input Rk-Search-Input" type="search" placeholder="<%- translate("Search the Web") %>" />'
+ '<div class="Rk-Search-Select"><div class="Rk-Search-Current"></div><ul class="Rk-Search-List"></ul></div>'
- + '<input type="submit" value="" class="Rk-Web-Search-Submit Rk-Search-Submit" /></form>'
+ + '<input type="submit" value="" class="Rk-Web-Search-Submit Rk-Search-Submit" title="<%- translate("Search the Web") %>" /></form>'
+ '<form class="Rk-Bins-Search-Form Rk-Search-Form"><input class="Rk-Bins-Search-Input Rk-Search-Input" type="search" placeholder="<%- translate("Search in Bins") %>" />'
- + '<input type="submit" value="" class="Rk-Bins-Search-Submit Rk-Search-Submit" /></form></div>'
+ + '<input type="submit" value="" class="Rk-Bins-Search-Submit Rk-Search-Submit" title="<%- translate("Search in Bins") %>" /></form></div>'
+ '<ul class="Rk-Bin-List"></ul></div><% } %><div class="Rk-Render Rk-Render-<% if (options.show_bins) { %>Panel<% } else { %>Full<% } %>"></div>'
);
--- a/client/js/paper-renderer.js Fri Mar 29 12:03:58 2013 +0100
+++ b/client/js/paper-renderer.js Fri Mar 29 18:19:47 2013 +0100
@@ -1453,6 +1453,13 @@
newNode.description = snippet.find("[data-description]").attr("data-description") || newNode.description;
}
}
+ var fields = ["title", "description", "uri", "image"];
+ for (var i = 0; i < fields.length; i++) {
+ var f = fields[i];
+ if (res["text/x-iri-" + f]) {
+ newNode[f] = res["text/x-iri-" + f];
+ }
+ }
if (newNode.title || newNode.description || newNode.uri) {
var _off = _this.canvas_$.offset(),
_point = new paper.Point([