--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/plugin/action/RecommendPage.py	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,108 @@
+# -*- coding: iso-8859-1 -*-
+"""
+    MoinMoin - RecommendPage Action Macro
+
+    By this action one user can point another one to an usefully interesting page.
+    The hint becomes written to a page named user/RecommendedPage and the user
+    becomes subscribed to that page.
+
+    @copyright: 2005-2010 by MoinMoin:ReimarBauer
+    @license: GNU GPL, see COPYING for details.
+"""
+from MoinMoin import wikiutil, user
+from MoinMoin.Page import Page
+from MoinMoin.PageEditor import PageEditor
+
+def RecommendPage(request, pagename, username):
+    err = None
+    name = "%(username)s/RecommendedPage" % {"username": username}
+    page = PageEditor(request, name)
+    if request.user.may.write(name):
+        if user.getUserId(request, username) is not None:
+            uid = user.getUserId(request, username)
+            recom_user = user.User(request, id=uid)
+            subscription_list = recom_user.getSubscriptionList()
+            if name not in subscription_list:
+                recom_user.subscribe(name)
+                recom_user.save()
+
+        newtext = u" * [[%(pagename)s]]  <<ShortText(%(pagename)s)>> ...\n %(username)s\n" % {
+                 "pagename": pagename,
+                 "username": "@SIG@"}
+        if not page.exists():
+            return True, PageEditor.saveText(page, newtext, 0)
+        else:
+            body = page.get_data()
+            meta = page.get_meta()
+            text_meta = ''
+            for command, attrib in meta:
+                text_meta = '#%s %s\n%s' % (command, attrib, text_meta)
+
+            text = "%s\n%s\n%s\n" % (text_meta, newtext, body)
+            return True, PageEditor.saveText(page, text, 0)
+    else:
+        return False, "You are not allowed to edit this page."
+
+def execute(pagename, request):
+    _ = request.getText
+    actname = __name__.split('.')[-1]
+    thispage = Page(request, pagename)
+    if not (request.user.valid and request.user.may.read(pagename)):
+        msg = _("You are not allowed to do %(action_name)s on this page.") % {"action_name": actname}
+        request.theme.add_msg(msg, "warning")
+        return thispage.send_page()
+
+    if request.method == 'POST' and request.form.has_key('button'):
+        if not wikiutil.checkTicket(request, request.form.get('ticket', '')):
+            msg=_('Please use the interactive user interface to recommend pages!')
+            request.theme.add_msg(msg, "warning")
+            return thispage.send_page()
+
+        selected_users = request.values.getlist('username') or  [request.user.name]
+        recommendation_send_to = []
+        for username in selected_users:
+            status, msg = RecommendPage(request, pagename, username)
+            if status:
+                recommendation_send_to.append(username)
+
+        no_recommendation_for = set(selected_users) - set(recommendation_send_to)
+        msg = []
+        msg.append("recommended to read %(pagename)s for %(username)s" % {
+              "pagename": pagename,
+              "username": ', '.join(recommendation_send_to)})
+        if no_recommendation_for:
+            msg.append("You can't send a recommendation to %(username)s" % {
+              "username": ', '.join(no_recommendation_for)})
+
+        request.theme.add_msg('<br>'.join(msg), "info")
+        thispage.send_page()
+        return
+
+    users = user.getUserList(request)
+    html = ["<OPTION>%s</OPTION>" % user.User(request, id=uid).name for uid in users]
+    html.sort()
+
+    formhtml = """
+<form method="post" >
+<strong>%(querytext)s</strong><BR>
+<select name="username" size="%(len)s" multiple>
+%(option)s
+</select>
+<input type="hidden" name="action" value="%(actname)s">
+<input type="submit" name="button" value="%(button)s">
+<br>
+(no selection recommends to: %(user)s)
+<input type="hidden" name="ticket" value="%(ticket)s">
+<p>
+</form>""" % {
+'querytext': 'Recommend page to',
+'actname': 'RecommendPage',
+'ticket': wikiutil.createTicket(request),
+'option': ' '.join(html),
+'user': request.user.name,
+'len': min([3, len(html)]),
+'button': 'Recommend'}
+
+    request.theme.add_msg(formhtml, "info")
+    thispage.send_page()
+    return

--- a/data/plugin/action/SlideShow.py	Fri Apr 23 22:29:49 2010 +0200
+++ b/data/plugin/action/SlideShow.py	Fri Apr 23 22:38:00 2010 +0200
@@ -37,9 +37,11 @@
 
 from MoinMoin import wikiutil, i18n, error
 from MoinMoin.Page import Page
+from MoinMoin.version import release
 
 Dependencies = ['language']
 
+actname = __name__.split('.')[-1]
 
 class Error(error.Error):
     """ Raised for errors in this module """
@@ -468,6 +470,10 @@
 
 
 def execute(pagename, request):
+    if not release.startswith('1.8'):
+        msg = 'This local extension action "%(action_name)s" requires moin 1.8.' % {"action_name": actname}
+        request.theme.add_msg(msg, "warning")
+        return Page(request, pagename).send_page()
     """ Glue to current plugin system """
     SlideshowAction(request, pagename, template).execute()
 

--- a/data/plugin/macro/DictColumns.py	Fri Apr 23 22:29:49 2010 +0200
+++ b/data/plugin/macro/DictColumns.py	Fri Apr 23 22:38:00 2010 +0200
@@ -139,7 +139,7 @@
         request = self.request
         # use selection and order
         if self.names:
-            names = self.names
+            return self.names
         # use keys from template page, no order
         elif Page(request, self.template_page).exists():
             page_dict = self.get_dict(self.template_page)

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/data/plugin/macro/ShortText.py	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,26 @@
+# -*- coding: iso-8859-1 -*-
+"""
+    MoinMoin - ShortText macro
+
+    It shows the first 180 chars of a wiki page without any processing instructions
+    and only if the user is allowed to read that page.
+
+    @copyright: 2005-2010 by MoinMoin:ReimarBauer
+    @license: GNU GPL, see COPYING for details.
+"""
+Dependencies = ["pages"]
+
+from MoinMoin.Page import Page
+from MoinMoin import wikiutil
+
+def macro_ShortText(macro, pagename=unicode, length=180):
+    request = macro.request
+    _ = request.getText
+    if request.user.may.read(pagename):
+        raw = Page(request, pagename).get_data()
+        return request.formatter.text(raw[:length])
+    else:
+        return _("You are not allowed to view this page.")
+
+
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/CHANGES.current	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,47 @@
+
+SVG-edit is a lightweight, web-based, Javascript-driven SVG editor that works in any modern browser: version of svg-edit Revision r1502, 2.5alpha (http://code.google.com/p/svg-edit/) for moin-1.9
+
+htdocs/svg-edit must be linked into MoinMoin/web/static/htdocs
+--------------------------------------------------------------
+
+
+Status current svg-edit r1502:
+==============================
+
+Since the svg-edit editor could be called by an url parameter pointing to an existing drawing I changed the deploying from sending the html data by the action to calling the svg-editor.html by an object data tag.
+
+The reason for this change is that it becomes much easier to update to a newer svg-edit version as by the other method.
+
+By this currently only the modifcation of svg-editor.js is necessary to save to the wiki instead to a new window.
+
+ToDo:
+ * Link Syntax for attachments
+
+Known Issues:
+ * changing locale to a different language than english does not work, see 
+   http://code.google.com/p/svg-edit/issues/detail?id=451
+
+
+Status svg-edit r1200:
+======================
+ 
+ * css adapted for moinmoin
+ * action SVG-Editor added
+   This action can currenly save to the page where it is called
+ * target parameter addded
+   by adding the target name a file could be saved to this name
+   e.g. http://localhost:8080/Test?action=SvgEditor&target=example.svg
+   or <<Action(SvgEditor,target=test.svg)>>{{attachment:test.svg}}
+   and go to the page after saving
+
+ToDo
+ * url_prefix paramter needs to be used in some more js functions 
+   of locale.js, svgcanvas.js and svg-edit.js instead of hardcoding it.
+   (search for '/moin_static191/svg-edit/editor')
+ * Link Syntax for attachments
+
+Known Issues in svg-edit
+ * after changing locale in svg-edit properties a mysterious word
+   translated from "page" appears on the upper and bottom left corner.
+   see http://code.google.com/p/svg-edit/issues/detail?id=418
+

--- a/htdocs/svg-edit/AUTHORS	Fri Apr 23 22:29:49 2010 +0200
+++ b/htdocs/svg-edit/AUTHORS	Fri Apr 23 22:38:00 2010 +0200
@@ -14,7 +14,9 @@
 fr: wormsxulla <wormsxulla@yahoo.com> (Français)
 fy: Wander Nauta <info@wandernauta.nl> (Frysk)
 hi: Tavish Naruka <tavishnaruka@gmail.com> (हिन्दी)
+ja: Dong <iwadon@yarhalla.jpn.org> (日本語)
 nl: Jaap Blom <jaap.blom@gmail.com> (Nederlands)
 ro: Christian Tzurcanu <christian.tzurcanu@gmail.com> (Româneşte)
-ru: Laurent Dufloux <laurent.dufloux@etu.upmc.fr> (Русский язык)
-sk: Pavol Rusnak <rusnakp@gmail.com> (Slovenčina)
\ No newline at end of file
+ru: Laurent Dufloux <laurent.dufloux@etu.upmc.fr> (Русский)
+sk: Pavol Rusnak <rusnakp@gmail.com> (Slovenčina)
+zh-TW: 黃瀚生(han sheng Huang) <zenixls2@gmail.com> (台灣正體)

--- a/htdocs/svg-edit/CHANGES.current	Fri Apr 23 22:29:49 2010 +0200
+++ b/htdocs/svg-edit/CHANGES.current	Fri Apr 23 22:38:00 2010 +0200
@@ -4,6 +4,10 @@
 htdocs/svg-edit must be linked into MoinMoin/web/static/htdocs
 --------------------------------------------------------------
 
+Status current svg-edit r1502:
+==============================
+small modification on svg-editor.js for loading from url (cs 516:2b7a77acc967) and save (cs 517:aed9bccfe159) to moin-1.9
+
 
 Status current svg-edit r1310:
 ==============================

--- a/htdocs/svg-edit/Makefile	Fri Apr 23 22:29:49 2010 +0200
+++ b/htdocs/svg-edit/Makefile	Fri Apr 23 22:38:00 2010 +0200
@@ -1,8 +1,9 @@
 NAME=svg-edit
 VERSION=2.5
+PACKAGE=$(NAME)-$(VERSION)
 MAKEDOCS=naturaldocs/NaturalDocs
-PACKAGE=$(NAME)-$(VERSION)
-YUI=build/yuicompressor.jar
+CLOSURE=build/tools/closure-compiler.jar
+YUICOMPRESS=build/tools/yuicompressor.jar
 ZIP=zip
 
 all: release firefox opera
@@ -10,18 +11,21 @@
 build/$(PACKAGE):
 	rm -rf config
 	mkdir config
-	$(MAKEDOCS) -i editor/ -o html docs/ -p config/ -oft -r
+	if [ -x $(MAKEDOCS) ] ; then $(MAKEDOCS) -i editor/ -o html docs/ -p config/ -oft -r ; fi
 	mkdir -p build/$(PACKAGE)
 	cp -r editor/* build/$(PACKAGE)
 	-find build/$(PACKAGE) -name .svn -type d -exec rm -rf {} \;
 # minify spin button
-	java -jar $(YUI) build/$(PACKAGE)/spinbtn/JQuerySpinBtn.js > build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min.js
+	java -jar $(YUICOMPRESS)  build/$(PACKAGE)/spinbtn/JQuerySpinBtn.js                > build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min.js
+	java -jar $(CLOSURE) --js build/$(PACKAGE)/spinbtn/JQuerySpinBtn.js --js_output_file build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min-closure.js
 # minify SVG-edit files
-	java -jar $(YUI) build/$(PACKAGE)/svg-editor.js > build/$(PACKAGE)/svg-editor.min.js
-	java -jar $(YUI) build/$(PACKAGE)/svgcanvas.js > build/$(PACKAGE)/svgcanvas.min.js
+	java -jar $(YUICOMPRESS)  build/$(PACKAGE)/svg-editor.js                > build/$(PACKAGE)/svg-editor.min.js
+	java -jar $(CLOSURE) --js build/$(PACKAGE)/svg-editor.js --js_output_file build/$(PACKAGE)/svg-editor.min-closure.js
+	java -jar $(YUICOMPRESS)  build/$(PACKAGE)/svgcanvas.js                 > build/$(PACKAGE)/svgcanvas.min.js
+	java -jar $(CLOSURE) --js build/$(PACKAGE)/svgcanvas.js  --js_output_file build/$(PACKAGE)/svgcanvas.min-closure.js
 # CSS files do not work remotely
-# java -jar $(YUI) build/$(PACKAGE)/spinbtn/JQuerySpinBtn.css > build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min.css
-# java -jar $(YUI) build/$(PACKAGE)/svg-editor.css > build/$(PACKAGE)/svg-editor.min.css
+# java -jar $(YUICOMPRESS) build/$(PACKAGE)/spinbtn/JQuerySpinBtn.css > build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min.css
+# java -jar $(YUICOMPRESS) build/$(PACKAGE)/svg-editor.css > build/$(PACKAGE)/svg-editor.min.css
 
 release: build/$(PACKAGE)
 	cd build ; $(ZIP) $(PACKAGE).zip -r $(PACKAGE) ; cd ..

Binary file htdocs/svg-edit/build/tools/closure-compiler.jar has changed

Binary file htdocs/svg-edit/build/tools/yuicompressor.jar has changed

Binary file htdocs/svg-edit/build/yuicompressor.jar has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/clipart/moon.svg	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg width="100" xmlns="http://www.w3.org/2000/svg" height="100" viewBox="0 0 205.5 255.87">
+ <g display="inline">
+  <title>Layer 1</title>
+  <path id="svg_1" d="m10.671,231.42c89.543,56.086,188.11-10.029,193.33-94.559-1.7286-101.53-92.171-150.4-160.16-128.01,35.129,15.844,73.4,62.729,73.871,88.013-3.4428,7.5157-5.8714,16.373,1.5286,18.844-2,12.857-18.486,33.571-21.043,40.643-2.5571,7.0714,2.2143,9.8443,5.4429,10.357,0.2,6.0586-4.4429,8.3572-5.3572,12.156-7.9,3.13-8.4714,9.9872-7.3286,14.844-19.714,18.571-20.571,27.143-80.286,37.714z" stroke="#000" stroke-width="5" fill="#f6c700"/>
+  <path id="svg_3" d="m98.193,180.83c2.5851-3.421,7.4852,2.5632,7.1642,5.1572-0.32201,2.594-0.67928,4.0227-3.7143,5.2857" stroke="#000" stroke-width="5" fill="none"/>
+  <path id="svg_4" d="m104.11,166.92c5.5357-0.49998,14.643,3.8472,17.75,2.37,3.1072-1.4771,3.3929-4.6686,2.3572-6.5129" stroke="#000" stroke-width="5" fill="none"/>
+  <path id="svg_5" d="m125.64,171.49c-3.9286,8.2143-3.8572,18.987,4.2143,33.286" stroke="#000" stroke-width="2" fill="none"/>
+  <path id="svg_6" d="m117.91,97.816c9.572,1.8,16.143-9.0571,20.8-10.101,3.057-1.0986,14.057,27.473,21.057,35.616" stroke="#000" stroke-width="5" fill="none"/>
+  <path id="svg_7" d="m129.49,105.78c7.6428-3.6429,11.179,6.5357,12.607,10.929,1.4286,4.3928,7.1428,5.1071,10.857,5.5" stroke="#000" stroke-width="2" fill="none"/>
+  <path id="svg_8" d="m133.91,114.75c0.87856-0.13215,1.6214,4.3107,2.5143,6.8236,1.2857-0.90571,0.82143-1.5129,1.3928-1.9771,0.96429-0.82143,1.6071,3.6657,2.3572,5.1429,4.8572-0.00001,5.4643,0.89286,5.4286,1.9286-3.25,0.21429-5.1786,0.67857-7.5,1.6071-3.7857,2.3214-6.0357,6.6072-7,5.4286-0.32143-1.5,3.3571-4.5357,4-5.4286-3.0714-5.1428-2.0714-13.393-1.1929-13.525z" stroke="#000" fill="#000"/>
+ </g>
+</svg>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/clipart/star.svg	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="100" width="100">
+ <path id="svg_1" stroke-linejoin="round" d="M36.536,32.822c12.699-31.856,13.17-31.734,26.356-1.061,34.15,2.198,39.388,9.622,6.513,23.932,19.821,46.047-0.792,28.383-19.842,13.178-22.358,25.013-29.541,22.639-18.782-12.118-7.282-8.501-45.095-18.741,5.755-23.931z" fill-rule="evenodd" stroke="#000" stroke-linecap="round" stroke-miterlimit="4" stroke-width="5" fill="#FF0"/>
+</svg>

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/clipart/sun.svg	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg id="svg4562" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns="http://www.w3.org/2000/svg" xml:space="preserve" height="330.42" width="309.18" version="1.0" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/"><metadata id="metadata4567"><rdf:RDF><cc:Work rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/></cc:Work></rdf:RDF></metadata><defs id="defs4565"/><g id="g4569" fill-rule="nonzero" transform="matrix(1.25,0,0,-1.25,-2.8758105,798.03929)" fill="#f9a749"><path id="path4595" d="M160.13,603.66h0.09-0.09"/><g id="g5207" transform="matrix(2.30724,0,0,2.30724,-136.436,314.961)"><path id="path4735" d="M118.02,123.06c0.15,0,0.31-0.05,0.41,0.11,0.11-0.58,0.21-1.15,0.37-1.78l-0.16-0.1-0.21,0.52c-0.57-1.57,0.37-3.14,0.63-4.65,0.52-0.68,0.52-1.62,0.47-2.51-0.63,0.11-0.31-0.68-0.73-0.78,0.1-0.26,0.31-0.47,0.26-0.84-0.94-0.42-1.62,0.63-1.78,1.26-0.15,0.31-0.15,0.73-0.52,0.99-0.16-0.84-0.78-0.05-1.25-0.16-1.15,5.7-0.84,11.65-0.73,17.71,0.42,1.2,0,2.3,0.1,3.61,0.32-0.79,0-1.78,0.26-2.62,0.11,0.68,0.37,1.26,0.26,1.99l0.26-2.35h0.11v6.74c-0.11-6.06,2.14-11.34,2.25-17.14"/><path id="path4761" d="M115.93,131.06l-0.16,2.14,0.16-1.78v-0.36"/><path id="path4763" d="M131.08,114.13c-0.89-0.89-1.83-1.83-2.77-2.25-0.11,3.19,1.62,6.22,2.66,9.3,1.88,3.5,3.03,7.42,5.75,10.66l0.36,0.99c-2.14-6.16-3.6-12.64-6-18.7"/><path id="path4765" d="M102.5,114.76c0.21-0.11,0.31,0.15,0.47,0.26-0.05-1.36,0.73-1.31-0.1-2.51-0.37-0.26-0.74-0.42-1.26-0.37-3.864,3.56-5.222,8.73-6.633,13.01l1.097-2.61c-0.627,2.87-1.619,5.9-2.508,8.88,2.195-5.85,5.486-11.39,8.934-16.66"/><path id="path4767" d="M115.51,126.2l0.15-2.67-0.15,2.67"/><path id="path4769" d="M157.51,118.52c-5.59-4.18-12.07-8.83-15.78-15.41-2.09-0.58-3.86-1.94-6.27-1.78,0.58,0.26-0.26,0.84,0,1.25h-0.52c0.42,0.47,1.2,0.58,1.26,1.26-0.47,0.15-0.21,1.51-1.36,1.04,0.26,0.63,0.89,0.79,1.51,0.84,0.58,1.36,2.15,0.89,3.14,1.51,5.53,3.82,10.29,9.56,16.56,11.81,0.52-0.1,1.36,0.26,1.46-0.52"/><path id="path4771" d="M79.148,110.26l0.261,0.26c3.03-1.98,5.694-5.01,9.142-5.9,0.732,0.16,1.045,0.11,1.776,0.11,0.105-0.27,0-0.68,0.366-0.89,0.627,0.36,0.731-0.37,0.993-0.73-0.209-0.32-0.679,0.1-0.836-0.37,0.313-0.63,1.567-0.31,1.462-1.25-0.574-0.94-2.507-0.05-1.723-1.884l-0.366-1.515c-5.329,1.358-8.254,6.739-12.068,10.399l1.619-1.1c-0.104-0.05-0.156,0.05-0.209,0.11l-0.261-0.27c0.888-0.26,1.097-1.35,2.142-1.35-0.209,1.04-1.724,1.56-2.298,2.61,0.783-0.16,1.514-1.1,2.298-1.62-0.47,1.04-1.515,1.93-2.664,2.77l-2.612,3.13c1.045-1.04,1.828-1.88,2.978-2.51"/><path id="path4773" d="M116.55,111.88c5.38,0.58,10.03-1.62,14.16-4.28-6.11,1.57-12.69,4.07-18.96,0.78-1-0.15-2.09-0.62-2.51-1.62l0.16-0.42-0.89-0.36c0,0.16,0.05,0.31-0.11,0.36-0.42-0.41-1.36-0.1-1.77-0.73l0.1-0.1c-0.52-0.31-1.77-1.05-2.71-0.78-4.184-3.29-7.476-7.005-9.409-11.759,0.471,0,1.097,0.888,1.097,1.359,0.157,0.104,0.209,0.313,0.366,0.261l0.157-0.157c-0.314,0.731,0.731,0.94,0.888,1.515-0.157-0.575-1.202-1.672-0.627-2.508l-2.142-3.395c-0.679,0.261-0.522-0.575-0.784-0.836,0.418-1.829-1.097-4.232-1.097-6.53,0.052-1.672-0.992-2.56-0.261-4.023l0.104,0.104c0.105-0.156,0.418-1.358-0.208-0.992-0.157-0.314,0.261-0.314,0.208-0.366-0.208-0.418-0.104-1.045,0.262-1.358l0.156,0.104c0.314-0.679,0.889-1.828,0.471-2.612,0.731,0,0.679-1.097,0.992-1.672,0.418-2.298,1.568-4.597,3.292-6.478,0.261-0.783,1.201-1.306,1.619-2.037,0.836,0.261,1.676-1.306,2.406-0.732l-0.16,0.105c1.46-0.418,1.1-2.09,2.87-1.985,1.94-1.15,4.29-0.418,6.43-0.627,2.77-0.679,5.12,1.253,7.63,0.731,1.67,0.522,3.29,1.568,5.01,1.515,2.98,1.463,6.32,2.926,8.41,6.165,4.24,5.538,6.22,12.381,5.28,19.8-1.46,6.164-7.26,12.538-13.79,13.268-7.42,1.62-13.43-2.402-17.29-8.41-2.62-4.336-3.3-11.18-0.42-15.672,2.35-4.545,7.62-5.747,12.54-5.225,2.71,0.418,5.59,1.463,6.89,4.127,2.46,3.762,0.79,8.934,0,12.904-0.63,1.359-2.04,1.933-3.24,2.508-2.77-0.052-5.43-0.157-7.42-2.142,0.42-2.926-0.15-6.374,2.93-8.15,1.1-0.261,1.93-1.045,3.24-0.731,0.36-1.045-1.15-0.575-1.62-0.993-2.04,0.784-4.02,1.933-4.55,4.232l-0.62,6.53c0.78,3.448,4.75,3.291,7.52,3.866,3.19-0.47,5.85-2.09,7.78-4.754,0.58-1.881,1.52-3.761,1.15-5.903,0.84-2.09,0-4.336-0.26-6.635-1.15-2.978-2.92-6.008-5.9-7.889-4.02-0.783-8.2-1.567-12.17,0-5.12,1.358-9.35,6.478-10.03,11.65-1.41,8.464,3.13,15.986,9.92,20.427,6.2,3.96,14.76,3.11,20.69-1.463,6.63-5.224,10.55-12.747,9.67-21.471-0.32-7.732-5.23-14.576-12.07-18.285-3.19-0.888-6.53-2.873-9.62-2.665-2.66-0.157-5.01-0.783-7.94-0.365l-1.09-0.366,0.1-0.522c0.47,0.104,0.89,0.156,1.41,0.156-4.49-0.365-9.51,0.523-13.059,2.978-0.679,0.94-1.829,0.94-2.508,1.515-4.545,2.09-5.694,7.157-7.522,11.18l-0.105,1.254c0.209-0.627,0.47-1.254,0.731-1.881,0.575,1.359-0.522,2.299-0.522,3.762-1.724,4.231-0.418,9.874,0,13.792,0.105,0.94,0.94,2.194,0.522,2.612,0.262,1.253,0.68,2.351,1.254,3.5,1.149-0.209,0.731,1.097,1.149,1.672,1.359,1.515,1.725,3.447,3.501,5.017,0.94,0.21,0.992-0.58,1.724,0-0.523-0.68-0.784-0.21-1.463-0.52,0.313,0.1,0.47-0.68,0.836-0.53-0.105-0.15-0.523-0.15-0.366-0.47,0.314-0.15,0.627,0.26,0.888,0.47-0.052,0.32,0.261,0.63,0.523,1.05,0.731-0.05,1.515,0.94,1.619,1.36-0.313,0.41-0.47-0.32-0.783-0.27l0.417,0.37-0.522,0.16,0.732,0.73v-0.11c0.414-0.26,0.884,0,1.144,0.37l-0.52,0.37c2.98,1.09,4.81,4.85,8.15,5.27,2.25,1.41,5.07,1.94,7.94,1.99v-0.11"/><path id="path4775" d="M114.78,110.37c-0.53-0.16-0.94-0.68-1.62-0.47,0.47,0.31,1.09,0.31,1.62,0.47"/><path id="path4777" d="M112.01,110.26h0.52-0.52"/><path id="path4779" d="M101.25,103.73l-0.63-0.62,0.63,0.62"/><path id="path4781" d="M98.582,102.74l-0.105,0.26h0.366l-0.261-0.26"/><path id="path4783" d="M98.843,102.58l-0.627-0.47,0.627,0.47"/><path id="path4785" d="M96.231,100.96l-0.366-0.36,0.366,0.36"/><path id="path4787" d="M91.842,98.718l-0.156-0.627,0.156,0.627"/><path id="path4789" d="M163.41,97.725c0-0.156,0.06-0.209,0.16-0.261-6.43-2.09-12.33-5.485-19.33-6.269-0.36,0.261-0.94,0.105-1.25,0.522,0.21,0.575,0.42,1.15,0.99,1.62-0.36,0.784-2.14-0.052-1.52,1.097,1.68,0.261,3.14,0.94,4.55,1.672,5.01,0.522,10.19,0.313,15.05,1.619h1.35"/><path id="path4791" d="M70.893,91.456c4.441,0.105,8.202-0.731,12.643-0.261,0.313,1.097,1.828-0.104,1.776,0.993,1.202-0.418-0.261-0.941,0.366-1.724,0.731-0.47,1.724-0.679,2.037-1.411-0.104-0.575-1.358-0.731-0.522-1.358-2.873-0.209-6.74-0.105-9.665-0.157-3.552,0.418-7,1.045-10.135,2.403,1.097,0.157,2.403-0.261,3.5-0.104-3.813,0.679-7.261,2.403-10.762,3.866l10.762-2.247"/><path id="path4793" d="M94.35,93.703l-0.157-0.366,0.157,0.366"/><path id="path4795" d="M151.87,79.806c5.12-0.679,10.92,0.157,14.83-3.134-0.2-0.627,0.27-0.889,0.63-1.254l-1.67,0.627c-7.36,0.836-16.46-1.881-21.42,4.231,0.52,0.47,0.94,0.627,1.62,0.888,2.25,0.105,3.97-1.097,6.01-1.358"/><path id="path4797" d="M88.447,79.649h0.105v-0.47h-0.105v0.47z"/><path id="path4799" d="M85.835,76.672c0.47,0,0.835-0.575,1.097-0.784l0.156-0.627c-0.313,0.157-0.418-0.261-0.627-0.366-0.104-0.209,0.157-0.261,0.209-0.365,0.262,0.104,0.366,0.313,0.627,0.261,0.366-0.575,0.366-0.888,0.523-1.515-0.209,0-0.366-0.261-0.523-0.366,0.627-0.47-0.052-1.097,0.157-1.515-1.881-1.881-4.702-1.463-6.792-2.769-3.552-1.41-7.261-2.873-11.127-3.134l-3.761-0.732c1.149,0.471,2.507,0.784,3.5,1.359-2.038,0.157-4.127-0.888-6.008-0.627,1.776,0.784,3.03,1.933,4.754,2.873-0.105,0.209-0.366,0.105-0.523,0.157l0.157,0.104h-0.888l1.358,0.262-0.104,0.104c-0.052,0,0.679-0.052,0.888,0.261-0.105,0.888,2.403,0.314,1.097,0.993,0.314,0.313,0.732,0.261,1.15,0.261l-0.366-0.261c1.41,0,2.351,1.149,3.761,1.619,0.94,0.471,1.985,0.575,2.717,1.515l-0.105,0.157c1.568,0.366,3.03,2.351,4.911,2.508,0.627,1.045,2.194,0.052,3.344,0.365l0.418,0.262"/><path id="path4801" d="M91.215,74.634l0.105,0.157,0.261-0.418c-0.783-0.313-0.104-1.41-0.104-1.724-0.47,1.202-0.732,2.351-0.784,3.605,0.366-0.157-0.209-1.306,0.522-1.62"/><path id="path4803" d="M90.85,71.029c-0.157-0.104-0.157-0.261-0.157-0.418l-0.261,0.784,0.418-0.366"/><path id="path4805" d="M90.954,70.507l0.105-0.522-0.105,0.522"/><path id="path4807" d="M149.15,62.88c2.2-1.62,3.97-3.866,4.76-6.27-4.76,2.561-10.35,4.128-14.32,8.621,0.16,0.731,0.99,0.156,1.41,0.522l-0.26,0.261c3.4,1.15,5.59-2.142,8.41-3.134"/><path id="path4809" d="M94.35,60.738c-1.149-1.254,1.776-2.299-0.157-3.292-4.858-4.701-10.291-10.239-15.672-14.889l2.298,2.508c-0.783,0.209-1.41-0.836-2.037-1.149l-2.247-2.142c0.836,0.836,1.829,1.724,1.986,2.664-1.463-0.992-2.978-2.037-4.493-3.03,0.836,1.202,1.881,1.515,2.612,2.508-0.052,0.156-0.209,0.156-0.366,0.156,4.545,6.113,9.769,12.538,16.038,17.397-0.156,0.366,0.262,0.68,0.523,0.784,0.731,0,1.149-0.94,1.515-1.515"/><path id="path4811" d="M97.223,60.477l1.515-1.15c-1.149,0.261-2.142,0.784-3.03,1.672,0.627,0.052,0.732-0.888,1.515-0.522"/><path id="path4813" d="M125.54,57.864c-0.16-0.104-0.37-0.156-0.63-0.156,0.21,0.052,0.42,0.156,0.63,0.156"/><path id="path4815" d="M129.93,53.685c1.25,0.157,0.21-1.045,0.52-1.463l-0.37-0.784c1.15-4.336,1.88-9.037,1.73-13.791-3.4,4.858-4.39,10.866-6.9,16.195h0.16c0.26,0.261-0.05,0.574-0.26,0.731,1.25,0.941,3.5,1.463,5.01,0.523l0.11-1.411"/><path id="path4817" d="M110.49,51.7c-0.36-0.523,0.53-0.836,0.79-1.254-1.1-0.104-0.21-1.619-1.41-1.359-4.45-6.373-7.16-13.478-10.139-20.478-0.731-1.045-1.463-2.403-2.612-2.978l-0.261,0.366c3.134,9.037,5.802,18.336,10.032,26.957l-0.37,0.731,1.26,0.784c1.09-0.732,1.93-1.568,2.71-2.769"/></g></g></svg>

--- a/htdocs/svg-edit/editor/ext-connector.js	Fri Apr 23 22:29:49 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,367 +0,0 @@
-$(function() {
-	svgCanvas.addExtension("Connector", function(vars) {
-		var svgcontent = vars.content,
-			svgroot = vars.root,
-			getNextId = vars.getNextId,
-			getElem = vars.getElem,
-			addElem = vars.addSvgElementFromJson,
-			selManager = vars.selectorManager,
-			started = false,
-			start_x,
-			start_y,
-			cur_line,
-			start_elem,
-			end_elem,
-			connections = [],
-			conn_class = "se_connect",
-			connect_str = "-SE_CONNECT-",
-			selElems;
-			
-		var lang_list = {
-			"en":[
-				{"id": "mode_connect", "title": "Connect two objects" },
-				{"id": "conn_arrow_none", "textContent": "No arrow" },
-				{"id": "conn_arrow_arrow", "textContent": "Arrow" }
-			],
-			"fr":[
-				{"id": "mode_connect", "title": "Connecter deux objets"},
-				{"id": "conn_arrow_none", "textContent": "Sans flèche" },
-				{"id": "conn_arrow_arrow", "textContent": "Flèche" }
-			]
-		};
-		
-		function showPanel(on) {
-			var conn_rules = $('#connector_rules');
-			if(!conn_rules.length) {
-				conn_rules = $('<style id="connector_rules"><\/style>').appendTo('head');
-			} 
-			conn_rules.text(!on?"":"#tool_clone, #tool_topath, #tool_angle, #xy_panel { display: none !important; }");
-			$('#connector_panel').toggle(on);
-			
-			if(on) {
-				var has_arrow = selElems[0].getAttribute("marker-mid");
-				$("#connector_arrow").val(has_arrow?"arrow":"none");
-			}
-		}
-		
-		function setPoint(elem, pos, x, y, setMid) {
-			var pts = elem.points;
-			var pt = svgroot.createSVGPoint();
-			pt.x = x;
-			pt.y = y;
-			if(pos === 'end') pos = pts.numberOfItems-1;
-			// TODO: Test for this on init, then use alt only if needed
-			try {
-				pts.replaceItem(pt, pos);
-			} catch(err) {
-				// Should only occur in FF which formats points attr as "n,n n,n", so just split
-				var pt_arr = elem.getAttribute("points").split(" ");
-				for(var i=0; i< pt_arr.length; i++) {
-					if(i == pos) {
-						pt_arr[i] = x + ',' + y;
-					}
-				}
-				elem.setAttribute("points",pt_arr.join(" ")); 
-			}
-			
-			if(setMid) {
-				// Add center point
-				var pt_start = pts.getItem(0);
-				var pt_end = pts.getItem(pts.numberOfItems-1);
-				setPoint(elem, 1, (pt_end.x + pt_start.x)/2, (pt_end.y + pt_start.y)/2);
-			}
-		}
-		
-		function addArrow() {
-			var defs = vars.findDefs();
-			var m_id = "se_connector_arrow";
-			var marker = getElem(m_id);
-			
-			if(!marker) {
-				marker = addElem({
-					"element": "marker",
-					"attr": {
-						"viewBox": "0 0 10 10",
-						"id": m_id,
-						"refX": 5,
-						"refY": 5,
-						"markerUnits": "strokeWidth",
-						"markerWidth": 16,
-						"markerHeight": 14,
-						"orient": "auto"
-					}
-				});
-				var arrow = addElem({
-					"element": "path",
-					"attr": {
-						"d": "M0,0 L10,5 L0,10 z",
-						"fill": "#000"
-					}
-				});
-				
-				marker.appendChild(arrow);
-				defs.appendChild(marker);
-			}
-			
-			selElems[0].setAttribute("marker-mid", "url(#" + m_id + ")");
-		}
-
-		function remArrow() {
-			selElems[0].removeAttribute("marker-mid");
-		}
-		
-		// Init code
-		(function() {
-			var conn_tools = $('<div id="connector_panel">\
-			<label><select id="connector_arrow">\
-			<option id="conn_arrow_none" value="none">No arrow</option>\
-			<option id="conn_arrow_arrow" value="arrow">Arrow</option>\
-			</select></label></div>"').hide().appendTo("#tools_top");
-			
-			$('#connector_arrow').change(function() {
-				switch ( this.value ) {
-					case "arrow":
-						addArrow();
-						break;
-					case "none":
-						remArrow();
-						break;
-				}
-			});
-
-			vars.extendWhitelist({
-				"marker": ["viewBox", "id", "refX", "refY", "markerUnits", "markerWidth", "markerHeight", "orient"],
-				"polyline": ["class", "marker-mid"]
-			});
-		}());
-		
-		return {
-			name: "Connector",
-			svgicons: "images/conn.svg",
-			buttons: [{
-				id: "mode_connect",
-				type: "mode",
-				icon: "images/cut.png",
-				title: "Connect two objects",
-				key: "L",
-				includeWith: {
-					button: '#tool_line',
-					isDefault: false,
-					position: 1
-				},
-				events: {
-					'click': function() {
-						svgCanvas.setMode("connector");
-					}
-				}
-			}],
-			addLangData: function(lang) {
-				return {
-					data: lang_list[lang]
-				};
-			},
-			mouseDown: function(opts) {
-				var e = opts.event;
-				
-				start_x = opts.start_x,
-				start_y = opts.start_y;
-				var mode = svgCanvas.getMode();
-				
-				if(mode == "connector") {
-					
-					if(started) return;
-					
-					if(e.target.parentNode.parentNode == svgcontent) {
-						// Connectable element
-						start_elem = e.target;
-						
-						// Get center of source element
-						var bb = svgCanvas.getStrokedBBox([start_elem]);
-						var x = bb.x + bb.width/2;
-						var y = bb.y + bb.height/2;
-						
-						started = true;
-						cur_line = addElem({
-							"element": "polyline",
-							"attr": {
-								"points": (x+','+y+' '+x+','+y+' '+start_x+','+start_y),
-								"stroke": '#000',
-								"stroke-width": 1,
-								"fill": "none",
-								"opacity": .5,
-								"style": "pointer-events:none"
-							}
-						});
-					}
-					return {
-						started: true
-					};
-				} else if(mode == "select") {
-					
-					// Check if selected elements have connections
-					var elems = opts.selectedElements;
-					var i = elems.length;
-					var connectors = $(svgcontent).find("." + conn_class);
-					if(!connectors.length) return;
-					connections = [];
-					
-					while(i--) {
-						var elem = elems[i];
-						if(!elem) continue;
-						if(elem.getAttribute('class') == conn_class) continue;
-						var elem_id = elem.id;
-						connectors.each(function() {
-							var con_id = this.id;
-							if(con_id.indexOf(elem_id) != -1) {
-								var is_start = true;
-								if(con_id.indexOf(connect_str + elem_id) != -1) {
-									// Found connector (selected is end elem)
-									is_start = false;
-								}
-								
-								var bb = svgCanvas.getStrokedBBox([elem]);
-								var x = bb.x + bb.width/2;
-								var y = bb.y + bb.height/2;
-								connections.push({
-									elem: elem,
-									connector: this,
-									is_start: is_start,
-									start_x: x,
-									start_y: y
-								});	
-							}
-						});
-					}
-				}
-			},
-			mouseMove: function(opts) {
-				var zoom = svgCanvas.getZoom();
-				var e = opts.event;
-				var x = opts.mouse_x/zoom;
-				var y = opts.mouse_y/zoom;
-				
-				var	diff_x = x - start_x,
-					diff_y = y - start_y;
-									
-				var mode = svgCanvas.getMode();
-				
-				if(mode == "connector" && started) {
-					// Set middle point for marker
-					setPoint(cur_line, 'end', x, y, true);
-				} else if(mode == "select") {
-					var slen = selElems.length;
-					
-					while(slen--) {
-						var elem = selElems[slen];
-						// Look for selected connector elements
-						if(elem && elem.getAttribute('class') == conn_class) {
-							// Remove the "translate" transform given to move
-							svgCanvas.getTransformList(elem).clear();
-						}
-					}
-					if(connections.length) {
-						// Update line with element
-						var i = connections.length;
-						while(i--) {
-							var conn = connections[i];
-							var line = conn.connector;
-							var elem = conn.elem;
-							var pt_x = conn.start_x + diff_x;
-							var pt_y = conn.start_y + diff_y;
-							setPoint(line, conn.is_start?0:'end', pt_x, pt_y, true);
-						}
-					}
-				} 
-			},
-			mouseUp: function(opts) {
-				var zoom = svgCanvas.getZoom();
-				var e = opts.event,
-					x = opts.mouse_x/zoom,
-					y = opts.mouse_y/zoom;
-				
-				if(svgCanvas.getMode() == "connector") {
-					if(e.target.parentNode.parentNode != svgcontent) {
-						// Not a valid target element, so remove line
-						$(cur_line).remove();
-						started = false;
-						return {
-							keep: false,
-							element: null,
-							started: started
-						}
-					} else if(e.target == start_elem) {
-						// Start line through click
-						started = true;
-						return {
-							keep: true,
-							element: null,
-							started: started
-						}						
-					} else {
-						// Valid end element
-						end_elem = e.target;
-						var line_id = start_elem.id + connect_str + end_elem.id;
-						var alt_line_id = end_elem.id + connect_str + start_elem.id;
-						
-						// Don't create connector if one already exists
-						if($('#'+line_id + ', #' + alt_line_id).length) {
-							$(cur_line).remove();
-							return {
-								keep: false,
-								element: null,
-								started: false
-							}
-						}
-						
-						var bb = svgCanvas.getStrokedBBox([end_elem]);
-						var x = bb.x + bb.width/2;
-						var y = bb.y + bb.height/2;
-						setPoint(cur_line, 'end', x, y, true);
-						cur_line.id = line_id;
-						cur_line.setAttribute("class", conn_class);
-						svgCanvas.addToSelection([cur_line]);
-						svgCanvas.moveToBottomSelectedElement();
-						
-						started = false;
-						return {
-							keep: true,
-							element: cur_line,
-							started: started
-						}
-					}
-				}
-			},
-			selectedChanged: function(opts) {
-				
-				// Use this to update the current selected elements
-				selElems = opts.elems;
-				
-				var i = selElems.length;
-				
-				while(i--) {
-					var elem = selElems[i];
-					if(elem && elem.getAttribute('class') == conn_class) {
-						selManager.requestSelector(elem).showGrips(false);
-						
-						if(opts.selectedElement && !opts.multiselected) {
-							// TODO: Set up context tools and hide most regular line tools
-							showPanel(true);
-						} else {
-							showPanel(false);
-						}
-					} else {
-						showPanel(false);
-					}
-				}
-			},
-			elementChanged: function(opts) {
-				var elem = opts.elems[0];
-				if (elem && elem.tagName == 'svg' && elem.id == "svgcontent") {
-					// Update svgcontent (can change on import)
-					svgcontent = elem;
-				}
-				
-			}
-		};
-	});
-});
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/extensions/closepath_icons.svg	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,41 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+<g id="tool_closepath">
+<svg viewBox="0 0 300 300" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g>
+  <title>Layer 1</title>
+  <path stroke="#000" stroke-width="15" fill="#ffc8c8" d="m121.5,40l-84,106l27,115l166,2l29,-111"/>
+  <line x1="240" y1="136" x2="169.5" y2="74" stroke="#A00" stroke-width="25" fill="none"/>
+  <path stroke="none" fill ="#A00" d="m158,65l31,74l-3,-50l51,-3z"/>
+  <g stroke-width="15" stroke="#00f" fill="#0ff">
+  <circle r="30" cy="41" cx="123"/>
+  <circle r="30" cy="146" cx="40"/>
+  <circle r="30" cy="260" cx="69"/>
+  <circle r="30" cy="260" cx="228"/>
+  <circle r="30" cy="148" cx="260"/>
+  </g>
+ </g>
+</svg>
+</g>
+<g id="tool_openpath">
+<svg viewBox="0 0 300 300" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g>
+  <title>Layer 1</title>
+  <path stroke="#000" stroke-width="15" fill="#ffc8c8" d="m123.5,38l-84,106l27,115l166,2l29,-111"/>
+  <line x1="276.5" y1="153" x2="108.5" y2="24" stroke="#000" stroke-width="10" fill="none"/>
+  <g stroke-width="15" stroke="#00f" fill="#0ff">
+   <circle r="30" cy="41" cx="123"/>
+   <circle r="30" cy="146" cx="40"/>
+   <circle r="30" cy="260" cx="69"/>
+   <circle r="30" cy="260" cx="228"/>
+   <circle r="30" cy="148" cx="260"/>
+  </g>
+  <g  stroke="#A00" stroke-width="15" fill="none">
+   <line x1="168" y1="24" x2="210" y2="150"/>
+   <line x1="210" y1="24" x2="168" y2="150"/>
+  </g>
+ </g>
+</svg>
+</g>
+
+<g id="svg_eof"/>
+</svg>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/extensions/ext-arrows.js	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,296 @@
+/*
+ * ext-arrows.js
+ *
+ * Licensed under the Apache License, Version 2
+ *
+ * Copyright(c) 2010 Alexis Deveria
+ *
+ */
+
+ 
+svgEditor.addExtension("Arrows", function(S) {
+		var svgcontent = S.svgcontent,
+			addElem = S.addSvgElementFromJson,
+			nonce = S.nonce,
+			randomize_ids = S.randomize_ids,
+			selElems;
+
+		svgCanvas.bind('setarrownonce', setArrowNonce);
+		svgCanvas.bind('unsetsetarrownonce', unsetArrowNonce);
+			
+		var lang_list = {
+			"en":[
+				{"id": "arrow_none", "textContent": "No arrow" }
+			],
+			"fr":[
+				{"id": "arrow_none", "textContent": "Sans flèche" }
+			]
+		};
+		
+		var prefix = 'se_arrow_';
+		if (randomize_ids) {
+		  var arrowprefix = prefix + nonce + '_';
+		} else {
+		  var arrowprefix = prefix;
+		}
+
+		var pathdata = {
+			fw: {d:"m0,0l10,5l-10,5l5,-5l-5,-5z", refx:8,  id: arrowprefix + 'fw'},
+			bk: {d:"m10,0l-10,5l10,5l-5,-5l5,-5z", refx:2, id: arrowprefix + 'bk'}
+		}
+		
+		function setArrowNonce(window, n) {
+		    randomize_ids = true;
+		    arrowprefix = prefix + n + '_';
+ 			pathdata.fw.id = arrowprefix + 'fw';
+			pathdata.bk.id = arrowprefix + 'bk';
+		}
+
+		function unsetArrowNonce(window) {
+		    randomize_ids = false;
+		    arrowprefix = prefix;
+ 			pathdata.fw.id = arrowprefix + 'fw';
+			pathdata.bk.id = arrowprefix + 'bk';
+		}
+
+		function getLinked(elem, attr) {
+			var str = elem.getAttribute(attr);
+			if(!str) return null;
+			var m = str.match(/\(\#(.*)\)/);
+			if(!m || m.length !== 2) {
+				return null;
+			}
+			return S.getElem(m[1]);
+		}
+		
+		function showPanel(on) {
+			$('#arrow_panel').toggle(on);
+			
+			if(on) {
+				var el = selElems[0];
+				var end = el.getAttribute("marker-end");
+				var start = el.getAttribute("marker-start");
+				var mid = el.getAttribute("marker-mid");
+				var val;
+				
+				if(end && start) {
+					val = "both";
+				} else if(end) {
+					val = "end";
+				} else if(start) {
+					val = "start";
+				} else if(mid) {
+					val = "mid";
+					if(mid.indexOf("bk") != -1) {
+						val = "mid_bk";
+					}
+				}
+				
+				if(!start && !mid && !end) {
+					val = "none";
+				}
+				
+				$("#arrow_list").val(val);
+			}
+		}
+		
+		function resetMarker() {
+			var el = selElems[0];
+			el.removeAttribute("marker-start");
+			el.removeAttribute("marker-mid");
+			el.removeAttribute("marker-end");
+		}
+		
+		function addMarker(dir, type, id) {
+			// TODO: Make marker (or use?) per arrow type, since refX can be different
+			id = id || arrowprefix + dir;
+			
+			var marker = S.getElem(id);
+
+			var data = pathdata[dir];
+			
+			if(type == "mid") {
+				data.refx = 5;
+			}
+
+			if(!marker) {
+				marker = addElem({
+					"element": "marker",
+					"attr": {
+						"viewBox": "0 0 10 10",
+						"id": id,
+						"refY": 5,
+						"markerUnits": "strokeWidth",
+						"markerWidth": 5,
+						"markerHeight": 5,
+						"orient": "auto",
+						"style": "pointer-events:none" // Currently needed for Opera
+					}
+				});
+				var arrow = addElem({
+					"element": "path",
+					"attr": {
+						"d": data.d,
+						"fill": "#000000"
+					}
+				});
+				marker.appendChild(arrow);
+				S.findDefs().appendChild(marker);
+			} 
+			
+			marker.setAttribute('refX', data.refx);
+			
+			return marker;
+		}
+		
+		function setArrow() {
+			var type = this.value;
+			resetMarker();
+		
+			if(type == "none") {
+				return;
+			}
+		
+			// Set marker on element
+			var dir = "fw";
+			if(type == "mid_bk") {
+				type = "mid";
+				dir = "bk";
+			} else if(type == "both") {
+				addMarker("bk", type);
+				svgCanvas.changeSelectedAttribute("marker-start", "url(#" + pathdata.bk.id + ")");
+				type = "end";
+				dir = "fw";
+			} else if (type == "start") {
+				dir = "bk";
+			}
+			
+			addMarker(dir, type);
+			svgCanvas.changeSelectedAttribute("marker-"+type, "url(#" + pathdata[dir].id + ")");
+			S.call("changed", selElems);
+		}
+		
+		function colorChanged(elem) {
+			var color = elem.getAttribute('stroke');
+			
+			var mtypes = ['start','mid','end'];
+			var defs = S.findDefs();
+			
+			$.each(mtypes, function(i, type) {
+				var marker = getLinked(elem, 'marker-'+type);
+				if(!marker) return;
+				
+				var cur_color = $(marker).children().attr('fill');
+				var cur_d = $(marker).children().attr('d');
+				var new_marker = null;
+				if(cur_color === color) return;
+				
+				var all_markers = $(defs).find('marker');
+				// Different color, check if already made
+				all_markers.each(function() {
+					var attrs = $(this).children().attr(['fill', 'd']);
+					if(attrs.fill === color && attrs.d === cur_d) {
+						// Found another marker with this color and this path
+						new_marker = this;
+					}
+				});
+				
+				if(!new_marker) {
+					// Create a new marker with this color
+					var last_id = marker.id;
+					var dir = last_id.indexOf('_fw') !== -1?'fw':'bk';
+					
+					new_marker = addMarker(dir, type, arrowprefix + dir + all_markers.length);
+
+					$(new_marker).children().attr('fill', color);
+				}
+				
+				$(elem).attr('marker-'+type, "url(#" + new_marker.id + ")");
+				
+				// Check if last marker can be removed
+				var remove = true;
+				$(S.svgcontent).find('line, polyline, path, polygon').each(function() {
+					var elem = this;
+					$.each(mtypes, function(j, mtype) {
+						if($(elem).attr('marker-' + mtype) === "url(#" + marker.id + ")") {
+							return remove = false;
+						}
+					});
+					if(!remove) return false;
+				});
+				
+				// Not found, so can safely remove
+				if(remove) {
+					$(marker).remove();
+				}
+
+			});
+			
+		}
+		
+		return {
+			name: "Arrows",
+			context_tools: [{
+				type: "select",
+				panel: "arrow_panel",
+				title: "Select arrow type",
+				id: "arrow_list",
+				options: {
+					none: "No arrow",
+					end: "---->",
+					start: "<----",
+					both: "<--->",
+					mid: "-->--",
+					mid_bk: "--<--"
+				},
+				defval: "none",
+				events: {
+					change: setArrow
+				}
+			}],
+			callback: function() {
+				$('#arrow_panel').hide();
+			},
+			addLangData: function(lang) {
+				return {
+					data: lang_list[lang]
+				};
+			},
+			selectedChanged: function(opts) {
+				
+				// Use this to update the current selected elements
+				selElems = opts.elems;
+				
+				var i = selElems.length;
+				var marker_elems = ['line','path','polyline','polygon'];
+				
+				while(i--) {
+					var elem = selElems[i];
+					if(elem && $.inArray(elem.tagName, marker_elems) != -1) {
+						if(opts.selectedElement && !opts.multiselected) {
+							showPanel(true);
+						} else {
+							showPanel(false);
+						}
+					} else {
+						showPanel(false);
+					}
+				}
+			},
+			elementChanged: function(opts) {
+				var elem = opts.elems[0];
+				if(elem && (
+					elem.getAttribute("marker-start") ||
+					elem.getAttribute("marker-mid") ||
+					elem.getAttribute("marker-end")
+				)) {
+	// 								var start = elem.getAttribute("marker-start");
+	// 								var mid = elem.getAttribute("marker-mid");
+	// 								var end = elem.getAttribute("marker-end");
+					// Has marker, so see if it should match color
+					colorChanged(elem);
+				}
+				
+			}
+		};
+});

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/extensions/ext-closepath.js	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,92 @@
+/*
+ * ext-closepath.js
+ *
+ * Licensed under the Apache License, Version 2
+ *
+ * Copyright(c) 2010 Jeff Schiller
+ *
+ */
+
+// This extension adds a simple button to the contextual panel for paths
+// The button toggles whether the path is open or closed
+svgEditor.addExtension("ClosePath", function(S) {
+		var selElems,
+			updateButton = function(path) {
+				var seglist = path.pathSegList,
+					closed = seglist.getItem(seglist.numberOfItems - 1).pathSegType==1,
+					showbutton = closed ? '#tool_openpath' : '#tool_closepath',
+					hidebutton = closed ? '#tool_closepath' : '#tool_openpath';
+					$(hidebutton).hide();
+					$(showbutton).show();
+			},
+			showPanel = function(on) {
+				$('#closepath_panel').toggle(on);
+				if (on) {
+					var path = selElems[0];
+					if (path) updateButton(path);
+				}
+			},
+		
+			toggleClosed = function() {
+				var path = selElems[0];
+				if (path) {
+					var seglist = path.pathSegList,
+						last = seglist.numberOfItems - 1;					
+					// is closed
+					if(seglist.getItem(last).pathSegType == 1) {
+						seglist.removeItem(last);
+					}
+					else {
+						seglist.appendItem(path.createSVGPathSegClosePath());
+					}
+					updateButton(path);
+				}
+			};
+		
+		return {
+			name: "ClosePath",
+			svgicons: "extensions/closepath_icons.svg",
+			buttons: [{
+				id: "tool_openpath",
+				type: "context",
+				panel: "closepath_panel",
+				title: "Open path",
+				events: {
+					'click': function() {
+						toggleClosed();
+					}
+				}
+			},
+			{
+				id: "tool_closepath",
+				type: "context",
+				panel: "closepath_panel",
+				title: "Close path",
+				events: {
+					'click': function() {
+						toggleClosed();
+					}
+				}
+			}],
+			callback: function() {
+				$('#closepath_panel').hide();
+			},
+			selectedChanged: function(opts) {
+				selElems = opts.elems;
+				var i = selElems.length;
+				
+				while(i--) {
+					var elem = selElems[i];
+					if(elem && elem.tagName == 'path') {
+						if(opts.selectedElement && !opts.multiselected) {
+							showPanel(true);
+						} else {
+							showPanel(false);
+						}
+					} else {
+						showPanel(false);
+					}
+				}
+			}
+		};
+});

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/extensions/ext-connector.js	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,555 @@
+/*
+ * ext-connector.js
+ *
+ * Licensed under the Apache License, Version 2
+ *
+ * Copyright(c) 2010 Alexis Deveria
+ *
+ */
+ 
+svgEditor.addExtension("Connector", function(S) {
+	var svgcontent = S.svgcontent,
+		svgroot = S.svgroot,
+		getNextId = S.getNextId,
+		getElem = S.getElem,
+		addElem = S.addSvgElementFromJson,
+		selManager = S.selectorManager,
+		curConfig = svgEditor.curConfig,
+		started = false,
+		start_x,
+		start_y,
+		cur_line,
+		start_elem,
+		end_elem,
+		connections = [],
+		conn_sel = ".se_connector",
+		se_ns,
+// 			connect_str = "-SE_CONNECT-",
+		selElems = [];
+		
+	var lang_list = {
+		"en":[
+			{"id": "mode_connect", "title": "Connect two objects" }
+		],
+		"fr":[
+			{"id": "mode_connect", "title": "Connecter deux objets"}
+		]
+	};
+	
+	function showPanel(on) {
+		var conn_rules = $('#connector_rules');
+		if(!conn_rules.length) {
+			conn_rules = $('<style id="connector_rules"><\/style>').appendTo('head');
+		} 
+		conn_rules.text(!on?"":"#tool_clone, #tool_topath, #tool_angle, #xy_panel { display: none !important; }");
+		$('#connector_panel').toggle(on);
+	}
+	
+	function setPoint(elem, pos, x, y, setMid) {
+		var pts = elem.points;
+		var pt = svgroot.createSVGPoint();
+		pt.x = x;
+		pt.y = y;
+		if(pos === 'end') pos = pts.numberOfItems-1;
+		// TODO: Test for this on init, then use alt only if needed
+		try {
+			pts.replaceItem(pt, pos);
+		} catch(err) {
+			// Should only occur in FF which formats points attr as "n,n n,n", so just split
+			var pt_arr = elem.getAttribute("points").split(" ");
+			for(var i=0; i< pt_arr.length; i++) {
+				if(i == pos) {
+					pt_arr[i] = x + ',' + y;
+				}
+			}
+			elem.setAttribute("points",pt_arr.join(" ")); 
+		}
+		
+		if(setMid) {
+			// Add center point
+			var pt_start = pts.getItem(0);
+			var pt_end = pts.getItem(pts.numberOfItems-1);
+			setPoint(elem, 1, (pt_end.x + pt_start.x)/2, (pt_end.y + pt_start.y)/2);
+		}
+	}
+	
+	function findConnectors() {
+		var elems = selElems;
+		var connectors = $(svgcontent).find(conn_sel);
+		connections = [];
+
+		// Loop through connectors to see if one is connected to the element
+		connectors.each(function() {
+			var start = $(this).data("c_start");
+			var end = $(this).data("c_end");
+			
+			var parts = [getElem(start), getElem(end)];
+			for(var i=0; i<2; i++) {
+				var c_elem = parts[i];
+				var add_this = false;
+				// The connected element might be part of a selected group
+				$(c_elem).parents().each(function() {
+					if($.inArray(this, elems) !== -1) {
+						// Pretend this element is selected
+						add_this = true;
+					}
+				});
+				
+				if(!c_elem || !c_elem.parentNode) {
+					$(this).remove();
+					continue;
+				}
+				
+				if($.inArray(c_elem, elems) !== -1 || add_this) {
+					var bb = svgCanvas.getStrokedBBox([c_elem]);
+					connections.push({
+						elem: c_elem,
+						connector: this,
+						is_start: (i === 0),
+						start_x: bb.x,
+						start_y: bb.y
+					});	
+				}
+			}
+		});
+	}
+	
+	function updateConnectors() {
+		// Updates connector lines based on selected elements
+		// Is not used on mousemove, as it runs getStrokedBBox every time,
+		// which isn't necessary there.
+		findConnectors();
+		if(connections.length) {
+			// Update line with element
+			var i = connections.length;
+			while(i--) {
+				var conn = connections[i];
+				var line = conn.connector;
+				var elem = conn.elem;
+
+				var sw = line.getAttribute('stroke-width');
+				var pre = conn.is_start?'start':'end';
+				
+				// Update bbox for this element
+				var bb = svgCanvas.getStrokedBBox([elem]);
+				bb.x = conn.start_x;
+				bb.y = conn.start_y;
+				$(line).data(pre+'_bb', bb);
+				var add_offset = $(line).data(pre+'_off');
+			
+				var alt_pre = conn.is_start?'end':'start';
+				
+				// Get center pt of connected element
+				var bb2 = $(line).data(alt_pre+'_bb');
+				var src_x = bb2.x + bb2.width/2;
+				var src_y = bb2.y + bb2.height/2;
+				
+				// Set point of element being moved
+				var pt = getBBintersect(src_x, src_y, bb, add_offset?sw:0);
+				setPoint(line, conn.is_start?0:'end', pt.x, pt.y, true);
+				
+				// Set point of connected element
+				var pt2 = getBBintersect(pt.x, pt.y, $(line).data(alt_pre + '_bb'), $(line).data(alt_pre + '_off')?sw:0);
+				setPoint(line, conn.is_start?'end':0, pt2.x, pt2.y, true);
+				
+				// Update points attribute manually for webkit
+				if(navigator.userAgent.indexOf('AppleWebKit') != -1) {
+					var pts = line.points;
+					var len = pts.numberOfItems;
+					var pt_arr = Array(len);
+					for(var j=0; j< len; j++) {
+						var pt = pts.getItem(j);
+						pt_arr[j] = pt.x + ',' + pt.y;
+					}	
+					line.setAttribute("points",pt_arr.join(" ")); 
+				}
+
+			}
+		}
+	}
+	
+	function getBBintersect(x, y, bb, offset) {
+		if(offset) {
+			offset -= 0;
+			bb = $.extend({}, bb);
+			bb.width += offset;
+			bb.height += offset;
+			bb.x -= offset/2;
+			bb.y -= offset/2;
+		}
+	
+		var mid_x = bb.x + bb.width/2;
+		var mid_y = bb.y + bb.height/2;
+		var len_x = x - mid_x;
+		var len_y = y - mid_y;
+		
+		var slope = Math.abs(len_y/len_x);
+		
+		var ratio;
+		
+		if(slope < bb.height/bb.width) {
+			ratio = (bb.width/2) / Math.abs(len_x);
+		} else {
+			ratio = (bb.height/2) / Math.abs(len_y);
+		}
+		
+		
+		return {
+			x: mid_x + len_x * ratio,
+			y: mid_y + len_y * ratio
+		}
+	}
+	
+	// Do once
+	(function() {
+		var gse = svgCanvas.groupSelectedElements;
+		
+		svgCanvas.groupSelectedElements = function() {
+			svgCanvas.removeFromSelection($(conn_sel).toArray());
+			gse();
+		}
+		
+		var mse = svgCanvas.moveSelectedElements;
+		
+		svgCanvas.moveSelectedElements = function() {
+			svgCanvas.removeFromSelection($(conn_sel).toArray());
+			mse.apply(this, arguments);
+			updateConnectors();
+		}
+		
+		se_ns = svgCanvas.getEditorNS();
+	}());
+	
+	// Do on reset
+	function init() {
+		// Make sure all connectors have data set
+		$(svgcontent).find('*').each(function() { 
+			var conn = this.getAttributeNS(se_ns, "connector");
+			if(conn) {
+				this.setAttribute('class', conn_sel.substr(1));
+				var conn_data = conn.split(' ');
+				var sbb = svgCanvas.getStrokedBBox([getElem(conn_data[0])]);
+				var ebb = svgCanvas.getStrokedBBox([getElem(conn_data[1])]);
+				$(this).data('c_start',conn_data[0])
+					.data('c_end',conn_data[1])
+					.data('start_bb', sbb)
+					.data('end_bb', ebb);
+				svgCanvas.getEditorNS(true);
+			}
+		});
+// 			updateConnectors();
+	}
+	
+// 		$(svgroot).parent().mousemove(function(e) {
+// // 			if(started 
+// // 				|| svgCanvas.getMode() != "connector"
+// // 				|| e.target.parentNode.parentNode != svgcontent) return;
+// 			
+// 			console.log('y')
+// // 			if(e.target.parentNode.parentNode === svgcontent) {
+// // 					
+// // 			}
+// 		});
+	
+	return {
+		name: "Connector",
+		svgicons: "images/conn.svg",
+		buttons: [{
+			id: "mode_connect",
+			type: "mode",
+			icon: "images/cut.png",
+			title: "Connect two objects",
+			key: "Shift+3",
+			includeWith: {
+				button: '#tool_line',
+				isDefault: false,
+				position: 1
+			},
+			events: {
+				'click': function() {
+					svgCanvas.setMode("connector");
+				}
+			}
+		}],
+		addLangData: function(lang) {
+			return {
+				data: lang_list[lang]
+			};
+		},
+		mouseDown: function(opts) {
+			var e = opts.event;
+			start_x = opts.start_x,
+			start_y = opts.start_y;
+			var mode = svgCanvas.getMode();
+			
+			if(mode == "connector") {
+				
+				if(started) return;
+				
+				var mouse_target = e.target;
+				
+				var parents = $(mouse_target).parents();
+				
+				if($.inArray(svgcontent, parents) != -1) {
+					// Connectable element
+					
+					// If child of foreignObject, use parent
+					var fo = $(mouse_target).closest("foreignObject");
+					start_elem = fo.length ? fo[0] : mouse_target;
+					
+					// Get center of source element
+					var bb = svgCanvas.getStrokedBBox([start_elem]);
+					var x = bb.x + bb.width/2;
+					var y = bb.y + bb.height/2;
+					
+					started = true;
+					cur_line = addElem({
+						"element": "polyline",
+						"attr": {
+							"id": getNextId(),
+							"points": (x+','+y+' '+x+','+y+' '+start_x+','+start_y),
+							"stroke": '#' + curConfig.initStroke.color,
+							"stroke-width": (!start_elem.stroke_width || start_elem.stroke_width == 0) ? curConfig.initStroke.width : start_elem.stroke_width,
+							"fill": "none",
+							"opacity": curConfig.initStroke.opacity,
+							"style": "pointer-events:none"
+						}
+					});
+					$(cur_line).data('start_bb', bb);
+				}
+				return {
+					started: true
+				};
+			} else if(mode == "select") {
+				findConnectors();
+			}
+		},
+		mouseMove: function(opts) {
+			var zoom = svgCanvas.getZoom();
+			var e = opts.event;
+			var x = opts.mouse_x/zoom;
+			var y = opts.mouse_y/zoom;
+			
+			var	diff_x = x - start_x,
+				diff_y = y - start_y;
+								
+			var mode = svgCanvas.getMode();
+			
+			if(mode == "connector" && started) {
+
+				// Set start point (adjusts based on bb)
+				var pt = getBBintersect(x, y, $(cur_line).data('start_bb'));
+				start_x = pt.x;
+				start_y = pt.y;
+				
+				setPoint(cur_line, 0, pt.x, pt.y, true);
+				
+				// Set end point
+				setPoint(cur_line, 'end', x, y, true);
+			} else if(mode == "select") {
+				var slen = selElems.length;
+				
+				while(slen--) {
+					var elem = selElems[slen];
+					// Look for selected connector elements
+					if(elem && $(elem).data('c_start')) {
+						// Remove the "translate" transform given to move
+						svgCanvas.removeFromSelection([elem]);
+						svgCanvas.getTransformList(elem).clear();
+
+					}
+				}
+				if(connections.length) {
+					// Update line with element
+					var i = connections.length;
+					while(i--) {
+						var conn = connections[i];
+						var line = conn.connector;
+						var elem = conn.elem;
+						
+						var pre = conn.is_start?'start':'end';
+						var sw = line.getAttribute('stroke-width');
+						
+						// Update bbox for this element
+						var bb = $(line).data(pre+'_bb');
+						bb.x = conn.start_x + diff_x;
+						bb.y = conn.start_y + diff_y;
+						$(line).data(pre+'_bb', bb);
+						
+						var alt_pre = conn.is_start?'end':'start';
+						
+						// Get center pt of connected element
+						var bb2 = $(line).data(alt_pre+'_bb');
+						var src_x = bb2.x + bb2.width/2;
+						var src_y = bb2.y + bb2.height/2;
+						
+						// Set point of element being moved
+						var pt = getBBintersect(src_x, src_y, bb, $(line).data(pre+'_off')?sw:0);
+						setPoint(line, conn.is_start?0:'end', pt.x, pt.y, true);
+						
+						// Set point of connected element
+						var pt2 = getBBintersect(pt.x, pt.y, $(line).data(alt_pre + '_bb'), $(line).data(alt_pre+'_off')?sw:0);
+						setPoint(line, conn.is_start?'end':0, pt2.x, pt2.y, true);
+
+					}
+					
+				}
+			} 
+		},
+		mouseUp: function(opts) {
+			var zoom = svgCanvas.getZoom();
+			var e = opts.event,
+				x = opts.mouse_x/zoom,
+				y = opts.mouse_y/zoom,
+				mouse_target = e.target;
+			
+			if(svgCanvas.getMode() == "connector") {
+				var fo = $(mouse_target).closest("foreignObject");
+				if(fo.length) mouse_target = fo[0];
+				if(mouse_target.parentNode.parentNode != svgcontent) {
+					// Not a valid target element, so remove line
+					$(cur_line).remove();
+					started = false;
+					return {
+						keep: false,
+						element: null,
+						started: started
+					}
+				} else if(mouse_target == start_elem) {
+					// Start line through click
+					started = true;
+					return {
+						keep: true,
+						element: null,
+						started: started
+					}						
+				} else {
+					// Valid end element
+					end_elem = mouse_target;
+					
+					var start_id = start_elem.id, end_id = end_elem.id;
+					var conn_str = start_id + " " + end_id;
+					var alt_str = end_id + " " + start_id;
+					// Don't create connector if one already exists
+					var dupe = $(svgcontent).find(conn_sel).filter(function() {
+						var conn = this.getAttributeNS(se_ns, "connector");
+						if(conn == conn_str || conn == alt_str) return true;
+					});
+					if(dupe.length) {
+						$(cur_line).remove();
+						return {
+							keep: false,
+							element: null,
+							started: false
+						}
+					}
+					
+					var bb = svgCanvas.getStrokedBBox([end_elem]);
+					
+					var pt = getBBintersect(start_x, start_y, bb);
+					setPoint(cur_line, 'end', pt.x, pt.y, true);
+					$(cur_line)
+						.data("c_start", start_id)
+						.data("c_end", end_id)
+						.data("end_bb", bb);
+					se_ns = svgCanvas.getEditorNS(true);
+					cur_line.setAttributeNS(se_ns, "se:connector", conn_str);
+					cur_line.setAttribute('class', conn_sel.substr(1));
+					cur_line.setAttribute('opacity', 1);
+					svgCanvas.addToSelection([cur_line]);
+					svgCanvas.moveToBottomSelectedElement();
+					selManager.requestSelector(cur_line).showGrips(false);
+					started = false;
+					return {
+						keep: true,
+						element: cur_line,
+						started: started
+					}
+				}
+			}
+		},
+		selectedChanged: function(opts) {
+			
+			// Use this to update the current selected elements
+			selElems = opts.elems;
+			
+			var i = selElems.length;
+			
+			while(i--) {
+				var elem = selElems[i];
+				if(elem && $(elem).data('c_start')) {
+					selManager.requestSelector(elem).showGrips(false);
+					if(opts.selectedElement && !opts.multiselected) {
+						// TODO: Set up context tools and hide most regular line tools
+						showPanel(true);
+					} else {
+						showPanel(false);
+					}
+				} else {
+					showPanel(false);
+				}
+			}
+		},
+		elementChanged: function(opts) {
+			var elem = opts.elems[0];
+			if (elem && elem.tagName == 'svg' && elem.id == "svgcontent") {
+				// Update svgcontent (can change on import)
+				svgcontent = elem;
+				init();
+			}
+			
+			// Has marker, so change offset
+			if(elem && (
+				elem.getAttribute("marker-start") ||
+				elem.getAttribute("marker-mid") ||
+				elem.getAttribute("marker-end")
+			)) {
+				var start = elem.getAttribute("marker-start");
+				var mid = elem.getAttribute("marker-mid");
+				var end = elem.getAttribute("marker-end");
+				cur_line = elem;
+				$(elem)
+					.data("start_off", !!start)
+					.data("end_off", !!end);
+				
+				if(elem.tagName == "line" && mid) {
+					// Convert to polyline to accept mid-arrow
+					
+					var x1 = elem.getAttribute('x1')-0;
+					var x2 = elem.getAttribute('x2')-0;
+					var y1 = elem.getAttribute('y1')-0;
+					var y2 = elem.getAttribute('y2')-0;
+					var id = elem.id;
+					
+					var mid_pt = (' '+((x1+x2)/2)+','+((y1+y2)/2) + ' ');
+					var pline = addElem({
+						"element": "polyline",
+						"attr": {
+							"points": (x1+','+y1+ mid_pt +x2+','+y2),
+							"stroke": elem.getAttribute('stroke'),
+							"stroke-width": elem.getAttribute('stroke-width'),
+							"marker-mid": mid,
+							"fill": "none",
+							"opacity": elem.getAttribute('opacity') || 1
+						}
+					});
+					$(elem).after(pline).remove();
+					svgCanvas.clearSelection();
+					pline.id = id;
+					svgCanvas.addToSelection([pline]);
+				}
+					
+			}
+			updateConnectors();
+		},
+		toolButtonStateUpdate: function(opts) {
+			if(opts.nostroke) {
+				if ($('#mode_connect').hasClass('tool_button_current')) {
+					clickSelect();
+				}
+			}
+			$('#mode_connect')
+				.toggleClass('disabled',opts.nostroke);
+		}
+	};
+});

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/extensions/ext-eyedropper.js	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,90 @@
+/*
+ * ext-eyedropper.js
+ *
+ * Licensed under the Apache License, Version 2
+ *
+ * Copyright(c) 2010 Jeff Schiller
+ *
+ */
+
+svgEditor.addExtension("eyedropper", function(S) {
+		var svgcontent = S.svgcontent,
+			svgns = "http://www.w3.org/2000/svg",
+			svgdoc = S.svgroot.parentNode.ownerDocument,
+			ChangeElementCommand = svgCanvas.getPrivateMethods().ChangeElementCommand,
+			addToHistory = svgCanvas.getPrivateMethods().addCommandToHistory,
+			currentStyle = {fillPaint: "red", fillOpacity: 1.0,
+							strokePaint: "black", strokeOpacity: 1.0, 
+							strokeWidth: 5, strokeDashArray: null,
+							opacity: 1.0 };
+		
+		return {
+			name: "eyedropper",
+			svgicons: "extensions/eyedropper-icon.xml",
+			buttons: [{
+				id: "tool_eyedropper",
+				type: "mode",
+				title: "Eye Dropper Tool",
+				events: {
+					"click": function() {
+						svgCanvas.setMode("eyedropper");
+					}
+				}
+			}],
+			
+			// if we have selected an element, grab its paint and enable the eye dropper button
+			selectedChanged: function(opts) {
+				// if we are in eyedropper mode, we don't want to disable the eye-dropper tool
+				var mode = svgCanvas.getMode();
+				if (mode == "eyedropper") return;
+
+				var elem = null;
+				var tool = $('#tool_eyedropper');
+				// enable-eye-dropper if one element is selected
+				if (opts.elems.length == 1 && opts.elems[0] && 
+					$.inArray(opts.elems[0].nodeName, ['svg', 'g', 'use']) == -1) 
+				{
+					elem = opts.elems[0];
+					tool.removeClass('disabled');
+					// grab the current style
+					currentStyle.fillPaint = elem.getAttribute("fill") || "black";
+					currentStyle.fillOpacity = elem.getAttribute("fill-opacity") || 1.0;
+					currentStyle.strokePaint = elem.getAttribute("stroke");
+					currentStyle.strokeOpacity = elem.getAttribute("stroke-opacity") || 1.0;
+					currentStyle.strokeWidth = elem.getAttribute("stroke-width");
+					currentStyle.strokeDashArray = elem.getAttribute("stroke-dasharray");
+					currentStyle.opacity = elem.getAttribute("opacity") || 1.0;
+				}
+				// disable eye-dropper tool
+				else {
+					tool.addClass('disabled');
+				}
+			},
+			
+			mouseDown: function(opts) {
+				var mode = svgCanvas.getMode();
+				if (mode == "eyedropper") {
+					var e = opts.event;
+					var target = e.target;
+					if ($.inArray(target.nodeName, ['svg', 'g', 'use']) == -1) {
+						var changes = {};
+
+						var change = function(elem, attrname, newvalue) {
+							changes[attrname] = elem.getAttribute(attrname);
+							elem.setAttribute(attrname, newvalue);
+						};
+						
+						if (currentStyle.fillPaint) 		change(target, "fill", currentStyle.fillPaint);
+						if (currentStyle.fillOpacity) 		change(target, "fill-opacity", currentStyle.fillOpacity);
+						if (currentStyle.strokePaint) 		change(target, "stroke", currentStyle.strokePaint);
+						if (currentStyle.strokeOpacity) 	change(target, "stroke-opacity", currentStyle.strokeOpacity);
+						if (currentStyle.strokeWidth) 		change(target, "stroke-width", currentStyle.strokeWidth);
+						if (currentStyle.strokeDashArray) 	change(target, "stroke-dasharray", currentStyle.strokeDashArray);
+						if (currentStyle.opacity) 			change(target, "opacity", currentStyle.opacity);
+						
+						addToHistory(new ChangeElementCommand(target, changes));
+					}
+				}
+			},
+		};
+});

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/extensions/ext-foreignobject.js	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,277 @@
+/*
+ * ext-foreignobject.js
+ *
+ * Licensed under the Apache License, Version 2
+ *
+ * Copyright(c) 2010 Jacques Distler 
+ * Copyright(c) 2010 Alexis Deveria 
+ *
+ */
+
+svgEditor.addExtension("foreignObject", function(S) {
+		var svgcontent = S.svgcontent,
+			addElem = S.addSvgElementFromJson,
+			selElems,
+			svgns = "http://www.w3.org/2000/svg",
+			xlinkns = "http://www.w3.org/1999/xlink",
+			xmlns = "http://www.w3.org/XML/1998/namespace",
+			xmlnsns = "http://www.w3.org/2000/xmlns/",
+			se_ns = "http://svg-edit.googlecode.com",
+			htmlns = "http://www.w3.org/1999/xhtml",
+			mathns = "http://www.w3.org/1998/Math/MathML",
+			editingforeign = false,
+			svgdoc = S.svgroot.parentNode.ownerDocument,
+			started,
+			newFO;
+			
+			
+		var properlySourceSizeTextArea = function(){
+			// TODO: remove magic numbers here and get values from CSS
+			var height = $('#svg_source_container').height() - 80;
+			$('#svg_source_textarea').css('height', height);
+		};
+
+		function showPanel(on) {
+			var fc_rules = $('#fc_rules');
+			if(!fc_rules.length) {
+				fc_rules = $('<style id="fc_rules"><\/style>').appendTo('head');
+			} 
+			fc_rules.text(!on?"":" #tool_topath { display: none !important; }");
+			$('#foreignObject_panel').toggle(on);
+		}
+
+		function toggleSourceButtons(on) {
+			$('#tool_source_save, #tool_source_cancel').toggle(!on);
+			$('#foreign_save, #foreign_cancel').toggle(on);
+		}
+		
+			
+		// Function: setForeignString(xmlString, elt)
+		// This function sets the content of element elt to the input XML.
+		//
+		// Parameters:
+		// xmlString - The XML text.
+		// elt - the parent element to append to
+		//
+		// Returns:
+		// This function returns false if the set was unsuccessful, true otherwise.
+		function setForeignString(xmlString) {
+			var elt = selElems[0];
+			try {
+				// convert string into XML document
+				var newDoc = Utils.text2xml('<svg xmlns="'+svgns+'" xmlns:xlink="'+xlinkns+'">'+xmlString+'</svg>');
+				// run it through our sanitizer to remove anything we do not support
+				S.sanitizeSvg(newDoc.documentElement);
+				elt.parentNode.replaceChild(svgdoc.importNode(newDoc.documentElement.firstChild, true), elt);
+				S.call("changed", [elt]);
+				svgCanvas.clearSelection();
+			} catch(e) {
+				console.log(e);
+				return false;
+			}
+	
+			return true;
+		};
+
+		function showForeignEditor() {
+			var elt = selElems[0];
+			if (!elt || editingforeign) return;
+			editingforeign = true;
+			toggleSourceButtons(true);
+			elt.removeAttribute('fill');
+
+			var str = S.svgToString(elt, 0);
+			$('#svg_source_textarea').val(str);
+			$('#svg_source_editor').fadeIn();
+			properlySourceSizeTextArea();
+			$('#svg_source_textarea').focus();
+		}
+		
+		function setAttr(attr, val) {
+			svgCanvas.changeSelectedAttribute(attr, val);
+			S.call("changed", selElems);
+		}
+		
+		
+		return {
+			name: "foreignObject",
+			svgicons: "extensions/foreignobject-icons.xml",
+			buttons: [{
+				id: "tool_foreign",
+				type: "mode",
+				title: "Foreign Object Tool",
+				events: {
+					'click': function() {
+						svgCanvas.setMode('foreign')
+					}
+				}
+			},{
+				id: "edit_foreign",
+				type: "context",
+				panel: "foreignObject_panel",
+				title: "Edit ForeignObject Content",
+				events: {
+					'click': function() {
+						showForeignEditor();
+					}
+				}
+			}],
+			
+			context_tools: [{
+				type: "input",
+				panel: "foreignObject_panel",
+				title: "Change foreignObject's width",
+				id: "foreign_width",
+				label: "w",
+				size: 3,
+				events: {
+					change: function() {
+						setAttr('width', this.value);
+					}
+				}
+			},{
+				type: "input",
+				panel: "foreignObject_panel",
+				title: "Change foreignObject's height",
+				id: "foreign_height",
+				label: "h",
+				events: {
+					change: function() {
+						setAttr('height', this.value);
+					}
+				}
+			}, {
+				type: "input",
+				panel: "foreignObject_panel",
+				title: "Change foreignObject's font size",
+				id: "foreign_font_size",
+				label: "font-size",
+				size: 2,
+				defval: 16,
+				events: {
+					change: function() {
+						setAttr('font-size', this.value);
+					}
+				}
+			}
+			
+			
+			],
+			callback: function() {
+				$('#foreignObject_panel').hide();
+
+				var endChanges = function() {
+					$('#svg_source_editor').hide();
+					editingforeign = false;
+					$('#svg_source_textarea').blur();
+					toggleSourceButtons(false);
+				}
+
+				// TODO: Needs to be done after orig icon loads
+				setTimeout(function() {				
+					// Create source save/cancel buttons
+					var save = $('#tool_source_save').clone()
+						.hide().attr('id', 'foreign_save').unbind()
+						.appendTo("#tool_source_back").click(function() {
+							
+							if (!editingforeign) return;
+
+							if (!setForeignString($('#svg_source_textarea').val())) {
+								$.confirm("Errors found. Revert to original?", function(ok) {
+									if(!ok) return false;
+									endChanges();
+								});
+							} else {
+								endChanges();
+							}
+							// setSelectMode();	
+						});
+						
+					var cancel = $('#tool_source_cancel').clone()
+						.hide().attr('id', 'foreign_cancel').unbind()
+						.appendTo("#tool_source_back").click(function() {
+							endChanges();
+						});
+					
+				}, 3000);
+			},
+			mouseDown: function(opts) {
+				var e = opts.event;
+				
+				if(svgCanvas.getMode() == "foreign") {
+
+					started = true;
+					newFO = S.addSvgElementFromJson({
+						"element": "foreignObject",
+						"attr": {
+							"x": opts.start_x,
+							"y": opts.start_y,
+							"id": S.getNextId(),
+							"font-size": 16, //cur_text.font_size,
+							"width": "48",
+							"height": "20",
+							"style": "pointer-events:inherit"
+						}
+					});
+					var m = svgdoc.createElementNS(mathns, 'math');
+					m.setAttributeNS(xmlnsns, 'xmlns', mathns);
+					m.setAttribute('display', 'inline');
+					var mi = svgdoc.createElementNS(mathns, 'mi');
+					mi.setAttribute('mathvariant', 'normal');
+					mi.textContent = "\u03A6";
+					var mo = svgdoc.createElementNS(mathns, 'mo');
+					mo.textContent = "\u222A";
+					var mi2 = svgdoc.createElementNS(mathns, 'mi');
+					mi2.textContent = "\u2133";
+					m.appendChild(mi);
+					m.appendChild(mo);
+					m.appendChild(mi2);
+					newFO.appendChild(m);
+					return {
+						started: true
+					}
+				}
+			},
+			mouseUp: function(opts) {
+				var e = opts.event;
+				if(svgCanvas.getMode() == "foreign" && started) {
+					var attrs = $(newFO).attr(["width", "height"]);
+					keep = (attrs.width != 0 || attrs.height != 0);
+					svgCanvas.addToSelection([newFO], true);
+
+					return {
+						keep: keep,
+						element: newFO
+					}
+
+				}
+				
+			},
+			selectedChanged: function(opts) {
+				// Use this to update the current selected elements
+				selElems = opts.elems;
+				
+				var i = selElems.length;
+				
+				while(i--) {
+					var elem = selElems[i];
+					if(elem && elem.tagName == "foreignObject") {
+						if(opts.selectedElement && !opts.multiselected) {
+							$('#foreign_font_size').val(elem.getAttribute("font-size"));
+							$('#foreign_width').val(elem.getAttribute("width"));
+							$('#foreign_height').val(elem.getAttribute("height"));
+						
+							showPanel(true);
+						} else {
+							showPanel(false);
+						}
+					} else {
+						showPanel(false);
+					}
+				}
+			},
+			elementChanged: function(opts) {
+				var elem = opts.elems[0];
+			}
+		};
+});

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/extensions/ext-helloworld.js	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,78 @@
+/*
+ * ext-helloworld.js
+ *
+ * Licensed under the Apache License, Version 2
+ *
+ * Copyright(c) 2010 Alexis Deveria
+ *
+ */
+ 
+/* 
+	This is a very basic SVG-Edit extension. It adds a "Hello World" button in
+	the left panel. Clicking on the button, and then the canvas will show the
+ 	user the point on the canvas that was clicked on.
+*/
+ 
+svgEditor.addExtension("Hello World", function() {
+
+		return {
+			name: "Hello World",
+			// For more notes on how to make an icon file, see the source of
+			// the hellorworld-icon.xml
+			svgicons: "extensions/helloworld-icon.xml",
+			
+			// Multiple buttons can be added in this array
+			buttons: [{
+				// Must match the icon ID in helloworld-icon.xml
+				id: "hello_world", 
+				
+				// This indicates that the button will be added to the "mode"
+				// button panel on the left side
+				type: "mode", 
+				
+				// Tooltip text
+				title: "Say 'Hello World'", 
+				
+				// Events
+				events: {
+					'click': function() {
+						// The action taken when the button is clicked on.
+						// For "mode" buttons, any other button will 
+						// automatically be de-pressed.
+						svgCanvas.setMode("hello_world");
+					}
+				}
+			}],
+			// This is triggered when the main mouse button is pressed down 
+			// on the editor canvas (not the tool panels)
+			mouseDown: function() {
+				// Check the mode on mousedown
+				if(svgCanvas.getMode() == "hello_world") {
+				
+					// The returned object must include "started" with 
+					// a value of true in order for mouseUp to be triggered
+					return {started: true};
+				}
+			},
+			
+			// This is triggered from anywhere, but "started" must have been set
+			// to true (see above). Note that "opts" is an object with event info
+			mouseUp: function(opts) {
+				// Check the mode on mouseup
+				if(svgCanvas.getMode() == "hello_world") {
+					var zoom = svgCanvas.getZoom();
+					
+					// Get the actual coordinate by dividing by the zoom value
+					var x = opts.mouse_x / zoom;
+					var y = opts.mouse_y / zoom;
+					
+					var text = "Hello World!\n\nYou clicked here: " 
+						+ x + ", " + y;
+						
+					// Show the text using the custom alert function
+					$.alert(text);
+				}
+			}
+		};
+});
+

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/extensions/eyedropper-icon.xml	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,34 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+
+<g id="tool_eyedropper">
+<svg viewBox="0 0 320 320" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
+ <defs>
+  <radialGradient id="eyedropper_svg_6" cx="0.5" cy="0.5" r="0.5">
+   <stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
+   <stop offset="1" stop-color="#e5e5e5" stop-opacity="0.38"/>
+  </radialGradient>
+  <linearGradient id="eyedropper_svg_15" x1="0" y1="0" x2="0.58594" y2="0.55078">
+   <stop offset="0" stop-color="#ffffff" stop-opacity="0.57"/>
+   <stop offset="1" stop-color="#000056" stop-opacity="1"/>
+  </linearGradient>
+  <linearGradient id="eyedropper_svg_19" x1="0" y1="0" x2="1" y2="1">
+   <stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
+   <stop offset="1" stop-color="#ffffff" stop-opacity="0"/>
+  </linearGradient>
+ </defs>
+ <g display="inline">
+  <title>Layer 1</title>
+  <path d="m193.899994,73l-119.899979,118l-15,39.5l10.25,4.5l43.750015,-20l108.999969,-112l-28.100006,-30z" id="svg_3" fill="none" stroke="#000000" stroke-width="5"/>
+  <path d="m58.649994,232c-2.75,28.200012 -26.399994,28.950012 -21.899994,59c4.5,30.049988 55,28 55.5,-1.25c0.5,-29.25 -20.25,-28.75 -22.25,-54.75l-11.350006,-3z" id="svg_4" fill="#aa56ff" stroke="#000000" stroke-width="7"/>
+  <path d="m45.474976,269.275024l13.775024,0.474976l-0.75,16.75l-14.25,-1.25l1.224976,-15.974976z" id="svg_5" fill="url(#eyedropper_svg_6)" stroke-width="5" fill-opacity="0.73"/>
+  <path d="m217.899994,46c21.5,-101.549999 141.600006,20.449997 28.100006,33l-5,44l-63,-66l39.899994,-11z" id="svg_2" fill="#000000" stroke-width="5"/>
+  <path d="m206.825012,61.075008c3.712494,-2.46249 7.637482,-3.53751 14.424988,-5.575008c10.125,-16.5 32.875,-41.5 40.5,-35c7.625,6.5 -21.25,35.625 -37.5,39.25c-5.5,10.125 -8,13.875 -17.25,16.5c-2.837494,-8.162514 -4.262482,-12.337486 -0.174988,-15.174992z" id="svg_7" fill="url(#eyedropper_svg_15)" stroke-width="5"/>
+  <path d="m133.049988,134.75l46.950012,9.25l-66,70l-42.5,20.5l-11.5,-5l14,-37.5l59.049988,-57.25z" id="svg_11" fill="#aa56ff" stroke="#000000" stroke-width="7"/>
+  <path d="m71.425034,212.350006l9.050888,-20.022537l51.516724,-49.327469l8.507355,0.97197l-69.074966,68.378036z" id="svg_16" fill="url(#eyedropper_svg_19)" stroke-width="5"/>
+ </g>
+</svg>
+</g>
+	
+	<g id="svg_eof"/>
+</svg>
\ No newline at end of file

Binary file htdocs/svg-edit/editor/extensions/eyedropper.png has changed

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/extensions/foreignobject-icons.xml	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,96 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+	<g id="tool_foreign">
+		<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 84 84">
+		  <g fill="#444" opacity="0.2" transform="translate(6,6)">
+		  <path d="M42.8,74.3c0,4.3,0,5.9,11.8,5.9l4.1,0l0,3.8c-4.5-0.4-16.1-0.4-21.2-0.3c-5.1,0-16.6,0-21,0.4l0-3.8l4.1,0
+			c11.8,0,11.8-1.7,11.8-5.9l0-6.9C13.9,65.6,0,54.6,0,42c0-12.2,13.3-23.5,32.4-25.4l0-6.9c0-4.3,0-5.9-11.8-5.9l-4.1,0l0-3.8
+			c4.5,0.4,16.1,0.4,21.2,0.3c5.1,0,16.6,0,21-0.4l0,3.8l-4.1,0c-11.8,0-11.8,1.7-11.8,5.9l0,6.9C61.6,18.1,75.8,29.2,75.8,42
+			c0,12.4-13.8,23.9-33.1,25.4L42.8,74.3z M32.4,19.4c-18.7,2.5-19.9,16.2-19.9,22.6c0,7.6,2.3,20.2,20,22.5L32.4,19.4z M42.7,64.7
+			c18.8-2.2,20.7-15.4,20.6-22.8c0-9.3-3.5-20.6-20.7-22.6L42.7,64.7z"/>
+		  </g>
+		  <g fill="#444" opacity="0.3" transform="translate(4,4)">
+		  <path d="M42.8,74.3c0,4.3,0,5.9,11.8,5.9l4.1,0l0,3.8c-4.5-0.4-16.1-0.4-21.2-0.3c-5.1,0-16.6,0-21,0.4l0-3.8l4.1,0
+			c11.8,0,11.8-1.7,11.8-5.9l0-6.9C13.9,65.6,0,54.6,0,42c0-12.2,13.3-23.5,32.4-25.4l0-6.9c0-4.3,0-5.9-11.8-5.9l-4.1,0l0-3.8
+			c4.5,0.4,16.1,0.4,21.2,0.3c5.1,0,16.6,0,21-0.4l0,3.8l-4.1,0c-11.8,0-11.8,1.7-11.8,5.9l0,6.9C61.6,18.1,75.8,29.2,75.8,42
+			c0,12.4-13.8,23.9-33.1,25.4L42.8,74.3z M32.4,19.4c-18.7,2.5-19.9,16.2-19.9,22.6c0,7.6,2.3,20.2,20,22.5L32.4,19.4z M42.7,64.7
+			c18.8-2.2,20.7-15.4,20.6-22.8c0-9.3-3.5-20.6-20.7-22.6L42.7,64.7z"/>
+		  </g>
+		  <g fill="#444" opacity="0.5" transform="translate(2,2)">
+		  <path d="M42.8,74.3c0,4.3,0,5.9,11.8,5.9l4.1,0l0,3.8c-4.5-0.4-16.1-0.4-21.2-0.3c-5.1,0-16.6,0-21,0.4l0-3.8l4.1,0
+			c11.8,0,11.8-1.7,11.8-5.9l0-6.9C13.9,65.6,0,54.6,0,42c0-12.2,13.3-23.5,32.4-25.4l0-6.9c0-4.3,0-5.9-11.8-5.9l-4.1,0l0-3.8
+			c4.5,0.4,16.1,0.4,21.2,0.3c5.1,0,16.6,0,21-0.4l0,3.8l-4.1,0c-11.8,0-11.8,1.7-11.8,5.9l0,6.9C61.6,18.1,75.8,29.2,75.8,42
+			c0,12.4-13.8,23.9-33.1,25.4L42.8,74.3z M32.4,19.4c-18.7,2.5-19.9,16.2-19.9,22.6c0,7.6,2.3,20.2,20,22.5L32.4,19.4z M42.7,64.7
+			c18.8-2.2,20.7-15.4,20.6-22.8c0-9.3-3.5-20.6-20.7-22.6L42.7,64.7z"/>
+		  </g>
+		  <g fill="#0000CC">
+		  <path id="xyz321" d="M42.8,74.3c0,4.3,0,5.9,11.8,5.9l4.1,0l0,3.8c-4.5-0.4-16.1-0.4-21.2-0.3c-5.1,0-16.6,0-21,0.4l0-3.8l4.1,0
+			c11.8,0,11.8-1.7,11.8-5.9l0-6.9C13.9,65.6,0,54.6,0,42c0-12.2,13.3-23.5,32.4-25.4l0-6.9c0-4.3,0-5.9-11.8-5.9l-4.1,0l0-3.8
+			c4.5,0.4,16.1,0.4,21.2,0.3c5.1,0,16.6,0,21-0.4l0,3.8l-4.1,0c-11.8,0-11.8,1.7-11.8,5.9l0,6.9C61.6,18.1,75.8,29.2,75.8,42
+			c0,12.4-13.8,23.9-33.1,25.4L42.8,74.3z M32.4,19.4c-18.7,2.5-19.9,16.2-19.9,22.6c0,7.6,2.3,20.2,20,22.5L32.4,19.4z M42.7,64.7
+			c18.8-2.2,20.7-15.4,20.6-22.8c0-9.3-3.5-20.6-20.7-22.6L42.7,64.7z"/>
+		  </g>
+		</svg>
+	</g>
+	
+	<g id="edit_foreign">
+		<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="34 38 170 170" overflow="hidden">
+		<g fill="#000088">
+			<path d="M30.1,63.9v-4.3l30.2-14.9V50L36.5,61.7l23.8,11.7v5.3L30.1,63.9z"/>
+			<path d="M106.1,79.7v-1.1c4.2-0.5,4.8-1.1,4.8-5.2V58.2c0-6-1.3-7.9-5.4-7.9c-3.3,0-5.7,1.3-7.8,4.4v18.1
+				c0,4.5,1.1,5.7,5.2,5.8v1.1H86.8v-1.1c4.1-0.3,4.9-1.1,4.9-5.1V57.9c0-5-1.6-7.6-4.8-7.6c-2.5,0-5.6,1.2-7.4,2.9
+				c-0.5,0.5-1.1,1.4-1.1,1.4v20.3c0,2.8,1.1,3.6,4.9,3.7v1.1h-16v-1.1c4-0.1,5-1.2,5-5V55.4c0-3.5-0.6-4.6-2.5-4.6
+				c-0.8,0-1.4,0.1-2.3,0.3v-1.2c4-1.1,6.4-1.9,10.1-3.2l0.5,0.1v5.4c6-4.5,8-5.5,11.2-5.5c3.9,0,6.3,1.9,7.6,6c3.9-4.2,7.6-6,11.7-6
+				c5.5,0,8.4,4.3,8.4,12.8v14.8c0,2.8,0.9,4.1,3.1,4.2l1.9,0.1v1.1H106.1z"/>
+			<path d="M147.3,80.5c-3,0-4.2-1.4-4.6-5.3c-4.4,3.7-7.3,5.3-10.5,5.3c-4.5,0-7.6-3.2-7.6-7.7c0-2.4,1-4.8,2.6-6.3
+				c3.1-2.7,4.3-3.3,15.4-7.8v-4.4c0-3.9-1.9-6-5.5-6c-2.9,0-5.2,1.6-5.2,3.5c0,0.5,0.1,1.1,0.2,1.7c0.1,0.5,0.1,0.9,0.1,1.2
+				c0,1.6-1.5,3-3.2,3s-3.1-1.4-3.1-3.1c0-1.8,1.2-3.9,3-5.4c2-1.7,5.5-2.7,9.1-2.7c4.4,0,7.5,1.4,9,4.2c1,1.7,1.4,3.7,1.4,7.3v14
+				c0,3.2,0.5,4.2,2.2,4.2c1.1,0,1.9-0.4,3.2-1.4v1.9C151.3,79.6,149.8,80.5,147.3,80.5z M142.6,60.5c-8.7,3.2-11.7,5.8-11.7,10v0.3
+				c0,3.1,2,5.5,4.5,5.5c1.5,0,3.5-0.6,5.3-1.6c1.5-0.9,1.9-1.6,1.9-3.8V60.5z"/>
+			<path d="M165.3,80.5c-4.2,0-6.3-3.1-6.3-9.1V49.7h-3.8c-0.2-0.1-0.3-0.3-0.3-0.5c0-0.4,0.4-0.9,1.2-1.4
+				c1.9-1.1,4.3-3.7,7-7.7c0.5-0.6,1-1.3,1.4-2c0.4,0,0.5,0.2,0.5,0.9v8.4h7.3v2.3h-7.3v20.6c0,4.6,1.1,6.5,3.7,6.5
+				c1.6,0,2.7-0.6,4.3-2.5l0.9,0.8C171.8,78.7,169,80.5,165.3,80.5z"/>
+			<path d="M193.8,79.7v-1.1c4.1-0.4,4.9-1.3,4.9-6.2V58.1c0-5-1.8-7.6-5.4-7.6c-2.8,0-5,1.2-8,4.5v17.4
+				c0,5,0.7,5.8,4.9,6.3v1.1h-15.6v-1.1c4.2-0.6,4.6-1.2,4.6-6.3V38.5c0-3.1-0.6-3.7-3.7-3.7c-0.4,0-0.6,0-0.9,0.1v-1.2l1.9-0.6
+				c4-1.2,5.8-1.7,8.3-2.6l0.4,0.2v21.9c3.3-4.3,6.3-6,10.6-6c5.9,0,8.9,3.9,8.9,11.5v14.3c0,5,0.4,5.5,4.3,6.3v1.1h-15.2V79.7z"/>
+			<path d="M59.1,116.1v-4.3l30.2-14.9v5.3l-23.8,11.7l23.8,11.7v5.3L59.1,116.1z"/>
+			<path d="M135.1,131.9v-1.1c4.2-0.5,4.8-1.1,4.8-5.2v-15.1c0-6-1.3-7.9-5.4-7.9c-3.3,0-5.7,1.3-7.8,4.4v18.1
+				c0,4.5,1.1,5.7,5.2,5.8v1.1h-16.1v-1.1c4.1-0.3,4.9-1.1,4.9-5.1v-15.7c0-5-1.6-7.6-4.8-7.6c-2.5,0-5.6,1.2-7.4,2.9
+				c-0.5,0.5-1.1,1.4-1.1,1.4v20.3c0,2.8,1.1,3.6,4.9,3.7v1.1h-16v-1.1c4-0.1,5-1.2,5-5v-18.2c0-3.5-0.6-4.6-2.5-4.6
+				c-0.8,0-1.4,0.1-2.3,0.3v-1.2c4-1.1,6.4-1.9,10.1-3.2l0.5,0.1v5.4c6-4.5,8-5.5,11.2-5.5c3.9,0,6.3,1.9,7.6,6c3.9-4.2,7.6-6,11.7-6
+				c5.5,0,8.4,4.3,8.4,12.8v14.8c0,2.8,0.9,4.1,3.1,4.2l1.9,0.1v1.1H135.1z"/>
+			<path d="M152.1,131.9v-1.1c5-0.3,5.7-1.1,5.7-6.3v-16.6c0-3.2-0.6-4.3-2.4-4.3c-0.6,0-1.6,0.1-2.4,0.2l-0.6,0.1v-1.1
+				l11.2-4L164,99v25.6c0,5.2,0.6,5.9,5.3,6.3v1.1L152.1,131.9L152.1,131.9z M160.8,93.1c-2,0-3.7-1.6-3.7-3.7c0-2,1.7-3.7,3.7-3.7
+				c2.1,0,3.7,1.7,3.7,3.7C164.6,91.6,163,93.1,160.8,93.1z"/>
+			<path d="M175.8,131v-5.3l23.7-11.8l-23.7-11.7v-5.3l30.1,14.9v4.3L175.8,131z"/>
+			<path d="M31.1,169.5v-4.3l30.2-14.9v5.3l-23.8,11.7L61.3,179v5.3L31.1,169.5z"/>
+			<path d="M71.3,186.4h-4.9l16.5-49.7h4.8L71.3,186.4z"/>
+			<path d="M127.1,185.3v-1.1c4.2-0.5,4.8-1.1,4.8-5.2v-15.2c0-6-1.3-7.9-5.4-7.9c-3.3,0-5.7,1.3-7.8,4.4v18.1
+				c0,4.5,1.1,5.7,5.2,5.8v1.1h-16.1v-1.1c4.1-0.3,4.9-1.1,4.9-5.1v-15.6c0-5-1.6-7.6-4.8-7.6c-2.5,0-5.6,1.2-7.4,2.9
+				c-0.5,0.5-1.1,1.4-1.1,1.4v20.3c0,2.8,1.1,3.6,4.9,3.7v1.1h-16v-1.1c4-0.1,5-1.2,5-5V161c0-3.5-0.6-4.6-2.5-4.6
+				c-0.8,0-1.4,0.1-2.3,0.3v-1.2c4-1.1,6.4-1.9,10.1-3.2l0.5,0.1v5.4c6-4.5,8-5.5,11.2-5.5c3.9,0,6.3,1.9,7.6,6c3.9-4.2,7.6-6,11.7-6
+				c5.5,0,8.4,4.3,8.4,12.8v14.8c0,2.8,0.9,4.1,3.1,4.2l1.9,0.1v1.1H127.1L127.1,185.3z"/>
+			<path d="M168.3,186.1c-3,0-4.2-1.4-4.6-5.3c-4.4,3.7-7.3,5.3-10.5,5.3c-4.5,0-7.6-3.2-7.6-7.7c0-2.4,1-4.8,2.6-6.3
+				c3.1-2.7,4.3-3.3,15.4-7.8v-4.4c0-3.9-1.9-6-5.5-6c-2.9,0-5.2,1.6-5.2,3.5c0,0.5,0.1,1.1,0.2,1.7c0.1,0.5,0.1,0.9,0.1,1.2
+				c0,1.6-1.5,3-3.2,3s-3.1-1.4-3.1-3.1c0-1.8,1.2-3.9,3-5.4c2-1.7,5.5-2.7,9.1-2.7c4.4,0,7.5,1.4,9,4.2c1,1.7,1.4,3.7,1.4,7.3v14
+				c0,3.2,0.5,4.2,2.2,4.2c1.1,0,1.9-0.4,3.2-1.4v1.9C172.3,185.2,170.8,186.1,168.3,186.1z M163.8,166.1c-8.7,3.2-11.7,5.8-11.7,10
+				v0.3c0,3.1,2,5.5,4.5,5.5c1.5,0,3.5-0.6,5.3-1.6c1.5-0.9,1.9-1.6,1.9-3.8V166.1z"/>
+			<path d="M186.3,186.1c-4.2,0-6.3-3.1-6.3-9.1v-21.7h-3.8c-0.2-0.1-0.3-0.3-0.3-0.5c0-0.4,0.4-0.9,1.2-1.4
+				c1.9-1.1,4.3-3.7,7-7.7c0.5-0.6,1-1.3,1.4-2c0.4,0,0.5,0.2,0.5,0.9v8.4h7.3v2.3h-7.3v20.6c0,4.6,1.1,6.5,3.7,6.5
+				c1.6,0,2.7-0.6,4.3-2.5l0.9,0.8C192.8,184.3,190,186.1,186.3,186.1z"/>
+			<path d="M209.1,185.3h-13.4v-1.1c4.2-0.6,4.6-1.2,4.6-6.3V144c0-3.1-0.6-3.7-3.7-3.7c-0.4,0-0.6,0-0.9,0.1v-1.2
+				l1.9-0.6c4-1.2,5.8-1.7,8.3-2.6l0.4,0.2v21.9c0.9-1.2,1.9-2.2,2.8-3.1"/>
+			<path d="M209.1,157.9c-0.8,0.7-1.7,1.5-2.7,2.6v17.4c0,4,0.4,5.3,2.7,5.9"/>
+		  </g>
+		  <g>
+			<polyline opacity="0.2" fill="#231F20" points="209.1,76.4 118.7,186.5 139.1,186.4 209.1,121 209.1,76.4 "/>
+			<polyline opacity="0.4" fill="#231F20" points="209.1,76.2 118.5,186.5 129.7,186.4 200.2,120.3 209.1,100.8 209.1,76.4 "/>
+			<path fill="#FFD761" d="M121.6,88.7l0.8,87.5l62.3-56.7c0,0-15.3-25.8-24.8-30C151.1,85.6,121.6,88.7,121.6,88.7z"/>
+			<path fill="#FEA01E" d="M209.1,19.5h-54l-33.5,69.2c0,0,29.7-3.4,38.3,0.8c8.9,4.4,25,30.8,25,30.8l24.2-50V19.5z"/>
+			<path d="M120.4,153.7l-0.6,25l23.8-16.9c0,0-8-7-11.2-8.1C129.4,152.8,120.4,153.7,120.4,153.7z"/>
+			<polyline fill="none" stroke="#231F20" stroke-width="5" points="153.9,19.5 121.6,88.7 120.7,181.2 186.6,120.3 209.1,70.3 "/>
+		  </g>
+		</svg>
+	</g>
+	
+	<g id="svg_eof"/>
+</svg>
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/extensions/helloworld-icon.xml	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,21 @@
+<svg xmlns="http://www.w3.org/2000/svg">
+<!-- 
+	Sample icons file. This file looks like an SVG file with groups as its
+	children. Each group element has an ID that must match the ID of the button given
+	in the extension. The SVG inside the group makes up the actual icon, and
+	needs use a viewBox instead of width/height for it to scale	properly.
+	
+	Multiple icons can be included, each within their own group.
+-->
+	<g id="hello_world">
+		<svg width="102" height="102" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+		 <!-- Created with SVG-edit - http://svg-edit.googlecode.com/ -->
+		 <g>
+		  <title>Layer 1</title>
+		  <rect ry="30" rx="30" x="2.5" y="2.5" width="97" height="97" id="svg_3" fill="#008000" stroke="#000000" stroke-width="5"/>
+		  <text x="52.668" y="42.5" id="svg_1" fill="#ffffff" stroke="#000000" stroke-width="0" font-size="24" font-family="Monospace" text-anchor="middle" xml:space="preserve">Hello</text>
+		  <text x="52.668" y="71.5" fill="#ffffff" stroke="#000000" stroke-width="0" font-size="24" font-family="Monospace" text-anchor="middle" xml:space="preserve" id="svg_2">World!</text>
+		 </g>
+		</svg>
+	</g>
+</svg>
\ No newline at end of file

Binary file htdocs/svg-edit/editor/images/logo.png has changed

--- a/htdocs/svg-edit/editor/images/logo.svg	Fri Apr 23 22:29:49 2010 +0200
+++ b/htdocs/svg-edit/editor/images/logo.svg	Fri Apr 23 22:38:00 2010 +0200
@@ -1,291 +1,32 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   viewBox="0 0 600 600"
-   id="svg2"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   width="48"
-   height="48"
-   sodipodi:docname="logo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0"
-   inkscape:export-filename="logo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <sodipodi:namedview
-     inkscape:window-height="858"
-     inkscape:window-width="911"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     guidetolerance="10.0"
-     gridtolerance="10.0"
-     objecttolerance="10.0"
-     borderopacity="1.0"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     showgrid="false"
-     inkscape:zoom="11.352818"
-     inkscape:cx="27.728302"
-     inkscape:cy="25.018074"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:current-layer="a32" />
-  <defs
-     id="defs14280">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 526.18109 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="744.09448 : 526.18109 : 1"
-       inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
-       id="perspective71" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_16_"
-       x1="67.8452"
-       x2="144.5898"
-       y1="115.5361"
-       y2="115.5361">
-      <stop
-         id="stop780"
-         offset="0"
-         stop-color="#7D7D99" />
-      <stop
-         id="stop781"
-         offset="0.1798"
-         stop-color="#B1B1C5" />
-      <stop
-         id="stop782"
-         offset="0.3727"
-         stop-color="#BCBCC8" />
-      <stop
-         id="stop783"
-         offset="0.6825"
-         stop-color="#C8C8CB" />
-      <stop
-         id="stop784"
-         offset="1"
-         stop-color="#CCC" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(-0.999,4.35e-2,4.35e-2,0.999,-1277.01,-496.517)"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_15_"
-       x1="-1401.459"
-       x2="-1354.6851"
-       y1="595.63092"
-       y2="699.47632">
-      <stop
-         id="stop770"
-         offset="0"
-         stop-color="#FFA700" />
-      <stop
-         id="stop771"
-         offset="0.7753"
-         stop-color="#FFD700" />
-      <stop
-         id="stop772"
-         offset="1"
-         stop-color="#FF9200" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(-0.999,4.35e-2,4.35e-2,0.999,-1277.01,-496.517)"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_14_"
-       x1="-1336.4497"
-       x2="-1325.3219"
-       y1="635.79492"
-       y2="622.53333">
-      <stop
-         id="stop763"
-         offset="0"
-         stop-color="#FFC957" />
-      <stop
-         id="stop764"
-         offset="1"
-         stop-color="#FF6D00" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_13_"
-       x1="65.094704"
-       x2="137.6021"
-       y1="-0.79540002"
-       y2="160.1823">
-      <stop
-         id="stop750"
-         offset="0"
-         stop-color="#FFA700" />
-      <stop
-         id="stop751"
-         offset="0.7753"
-         stop-color="#FFD700" />
-      <stop
-         id="stop752"
-         offset="1"
-         stop-color="#FF794B" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(-0.999,4.35e-2,4.35e-2,0.999,-1277.01,-496.517)"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_12_"
-       x1="-1375.9844"
-       x2="-1355.0455"
-       y1="685.38092"
-       y2="706.32172">
-      <stop
-         id="stop743"
-         offset="0"
-         stop-color="#F8F1DC" />
-      <stop
-         id="stop744"
-         offset="1"
-         stop-color="#D6A84A" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.1991,0.98,-0.98,0.1991,91.6944,573.565)"
-       gradientUnits="userSpaceOnUse"
-       id="XMLID_11_"
-       x1="-481.70071"
-       x2="-360.24561"
-       y1="-94.419403"
-       y2="-164.22141">
-      <stop
-         id="stop736"
-         offset="0"
-         stop-color="#900" />
-      <stop
-         id="stop737"
-         offset="1"
-         stop-color="#7C0000" />
-    </linearGradient>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath4418">
-      <rect
-         height="79.958374"
-         id="rect4420"
-         stroke-miterlimit="4"
-         style="fill:none;stroke:#000000;stroke-width:0.14421287;stroke-miterlimit:4;stroke-dasharray:none"
-         transform="scale(-1,1)"
-         width="73.952118"
-         x="-196.68831"
-         y="126.58712" />
-    </clipPath>
-  </defs>
-  <metadata
-     id="metadata30">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <a
-     xlink:href="http://svg-edit.googlecode.com/"
-     xlink:title="SVG-edit, an in-browser vector graphics editor"
-     target="_blank"
-     id="a32">
-    <path
-       sodipodi:type="star"
-       style="opacity:1;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path3216"
-       sodipodi:sides="8"
-       sodipodi:cx="239.79607"
-       sodipodi:cy="346.96844"
-       sodipodi:r1="194.03661"
-       sodipodi:r2="155.59306"
-       sodipodi:arg1="0.78539816"
-       sodipodi:arg2="1.1780972"
-       inkscape:flatsided="false"
-       inkscape:rounded="0"
-       inkscape:randomized="0"
-       d="M 377.00067,484.17304 L 299.33895,490.71769 L 239.79607,541.00505 L 180.25318,490.71769 L 102.59147,484.17305 L 96.04682,406.51133 L 45.75946,346.96845 L 96.046819,287.42556 L 102.59147,209.76385 L 180.25318,203.2192 L 239.79607,152.93184 L 299.33895,203.2192 L 377.00067,209.76384 L 383.54531,287.42556 L 433.83267,346.96844 L 383.54531,406.51133 L 377.00067,484.17304 z"
-       transform="translate(4.1586051,6.9957853)" />
-    <path
-       d="M 257.74,558.2 C 282.68,551.18 299.44,533.03 303.3,508.86 L 304.6,500.74 L 310.09,504.65 C 342.6,527.8 385.95,516.69 401.92,481.11 C 410.74,461.44 406.88,429.74 394.39,419.38 C 389.52,415.34 390.73,414.03 400.54,412.71 C 463.81,404.2 466.02,308.53 403.26,294.99 C 389.53,292.02 390.07,292.74 395.81,285.17 C 435.22,233.14 367.98,163.64 313.59,200.18 L 305.09,205.89 L 302.14,193.86 C 286.67,130.77 193.37,133.52 184.62,197.33 C 183.22,207.55 183.54,207.42 175.45,201.25 C 145.54,178.44 96.024,193.52 84.229,229.04 C 77.621,248.93 81.839,276.52 93.036,286.66 C 98.393,291.5 97.7,292.63 88.496,294.06 C 22.466,304.29 22.003,403.73 87.943,412.77 L 96.572,413.95 L 91.187,421.94 C 63.478,463.02 91.34,516.89 140.25,516.79 C 154.94,516.76 170.97,511.38 177.33,504.36 C 181.99,499.22 183.95,499.74 183.95,506.13 C 183.95,538.55 224.9,567.45 257.74,558.2 L 257.74,558.2 z M 224.97,526.08 C 211.13,516.23 207.03,494.21 216.63,481.24 C 220.49,476.01 220.78,473.32 220.78,442.14 L 220.78,408.66 L 196.55,432.83 C 177.87,451.47 172.32,458.16 172.32,462.07 C 172.32,481.92 139.36,496.53 122.68,484.07 C 99.738,466.94 105.5,432.15 132.4,425.3 C 138.8,423.67 144.87,418.74 163.57,399.95 L 186.8,376.62 L 154.85,376.63 C 124.63,376.64 122.38,376.9 113.36,381.47 C 76.809,400.02 46.091,351.65 78.652,326.81 C 88.187,319.54 106.02,319.02 115.45,325.74 C 121.2,329.85 123.45,330.1 154.18,330.1 L 186.8,330.1 L 163.79,307.04 C 147.4,290.61 139.05,283.62 134.78,282.77 C 106.14,277.04 98.685,240.4 122.56,222.71 C 139.4,210.23 172.44,224.79 172.28,244.63 C 172.25,248.57 177.44,254.67 196.02,272.54 L 219.81,295.41 L 220.34,263.32 C 220.84,233.01 220.64,230.91 216.67,225.55 C 202.3,206.11 216.23,177.52 241.09,175.46 C 267.18,173.29 284.31,199.14 272.29,222.54 C 267.54,231.79 267.31,233.68 267.3,264.18 L 267.29,296.13 L 290.36,273.12 C 306.39,257.14 313.79,248.33 314.59,244.3 C 320.55,214.53 361.13,208.27 375.2,234.95 C 385.62,254.7 375.71,276.27 353.68,281.82 C 346.89,283.53 341.33,288 322.38,307 L 299.33,330.1 L 332.92,330.1 C 363.2,330.1 367.04,329.73 371.86,326.3 C 384.69,317.16 402.12,319.56 413.39,332.03 C 438.43,359.76 402.17,402.01 371.86,380.43 C 367.04,377 363.2,376.62 332.92,376.62 L 299.33,376.62 L 322.38,399.72 C 341.33,418.73 346.89,423.2 353.68,424.91 C 390.29,434.13 386.87,485.55 349.44,488.65 C 332.45,490.06 313.81,474.97 313.81,459.8 C 313.81,458.26 303.34,446.56 290.55,433.8 L 267.29,410.6 L 267.3,442.55 C 267.31,472.77 267.57,475.02 272.15,484.03 C 287.66,514.61 252.66,545.8 224.97,526.08 L 224.97,526.08 z"
-       id="path34"
-       style="fill:#000000" />
-    <g
-       clip-path="url(#clipPath4418)"
-       transform="matrix(-4.6717475,0,0,4.6717475,1143.4575,-562.74962)"
-       id="g36">
-      <path
-         d="M 191.92,195.98 C 180.31,159.86 178.21,153.31 177.06,151.92 C 177.18,152 177.35,152.1 177.35,152.1 L 98.804,64.643 C 94.609,59.993 84.799,64.999 77.449,71.619 C 70.166,78.161 64.129,87.392 68.079,92.183 L 147.02,179.73 L 147.56,179.82 L 185.32,197.42 L 193.01,199.79 L 191.92,195.98 L 191.92,195.98 z"
-         id="path38"
-         style="opacity:0.2" />
-      <path
-         d="M 193.56,193.52 C 181.95,157.39 179.84,150.85 178.7,149.45 C 178.82,149.52 178.99,149.63 178.99,149.63 L 100.44,62.175 C 96.245,57.524 86.429,62.53 79.083,69.15 C 71.802,75.695 65.763,84.923 69.715,89.716 L 148.66,177.26 L 149.19,177.36 L 186.96,194.95 L 194.64,197.32 L 193.56,193.52 L 193.56,193.52 z"
-         id="path40"
-         style="opacity:0.2" />
-      <path
-         d="M 186.77,191.05 C 175.16,154.92 173.06,148.38 171.91,146.98 C 172.03,147.06 172.2,147.16 172.2,147.16 L 93.653,59.704 C 89.461,55.054 79.644,60.063 72.299,66.682 C 65.016,73.224 58.978,82.453 62.93,87.247 L 141.87,174.79 L 142.41,174.88 L 180.18,192.48 L 187.86,194.85 L 186.77,191.05 L 186.77,191.05 z"
-         id="path42"
-         style="opacity:0.2" />
-      <path
-         d="M 186.43,189.36 C 174.82,153.23 172.72,146.69 171.57,145.29 C 171.69,145.37 171.86,145.47 171.86,145.47 L 93.314,58.016 C 89.115,53.365 79.299,58.373 71.955,64.993 C 64.672,71.536 58.633,80.767 62.585,85.559 L 141.53,173.1 L 142.06,173.2 L 179.83,190.8 L 187.52,193.16 L 186.43,189.36 L 186.43,189.36 z"
-         id="path44"
-         style="fill:#ffffff" />
-      <path
-         d="M 186.43,189.36 C 174.82,153.23 172.72,146.69 171.57,145.29 C 171.69,145.37 171.86,145.47 171.86,145.47 L 93.314,58.016 C 89.115,53.365 79.299,58.373 71.955,64.993 C 64.672,71.536 58.633,80.767 62.585,85.559 L 141.53,173.1 L 142.06,173.2 L 179.83,190.8 L 187.52,193.16 L 186.43,189.36 L 186.43,189.36 z"
-         id="path46"
-         style="fill:url(#XMLID_11_)" />
-      <path
-         d="M 166.97,147.76 L 180.69,185.89 L 144.32,167.99 L 144.49,167.84 C 144.24,167.76 143.99,167.66 143.79,167.52 L 143.66,167.64 L 68.36,84.072 L 68.483,83.968 C 66.237,81.478 69.515,74.874 75.791,69.216 C 82.071,63.564 88.971,60.997 91.216,63.483 L 166.51,147.05 L 166.97,147.76 L 166.97,147.76 z"
-         id="path48"
-         style="fill:url(#XMLID_12_)" />
-      <path
-         d="M 148.65,170.12 C 150.73,169.75 153.29,168.64 155.9,166.98 C 157.52,165.96 159.18,164.7 160.8,163.24 C 162.26,161.94 163.54,160.57 164.64,159.23 C 166.72,156.7 167.96,154.02 168.42,151.8 L 166.97,147.76 L 166.5,147.05 L 91.707,64.028 C 92.315,66.268 90.745,69.966 87.644,73.768 C 86.51,75.157 85.203,76.557 83.699,77.909 C 82.125,79.328 80.504,80.561 78.932,81.563 C 74.439,84.434 70.304,85.491 68.384,84.049 L 68.359,84.07 L 143.66,167.64 L 143.79,167.52 C 143.99,167.66 144.24,167.76 144.49,167.84 L 144.32,167.99 L 148.65,170.12 L 148.65,170.12 z"
-         id="path50"
-         style="fill:url(#XMLID_13_)" />
-      <path
-         d="M 68.083,83.41 C 69.815,85.182 74.077,84.186 78.726,81.216 C 80.267,80.234 81.858,79.023 83.403,77.63 C 84.879,76.305 86.162,74.929 87.275,73.567 C 90.853,69.179 92.366,64.925 90.752,62.983 L 90.775,62.959 L 166.59,147.08 C 167.23,149.34 166,153.58 162.84,157.44 C 161.76,158.75 160.5,160.09 159.07,161.37 C 157.48,162.8 155.85,164.04 154.26,165.04 C 149.52,168.05 144.96,169.24 143.24,167.35 C 142.85,166.91 141.15,165.01 141.1,164.94 L 67.845,83.626 L 68.083,83.41 L 68.083,83.41 z"
-         id="path52"
-         style="fill:#ffffff" />
-      <path
-         d="M 75.79,69.215 C 82.07,63.563 88.97,60.996 91.215,63.482 L 108.18,82.31 L 109.33,108.8 L 91.355,109.58 L 68.359,84.071 L 68.482,83.967 C 66.236,81.477 69.514,74.874 75.79,69.215 L 75.79,69.215 z"
-         id="path54"
-         style="fill:#ffffff" />
-      <path
-         d="M 68.083,83.41 C 69.815,85.182 74.077,84.186 78.726,81.216 C 80.267,80.234 81.858,79.023 83.403,77.63 C 84.879,76.305 86.162,74.929 87.275,73.567 C 90.853,69.179 92.366,64.925 90.752,62.983 L 90.775,62.959 L 166.59,147.08 C 167.23,149.34 166,153.58 162.84,157.44 C 161.76,158.75 160.5,160.09 159.07,161.37 C 157.48,162.8 155.85,164.04 154.26,165.04 C 149.52,168.05 144.96,169.24 143.24,167.35 C 142.85,166.91 141.15,165.01 141.1,164.94 L 67.845,83.626 L 68.083,83.41 L 68.083,83.41 z"
-         id="path56"
-         style="fill:#ffffff" />
-      <path
-         d="M 75.79,69.215 C 82.07,63.563 88.97,60.996 91.215,63.482 L 108.18,82.31 L 109.33,108.8 L 91.355,109.58 L 68.359,84.071 L 68.482,83.967 C 66.236,81.477 69.514,74.874 75.79,69.215 L 75.79,69.215 z"
-         id="path58"
-         style="fill:url(#XMLID_14_)" />
-      <path
-         d="M 68.083,83.41 C 69.815,85.182 74.077,84.186 78.726,81.216 C 80.267,80.234 81.858,79.023 83.403,77.63 C 84.879,76.305 86.162,74.929 87.275,73.567 C 90.853,69.179 92.366,64.925 90.752,62.983 L 90.775,62.959 L 166.59,147.08 C 167.23,149.34 166,153.58 162.84,157.44 C 161.76,158.75 160.5,160.09 159.07,161.37 C 157.48,162.8 155.85,164.04 154.26,165.04 C 149.52,168.05 144.96,169.24 143.24,167.35 C 142.85,166.91 141.15,165.01 141.1,164.94 L 67.845,83.626 L 68.083,83.41 L 68.083,83.41 z"
-         id="path60"
-         style="fill:url(#XMLID_15_)" />
-      <path
-         d="M 74.357,90.713 C 74.357,90.713 80.393,90.501 85.042,87.531 C 86.584,86.548 88.174,85.338 89.719,83.945 C 91.196,82.619 92.479,81.244 93.592,79.881 C 96.52,76.292 98.061,72.793 97.641,70.574 L 90.776,62.957 L 90.753,62.981 C 92.367,64.923 90.855,69.177 87.276,73.565 C 86.163,74.927 84.88,76.303 83.404,77.628 C 81.859,79.021 80.268,80.232 78.727,81.214 C 74.079,84.185 69.817,85.181 68.084,83.408 L 67.846,83.625 L 141.1,164.94 C 141.15,165.01 142.85,166.9 143.25,167.34 C 143.59,167.72 144.05,167.97 144.59,168.11 L 74.357,90.713 L 74.357,90.713 z"
-         id="path62"
-         style="fill:url(#XMLID_16_)" />
-      <path
-         d="M 172.04,175.35 C 170.4,176.83 168.73,178.12 167.09,179.19 L 180.69,185.89 L 175.6,171.74 C 174.54,172.95 173.35,174.18 172.04,175.35 z"
-         id="path64"
-         style="fill:#003333" />
-      <path
-         d="M 163.12,157.05 L 86.968,73.93 C 87.068,73.81 87.181,73.688 87.275,73.566 C 88.703,71.814 89.795,70.076 90.5,68.508 L 166.27,151.22 C 165.72,153.04 164.67,155.08 163.12,157.05 L 163.12,157.05 z"
-         id="path66"
-         style="opacity:0.5;fill:#ffffff" />
-      <path
-         d="M 87.275,73.566 C 87.909,72.792 88.464,72.018 88.969,71.266 L 164.98,154.24 C 164.41,155.3 163.7,156.39 162.84,157.43 C 162.09,158.33 161.27,159.24 160.37,160.13 L 84.152,76.932 C 85.316,75.824 86.361,74.692 87.275,73.566 L 87.275,73.566 z"
-         id="path68"
-         style="opacity:0.5;fill:#ffffff" />
-    </g>
-  </a>
+<svg viewBox="0 0 478 472" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="svg_5" x1="0" y1="0" x2="1" y2="1">
+   <stop offset="0" stop-color="#ffffe0" stop-opacity="1"/>
+   <stop offset="1" stop-color="#edc39c" stop-opacity="1"/>
+  </linearGradient>
+  <linearGradient id="svg_10" x1="0.57031" y1="0.78125" x2="0.28906" y2="0.41406">
+   <stop offset="0" stop-color="#ff7f00" stop-opacity="1"/>
+   <stop offset="1" stop-color="#ffff00"/>
+  </linearGradient>
+  <linearGradient id="svg_18" x1="0.37891" y1="0.35938" x2="1" y2="1">
+   <stop offset="0" stop-color="#e0e0e0" stop-opacity="1"/>
+   <stop offset="1" stop-color="#666666" stop-opacity="1"/>
+  </linearGradient>
+ </defs>
+ <g>
+  <title>Layer 1</title>
+  <path d="m68.82031,270.04688l-22,-33l17,-35l34,2l25,15l7,-35l28,-16l25,12l100,102l21,23l-15,35l-36,9l20,49l-31,24l-49,-17l-1,31l-33,21l-31,-19l-13,-35l-30,21l-30,-9l-5,-35l16,-31l-32,-6l-15,-19l3,-36l47,-18z" id="svg_19" fill="#ffffff"/>
+  <path fill="#1a171a" fill-rule="nonzero" id="path2902" d="m158.96452,155.03685c-25.02071,0 -45.37077,20.35121 -45.37077,45.3775c0,0.72217 0.01794,1.4399 0.0471,2.15645c-0.49339,-0.53604 -0.99355,-1.06085 -1.50603,-1.58452c-8.56077,-8.55519 -19.95982,-13.28413 -32.07432,-13.28413c-12.12122,0 -23.52027,4.72334 -32.08778,13.29646c-17.69347,17.69464 -17.69347,46.4619 0,64.17445c0.51809,0.51697 1.0485,1.0126 1.59015,1.50601c-0.72891,-0.03586 -1.45782,-0.04822 -2.19234,-0.04822c-25.02071,0 -45.37189,20.35117 -45.37189,45.37747c0,25.01398 20.35119,45.36517 45.37189,45.36517c0.72891,0 1.45221,-0.01236 2.1744,-0.04828c-0.5293,0.48221 -1.05412,0.98801 -1.56547,1.49368c-17.70021,17.68906 -17.70021,46.48654 -0.00628,64.18677c8.57872,8.56747 19.96655,13.2785 32.08778,13.2785c12.1145,0 23.5012,-4.71103 32.07433,-13.2785c0.51247,-0.51694 1.01823,-1.04849 1.50603,-1.57895c-0.02915,0.71213 -0.04709,1.44669 -0.04709,2.15759c0,25.01511 20.35007,45.37747 45.37077,45.37747c25.01398,0 45.37079,-20.3624 45.37079,-45.37747c0,-0.7222 -0.01689,-1.44553 -0.05266,-2.18112c0.48105,0.52933 0.97562,1.04849 1.48697,1.56662c8.57982,8.57977 19.97775,13.2908 32.1057,13.2908c12.11003,0 23.51358,-4.71103 32.0687,-13.2785c17.68906,-17.70013 17.68906,-46.48538 0,-64.17441c-0.50577,-0.4946 -1.01141,-1.00034 -1.54306,-1.48248c0.69983,0.03592 1.42316,0.04828 2.16992,0.04828c25.01514,0 45.35284,-20.35123 45.35284,-45.36517c0,-25.02631 -20.33774,-45.37747 -45.35284,-45.37747c-0.74683,0 -1.47009,0.01236 -2.19345,0.04822c0.53152,-0.49341 1.06082,-0.98904 1.59128,-1.50601c8.55521,-8.55521 13.2785,-19.94186 13.2785,-32.07545c0,-12.12793 -4.72336,-23.52028 -13.30319,-32.0934c-8.55515,-8.56076 -19.95866,-13.2841 -32.0687,-13.2841c-12.12122,0 -23.52025,4.72334 -32.08777,13.2841c-0.51137,0.5181 -1.01822,1.04851 -1.5049,1.57895c0.03586,-0.72331 0.05266,-1.43991 0.05266,-2.16881c0,-25.02629 -20.35681,-45.3775 -45.37079,-45.3775m0,20.71901c13.61607,0 24.65851,11.03122 24.65851,24.65849c0,6.62749 -2.651,12.62137 -6.9101,17.04979l0,51.67419l36.53975,-36.53523c0.12001,-6.14418 2.48277,-12.24686 7.18146,-16.94667c4.81305,-4.81305 11.12094,-7.22409 17.44116,-7.22409c6.30228,0 12.61577,2.41104 17.43552,7.22409c9.62166,9.63287 9.62166,25.24948 0,34.87669c-4.69977,4.68634 -10.80803,7.04915 -16.95334,7.18147l-36.5341,36.53305l51.66742,0c4.42841,-4.25351 10.42905,-6.90451 17.08008,-6.90451c13.59137,0 24.62933,11.03799 24.62933,24.66525c0,13.61606 -11.03796,24.66519 -24.62933,24.66519c-6.65106,0 -12.65167,-2.66333 -17.08008,-6.91681l-51.64836,0l36.50273,36.50946c6.16995,0.14465 12.26587,2.50522 16.96568,7.20618c9.6216,9.61487 9.6216,25.23151 0,34.85757c-4.80856,4.81979 -11.13327,7.22974 -17.43556,7.22974c-6.32019,0 -12.63371,-2.40991 -17.44786,-7.22974c-4.68074,-4.68744 -7.04802,-10.79572 -7.17473,-16.94098l-36.53975,-36.53415l0,51.66742c4.25908,4.44635 6.9101,10.43466 6.9101,17.0621c0,13.62729 -11.04243,24.66415 -24.65851,24.66415c-13.62166,0 -24.65848,-11.0369 -24.65848,-24.66415c0,-6.62744 2.64539,-12.61575 6.90335,-17.0621l0,-51.66742l-36.53864,36.54648c-0.12672,6.14413 -2.48838,12.26477 -7.18147,16.94098c-4.81416,4.81873 -11.12206,7.22974 -17.42882,7.22974c-6.31461,0 -12.6225,-2.41101 -17.43555,-7.22974c-9.63284,-9.62833 -9.63284,-25.24277 0,-34.8699c4.68073,-4.67627 10.79012,-7.05026 16.94101,-7.18262l36.533,-36.53302l-51.66632,0c-4.44075,4.25348 -10.42902,6.91681 -17.06211,6.91681c-13.61606,0 -24.65288,-11.04913 -24.65288,-24.66519c0,-13.62726 11.03682,-24.66525 24.65288,-24.66525c6.63309,0 12.62136,2.651 17.06211,6.90451l51.68537,0l-36.55208,-36.54538c-6.14527,-0.12 -12.25354,-2.49403 -16.94775,-7.19377c-9.62611,-9.61493 -9.62611,-25.23715 0,-34.86441c4.81419,-4.81305 11.12769,-7.22406 17.44228,-7.22406c6.30676,0 12.61465,2.41101 17.42883,7.22406c4.69978,4.69307 7.06034,10.80246 7.18144,16.94777l36.5386,36.53299l0,-51.66074c-4.25795,-4.42841 -6.90334,-10.42229 -6.90334,-17.04979c0,-13.62726 11.03682,-24.65848 24.65848,-24.65848"/>
+  <path d="m188.82031,210.04688l16,-47l155,-148l107,100l-158,156.99999l-44,12l-76,-74z" id="svg_6" fill="url(#svg_10)" stroke="#ffffff" stroke-width="0"/>
+  <path d="m335.57031,40.29688c-11.5,39.75 55.5,115.25 109.25,98.75l21,-20.99999l-103,-101l-27.25,23.25z" id="svg_11" fill="url(#svg_18)" stroke="#ffffff" stroke-width="0"/>
+  <rect x="272.80404" y="20.76382" width="42.35197" height="232.66835" id="svg_13" fill="#ffffff" stroke="#ffffff" stroke-width="0" transform="rotate(45.9094, 293.98, 137.1)" opacity="0.4"/>
+  <rect x="282.80404" y="22.76382" width="14" height="232.66835" fill="#ffffff" stroke="#ffffff" stroke-width="0" transform="rotate(45.9094, 289.805, 139.1)" opacity="0.4" id="svg_14"/>
+  <ellipse cx="415.13312" cy="64.38066" id="svg_12" fill="#ea7598" stroke="#ffffff" stroke-width="0" rx="67.79251" ry="34.82026" transform="rotate(39.4735, 415.133, 64.379)"/>
+  <path d="m212.07031,166.04688c-8.5,47 36.25,103.75 99.25,96.75l-152.5,53.25l53.25,-150z" id="svg_4" fill="url(#svg_5)" stroke="#ffffff" stroke-width="0"/>
+  <path d="m181.32031,242.54688c0.5,20.5 26.75,45 46.75,48.5l-66.25,20l19.5,-68.5z" id="svg_3" fill="#27382f" stroke="#ffffff" stroke-width="0"/>
+ </g>
+ <g>
+  <title>Layer 2</title>
+  <path d="m152.82031,317.04688l51,-152l157,-153c40,-12.00001 118,48 105,105l-157,152.99999l-156,47z" id="svg_1" fill="none" stroke="#800000" stroke-width="17"/>
+ </g>
 </svg>

--- a/htdocs/svg-edit/editor/images/svg_edit_icons.svg	Fri Apr 23 22:29:49 2010 +0200
+++ b/htdocs/svg-edit/editor/images/svg_edit_icons.svg	Fri Apr 23 22:38:00 2010 +0200
@@ -1,106 +1,39 @@
 <svg xmlns="http://www.w3.org/2000/svg">
-<!-- All images except logo created with SVG-edit - http://svg-edit.googlecode.com/ -->
+<!-- All images created with SVG-edit - http://svg-edit.googlecode.com/ -->
 
 <g id="logo">
-	<svg version="1.0"
-		 id="svg2" inkscape:output_extension="org.inkscape.output.svg.inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:cc="http://creativecommons.org/ns#" inkscape:export-ydpi="90" inkscape:export-xdpi="90" xmlns:svg="http://www.w3.org/2000/svg"
-		 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-		 viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
-	<a id="a32" xlink:href="http://svg-edit.googlecode.com/"  xlink:title="SVG-edit, an in-browser vector graphics editor">
-		
-			<path id="path3216" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="1.1780972" sodipodi:arg1="0.78539816" sodipodi:r2="155.59306" sodipodi:r1="194.03661" sodipodi:cy="346.96844" sodipodi:cx="239.79607" sodipodi:sides="8" sodipodi:type="star" fill="#FFFFFF" d="
-			M30.5,39.3l-6.2,0.5l-4.8,4l-4.8-4l-6.2-0.5L8,33.1l-4-4.8l4-4.8l0.5-6.2l6.2-0.5l4.8-4l4.8,4l6.2,0.5l0.5,6.2l4,4.8l-4,4.8
-			L30.5,39.3z"/>
-		<path id="path34" d="M20.6,44.7c2-0.6,3.3-2,3.6-3.9l0.1-0.7l0.4,0.3c2.6,1.9,6.1,1,7.3-1.9c0.7-1.6,0.4-4.1-0.6-4.9
-			c-0.4-0.3-0.3-0.4,0.5-0.5c5.1-0.7,5.2-8.3,0.2-9.4c-1.1-0.2-1.1-0.2-0.6-0.8c3.2-4.2-2.2-9.7-6.6-6.8l-0.7,0.5l-0.2-1
-			c-1.2-5-8.7-4.8-9.4,0.3c-0.1,0.8-0.1,0.8-0.7,0.3c-2.4-1.8-6.4-0.6-7.3,2.2c-0.5,1.6-0.2,3.8,0.7,4.6c0.4,0.4,0.4,0.5-0.4,0.6
-			c-5.3,0.8-5.3,8.8,0,9.5l0.7,0.1l-0.4,0.6c-2.2,3.3,0,7.6,3.9,7.6c1.2,0,2.5-0.4,3-1c0.4-0.4,0.5-0.4,0.5,0.1
-			C14.7,43.1,18,45.4,20.6,44.7L20.6,44.7z M18,42.1c-1.1-0.8-1.4-2.5-0.7-3.6c0.3-0.4,0.3-0.6,0.3-3.1v-2.7l-1.9,1.9
-			c-1.5,1.5-1.9,2-1.9,2.3c0,1.6-2.6,2.8-4,1.8C8,37.4,8.4,34.6,10.6,34c0.5-0.1,1-0.5,2.5-2l1.9-1.9l-2.6,0c-2.4,0-2.6,0-3.3,0.4
-			c-2.9,1.5-5.4-2.4-2.8-4.4c0.8-0.6,2.2-0.6,2.9-0.1c0.5,0.3,0.6,0.3,3.1,0.3h2.6l-1.8-1.8c-1.3-1.3-2-1.9-2.3-1.9
-			c-2.3-0.5-2.9-3.4-1-4.8c1.3-1,4,0.2,4,1.8c0,0.3,0.4,0.8,1.9,2.2l1.9,1.8l0-2.6c0-2.4,0-2.6-0.3-3c-1.1-1.6,0-3.8,2-4
-			c2.1-0.2,3.5,1.9,2.5,3.8c-0.4,0.7-0.4,0.9-0.4,3.3l0,2.6l1.8-1.8c1.3-1.3,1.9-2,1.9-2.3c0.5-2.4,3.7-2.9,4.8-0.7
-			c0.8,1.6,0,3.3-1.7,3.7c-0.5,0.1-1,0.5-2.5,2l-1.8,1.8h2.7c2.4,0,2.7,0,3.1-0.3c1-0.7,2.4-0.5,3.3,0.5c2,2.2-0.9,5.6-3.3,3.9
-			c-0.4-0.3-0.7-0.3-3.1-0.3h-2.7l1.8,1.8c1.5,1.5,2,1.9,2.5,2c2.9,0.7,2.7,4.9-0.3,5.1c-1.4,0.1-2.8-1.1-2.8-2.3
-			c0-0.1-0.8-1.1-1.9-2.1l-1.9-1.9l0,2.6c0,2.4,0,2.6,0.4,3.3C23,41.2,20.2,43.7,18,42.1L18,42.1z"/>
-		<g>
-			<g id="g36" transform="matrix(-4.6717475,0,0,4.6717475,1143.4575,-562.74962)">
-				<path id="path38" opacity="0.2" enable-background="new    " d="M240.5,126.5c-0.9-2.9-1.1-3.4-1.2-3.5c0,0,0,0,0,0l-6.3-7
-					c-0.3-0.4-1.1,0-1.7,0.6c-0.6,0.5-1.1,1.3-0.7,1.6l6.3,7l0,0l3,1.4l0.6,0.2L240.5,126.5L240.5,126.5z"/>
-				<path id="path40" opacity="0.2" enable-background="new    " d="M240.7,126.3c-0.9-2.9-1.1-3.4-1.2-3.5c0,0,0,0,0,0l-6.3-7
-					c-0.3-0.4-1.1,0-1.7,0.6c-0.6,0.5-1.1,1.3-0.7,1.6l6.3,7l0,0l3,1.4l0.6,0.2L240.7,126.3L240.7,126.3z"/>
-				<path id="path42" opacity="0.2" enable-background="new    " d="M240.1,126.1c-0.9-2.9-1.1-3.4-1.2-3.5c0,0,0,0,0,0l-6.3-7
-					c-0.3-0.4-1.1,0-1.7,0.6c-0.6,0.5-1.1,1.3-0.7,1.6l6.3,7l0,0l3,1.4l0.6,0.2L240.1,126.1L240.1,126.1z"/>
-				<path id="path44" fill="#FFFFFF" d="M240.1,126c-0.9-2.9-1.1-3.4-1.2-3.5c0,0,0,0,0,0l-6.3-7c-0.3-0.4-1.1,0-1.7,0.6
-					c-0.6,0.5-1.1,1.3-0.7,1.6l6.3,7l0,0l3,1.4l0.6,0.2L240.1,126L240.1,126z"/>
-				
-					<linearGradient id="path46_1_" gradientUnits="userSpaceOnUse" x1="251.6057" y1="30.2918" x2="373.0601" y2="100.0934" gradientTransform="matrix(-7.441159e-02 -0.3663 0.3663 -7.441159e-02 239.8726 211.8456)">
-					<stop  offset="0" style="stop-color:#990000"/>
-					<stop  offset="1" style="stop-color:#7C0000"/>
-				</linearGradient>
-				<path id="path46" fill="url(#path46_1_)" d="M240.1,126c-0.9-2.9-1.1-3.4-1.2-3.5c0,0,0,0,0,0l-6.3-7c-0.3-0.4-1.1,0-1.7,0.6
-					c-0.6,0.5-1.1,1.3-0.7,1.6l6.3,7l0,0l3,1.4l0.6,0.2L240.1,126L240.1,126z"/>
-				
-					<linearGradient id="path48_1_" gradientUnits="userSpaceOnUse" x1="448.9506" y1="-141.7113" x2="469.8885" y2="-162.6511" gradientTransform="matrix(0.3734 -1.625768e-02 -1.625768e-02 -0.3734 65.4455 75.4761)">
-					<stop  offset="0" style="stop-color:#F8F1DC"/>
-					<stop  offset="1" style="stop-color:#D6A84A"/>
-				</linearGradient>
-				<path id="path48" fill="url(#path48_1_)" d="M238.5,122.6l1.1,3.1l-2.9-1.4l0,0c0,0,0,0-0.1,0l0,0l-6-6.7l0,0
-					c-0.2-0.2,0.1-0.7,0.6-1.2c0.5-0.5,1.1-0.7,1.2-0.5L238.5,122.6L238.5,122.6L238.5,122.6z"/>
-				
-					<linearGradient id="path50_1_" gradientUnits="userSpaceOnUse" x1="473.214" y1="-2.063" x2="545.7217" y2="-163.0414" gradientTransform="matrix(-0.3737 0 0 -0.3737 407.2458 109.9867)">
-					<stop  offset="0" style="stop-color:#FFA700"/>
-					<stop  offset="0.7753" style="stop-color:#FFD700"/>
-					<stop  offset="1" style="stop-color:#FF794B"/>
-				</linearGradient>
-				<path id="path50" fill="url(#path50_1_)" d="M237.1,124.4c0.2,0,0.4-0.1,0.6-0.3c0.1-0.1,0.3-0.2,0.4-0.3
-					c0.1-0.1,0.2-0.2,0.3-0.3c0.2-0.2,0.3-0.4,0.3-0.6l-0.1-0.3l0-0.1l-6-6.6c0,0.2-0.1,0.5-0.3,0.8c-0.1,0.1-0.2,0.2-0.3,0.3
-					c-0.1,0.1-0.3,0.2-0.4,0.3c-0.4,0.2-0.7,0.3-0.8,0.2l0,0l6,6.7l0,0c0,0,0,0,0.1,0l0,0L237.1,124.4L237.1,124.4z"/>
-				<path id="path52" fill="#FFFFFF" d="M230.6,117.5c0.1,0.1,0.5,0.1,0.9-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.2,0.3-0.3
-					c0.3-0.4,0.4-0.7,0.3-0.8l0,0l6.1,6.7c0.1,0.2,0,0.5-0.3,0.8c-0.1,0.1-0.2,0.2-0.3,0.3c-0.1,0.1-0.3,0.2-0.4,0.3
-					c-0.4,0.2-0.7,0.3-0.9,0.2c0,0-0.2-0.2-0.2-0.2L230.6,117.5L230.6,117.5L230.6,117.5z"/>
-				<path id="path54" fill="#FFFFFF" d="M231.2,116.4c0.5-0.5,1.1-0.7,1.2-0.5l1.4,1.5l0.1,2.1l-1.4,0.1l-1.8-2l0,0
-					C230.5,117.3,230.7,116.8,231.2,116.4L231.2,116.4z"/>
-				<path id="path56" fill="#FFFFFF" d="M230.6,117.5c0.1,0.1,0.5,0.1,0.9-0.2c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.2,0.3-0.3
-					c0.3-0.4,0.4-0.7,0.3-0.8l0,0l6.1,6.7c0.1,0.2,0,0.5-0.3,0.8c-0.1,0.1-0.2,0.2-0.3,0.3c-0.1,0.1-0.3,0.2-0.4,0.3
-					c-0.4,0.2-0.7,0.3-0.9,0.2c0,0-0.2-0.2-0.2-0.2L230.6,117.5L230.6,117.5L230.6,117.5z"/>
-				
-					<linearGradient id="path58_1_" gradientUnits="userSpaceOnUse" x1="440.489" y1="-131.0965" x2="451.6169" y2="-117.8349" gradientTransform="matrix(0.3734 -1.625768e-02 -1.625768e-02 -0.3734 65.4455 75.4761)">
-					<stop  offset="0" style="stop-color:#FFC957"/>
-					<stop  offset="1" style="stop-color:#FF6D00"/>
-				</linearGradient>
-				<path id="path58" fill="url(#path58_1_)" d="M231.2,116.4c0.5-0.5,1.1-0.7,1.2-0.5l1.4,1.5l0.1,2.1l-1.4,0.1l-1.8-2l0,0
-					C230.5,117.3,230.7,116.8,231.2,116.4L231.2,116.4z"/>
-				
-					<linearGradient id="path60_1_" gradientUnits="userSpaceOnUse" x1="454.4041" y1="-122.501" x2="501.1769" y2="-226.3438" gradientTransform="matrix(0.3734 -1.625768e-02 -1.625768e-02 -0.3734 65.4455 75.4761)">
-					<stop  offset="0" style="stop-color:#FFA700"/>
-					<stop  offset="0.7753" style="stop-color:#FFD700"/>
-					<stop  offset="1" style="stop-color:#FF9200"/>
-				</linearGradient>
-				<path id="path60" fill="url(#path60_1_)" d="M230.6,117.5c0.1,0.1,0.5,0.1,0.9-0.2c0.1-0.1,0.3-0.2,0.4-0.3
-					c0.1-0.1,0.2-0.2,0.3-0.3c0.3-0.4,0.4-0.7,0.3-0.8l0,0l6.1,6.7c0.1,0.2,0,0.5-0.3,0.8c-0.1,0.1-0.2,0.2-0.3,0.3
-					c-0.1,0.1-0.3,0.2-0.4,0.3c-0.4,0.2-0.7,0.3-0.9,0.2c0,0-0.2-0.2-0.2-0.2L230.6,117.5L230.6,117.5L230.6,117.5z"/>
-				
-					<linearGradient id="path62_1_" gradientUnits="userSpaceOnUse" x1="472.6249" y1="-26.9638" x2="549.3671" y2="-26.9638" gradientTransform="matrix(-0.3737 0 0 -0.3737 407.2458 109.9867)">
-					<stop  offset="0" style="stop-color:#7D7D99"/>
-					<stop  offset="0.1798" style="stop-color:#B1B1C5"/>
-					<stop  offset="0.3727" style="stop-color:#BCBCC8"/>
-					<stop  offset="0.6825" style="stop-color:#C8C8CB"/>
-					<stop  offset="1" style="stop-color:#CCCCCC"/>
-				</linearGradient>
-				<path id="path62" fill="url(#path62_1_)" d="M231.1,118.1c0,0,0.5,0,0.9-0.3c0.1-0.1,0.3-0.2,0.4-0.3c0.1-0.1,0.2-0.2,0.3-0.3
-					c0.2-0.3,0.4-0.6,0.3-0.7l-0.5-0.6l0,0c0.1,0.2,0,0.5-0.3,0.8c-0.1,0.1-0.2,0.2-0.3,0.3c-0.1,0.1-0.3,0.2-0.4,0.3
-					c-0.4,0.2-0.7,0.3-0.9,0.2l0,0l5.9,6.5c0,0,0.1,0.2,0.2,0.2c0,0,0.1,0.1,0.1,0.1L231.1,118.1L231.1,118.1z"/>
-				<path id="path64" fill="#003333" d="M238.9,124.8c-0.1,0.1-0.3,0.2-0.4,0.3l1.1,0.5l-0.4-1.1C239.1,124.7,239,124.8,238.9,124.8z
-					"/>
-				<path id="path66" opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M238.2,123.4l-6.1-6.6c0,0,0,0,0,0
-					c0.1-0.1,0.2-0.3,0.3-0.4l6.1,6.6C238.4,123.1,238.4,123.2,238.2,123.4L238.2,123.4z"/>
-				<path id="path68" opacity="0.5" fill="#FFFFFF" enable-background="new    " d="M232.2,116.7c0.1-0.1,0.1-0.1,0.1-0.2l6.1,6.6
-					c0,0.1-0.1,0.2-0.2,0.3c-0.1,0.1-0.1,0.1-0.2,0.2l-6.1-6.7C232,116.9,232.1,116.8,232.2,116.7L232.2,116.7z"/>
-			</g>
-		</g>
-	</a>
-	</svg>
+<svg viewBox="0 0 478 472" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg">
+ <defs>
+  <linearGradient id="svg_5" x1="0" y1="0" x2="1" y2="1">
+   <stop offset="0" stop-color="#ffffe0" stop-opacity="1"/>
+   <stop offset="1" stop-color="#edc39c" stop-opacity="1"/>
+  </linearGradient>
+  <linearGradient id="svg_10" x1="0.57031" y1="0.78125" x2="0.28906" y2="0.41406">
+   <stop offset="0" stop-color="#ff7f00" stop-opacity="1"/>
+   <stop offset="1" stop-color="#ffff00"/>
+  </linearGradient>
+  <linearGradient id="svg_18" x1="0.37891" y1="0.35938" x2="1" y2="1">
+   <stop offset="0" stop-color="#e0e0e0" stop-opacity="1"/>
+   <stop offset="1" stop-color="#666666" stop-opacity="1"/>
+  </linearGradient>
+ </defs>
+ <g>
+  <title>Layer 1</title>
+  <path d="m68.82031,270.04688l-22,-33l17,-35l34,2l25,15l7,-35l28,-16l25,12l100,102l21,23l-15,35l-36,9l20,49l-31,24l-49,-17l-1,31l-33,21l-31,-19l-13,-35l-30,21l-30,-9l-5,-35l16,-31l-32,-6l-15,-19l3,-36l47,-18z" id="svg_19" fill="#ffffff"/>
+  <path fill="#1a171a" fill-rule="nonzero" id="path2902" d="m158.96452,155.03685c-25.02071,0 -45.37077,20.35121 -45.37077,45.3775c0,0.72217 0.01794,1.4399 0.0471,2.15645c-0.49339,-0.53604 -0.99355,-1.06085 -1.50603,-1.58452c-8.56077,-8.55519 -19.95982,-13.28413 -32.07432,-13.28413c-12.12122,0 -23.52027,4.72334 -32.08778,13.29646c-17.69347,17.69464 -17.69347,46.4619 0,64.17445c0.51809,0.51697 1.0485,1.0126 1.59015,1.50601c-0.72891,-0.03586 -1.45782,-0.04822 -2.19234,-0.04822c-25.02071,0 -45.37189,20.35117 -45.37189,45.37747c0,25.01398 20.35119,45.36517 45.37189,45.36517c0.72891,0 1.45221,-0.01236 2.1744,-0.04828c-0.5293,0.48221 -1.05412,0.98801 -1.56547,1.49368c-17.70021,17.68906 -17.70021,46.48654 -0.00628,64.18677c8.57872,8.56747 19.96655,13.2785 32.08778,13.2785c12.1145,0 23.5012,-4.71103 32.07433,-13.2785c0.51247,-0.51694 1.01823,-1.04849 1.50603,-1.57895c-0.02915,0.71213 -0.04709,1.44669 -0.04709,2.15759c0,25.01511 20.35007,45.37747 45.37077,45.37747c25.01398,0 45.37079,-20.3624 45.37079,-45.37747c0,-0.7222 -0.01689,-1.44553 -0.05266,-2.18112c0.48105,0.52933 0.97562,1.04849 1.48697,1.56662c8.57982,8.57977 19.97775,13.2908 32.1057,13.2908c12.11003,0 23.51358,-4.71103 32.0687,-13.2785c17.68906,-17.70013 17.68906,-46.48538 0,-64.17441c-0.50577,-0.4946 -1.01141,-1.00034 -1.54306,-1.48248c0.69983,0.03592 1.42316,0.04828 2.16992,0.04828c25.01514,0 45.35284,-20.35123 45.35284,-45.36517c0,-25.02631 -20.33774,-45.37747 -45.35284,-45.37747c-0.74683,0 -1.47009,0.01236 -2.19345,0.04822c0.53152,-0.49341 1.06082,-0.98904 1.59128,-1.50601c8.55521,-8.55521 13.2785,-19.94186 13.2785,-32.07545c0,-12.12793 -4.72336,-23.52028 -13.30319,-32.0934c-8.55515,-8.56076 -19.95866,-13.2841 -32.0687,-13.2841c-12.12122,0 -23.52025,4.72334 -32.08777,13.2841c-0.51137,0.5181 -1.01822,1.04851 -1.5049,1.57895c0.03586,-0.72331 0.05266,-1.43991 0.05266,-2.16881c0,-25.02629 -20.35681,-45.3775 -45.37079,-45.3775m0,20.71901c13.61607,0 24.65851,11.03122 24.65851,24.65849c0,6.62749 -2.651,12.62137 -6.9101,17.04979l0,51.67419l36.53975,-36.53523c0.12001,-6.14418 2.48277,-12.24686 7.18146,-16.94667c4.81305,-4.81305 11.12094,-7.22409 17.44116,-7.22409c6.30228,0 12.61577,2.41104 17.43552,7.22409c9.62166,9.63287 9.62166,25.24948 0,34.87669c-4.69977,4.68634 -10.80803,7.04915 -16.95334,7.18147l-36.5341,36.53305l51.66742,0c4.42841,-4.25351 10.42905,-6.90451 17.08008,-6.90451c13.59137,0 24.62933,11.03799 24.62933,24.66525c0,13.61606 -11.03796,24.66519 -24.62933,24.66519c-6.65106,0 -12.65167,-2.66333 -17.08008,-6.91681l-51.64836,0l36.50273,36.50946c6.16995,0.14465 12.26587,2.50522 16.96568,7.20618c9.6216,9.61487 9.6216,25.23151 0,34.85757c-4.80856,4.81979 -11.13327,7.22974 -17.43556,7.22974c-6.32019,0 -12.63371,-2.40991 -17.44786,-7.22974c-4.68074,-4.68744 -7.04802,-10.79572 -7.17473,-16.94098l-36.53975,-36.53415l0,51.66742c4.25908,4.44635 6.9101,10.43466 6.9101,17.0621c0,13.62729 -11.04243,24.66415 -24.65851,24.66415c-13.62166,0 -24.65848,-11.0369 -24.65848,-24.66415c0,-6.62744 2.64539,-12.61575 6.90335,-17.0621l0,-51.66742l-36.53864,36.54648c-0.12672,6.14413 -2.48838,12.26477 -7.18147,16.94098c-4.81416,4.81873 -11.12206,7.22974 -17.42882,7.22974c-6.31461,0 -12.6225,-2.41101 -17.43555,-7.22974c-9.63284,-9.62833 -9.63284,-25.24277 0,-34.8699c4.68073,-4.67627 10.79012,-7.05026 16.94101,-7.18262l36.533,-36.53302l-51.66632,0c-4.44075,4.25348 -10.42902,6.91681 -17.06211,6.91681c-13.61606,0 -24.65288,-11.04913 -24.65288,-24.66519c0,-13.62726 11.03682,-24.66525 24.65288,-24.66525c6.63309,0 12.62136,2.651 17.06211,6.90451l51.68537,0l-36.55208,-36.54538c-6.14527,-0.12 -12.25354,-2.49403 -16.94775,-7.19377c-9.62611,-9.61493 -9.62611,-25.23715 0,-34.86441c4.81419,-4.81305 11.12769,-7.22406 17.44228,-7.22406c6.30676,0 12.61465,2.41101 17.42883,7.22406c4.69978,4.69307 7.06034,10.80246 7.18144,16.94777l36.5386,36.53299l0,-51.66074c-4.25795,-4.42841 -6.90334,-10.42229 -6.90334,-17.04979c0,-13.62726 11.03682,-24.65848 24.65848,-24.65848"/>
+  <path d="m188.82031,210.04688l16,-47l155,-148l107,100l-158,156.99999l-44,12l-76,-74z" id="svg_6" fill="url(#svg_10)" stroke="#ffffff" stroke-width="0"/>
+  <path d="m335.57031,40.29688c-11.5,39.75 55.5,115.25 109.25,98.75l21,-20.99999l-103,-101l-27.25,23.25z" id="svg_11" fill="url(#svg_18)" stroke="#ffffff" stroke-width="0"/>
+  <rect x="272.80404" y="20.76382" width="42.35197" height="232.66835" id="svg_13" fill="#ffffff" stroke="#ffffff" stroke-width="0" transform="rotate(45.9094, 293.98, 137.1)" opacity="0.4"/>
+  <rect x="282.80404" y="22.76382" width="14" height="232.66835" fill="#ffffff" stroke="#ffffff" stroke-width="0" transform="rotate(45.9094, 289.805, 139.1)" opacity="0.4" id="svg_14"/>
+  <ellipse cx="415.13312" cy="64.38066" id="svg_12" fill="#ea7598" stroke="#ffffff" stroke-width="0" rx="67.79251" ry="34.82026" transform="rotate(39.4735, 415.133, 64.379)"/>
+  <path d="m212.07031,166.04688c-8.5,47 36.25,103.75 99.25,96.75l-152.5,53.25l53.25,-150z" id="svg_4" fill="url(#svg_5)" stroke="#ffffff" stroke-width="0"/>
+  <path d="m181.32031,242.54688c0.5,20.5 26.75,45 46.75,48.5l-66.25,20l19.5,-68.5z" id="svg_3" fill="#27382f" stroke="#ffffff" stroke-width="0"/>
+ </g>
+ <g>
+  <title>Layer 2</title>
+  <path d="m152.82031,317.04688l51,-152l157,-153c40,-12.00001 118,48 105,105l-157,152.99999l-156,47z" id="svg_1" fill="none" stroke="#800000" stroke-width="17"/>
+ </g>
+</svg>
 </g>
 
 
@@ -265,6 +198,65 @@
  </svg>
 </g>
 
+<g id="add_subpath">
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 124 124" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <linearGradient id="svg_4" x1="0.33594" y1="0.28125" x2="1" y2="1">
+   <stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
+   <stop offset="1" stop-color="#33a533" stop-opacity="1"/>
+  </linearGradient>
+ </defs>
+ <g>
+  <path d="m6,103l55,-87c85,33.64 -26,37.12 55,87l-110,0z" id="svg_1" fill="url(#svg_4)" stroke="#000000" stroke-width="4" stroke-dasharray="null"/>
+  <g id="svg_7">
+   <circle stroke-dasharray="null" stroke-width="5" stroke="#000000" fill="#ffffff" id="svg_6" r="22.63281" cy="88.5" cx="45.5"/>
+   <line stroke-dasharray="null" stroke-width="7" stroke="#000000" id="svg_2" y2="104.03768" x2="45.5" y1="72.96232" x1="45.5"/>
+   <line stroke-dasharray="null" stroke-width="7" stroke="#000000" id="svg_3" y2="88.5" x2="61.03768" y1="88.5" x1="29.96232"/>
+  </g>
+ </g>
+ </svg>
+</g>
+
+<g id="close_path">
+<svg viewBox="0 0 300 300" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g>
+  <title>Layer 1</title>
+  <path stroke="#000" stroke-width="15" fill="#ffc8c8" d="m121.5,40l-84,106l27,115l166,2l29,-111"/>
+  <line x1="240" y1="136" x2="169.5" y2="74" stroke="#A00" stroke-width="25" fill="none"/>
+  <path stroke="none" fill ="#A00" d="m158,65l31,74l-3,-50l51,-3z"/>
+  <g stroke-width="15" stroke="#00f" fill="#0ff">
+  <circle r="30" cy="41" cx="123"/>
+  <circle r="30" cy="146" cx="40"/>
+  <circle r="30" cy="260" cx="69"/>
+  <circle r="30" cy="260" cx="228"/>
+  <circle r="30" cy="148" cx="260"/>
+  </g>
+ </g>
+</svg>
+</g>
+
+<g id="open_path">
+<svg viewBox="0 0 300 300" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <g>
+  <title>Layer 1</title>
+  <path stroke="#000" stroke-width="15" fill="#ffc8c8" d="m123.5,38l-84,106l27,115l166,2l29,-111"/>
+  <line x1="276.5" y1="153" x2="108.5" y2="24" stroke="#000" stroke-width="10" fill="none"/>
+  <g stroke-width="15" stroke="#00f" fill="#0ff">
+   <circle r="30" cy="41" cx="123"/>
+   <circle r="30" cy="146" cx="40"/>
+   <circle r="30" cy="260" cx="69"/>
+   <circle r="30" cy="260" cx="228"/>
+   <circle r="30" cy="148" cx="260"/>
+  </g>
+  <g  stroke="#A00" stroke-width="15" fill="none">
+   <line x1="168" y1="24" x2="210" y2="150"/>
+   <line x1="210" y1="24" x2="168" y2="150"/>
+  </g>
+ </g>
+</svg>
+</g>
+
+
 <g id="image">
 <svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
  <defs>
@@ -308,6 +300,12 @@
 	</svg>
 </g>
 
+<g id="arrow_right_big">
+	<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 40 50">
+	  <path stroke="#000000" fill="#000000" d="m0,0l0,50l25,-25l-25,-25z"/>
+	</svg>
+</g>
+
 <g id="arrow_down">
 	<svg viewBox="0 0 50 40" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
 	  <path transform="rotate(90, 26, 13)" d="m14,-12l0,50l25,-25l-25,-25z" fill="#000000" stroke="#000000"/>
@@ -316,10 +314,16 @@
 
 
 <g id="new_image">
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
   <rect x="2.42792" y="1.6692" width="18" height="21" id="svg_55" fill="#eaeaea" stroke="#606060"/>
-  <circle stroke-width="0" stroke="#a0a0a0" fill="#fff175" id="svg_65" r="3.83333" cy="6.24769" cx="19.16813"/>
- </svg>
+  <circle stroke-width="0" stroke="#a0a0a0" fill="url(#svg_9)" id="svg_65" r="6.300781" cy="7.529969" cx="17.761984"/>
+ <defs>
+  <radialGradient id="svg_9" cx="0.5" cy="0.5" r="0.5">
+   <stop offset="0.1" stop-color="#ffe500" stop-opacity="1"/>
+   <stop offset="1" stop-color="#ffff00" stop-opacity="0"/>
+  </radialGradient>
+ </defs>
+</svg>
 </g>
 
 <g id="save">
@@ -359,6 +363,19 @@
 </svg>
 </g>
 
+<g id="import">
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+  <linearGradient y2="0.875" x2="0.21484" y1="0.00391" x1="0.04297" id="svg_46_import">
+   <stop stop-opacity="1" stop-color="#81f4bb" offset="0"/>
+   <stop stop-opacity="1" stop-color="#37b76e" offset="1"/>
+  </linearGradient>
+ </defs>
+ <rect x="2.42792" y="1.6692" width="18" height="21" id="svg_55" fill="#eaeaea" stroke="#606060"/>
+	  <path stroke="#285582" fill="url(#svg_46_import)" id="svg_45" d="m7.14286,12.74903l5.21236,5.79151l5.50193,-5.88803l-2.50965,-0.09653l0,-2.79923c0,-2.3166 -2.3166,-5.59846 -6.56371,-5.59846c-4.05405,0 -6.27413,3.37838 -6.56371,6.75676c0.48263,-1.5444 2.7027,-4.53668 4.44015,-4.44015c2.12355,-0.09653 2.79923,1.64093 2.79923,3.37838l0.09653,2.79923l-2.41313,0.09653z"/>
+</svg>
+</g>
+
 <g id="docprops">
 	<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
 	 <defs>

--- a/htdocs/svg-edit/editor/jgraduate/css/jGraduate-0.2.0.css	Fri Apr 23 22:29:49 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,176 +0,0 @@
-/* 
- * jGraduate Default CSS
- * 
- * Copyright (c) 2009 Jeff Schiller
- *
- * Licensed under the Apache License Version 2
- */
-
-h2.jGraduate_Title {
-  font-family: Arial, Helvetica, Sans-Serif;
-  font-size: 11px !important;
-  font-weight: bold;
-  margin: -13px 0px 0px 0px;
-  padding: 0px;
-  text-align: center;
-}
-
-.jGraduate_Picker {
-	font-family: Arial, Helvetica, Sans-Serif;
-	font-size: 12px;
-	border-style: solid;
-	border-color: lightgrey black black lightgrey;
-	border-width: 1px;
-	background-color: #EFEFEF;
-	position: absolute;
-	padding: 10px;
-}
-
-li.jGraduate_tab_color, li.jGraduate_tab_lingrad {
-	background-color: #ccc;
-	display: inline;
-	border: solid 1px grey;
-	padding: 3px;
-	margin: 2px;
-	cursor: pointer;
-}
-
-li.jGraduate_tab_current {
-	background-color: #EFEFEF;
-	display: inline;
-	padding: 3px;
-	margin: 2px;
-	border: solid 1px black;
-	cursor: pointer;
-}
-
-.jGraduate_colPick {
-	display: none;
-}
-
-.jGraduate_lgPick {	
-	display: none;
-	border: outset 1px #666;
-	padding: 10px 7px 5px 5px;
-	overflow: auto;
-}
-
-.jGraduate_tabs {
-	position: relative;
-	background-color: #EFEFEF;
-	padding: 0px;
-	margin: 0px;
-	margin-bottom: 5px;
-}
-
-div.jGraduate_Swatch {
-	float: left;
-	margin: 8px;
-}
-div.jGraduate_GradContainer {
-	border: 2px inset #EEE;
-	background-image: url(../images/map-opacity.png); 
-	background-position: 0px 0px;
-	height: 256px;
-}
-
-.jGraduate_AlphaArrows {
-	position: absolute;
-	margin-top: -10px;
-	margin-left: 250.5px;
-}
-
-div.jGraduate_Opacity {
-	border: 2px inset #eee;
-	margin-top: 14px;
-	background-color: black;
-	background-image: url(../images/Maps.png);
-	background-position: 0px -2816px;
-	height: 20px;
-	cursor: ew-resize;
-}
-
-div.jGraduate_OpacityField {
-	position: absolute;
-	bottom: 25px;
-	left: 292px;
-}
-
-div.jGraduate_Form {
-	float: left;
-	width: 140px;
-	margin: -3px 3px 0px 4px;
-}
-
-div.jGraduate_StopSection {
-	width: 120px;
-	text-align: center;
-}
-
-div.jGraduate_OkCancel {
-	float: left;
-	width: 113px;
-}
-
-input.jGraduate_Ok, input.jGraduate_Cancel {
-	display: block;
-	width: 100px;
-	margin-left: -4px;
-	margin-right: -4px;
-}
-input.jGraduate_Ok {
-	margin: 9px -4px 5px -4px;
-}
-
-.colorBox {
-	float: left;
-	height: 16px;
-	width: 16px;
-	border: 1px solid #808080;
-	cursor: pointer;
-	margin: 4px 4px 4px 30px;
-}
-
-.colorBox + label {
-	float: left;
-	margin-top: 7px;
-}
-
-label.jGraduate_Form_Heading {
-	position: relative;
-	top: 10px;
-	background-color: #EFEFEF;
-	padding: 2px;
-	font-weight: bold;
-	font-size: 13px;
-}
-
-div.jGraduate_Form_Section {
-	border-style: solid;
-	border-width: 1px;
-	border-color: grey;
-	-moz-border-radius: 5px;
-	-webkit-border-radius: 5px;
-	padding: 15px 5px 5px 5px;
-	margin: 2px;
-	width: 110px;
-	text-align: center;
-	overflow: auto;
-}
-
-div.jGraduate_LightBox {
-	position: fixed;
-	top: 0px;
-	left: 0px;
-	right: 0px;
-	bottom: 0px;
-	background-color: #000;
-	opacity: 0.5;
-	display: none;
-}
-
-div.jGraduate_stopPicker {
-	position: absolute;
-	display: none;
-	background: #E8E8E8;
-}
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/htdocs/svg-edit/editor/jgraduate/css/jgraduate.css	Fri Apr 23 22:38:00 2010 +0200
@@ -0,0 +1,266 @@
+/* 
+ * jGraduate Default CSS
+ * 
+ * Copyright (c) 2009 Jeff Schiller
+ *
+ * Licensed under the Apache License Version 2
+ */
+
+h2.jGraduate_Title {
+  font-family: Arial, Helvetica, Sans-Serif;
+  font-size: 11px !important;
+  font-weight: bold;
+  margin: -13px 0px 0px 0px;
+  padding: 0px;
+  text-align: center;
+}
+
+.jGraduate_Picker {
+	font-family: Arial, Helvetica, Sans-Serif;
+	font-size: 12px;
+	border-style: solid;
+	border-color: lightgrey black black lightgrey;
+	border-width: 1px;
+	background-color: #EFEFEF;
+	position: absolute;
+	padding: 10px;
+}
+
+.jGraduate_tabs li {
+	background-color: #ccc;
+	display: inline;
+	border: solid 1px grey;
+	padding: 3px;
+	margin: 2px;
+	cursor: pointer;
+}
+
+li.jGraduate_tab_current {
+	background-color: #EFEFEF;
+	display: inline;
+	padding: 3px;
+	margin: 2px;
+	border: solid 1px black;
+	cursor: pointer;
+}
+
+.jGraduate_colPick {
+	display: none;
+}
+
+.jGraduate_lgPick {	
+	display: none;
+	border: outset 1px #666;
+	padding: 10px 7px 5px 5px;
+	overflow: auto;
+}
+
+.jGraduate_rgPick {	
+	display: none;
+	border: outset 1px #666;
+	padding: 10px 7px 5px 5px;
+	overflow: auto;
+/*	position: relative;*/
+}
+
+.jGraduate_tabs {
+	position: relative;
+	background-color: #EFEFEF;
+	padding: 0px;
+	margin: 0px;
+	margin-bottom: 5px;
+}
+
+div.jGraduate_Swatch {
+	float: left;
+	margin: 8px;
+}
+div.jGraduate_GradContainer {
+	border: 2px inset #EEE;
+	background-image: url(../images/map-opacity.png); 
+	background-position: 0px 0px;
+	height: 256px;
+}
+
+.jGraduate_AlphaArrows {
+	position: absolute;
+	margin-top: -10px;
+	margin-left: 250.5px;
+}
+
+div.jGraduate_Opacity {
+	border: 2px inset #eee;
+	margin-top: 14px;
+	background-color: black;
+	background-image: url(../images/Maps.png);
+	background-position: 0px -2816px;
+	height: 20px;
+	cursor: ew-resize;
+}
+
+div.lg_jGraduate_OpacityField {
+	position: absolute;
+	bottom: 25px;
+	left: 292px;
+}
+
+div.jGraduate_Form {
+	float: left;
+	width: 140px;
+	margin: -3px 3px 0px 4px;
+}
+
+div.jGraduate_StopSection {
+	width: 120px;
+	text-align: center;
+}
+
+div.jGraduate_RadiusField {
+	
+	text-align: center;
+	float: left;
+}
+
+div.jGraduate_RadiusField input {
+	margin-top: 10px;
+}
+
+.jGraduate_RadiusField .jGraduate_Form_Section {
+	width: 250px;
+	padding: 2px;
+	height: 80px;
+	overflow: visible;
+}
+
+.jGraduate_Radius {
+	border:1px solid #BBB;
+	cursor:ew-resize;
+	height:20px;
+	margin-top:14px;
+	position: relative;
+}
+
+
+.jGraduate_RadiusArrows {
+	top: 0;
+	left: 0;
+	position: absolute;
+	margin-top: -10px;
+	margin-left: 250.5px;
+}
+
+
+div.jGraduate_OkCancel {
+	float: left;
+	width: 113px;
+}
+
+input.jGraduate_Ok, input.jGraduate_Cancel {
+	display: block;
+	width: 100px;
+	margin-left: -4px;
+	margin-right: -4px;
+}
+input.jGraduate_Ok {
+	margin: 9px -4px 5px -4px;
+}
+
+.colorBox {
+	float: left;
+	height: 16px;
+	width: 16px;
+	border: 1px solid #808080;
+	cursor: pointer;
+	margin: 4px 4px 4px 30px;
+}
+
+.colorBox + label {
+	float: left;
+	margin-top: 7px;
+}
+
+label.jGraduate_Form_Heading {
+	position: relative;
+	top: 10px;
+	background-color: #EFEFEF;
+	padding: 2px;
+	font-weight: bold;
+	font-size: 13px;
+}
+
+div.jGraduate_Form_Section {
+	border-style: solid;
+	border-width: 1px;
+	border-color: grey;
+	-moz-border-radius: 5px;
+	-webkit-border-radius: 5px;
+	padding: 15px 5px 5px 5px;
+	margin: 2px;
+	width: 110px;
+	text-align: center;
+	overflow: auto;
+}
+
+div.jGraduate_LightBox {
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	right: 0px;
+	bottom: 0px;
+	background-color: #000;
+	opacity: 0.5;
+	display: none;
+}
+
+div.jGraduate_stopPicker {
+	position: absolute;
+	display: none;
+	background: #E8E8E8;
+}
+
+
+.jGraduate_rgPick {
+	width: 530px;
+}
+
+.jGraduate_rgPick div.jGraduate_Form {
+	width: 270px;
+	position: absolute;
+	left: 284px;
+	width: 266px;
+	top: 130px;
+	margin: -3px 3px 0px 4px;
+}
+
+.jGraduate_Colorblocks {
+	display: table;
+	border-spacing: 0 5px;
+}
+
+.jGraduate_colorblock {
+	display: table-row;
+}
+
+.jGraduate_Colorblocks .jGraduate_colorblock > * {
+	display: table-cell;
+	vertical-align: middle;
+	margin: 0;
+	float: none;
+}
+
+.jGraduate_rgPick div.jGraduate_StopSection {
+	float: left;
+	width: 133px;
+	margin: 0;
+}
+
+.jGraduate_rgPick .jGraduate_OkCancel {
+	position: absolute;
+	right: 0;
+}
+
+.rg_jGraduate_OpacityField {
+	position: absolute;
+	left: 288px;
+	bottom: 24px;
+}
\ No newline at end of file

Binary file htdocs/svg-edit/editor/jgraduate/images/mappoint_c.png has changed

Binary file htdocs/svg-edit/editor/jgraduate/images/mappoint_f.png has changed

--- a/htdocs/svg-edit/editor/jgraduate/jquery.jgraduate.js	Fri Apr 23 22:29:49 2010 +0200
+++ b/htdocs/svg-edit/editor/jgraduate/jquery.jgraduate.js	Fri Apr 23 22:38:00 2010 +0200
@@ -3,8 +3,10 @@
  *
  * jQuery Plugin for a gradient picker
  *
- * Copyright (c) 2009 Jeff Schiller
+ * Copyright (c) 2010 Jeff Schiller
  * http://blog.codedread.com/
+ * Copyright (c) 2010 Alexis Deveria
+ * http://a.deveria.com/
  *
  * Apache 2 License
 
@@ -23,12 +25,14 @@
 		alpha: Number representing opacity (0-100),
 		solidColor: String representing #RRGGBB hex of color,
 		linearGradient: object of interface SVGLinearGradientElement,
+		radialGradient: object of interface SVGRadialGradientElement,
 	}
 
 $.jGraduate.Paint() -> constructs a 'none' color
 $.jGraduate.Paint({copy: o}) -> creates a copy of the paint o
 $.jGraduate.Paint({hex: "#rrggbb"}) -> creates a solid color paint with hex = "#rrggbb"
 $.jGraduate.Paint({linearGradient: o, a: 50}) -> creates a linear gradient paint with opacity=0.5
+$.jGraduate.Paint({radialGradient: o, a: 7}) -> creates a radial gradient paint with opacity=0.07
 $.jGraduate.Paint({hex: "#rrggbb", linearGradient: o}) -> throws an exception?
 
 - picker accepts the following object as input:
@@ -42,6 +46,9 @@
 
  *
  */
+ 
+(function() {
+ 
 var ns = { svg: 'http://www.w3.org/2000/svg', xlink: 'http://www.w3.org/1999/xlink' };
 if(!window.console) {
   window.console = new function() {
@@ -74,27 +81,38 @@
     		if (options.copy) {
     			this.type = options.copy.type;
     			this.alpha = options.copy.alpha;
+				this.solidColor = null;
+				this.linearGradient = null;
+				this.radialGradient = null;
+
     			switch(this.type) {
     				case "none":
-    					this.solidColor = null;
-    					this.linearGradient = null;
     					break;
     				case "solidColor":
     					this.solidColor = options.copy.solidColor;
-    					this.linearGradient = null;
     					break;
     				case "linearGradient":
-    					this.solidColor = null;
     					this.linearGradient = $.cloneNode(options.copy.linearGradient);
     					break;
+    				case "radialGradient":
+    					this.radialGradient = $.cloneNode(options.copy.radialGradient);
+    					break;
     			}
     		}
     		// create linear gradient paint
     		else if (options.linearGradient) {
     			this.type = "linearGradient";
     			this.solidColor = null;
+    			this.radialGradient = null;
     			this.linearGradient = $.cloneNode(options.linearGradient);
     		}
+    		// create linear gradient paint
+    		else if (options.radialGradient) {
+    			this.type = "radialGradient";
+    			this.solidColor = null;
+    			this.linearGradient = null;
+    			this.radialGradient = $.cloneNode(options.radialGradient);
+    		}
     		// create solid color paint
     		else if (options.solidColor) {
     			this.type = "solidColor";
@@ -105,6 +123,7 @@
 	    		this.type = "none";
     			this.solidColor = null;
     			this.linearGradient = null;
+    			this.radialGradient = null;
 	    	}
 		}
 };
@@ -134,6 +153,15 @@
             }
             
             var okClicked = function() {
+	            // TODO: Fix this ugly hack
+	            if($this.paint.type == "radialGradient") {
+	            	$this.paint.linearGradient = null;
+	            } else if($this.paint.type == "linearGradient") {
+	            	$this.paint.radialGradient = null;	            
+	            } else if($this.paint.type == "solidColor") {
+	            	$this.paint.linearGradient = null;
+	            	$this.paint.radialGradient = null;
+	            }
             	$.isFunction($this.okCallback) && $this.okCallback($this.paint);
             	$this.hide();
             },
@@ -156,23 +184,26 @@
 			if ($this.paint.type == "none") {
 				$this.paint = $.jGraduate.Paint({solidColor: 'ffffff'});
 			}
-
+			
             $this.addClass('jGraduate_Picker');
             $this.html('<ul class="jGraduate_tabs">' +
-            				'<li class="jGraduate_tab_color jGraduate_tab_current">Solid Color</li>' +
-            				'<li class="jGraduate_tab_lingrad">Linear Gradient</li>' +
+            				'<li class="jGraduate_tab_color jGraduate_tab_current" data-type="col">Solid Color</li>' +
+            				'<li class="jGraduate_tab_lingrad" data-type="lg">Linear Gradient</li>' +
+            				'<li class="jGraduate_tab_radgrad" data-type="rg">Radial Gradient</li>' +
             			'</ul>' +
             			'<div class="jGraduate_colPick"></div>' +
-            			'<div class="jGraduate_lgPick"></div>');
+            			'<div class="jGraduate_lgPick"></div>' +
+            			'<div class="jGraduate_rgPick"></div>');
 			var colPicker = $(idref + '> .jGraduate_colPick');
 			var lgPicker = $(idref + '> .jGraduate_lgPick');
+			var rgPicker = $(idref + '> .jGraduate_rgPick');
 			
             lgPicker.html(
             	'<div id="' + id + '_jGraduate_Swatch" class="jGraduate_Swatch">' +
             		'<h2 class="jGraduate_Title">' + $settings.window.pickerTitle + '</h2>' +
-            		'<div id="' + id + '_jGraduate_GradContainer" class="jGraduate_GradContainer"></div>' +
-            		'<div id="' + id + '_jGraduate_Opacity" class="jGraduate_Opacity" title="Click to set overall opacity of the gradient paint">' +
-            			'<img id="' + id + '_jGraduate_AlphaArrows" class="jGraduate_AlphaArrows" src="' + $settings.images.clientPath + 'rangearrows2.gif"></img>' +
+            		'<div id="' + id + '_lg_jGraduate_GradContainer" class="jGraduate_GradContainer"></div>' +
+            		'<div id="' + id + '_lg_jGraduate_Opacity" class="jGraduate_Opacity" title="Click to set overall opacity of the gradient paint">' +
+            			'<img id="' + id + '_lg_jGraduate_AlphaArrows" class="jGraduate_AlphaArrows" src="' + $settings.images.clientPath + 'rangearrows2.gif"></img>' +
             		'</div>' +
             	'</div>' + 
             	'<div class="jGraduate_Form">' +
@@ -198,374 +229,861 @@
 			            	'<label id="' + id + '_jGraduate_endOpacity">100%</label>' +
     	    	    	'</div>' +
     	    	    '</div>' +
-    	    	    '<div class="jGraduate_OpacityField">' +
-    	    	    	'<label class="jGraduate_OpacityLabel">A: </label>' +
-    	    	    	'<input type="text" id="' + id + '_jGraduate_OpacityInput" class="jGraduate_OpacityInput" size="3" value="100"/>%' +
+    	    	    '<div class="lg_jGraduate_OpacityField">' +
+    	    	    	'<label class="lg_jGraduate_OpacityLabel">A: </label>' +
+    	    	    	'<input type="text" id="' + id + '_lg_jGraduate_OpacityInput" class="jGraduate_OpacityInput" size="3" value="100"/>%' +
     	    	    '</div>' +
     	       	'</div>' +
         	    '<div class="jGraduate_OkCancel">' +
-            		'<input type="button" id="' + id + '_jGraduate_Ok" class="jGraduate_Ok" value="OK"/>' +
-            		'<input type="button" id="' + id + '_jGraduate_Cancel" class="jGraduate_Cancel" value="Cancel"/>' +
+            		'<input type="button" id="' + id + '_lg_jGraduate_Ok" class="jGraduate_Ok" value="OK"/>' +
+            		'<input type="button" id="' + id + '_lg_jGraduate_Cancel" class="jGraduate_Cancel" value="Cancel"/>' +
             	'</div>' +
             	'<div class="jGraduate_LightBox"></div>' +
             	'<div id="' + id + '_jGraduate_stopPicker" class="jGraduate_stopPicker"></div>');
+            	
+            rgPicker.html(
+            	'<div class="jGraduate_Swatch">' +
+            		'<h2 class="jGraduate_Title">' + $settings.window.pickerTitle + '</h2>' +
+            		'<div id="' + id + '_rg_jGraduate_GradContainer" class="jGraduate_GradContainer"></div>' +
+            		'<div id="' + id + '_rg_jGraduate_Opacity" class="jGraduate_Opacity" title="Click to set overall opacity of the gradient paint">' +
+            			'<img id="' + id + '_rg_jGraduate_AlphaArrows" class="jGraduate_AlphaArrows" src="' + $settings.images.clientPath + 'rangearrows2.gif"></img>' +
+            		'</div>' +
+            	'</div>' + 
+				'<div id="jGraduate_radColors" class="jGraduate_StopSection">' +
+					'<label class="jGraduate_Form_Heading">Colors</label>' +
+					'<div class="jGraduate_Form_Section jGraduate_Colorblocks">' +
+						'<div class="jGraduate_colorblock"><span>Center:</span>' +
+						'<div id="' + id + '_jGraduate_colorBoxCenter" class="colorBox"></div>' +
+						'<label id="' + id + '_rg_jGraduate_centerOpacity"> 100%</label></div>' +
+
+						'<div class="jGraduate_colorblock"><span>Outer:</span>' +
+							'<div id="' + id + '_jGraduate_colorBoxOuter" class="colorBox"></div>' +
+							'<label id="' + id + '_jGraduate_outerOpacity"> 100%</label></div>' +
+					'</div>' +
+				'</div>' +
+				'<div class="jGraduate_StopSection">' +
+				'</div>' +
+            	'<div class="jGraduate_Form">' +
+        	   		'<div class="jGraduate_StopSection">' +
+	            		'<label class="jGraduate_Form_Heading">Center Point</label>' +
+    	        		'<div class="jGraduate_Form_Section">' +
+	    	        		'<label>x:</label>' +
+		    	        	'<input type="text" id="' + id + '_jGraduate_cx" size="3" title="Enter x value between 0.0 and 1.0"/>' +
+    		    	    	'<label> y:</label>' +
+        		    		'<input type="text" id="' + id + '_jGraduate_cy" size="3" title="Enter y value between 0.0 and 1.0"/>' +
+    	    	    	'</div>' +
+    	    	    '</div>' +
+        	   		'<div class="jGraduate_StopSection">' +
+	            		'<label class="jGraduate_Form_Heading">Focal Point</label>' +
+    	        		'<div class="jGraduate_Form_Section">' +
+	    	        		'<label>Match center: <input type="checkbox" checked="checked" id="' + id + '_jGraduate_match_ctr"/></label><br/>' +
+	    	        		'<label>x:</label>' +
+		    	        	'<input type="text" id="' + id + '_jGraduate_fx" size="3" title="Enter x value between 0.0 and 1.0"/>' +
+    		    	    	'<label> y:</label>' +
+        		    		'<input type="text" id="' + id + '_jGraduate_fy" size="3" title="Enter y value between 0.0 and 1.0"/>' +
+    	    	    	'</div>' +
+    	    	    '</div>' +
+        	   		'<div class="jGraduate_RadiusField">' +
+	            		'<label class="jGraduate_Form_Heading">Radius</label>' +
+    	        		'<div class="jGraduate_Form_Section">' +
+							'<div id="' + id + '_jGraduate_RadiusContainer" class="jGraduate_RadiusContainer"></div>' +
+							'<input type="text" id="' + id + '_jGraduate_RadiusInput" size="3" value="100"/>%' +
+							'<div id="' + id + '_jGraduate_Radius" class="jGraduate_Radius" title="Click to set radius">' +
+								'<img id="' + id + '_jGraduate_RadiusArrows" class="jGraduate_RadiusArrows" src="' + $settings.images.clientPath + 'rangearrows2.gif"></img>' +
+							'</div>' +
+    	    	    	'</div>' +
+    	    	    '</div>' +
+    	       	'</div>' +
+				'<div class="rg_jGraduate_OpacityField">' +
+					'<label class="rg_jGraduate_OpacityLabel">A: </label>' +
+					'<input type="text" id="' + id + '_rg_jGraduate_OpacityInput" class="jGraduate_OpacityInput" size="3" value="100"/>%' +
+				'</div>' +
+        	    '<div class="jGraduate_OkCancel">' +
+            		'<input type="button" id="' + id + '_rg_jGraduate_Ok" class="jGraduate_Ok" value="OK"/>' +
+            		'<input type="button" id="' + id + '_rg_jGraduate_Cancel" class="jGraduate_Cancel" value="Cancel"/>' +
+            	'</div>' +
+            	'<div class="jGraduate_LightBox"></div>' +
+            	'<div id="' + id + '_rg_jGraduate_stopPicker" class="jGraduate_stopPicker"></div>');
 			
 			// --------------
             // Set up all the SVG elements (the gradient, stops and rectangle)
             var MAX = 256, MARGINX = 0, MARGINY = 0, STOP_RADIUS = 15/2,
             	SIZEX = MAX - 2*MARGINX, SIZEY = MAX - 2*MARGINY;
-            var container = document.getElementById(id+'_jGraduate_GradContainer');
-            var svg = container.appendChild(document.createElementNS(ns.svg, 'svg'));
-            svg.id = id+'_jgraduate_svg';            
-            svg.setAttribute('width', MAX);
-            svg.setAttribute('height', MAX);
-			svg.setAttribute("xmlns", ns.svg);
-			
-			// if we are sent a gradient, import it 
-			if ($this.paint.type == "linearGradient") {
-				$this.paint.linearGradient.id = id+'_jgraduate_grad';
-				$this.paint.linearGradient = svg.appendChild($.cloneNode($this.paint.linearGradient));
-			}
-			else { // we create a gradient
-				var grad = svg.appendChild(document.createElementNS(ns.svg, 'linearGradient'));
-				grad.id = id+'_jgraduate_grad';
-				grad.setAttribute('x1','0.0');
-				grad.setAttribute('y1','0.0');
-				grad.setAttribute('x2','1.0');
-				grad.setAttribute('y2','1.0');
-				
-				var begin = grad.appendChild(document.createElementNS(ns.svg, 'stop'));
-				begin.setAttribute('offset', '0.0');
-				begin.setAttribute('stop-color', '#ff0000');
-
-				var end = grad.appendChild(document.createElementNS(ns.svg, 'stop'));
-				end.setAttribute('offset', '1.0');
-				end.setAttribute('stop-color', '#ffff00');
-			
-				$this.paint.linearGradient = grad;
-			}
-
-			var gradalpha = $this.paint.alpha;
-            $('#' + id + '_jGraduate_OpacityInput').val(gradalpha);
-			var posx = parseInt(255*(gradalpha/100)) - 4.5;
-            $('#' + id + '_jGraduate_AlphaArrows').css({'margin-left':posx});
-            $('#' + id + '_jgraduate_rect').attr('fill-opacity', gradalpha/100);
-			
-			var x1 = parseFloat($this.paint.linearGradient.getAttribute('x1')||0.0),
-				y1 = parseFloat($this.paint.linearGradient.getAttribute('y1')||0.0),
-				x2 = parseFloat($this.paint.linearGradient.getAttribute('x2')||1.0),
-				y2 = parseFloat($this.paint.linearGradient.getAttribute('y2')||0.0);
-			
-            var rect = document.createElementNS(ns.svg, 'rect');
-            rect.id = id + '_jgraduate_rect';
-            rect.setAttribute('x', MARGINX);
-            rect.setAttribute('y', MARGINY);
-            rect.setAttribute('width', SIZEY);
-            rect.setAttribute('height', SIZEY);
-            rect.setAttribute('fill', 'url(#'+id+'_jgraduate_grad)');
-            rect.setAttribute('fill-opacity', '1.0');
-            rect = svg.appendChild(rect);
-            
-            // stop visuals created here
-            var beginStop = document.createElementNS(ns.svg, 'image');
-            beginStop.id = id + "_stop1";
-            beginStop.setAttribute('class', 'stop');
-            beginStop.setAttributeNS(ns.xlink, 'href', $settings.images.clientPath + 'mappoint.gif');
-            beginStop.setAttributeNS(ns.xlink, "title", "Begin Stop");
-            beginStop.appendChild(document.createElementNS(ns.svg, 'title')).appendChild(
-            	document.createTextNode("Begin Stop"));
-            beginStop.setAttribute('width', 18);
-            beginStop.setAttribute('height', 18);
-            beginStop.setAttribute('x', MARGINX + SIZEX*x1 - STOP_RADIUS);
-            beginStop.setAttribute('y', MARGINY + SIZEY*y1 - STOP_RADIUS);
-            beginStop.setAttribute('cursor', 'move');
-            // must append only after setting all attributes due to Webkit Bug 27952
-            // https://bugs.webkit.org/show_bug.cgi?id=27592
-            beginStop = svg.appendChild(beginStop);
-            
-            var endStop = document.createElementNS(ns.svg, 'image');
-            endStop.id = id + "_stop2";
-            endStop.setAttribute('class', 'stop');
-            endStop.setAttributeNS(ns.xlink, 'href', $settings.images.clientPath + 'mappoint.gif');
-            endStop.setAttributeNS(ns.xlink, "title", "End Stop");
-            endStop.appendChild(document.createElementNS(ns.svg, 'title')).appendChild(
-            	document.createTextNode("End Stop"));
-            endStop.setAttribute('width', 18);
-            endStop.setAttribute('height', 18);
-            endStop.setAttribute('x', MARGINX + SIZEX*x2 - STOP_RADIUS);
-            endStop.setAttribute('y', MARGINY + SIZEY*y2 - STOP_RADIUS);
-            endStop.setAttribute('cursor', 'move');
-            endStop = svg.appendChild(endStop);
-            
-            // bind GUI elements
-            $('#'+id+'_jGraduate_Ok').bind('click', function() {
-            	$this.paint.type = "linearGradient";
-				$this.paint.solidColor = null;
-            	okClicked();
-            });
-            $('#'+id+'_jGraduate_Cancel').bind('click', function(paint) {
-            	cancelClicked();
-            });
-            
-            var x1 = $this.paint.linearGradient.getAttribute('x1');
-            if(!x1) x1 = "0.0";
-            x1Input = $('#'+id+'_jGraduate_x1');
-            x1Input.val(x1);
-            x1Input.change( function() {
-            	if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
-            		this.value = 0.0; 
-            	}
-            	$this.paint.linearGradient.setAttribute('x1', this.value);
-            	beginStop.setAttribute('x', MARGINX + SIZEX*this.value - STOP_RADIUS);
-            });
-
-            var y1 = $this.paint.linearGradient.getAttribute('y1');
-            if(!y1) y1 = "0.0";
-            y1Input = $('#'+id+'_jGraduate_y1');
-            y1Input.val(y1);
-            y1Input.change( function() {
-            	if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
-            		this.value = 0.0; 
-            	}
-            	$this.paint.linearGradient.setAttribute('y1', this.value);
-            	beginStop.setAttribute('y', MARGINY + SIZEY*this.value - STOP_RADIUS);
-            });
-            
-            var x2 = $this.paint.linearGradient.getAttribute('x2');
-            if(!x2) x2 = "1.0";
-            x2Input = $('#'+id+'_jGraduate_x2');
-            x2Input.val(x2);
-            x2Input.change( function() {
-            	if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
-            		this.value = 1.0;
-            	}
-            	$this.paint.linearGradient.setAttribute('x2', this.value);
-            	endStop.setAttribute('x', MARGINX + SIZEX*this.value - STOP_RADIUS);
+            	
+            $.each(['lg', 'rg'], function(i) {
+            	var grad_id = id + '_' + this;
+				var container = document.getElementById(grad_id+'_jGraduate_GradContainer');
+				var svg = container.appendChild(document.createElementNS(ns.svg, 'svg'));
+				svg.id = grad_id + '_jgraduate_svg';            
+				svg.setAttribute('width', MAX);
+				svg.setAttribute('height', MAX);
+				svg.setAttribute("xmlns", ns.svg);
             });
-            
-            var y2 = $this.paint.linearGradient.getAttribute('y2');
-            if(!y2) y2 = "0.0";
-            y2Input = $('#'+id+'_jGraduate_y2');
-            y2Input.val(y2);
-            y2Input.change( function() {
-            	if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
-            		this.value = 0.0;
-            	}
-            	$this.paint.linearGradient.setAttribute('y2', this.value);
-            	endStop.setAttribute('y', MARGINY + SIZEY*this.value - STOP_RADIUS);
-            });            
-            
-            var stops = $this.paint.linearGradient.getElementsByTagNameNS(ns.svg, 'stop');
-            var numstops = stops.length;
-            // if there are not at least two stops, then 
-            if (numstops < 2) {
-	            while (numstops < 2) {
-    	        	$this.paint.linearGradient.appendChild( document.createElementNS(ns.svg, 'stop') );
-        	    	++numstops;
-            	}
-            	stops = $this.paint.linearGradient.getElementsByTagNameNS(ns.svg, 'stop');
-            }
-            
-            var setOpacitySlider = function(e, div) {
-            	var offset = div.offset();
-            	var x = (e.pageX - offset.left - parseInt(div.css('border-left-width')));
-            	if (x > 255) x = 255;
-            	if (x < 0) x = 0;
-            	var posx = x - 4.5;
-            	x /= 255;
-            	$('#' + id + '_jGraduate_AlphaArrows').css({'margin-left':posx});
-            	$('#' + id + '_jgraduate_rect').attr('fill-opacity', x);
-            	x = parseInt(x*100);
-            	$('#' + id + '_jGraduate_OpacityInput').val(x);
-            	$this.paint.alpha = x;
-            };
-            
-            // handle dragging on the opacity slider
-            var bSlidingOpacity = false;
-            $('.jGraduate_Opacity').mousedown(function(evt) {
-            	setOpacitySlider(evt, $(this));
-            	bSlidingOpacity = true;
-            	evt.preventDefault();
-            });
-            $('.jGraduate_Opacity').mousemove(function(evt) {
-            	if (bSlidingOpacity) {
-            		setOpacitySlider(evt, $(this));
-            		evt.preventDefault();
-            	}
-            });
-            $('.jGraduate_Opacity').mouseup(function(evt) {
-            	setOpacitySlider(evt, $(this));
-            	bSlidingOpacity = false;
-            	evt.preventDefault();
-            });
-            
-			// handle dragging the stop around the swatch
-            var draggingStop = null;
-            var startx = -1, starty = -1;
-            // for whatever reason, Opera does not allow $('image.stop') here,
-            // and Firefox 1.5 does not allow $('.stop')
-            $('.stop, #color_picker_jGraduate_GradContainer image').mousedown(function(evt) {
-            	draggingStop = this;
-            	startx = evt.clientX;
-            	starty = evt.clientY;
-            	evt.preventDefault();
-            });
-            $('#'+id+'_jgraduate_svg').mousemove(function(evt) {
-            	if (null != draggingStop) {
-            		var dx = evt.clientX - startx;
-            		var dy = evt.clientY - starty;
-            		startx += dx;
-            		starty += dy;
-            		var x = parseFloat(draggingStop.getAttribute('x')) + dx;
-            		var y = parseFloat(draggingStop.getAttribute('y')) + dy;
-
-					// clamp stop to the swatch
-            		if (x < MARGINX - STOP_RADIUS) x = MARGINX - STOP_RADIUS;
-            		if (y < MARGINY - STOP_RADIUS) y = MARGINY - STOP_RADIUS;
-            		if (x > MARGINX + SIZEX - STOP_RADIUS) x = MARGINX + SIZEX - STOP_RADIUS;
-            		if (y > MARGINY + SIZEY - STOP_RADIUS) y = MARGINY + SIZEY - STOP_RADIUS;
-            		            		
-            		draggingStop.setAttribute('x', x);
-            		draggingStop.setAttribute('y', y);
-
-					// calculate stop offset            		
-            		var fracx = (x - MARGINX + STOP_RADIUS)/SIZEX;
-            		var fracy = (y - MARGINY + STOP_RADIUS)/SIZEY;
-            		
-            		if (draggingStop.id == (id+'_stop1')) {
-            			x1Input.val(fracx);
-            			y1Input.val(fracy);
-            			$this.paint.linearGradient.setAttribute('x1', fracx);
-            			$this.paint.linearGradient.setAttribute('y1', fracy);
-            		}
-            		else {
-            			x2Input.val(fracx);
-            			y2Input.val(fracy);
-            			$this.paint.linearGradient.setAttribute('x2', fracx);
-            			$this.paint.linearGradient.setAttribute('y2', fracy);
-            		}
-            		
-            		evt.preventDefault();
-            	}
-            });
-            $('#'+id+'_jgraduate_svg').mouseup(function(evt) {
-            	draggingStop = null;
-            });
-            
-            var beginColor = stops[0].getAttribute('stop-color');
-            if(!beginColor) beginColor = '#000';
-            beginColorBox = $('#'+id+'_jGraduate_colorBoxBegin');
-            beginColorBox.css({'background-color':beginColor});
-
-            var beginOpacity = stops[0].getAttribute('stop-opacity');
-            if(!beginOpacity) beginOpacity = '1.0';
-            $('#'+id+'jGraduate_beginOpacity').html( (beginOpacity*100)+'%' );
-
-            var endColor = stops[stops.length-1].getAttribute('stop-color');
-            if(!endColor) endColor = '#000';
-            endColorBox = $('#'+id+'_jGraduate_colorBoxEnd');
-            endColorBox.css({'background-color':endColor});
-
-            var endOpacity = stops[stops.length-1].getAttribute('stop-opacity');
-            if(!endOpacity) endOpacity = '1.0';
-            $('#'+id+'jGraduate_endOpacity').html( (endOpacity*100)+'%' );
-            
-			$('#'+id+'_jGraduate_colorBoxBegin').click(function() {
-				$('div.jGraduate_LightBox').show();			
-				var colorbox = $(this);
-				var thisAlpha = (parseFloat(beginOpacity)*255).toString(16);
+			
+			
+			// Linear gradient
+			(function() {
+				var svg = document.getElementById(id + '_lg_jgraduate_svg');
+				
+				// if we are sent a gradient, import it 
+				if ($this.paint.type == "linearGradient") {
+					$this.paint.linearGradient.id = id+'_jgraduate_grad';
+					$this.paint.linearGradient = svg.appendChild($.cloneNode($this.paint.linearGradient));
+				} else { // we create a gradient
+					var grad = svg.appendChild(document.createElementNS(ns.svg, 'linearGradient'));
+					grad.id = id+'_jgraduate_grad';
+					grad.setAttribute('x1','0.0');
+					grad.setAttribute('y1','0.0');
+					grad.setAttribute('x2','1.0');
+					grad.setAttribute('y2','1.0');
+					
+					var begin = grad.appendChild(document.createElementNS(ns.svg, 'stop'));
+					begin.setAttribute('offset', '0.0');
+					begin.setAttribute('stop-color', '#ff0000');
+	
+					var end = grad.appendChild(document.createElementNS(ns.svg, 'stop'));
+					end.setAttribute('offset', '1.0');
+					end.setAttribute('stop-color', '#ffff00');
+				
+					$this.paint.linearGradient = grad;
+				}
+	
+				var gradalpha = $this.paint.alpha;
+				$('#' + id + '_lg_jGraduate_OpacityInput').val(gradalpha);
+				var posx = parseInt(255*(gradalpha/100)) - 4.5;
+				$('#' + id + '_lg_jGraduate_AlphaArrows').css({'margin-left':posx});
+				
+				var x1 = parseFloat($this.paint.linearGradient.getAttribute('x1')||0.0),
+					y1 = parseFloat($this.paint.linearGradient.getAttribute('y1')||0.0),
+					x2 = parseFloat($this.paint.linearGradient.getAttribute('x2')||1.0),
+					y2 = parseFloat($this.paint.linearGradient.getAttribute('y2')||0.0);
+				
+				var rect = document.createElementNS(ns.svg, 'rect');
+				rect.id = id + '_lg_jgraduate_rect';
+				rect.setAttribute('x', MARGINX);
+				rect.setAttribute('y', MARGINY);
+				rect.setAttribute('width', SIZEY);
+				rect.setAttribute('height', SIZEY);
+				rect.setAttribute('fill', 'url(#'+id+'_jgraduate_grad)');
+				rect.setAttribute('fill-opacity', '1.0');
+				rect = svg.appendChild(rect);
+				$('#' + id + '_lg_jgraduate_rect').attr('fill-opacity', gradalpha/100);
+				
+				// stop visuals created here
+				var beginStop = document.createElementNS(ns.svg, 'image');
+				beginStop.id = id + "_stop1";
+				beginStop.setAttribute('class', 'stop');
+				beginStop.setAttributeNS(ns.xlink, 'href', $settings.images.clientPath + 'mappoint.gif');
+				beginStop.setAttributeNS(ns.xlink, "title", "Begin Stop");
+				beginStop.appendChild(document.createElementNS(ns.svg, 'title')).appendChild(
+					document.createTextNode("Begin Stop"));
+				beginStop.setAttribute('width', 18);
+				beginStop.setAttribute('height', 18);
+				beginStop.setAttribute('x', MARGINX + SIZEX*x1 - STOP_RADIUS);
+				beginStop.setAttribute('y', MARGINY + SIZEY*y1 - STOP_RADIUS);
+				beginStop.setAttribute('cursor', 'move');
+				// must append only after setting all attributes due to Webkit Bug 27952
+				// https://bugs.webkit.org/show_bug.cgi?id=27592
+				beginStop = svg.appendChild(beginStop);
+				
+				var endStop = document.createElementNS(ns.svg, 'image');
+				endStop.id = id + "_stop2";
+				endStop.setAttribute('class', 'stop');
+				endStop.setAttributeNS(ns.xlink, 'href', $settings.images.clientPath + 'mappoint.gif');
+				endStop.setAttributeNS(ns.xlink, "title", "End Stop");
+				endStop.appendChild(document.createElementNS(ns.svg, 'title')).appendChild(
+					document.createTextNode("End Stop"));
+				endStop.setAttribute('width', 18);
+				endStop.setAttribute('height', 18);
+				endStop.setAttribute('x', MARGINX + SIZEX*x2 - STOP_RADIUS);
+				endStop.setAttribute('y', MARGINY + SIZEY*y2 - STOP_RADIUS);
+				endStop.setAttribute('cursor', 'move');
+				endStop = svg.appendChild(endStop);
+				
+				// bind GUI elements
+				$('#'+id+'_lg_jGraduate_Ok').bind('click', function() {
+					$this.paint.type = "linearGradient";
+					$this.paint.solidColor = null;
+					okClicked();
+				});
+				$('#'+id+'_lg_jGraduate_Ok').bind('click', function(paint) {
+					cancelClicked();
+				});
+				
+				var x1 = $this.paint.linearGradient.getAttribute('x1');
+				if(!x1) x1 = "0.0";
+				var x1Input = $('#'+id+'_jGraduate_x1');
+				x1Input.val(x1);
+				x1Input.change( function() {
+					if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
+						this.value = 0.0; 
+					}
+					$this.paint.linearGradient.setAttribute('x1', this.value);
+					beginStop.setAttribute('x', MARGINX + SIZEX*this.value - STOP_RADIUS);
+				});
+	
+				var y1 = $this.paint.linearGradient.getAttribute('y1');
+				if(!y1) y1 = "0.0";
+				var y1Input = $('#'+id+'_jGraduate_y1');
+				y1Input.val(y1);
+				y1Input.change( function() {
+					if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
+						this.value = 0.0; 
+					}
+					$this.paint.linearGradient.setAttribute('y1', this.value);
+					beginStop.setAttribute('y', MARGINY + SIZEY*this.value - STOP_RADIUS);
+				});
+				
+				var x2 = $this.paint.linearGradient.getAttribute('x2');
+				if(!x2) x2 = "1.0";
+				var x2Input = $('#'+id+'_jGraduate_x2');
+				x2Input.val(x2);
+				x2Input.change( function() {
+					if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
+						this.value = 1.0;
+					}
+					$this.paint.linearGradient.setAttribute('x2', this.value);
+					endStop.setAttribute('x', MARGINX + SIZEX*this.value - STOP_RADIUS);
+				});
+				
+				var y2 = $this.paint.linearGradient.getAttribute('y2');
+				if(!y2) y2 = "0.0";
+				y2Input = $('#'+id+'_jGraduate_y2');
+				y2Input.val(y2);
+				y2Input.change( function() {
+					if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
+						this.value = 0.0;
+					}
+					$this.paint.linearGradient.setAttribute('y2', this.value);
+					endStop.setAttribute('y', MARGINY + SIZEY*this.value - STOP_RADIUS);
+				});            
+				
+				var stops = $this.paint.linearGradient.getElementsByTagNameNS(ns.svg, 'stop');
+				var numstops = stops.length;
+				// if there are not at least two stops, then 
+				if (numstops < 2) {
+					while (numstops < 2) {
+						$this.paint.linearGradient.appendChild( document.createElementNS(ns.svg, 'stop') );
+						++numstops;
+					}
+					stops = $this.paint.linearGradient.getElementsByTagNameNS(ns.svg, 'stop');
+				}
+				
+				var setLgOpacitySlider = function(e, div) {
+					var offset = div.offset();
+					var x = (e.pageX - offset.left - parseInt(div.css('border-left-width')));
+					if (x > 255) x = 255;
+					if (x < 0) x = 0;
+					var posx = x - 4.5;
+					x /= 255;
+					$('#' + id + '_lg_jGraduate_AlphaArrows').css({'margin-left':posx});
+					$('#' + id + '_lg_jgraduate_rect').attr('fill-opacity', x);
+					x = parseInt(x*100);
+					$('#' + id + '_lg_jGraduate_OpacityInput').val(x);
+					$this.paint.alpha = x;
+				};
+				
+				// handle dragging on the opacity slider
+				var bSlidingOpacity = false;
+				$('#' + id + '_lg_jGraduate_Opacity').mousedown(function(evt) {
+					setLgOpacitySlider(evt, $(this));
+					bSlidingOpacity = true;
+					evt.preventDefault();
+				}).mousemove(function(evt) {
+					if (bSlidingOpacity) {
+						setLgOpacitySlider(evt, $(this));
+						evt.preventDefault();
+					}
+				}).mouseup(function(evt) {
+					setLgOpacitySlider(evt, $(this));
+					bSlidingOpacity = false;
+					evt.preventDefault();
+				});
+				
+				// handle dragging the stop around the swatch
+				var draggingStop = null;
+				var startx = -1, starty = -1;
+				// for whatever reason, Opera does not allow $('image.stop') here,
+				// and Firefox 1.5 does not allow $('.stop')
+				$('.stop, #color_picker_lg_jGraduate_GradContainer image').mousedown(function(evt) {
+					draggingStop = this;
+					startx = evt.clientX;
+					starty = evt.clientY;
+					evt.preventDefault();
+				});
+				$('#'+id+'_lg_jgraduate_svg').mousemove(function(evt) {
+					if (null != draggingStop) {
+						var dx = evt.clientX - startx;
+						var dy = evt.clientY - starty;
+						startx += dx;
+						starty += dy;
+						var x = parseFloat(draggingStop.getAttribute('x')) + dx;
+						var y = parseFloat(draggingStop.getAttribute('y')) + dy;
+	
+						// clamp stop to the swatch
+						if (x < MARGINX - STOP_RADIUS) x = MARGINX - STOP_RADIUS;
+						if (y < MARGINY - STOP_RADIUS) y = MARGINY - STOP_RADIUS;
+						if (x > MARGINX + SIZEX - STOP_RADIUS) x = MARGINX + SIZEX - STOP_RADIUS;
+						if (y > MARGINY + SIZEY - STOP_RADIUS) y = MARGINY + SIZEY - STOP_RADIUS;
+											
+						draggingStop.setAttribute('x', x);
+						draggingStop.setAttribute('y', y);
+	
+						// calculate stop offset            		
+						var fracx = (x - MARGINX + STOP_RADIUS)/SIZEX;
+						var fracy = (y - MARGINY + STOP_RADIUS)/SIZEY;
+						
+						if (draggingStop.id == (id+'_stop1')) {
+							x1Input.val(fracx);
+							y1Input.val(fracy);
+							$this.paint.linearGradient.setAttribute('x1', fracx);
+							$this.paint.linearGradient.setAttribute('y1', fracy);
+						}
+						else {
+							x2Input.val(fracx);
+							y2Input.val(fracy);
+							$this.paint.linearGradient.setAttribute('x2', fracx);
+							$this.paint.linearGradient.setAttribute('y2', fracy);
+						}
+						
+						evt.preventDefault();
+					}
+				});
+				$('#'+id+'_lg_jgraduate_svg').mouseup(function(evt) {
+					draggingStop = null;
+				});
+				
+				var beginColor = stops[0].getAttribute('stop-color');
+				if(!beginColor) beginColor = '#000';
+				beginColorBox = $('#'+id+'_jGraduate_colorBoxBegin');
+				beginColorBox.css({'background-color':beginColor});
+	
+				var beginOpacity = stops[0].getAttribute('stop-opacity');
+				if(!beginOpacity) beginOpacity = '1.0';
+				$('#'+id+'lg_jGraduate_beginOpacity').html( (beginOpacity*100)+'%' );
+	
+				var endColor = stops[stops.length-1].getAttribute('stop-color');
+				if(!endColor) endColor = '#000';
+				endColorBox = $('#'+id+'_jGraduate_colorBoxEnd');
+				endColorBox.css({'background-color':endColor});
+	
+				var endOpacity = stops[stops.length-1].getAttribute('stop-opacity');
+				if(!endOpacity) endOpacity = '1.0';
+				$('#'+id+'jGraduate_endOpacity').html( (endOpacity*100)+'%' );
+				
+				$('#'+id+'_jGraduate_colorBoxBegin').click(function() {
+					$('div.jGraduate_LightBox').show();			
+					var colorbox = $(this);
+					var thisAlpha = (parseFloat(beginOpacity)*255).toString(16);
+					while (thisAlpha.length < 2) { thisAlpha = "0" + thisAlpha; }
+					color = beginColor.substr(1) + thisAlpha;
+					$('#'+id+'_jGraduate_stopPicker').css({'left': 100, 'bottom': 15}).jPicker({
+							window: { title: "Pick the start color and opacity for the gradient" },
+							images: { clientPath: $settings.images.clientPath },
+							color: { active: color, alphaSupport: true }
+						}, function(color){
+							beginColor = color.get_Hex() ? ('#'+color.get_Hex()) : "none";
+							beginOpacity = color.get_A() ? color.get_A()/100 : 1;
+							colorbox.css('background', beginColor);
+							$('#'+id+'_jGraduate_beginOpacity').html(parseInt(beginOpacity*100)+'%');
+							stops[0].setAttribute('stop-color', beginColor);
+							stops[0].setAttribute('stop-opacity', beginOpacity);
+							$('div.jGraduate_LightBox').hide();
+							$('#'+id+'_jGraduate_stopPicker').hide();
+						}, null, function() {
+							$('div.jGraduate_LightBox').hide();
+							$('#'+id+'_jGraduate_stopPicker').hide();
+						});
+				});
+				$('#'+id+'_jGraduate_colorBoxEnd').click(function() {
+					$('div.jGraduate_LightBox').show();
+					var colorbox = $(this);
+					var thisAlpha = (parseFloat(endOpacity)*255).toString(16);
+					while (thisAlpha.length < 2) { thisAlpha = "0" + thisAlpha; }
+					color = endColor.substr(1) + thisAlpha;
+					$('#'+id+'_jGraduate_stopPicker').css({'left': 100, 'top': 15}).jPicker({
+							window: { title: "Pick the end color and opacity for the gradient" },
+							images: { clientPath: $settings.images.clientPath },
+							color: { active: color, alphaSupport: true }
+						}, function(color){
+							endColor = color.get_Hex() ? ('#'+color.get_Hex()) : "none";
+							endOpacity = color.get_A() ? color.get_A()/100 : 1;
+							colorbox.css('background', endColor);
+							$('#'+id+'_jGraduate_endOpacity').html(parseInt(endOpacity*100)+'%');
+							stops[1].setAttribute('stop-color', endColor);
+							stops[1].setAttribute('stop-opacity', endOpacity);
+							$('div.jGraduate_LightBox').hide();
+							$('#'+id+'_jGraduate_stopPicker').hide();
+						}, null, function() {
+							$('div.jGraduate_LightBox').hide();
+							$('#'+id+'_jGraduate_stopPicker').hide();
+						});
+				});            
+				
+				// --------------
+				var thisAlpha = ($this.paint.alpha*255/100).toString(16);
 				while (thisAlpha.length < 2) { thisAlpha = "0" + thisAlpha; }
-				color = beginColor.substr(1) + thisAlpha;
-				$('#'+id+'_jGraduate_stopPicker').css({'left': 100, 'bottom': 15}).jPicker({
-						window: { title: "Pick the start color and opacity for the gradient" },
+				color = $this.paint.solidColor == "none" ? "" : $this.paint.solidColor + thisAlpha;
+				colPicker.jPicker(
+					{
+						window: { title: $settings.window.pickerTitle },
 						images: { clientPath: $settings.images.clientPath },
 						color: { active: color, alphaSupport: true }
-					}, function(color){
-						beginColor = color.get_Hex() ? ('#'+color.get_Hex()) : "none";
-						beginOpacity = color.get_A() ? color.get_A()/100 : 1;
-						colorbox.css('background', beginColor);
-						$('#'+id+'_jGraduate_beginOpacity').html(parseInt(beginOpacity*100)+'%');
-            			stops[0].setAttribute('stop-color', beginColor);
-						stops[0].setAttribute('stop-opacity', beginOpacity);
-						$('div.jGraduate_LightBox').hide();
-						$('#'+id+'_jGraduate_stopPicker').hide();
-					}, null, function() {
-						$('div.jGraduate_LightBox').hide();
-						$('#'+id+'_jGraduate_stopPicker').hide();
-					});
-			});
-			$('#'+id+'_jGraduate_colorBoxEnd').click(function() {
-				$('div.jGraduate_LightBox').show();
-				var colorbox = $(this);
-				var thisAlpha = (parseFloat(endOpacity)*255).toString(16);
+					},
+					function(color) {
+						$this.paint.type = "solidColor";
+						$this.paint.alpha = color.get_A() ? color.get_A() : 100;
+						$this.paint.solidColor = color.get_Hex() ? color.get_Hex() : "none";
+						$this.paint.linearGradient = null;
+						okClicked(); 
+					},
+					null,
+					function(){ cancelClicked(); }
+					);
+			}());	
+			
+			
+			// Radial gradient
+			(function() {
+				var svg = document.getElementById(id + '_rg_jgraduate_svg');
+				
+				// if we are sent a gradient, import it 
+				if ($this.paint.type == "radialGradient") {
+					$this.paint.radialGradient.id = id+'_rg_jgraduate_grad';
+					$this.paint.radialGradient = svg.appendChild($.cloneNode($this.paint.radialGradient));
+				} else { // we create a gradient
+					var grad = svg.appendChild(document.createElementNS(ns.svg, 'radialGradient'));
+					grad.id = id+'_rg_jgraduate_grad';
+					grad.setAttribute('cx','0.5');
+					grad.setAttribute('cy','0.5');
+					grad.setAttribute('r','0.5');
+					
+					var begin = grad.appendChild(document.createElementNS(ns.svg, 'stop'));
+					begin.setAttribute('offset', '0.0');
+					begin.setAttribute('stop-color', '#ff0000');
+	
+					var end = grad.appendChild(document.createElementNS(ns.svg, 'stop'));
+					end.setAttribute('offset', '1.0');
+					end.setAttribute('stop-color', '#ffff00');
+				
+					$this.paint.radialGradient = grad;
+				}
+	
+				var gradalpha = $this.paint.alpha;
+				$('#' + id + '_rg_jGraduate_OpacityInput').val(gradalpha);
+				var posx = parseInt(255*(gradalpha/100)) - 4.5;
+				$('#' + id + '_rg_jGraduate_AlphaArrows').css({'margin-left':posx});
+				
+				var grad = $this.paint.radialGradient;
+				
+				var cx = parseFloat(grad.getAttribute('cx')||0.5),
+					cy = parseFloat(grad.getAttribute('cy')||0.5),
+					fx = parseFloat(grad.getAttribute('fx')||0.5),
+					fy = parseFloat(grad.getAttribute('fy')||0.5);
+				
+				// No match, so show focus point
+				var showFocus = grad.getAttribute('fx') != null && !(cx == fx && cy == fy);
+				
+				var rect = document.createElementNS(ns.svg, 'rect');
+				rect.id = id + '_rg_jgraduate_rect';
+				rect.setAttribute('x', MARGINX);
+				rect.setAttribute('y', MARGINY);
+				rect.setAttribute('width', SIZEY);
+				rect.setAttribute('height', SIZEY);
+				rect.setAttribute('fill', 'url(#'+id+'_rg_jgraduate_grad)');
+				rect.setAttribute('fill-opacity', '1.0');
+
+				rect = svg.appendChild(rect);
+				
+				$('#' + id + '_rg_jgraduate_rect').attr('fill-opacity', gradalpha/100);
+
+				// stop visuals created here
+				var centerPoint = document.createElementNS(ns.svg, 'image');
+				centerPoint.id = id + "_center_pt";
+				centerPoint.setAttribute('class', 'stop');
+				centerPoint.setAttributeNS(ns.xlink, 'href', $settings.images.clientPath + 'mappoint_c.png');
+				centerPoint.setAttributeNS(ns.xlink, "title", "Center Point");
+				centerPoint.appendChild(document.createElementNS(ns.svg, 'title')).appendChild(
+					document.createTextNode("Center Point"));
+				centerPoint.setAttribute('width', 18);
+				centerPoint.setAttribute('height', 18);
+				centerPoint.setAttribute('x', MARGINX + SIZEX*cx - STOP_RADIUS);
+				centerPoint.setAttribute('y', MARGINY + SIZEY*cy - STOP_RADIUS);
+				centerPoint.setAttribute('cursor', 'move');
+
+				
+				var focusPoint = document.createElementNS(ns.svg, 'image');
+				focusPoint.id = id + "_focus_pt";
+				focusPoint.setAttribute('class', 'stop');
+				focusPoint.setAttributeNS(ns.xlink, 'href', $settings.images.clientPath + 'mappoint_f.png');
+				focusPoint.setAttributeNS(ns.xlink, "title", "Focus Point");
+				focusPoint.appendChild(document.createElementNS(ns.svg, 'title')).appendChild(
+					document.createTextNode("Focus Point"));
+				focusPoint.setAttribute('width', 18);
+				focusPoint.setAttribute('height', 18);
+				focusPoint.setAttribute('x', MARGINX + SIZEX*fx - STOP_RADIUS);
+				focusPoint.setAttribute('y', MARGINY + SIZEY*fy - STOP_RADIUS);
+				focusPoint.setAttribute('cursor', 'move');
+				
+				// must append only after setting all attributes due to Webkit Bug 27952
+				// https://bugs.webkit.org/show_bug.cgi?id=27592
+				
+				// centerPoint is added last so it is moved first
+				focusPoint = svg.appendChild(focusPoint);
+				centerPoint = svg.appendChild(centerPoint);
+				
+				// bind GUI elements
+				$('#'+id+'_rg_jGraduate_Ok').bind('click', function() {
+					$this.paint.type = "radialGradient";
+					$this.paint.solidColor = null;
+					okClicked();
+				});
+				$('#'+id+'_rg_jGraduate_Cancel').bind('click', function(paint) {
+					cancelClicked();
+				});
+				
+				var cx = $this.paint.radialGradient.getAttribute('cx');
+				if(!cx) cx = "0.0";
+				var cxInput = $('#'+id+'_jGraduate_cx');
+				cxInput.val(cx);
+				cxInput.change( function() {
+					if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
+						this.value = 0.0; 
+					}
+					$this.paint.radialGradient.setAttribute('cx', this.value);
+					centerPoint.setAttribute('x', MARGINX + SIZEX*this.value - STOP_RADIUS);
+				});
+	
+				var cy = $this.paint.radialGradient.getAttribute('cy');
+				if(!cy) cy = "0.0";
+				var cyInput = $('#'+id+'_jGraduate_cy');
+				cyInput.val(cy);
+				cyInput.change( function() {
+					if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
+						this.value = 0.0; 
+					}
+					$this.paint.radialGradient.setAttribute('cy', this.value);
+					centerPoint.setAttribute('y', MARGINY + SIZEY*this.value - STOP_RADIUS);
+				});
+				
+				var fx = $this.paint.radialGradient.getAttribute('fx');
+				if(!fx) fx = "1.0";
+				var fxInput = $('#'+id+'_jGraduate_fx');
+				fxInput.val(fx);
+				fxInput.change( function() {
+					if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
+						this.value = 1.0;
+					}
+					$this.paint.radialGradient.setAttribute('fx', this.value);
+					focusPoint.setAttribute('x', MARGINX + SIZEX*this.value - STOP_RADIUS);
+				});
+				
+				var fy = $this.paint.radialGradient.getAttribute('fy');
+				if(!fy) fy = "0.0";
+				var fyInput = $('#'+id+'_jGraduate_fy');
+				fyInput.val(fy);
+				fyInput.change( function() {
+					if (isNaN(parseFloat(this.value)) || this.value < 0.0 || this.value > 1.0) { 
+						this.value = 0.0;
+					}
+					$this.paint.radialGradient.setAttribute('fy', this.value);
+					focusPoint.setAttribute('y', MARGINY + SIZEY*this.value - STOP_RADIUS);
+				});      
+				
+				if(!showFocus) {
+					focusPoint.setAttribute('display', 'none');	
+					fxInput.val("");
+					fyInput.val("");
+				}
+
+				$("#" + id + "_jGraduate_match_ctr")[0].checked = !showFocus;
+				
+				var lastfx, lastfy;
+				
+				$("#" + id + "_jGraduate_match_ctr").change(function() {
+					showFocus = !this.checked;
+					focusPoint.setAttribute('display', showFocus?'inline':'none');
+					fxInput.val("");
+					fyInput.val("");
+					var grad = $this.paint.radialGradient;
+					if(!showFocus) {
+						lastfx = grad.getAttribute('fx');
+						lastfy = grad.getAttribute('fy');
+						grad.removeAttribute('fx');
+						grad.removeAttribute('fy');
+					} else {
+						var fx = lastfx || .5;
+						var fy = lastfy || .5;
+						grad.setAttribute('fx', fx);
+						grad.setAttribute('fy', fy);
+						fxInput.val(fx);
+						fyInput.val(fy);
+					}
+				});
+				
+				var stops = $this.paint.radialGradient.getElementsByTagNameNS(ns.svg, 'stop');
+				var numstops = stops.length;
+				// if there are not at least two stops, then 
+				if (numstops < 2) {
+					while (numstops < 2) {
+						$this.paint.radialGradient.appendChild( document.createElementNS(ns.svg, 'stop') );
+						++numstops;
+					}
+					stops = $this.paint.radialGradient.getElementsByTagNameNS(ns.svg, 'stop');
+				}
+				var radius = $this.paint.radialGradient.getAttribute('r')-0;
+				var radiusx = parseInt((245/2)*(radius)) - 4.5;
+				$('#' + id + '_jGraduate_RadiusArrows').css({'margin-left':radiusx});
+				$('#' + id + '_jGraduate_RadiusInput').val(parseInt(radius*100)).change(function(e) {
+					var x = this.value / 100;
+					if(x < 0.01) {
+						x = 0.01;
+					}
+					
+					$this.paint.radialGradient.setAttribute('r', x);
+					// Allow higher value, but pretend it's the max for the slider
+					if(x > 2) x = 2;
+					var posx = parseInt((245/2) * x) - 4.5;
+					$('#' + id + '_jGraduate_RadiusArrows').css({'margin-left':posx});
+					
+				});
+				
+				var setRgOpacitySlider = function(e, div) {
+					var offset = div.offset();
+					var x = (e.pageX - offset.left - parseInt(div.css('border-left-width')));
+					if (x > 255) x = 255;
+					if (x < 0) x = 0;
+					var posx = x - 4.5;
+					x /= 255;
+					$('#' + id + '_rg_jGraduate_AlphaArrows').css({'margin-left':posx});
+					$('#' + id + '_rg_jgraduate_rect').attr('fill-opacity', x);
+					x = parseInt(x*100);
+					$('#' + id + '_rg_jGraduate_OpacityInput').val(x);
+					$this.paint.alpha = x;
+				};
+				
+				// handle dragging on the opacity slider
+				var bSlidingOpacity = false;
+				$('#' + id + '_rg_jGraduate_Opacity').mousedown(function(evt) {
+					setRgOpacitySlider(evt, $(this));
+					bSlidingOpacity = true;
+					evt.preventDefault();
+				}).mousemove(function(evt) {
+					if (bSlidingOpacity) {
+						setRgOpacitySlider(evt, $(this));
+						evt.preventDefault();
+					}
+				}).mouseup(function(evt) {
+					setRgOpacitySlider(evt, $(this));
+					bSlidingOpacity = false;
+					evt.preventDefault();
+				});
+				
+				var setRadiusSlider = function(e, div) {
+					var offset = div.offset();
+					var x = (e.pageX - offset.left - parseInt(div.css('border-left-width')));
+					if (x > 245) x = 245;
+					if (x <= 1) x = 1;
+					var posx = x - 5;
+					x /= (245/2);
+					$('#' + id + '_jGraduate_RadiusArrows').css({'margin-left':posx});
+					$this.paint.radialGradient.setAttribute('r', x);
+					x = parseInt(x*100);
+					
+					$('#' + id + '_jGraduate_RadiusInput').val(x);
+				};
+				
+				// handle dragging on the radius slider
+				var bSlidingRadius = false;
+				$('#' + id + '_jGraduate_Radius').mousedown(function(evt) {
+					setRadiusSlider(evt, $(this));
+					bSlidingRadius = true;
+					evt.preventDefault();
+				}).mousemove(function(evt) {
+					if (bSlidingRadius) {
+						setRadiusSlider(evt, $(this));
+						evt.preventDefault();
+					}
+				}).mouseup(function(evt) {
+					setRadiusSlider(evt, $(this));
+					bSlidingRadius = false;
+					evt.preventDefault();
+				});
+				
+				
+				// handle dragging the stop around the swatch
+				var draggingStop = null;
+				var startx = -1, starty = -1;
+				// for whatever reason, Opera does not allow $('image.stop') here,
+				// and Firefox 1.5 does not allow $('.stop')
+				$('.stop, #color_picker_rg_jGraduate_GradContainer image').mousedown(function(evt) {
+					draggingStop = this;
+					startx = evt.clientX;
+					starty = evt.clientY;
+					evt.preventDefault();
+				});
+				$('#'+id+'_rg_jgraduate_svg').mousemove(function(evt) {
+					if (null != draggingStop) {
+						var dx = evt.clientX - startx;
+						var dy = evt.clientY - starty;
+						startx += dx;
+						starty += dy;
+						var x = parseFloat(draggingStop.getAttribute('x')) + dx;
+						var y = parseFloat(draggingStop.getAttribute('y')) + dy;
+	
+						// clamp stop to the swatch
+						if (x < MARGINX - STOP_RADIUS) x = MARGINX - STOP_RADIUS;
+						if (y < MARGINY - STOP_RADIUS) y = MARGINY - STOP_RADIUS;
+						if (x > MARGINX + SIZEX - STOP_RADIUS) x = MARGINX + SIZEX - STOP_RADIUS;
+						if (y > MARGINY + SIZEY - STOP_RADIUS) y = MARGINY + SIZEY - STOP_RADIUS;
+											
+						draggingStop.setAttribute('x', x);
+						draggingStop.setAttribute('y', y);
+	
+						// calculate stop offset            		
+						var fracx = (x - MARGINX + STOP_RADIUS)/SIZEX;
+						var fracy = (y - MARGINY + STOP_RADIUS)/SIZEY;
+						
+						
+						if (draggingStop.id == (id+'_center_pt')) {
+							cxInput.val(fracx);
+							cyInput.val(fracy);
+							$this.paint.radialGradient.setAttribute('cx', fracx);
+							$this.paint.radialGradient.setAttribute('cy', fracy);
+							
+							if(!showFocus) {
+								$this.paint.radialGradient.setAttribute('fx', fracx);
+								$this.paint.radialGradient.setAttribute('fy', fracy);
+							}
+						}
+						else {
+							fxInput.val(fracx);
+							fyInput.val(fracy);
+							$this.paint.radialGradient.setAttribute('fx', fracx);
+							$this.paint.radialGradient.setAttribute('fy', fracy);
+						}
+						
+						evt.preventDefault();
+					}
+				});
+				$('#'+id+'_rg_jgraduate_svg').mouseup(function(evt) {
+					draggingStop = null;
+				});
+				
+				var centerColor = stops[0].getAttribute('stop-color');
+				if(!centerColor) centerColor = '#000';
+				centerColorBox = $('#'+id+'_jGraduate_colorBoxCenter');
+				centerColorBox.css({'background-color':centerColor});
+	
+				var centerOpacity = stops[0].getAttribute('stop-opacity');
+				if(!centerOpacity) centerOpacity = '1.0';
+				$('#'+id+'jGraduate_centerOpacity').html( (centerOpacity*100)+'%' );
+	
+				var outerColor = stops[stops.length-1].getAttribute('stop-color');
+				if(!outerColor) outerColor = '#000';
+				outerColorBox = $('#'+id+'_jGraduate_colorBoxOuter');
+				outerColorBox.css({'background-color':outerColor});
+	
+				var outerOpacity = stops[stops.length-1].getAttribute('stop-opacity');
+				if(!outerOpacity) outerOpacity = '1.0';
+				$('#'+id+'rg_jGraduate_outerOpacity').html( (outerOpacity*100)+'%' );
+				
+				$('#'+id+'_jGraduate_colorBoxCenter').click(function() {
+					$('div.jGraduate_LightBox').show();			
+					var colorbox = $(this);
+					var thisAlpha = (parseFloat(centerOpacity)*255).toString(16);
+					while (thisAlpha.length < 2) { thisAlpha = "0" + thisAlpha; }
+					color = centerColor.substr(1) + thisAlpha;
+					$('#'+id+'_rg_jGraduate_stopPicker').css({'left': 100, 'bottom': 15}).jPicker({
+							window: { title: "Pick the center color and opacity for the gradient" },
+							images: { clientPath: $settings.images.clientPath },
+							color: { active: color, alphaSupport: true }
+						}, function(color){
+							centerColor = color.get_Hex() ? ('#'+color.get_Hex()) : "none";
+							centerOpacity = color.get_A() ? color.get_A()/100 : 1;
+							colorbox.css('background', centerColor);
+							$('#'+id+'_rg_jGraduate_centerOpacity').html(parseInt(centerOpacity*100)+'%');
+							stops[0].setAttribute('stop-color', centerColor);
+							stops[0].setAttribute('stop-opacity', centerOpacity);
+							$('div.jGraduate_LightBox').hide();
+							$('#'+id+'_rg_jGraduate_stopPicker').hide();
+						}, null, function() {
+							$('div.jGraduate_LightBox').hide();
+							$('#'+id+'_rg_jGraduate_stopPicker').hide();
+						});
+				});
+				$('#'+id+'_jGraduate_colorBoxOuter').click(function() {
+					$('div.jGraduate_LightBox').show();
+					var colorbox = $(this);
+					var thisAlpha = (parseFloat(outerOpacity)*255).toString(16);
+					while (thisAlpha.length < 2) { thisAlpha = "0" + thisAlpha; }
+					color = outerColor.substr(1) + thisAlpha;
+					$('#'+id+'_rg_jGraduate_stopPicker').css({'left': 100, 'top': 15}).jPicker({
+							window: { title: "Pick the outer color and opacity for the gradient" },
+							images: { clientPath: $settings.images.clientPath },
+							color: { active: color, alphaSupport: true }
+						}, function(color){
+							outerColor = color.get_Hex() ? ('#'+color.get_Hex()) : "none";
+							outerOpacity = color.get_A() ? color.get_A()/100 : 1;
+							colorbox.css('background', outerColor);
+							$('#'+id+'_jGraduate_outerOpacity').html(parseInt(outerOpacity*100)+'%');
+							stops[1].setAttribute('stop-color', outerColor);
+							stops[1].setAttribute('stop-opacity', outerOpacity);
+							$('div.jGraduate_LightBox').hide();
+							$('#'+id+'_rg_jGraduate_stopPicker').hide();
+						}, null, function() {
+							$('div.jGraduate_LightBox').hide();
+							$('#'+id+'_rg_jGraduate_stopPicker').hide();
+						});
+				});            
+				
+				// --------------
+				var thisAlpha = ($this.paint.alpha*255/100).toString(16);
 				while (thisAlpha.length < 2) { thisAlpha = "0" + thisAlpha; }
-				color = endColor.substr(1) + thisAlpha;
-				$('#'+id+'_jGraduate_stopPicker').css({'left': 100, 'top': 15}).jPicker({
-						window: { title: "Pick the end color and opacity for the gradient" },
+				color = $this.paint.solidColor == "none" ? "" : $this.paint.solidColor + thisAlpha;
+				colPicker.jPicker(
+					{
+						window: { title: $settings.window.pickerTitle },
 						images: { clientPath: $settings.images.clientPath },
 						color: { active: color, alphaSupport: true }
-					}, function(color){
-						endColor = color.get_Hex() ? ('#'+color.get_Hex()) : "none";
-						endOpacity = color.get_A() ? color.get_A()/100 : 1;
-						colorbox.css('background', endColor);
-						$('#'+id+'_jGraduate_endOpacity').html(parseInt(endOpacity*100)+'%');
-            			stops[1].setAttribute('stop-color', endColor);
-						stops[1].setAttribute('stop-opacity', endOpacity);
-						$('div.jGraduate_LightBox').hide();
-						$('#'+id+'_jGraduate_stopPicker').hide();
-					}, null, function() {
-						$('div.jGraduate_LightBox').hide();
-						$('#'+id+'_jGraduate_stopPicker').hide();
-					});
-			});            
-            
-			// --------------
-			var thisAlpha = ($this.paint.alpha*255/100).toString(16);
-			while (thisAlpha.length < 2) { thisAlpha = "0" + thisAlpha; }
-			color = $this.paint.solidColor == "none" ? "" : $this.paint.solidColor + thisAlpha;
-			colPicker.jPicker(
-				{
-					window: { title: $settings.window.pickerTitle },
-					images: { clientPath: $settings.images.clientPath },
-					color: { active: color, alphaSupport: true }
-				},
-				function(color) {
-					$this.paint.type = "solidColor";
-					$this.paint.alpha = color.get_A() ? color.get_A() : 100;
-					$this.paint.solidColor = color.get_Hex() ? color.get_Hex() : "none";
-					$this.paint.linearGradient = null;
-					okClicked(); 
-				},
-				null,
-				function(){ cancelClicked(); }
-				);
-				
-			$(idref + ' .jGraduate_tab_color').click( function(){
-				$(idref + ' .jGraduate_tab_lingrad').removeClass('jGraduate_tab_current');
-				$(idref + ' .jGraduate_tab_color').addClass('jGraduate_tab_current');
-				lgPicker.hide();
-				colPicker.show();
-			});
-			$(idref + ' .jGraduate_tab_lingrad').click( function(){
-				$(idref + ' .jGraduate_tab_color').removeClass('jGraduate_tab_current');
-				$(idref + ' .jGraduate_tab_lingrad').addClass('jGraduate_tab_current');
-				colPicker.hide();
-				lgPicker.show();
+					},
+					function(color) {
+						$this.paint.type = "solidColor";
+						$this.paint.alpha = color.get_A() ? color.get_A() : 100;
+						$this.paint.solidColor = color.get_Hex() ? color.get_Hex() : "none";
+						$this.paint.radialGradient = null;
+						okClicked(); 
+					},
+					null,
+					function(){ cancelClicked(); }
+					);
+			}());	
+			
+			var tabs = $(idref + ' .jGraduate_tabs li');
+			tabs.click(function() {
+				tabs.removeClass('jGraduate_tab_current');
+				$(this).addClass('jGraduate_tab_current');
+				$(idref + " > div").hide();
+				$(idref + ' .jGraduate_' +  $(this).attr('data-type') + 'Pick').show();
 			});
 			
-			if ($this.paint.type == "linearGradient") {
-				lgPicker.show();
-				colPicker.hide();
-				$(idref + ' .jGraduate_tab_color').removeClass('jGraduate_tab_current');
-				$(idref + ' .jGraduate_tab_lingrad').addClass('jGraduate_tab_current');				
+			$(idref + " > div").hide();
+			tabs.removeClass('jGraduate_tab_current');
+			var tab;
+			switch ( $this.paint.type ) {
+				case 'linearGradient':
+					tab = $(idref + ' .jGraduate_tab_lingrad');
+					break;
+				case 'radialGradient':
+					tab = $(idref + ' .jGraduate_tab_radgrad');
+					break;
+				default:
+					tab = $(idref + ' .jGraduate_tab_color');
+					break;
 			}
-			else {
-				colPicker.show();
-				lgPicker.hide();
-				$(idref + ' .jGraduate_tab_color').addClass('jGraduate_tab_current');
-				$(idref + ' .jGraduate_tab_lingrad').removeClass('jGraduate_tab_current');				
-			}
+			tab.addClass('jGraduate_tab_current').click();	
 
 			$this.show();
 		});
 	};
+})();
\ No newline at end of file