Mercurial Mercurial > cinegift / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
No more URI on Stickers
authorveltr
Thu, 11 Apr 2013 17:32:10 +0200
changeset 27 c21cffd36f98
parent 26 12d37f113973
child 28 84719280c84d
No more URI on Stickers
integ/iri-creation-cinecard.html file | annotate | diff | comparison | revisions
integ/renkan/css/renkan.css file | annotate | diff | comparison | revisions
integ/renkan/js/paper-renderer.js file | annotate | diff | comparison | revisions 
--- a/integ/iri-creation-cinecard.html	Thu Apr 11 15:51:23 2013 +0200
+++ b/integ/iri-creation-cinecard.html	Thu Apr 11 17:32:10 2013 +0200
@@ -66,33 +66,33 @@
 						<h3 class="instruction">Glisser un contenu dans la carte</h3>
 						<h3>Stickers</h3>
 						<ul class="stickers less" id="stickers-more">
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Scènes cultes" data-image="img/stickers/scenes-cultes.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Scènes cultes" data-image="img/stickers/scenes-cultes.png" data-uri="none">
 								<a class="culte" href="#">
 									<span>SCENES CULTES</span>
 								</a>
 							</li>
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Mon avis" data-image="img/stickers/mon-avis.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Mon avis" data-image="img/stickers/mon-avis.png" data-uri="none">
 								<a class="star" href="#">
 									<span>MON<br />AVIS</span>
 								</a>
 							</li>
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Tu vas aimer" data-image="img/stickers/tu-vas-aimer.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Tu vas aimer" data-image="img/stickers/tu-vas-aimer.png" data-uri="none">
 								<a class="like" href="#">
 									<span>TU VAS<br />AIMER</span>
 								</a>
 							</li>
 						
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Pourquoi le voir" data-image="img/stickers/pourquoi-le-voir.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Pourquoi le voir" data-image="img/stickers/pourquoi-le-voir.png" data-uri="none">
 								<a class="culte" href="#">
 									<span>POURQUOI<br/>LE VOIR</span>
 								</a>
 							</li>
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Secrets et bonus" data-image="img/stickers/secrets-et-bonus.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Secrets et bonus" data-image="img/stickers/secrets-et-bonus.png" data-uri="none">
 								<a class="star" href="#">
 									<span>SECRETS<br />ET BONUS</span>
 								</a>
 							</li>
-							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Pourquoi j'ai aimé" data-image="img/stickers/pourquoi-j-ai-aime.png">
+							<li class="cinecard-draggable" draggable="true" data-title=" " data-description="Pourquoi j'ai aimé" data-image="img/stickers/pourquoi-j-ai-aime.png" data-uri="none">
 								<a class="like" href="#">
 									<span>POURQUOI<br />J'AI AIMÉ</span>
 								</a>
--- a/integ/renkan/css/renkan.css	Thu Apr 11 15:51:23 2013 +0200
+++ b/integ/renkan/css/renkan.css	Thu Apr 11 17:32:10 2013 +0200
@@ -1,4 +1,3 @@
-
 .Rk-Render {
     position: absolute; left: 0; top: 0; right: 0; bottom: 0;
 }
@@ -12,7 +11,7 @@
 /* Editors */
 
 .Rk-Editor {
-    position: absolute; left: 0; top: 0; right: 0; z-index: 2; color: #000000;
+    position: absolute; left: 0; top: 0; z-index: 2; color: #000000;
 }
 
 .Rk-Notifications {
--- a/integ/renkan/js/paper-renderer.js	Thu Apr 11 15:51:23 2013 +0200
+++ b/integ/renkan/js/paper-renderer.js	Thu Apr 11 17:32:10 2013 +0200
@@ -74,6 +74,7 @@
             left: (_options.tooltip_padding + Math.min(_left, _right)),
             top: (_options.tooltip_padding + _top)
         });
+        return _path;
     },
     sector : function(_repr, _inR, _outR, _startAngle, _endAngle, _padding, _imgsrc, _caption) {
         var _options = _repr.renderer.renkan.options,
@@ -826,6 +827,7 @@
     + '<span class="Rk-Display-Title"><% if (node.uri) { %><a href="<%-node.uri%>" target="_blank"><% } %><%-node.title%><% if (node.uri) { %></a><% } %></span></h2>'
     + '<% if (node.uri) { %><p class="Rk-Display-URI"><a href="<%-node.uri%>" target="_blank"><%-node.short_uri%></a></p><% } %>'
     + '<p><%-node.description%></p>'
+    + '<% if (node.image) { %><img class="Rk-Display-ImgPreview" src="<%-node.image%>" /><% } %>'
     + '<% if (node.has_creator) { %><p><span class="Rk-Editor-Label"><%-translate("Created by:")%></span><span class="Rk-UserColor" style="background:<%-node.created_by_color%>;"></span><%- Rkns.Renderer.Utils.shortenText(node.created_by_title, 25) %></p><% } %>'
 );
 
@@ -1496,6 +1498,9 @@
     		if (res["text/x-iri-" + f] || res[f]) {
     			newNode[f] = res["text/x-iri-" + f] || res[f];
     		}
+    		if (newNode[f] === "none" || newNode[f] === "null") {
+    			newNode[f] = undefined;
+    		}
     	}
     	if (newNode.title || newNode.description || newNode.uri) {
     		var _off = _this.canvas_$.offset(),
cinegift