deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2010-02-06 16:58:17 -06:00
parent b1e0b4830b c32e5b7178
commit 1d20af58c1
3 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
public/javascripts/page_helper.js
View file

@ -83,10 +83,13 @@ function setupSVGedit(path){
SVGeditButton.disabled = true; SVGeditButton.disabled = true;
Event.observe(SVGeditButton, 'click', function(){ Event.observe(SVGeditButton, 'click', function(){
if (selected) { if (selected) {
var editor = window.open(path +'?source=data:image/svg+xml;base64,' + window.btoa(selected), 'Spoons!'); var editor = window.open(path +'?source=data:image/svg+xml;base64,' + window.btoa(selected),
'Editing Existing SVG Graphic');
} else { } else {
var editor = window.open(path, 'Spoons!'); var editor = window.open(path, 'Creating New SVG graphic');
} }
SVGeditButton.disabled = true;
SVGeditButton.value = 'Create SVG graphic';
editor.focus(); editor.focus();
}); });
} }

28
public/svg-edit/editor/svg-editor.html
View file

@ -4,7 +4,7 @@
<head> <head>
<meta http-equiv="Content-type" content="text/html;charset=UTF-8" /> <meta http-equiv="Content-type" content="text/html;charset=UTF-8" />
<meta http-equiv="X-UA-Compatible" content="chrome=1"/> <meta http-equiv="X-UA-Compatible" content="chrome=1"/>
<link rel="icon" type="image/png" href="images/logo.png"> <link rel="icon" type="image/png" href="images/logo.png"/>
<link rel="stylesheet" href="jgraduate/css/jPicker-1.0.12.css" type="text/css"/> <link rel="stylesheet" href="jgraduate/css/jPicker-1.0.12.css" type="text/css"/>
<link rel="stylesheet" href="jgraduate/css/jGraduate-0.2.0.css" type="text/css"/> <link rel="stylesheet" href="jgraduate/css/jGraduate-0.2.0.css" type="text/css"/>
<link rel="stylesheet" href="svg-editor.css" type="text/css"/> <link rel="stylesheet" href="svg-editor.css" type="text/css"/>
@ -73,7 +73,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<option selected="selected" value="layer1">Layer 1</option> <option selected="selected" value="layer1">Layer 1</option>
</select> </select>
</div> </div>
<div id="sidepanel_handle" onselectstart="return false;" title="Drag left/right to resize side panel [X]">L a y e r s</div> <div id="sidepanel_handle" title="Drag left/right to resize side panel [X]">L a y e r s</div>
</div> </div>
<div id="main_button"> <div id="main_button">
@ -231,7 +231,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<div id="image_panel"> <div id="image_panel">
<div class="toolset"> <div class="toolset">
<label id="iwidthLabel"><span id="iwidthLabel">width:</span> <label><span id="iwidthLabel">width:</span>
<input id="image_width" class="attr_changer" title="Change image width" size="3" data-attr="width"/> <input id="image_width" class="attr_changer" title="Change image width" size="3" data-attr="width"/>
</label> </label>
<label><span id="iheightLabel">height:</span> <label><span id="iheightLabel">height:</span>
@ -241,23 +241,25 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<div class="toolset"> <div class="toolset">
<label id="tool_image_url">url: <label id="tool_image_url">url:
<input id="image_url" type="text" title="Change URL" size="35"/> <input id="image_url" type="text" title="Change URL" size="35"/>
</label>
<label id="tool_change_image">
<button id="change_image_url" style="display:none;">Change Image</button> <button id="change_image_url" style="display:none;">Change Image</button>
<div id="url_notice" title="NOTE: This image cannot be embedded. It will depend on this path to be displayed"></div> <span id="url_notice" title="NOTE: This image cannot be embedded. It will depend on this path to be displayed"></span>
</label> </label>
</div> </div>
</div> </div>
<div id="circle_panel"> <div id="circle_panel">
<div class="toolset"> <div class="toolset">
<label id="tool_ellipse_cx">cx: <label id="tool_circle_cx">cx:
<input id="circle_cx" class="attr_changer" title="Change circle's cx coordinate" size="3" data-attr="cx"/> <input id="circle_cx" class="attr_changer" title="Change circle's cx coordinate" size="3" data-attr="cx"/>
</label> </label>
<label id="tool_ellipse_cy">cy: <label id="tool_circle_cy">cy:
<input id="circle_cy" class="attr_changer" title="Change circle's cy coordinate" size="3" data-attr="cy"/> <input id="circle_cy" class="attr_changer" title="Change circle's cy coordinate" size="3" data-attr="cy"/>
</label> </label>
</div> </div>
<div class="toolset"> <div class="toolset">
<label id="tool_ellipse_r">r: <label id="tool_circle_r">r:
<input id="circle_r" class="attr_changer" title="Change circle's radius" size="3" data-attr="r"/> <input id="circle_r" class="attr_changer" title="Change circle's radius" size="3" data-attr="r"/>
</label> </label>
</div> </div>
@ -335,7 +337,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<label id="tool_node_x">x: <label id="tool_node_x">x:
<input id="path_node_x" class="attr_changer" title="Change node's x coordinate" size="3" data-attr="x"/> <input id="path_node_x" class="attr_changer" title="Change node's x coordinate" size="3" data-attr="x"/>
</label> </label>
<label id="tool_node_y">y:</label> <label id="tool_node_y">y:
<input id="path_node_y" class="attr_changer" title="Change node's y coordinate" size="3" data-attr="y"/> <input id="path_node_y" class="attr_changer" title="Change node's y coordinate" size="3" data-attr="y"/>
</label> </label>
<select id="seg_type" title="Change Segment type"> <select id="seg_type" title="Change Segment type">
@ -476,15 +478,15 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<legend id="svginfo_image_props">Image Properties</legend> <legend id="svginfo_image_props">Image Properties</legend>
<label> <label>
<span id="svginfo_title">Title:</span> <span id="svginfo_title">Title:</span>
<input type="text" id="canvas_title" size="24"> <input type="text" id="canvas_title" size="24"/>
</label> </label>
<fieldset id="change_resolution"> <fieldset id="change_resolution">
<legend id="svginfo_dim">Canvas Dimensions</legend> <legend id="svginfo_dim">Canvas Dimensions</legend>
<label><span id="svginfo_width">Width:</span> <input type="text" id="canvas_width" size="6"></label> <label><span id="svginfo_width">Width:</span> <input type="text" id="canvas_width" size="6"/></label>
<label><span id="svginfo_height">Height:</span> <input type="text" id="canvas_height" size="6"></label> <label><span id="svginfo_height">Height:</span> <input type="text" id="canvas_height" size="6"/></label>
<label> <label>
<select id="resolution"> <select id="resolution">
@ -525,7 +527,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<option id="lang_hi" value="hi">&#2361;&#2367;&#2344;&#2381;&#2342;&#2368;, &#2361;&#2367;&#2306;&#2342;&#2368;</option> <option id="lang_hi" value="hi">&#2361;&#2367;&#2344;&#2381;&#2342;&#2368;, &#2361;&#2367;&#2306;&#2342;&#2368;</option>
<option id="lang_nl" value="nl">Nederlands</option> <option id="lang_nl" value="nl">Nederlands</option>
<option id="lang_ro" value="ro">Româneşte</option> <option id="lang_ro" value="ro">Româneşte</option>
<option id="lang_ro" value="ru">Русский</option> <option id="lang_ru" value="ru">Русский</option>
<option id="lang_sk" value="sk">Slovenčina</option> <option id="lang_sk" value="sk">Slovenčina</option>
<option id="lang_zh-TW" value="zh-TW">繁體中文</option> <option id="lang_zh-TW" value="zh-TW">繁體中文</option>
</select> </select>
@ -543,7 +545,7 @@ script type="text/javascript" src="locale/locale.min.js"></script-->
<fieldset id="change_background"> <fieldset id="change_background">
<legend id="svginfo_change_background">Editor Background</legend> <legend id="svginfo_change_background">Editor Background</legend>
<div id="bg_blocks"></div> <div id="bg_blocks"></div>
<label><span id="svginfo_bg_url">URL:</span> <input type="text" id="canvas_bg_url" size="21"></label> <label><span id="svginfo_bg_url">URL:</span> <input type="text" id="canvas_bg_url" size="21"/></label>
<p id="svginfo_bg_note">Note: Background will not be saved with image.</p> <p id="svginfo_bg_note">Note: Background will not be saved with image.</p>
</fieldset> </fieldset>

4
public/svg-edit/editor/svgcanvas.js
View file

@ -36,7 +36,7 @@ var isOpera = !!window.opera,
"ellipse": ["class", "clip-path", "clip-rule", "cx", "cy", "fill", "fill-opacity", "fill-rule", "filter", "id", "mask", "opacity", "requiredFeatures", "rx", "ry", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], "ellipse": ["class", "clip-path", "clip-rule", "cx", "cy", "fill", "fill-opacity", "fill-rule", "filter", "id", "mask", "opacity", "requiredFeatures", "rx", "ry", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"],
"feGaussianBlur": ["class", "id", "requiredFeatures", "stdDeviation"], "feGaussianBlur": ["class", "id", "requiredFeatures", "stdDeviation"],
"filter": ["class", "filterRes", "filterUnits", "height", "id", "primitiveUnits", "requiredFeatures", "width", "x", "xlink:href", "y"], "filter": ["class", "filterRes", "filterUnits", "height", "id", "primitiveUnits", "requiredFeatures", "width", "x", "xlink:href", "y"],
"foreignObject": ["height", "width", "x", "y"], "foreignObject": ["class", "height", "id", "requiredFeatures", "style", "width", "x", "y"],
"g": ["class", "clip-path", "clip-rule", "id", "display", "fill", "fill-opacity", "fill-rule", "filter", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"], "g": ["class", "clip-path", "clip-rule", "id", "display", "fill", "fill-opacity", "fill-rule", "filter", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform"],
"image": ["class", "clip-path", "clip-rule", "filter", "height", "id", "mask", "opacity", "requiredFeatures", "style", "systemLanguage", "transform", "width", "x", "xlink:href", "xlink:title", "y"], "image": ["class", "clip-path", "clip-rule", "filter", "height", "id", "mask", "opacity", "requiredFeatures", "style", "systemLanguage", "transform", "width", "x", "xlink:href", "xlink:title", "y"],
"line": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "id", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "x1", "x2", "y1", "y2"], "line": ["class", "clip-path", "clip-rule", "fill", "fill-opacity", "fill-rule", "filter", "id", "marker-end", "marker-mid", "marker-start", "mask", "opacity", "requiredFeatures", "stroke", "stroke-dasharray", "stroke-dashoffset", "stroke-linecap", "stroke-linejoin", "stroke-miterlimit", "stroke-opacity", "stroke-width", "style", "systemLanguage", "transform", "x1", "x2", "y1", "y2"],
@ -7467,7 +7467,7 @@ function BatchCommand(text) {
// Function: getVersion // Function: getVersion
// Returns a string which describes the revision number of SvgCanvas. // Returns a string which describes the revision number of SvgCanvas.
this.getVersion = function() { this.getVersion = function() {
return "svgcanvas.js ($Rev: 1349 $)"; return "svgcanvas.js ($Rev: 1352 $)";
}; };
this.setUiStrings = function(strs) { this.setUiStrings = function(strs) {