# HG changeset patch # User rougeronj # Date 1441982081 -7200 # Node ID 5fbcc117e8fed3cf2df34bf612a7e62f337a1ae7 # Parent d45e95229c47aeaaf5b48c9781ed7ab65b536164# Parent 18cb4c4c4e5ea2b4737d7141f860c2dd4f15e1ba Merge with 18cb4c4c4e5ea2b4737d7141f860c2dd4f15e1ba diff -r d45e95229c47 -r 5fbcc117e8fe client/js/defaults.js --- a/client/js/defaults.js Thu Sep 10 16:22:28 2015 +0200 +++ b/client/js/defaults.js Fri Sep 11 16:34:41 2015 +0200 @@ -118,15 +118,15 @@ /* Maximum displayed text length */ label_untitled_nodes: "(untitled)", /* Label to display on untitled nodes */ - hide_nodes: true, + hide_nodes: true, /* allow hide/show nodes */ change_shapes: true, /* Change shapes enabled */ change_types: true, /* Change type enabled */ - + /* NODE EDITOR TEMPLATE*/ - + node_editor_templates: { "default": "templates/nodeeditor_readonly.html", "video": "templates/nodeeditor_video.html" @@ -159,6 +159,7 @@ tooltip_bottom_color: "#d0d0d0", tooltip_border_color: "#808080", tooltip_border_width: 1, + tooltip_opacity: 0.8, richtext_editor_config: { toolbarGroups: [ diff -r d45e95229c47 -r 5fbcc117e8fe client/js/renderer/baseeditor.js --- a/client/js/renderer/baseeditor.js Thu Sep 10 16:22:28 2015 +0200 +++ b/client/js/renderer/baseeditor.js Fri Sep 11 16:34:41 2015 +0200 @@ -17,14 +17,14 @@ this.editor_block.add.apply(this.editor_block, _pts); this.editor_block.strokeWidth = this.options.tooltip_border_width; this.editor_block.strokeColor = this.options.tooltip_border_color; - this.editor_block.opacity = 0.8; + this.editor_block.opacity = this.options.tooltip_opacity; this.editor_$ = $('
') - .appendTo(this.renderer.editor_$) - .css({ - position: "absolute", - opacity: 0.8 - }) - .hide(); + .appendTo(this.renderer.editor_$) + .css({ + position: "absolute", + opacity: this.options.tooltip_opacity + }) + .hide(); }, destroy: function() { this.editor_block.remove(); diff -r d45e95229c47 -r 5fbcc117e8fe client/test/test-writable-simple-opacity.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/client/test/test-writable-simple-opacity.html Fri Sep 11 16:34:41 2015 +0200 @@ -0,0 +1,49 @@ + + + + + + Test de Rendu RENKAN + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + diff -r d45e95229c47 -r 5fbcc117e8fe client/test/test-writable-simple.html --- a/client/test/test-writable-simple.html Thu Sep 10 16:22:28 2015 +0200 +++ b/client/test/test-writable-simple.html Fri Sep 11 16:34:41 2015 +0200 @@ -31,7 +31,7 @@ /*user_id: "u-iri", language: "fr", node_fill_color: false*/ - show_bins: false, + show_bins: false, static_url: "../" }); Rkns.jsonIO(_renkan, {