Merge remote-tracking branch 'osmlab/id-default'
authorTom Hughes <tom@compton.nu>
Fri, 23 Aug 2013 16:41:09 +0000 (17:41 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 23 Aug 2013 16:41:09 +0000 (17:41 +0100)
51 files changed:
Vendorfile
app/assets/images/confirm-illustration.png [new file with mode: 0644]
app/assets/images/confirm-illustration.svg [new file with mode: 0644]
app/assets/images/donate-ad.png [deleted file]
app/assets/images/sign-up-illustration-arm.png [new file with mode: 0644]
app/assets/images/sign-up-illustration.png [new file with mode: 0644]
app/assets/images/sign-up-illustration.svg [new file with mode: 0644]
app/assets/images/sprite.svg
app/assets/images/terms-illustration.png [new file with mode: 0644]
app/assets/images/terms-illustration.svg [new file with mode: 0644]
app/assets/images/welcome-sprite.png [new file with mode: 0644]
app/assets/images/welcome-sprite.svg [new file with mode: 0644]
app/assets/javascripts/application.js
app/assets/javascripts/browse.js
app/assets/javascripts/index.js
app/assets/javascripts/menu.js [deleted file]
app/assets/javascripts/welcome.js [new file with mode: 0644]
app/assets/stylesheets/common.css.scss
app/assets/stylesheets/print.css
app/assets/stylesheets/small.css.scss
app/controllers/site_controller.rb
app/controllers/user_controller.rb
app/models/notifier.rb
app/models/user_token.rb
app/views/browse/_map.html.erb
app/views/layouts/_edit_menu.html.erb [new file with mode: 0644]
app/views/layouts/_inbox.html.erb
app/views/layouts/_user_menu.html.erb [new file with mode: 0644]
app/views/layouts/site.html.erb
app/views/notifier/signup_confirm.html.erb
app/views/notifier/signup_confirm.text.erb
app/views/site/_home_link.html.erb
app/views/site/welcome.html.erb [new file with mode: 0644]
app/views/user/account.html.erb
app/views/user/api_read.builder
app/views/user/confirm.html.erb
app/views/user/new.html.erb
app/views/user/terms.html.erb
config/environments/production.rb
config/locales/da.yml
config/locales/de.yml
config/locales/en.yml
config/locales/fr.yml
config/routes.rb
test/functional/site_controller_test.rb
test/functional/user_controller_test.rb
test/integration/user_creation_test.rb
vendor/assets/bootstrap/bootstrap.dropdown.js [new file with mode: 0644]
vendor/assets/iD/iD.css.erb
vendor/assets/iD/iD.js
vendor/assets/potlatch2/potlatch2.swf

index 88f999a405607f91d7ff1f869d9695c86d464f52..c1242beb7fd92e0ccd9eb9d6aca11d26795f6acd 100644 (file)
@@ -5,6 +5,7 @@ folder 'vendor/assets' do
 
   folder 'bootstrap' do
     file 'bootstrap.tooltip.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-tooltip.js'
+    file 'bootstrap.dropdown.js', 'https://raw.github.com/twbs/bootstrap/v2.3.2/js/bootstrap-dropdown.js'
   end
 
   folder 'leaflet' do
diff --git a/app/assets/images/confirm-illustration.png b/app/assets/images/confirm-illustration.png
new file mode 100644 (file)
index 0000000..ad673d5
Binary files /dev/null and b/app/assets/images/confirm-illustration.png differ
diff --git a/app/assets/images/confirm-illustration.svg b/app/assets/images/confirm-illustration.svg
new file mode 100644 (file)
index 0000000..9bb5715
--- /dev/null
@@ -0,0 +1,1255 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="580"
+   height="270"
+   id="svg4136"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="verify-illustration.svg"
+   inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/verify-illustration.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4138">
+    <linearGradient
+       id="linearGradient14931">
+      <stop
+         id="stop14933"
+         offset="0"
+         style="stop-color:#ccf1ff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#ccf1ff;stop-opacity:0;"
+         offset="0.85714281"
+         id="stop14937" />
+      <stop
+         id="stop14935"
+         offset="1"
+         style="stop-color:#789afb;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14233"
+       inkscape:collect="always">
+      <stop
+         id="stop14235"
+         offset="0"
+         style="stop-color:#a2c9ed;stop-opacity:1;" />
+      <stop
+         id="stop14237"
+         offset="1"
+         style="stop-color:#7a9dfc;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient14223">
+      <stop
+         style="stop-color:#a2c9ed;stop-opacity:1;"
+         offset="0"
+         id="stop14225" />
+      <stop
+         style="stop-color:#7a9dfc;stop-opacity:1"
+         offset="1"
+         id="stop14227" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13250">
+      <stop
+         style="stop-color:#8eb3f5;stop-opacity:1"
+         offset="0"
+         id="stop13252" />
+      <stop
+         style="stop-color:#b2dbea;stop-opacity:0;"
+         offset="1"
+         id="stop13254" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13240">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop13242" />
+      <stop
+         style="stop-color:#ebf2fd;stop-opacity:1"
+         offset="1"
+         id="stop13244" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13198">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop13200" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop13202" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9009">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9011" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop9013" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8284"
+       inkscape:collect="always">
+      <stop
+         id="stop8286"
+         offset="0"
+         style="stop-color:#b2dbea;stop-opacity:1" />
+      <stop
+         id="stop8288"
+         offset="1"
+         style="stop-color:#93b8e0;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7775">
+      <stop
+         style="stop-color:#222222;stop-opacity:1"
+         offset="0"
+         id="stop7777" />
+      <stop
+         style="stop-color:#adadc6;stop-opacity:0;"
+         offset="1"
+         id="stop7779" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7767">
+      <stop
+         style="stop-color:#b2dbea;stop-opacity:1"
+         offset="0"
+         id="stop7769" />
+      <stop
+         style="stop-color:#7092ff;stop-opacity:1"
+         offset="1"
+         id="stop7771" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7691">
+      <path
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(1.4545455,0,0,1.4545455,-622.81822,-83.09091)"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         sodipodi:ry="110"
+         sodipodi:rx="110"
+         sodipodi:cy="119"
+         sodipodi:cx="1236"
+         id="path7693"
+         style="color:#000000;fill:#c5c5d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7755">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#adadc6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1230.4688,792.26843 c 13.3096,49.6722 -20.4537,112.82556 -47.6876,150.09372 l 152.2188,0 c 0,-68.85715 -43.5157,-127.53233 -104.5312,-150.09372 z"
+         id="path7757"
+         sodipodi:nodetypes="cccc" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter7759"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.8125"
+         id="feGaussianBlur7761" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7763"
+       x="-0.103344"
+       width="1.206688"
+       y="-0.089630529"
+       height="1.1792611"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.3825"
+         id="feGaussianBlur7765" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7767"
+       id="linearGradient7773"
+       x1="1225.6875"
+       y1="36.5"
+       x2="1225.6875"
+       y2="119"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7775"
+       id="linearGradient7781"
+       x1="1224.2188"
+       y1="789.35889"
+       x2="1224.2188"
+       y2="942.36212"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872"
+       id="linearGradient7878"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter7759-0">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.8125"
+         id="feGaussianBlur7761-9" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8573">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path8575"
+         sodipodi:cx="1236"
+         sodipodi:cy="119"
+         sodipodi:rx="110"
+         sodipodi:ry="110"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         transform="matrix(1.4545455,0,0,1.4545455,-611.81823,-534.09093)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853"
+         sodipodi:open="true" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8675">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient8679);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.81818199;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 1190.4062,-388.15627 a 12.0012,12.0012 0 0 0 -10.0312,4.96875 c -23.0888,31.04416 -73.5,61.84375 -73.5,61.84375 a 12.007739,12.007739 0 0 0 -0.8125,0.5625 12.007739,12.007739 0 0 0 -0.1875,0.125 l -13.875,7.90625 a 4.0175701,4.0175701 0 1 0 4,6.96875 l 5.2188,-2.96875 a 12.007739,12.007739 0 0 0 17.9062,8.0625 c 0,0 52.3016,-30.24185 80.5,-68.15625 a 12.0012,12.0012 0 0 0 -9.2188,-19.3125 z"
+         id="path8677"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8284"
+       id="linearGradient8679"
+       gradientUnits="userSpaceOnUse"
+       x1="1086"
+       y1="139"
+       x2="1125.7982"
+       y2="99.201767"
+       gradientTransform="translate(11.000003,-451.00002)" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8987">
+      <flowRoot
+         xml:space="preserve"
+         id="flowRoot8989"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Menlo;-inkscape-font-specification:Menlo Bold"
+         transform="translate(-173.25,451.00002)"
+         clip-path="none"><flowRegion
+           id="flowRegion8991"><rect
+             id="rect8993"
+             width="580"
+             height="303"
+             x="1021"
+             y="-529"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;stroke:none;font-family:Menlo;-inkscape-font-specification:Menlo Bold" /></flowRegion><flowPara
+           id="flowPara8995">101010101010100011</flowPara><flowPara
+           id="flowPara8997">100010101010011010</flowPara><flowPara
+           id="flowPara8999">101010101001010110</flowPara><flowPara
+           id="flowPara9001">010111010000011010</flowPara><flowPara
+           id="flowPara9003">000101010000110001</flowPara><flowPara
+           id="flowPara9005">101010110010101101</flowPara><flowPara
+           id="flowPara9007">101010111010101011</flowPara></flowRoot>    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9015"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9019"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9021"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9023"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9025"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9027"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9029"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9031"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9033"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9035"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-10"
+       id="linearGradient7878-5"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-10">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-2" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-80"
+       id="linearGradient7878-1"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-870,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-80">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-6" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-8-5"
+       id="linearGradient7878-9-6"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-870,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-8-5">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-3-7" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-8-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-8-9"
+       id="linearGradient7878-9-9"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-870,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-8-9">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-3-4" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-8-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-8-2"
+       id="linearGradient7878-9-8"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-8-2">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-3-3" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-8-6" />
+    </linearGradient>
+    <linearGradient
+       y2="802.62952"
+       x2="1097"
+       y1="942.36218"
+       x1="1097"
+       gradientTransform="translate(-1205,-787.20593)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient13058"
+       xlink:href="#linearGradient7872-8-2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13198"
+       id="linearGradient13220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0.26794919,1,-171.4763,0)"
+       x1="1075"
+       y1="942.61218"
+       x2="1075"
+       y2="897.61151" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13240"
+       id="linearGradient13246"
+       x1="1023.75"
+       y1="883.11218"
+       x2="1023.75"
+       y2="905.88416"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(80,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13250"
+       id="linearGradient13256"
+       x1="210"
+       y1="135"
+       x2="210"
+       y2="145"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-3"
+       id="linearGradient7878-19"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-790,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-3">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-9" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-7" />
+    </linearGradient>
+    <linearGradient
+       y2="802.62952"
+       x2="1097"
+       y1="942.36218"
+       x1="1097"
+       gradientTransform="translate(-1030,-792.36218)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient14202"
+       xlink:href="#linearGradient7872-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14223"
+       id="linearGradient14229"
+       x1="1104"
+       y1="908.36218"
+       x2="1104"
+       y2="944.48694"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14233"
+       id="linearGradient14231"
+       x1="1104"
+       y1="908.36218"
+       x2="1104"
+       y2="944.48694"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7767-8"
+       id="linearGradient7773-6"
+       x1="1225.6875"
+       y1="36.5"
+       x2="1225.6875"
+       y2="119"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient7767-8">
+      <stop
+         style="stop-color:#b2dbea;stop-opacity:1"
+         offset="0"
+         id="stop7769-3" />
+      <stop
+         style="stop-color:#7092ff;stop-opacity:1"
+         offset="1"
+         id="stop7771-2" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14931"
+       id="radialGradient14929"
+       cx="1218.1995"
+       cy="124.60332"
+       fx="1218.1995"
+       fy="124.60332"
+       r="110"
+       gradientTransform="matrix(8.9292362e-8,-1.09375,1.0937499,1.4609618e-6,1099.715,1451.4055)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15209"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15211"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15213"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15215"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15217"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15219"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15221"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15223"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7775"
+       id="linearGradient15226"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)"
+       x1="1224.2188"
+       y1="789.35889"
+       x2="1224.2188"
+       y2="942.36212" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14223"
+       id="linearGradient15231"
+       gradientUnits="userSpaceOnUse"
+       x1="1104"
+       y1="908.36218"
+       x2="1104"
+       y2="944.48694" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14233"
+       id="linearGradient15234"
+       gradientUnits="userSpaceOnUse"
+       x1="1104"
+       y1="908.36218"
+       x2="1104"
+       y2="944.48694"
+       gradientTransform="translate(-820,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13240"
+       id="linearGradient15237"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(80,0)"
+       x1="1023.75"
+       y1="883.11218"
+       x2="1023.75"
+       y2="905.88416" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13198"
+       id="linearGradient15240"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0.26794919,1,-171.4763,0)"
+       x1="1075"
+       y1="942.61218"
+       x2="1075"
+       y2="897.61151" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-10"
+       id="linearGradient15249"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872"
+       id="linearGradient15252"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-3"
+       id="linearGradient15256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15270"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15272"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15274"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15276"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15278"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15280"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15282"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15284"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15284-1"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9009-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9011-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop9013-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient9021-0"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient9019-6"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15270-8"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15272-3"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15274-2"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15276-3"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15278-3"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15280-7"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15282-7"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       y2="-533.03516"
+       x2="1184"
+       y1="-405.00003"
+       x1="1184"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15375"
+       xlink:href="#linearGradient9009-6"
+       inkscape:collect="always" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath15492">
+      <path
+         id="path15494"
+         d="m 1071,-406.00002 c -4.5663,0 -8.4278,3.06835 -9.625,7.25 l -12.375,37.75 22,0 9.5625,-32 0,-0.0625 c 0.019,-0.0621 0.045,-0.12491 0.062,-0.1875 0.2508,-0.87601 0.375,-1.79341 0.375,-2.75 0,-5.52285 -4.4771,-10 -10,-10 z m 40,0 c -5.5228,0 -10,4.47715 -10,10 0,0.95659 0.1242,1.87399 0.375,2.75 l 0.062,0.1875 c 0.01,0.0188 -0.01,0.0437 0,0.0625 l 9.5625,32 20,0 -10.375,-37.75 c -1.1972,-4.18165 -5.0587,-7.25 -9.625,-7.25 z"
+         style="color:#000000;fill:url(#linearGradient15496);fill-opacity:1;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         clip-path="none"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14233"
+       id="linearGradient15496"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.999997,-1303.3622)"
+       x1="1104"
+       y1="908.36218"
+       x2="1104"
+       y2="944.48694" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="454.13163"
+     inkscape:cy="142.68005"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1524"
+     inkscape:window-height="817"
+     inkscape:window-x="397"
+     inkscape:window-y="161"
+     inkscape:window-maximized="0"
+     borderlayer="false"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-paths="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-nodes="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4228"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="523,479"
+       id="guide6331" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4141">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-820,-742.36218)">
+    <g
+       id="g8240"
+       transform="translate(-49,2)"
+       style="fill:#7693dc;fill-opacity:1" />
+    <rect
+       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect9589"
+       width="230"
+       height="60"
+       x="-1050"
+       y="-962.36218"
+       transform="scale(-1,-1)" />
+    <g
+       id="g13213"
+       transform="translate(10,0)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#linearGradient7773);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path7176"
+       sodipodi:cx="1236"
+       sodipodi:cy="119"
+       sodipodi:rx="110"
+       sodipodi:ry="110"
+       d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+       transform="matrix(1.4545455,0,0,1.4545455,-592.81822,769.27127)"
+       sodipodi:start="3.1415927"
+       sodipodi:end="6.2831853"
+       sodipodi:open="true" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot8523"
+       style="font-size:30px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:url(#linearGradient15284);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Menlo;-inkscape-font-specification:Menlo Bold"
+       transform="translate(19,1303.3622)"
+       clip-path="url(#clipPath8573)"><flowRegion
+         id="flowRegion8525"
+         style="fill:url(#linearGradient9021);fill-opacity:1"><rect
+           id="rect8527"
+           width="580"
+           height="303"
+           x="1021"
+           y="-529"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:url(#linearGradient9019);fill-opacity:1;stroke:none;font-family:Menlo;-inkscape-font-specification:Menlo Bold" /></flowRegion><flowPara
+         id="flowPara8529"
+         style="fill:url(#linearGradient15270);fill-opacity:1">101010101010100011</flowPara><flowPara
+         id="flowPara8531"
+         style="fill:url(#linearGradient15272);fill-opacity:1">100010101010011010</flowPara><flowPara
+         id="flowPara8533"
+         style="fill:url(#linearGradient15274);fill-opacity:1">101010101001010110</flowPara><flowPara
+         id="flowPara8535"
+         style="fill:url(#linearGradient15276);fill-opacity:1">010111010101011010</flowPara><flowPara
+         id="flowPara8537"
+         style="fill:url(#linearGradient15278);fill-opacity:1">000101010000110001</flowPara><flowPara
+         id="flowPara8617"
+         style="fill:url(#linearGradient15280);fill-opacity:1">101010110010101101</flowPara><flowPara
+         id="flowPara8619"
+         style="fill:url(#linearGradient15282);fill-opacity:1">101010111010101011</flowPara></flowRoot>    <path
+       style="opacity:0.25;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7759);enable-background:accumulate"
+       d="m 1174,-70 c -6.4317,0.0395 -12.7696,0.4728 -19,1.25 l 0,8.75 5,5 10,0 z m 40.25,4.84375 -0.031,0.15625 7.7812,9 5,0 3,-4 0,-0.28125 c -1.2872,-0.4713 -2.5726,-0.93607 -3.875,-1.375 -0.041,-0.0138 -0.084,-0.01755 -0.125,-0.03125 -1.2576,-0.42471 -2.5104,-0.82436 -3.7812,-1.21875 -1.1271,-0.34978 -2.2683,-0.70623 -3.4063,-1.03125 -0.1871,-0.0531 -0.3752,-0.10379 -0.5625,-0.15625 -1.079,-0.30374 -2.1607,-0.59432 -3.25,-0.875 -0.2478,-0.0638 -0.5017,-0.1249 -0.75,-0.1875 z m -95,5.15625 c -39.4401,14.6674 -71.5429,44.43079 -89.25,82.28125 L 1030,35 l 15,15 0,10 5,0 5,5 0,5 -5,5 0,15 105,0 -10,-10 -20,0 -5,-5 0,-5 -40,-25 -10,0 -10,10 -10,0 0,-15 -5,-5 5,-5 0,-5 -5,0 -10,0 10,-20 15,-5 0,15 5,0 5,-5 0,-10 25,-30 5,0 40,-15 0,-10 -5,-5 z m 91.75,5 6,8 7,0 -8,-8 z m 33.5,0.84375 -2.375,4.15625 -12.125,0 -5.7812,10 5.7812,10 -10,0.3125 -4.4375,4.6875 0,5 8.6563,5 10.7812,0 8.6562,-15 6.3438,0 10,8 1.3438,5 3.6562,0 0,-8 5,3 5,2 5,0 6,-6 -9,-10 -2.125,1 c -0.029,-0.0234 -0.064,-0.0392 -0.094,-0.0625 -0.3359,-0.26835 -0.6619,-0.54681 -1,-0.8125 -0.8033,-0.63134 -1.6219,-1.25882 -2.4374,-1.875 -0.2074,-0.1566 -0.417,-0.31314 -0.625,-0.46875 -0.9966,-0.74524 -1.9858,-1.46514 -3,-2.1875 -0.031,-0.0218 -0.063,-0.0408 -0.094,-0.0625 -0.1103,-0.0784 -0.2332,-0.14058 -0.3438,-0.21875 -0.9382,-0.66399 -1.8596,-1.35587 -2.8124,-2 -0.1442,-0.0974 -0.2931,-0.18434 -0.4376,-0.28125 -0.9169,-0.61558 -1.8508,-1.21555 -2.7812,-1.8125 -0.3292,-0.21107 -0.6691,-0.41628 -1,-0.625 -1.2672,-0.79993 -2.5216,-1.57877 -3.8125,-2.34375 -1.0622,-0.62947 -2.1409,-1.23835 -3.2187,-1.84375 -0.538,-0.302 -1.0834,-0.6103 -1.625,-0.90625 -0.1142,-0.0623 -0.2296,-0.12545 -0.3438,-0.1875 -0.9035,-0.49081 -1.8049,-0.9637 -2.7188,-1.4375 -1.3366,-0.69309 -2.6725,-1.3751 -4.0312,-2.03125 z M 1283,-30 l -3,10 5,5 10,0 0,10 -15,0 0,5 -10,0 -10,-10 -20,0 -5,0 -10,0 -5,5 0,10 -5,0 -10,20 0,5 5,5 0,15 20,20 20,0 5,-5 10,0 10,10 0,10 3.3438,5 56.6562,0 c 0,-44.18275 -17.9207,-84.17069 -46.875,-113.125 -0.6292,-0.62919 -1.2668,-1.25631 -1.9062,-1.875 z m -78,-20 3,5 5,0 -3,-5 z"
+       transform="translate(30,852.36218)"
+       id="path7591"
+       clip-path="url(#clipPath7691)"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccsccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#linearGradient15256);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1244.25,787.20593 -0.031,0.15625 7.7812,9 5,0 3,-4 0,-0.28125 c -1.2873,-0.4713 -2.5726,-0.93607 -3.875,-1.375 -0.041,-0.0138 -0.084,-0.0175 -0.125,-0.0312 -1.2576,-0.42471 -2.5104,-0.82436 -3.7812,-1.21875 -1.1271,-0.34978 -2.2683,-0.70623 -3.4063,-1.03125 -0.1871,-0.0531 -0.3752,-0.10379 -0.5625,-0.15625 -1.079,-0.30374 -2.1607,-0.59432 -3.25,-0.875 -0.2478,-0.0638 -0.5018,-0.1249 -0.75,-0.1875 z m -3.25,10.15625 6,8 7,0 -8,-8 -5,0 z m 33.5,0.875 -2.375,4.125 -9.5937,0 -2.5313,0 -5.7812,10 5.7812,10 -10,0.3125 -4.4375,4.6875 0,5 8.6563,5 7.3437,0 3.4375,0 8.6563,-15 6.3437,0 10,8 1.3438,5 3.6562,0 0,-8 5,3 5,2 5,0 5,5 10,0 0,10 -15,0 0,5 -10,0 -10,-10 -20,0 -5,0 -4.375,0 -5.625,0 -5,5 0,10 -5,0 -10,20 0,5 5,5 0,10.9375 0,4.0625 20,20 20,0 5,-5 10,0 10,10 0,10 3.3438,5 51.6562,0 5,0 c 0,-51.43766 -24.2837,-97.1986 -62,-126.46875 -0.1548,-0.11296 -0.3219,-0.23072 -0.4687,-0.34375 -0.018,-0.014 -0.045,-0.0172 -0.062,-0.0312 -0.7174,-0.55233 -1.4292,-1.11612 -2.1563,-1.65625 -0.053,-0.0397 -0.1025,-0.0854 -0.1562,-0.125 -0.06,-0.0444 -0.1301,-0.0771 -0.1875,-0.125 -0.023,-0.0187 -0.043,-0.0403 -0.062,-0.0625 -0.023,-0.0174 -0.04,-0.0451 -0.062,-0.0625 -0.7324,-0.5397 -1.4775,-1.07211 -2.2188,-1.59375 -0.019,-0.0133 -0.044,-0.0179 -0.062,-0.0312 -0.7603,-0.5345 -1.5106,-1.06633 -2.2812,-1.59375 -0.8253,-0.56504 -1.6633,-1.10637 -2.5,-1.65625 -1.673,-1.09976 -3.3778,-2.18082 -5.0938,-3.21875 -0.858,-0.51897 -1.7254,-1.02804 -2.5937,-1.53125 -0.8686,-0.50321 -1.7441,-1.0092 -2.625,-1.5 -0.8811,-0.49079 -1.7676,-0.96639 -2.6563,-1.4375 -0.8887,-0.47111 -1.7575,-0.92024 -2.6562,-1.375 -0.8777,-0.44428 -1.7693,-0.884 -2.6563,-1.3125 z m -39.5,4.125 3,5 5,0 -3,-5 -5,0 z"
+       id="path7176-41" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1285,897.36218 -15,15 -20,0 10,10 20,0 5,-5 10,0 10,10 0,10 5,0 10,-10 15.9688,0 0,-15 -25.9688,-15 -25,0 z"
+       id="path7176-3-8" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#linearGradient15252);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1149.25,792.36218 c -39.4401,14.6674 -71.5429,44.43079 -89.25,82.28125 l 0,12.71875 15,15 0,10 5,0 5,5 0,5 -5,5 0,15.00002 105,0 -10,-10.00002 -20,0 -5,-5 0,-5 -40,-25 -10,0 -10,10 -10,0 0,-15 -5,-5 5,-5 0,-5 -5,0 -10,0 10,-20 15,-5 0,15 5,0 5,-5 0,-10 25,-30 5,0 40,-15 0,-10 -5,-5 z"
+       id="path7176-4"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#linearGradient15249);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1204,782.36218 c -6.4317,0.0395 -12.7696,0.4728 -19,1.25 l 0,8.75 5,5 10,0 4,-15 z"
+       id="path7176-9" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1149.25,792.36218 c -5.8774,2.18576 -11.5968,4.72945 -17.125,7.5625 l 12.875,7.4375 0,9.375 25,-9.375 0,-10 -5,-5 -15.75,0 z"
+       id="path7176-4-7" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1115,810.08093 c -13.1826,8.9817 -24.9493,19.86488 -34.9063,32.28125 l 14.9063,0 20,-20 0,-12.28125 z"
+       id="path7176-4-76" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.25;color:#000000;fill:url(#linearGradient15226);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1260.4688,792.26843 c 13.3096,49.6722 -0.4537,112.82556 -27.6876,150.09372 l 132.2188,0 c 0,-68.85715 -43.5157,-127.53233 -104.5312,-150.09372 z"
+       id="path7176-2"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2831853"
+       sodipodi:start="3.1415927"
+       transform="matrix(1.5000002,0,0,1.5,-649.00018,763.86218)"
+       d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+       sodipodi:ry="110"
+       sodipodi:rx="110"
+       sodipodi:cy="119"
+       sodipodi:cx="1236"
+       id="path7176-1"
+       style="color:#000000;fill:url(#radialGradient14929);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.5;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path8131"
+       sodipodi:cx="1302.5"
+       sodipodi:cy="17.5"
+       sodipodi:rx="2.5"
+       sodipodi:ry="2.5"
+       d="m 1305,17.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
+       transform="matrix(2,0,0,2,-1441,832.36218)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.5;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path8157"
+       sodipodi:cx="1302.5"
+       sodipodi:cy="17.5"
+       sodipodi:rx="2.5"
+       sodipodi:ry="2.5"
+       d="m 1305,17.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
+       transform="matrix(2,0,0,2,-1467,832.36218)" />
+    <path
+       style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1100,927.36218 5,0 15,5 0,10 -30,0 z"
+       id="path9199"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1130,909.86218 0,7.5 10,5 0,10 -10,10 55,0 -10,-10 -20,0 -5,-5 0,-5 -20,-12.5 z"
+       id="path7176-4-2" />
+    <path
+       style="opacity:0.25;color:#000000;fill:url(#linearGradient15240);fill-opacity:1;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1100.75,887.36218 0,10.03125 c -0.2461,-0.0181 -0.4992,-0.0312 -0.75,-0.0312 -4.5663,0 -8.4278,3.06835 -9.625,7.25 l -12.375,37.75 22,0 8.375,-28 28.25,0 8.375,28 20,0 -9.0312,-32.75 c -0.9563,-3.33947 -5.7545,-9.13562 -9.9688,-11.34375 l 0,-10.90625 -45.25,0 z"
+       id="path13188"
+       inkscape:connector-curvature="0" />
+    <rect
+       style="color:#000000;fill:url(#linearGradient15237);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect13103"
+       width="50"
+       height="30"
+       x="1085"
+       y="877.36218" />
+    <path
+       style="color:#000000;fill:url(#linearGradient15234);fill-opacity:1;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="M 270 155 C 265.4337 155 261.5722 158.06835 260.375 162.25 L 248 200 L 270 200 L 279.5625 168 L 279.5625 167.9375 C 279.5815 167.8754 279.608 167.81259 279.625 167.75 C 279.8758 166.87399 280 165.95659 280 165 C 280 159.47715 275.5229 155 270 155 z M 310 155 C 304.4772 155 300 159.47715 300 165 C 300 165.95659 300.1242 166.87399 300.375 167.75 L 300.4375 167.9375 C 300.4475 167.9563 300.4275 167.9812 300.4375 168 L 310 200 L 330 200 L 319.625 162.25 C 318.4278 158.06835 314.5663 155 310 155 z "
+       transform="translate(820,742.36218)"
+       id="path13097" />
+    <path
+       style="opacity:0.5;color:#000000;fill:none;stroke:#222222;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1142,882.36218 c 0,0 3,4 8,4 5,0 8,-4 8,-4 z"
+       id="path8488-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cscc" />
+    <path
+       style="color:#000000;fill:#ebf2fd;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1135,877.36218 -20,-10 -10,0 -20,10 z"
+       id="path13169"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot8523-8"
+       style="font-size:30px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:url(#linearGradient15375);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Menlo;-inkscape-font-specification:Menlo Bold"
+       transform="translate(18.999997,1303.3622)"
+       clip-path="url(#clipPath15492)"><flowRegion
+         id="flowRegion8525-1"
+         style="fill:url(#linearGradient9021-0);fill-opacity:1"><rect
+           id="rect8527-5"
+           width="580"
+           height="303"
+           x="1021"
+           y="-529"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:url(#linearGradient9019-6);fill-opacity:1;stroke:none;font-family:Menlo;-inkscape-font-specification:Menlo Bold" /></flowRegion><flowPara
+         id="flowPara8529-9"
+         style="fill:url(#linearGradient15270-8);fill-opacity:1">101010101010100011</flowPara><flowPara
+         id="flowPara8531-7"
+         style="fill:url(#linearGradient15272-3);fill-opacity:1">100010101010011010</flowPara><flowPara
+         id="flowPara8533-2"
+         style="fill:url(#linearGradient15274-2);fill-opacity:1">101010101001010110</flowPara><flowPara
+         id="flowPara8535-4"
+         style="fill:url(#linearGradient15276-3);fill-opacity:1">010111010101011010</flowPara><flowPara
+         id="flowPara8537-7"
+         style="fill:url(#linearGradient15278-3);fill-opacity:1">000101010000110001</flowPara><flowPara
+         id="flowPara8617-3"
+         style="fill:url(#linearGradient15280-7);fill-opacity:1">101010110010101101</flowPara><flowPara
+         id="flowPara8619-9"
+         style="fill:url(#linearGradient15282-7);fill-opacity:1">101010111010101011</flowPara></flowRoot>  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="blahh"
+     style="display:none"
+     sodipodi:insensitive="true"
+     transform="translate(-820,110)">
+    <image
+       y="-104.56463"
+       x="967.5"
+       id="image7297"
+       xlink:href="file:///Users/saman/Desktop/Screen%20Shot%202013-07-30%20at%204.21.02%20PM.png"
+       height="361.12924"
+       width="381"
+       style="opacity:0.25" />
+  </g>
+</svg>
diff --git a/app/assets/images/donate-ad.png b/app/assets/images/donate-ad.png
deleted file mode 100644 (file)
index 6effbfe..0000000
Binary files a/app/assets/images/donate-ad.png and /dev/null differ
diff --git a/app/assets/images/sign-up-illustration-arm.png b/app/assets/images/sign-up-illustration-arm.png
new file mode 100644 (file)
index 0000000..5f78029
Binary files /dev/null and b/app/assets/images/sign-up-illustration-arm.png differ
diff --git a/app/assets/images/sign-up-illustration.png b/app/assets/images/sign-up-illustration.png
new file mode 100644 (file)
index 0000000..0a92b9c
Binary files /dev/null and b/app/assets/images/sign-up-illustration.png differ
diff --git a/app/assets/images/sign-up-illustration.svg b/app/assets/images/sign-up-illustration.svg
new file mode 100644 (file)
index 0000000..7f3a333
--- /dev/null
@@ -0,0 +1,1359 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="580"
+   height="270"
+   id="svg4136"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="sign-up-illustration.svg"
+   inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/sign-up-illustration.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4138">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9009">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9011" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop9013" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8284"
+       inkscape:collect="always">
+      <stop
+         id="stop8286"
+         offset="0"
+         style="stop-color:#b2dbea;stop-opacity:1" />
+      <stop
+         id="stop8288"
+         offset="1"
+         style="stop-color:#93b8e0;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7767">
+      <stop
+         style="stop-color:#b2dbea;stop-opacity:1"
+         offset="0"
+         id="stop7769" />
+      <stop
+         style="stop-color:#7092ff;stop-opacity:1"
+         offset="1"
+         id="stop7771" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7009">
+      <stop
+         style="stop-color:#f4f4ff;stop-opacity:1"
+         offset="0"
+         id="stop7011" />
+      <stop
+         style="stop-color:#f4f4ff;stop-opacity:0;"
+         offset="1"
+         id="stop7013" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7691">
+      <path
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(1.4545455,0,0,1.4545455,-622.81822,-83.09091)"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         sodipodi:ry="110"
+         sodipodi:rx="110"
+         sodipodi:cy="119"
+         sodipodi:cx="1236"
+         id="path7693"
+         style="color:#000000;fill:#c5c5d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7755">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#adadc6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1230.4688,792.26843 c 13.3096,49.6722 -20.4537,112.82556 -47.6876,150.09372 l 152.2188,0 c 0,-68.85715 -43.5157,-127.53233 -104.5312,-150.09372 z"
+         id="path7757"
+         sodipodi:nodetypes="cccc" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter7759"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.8125"
+         id="feGaussianBlur7761" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter7763"
+       x="-0.103344"
+       width="1.206688"
+       y="-0.089630529"
+       height="1.1792611"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.3825"
+         id="feGaussianBlur7765" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8573">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path8575"
+         sodipodi:cx="1236"
+         sodipodi:cy="119"
+         sodipodi:rx="110"
+         sodipodi:ry="110"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         transform="matrix(1.4545455,0,0,1.4545455,-611.81823,-534.09093)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853"
+         sodipodi:open="true" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8675">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient8679);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.81818199;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 1190.4062,-388.15627 a 12.0012,12.0012 0 0 0 -10.0312,4.96875 c -23.0888,31.04416 -73.5,61.84375 -73.5,61.84375 a 12.007739,12.007739 0 0 0 -0.8125,0.5625 12.007739,12.007739 0 0 0 -0.1875,0.125 l -13.875,7.90625 a 4.0175701,4.0175701 0 1 0 4,6.96875 l 5.2188,-2.96875 a 12.007739,12.007739 0 0 0 17.9062,8.0625 c 0,0 52.3016,-30.24185 80.5,-68.15625 a 12.0012,12.0012 0 0 0 -9.2188,-19.3125 z"
+         id="path8677"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8284"
+       id="linearGradient8679"
+       gradientUnits="userSpaceOnUse"
+       x1="1086"
+       y1="139"
+       x2="1125.7982"
+       y2="99.201767"
+       gradientTransform="translate(11.000003,-451.00002)" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8987">
+      <flowRoot
+         xml:space="preserve"
+         id="flowRoot8989"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Menlo;-inkscape-font-specification:Menlo Bold"
+         transform="translate(-173.25,451.00002)"
+         clip-path="none"><flowRegion
+           id="flowRegion8991"><rect
+             id="rect8993"
+             width="580"
+             height="303"
+             x="1021"
+             y="-529"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;stroke:none;font-family:Menlo;-inkscape-font-specification:Menlo Bold" /></flowRegion><flowPara
+           id="flowPara8995">101010101010100011</flowPara><flowPara
+           id="flowPara8997">100010101010011010</flowPara><flowPara
+           id="flowPara8999">101010101001010110</flowPara><flowPara
+           id="flowPara9001">010111010000011010</flowPara><flowPara
+           id="flowPara9003">000101010000110001</flowPara><flowPara
+           id="flowPara9005">101010110010101101</flowPara><flowPara
+           id="flowPara9007">101010111010101011</flowPara></flowRoot>    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9015"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9023"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9025"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9027"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9029"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9031"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9033"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9035"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-8"
+       id="linearGradient7878-9"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-50,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-8">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-3" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-80"
+       id="linearGradient7878-1"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-870,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-80">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-6" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-8-5"
+       id="linearGradient7878-9-6"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-870,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-8-5">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-3-7" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-8-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7009"
+       id="linearGradient9564"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-50,852.36218)"
+       x1="1177.2046"
+       y1="110.20067"
+       x2="1151.0864"
+       y2="155.43863" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7767"
+       id="linearGradient9566"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-50,852.36218)"
+       x1="1200"
+       y1="-30"
+       x2="1200"
+       y2="90" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8284"
+       id="linearGradient9568"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-50,852.36218)"
+       x1="1086"
+       y1="139"
+       x2="1125.7982"
+       y2="99.201767" />
+    <filter
+       inkscape:collect="always"
+       id="filter13004"
+       x="-0.15676734"
+       width="1.3135347"
+       y="-0.31353469"
+       height="1.6270694">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="1.3063945"
+         id="feGaussianBlur13006" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-8-9"
+       id="linearGradient7878-9-9"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-870,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-8-9">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-3-4" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-8-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-8-2">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-3-3" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-8-6" />
+    </linearGradient>
+    <linearGradient
+       y2="802.62952"
+       x2="1097"
+       y1="942.36218"
+       x1="1097"
+       gradientTransform="translate(-1205,-787.20593)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient13058"
+       xlink:href="#linearGradient7872-8-2"
+       inkscape:collect="always" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7755-6">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#adadc6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1230.4688,792.26843 c 13.3096,49.6722 -20.4537,112.82556 -47.6876,150.09372 l 152.2188,0 c 0,-68.85715 -43.5157,-127.53233 -104.5312,-150.09372 z"
+         id="path7757-0"
+         sodipodi:nodetypes="cccc" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter7763-9"
+       x="-0.103344"
+       width="1.206688"
+       y="-0.089630529"
+       height="1.1792611"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.3825"
+         id="feGaussianBlur7765-8" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7691-1">
+      <path
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(1.4545455,0,0,1.4545455,-622.81822,-83.09091)"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         sodipodi:ry="110"
+         sodipodi:rx="110"
+         sodipodi:cy="119"
+         sodipodi:cx="1236"
+         id="path7693-7"
+         style="color:#000000;fill:#c5c5d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter7759-4"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.8125"
+         id="feGaussianBlur7761-1" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient9015-1"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9009-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9011-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop9013-9" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8573-0">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path8575-7"
+         sodipodi:cx="1236"
+         sodipodi:cy="119"
+         sodipodi:rx="110"
+         sodipodi:ry="110"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         transform="matrix(1.4545455,0,0,1.4545455,-611.81823,-534.09093)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853"
+         sodipodi:open="true" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient9023-5"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient9025-9"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient9027-7"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient9029-0"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient9031-3"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient9033-7"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient9035-5"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7767-4"
+       id="linearGradient7773-2"
+       x1="1225.6875"
+       y1="36.5"
+       x2="1225.6875"
+       y2="119"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient7767-4">
+      <stop
+         style="stop-color:#b2dbea;stop-opacity:1"
+         offset="0"
+         id="stop7769-5" />
+      <stop
+         style="stop-color:#7092ff;stop-opacity:1"
+         offset="1"
+         id="stop7771-9" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7767-4-1">
+      <stop
+         style="stop-color:#b2dbea;stop-opacity:1"
+         offset="0"
+         id="stop7769-5-1" />
+      <stop
+         style="stop-color:#7092ff;stop-opacity:1"
+         offset="1"
+         id="stop7771-9-8" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1-9"
+       id="linearGradient9015-1-5"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9009-1-9">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9011-6-0" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop9013-9-3" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8573-0-1">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path8575-7-3"
+         sodipodi:cx="1236"
+         sodipodi:cy="119"
+         sodipodi:rx="110"
+         sodipodi:ry="110"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         transform="matrix(1.4545455,0,0,1.4545455,-611.81823,-534.09093)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853"
+         sodipodi:open="true" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1-9"
+       id="linearGradient9023-5-2"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1-9"
+       id="linearGradient9025-9-4"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1-9"
+       id="linearGradient9027-7-3"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1-9"
+       id="linearGradient9029-0-0"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1-9"
+       id="linearGradient9031-3-0"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1-9"
+       id="linearGradient9033-7-0"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1-9"
+       id="linearGradient9035-5-1"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7691-1-5">
+      <path
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(1.4545455,0,0,1.4545455,-622.81822,-83.09091)"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         sodipodi:ry="110"
+         sodipodi:rx="110"
+         sodipodi:cy="119"
+         sodipodi:cx="1236"
+         id="path7693-7-8"
+         style="color:#000000;fill:#c5c5d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter7759-4-0"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.8125"
+         id="feGaussianBlur7761-1-2" />
+    </filter>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7755-6-7">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#adadc6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1230.4688,792.26843 c 13.3096,49.6722 -20.4537,112.82556 -47.6876,150.09372 l 152.2188,0 c 0,-68.85715 -43.5157,-127.53233 -104.5312,-150.09372 z"
+         id="path7757-0-7"
+         sodipodi:nodetypes="cccc" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter7763-9-4"
+       x="-0.103344"
+       width="1.206688"
+       y="-0.089630529"
+       height="1.1792611"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.3825"
+         id="feGaussianBlur7765-8-0" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7767-2"
+       id="linearGradient7773-0"
+       x1="1225.6875"
+       y1="36.5"
+       x2="1225.6875"
+       y2="119"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient7767-2">
+      <stop
+         style="stop-color:#b2dbea;stop-opacity:1"
+         offset="0"
+         id="stop7769-1" />
+      <stop
+         style="stop-color:#7092ff;stop-opacity:1"
+         offset="1"
+         id="stop7771-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-4"
+       id="linearGradient9015-4"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9009-4">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9011-5" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop9013-7" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8573-8">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path8575-5"
+         sodipodi:cx="1236"
+         sodipodi:cy="119"
+         sodipodi:rx="110"
+         sodipodi:ry="110"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         transform="matrix(1.4545455,0,0,1.4545455,-611.81823,-534.09093)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853"
+         sodipodi:open="true" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-4"
+       id="linearGradient9021"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-4"
+       id="linearGradient9019"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-4"
+       id="linearGradient9023-3"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-4"
+       id="linearGradient9025-5"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-4"
+       id="linearGradient9027-5"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-4"
+       id="linearGradient9029-7"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-4"
+       id="linearGradient9031-7"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-4"
+       id="linearGradient9033-0"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-4"
+       id="linearGradient9035-1"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7691-3">
+      <path
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(1.4545455,0,0,1.4545455,-622.81822,-83.09091)"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         sodipodi:ry="110"
+         sodipodi:rx="110"
+         sodipodi:cy="119"
+         sodipodi:cx="1236"
+         id="path7693-5"
+         style="color:#000000;fill:#c5c5d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter7759-1"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.8125"
+         id="feGaussianBlur7761-6" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-3"
+       id="linearGradient7878-19"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-790,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-3">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-9" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-09"
+       id="linearGradient7878-93"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-09">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-8" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-9" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-10-4"
+       id="linearGradient7878-5-6"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-10-4">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-2-4" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-5-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7775-9"
+       id="linearGradient7781-5"
+       x1="1224.2188"
+       y1="789.35889"
+       x2="1224.2188"
+       y2="942.36212"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7775-9">
+      <stop
+         style="stop-color:#222222;stop-opacity:1"
+         offset="0"
+         id="stop7777-8" />
+      <stop
+         style="stop-color:#adadc6;stop-opacity:0;"
+         offset="1"
+         id="stop7779-49" />
+    </linearGradient>
+    <linearGradient
+       y2="942.36212"
+       x2="1224.2188"
+       y1="789.35889"
+       x1="1224.2188"
+       gradientTransform="translate(30,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient14425"
+       xlink:href="#linearGradient7775-9"
+       inkscape:collect="always" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14931"
+       id="radialGradient14929"
+       cx="1218.1995"
+       cy="124.60332"
+       fx="1218.1995"
+       fy="124.60332"
+       r="110"
+       gradientTransform="matrix(8.9292362e-8,-1.09375,1.0937499,1.4609618e-6,1099.715,1451.4055)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient14931">
+      <stop
+         id="stop14933"
+         offset="0"
+         style="stop-color:#ccf1ff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#ccf1ff;stop-opacity:0;"
+         offset="0.85714281"
+         id="stop14937" />
+      <stop
+         id="stop14935"
+         offset="1"
+         style="stop-color:#789afb;stop-opacity:1" />
+    </linearGradient>
+    <radialGradient
+       r="110"
+       fy="124.60332"
+       fx="1218.1995"
+       cy="124.60332"
+       cx="1218.1995"
+       gradientTransform="matrix(8.9292362e-8,-1.09375,1.0937499,1.4609618e-6,1099.715,1451.4055)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient14955"
+       xlink:href="#linearGradient14931"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="410.53143"
+     inkscape:cy="3.6619607"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1524"
+     inkscape:window-height="817"
+     inkscape:window-x="100"
+     inkscape:window-y="109"
+     inkscape:window-maximized="0"
+     borderlayer="false"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-paths="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-nodes="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4228"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="523,479"
+       id="guide6331" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4141">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-820,-742.36218)">
+    <g
+       id="g14683">
+      <path
+         inkscape:connector-curvature="0"
+         id="path8245"
+         d="m 964.625,854.79968 a 4.0004,4.0004 0 0 0 -3.84375,3.5625 4.0004,4.0004 0 0 0 -2.15625,-0.5625 4.0004,4.0004 0 0 0 -3.78125,4.90625 c 0,0 0.5454,2.1828 2.1875,5.1875 1.6421,3.0047 4.45773,7.22288 9.28125,12.4375 a 4.0025627,4.0025627 0 0 0 6.9375,-2.25 4.0025627,4.0025627 0 0 0 3.75,0.125 c 0.0733,0.22356 0.14387,0.47118 0.21875,0.6875 a 4.0025627,4.0025627 0 1 0 7.5625,-2.625 c -1.9723,-5.69775 -3.8125,-17.53125 -3.8125,-17.53125 a 4.0004,4.0004 0 0 0 -3.84375,-3.46875 4.0004,4.0004 0 0 0 -4.09375,4.65625 c 0,0 0.49861,3.30382 1.3125,7.46875 -2.08696,-2.64336 -3.45886,-4.78178 -4.3125,-6.34375 -1.2954,-2.3703 -1.375,-3.0625 -1.375,-3.0625 a 4.0004,4.0004 0 0 0 -4.03125,-3.1875 z"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#5e74ac;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7542-4-8-0);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+      <g
+         style="fill:#7693dc;fill-opacity:1"
+         transform="translate(31,2)"
+         id="g8240">
+        <path
+           inkscape:connector-curvature="0"
+           id="path8234"
+           transform="translate(-1,850.36218)"
+           d="m 922.625,10.4375 a 4.0004,4.0004 0 0 0 -3.78125,4.90625 c 0,0 0.5454,2.1828 2.1875,5.1875 1.40985,2.579729 3.70701,6.049888 7.375,10.28125 0.11178,0.128944 0.19812,0.275904 0.3125,0.40625 0.11345,0.137051 0.22397,0.284764 0.34375,0.40625 0.15485,0.157057 0.25496,0.252929 0.40625,0.40625 0.28133,0.31274 0.54746,0.61719 0.84375,0.9375 a 4.0025627,4.0025627 0 0 0 0.59375,0.53125 4.0025627,4.0025627 0 0 0 0.0625,0.03125 c 5.98699,6.043061 9.08242,9.018781 11.6875,10.90625 5.06802,3.671953 10.79446,9.23077 29.46875,15.59375 18.67429,6.36298 46.9429,9.60422 85.4688,-0.71875 2.5788,-0.63185 4.8672,-2.33956 6.2187,-4.625 1.3516,-2.28544 1.7513,-8.09198 1.0625,-10.65625 -0.6888,-2.56427 -2.4352,-4.82439 -4.75,-6.125 -2.3148,-1.30061 -5.1703,-1.65166 -7.7188,-0.90625 -35.1951,9.43054 -57.91701,6.16915 -72.81245,1.09375 C 964.69831,33.01835 961.4304,31.785386 957.34375,26.875 951.9003,20.33433 948.89393,16 942.5625,16 l -8.125,0 c -2.53697,0 -4.35949,0.782327 -5.625,2 -0.27387,-0.453136 -0.57102,-0.927833 -0.78125,-1.3125 -1.2954,-2.3703 -1.375,-3.0625 -1.375,-3.0625 A 4.0004,4.0004 0 0 0 922.625,10.4375 z"
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#7693dc;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7542-4-8-0);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" />
+      </g>
+      <path
+         inkscape:connector-curvature="0"
+         clip-path="url(#clipPath8987)"
+         id="path8245-3"
+         d="M 934.625,2.4375 A 4.0004,4.0004 0 0 0 930.78125,6 4.0004,4.0004 0 0 0 928.625,5.4375 a 4.0004,4.0004 0 0 0 -3.78125,4.90625 c 0,0 0.1099,0.36161 0.28125,0.875 a 4.0004,4.0004 0 0 0 -2.5,-0.78125 4.0004,4.0004 0 0 0 -3.78125,4.90625 c 0,0 0.5454,2.1828 2.1875,5.1875 1.40985,2.57973 3.70701,6.04989 7.375,10.28125 0.11178,0.12894 0.19812,0.2759 0.3125,0.40625 0.11345,0.13705 0.22397,0.28476 0.34375,0.40625 0.15485,0.15706 0.25496,0.25293 0.40625,0.40625 0.28133,0.31274 0.54746,0.61719 0.84375,0.9375 a 4.0025627,4.0025627 0 0 0 0.59375,0.53125 4.0025627,4.0025627 0 0 0 0.0625,0.03125 c 5.98699,6.04306 9.08242,9.01878 11.6875,10.90625 5.06802,3.67195 10.79446,9.23077 29.46875,15.59375 18.67429,6.36298 46.9429,9.60422 85.4688,-0.71875 2.5788,-0.63185 4.8672,-2.33956 6.2187,-4.625 1.3516,-2.28544 1.7513,-8.09198 1.0625,-10.65625 -0.6888,-2.56427 -2.4352,-4.82439 -4.75,-6.125 -2.3148,-1.30061 -5.1702,-1.65166 -7.7188,-0.90625 -35.1951,9.43054 -57.91701,6.16915 -72.81245,1.09375 -14.89544,-5.0754 -18.16335,-6.30836 -22.25,-11.21875 -0.96094,-1.154633 -1.78426,-2.150837 -2.625,-3.15625 -1.9499,-5.760197 -3.75,-17.34375 -3.75,-17.34375 A 4.0004,4.0004 0 0 0 947.125,2.90625 4.0004,4.0004 0 0 0 943.03125,7.5625 c 0,0 0.49861,3.30383 1.3125,7.46875 -2.08696,-2.64336 -3.45886,-4.78178 -4.3125,-6.34375 -1.2954,-2.3703 -1.375,-3.0625 -1.375,-3.0625 A 4.0004,4.0004 0 0 0 934.625,2.4375 z"
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.1;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7542-4-8-0);enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         transform="translate(30.000004,852.36218)" />
+      <path
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path8139-4-6-3-6"
+         d="m 975.26569,833.36219 c -4.1421,0 -7.5,3.35787 -7.5,7.5 0,4.14215 7.5,10.5 7.5,10.5 0,0 7.5,-6.35785 7.5,-10.5 0,-4.14213 -3.3579,-7.5 -7.5,-7.5 z m 0.2343,4.5 c 1.6569,0 3,1.34315 3,3 0,1.65686 -1.3431,3 -3,3 -1.65675,0 -3,-1.34314 -3,-3 0,-1.65685 1.34325,-3 3,-3 z"
+         inkscape:connector-curvature="0" />
+      <path
+         transform="matrix(0.75,0,0,0.5,258.75,862.36218)"
+         d="m 955,25 a 10,5 0 1 1 -20,0 10,5 0 1 1 20,0 z"
+         sodipodi:ry="5"
+         sodipodi:rx="10"
+         sodipodi:cy="25"
+         sodipodi:cx="945"
+         id="path8216"
+         style="color:#000000;fill:#3f4767;fill-opacity:0.39215686;fill-rule:nonzero;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter13004);enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path5387-6-5-6"
+         d="m 983.24999,851.86219 c -2.07107,0 -3.75,1.67891 -3.75,3.75001 0,0.37775 0.0679,0.73424 0.17187,1.07809 l -9.34375,9.34376 c -0.34388,-0.1039 -0.70033,-0.17186 -1.07812,-0.17186 -2.07107,0 -3.74999,1.6789 -3.74999,3.75 0,2.07104 1.67892,3.75 3.74999,3.75 2.07107,0 3.75,-1.67896 3.75,-3.75 0,-0.3778 -0.068,-0.73425 -0.17188,-1.07815 l 9.34375,-9.34375 c 0.34388,0.10395 0.70034,0.1719 1.07813,0.1719 2.07106,0 3.75,-1.67895 3.75,-3.74999 0,-2.0711 -1.67894,-3.75001 -3.75,-3.75001 z m 0,2.25001 c 0.82842,0 1.5,0.67155 1.5,1.5 0,0.8284 -0.67158,1.5 -1.5,1.5 -0.82843,0 -1.5,-0.6716 -1.5,-1.5 0,-0.82845 0.67157,-1.5 1.5,-1.5 z m -14,13.99999 c 0.82843,0 1.5,0.67155 1.5,1.5 0,0.8284 -0.67157,1.5 -1.5,1.5 -0.82842,0 -1.5,-0.6716 -1.5,-1.5 0,-0.82845 0.67158,-1.5 1.5,-1.5 z"
+         inkscape:connector-curvature="0" />
+      <path
+         style="color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path5288-4-8-0-3"
+         d="m 945.40433,849.14391 c -1.7936,1.03555 -2.40813,3.32901 -1.3726,5.12261 0.71815,1.24387 2.04645,1.91607 3.3883,1.8687 l 3.43751,5.95394 c -0.71196,1.13839 -0.79395,2.62483 -0.0758,3.8687 1.03552,1.79358 3.32899,2.40813 5.12259,1.37259 1.24386,-0.71814 1.91607,-2.04646 1.86871,-3.3883 l 5.95391,-3.43749 c 1.1384,0.71193 2.62484,0.79394 3.86871,0.0758 1.7936,-1.03553 2.40812,-3.329 1.37259,-5.12259 -0.71815,-1.24387 -2.04643,-1.91608 -3.38828,-1.86871 l -3.4375,-5.95392 c 0.71195,-1.1384 0.79393,-2.62484 0.0758,-3.86871 -1.03554,-1.7936 -3.32899,-2.40813 -5.12259,-1.3726 -1.25899,0.72688 -1.92459,2.07817 -1.85879,3.43672 l -0.10461,0.006 -5.8592,3.38282 c -1.13839,-0.71195 -2.62484,-0.79395 -3.8687,-0.0758 z m 1.125,1.94857 c 0.71744,-0.41421 1.63482,-0.1684 2.04904,0.54904 0.4142,0.71743 0.1684,1.63482 -0.54904,2.04904 -0.71744,0.41421 -1.63482,0.16839 -2.04904,-0.54905 -0.41422,-0.71744 -0.16841,-1.63482 0.54904,-2.04903 z m 11.69133,-6.75 c 0.71745,-0.41422 1.63483,-0.16841 2.04904,0.54904 0.41421,0.71744 0.1684,1.63482 -0.54904,2.04904 -0.71743,0.4142 -1.63482,0.16839 -2.04904,-0.54904 -0.41421,-0.71744 -0.16839,-1.63483 0.54904,-2.04904 z m -7.19762,7.90833 5.95392,-3.4375 c 0.63528,0.3973 1.38559,0.59835 2.13442,0.57191 l 3.4375,5.95393 c -0.39733,0.63527 -0.59837,1.38558 -0.57192,2.13442 l -5.95392,3.43749 c -0.6353,-0.39733 -1.3856,-0.59836 -2.13441,-0.57191 l -3.43751,-5.95393 c 0.39731,-0.63529 0.59835,-1.38559 0.57192,-2.13441 z m 2.25629,10.53301 c 0.71744,-0.41421 1.63481,-0.16842 2.04904,0.54904 0.4142,0.71741 0.16839,1.63481 -0.54904,2.04902 -0.71744,0.41422 -1.63484,0.16839 -2.04904,-0.54903 -0.41423,-0.71745 -0.1684,-1.63482 0.54904,-2.04903 z m 11.69133,-6.75 c 0.71744,-0.41421 1.63482,-0.16842 2.04904,0.54904 0.4142,0.71741 0.1684,1.63482 -0.54904,2.04903 -0.71744,0.41421 -1.63483,0.16838 -2.04904,-0.54903 -0.41422,-0.71746 -0.16839,-1.63483 0.54904,-2.04904 z"
+         inkscape:connector-curvature="0" />
+    </g>
+    <g
+       transform="translate(-3.0000006e-6,5.0000006e-7)"
+       id="g14241">
+      <path
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(1.4545455,0,0,1.4545455,-592.81822,769.27127)"
+         d="M 1126,118.99999 C 1126,58.248672 1175.2487,8.9999972 1236,9 c 60.7513,2.8e-6 110,49.248679 110,110"
+         sodipodi:ry="110"
+         sodipodi:rx="110"
+         sodipodi:cy="119"
+         sodipodi:cx="1236"
+         id="path7176"
+         style="color:#000000;fill:url(#linearGradient7773-0);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <flowRoot
+         clip-path="url(#clipPath8573-8)"
+         transform="translate(19,1303.3622)"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:url(#linearGradient9015-4);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Menlo;-inkscape-font-specification:Menlo Bold"
+         id="flowRoot8523"
+         xml:space="preserve"><flowRegion
+           style="fill:url(#linearGradient9021);fill-opacity:1"
+           id="flowRegion8525"><rect
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:url(#linearGradient9019);fill-opacity:1;stroke:none;font-family:Menlo;-inkscape-font-specification:Menlo Bold"
+             y="-529"
+             x="1021"
+             height="303"
+             width="580"
+             id="rect8527" /></flowRegion><flowPara
+           style="fill:url(#linearGradient9023-3);fill-opacity:1"
+           id="flowPara8529">101010101010100011</flowPara><flowPara
+           style="fill:url(#linearGradient9025-5);fill-opacity:1"
+           id="flowPara8531">100010101010011010</flowPara><flowPara
+           style="fill:url(#linearGradient9027-5);fill-opacity:1"
+           id="flowPara8533">101010101001010110</flowPara><flowPara
+           style="fill:url(#linearGradient9029-7);fill-opacity:1"
+           id="flowPara8535">010111010101011010</flowPara><flowPara
+           style="fill:url(#linearGradient9031-7);fill-opacity:1"
+           id="flowPara8537">000101010000110001</flowPara><flowPara
+           style="fill:url(#linearGradient9033-0);fill-opacity:1"
+           id="flowPara8617">101010110010101101</flowPara><flowPara
+           style="fill:url(#linearGradient9035-1);fill-opacity:1"
+           id="flowPara8619">101010111010101011</flowPara></flowRoot>      <path
+         sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccsccccccc"
+         inkscape:connector-curvature="0"
+         clip-path="url(#clipPath7691-3)"
+         id="path7591"
+         transform="translate(30,852.36218)"
+         d="m 1174,-70 c -6.4317,0.0395 -12.7696,0.4728 -19,1.25 l 0,8.75 5,5 10,0 z m 40.25,4.84375 -0.031,0.15625 7.7812,9 5,0 3,-4 0,-0.28125 c -1.2872,-0.4713 -2.5726,-0.93607 -3.875,-1.375 -0.041,-0.0138 -0.084,-0.01755 -0.125,-0.03125 -1.2576,-0.42471 -2.5104,-0.82436 -3.7812,-1.21875 -1.1271,-0.34978 -2.2683,-0.70623 -3.4063,-1.03125 -0.1871,-0.0531 -0.3752,-0.10379 -0.5625,-0.15625 -1.079,-0.30374 -2.1607,-0.59432 -3.25,-0.875 -0.2478,-0.0638 -0.5017,-0.1249 -0.75,-0.1875 z m -95,5.15625 c -39.4401,14.6674 -71.5429,44.43079 -89.25,82.28125 L 1030,35 l 15,15 0,10 5,0 5,5 0,5 -5,5 0,15 105,0 -10,-10 -20,0 -5,-5 0,-5 -40,-25 -10,0 -10,10 -10,0 0,-15 -5,-5 5,-5 0,-5 -5,0 -10,0 10,-20 15,-5 0,15 5,0 5,-5 0,-10 25,-30 5,0 40,-15 0,-10 -5,-5 z m 91.75,5 6,8 7,0 -8,-8 z m 33.5,0.84375 -2.375,4.15625 -12.125,0 -5.7812,10 5.7812,10 -10,0.3125 -4.4375,4.6875 0,5 8.6563,5 10.7812,0 8.6562,-15 6.3438,0 10,8 1.3438,5 3.6562,0 0,-8 5,3 5,2 5,0 6,-6 -9,-10 -2.125,1 c -0.029,-0.0234 -0.064,-0.0392 -0.094,-0.0625 -0.3359,-0.26835 -0.6619,-0.54681 -1,-0.8125 -0.8033,-0.63134 -1.6219,-1.25882 -2.4374,-1.875 -0.2074,-0.1566 -0.417,-0.31314 -0.625,-0.46875 -0.9966,-0.74524 -1.9858,-1.46514 -3,-2.1875 -0.031,-0.0218 -0.063,-0.0408 -0.094,-0.0625 -0.1103,-0.0784 -0.2332,-0.14058 -0.3438,-0.21875 -0.9382,-0.66399 -1.8596,-1.35587 -2.8124,-2 -0.1442,-0.0974 -0.2931,-0.18434 -0.4376,-0.28125 -0.9169,-0.61558 -1.8508,-1.21555 -2.7812,-1.8125 -0.3292,-0.21107 -0.6691,-0.41628 -1,-0.625 -1.2672,-0.79993 -2.5216,-1.57877 -3.8125,-2.34375 -1.0622,-0.62947 -2.1409,-1.23835 -3.2187,-1.84375 -0.538,-0.302 -1.0834,-0.6103 -1.625,-0.90625 -0.1142,-0.0623 -0.2296,-0.12545 -0.3438,-0.1875 -0.9035,-0.49081 -1.8049,-0.9637 -2.7188,-1.4375 -1.3366,-0.69309 -2.6725,-1.3751 -4.0312,-2.03125 z M 1283,-30 l -3,10 5,5 10,0 0,10 -15,0 0,5 -10,0 -10,-10 -20,0 -5,0 -10,0 -5,5 0,10 -5,0 -10,20 0,5 5,5 0,15 20,20 20,0 5,-5 10,0 10,10 0,10 3.3438,5 56.6562,0 c 0,-44.18275 -17.9207,-84.17069 -46.875,-113.125 -0.6292,-0.62919 -1.2668,-1.25631 -1.9062,-1.875 z m -78,-20 3,5 5,0 -3,-5 z"
+         style="opacity:0.25;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7759-1);enable-background:accumulate" />
+      <path
+         inkscape:connector-curvature="0"
+         id="path7176-41"
+         transform="translate(820,742.36218)"
+         d="M 424.25,44.84375 424.21875,45 432,54 l 5,0 3,-4 0,-0.28125 c -1.2873,-0.4713 -2.5726,-0.93607 -3.875,-1.375 -0.041,-0.0138 -0.084,-0.01755 -0.125,-0.03125 -1.2576,-0.42471 -2.51045,-0.82436 -3.78125,-1.21875 -1.1271,-0.34978 -2.26825,-0.70623 -3.40625,-1.03125 -0.1871,-0.0531 -0.3752,-0.10379 -0.5625,-0.15625 -1.079,-0.30374 -2.1607,-0.59432 -3.25,-0.875 -0.2478,-0.0638 -0.5018,-0.1249 -0.75,-0.1875 z M 421,55 l 6,8 7,0 -8,-8 -5,0 z M 454.5,55.875 452.125,60 442.53125,60 440,60 434.21875,70 440,80 430,80.3125 425.5625,85 l 0,5 8.65625,5 7.34375,0 3.4375,0 8.65625,-15 6.34375,0 10,8 1.34375,5 3.65625,0 0,-8 5,3 5,2 5,0 5,5 10,0 0,10 -15,0 0,5 -10,0 -10,-10 -20,0 -5,0 -4.375,0 -5.625,0 -5,5 0,10 -5,0 -10,20 0,5 5,5 0,10.9375 0,4.0625 20,20 20,0 5,-5 10,0 10,10 0,10 3.34375,5 51.65625,0 5,0 c 0,-51.43766 -24.2837,-97.1986 -62,-126.46875 -0.1548,-0.11296 -0.32195,-0.23072 -0.46875,-0.34375 -0.018,-0.014 -0.0445,-0.01725 -0.0625,-0.03125 -0.7174,-0.55233 -1.42915,-1.11612 -2.15625,-1.65625 -0.053,-0.0397 -0.10255,-0.0854 -0.15625,-0.125 -0.06,-0.0444 -0.13,-0.0771 -0.1875,-0.125 -0.023,-0.0187 -0.0425,-0.0403 -0.0625,-0.0625 -0.023,-0.0174 -0.0395,-0.0451 -0.0625,-0.0625 -0.7324,-0.5397 -1.47745,-1.07211 -2.21875,-1.59375 -0.019,-0.0133 -0.0445,-0.01795 -0.0625,-0.03125 -0.7603,-0.5345 -1.51065,-1.06633 -2.28125,-1.59375 -0.8253,-0.56504 -1.6633,-1.10637 -2.5,-1.65625 -1.673,-1.09976 -3.37775,-2.18082 -5.09375,-3.21875 -0.858,-0.51897 -1.72545,-1.02804 -2.59375,-1.53125 -0.8686,-0.50321 -1.744,-1.0092 -2.625,-1.5 -0.8811,-0.49079 -1.76755,-0.96639 -2.65625,-1.4375 -0.8887,-0.47111 -1.75755,-0.92024 -2.65625,-1.375 C 456.27855,56.74322 455.387,56.3035 454.5,55.875 z M 415,60 l 3,5 5,0 -3,-5 -5,0 z"
+         style="color:#000000;fill:url(#linearGradient7878-19);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         id="path7176-3-8-6"
+         d="m 1285,897.36218 -15,15 -20,0 10,10 20,0 5,-5 10,0 10,10 0,10 5,0 10,-10 15.9688,0 0,-15 -25.9688,-15 -25,0 z"
+         style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccc"
+         id="path7176-4"
+         d="m 1149.25,792.36218 c -39.4401,14.6674 -71.5429,44.43079 -89.25,82.28125 l 0,12.71875 15,15 0,10 5,0 5,5 0,5 -5,5 0,15.00002 105,0 -10,-10.00002 -20,0 -5,-5 0,-5 -40,-25 -10,0 -10,10 -10,0 0,-15 -5,-5 5,-5 0,-5 -5,0 -10,0 10,-20 15,-5 0,15 5,0 5,-5 0,-10 25,-30 5,0 40,-15 0,-10 -5,-5 z"
+         style="color:#000000;fill:url(#linearGradient7878-93);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7176-9"
+         d="m 1204,782.36218 c -6.4317,0.0395 -12.7696,0.4728 -19,1.25 l 0,8.75 5,5 10,0 4,-15 z"
+         style="color:#000000;fill:url(#linearGradient7878-5-6);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path9199"
+         d="m 1100,927.36218 5,0 15,5 0,10 -30,0 z"
+         style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+      <path
+         id="path7176-4-2"
+         d="m 1130,909.86218 0,7.5 10,5 0,10 -10,10 55,0 -10,-10 -20,0 -5,-5 0,-5 -20,-12.5 z"
+         style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7176-4-7"
+         d="m 1149.25,792.36218 c -5.8774,2.18576 -11.5968,4.72945 -17.125,7.5625 l 12.875,7.4375 0,9.375 25,-9.375 0,-10 -5,-5 -15.75,0 z"
+         style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         id="path7176-4-76"
+         d="m 1115,810.08093 c -13.1826,8.9817 -24.9493,19.86488 -34.9063,32.28125 l 14.9063,0 20,-20 0,-12.28125 z"
+         style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+      <path
+         sodipodi:nodetypes="cccc"
+         id="path7176-2"
+         d="m 1260.4688,792.26843 c 13.3096,49.6722 -0.4537,112.82556 -27.6876,150.09372 l 132.2188,0 c 0,-68.85715 -43.5157,-127.53233 -104.5312,-150.09372 z"
+         style="opacity:0.25;color:#000000;fill:url(#linearGradient14425);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         inkscape:connector-curvature="0" />
+    </g>
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.14999999999999999"
+       d="m 1205,897.36218 -15,15 -20,0 10,10 20,0 5,-5 10,0 10,10 0,10 5,0 10,-10 15.9688,0 0,-15 -25.9688,-15 -25,0 z"
+       id="path7176-3-8" />
+    <g
+       id="g9572"
+       inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/sign-up-illustration-arm.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90"
+       transform="translate(80,170)">
+      <g
+         id="g9543">
+        <path
+           style="color:#000000;fill:url(#linearGradient9564);fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+           d="m 1135,942.36218 c -5,40 -35,70.00002 -35,70.00002 l -25,-25.00002 50,-45 z"
+           id="path7007"
+           inkscape:connector-curvature="0"
+           sodipodi:nodetypes="ccccc" />
+        <path
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient9566);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.81818199;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           d="m 1129.4062,915.20593 a 12.0012,12.0012 0 0 0 -10.0312,4.96875 c -23.0888,31.04416 -73.5,61.84375 -73.5,61.84375 a 12.007739,12.007739 0 0 0 -0.8125,0.5625 12.007739,12.007739 0 0 0 -0.1875,0.125 L 1031,990.61218 a 4.0175701,4.0175701 0 1 0 4,6.96875 l 5.2188,-2.96875 a 12.007739,12.007739 0 0 0 17.9062,8.06252 c 0,0 52.3016,-30.24187 80.5,-68.15627 a 12.0012,12.0012 0 0 0 -9.2188,-19.3125 z"
+           id="path6371"
+           inkscape:connector-curvature="0" />
+        <path
+           id="path8280"
+           d="m 1129.4062,915.20593 a 12.0012,12.0012 0 0 0 -10.0312,4.96875 c -23.0888,31.04416 -73.5,61.84375 -73.5,61.84375 a 12.007739,12.007739 0 0 0 -0.8125,0.5625 12.007739,12.007739 0 0 0 -0.1875,0.125 L 1031,990.61218 a 4.0175701,4.0175701 0 1 0 4,6.96875 l 5.2188,-2.96875 a 12.007739,12.007739 0 0 0 17.9062,8.06252 c 0,0 52.3016,-30.24187 80.5,-68.15627 a 12.0012,12.0012 0 0 0 -9.2188,-19.3125 z"
+           style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient9568);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.81818199;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+           inkscape:connector-curvature="0" />
+        <flowRoot
+           xml:space="preserve"
+           id="flowRoot8523-6"
+           style="font-size:30px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Menlo;-inkscape-font-specification:Menlo Bold"
+           transform="translate(-61.000003,1303.3622)"
+           clip-path="url(#clipPath8675)"><flowRegion
+             id="flowRegion8525-6"><rect
+               id="rect8527-8"
+               width="580"
+               height="303"
+               x="1021"
+               y="-529"
+               style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;stroke:none;font-family:Menlo;-inkscape-font-specification:Menlo Bold" /></flowRegion><flowPara
+             id="flowPara8529-8">101010101010100011</flowPara><flowPara
+             id="flowPara8531-5">100010101010011010</flowPara><flowPara
+             id="flowPara8533-5">101010101001010110</flowPara><flowPara
+             id="flowPara8535-9">010111010101011010</flowPara><flowPara
+             id="flowPara8537-3">000101010000110001</flowPara><flowPara
+             id="flowPara8617-9">101010110010101101</flowPara><flowPara
+             id="flowPara8619-0">101010111010101011</flowPara></flowRoot>      </g>
+      <rect
+         y="902.36218"
+         x="1020"
+         height="110"
+         width="130"
+         id="rect9570"
+         style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    </g>
+    <path
+       style="color:#000000;fill:none;stroke:#222222;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.50000000000000000;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0"
+       d="m 1142,882.36218 c 0,0 3,2 8,2 5,0 8,-2 8,-2"
+       id="path8488"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <path
+       transform="matrix(2,0,0,2,-1441,832.36218)"
+       d="m 1305,17.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
+       sodipodi:ry="2.5"
+       sodipodi:rx="2.5"
+       sodipodi:cy="17.5"
+       sodipodi:cx="1302.5"
+       id="path8131-0"
+       style="opacity:0.5;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       transform="matrix(2,0,0,2,-1467,832.36218)"
+       d="m 1305,17.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
+       sodipodi:ry="2.5"
+       sodipodi:rx="2.5"
+       sodipodi:cy="17.5"
+       sodipodi:cx="1302.5"
+       id="path8157-4"
+       style="opacity:0.5;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2831853"
+       sodipodi:start="3.1415927"
+       transform="matrix(1.5000002,0,0,1.5,-649.00018,763.86218)"
+       d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+       sodipodi:ry="110"
+       sodipodi:rx="110"
+       sodipodi:cy="119"
+       sodipodi:cx="1236"
+       id="path7176-1"
+       style="color:#000000;fill:url(#radialGradient14955);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="blahh"
+     style="display:none"
+     sodipodi:insensitive="true"
+     transform="translate(-820,110)">
+    <image
+       y="-104.56463"
+       x="967.5"
+       id="image7297"
+       xlink:href="file:///Users/saman/Desktop/Screen%20Shot%202013-07-30%20at%204.21.02%20PM.png"
+       height="361.12924"
+       width="381"
+       style="opacity:0.25" />
+  </g>
+</svg>
index dea2cccc1bd234c0820121c5c3614a1c8e27fa63..3641c68abc2de153452caea5769eb6a21ba69fae 100644 (file)
@@ -27,9 +27,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="1.4142136"
-     inkscape:cx="82.865988"
-     inkscape:cy="195.08379"
+     inkscape:zoom="2"
+     inkscape:cx="141.24705"
+     inkscape:cy="185.81774"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
        style="color:#000000;fill:#70cd8f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6591-2);enable-background:accumulate" />
     <path
        style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 183,864.36218 0,-4 2,-2 2,0 -2,2 0,4 2,2 -2,0 z"
-       id="path4118"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       inkscape:connector-curvature="0"
-       id="path4120"
-       d="m 196,864.36218 0,-4 -2,-2 -2,0 2,2 0,4 -1,2 1,0 z"
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <path
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 185,858.36218 5,0 0,2 -5,0 z"
-       id="rect4122"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 194,866.36218 -5,0 0,-2 5,0 z"
-       id="rect4126"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="m 190,858.36218 2,2 0,3 -2,0 z"
-       id="path4130"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:nodetypes="ccccc"
-       inkscape:connector-curvature="0"
-       id="path4132"
-       d="m 189,866.36218 -2,-2 0,-3 2,0 z"
-       style="color:#000000;fill:#0000ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+       d="M 185 6 L 183 8 L 183 12 L 185 14 L 187 14 L 185 12 L 185 8 L 190 8 L 190 11 L 192 11 L 192 8 L 190 6 L 187 6 L 185 6 z M 192 6 L 194 8 L 194 12 L 189 12 L 189 9 L 187 9 L 187 12 L 189 14 L 194 14 L 196 12 L 196 8 L 194 6 L 192 6 z "
+       transform="translate(0,852.36218)"
+       id="path4118" />
   </g>
 </svg>
diff --git a/app/assets/images/terms-illustration.png b/app/assets/images/terms-illustration.png
new file mode 100644 (file)
index 0000000..475da0e
Binary files /dev/null and b/app/assets/images/terms-illustration.png differ
diff --git a/app/assets/images/terms-illustration.svg b/app/assets/images/terms-illustration.svg
new file mode 100644 (file)
index 0000000..2bb1aaf
--- /dev/null
@@ -0,0 +1,1620 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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"
+   width="580"
+   height="270"
+   id="svg4136"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="terms-illustration.svg"
+   inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/terms-illustration.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4138">
+    <linearGradient
+       id="linearGradient12085">
+      <stop
+         style="stop-color:#c4c4c4;stop-opacity:1;"
+         offset="0"
+         id="stop12087" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="1"
+         id="stop12089" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient12079"
+       inkscape:collect="always">
+      <stop
+         id="stop12081"
+         offset="0"
+         style="stop-color:#222222;stop-opacity:1;" />
+      <stop
+         id="stop12083"
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient12001">
+      <stop
+         style="stop-color:#222222;stop-opacity:1;"
+         offset="0"
+         id="stop12003" />
+      <stop
+         style="stop-color:#222222;stop-opacity:0;"
+         offset="1"
+         id="stop12005" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient11338">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop11340" />
+      <stop
+         style="stop-color:#dfe9fc;stop-opacity:1"
+         offset="1"
+         id="stop11342" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14931">
+      <stop
+         id="stop14933"
+         offset="0"
+         style="stop-color:#ccf1ff;stop-opacity:0;" />
+      <stop
+         style="stop-color:#ccf1ff;stop-opacity:0;"
+         offset="0.85714281"
+         id="stop14937" />
+      <stop
+         id="stop14935"
+         offset="1"
+         style="stop-color:#789afb;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient14233"
+       inkscape:collect="always">
+      <stop
+         id="stop14235"
+         offset="0"
+         style="stop-color:#a2c9ed;stop-opacity:1;" />
+      <stop
+         id="stop14237"
+         offset="1"
+         style="stop-color:#7a9dfc;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient14223">
+      <stop
+         style="stop-color:#a2c9ed;stop-opacity:1;"
+         offset="0"
+         id="stop14225" />
+      <stop
+         style="stop-color:#7a9dfc;stop-opacity:1"
+         offset="1"
+         id="stop14227" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13250">
+      <stop
+         style="stop-color:#8eb3f5;stop-opacity:1"
+         offset="0"
+         id="stop13252" />
+      <stop
+         style="stop-color:#b2dbea;stop-opacity:0;"
+         offset="1"
+         id="stop13254" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13240">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop13242" />
+      <stop
+         style="stop-color:#ebf2fd;stop-opacity:1"
+         offset="1"
+         id="stop13244" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13198">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop13200" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop13202" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9009">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9011" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop9013" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient8284"
+       inkscape:collect="always">
+      <stop
+         id="stop8286"
+         offset="0"
+         style="stop-color:#b2dbea;stop-opacity:1" />
+      <stop
+         id="stop8288"
+         offset="1"
+         style="stop-color:#93b8e0;stop-opacity:0" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7775">
+      <stop
+         style="stop-color:#222222;stop-opacity:1"
+         offset="0"
+         id="stop7777" />
+      <stop
+         style="stop-color:#adadc6;stop-opacity:0;"
+         offset="1"
+         id="stop7779" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient7767">
+      <stop
+         style="stop-color:#b2dbea;stop-opacity:1"
+         offset="0"
+         id="stop7769" />
+      <stop
+         style="stop-color:#7092ff;stop-opacity:1"
+         offset="1"
+         id="stop7771" />
+    </linearGradient>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7691">
+      <path
+         sodipodi:open="true"
+         sodipodi:end="6.2831853"
+         sodipodi:start="3.1415927"
+         transform="matrix(1.4545455,0,0,1.4545455,-622.81822,-83.09091)"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         sodipodi:ry="110"
+         sodipodi:rx="110"
+         sodipodi:cy="119"
+         sodipodi:cx="1236"
+         id="path7693"
+         style="color:#000000;fill:#c5c5d7;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath7755">
+      <path
+         inkscape:connector-curvature="0"
+         style="color:#000000;fill:#adadc6;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         d="m 1230.4688,792.26843 c 13.3096,49.6722 -20.4537,112.82556 -47.6876,150.09372 l 152.2188,0 c 0,-68.85715 -43.5157,-127.53233 -104.5312,-150.09372 z"
+         id="path7757"
+         sodipodi:nodetypes="cccc" />
+    </clipPath>
+    <filter
+       inkscape:collect="always"
+       id="filter7759"
+       color-interpolation-filters="sRGB">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="5.8125"
+         id="feGaussianBlur7761" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7767"
+       id="linearGradient7773"
+       x1="1225.6875"
+       y1="36.5"
+       x2="1225.6875"
+       y2="119"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7775"
+       id="linearGradient7781"
+       x1="1224.2188"
+       y1="789.35889"
+       x2="1224.2188"
+       y2="942.36212"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872"
+       id="linearGradient7878"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8573">
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path8575"
+         sodipodi:cx="1236"
+         sodipodi:cy="119"
+         sodipodi:rx="110"
+         sodipodi:ry="110"
+         d="M 1126,118.99999 A 110,110 0 0 1 1346,119"
+         transform="matrix(1.4545455,0,0,1.4545455,-611.81823,-534.09093)"
+         sodipodi:start="3.1415927"
+         sodipodi:end="6.2831853"
+         sodipodi:open="true" />
+    </clipPath>
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8675">
+      <path
+         style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient8679);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.81818199;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+         d="m 1190.4062,-388.15627 a 12.0012,12.0012 0 0 0 -10.0312,4.96875 c -23.0888,31.04416 -73.5,61.84375 -73.5,61.84375 a 12.007739,12.007739 0 0 0 -0.8125,0.5625 12.007739,12.007739 0 0 0 -0.1875,0.125 l -13.875,7.90625 a 4.0175701,4.0175701 0 1 0 4,6.96875 l 5.2188,-2.96875 a 12.007739,12.007739 0 0 0 17.9062,8.0625 c 0,0 52.3016,-30.24185 80.5,-68.15625 a 12.0012,12.0012 0 0 0 -9.2188,-19.3125 z"
+         id="path8677"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8284"
+       id="linearGradient8679"
+       gradientUnits="userSpaceOnUse"
+       x1="1086"
+       y1="139"
+       x2="1125.7982"
+       y2="99.201767"
+       gradientTransform="translate(11.000003,-451.00002)" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath8987">
+      <flowRoot
+         xml:space="preserve"
+         id="flowRoot8989"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Menlo;-inkscape-font-specification:Menlo Bold"
+         transform="translate(-173.25,451.00002)"
+         clip-path="none"><flowRegion
+           id="flowRegion8991"><rect
+             id="rect8993"
+             width="580"
+             height="303"
+             x="1021"
+             y="-529"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#ffffff;stroke:none;font-family:Menlo;-inkscape-font-specification:Menlo Bold" /></flowRegion><flowPara
+           id="flowPara8995">101010101010100011</flowPara><flowPara
+           id="flowPara8997">100010101010011010</flowPara><flowPara
+           id="flowPara8999">101010101001010110</flowPara><flowPara
+           id="flowPara9001">010111010000011010</flowPara><flowPara
+           id="flowPara9003">000101010000110001</flowPara><flowPara
+           id="flowPara9005">101010110010101101</flowPara><flowPara
+           id="flowPara9007">101010111010101011</flowPara></flowRoot>    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9015"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9019"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9021"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9023"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9025"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9027"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9029"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9031"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9033"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient9035"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-10"
+       id="linearGradient7878-5"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-10">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-2" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-5" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-80"
+       id="linearGradient7878-1"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-870,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-80">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-6" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-8-5"
+       id="linearGradient7878-9-6"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-870,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-8-5">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-3-7" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-8-7" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-8-9"
+       id="linearGradient7878-9-9"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-870,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-8-9">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-3-4" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-8-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-8-2"
+       id="linearGradient7878-9-8"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-8-2">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-3-3" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-8-6" />
+    </linearGradient>
+    <linearGradient
+       y2="802.62952"
+       x2="1097"
+       y1="942.36218"
+       x1="1097"
+       gradientTransform="translate(-1205,-787.20593)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient13058"
+       xlink:href="#linearGradient7872-8-2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13198"
+       id="linearGradient13220"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0.26794919,1,-171.4763,0)"
+       x1="1075"
+       y1="942.61218"
+       x2="1075"
+       y2="897.61151" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13240"
+       id="linearGradient13246"
+       x1="1023.75"
+       y1="883.11218"
+       x2="1023.75"
+       y2="905.88416"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(80,0)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13250"
+       id="linearGradient13256"
+       x1="210"
+       y1="135"
+       x2="210"
+       y2="145"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-3"
+       id="linearGradient7878-19"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-790,-742.36218)" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7872-3">
+      <stop
+         style="stop-color:#cbeea7;stop-opacity:1;"
+         offset="0"
+         id="stop7874-9" />
+      <stop
+         style="stop-color:#cee8c1;stop-opacity:1"
+         offset="1"
+         id="stop7876-7" />
+    </linearGradient>
+    <linearGradient
+       y2="802.62952"
+       x2="1097"
+       y1="942.36218"
+       x1="1097"
+       gradientTransform="translate(-1030,-792.36218)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient14202"
+       xlink:href="#linearGradient7872-3"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14223"
+       id="linearGradient14229"
+       x1="1104"
+       y1="908.36218"
+       x2="1104"
+       y2="944.48694"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14233"
+       id="linearGradient14231"
+       x1="1104"
+       y1="908.36218"
+       x2="1104"
+       y2="944.48694"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7767-8"
+       id="linearGradient7773-6"
+       x1="1225.6875"
+       y1="36.5"
+       x2="1225.6875"
+       y2="119"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient7767-8">
+      <stop
+         style="stop-color:#b2dbea;stop-opacity:1"
+         offset="0"
+         id="stop7769-3" />
+      <stop
+         style="stop-color:#7092ff;stop-opacity:1"
+         offset="1"
+         id="stop7771-2" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14931"
+       id="radialGradient14929"
+       cx="1218.1995"
+       cy="124.60332"
+       fx="1218.1995"
+       fy="124.60332"
+       r="110"
+       gradientTransform="matrix(8.9292362e-8,-1.09375,1.0937499,1.4609618e-6,1099.715,1451.4055)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15209"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15211"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15213"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15215"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15217"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15219"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15221"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15223"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7775"
+       id="linearGradient15226"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)"
+       x1="1224.2188"
+       y1="789.35889"
+       x2="1224.2188"
+       y2="942.36212" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14223"
+       id="linearGradient15231"
+       gradientUnits="userSpaceOnUse"
+       x1="1104"
+       y1="908.36218"
+       x2="1104"
+       y2="944.48694" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-10"
+       id="linearGradient15249"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872"
+       id="linearGradient15252"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7872-3"
+       id="linearGradient15256"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(30,0)"
+       x1="1097"
+       y1="942.36218"
+       x2="1097"
+       y2="802.62952" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15270"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15272"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15274"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15276"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15278"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15280"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15282"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009"
+       id="linearGradient15284"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15284-1"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9009-6">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9011-6" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop9013-1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15270-8"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15272-3"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15274-2"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15276-3"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15278-3"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15280-7"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-6"
+       id="linearGradient15282-7"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       y2="-533.03516"
+       x2="1184"
+       y1="-405.00003"
+       x1="1184"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient15375"
+       xlink:href="#linearGradient9009-6"
+       inkscape:collect="always" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath15492">
+      <path
+         id="path15494"
+         d="m 1071,-406.00002 c -4.5663,0 -8.4278,3.06835 -9.625,7.25 l -12.375,37.75 22,0 9.5625,-32 0,-0.0625 c 0.019,-0.0621 0.045,-0.12491 0.062,-0.1875 0.2508,-0.87601 0.375,-1.79341 0.375,-2.75 0,-5.52285 -4.4771,-10 -10,-10 z m 40,0 c -5.5228,0 -10,4.47715 -10,10 0,0.95659 0.1242,1.87399 0.375,2.75 l 0.062,0.1875 c 0.01,0.0188 -0.01,0.0437 0,0.0625 l 9.5625,32 20,0 -10.375,-37.75 c -1.1972,-4.18165 -5.0587,-7.25 -9.625,-7.25 z"
+         style="color:#000000;fill:url(#linearGradient15496);fill-opacity:1;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         clip-path="none"
+         inkscape:connector-curvature="0" />
+    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14233"
+       id="linearGradient15496"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(-18.999997,-1303.3622)"
+       x1="1104"
+       y1="908.36218"
+       x2="1104"
+       y2="944.48694" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient13198-1"
+       id="linearGradient15240-1"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0.26794919,1,-171.4763,0)"
+       x1="1075"
+       y1="942.61218"
+       x2="1075"
+       y2="897.61151" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient13198-1">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop13200-1" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0;"
+         offset="1"
+         id="stop13202-6" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient11338"
+       id="linearGradient11385"
+       gradientUnits="userSpaceOnUse"
+       x1="1115"
+       y1="912.36218"
+       x2="1115"
+       y2="947.36218"
+       gradientTransform="matrix(1,0,0,0.74,0,245.01417)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient15284-0"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient9009-1">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop9011-4" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop9013-3" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient15270-4"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient15272-34"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient15274-5"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient15276-6"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient15278-6"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient15280-8"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient15282-2"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       y2="-533.03516"
+       x2="1184"
+       y1="-405.00003"
+       x1="1184"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11524"
+       xlink:href="#linearGradient9009-1"
+       inkscape:collect="always" />
+    <clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath11645">
+      <flowRoot
+         xml:space="preserve"
+         id="flowRoot11647"
+         style="font-size:30px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:url(#linearGradient11685);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Menlo;-inkscape-font-specification:Menlo Bold"
+         transform="translate(-801,561.00002)"
+         clip-path="none"><flowRegion
+           id="flowRegion11649"
+           style="fill:url(#linearGradient11669);fill-opacity:1"><rect
+             id="rect11651"
+             width="580"
+             height="303"
+             x="1021"
+             y="-529"
+             style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:url(#linearGradient11667);fill-opacity:1;stroke:none;font-family:Menlo;-inkscape-font-specification:Menlo Bold" /></flowRegion><flowPara
+           id="flowPara11653"
+           style="fill:url(#linearGradient11671);fill-opacity:1">101010101010100011</flowPara><flowPara
+           id="flowPara11655"
+           style="fill:url(#linearGradient11673);fill-opacity:1">100010101010011010</flowPara><flowPara
+           id="flowPara11657"
+           style="fill:url(#linearGradient11675);fill-opacity:1">101010101001010110</flowPara><flowPara
+           id="flowPara11659"
+           style="fill:url(#linearGradient11677);fill-opacity:1">010111010101011010</flowPara><flowPara
+           id="flowPara11661"
+           style="fill:url(#linearGradient11679);fill-opacity:1">000101010000110001</flowPara><flowPara
+           id="flowPara11663"
+           style="fill:url(#linearGradient11681);fill-opacity:1">101010110010101101</flowPara><flowPara
+           id="flowPara11665"
+           style="fill:url(#linearGradient11683);fill-opacity:1">101010111010101011</flowPara></flowRoot>    </clipPath>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient11667"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient11669"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient11671"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient11673"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient11675"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient11677"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient11679"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient11681"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient11683"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient9009-1"
+       id="linearGradient11685"
+       gradientUnits="userSpaceOnUse"
+       x1="1184"
+       y1="-405.00003"
+       x2="1184"
+       y2="-533.03516" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient14233-1"
+       id="linearGradient15234"
+       gradientUnits="userSpaceOnUse"
+       x1="1104"
+       y1="908.36218"
+       x2="1104"
+       y2="944.48694"
+       gradientTransform="translate(-820,-742.36218)" />
+    <linearGradient
+       id="linearGradient14233-1"
+       inkscape:collect="always">
+      <stop
+         id="stop14235-3"
+         offset="0"
+         style="stop-color:#a2c9ed;stop-opacity:1;" />
+      <stop
+         id="stop14237-4"
+         offset="1"
+         style="stop-color:#7a9dfc;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="200"
+       x2="429.99951"
+       y1="163.87524"
+       x1="429.99951"
+       gradientTransform="translate(-69.9995,0)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11903-7"
+       xlink:href="#linearGradient14233-1-1"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient14233-1-1"
+       inkscape:collect="always">
+      <stop
+         id="stop14235-3-7"
+         offset="0"
+         style="stop-color:#a2c9ed;stop-opacity:1;" />
+      <stop
+         id="stop14237-4-3"
+         offset="1"
+         style="stop-color:#7a9dfc;stop-opacity:1" />
+    </linearGradient>
+    <linearGradient
+       y2="944.48694"
+       x2="1104"
+       y1="908.36218"
+       x1="1104"
+       gradientTransform="translate(-1068,-897.36218)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient11955"
+       xlink:href="#linearGradient14233-1-1"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12001"
+       id="linearGradient12007"
+       x1="1170"
+       y1="936.11218"
+       x2="1158.2526"
+       y2="892.27014"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12001-4"
+       id="linearGradient12007-4"
+       x1="315"
+       y1="200"
+       x2="303.25256"
+       y2="156.15796"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient12001-4">
+      <stop
+         style="stop-color:#222222;stop-opacity:1;"
+         offset="0"
+         id="stop12003-3" />
+      <stop
+         style="stop-color:#222222;stop-opacity:0;"
+         offset="1"
+         id="stop12005-1" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="translate(-1115,-892.36218)"
+       y2="892.27014"
+       x2="1158.2526"
+       y1="936.11218"
+       x1="1170"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient12057"
+       xlink:href="#linearGradient12001-4"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12079"
+       id="linearGradient12076"
+       gradientUnits="userSpaceOnUse"
+       x1="315"
+       y1="200"
+       x2="303.25256"
+       y2="156.15796" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient12085"
+       id="linearGradient12091"
+       gradientUnits="userSpaceOnUse"
+       x1="315"
+       y1="200"
+       x2="299.06372"
+       y2="140.52496" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="390.88798"
+     inkscape:cy="21.690494"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1280"
+     inkscape:window-height="756"
+     inkscape:window-x="88"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     borderlayer="false"
+     inkscape:showpageshadow="false"
+     inkscape:snap-bbox="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:object-paths="false"
+     inkscape:object-nodes="false"
+     inkscape:snap-nodes="true"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4228"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="523,479"
+       id="guide6331" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata4141">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-820,-742.36218)">
+    <g
+       id="g8240"
+       transform="translate(-49,2)"
+       style="fill:#7693dc;fill-opacity:1" />
+    <rect
+       style="opacity:0.15;color:#000000;fill:none;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect9589"
+       width="230"
+       height="60"
+       x="-1050"
+       y="-962.36218"
+       transform="scale(-1,-1)" />
+    <g
+       id="g13213"
+       transform="translate(10,0)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:url(#linearGradient7773);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path7176"
+       sodipodi:cx="1236"
+       sodipodi:cy="119"
+       sodipodi:rx="110"
+       sodipodi:ry="110"
+       d="M 1126,118.99999 C 1126,58.248672 1175.2487,8.9999972 1236,9 c 60.7513,2.8e-6 110,49.248679 110,110"
+       transform="matrix(1.4545455,0,0,1.4545455,-592.81822,769.27127)"
+       sodipodi:start="3.1415927"
+       sodipodi:end="6.2831853"
+       sodipodi:open="true" />
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot8523"
+       style="font-size:30px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.25;color:#000000;fill:url(#linearGradient15284);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Menlo;-inkscape-font-specification:Menlo Bold"
+       transform="translate(19,1303.3622)"
+       clip-path="url(#clipPath8573)"><flowRegion
+         id="flowRegion8525"
+         style="fill:url(#linearGradient9021);fill-opacity:1"><rect
+           id="rect8527"
+           width="580"
+           height="303"
+           x="1021"
+           y="-529"
+           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:url(#linearGradient9019);fill-opacity:1;stroke:none;font-family:Menlo;-inkscape-font-specification:Menlo Bold" /></flowRegion><flowPara
+         id="flowPara8529"
+         style="fill:url(#linearGradient15270);fill-opacity:1">101010101010100011</flowPara><flowPara
+         id="flowPara8531"
+         style="fill:url(#linearGradient15272);fill-opacity:1">100010101010011010</flowPara><flowPara
+         id="flowPara8533"
+         style="fill:url(#linearGradient15274);fill-opacity:1">101010101001010110</flowPara><flowPara
+         id="flowPara8535"
+         style="fill:url(#linearGradient15276);fill-opacity:1">010111010101011010</flowPara><flowPara
+         id="flowPara8537"
+         style="fill:url(#linearGradient15278);fill-opacity:1">000101010000110001</flowPara><flowPara
+         id="flowPara8617"
+         style="fill:url(#linearGradient15280);fill-opacity:1">101010110010101101</flowPara><flowPara
+         id="flowPara8619"
+         style="fill:url(#linearGradient15282);fill-opacity:1">101010111010101011</flowPara></flowRoot>    <path
+       transform="matrix(1.2,0,0,1.2,-425,849.36218)"
+       d="m 1305,17.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
+       sodipodi:ry="2.5"
+       sodipodi:rx="2.5"
+       sodipodi:cy="17.5"
+       sodipodi:cx="1302.5"
+       id="path11322"
+       style="opacity:0.5;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       style="opacity:0.25;color:#000000;fill:#222222;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter7759);enable-background:accumulate"
+       d="m 1174,-70 c -6.4317,0.0395 -12.7696,0.4728 -19,1.25 l 0,8.75 5,5 10,0 z m 40.25,4.84375 -0.031,0.15625 7.7812,9 5,0 3,-4 0,-0.28125 c -1.2872,-0.4713 -2.5726,-0.93607 -3.875,-1.375 -0.041,-0.0138 -0.084,-0.01755 -0.125,-0.03125 -1.2576,-0.42471 -2.5104,-0.82436 -3.7812,-1.21875 -1.1271,-0.34978 -2.2683,-0.70623 -3.4063,-1.03125 -0.1871,-0.0531 -0.3752,-0.10379 -0.5625,-0.15625 -1.079,-0.30374 -2.1607,-0.59432 -3.25,-0.875 -0.2478,-0.0638 -0.5017,-0.1249 -0.75,-0.1875 z m -95,5.15625 c -39.4401,14.6674 -71.5429,44.43079 -89.25,82.28125 L 1030,35 l 15,15 0,10 5,0 5,5 0,5 -5,5 0,15 105,0 -10,-10 -20,0 -5,-5 0,-5 -40,-25 -10,0 -10,10 -10,0 0,-15 -5,-5 5,-5 0,-5 -5,0 -10,0 10,-20 15,-5 0,15 5,0 5,-5 0,-10 25,-30 5,0 40,-15 0,-10 -5,-5 z m 91.75,5 6,8 7,0 -8,-8 z m 33.5,0.84375 -2.375,4.15625 -12.125,0 -5.7812,10 5.7812,10 -10,0.3125 -4.4375,4.6875 0,5 8.6563,5 10.7812,0 8.6562,-15 6.3438,0 10,8 1.3438,5 3.6562,0 0,-8 5,3 5,2 5,0 6,-6 -9,-10 -2.125,1 c -0.029,-0.0234 -0.064,-0.0392 -0.094,-0.0625 -0.3359,-0.26835 -0.6619,-0.54681 -1,-0.8125 -0.8033,-0.63134 -1.6219,-1.25882 -2.4374,-1.875 -0.2074,-0.1566 -0.417,-0.31314 -0.625,-0.46875 -0.9966,-0.74524 -1.9858,-1.46514 -3,-2.1875 -0.031,-0.0218 -0.063,-0.0408 -0.094,-0.0625 -0.1103,-0.0784 -0.2332,-0.14058 -0.3438,-0.21875 -0.9382,-0.66399 -1.8596,-1.35587 -2.8124,-2 -0.1442,-0.0974 -0.2931,-0.18434 -0.4376,-0.28125 -0.9169,-0.61558 -1.8508,-1.21555 -2.7812,-1.8125 -0.3292,-0.21107 -0.6691,-0.41628 -1,-0.625 -1.2672,-0.79993 -2.5216,-1.57877 -3.8125,-2.34375 -1.0622,-0.62947 -2.1409,-1.23835 -3.2187,-1.84375 -0.538,-0.302 -1.0834,-0.6103 -1.625,-0.90625 -0.1142,-0.0623 -0.2296,-0.12545 -0.3438,-0.1875 -0.9035,-0.49081 -1.8049,-0.9637 -2.7188,-1.4375 -1.3366,-0.69309 -2.6725,-1.3751 -4.0312,-2.03125 z M 1283,-30 l -3,10 5,5 10,0 0,10 -15,0 0,5 -10,0 -10,-10 -20,0 -5,0 -10,0 -5,5 0,10 -5,0 -10,20 0,5 5,5 0,15 20,20 20,0 5,-5 10,0 10,10 0,10 3.3438,5 56.6562,0 c 0,-44.18275 -17.9207,-84.17069 -46.875,-113.125 -0.6292,-0.62919 -1.2668,-1.25631 -1.9062,-1.875 z m -78,-20 3,5 5,0 -3,-5 z"
+       transform="translate(30,852.36218)"
+       id="path7591"
+       clip-path="url(#clipPath7691)"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccccscccccccccccccccccccccccccccccccccsccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#linearGradient15256);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1244.25,787.20593 -0.031,0.15625 7.7812,9 5,0 3,-4 0,-0.28125 c -1.2873,-0.4713 -2.5726,-0.93607 -3.875,-1.375 -0.041,-0.0138 -0.084,-0.0175 -0.125,-0.0312 -1.2576,-0.42471 -2.5104,-0.82436 -3.7812,-1.21875 -1.1271,-0.34978 -2.2683,-0.70623 -3.4063,-1.03125 -0.1871,-0.0531 -0.3752,-0.10379 -0.5625,-0.15625 -1.079,-0.30374 -2.1607,-0.59432 -3.25,-0.875 -0.2478,-0.0638 -0.5018,-0.1249 -0.75,-0.1875 z m -3.25,10.15625 6,8 7,0 -8,-8 -5,0 z m 33.5,0.875 -2.375,4.125 -9.5937,0 -2.5313,0 -5.7812,10 5.7812,10 -10,0.3125 -4.4375,4.6875 0,5 8.6563,5 7.3437,0 3.4375,0 8.6563,-15 6.3437,0 10,8 1.3438,5 3.6562,0 0,-8 5,3 5,2 5,0 5,5 10,0 0,10 -15,0 0,5 -10,0 -10,-10 -20,0 -5,0 -4.375,0 -5.625,0 -5,5 0,10 -5,0 -10,20 0,5 5,5 0,10.9375 0,4.0625 20,20 20,0 5,-5 10,0 10,10 0,10 3.3438,5 51.6562,0 5,0 c 0,-51.43766 -24.2837,-97.1986 -62,-126.46875 -0.1548,-0.11296 -0.3219,-0.23072 -0.4687,-0.34375 -0.018,-0.014 -0.045,-0.0172 -0.062,-0.0312 -0.7174,-0.55233 -1.4292,-1.11612 -2.1563,-1.65625 -0.053,-0.0397 -0.1025,-0.0854 -0.1562,-0.125 -0.06,-0.0444 -0.1301,-0.0771 -0.1875,-0.125 -0.023,-0.0187 -0.043,-0.0403 -0.062,-0.0625 -0.023,-0.0174 -0.04,-0.0451 -0.062,-0.0625 -0.7324,-0.5397 -1.4775,-1.07211 -2.2188,-1.59375 -0.019,-0.0133 -0.044,-0.0179 -0.062,-0.0312 -0.7603,-0.5345 -1.5106,-1.06633 -2.2812,-1.59375 -0.8253,-0.56504 -1.6633,-1.10637 -2.5,-1.65625 -1.673,-1.09976 -3.3778,-2.18082 -5.0938,-3.21875 -0.858,-0.51897 -1.7254,-1.02804 -2.5937,-1.53125 -0.8686,-0.50321 -1.7441,-1.0092 -2.625,-1.5 -0.8811,-0.49079 -1.7676,-0.96639 -2.6563,-1.4375 -0.8887,-0.47111 -1.7575,-0.92024 -2.6562,-1.375 -0.8777,-0.44428 -1.7693,-0.884 -2.6563,-1.3125 z m -39.5,4.125 3,5 5,0 -3,-5 -5,0 z"
+       id="path7176-41" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1285,897.36218 -15,15 -20,0 10,10 20,0 5,-5 10,0 10,10 0,10 5,0 10,-10 15.9688,0 0,-15 -25.9688,-15 -25,0 z"
+       id="path7176-3-8" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#linearGradient15252);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1149.25,792.36218 c -39.4401,14.6674 -71.5429,44.43079 -89.25,82.28125 l 0,12.71875 15,15 0,10 5,0 5,5 0,5 -5,5 0,15.00002 105,0 -10,-10.00002 -20,0 -5,-5 0,-5 -40,-25 -10,0 -10,10 -10,0 0,-15 -5,-5 5,-5 0,-5 -5,0 -10,0 10,-20 15,-5 0,15 5,0 5,-5 0,-10 25,-30 5,0 40,-15 0,-10 -5,-5 z"
+       id="path7176-4"
+       sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient12007);fill-opacity:1;stroke:none;stroke-width:9.60000038000000089;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.25000000000000000;fill-rule:nonzero"
+       d="m 1157,892.36218 c -6.1485,0 -11.3033,4.26474 -12.6562,10 l -29.3438,0 0,10 1.9063,0 8.0937,30.00002 55,0 -10,-37.00002 c -1.8732,-6.93102 -5.8203,-13 -13,-13 z"
+       id="path11973"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sccccccss" />
+    <path
+       inkscape:connector-curvature="0"
+       style="color:#000000;fill:url(#linearGradient15249);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1204,782.36218 c -6.4317,0.0395 -12.7696,0.4728 -19,1.25 l 0,8.75 5,5 10,0 4,-15 z"
+       id="path7176-9" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1149.25,792.36218 c -5.8774,2.18576 -11.5968,4.72945 -17.125,7.5625 l 12.875,7.4375 0,9.375 25,-9.375 0,-10 -5,-5 -15.75,0 z"
+       id="path7176-4-7" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1115,810.08093 c -13.1826,8.9817 -24.9493,19.86488 -34.9063,32.28125 l 14.9063,0 20,-20 0,-12.28125 z"
+       id="path7176-4-76" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.25;color:#000000;fill:url(#linearGradient15226);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1260.4688,792.26843 c 13.3096,49.6722 -0.4537,112.82556 -27.6876,150.09372 l 132.2188,0 c 0,-68.85715 -43.5157,-127.53233 -104.5312,-150.09372 z"
+       id="path7176-2"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:open="true"
+       sodipodi:end="6.2831853"
+       sodipodi:start="3.1415927"
+       transform="matrix(1.5000002,0,0,1.5,-649.00018,763.86218)"
+       d="M 1126,118.99999 C 1126,58.248672 1175.2487,8.9999972 1236,9 c 60.7513,2.8e-6 110,49.248679 110,110"
+       sodipodi:ry="110"
+       sodipodi:rx="110"
+       sodipodi:cy="119"
+       sodipodi:cx="1236"
+       id="path7176-1"
+       style="color:#000000;fill:url(#radialGradient14929);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.5;color:#000000;fill:#222222;fill-opacity:1;stroke:none;stroke-width:8;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path8131"
+       sodipodi:cx="1302.5"
+       sodipodi:cy="17.5"
+       sodipodi:rx="2.5"
+       sodipodi:ry="2.5"
+       d="m 1305,17.5 a 2.5,2.5 0 1 1 -5,0 2.5,2.5 0 1 1 5,0 z"
+       transform="matrix(1.2,0,0,1.2,-399,849.36218)" />
+    <path
+       style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1100,927.36218 5,0 15,5 0,10 -30,0 z"
+       id="path9199"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.15;color:#000000;fill:#9ed184;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1130,909.86218 0,7.5 10,5 0,10 -10,10 55,0 -10,-10 -20,0 -5,-5 0,-5 -20,-12.5 z"
+       id="path7176-4-2" />
+    <path
+       style="opacity:0.5;color:#000000;fill:none;stroke:#222222;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1142,883.36218 c 0,0 3,1 8,1 5,0 8,-1 8,-1"
+       id="path8488-2"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:0.47058824;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect10762"
+       width="18"
+       height="9"
+       x="1155"
+       y="864.36218"
+       rx="2"
+       ry="2" />
+    <rect
+       y="864.36218"
+       x="1126"
+       height="9"
+       width="18"
+       id="rect11289"
+       style="color:#000000;fill:#ffffff;fill-opacity:0.47058824;fill-rule:nonzero;stroke:#ffffff;stroke-width:2;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       rx="2"
+       ry="2" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect11291"
+       width="11"
+       height="2"
+       x="1144"
+       y="866.36218" />
+    <path
+       style="color:#000000;fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1174,867.36218 c 0,0 7.6667,0 9,0 2,0 2,2 2,2"
+       id="path11293"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="csc" />
+    <path
+       style="color:#000000;fill:url(#linearGradient11385);fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 1095,905.36218 55,0 10,37 -55,0 z"
+       id="rect11324"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect11389"
+       width="42"
+       height="13.000003"
+       x="1095"
+       y="892.36218" />
+    <path
+       style="color:#000000;fill:url(#linearGradient12091);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:9.60000038;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 317,150 c -6.14848,0 -11.98544,4.14562 -12.65625,10 L 304,163 l -29,0 0,2 0,5 1.4375,0 8.5625,30 9.375,0 -8.03125,-30 38.65625,0 0,-7 5,0 c 0,-7.1797 -5.8203,-13 -13,-13 z"
+       transform="translate(820,742.36218)"
+       id="path11396"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="sscccccccccccs" />
+    <path
+       style="color:#000000;fill:url(#linearGradient11903-7);fill-opacity:1;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;fill-rule:nonzero"
+       d="M 273 155 C 268.4337 155 264.5722 158.06835 263.375 162.25 L 251 200 L 273 200 L 282.5625 168 L 282.5625 167.9375 C 282.5815 167.8754 282.608 167.81259 282.625 167.75 C 282.8758 166.87399 283 165.95659 283 165 C 283 159.47715 278.5229 155 273 155 z M 326 155 C 320.4771 155 316 159.47715 316 165 C 316 165.95659 316.1242 166.87399 316.375 167.75 C 316.392 167.81259 316.4185 167.8754 316.4375 167.9375 L 316.4375 168 L 326 200 L 348 200 L 335.625 162.25 C 334.4278 158.06835 330.5663 155 326 155 z "
+       transform="translate(820,742.36218)"
+       id="path10760" />
+    <path
+       transform="matrix(1.7333333,0,0,-1.7333333,538.00001,1178.3622)"
+       d="m 330,157.5 a 7.5,7.5 0 1 1 -15,0 l 7.5,0 z"
+       sodipodi:ry="7.5"
+       sodipodi:rx="7.5"
+       sodipodi:cy="157.5"
+       sodipodi:cx="322.5"
+       id="path11387"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc"
+       sodipodi:start="0"
+       sodipodi:end="3.1415927" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:20;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;opacity:0.25"
+       d="M 273 155 C 268.4337 155 264.5722 158.06835 263.375 162.25 L 251 200 L 273 200 L 282.5625 168 L 282.5625 167.9375 C 282.5815 167.8754 282.608 167.81259 282.625 167.75 C 282.8758 166.87399 283 165.95659 283 165 C 283 159.47715 278.5229 155 273 155 z M 326 155 C 320.4771 155 316 159.47715 316 165 C 316 165.95659 316.1242 166.87399 316.375 167.75 C 316.392 167.81259 316.4185 167.8754 316.4375 167.9375 L 316.4375 168 L 326 200 L 348 200 L 335.625 162.25 C 334.4278 158.06835 330.5663 155 326 155 z "
+       transform="translate(820,742.36218)"
+       id="path11526"
+       clip-path="url(#clipPath11645)" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer2"
+     inkscape:label="blahh"
+     style="display:none"
+     sodipodi:insensitive="true"
+     transform="translate(-820,110)">
+    <image
+       y="-104.56463"
+       x="967.5"
+       id="image7297"
+       xlink:href="file:///Users/saman/Desktop/Screen%20Shot%202013-07-30%20at%204.21.02%20PM.png"
+       height="361.12924"
+       width="381"
+       style="opacity:0.25" />
+  </g>
+</svg>
diff --git a/app/assets/images/welcome-sprite.png b/app/assets/images/welcome-sprite.png
new file mode 100644 (file)
index 0000000..969c53f
Binary files /dev/null and b/app/assets/images/welcome-sprite.png differ
diff --git a/app/assets/images/welcome-sprite.svg b/app/assets/images/welcome-sprite.svg
new file mode 100644 (file)
index 0000000..0151c5c
--- /dev/null
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="1000"
+   height="500"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="welcome-sprite.svg"
+   inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/welcome-sprite.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="424.69193"
+     inkscape:cy="435.3413"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1369"
+     inkscape:window-height="1036"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-nodes="true"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="true">
+    <inkscape:grid
+       type="xygrid"
+       id="grid2985"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="100,530"
+       id="guide11961" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="200,540"
+       id="guide11963" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="300,550"
+       id="guide11977" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="400,600"
+       id="guide11979" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="500,580"
+       id="guide11981" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="600,500"
+       id="guide11983" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="700,500"
+       id="guide11985" />
+    <sodipodi:guide
+       orientation="-0.79335322,-0.60876159"
+       position="575.00001,439.99998"
+       id="guide12971" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="420,400"
+       id="guide3038" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-552.36218)">
+    <g
+       id="g11955"
+       transform="translate(0,-3)" />
+    <path
+       inkscape:export-ydpi="90"
+       inkscape:export-xdpi="90"
+       inkscape:export-filename="/Users/saman/work_repos/osm-redesign/renders/share-1.png"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:connector-curvature="0"
+       id="path6918-2"
+       d="m -153,412.86218 0,-2.00001 10,-3.99999 2,10e-6 0,1.99998 -4,10 -2,1e-5 0,-6 z"
+       style="color:#000000;fill:#70cd8f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;filter:url(#filter6591-2);enable-background:accumulate" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#70cd8f;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2987"
+       sodipodi:cx="42.5"
+       sodipodi:cy="42.5"
+       sodipodi:rx="42.5"
+       sodipodi:ry="42.5"
+       d="m 85,42.5 a 42.5,42.5 0 1 1 -85,0 42.5,42.5 0 1 1 85,0 z"
+       transform="matrix(1.0588235,0,0,1.0588235,5,557.36218)" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#cd7070;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2987-7"
+       sodipodi:cx="42.5"
+       sodipodi:cy="42.5"
+       sodipodi:rx="42.5"
+       sodipodi:ry="42.5"
+       d="m 85,42.5 a 42.5,42.5 0 1 1 -85,0 42.5,42.5 0 1 1 85,0 z"
+       transform="matrix(1.0588235,0,0,1.0588235,105,557.36218)" />
+    <path
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 135,582.36218 -2,0 -3,3 0,2 15,15 -15,15 0,2 3,3 2,0 15,-15 15,15 2,0 3,-3 0,-2 -15,-15 15,-15 0,-2 -3,-3 -2,0 -15,15 z"
+       id="rect3761-9"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccccccccccccccc" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2987-7-7-1"
+       sodipodi:cx="42.5"
+       sodipodi:cy="42.5"
+       sodipodi:rx="42.5"
+       sodipodi:ry="42.5"
+       d="m 85,42.5 a 42.5,42.5 0 1 1 -85,0 42.5,42.5 0 1 1 85,0 z"
+       transform="matrix(0.3529412,0,0,0.3529412,235,587.36218)" />
+    <path
+       style="opacity:0.5;color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.05882347;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 519.72811,582.91357 19.83383,-15.21904 40.43807,49.66766 -19.83383,15.21904 z"
+       id="rect4144"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 510.59669,571.01327 19.83383,-15.21904 6.08761,7.93353 -19.83383,15.21904 z"
+       id="rect4174"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:10;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 563.20997,636.54797 19.83384,-15.21903 1.19788,17.98791 -3.96676,3.04381 z"
+       id="path4182"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccc" />
+    <path
+       sodipodi:type="arc"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="path2987-7-7-2"
+       sodipodi:cx="42.5"
+       sodipodi:cy="42.5"
+       sodipodi:rx="42.5"
+       sodipodi:ry="42.5"
+       d="m 85,42.5 a 42.5,42.5 0 1 1 -85,0 42.5,42.5 0 1 1 85,0 z"
+       transform="matrix(1.0588235,0,0,1.0588235,605,557.36218)" />
+    <path
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       d="m 425.00002,639.36218 -20.00002,-20 0,-29 20.00003,-20.00001 67.99997,10e-6 2,2 0,65 -1.99998,2 z"
+       id="rect11998"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="ccccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 379.30233,557.36218 c -8.6696,0 -15.69768,7.02808 -15.69768,15.69767 0,1.58143 0.28446,3.07359 0.71948,4.51309 l -39.11337,39.11337 c -1.4395,-0.43502 -2.93166,-0.71948 -4.51309,-0.71948 -8.66959,0 -15.69767,7.02808 -15.69767,15.69768 0,8.66959 7.02808,15.69767 15.69767,15.69767 8.6696,0 15.69768,-7.02808 15.69768,-15.69767 0,-1.58143 -0.28446,-3.07359 -0.71948,-4.51309 l 39.11337,-39.11337 c 1.4395,0.43502 2.93166,0.71948 4.51309,0.71948 8.66959,0 15.69767,-7.02808 15.69767,-15.69768 0,-8.66959 -7.02808,-15.69767 -15.69767,-15.69767 z m 0,9.4186 c 3.46782,0 6.27907,2.81125 6.27907,6.27907 0,3.46783 -2.81125,6.27907 -6.27907,6.27907 -3.46783,0 -6.27907,-2.81124 -6.27907,-6.27907 0,-3.46782 2.81124,-6.27907 6.27907,-6.27907 z m -58.60466,58.60466 c 3.46783,0 6.27907,2.81124 6.27907,6.27907 0,3.46782 -2.81124,6.27907 -6.27907,6.27907 -3.46782,0 -6.27907,-2.81125 -6.27907,-6.27907 0,-3.46783 2.81125,-6.27907 6.27907,-6.27907 z"
+       id="path5387-6-5"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 250,557.36218 c -20.7105,0 -37.5,16.78935 -37.5,37.5 0,20.71072 37.5,52.5 37.5,52.5 0,0 37.5,-31.78928 37.5,-52.5 0,-20.71065 -16.7895,-37.5 -37.5,-37.5 z m 1.1715,22.5 c 8.2845,0 15,6.71572 15,15 0,8.28427 -6.7155,15 -15,15 -8.28375,0 -15,-6.71573 -15,-15 0,-8.28428 6.71625,-15 15,-15 z"
+       id="path8139-4-6-3-5"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <path
+       sodipodi:nodetypes="ccccccccccccc"
+       inkscape:connector-curvature="0"
+       id="path12963"
+       d="m 31,598.36218 -2,0 -3,3 0,2 14,14 5,5 5,-5 25,-25 0,-2 -3,-3 -2,0 -25,25 z"
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
+    <g
+       id="g12979">
+      <path
+         transform="matrix(1.0666649,0,0,1.0666649,-20.332779,546.02902)"
+         d="m 335,80 a 15,15 0 1 1 -30,0 15,15 0 1 1 30,0 z"
+         sodipodi:ry="15"
+         sodipodi:rx="15"
+         sodipodi:cy="80"
+         sodipodi:cx="320"
+         id="path12975"
+         style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:16;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         sodipodi:type="arc" />
+      <path
+         sodipodi:type="arc"
+         style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:16;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+         id="path12977"
+         sodipodi:cx="320"
+         sodipodi:cy="80"
+         sodipodi:rx="15"
+         sodipodi:ry="15"
+         d="m 335,80 a 15,15 0 1 1 -30,0 15,15 0 1 1 30,0 z"
+         transform="matrix(0.46666693,0,0,0.46666693,171.66658,594.02886)" />
+    </g>
+    <path
+       transform="matrix(1.0588235,0,0,1.0588235,605,557.36218)"
+       d="m 85,42.5 a 42.5,42.5 0 1 1 -85,0 42.5,42.5 0 1 1 85,0 z"
+       sodipodi:ry="42.5"
+       sodipodi:rx="42.5"
+       sodipodi:cy="42.5"
+       sodipodi:cx="42.5"
+       id="path16825"
+       style="color:#000000;fill:#7092ff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       sodipodi:type="arc" />
+    <text
+       xml:space="preserve"
+       style="font-size:60px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:125%;letter-spacing:0px;word-spacing:0px;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Helvetica Neue;-inkscape-font-specification:Helvetica Neue Bold"
+       x="633.32001"
+       y="624.29218"
+       id="text16827"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan16829"
+         x="633.32001"
+         y="624.29218">?</tspan></text>
+    <rect
+       style="color:#000000;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect3053"
+       width="10"
+       height="15.000005"
+       x="415"
+       y="597.36218"
+       rx="3"
+       ry="2.2500007" />
+  </g>
+</svg>
index a33e281ce8e0762bfcc64faa693adebfc30b7911..2b8bc5d26cb0d1ddf12db5ce5849eeaed11e1832 100644 (file)
@@ -4,6 +4,7 @@
 //= require jquery.cookie
 //= require jquery.throttle-debounce
 //= require bootstrap.tooltip
+//= require bootstrap.dropdown
 //= require augment
 //= require osm
 //= require leaflet
@@ -16,7 +17,6 @@
 //= require oauth
 //= require piwik
 //= require map
-//= require menu
 //= require sidebar
 //= require richtext
 //= require geocoder
@@ -95,26 +95,25 @@ function updatelinks(loc, zoom, layers, bounds, object) {
     }
 
     link.href = href;
-
-    var minzoom = $(link).data("minzoom");
-    if (minzoom) {
-      var name = link.id.replace(/anchor$/, "");
-      $(link).off("click.minzoom");
-      if (zoom >= minzoom) {
-        $(link)
-          .attr("title", I18n.t("javascripts.site." + name + "_tooltip"))
-          .removeClass("disabled");
-      } else {
-        $(link)
-          .attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip"))
-          .addClass("disabled")
-          .on("click.minzoom", function () {
-            alert(I18n.t("javascripts.site." + name + "_zoom_alert"));
-            return false;
-          });
-      }
-    }
   });
+
+  var editDisabled = zoom < 13;
+  $('#edit_tab')
+    .tooltip({placement: 'bottom'})
+    .off('click.minzoom')
+    .on('click.minzoom', function() { return !editDisabled; })
+    .toggleClass('disabled', editDisabled)
+    .attr('data-original-title', editDisabled ?
+      I18n.t('javascripts.site.edit_disabled_tooltip') : '');
+
+  var historyDisabled = zoom < 11;
+  $('#history_tab')
+    .tooltip({placement: 'bottom'})
+    .off('click.minzoom')
+    .on('click.minzoom', function() { return !historyDisabled; })
+    .toggleClass('disabled', historyDisabled)
+    .attr('data-original-title', historyDisabled ?
+      I18n.t('javascripts.site.history_disabled_tooltip') : '');
 }
 
 // generate a cookie-safe string of map state
index 5d2412183040ddcb76621aa843bbc829ec36eaac..11818a1712c513421221455c2c3f209c488b7c01 100644 (file)
@@ -23,7 +23,7 @@ $(document).ready(function () {
     }).addTo(map);
 
     $("#loading").hide();
-    $("#browse_map .geolink").show();
+    $("#browse_map .secondary-actions").show();
 
     $("a[data-editor=remote]").click(function () {
       return remoteEditHandler(bbox);
@@ -41,7 +41,7 @@ $(document).ready(function () {
     bbox = map.getBounds();
 
     $("#loading").hide();
-    $("#browse_map .geolink").show();
+    $("#browse_map .secondary-actions").show();
 
     $("a[data-editor=remote]").click(function () {
       return remoteEditHandler(bbox);
@@ -61,7 +61,7 @@ $(document).ready(function () {
       zoom: true,
       callback: function(extent) {
         $("#loading").hide();
-        $("#browse_map .geolink").show();
+        $("#browse_map .secondary-actions").show();
 
         if (extent) {
           $("a.bbox[data-editor=remote]").click(function () {
@@ -82,7 +82,4 @@ $(document).ready(function () {
       }
     });
   }
-
-  createMenu("area_edit", "area_edit_menu", "right");
-  createMenu("object_edit", "object_edit_menu", "right");
 });
index e46ca6d9d09d4483ace3474e5ca5299434e01465..2a704f72464f8d697fe02f8b91bd592855b3ac46 100644 (file)
@@ -158,6 +158,20 @@ $(document).ready(function () {
     remoteEditHandler(map.getBounds());
   }
 
+  if (OSM.params().edit_help) {
+    $('#editanchor')
+      .removeAttr('title')
+      .tooltip({
+        placement: 'bottom',
+        title: I18n.t('javascripts.edit_help')
+      })
+      .tooltip('show');
+
+    $('body').one('click', function() {
+      $('#editanchor').tooltip('hide');
+    });
+  }
+
   initializeSearch(map);
   initializeExport(map);
   initializeBrowse(map, params);
diff --git a/app/assets/javascripts/menu.js b/app/assets/javascripts/menu.js
deleted file mode 100644 (file)
index a01fc39..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Open a menu.
- */
-function openMenu(anchor, menu, align) {
-  var anchorPosition = anchor.offset();
-  var offset;
-
-  if (align == "left") {
-    offset = 0;
-  } else if (align == "right") {
-    offset = menu.outerWidth() - anchor.outerWidth();
-  }
-
-  menu.show();
-
-  menu.offset({
-    top: anchorPosition.top + anchor.outerHeight(),
-    left: anchorPosition.left - offset
-  });
-}
-
-/*
- * Setup a menu, triggered by hovering over an anchor for a given time.
- */
-function createMenu(anchorid, menuid, align) {
-  var $anchor = $("#" + anchorid);
-  var $arrow = $("#" + anchorid + " .menuicon");
-  var $menu = $("#" + menuid);
-  var $page = $(":not(#" + menuid + ", #" + anchorid + ")");
-
-  function hide() {
-    $menu.hide();
-    $page.off("click", hide);
-  }
-
-  $arrow.click(function(e) {
-    if ($anchor.is(":not(.disabled)")) {
-      e.stopPropagation();
-      e.preventDefault();
-      if ($menu.is(":visible")) {
-        $menu.hide();
-        $page.off("click", hide);
-      } else {
-        openMenu($anchor, $menu.show(), align);
-        $page.on("click", hide);
-      }
-    }
-  });
-}
diff --git a/app/assets/javascripts/welcome.js b/app/assets/javascripts/welcome.js
new file mode 100644 (file)
index 0000000..56c454a
--- /dev/null
@@ -0,0 +1,47 @@
+$(document).ready(function() {
+  var params = OSM.params();
+
+  if (params.lat && params.lon) {
+    params.lat = parseFloat(params.lat);
+    params.lon = parseFloat(params.lon);
+    params.zoom = params.zoom || 17;
+
+    var url = '/edit';
+
+    if (params.editor) {
+      url += '?editor=' + params.editor;
+    }
+
+    url += OSM.formatHash(params);
+
+    $('.start-mapping').attr('href', url);
+
+  } else if (navigator.geolocation) {
+    function geoSuccess(position) {
+      window.location = '/edit' + OSM.formatHash({
+        zoom: 17,
+        lat: position.coords.latitude,
+        lon: position.coords.longitude
+      });
+    }
+
+    $('.start-mapping').on('click', function(e) {
+      e.preventDefault();
+
+      $('.start-mapping')
+        .addClass('loading');
+
+      // handle firefox's weird implementation
+      // https://bugzilla.mozilla.org/show_bug.cgi?id=675533
+      window.setTimeout(manualEdit, 4000);
+
+      navigator.geolocation.getCurrentPosition(geoSuccess, manualEdit);
+    });
+  } else {
+    manualEdit();
+  }
+
+  function manualEdit() {
+    window.location = '/?edit_help=1'
+  }
+});
index a73c8e86d86799d8a0088a5c053bde369aeba3b7..c2f642edc52f539ffd7b8ceeef1f85d790506468 100644 (file)
@@ -57,6 +57,37 @@ abbr, acronym {
     clear: both;
 }
 
+/* Basic grid */
+
+.col0    { float:left; width:04.1666%; }
+.col1    { float:left; width:08.3333%; }
+.col2    { float:left; width:16.6666%; }
+.col3    { float:left; width:25.0000%; }
+.col4    { float:left; width:33.3333%; }
+.col5    { float:left; width:41.6666%; }
+.col6    { float:left; width:50.0000%; }
+.col7    { float:left; width:58.3333%; }
+.col8    { float:left; width:66.6666%; }
+.col9    { float:left; width:75.0000%; }
+.col10   { float:left; width:83.3333%; }
+.col11   { float:left; width:91.6666%; }
+.col12   { width:100%; }
+
+.margin0  { margin-left:04.1666%; }
+.margin1  { margin-left:08.3333%; }
+.margin2  { margin-left:16.6666%; }
+.margin3  { margin-left:25.0000%; }
+.margin4  { margin-left:33.3333%; }
+.margin5  { margin-left:41.6666%; }
+.margin6  { margin-left:50.0000%; }
+.margin7  { margin-left:58.3333%; }
+.margin8  { margin-left:66.6666%; }
+.margin9  { margin-left:75.0000%; }
+.margin10 { margin-left:83.3333%; }
+.margin11 { margin-left:91.6666%; }
+.margin12 { margin-left:100.0000%; }
+
+.fillL { background-color: white; }
 /* Default rules for the body of every page */
 
 * {
@@ -171,6 +202,7 @@ h6:first-child {
 .icon.close       { background-position: -200px 0; }
 .icon.check       { background-position: -220px 0; }
 .icon.note        { background-position: -240px 0; }
+.icon.gear        { background-position: -260px 0; }
 
 /* Rules for links */
 
@@ -441,7 +473,11 @@ a.donate {
   height: 30px;
   border-bottom: 1px solid #ccc;
   background: white;
-  z-index: 100;
+  z-index: 1001;
+
+  .caret {
+    margin-top: 10px;
+  }
 }
 
 .site-edit #top-bar,
@@ -455,49 +491,57 @@ a.donate {
 
 #tabnav {
   height: 29px;
-  margin-bottom:0;
-  overflow: hidden;
-  li {
-    display: inline;
-  }
-  a, a:link, a:visited {
+  margin-bottom: 0;
+
+  > li {
     float: left;
+
+    > * {
+      padding: 3px $lineheight/2;
+    }
+  }
+
+  a.tab {
+    display: inline-block;
     font-weight: bold;
-    padding: 3px $lineheight/2;
     text-decoration: none;
     color: #333;
-    float: left;
-    margin-right: 1px;
+
     -webkit-transition: color 200ms ease-in;
        -moz-transition: color 200ms ease-in;
          -o-transition: color 200ms ease-in;
             transition: color 200ms ease-in;
+
+    &:hover {
+      text-decoration: underline;
+    }
   }
-}
 
-.site-index #tabnav a#viewanchor,
-.site-edit #tabnav a#editanchor,
-.changeset-list #tabnav a#historyanchor {
-  border-bottom: 1px solid #aaa;
-  background: #9ed485;
-  color: #000;
-}
+  .disabled a {
+    color: #ccc;
+    cursor: default;
 
-#tabnav a:link:hover, #tabnav a:visited:hover {
-  text-decoration: underline;
-}
+    &:hover {
+      text-decoration: none;
+    }
 
-#tabnav a:link.disabled,
-#tabnav a:visited.disabled,
-#tabnav a:link:hover.disabled,
-#tabnav a:visited:hover.disabled {
-  color: #ccc;
-  cursor: default;
-  &:hover {
-    text-decoration: none;
+    .caret {
+      border-top-color: #ccc;
+    }
+  }
+
+  .dropdown {
+    height: 29px;
   }
 }
 
+.site-index #view_tab,
+.site-edit #edit_tab,
+.changeset-list #history_tab {
+  background: #9ed485;
+  color: #000;
+}
+
 /* Utility for styling notification numbers */
 
 .count-number {
@@ -513,12 +557,52 @@ a.donate {
 
 #greeting {
   float: right;
-  padding-top: 3px;
-  margin-right: $lineheight/4;
-}
+  height: 100%;
 
-.greeting-bar-unread {
-  font-weight: bold;
+  &.secondary-actions {
+    padding: 3px $lineheight/2;
+  }
+
+  &.dropdown {
+    background-color: #EEE;
+    &:hover {
+      background-color: #CCC;
+    }
+  }
+
+  img {
+    vertical-align: top;
+    border-radius: 2px 0 0 2px;
+    margin-right: 5px;
+  }
+
+  #inboxanchor {
+    display: inline-block;
+    position: relative;
+    height: 20px;
+    top: -2px;
+    margin: 0 2px 0 0;
+    padding: 0 5px 0 0;
+    border-radius: 2px;
+  }
+
+  .dropdown-toggle {
+    display: block;
+    padding: 3px 7px;
+    color: #000;
+    text-decoration: none;
+  }
+
+  .dropdown-menu {
+    left: auto;
+    right: 0;
+
+    .count-number {
+      float: right;
+      padding: 0 5px;
+      margin: 0;
+    }
+  }
 }
 
 /* Rules for the message shown in place of the map when javascript is disabled */
@@ -998,8 +1082,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 /* Rules for the main content area */
 
 #content {
-  padding: $lineheight;
   position: relative;
+  padding: $lineheight;
 }
 
 .site-edit #content,
@@ -1012,6 +1096,69 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   border-left: 1px solid #ccc;
 }
 
+/* Overrides for pages that use new layout conventions */
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm,
+.site-copyright,
+.site-welcome {
+  #content {
+    max-width: 740px;
+  }
+}
+
+.user-new,
+.user-create,
+.user-terms,
+.user-confirm {
+  .content-heading {
+    height: 200px;
+  }
+}
+
+.user-new,
+.user-create,
+.user-terms {
+  #content {
+    padding: 0;
+  }
+}
+
+.header-illustration {
+  background-position: 0 0;
+  background-repeat: no-repeat;
+  position: absolute;
+  height: 200px;
+  width: 100%;
+  left: 0;
+  bottom: 0;
+
+  &.new-user-main {
+    background-image: image-url("sign-up-illustration.png");
+  }
+
+  &.confirm-main {
+    background-image: image-url("confirm-illustration.png");
+  }
+
+  &.new-user-terms {
+    background-image: image-url("terms-illustration.png");
+  }
+
+  &.new-user-arm {
+    height: 110px;
+    width: 130px;
+    left: 260px;
+    top: 160px;
+    background-image: image-url("sign-up-illustration-arm.png");
+  }
+}
+
+@media only screen and (max-width:900px) {
+  .header-illustration.new-user-arm { display: none;}
+}
+
 .wrapper {
   margin-left: 184px;
   border-left: 1px solid #ccc;
@@ -1067,6 +1214,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   position: relative;
   padding: $lineheight;
   background: $offwhite;
+  z-index: 2;
   h1, h2 {
     margin-bottom: $lineheight/2;
     line-height: 100%;
@@ -1197,11 +1345,8 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   }
 }
 
-#browse_map .geolink {
-  display: none;
-}
-
 #browse_map .secondary-actions {
+  display: none;
   margin-bottom: $lineheight/2;
 }
 
@@ -1425,7 +1570,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
   float: left;
 }
 
-/* Rules for the login page */
+/* Rules for the log in page */
 
 #login_openid_buttons {
   margin-bottom: 0;
@@ -1438,7 +1583,7 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 
 /* Rules for the account confirmation page */
 
-#terms {
+.user-terms {
   .legale {
     border: 1px solid #ccc;
     padding: $lineheight;
@@ -1460,27 +1605,16 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     }
   }
 
-  form.sign {
-    input[type=submit] {
-      float: left;
-    }
-    #decline {
-      background: $grey;
-      &:hover {
-        background: darken($grey, $hovercolor);
-      }
+  #decline {
+    background: $lightblue;
+    &:hover {
+      background: darken($lightblue, $hovercolor);
     }
   }
-  fieldset {
-    margin-bottom: $lineheight;
-  }
-  #contributorGuidance {
-    background-color: $offwhite;
-    border-radius: 4px;
-    -moz-border-radius: 4px;
-  }
-  .signing-buttons {
-    height: 50px;
+
+  .form-row {
+    margin: auto;
+    max-width: 370px;
   }
 }
 
@@ -1632,7 +1766,17 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
 .field_with_errors {
   padding: 2px;
   background-color: #ff7070;
-  display: table;
+  display: inline-block;
+}
+
+.formError {
+  display: inline-block;
+  padding: 5px 10px;
+  margin-top: 5px;
+  border-radius: 4px;
+  font-size: 12px;
+  color: #fff;
+  background-color: #ff7070;
 }
 
 /* Rules for rails validation error boxes */
@@ -1699,6 +1843,10 @@ ul.results-list li { border-bottom: 1px solid #ccc; }
     padding-top: $lineheight;
     border-top: 1px solid $lightgrey;
   }
+  .horizontal-list .form-row { 
+    float: left;
+    padding-right: 10px;
+  }
   .form-row {
     margin-bottom: $lineheight/2;
   }
@@ -1793,7 +1941,7 @@ ul.secondary-actions {
     display: inline-block;
     margin-right: 60px;
   }
-  li {
+  li {
     display: block;
     float: left;
     list-style: none;
@@ -1808,6 +1956,10 @@ ul.secondary-actions {
       margin-right: 0px;
     }
   }
+  .dropdown-menu {
+    left: auto;
+    right: 0;
+  }
 }
 
 /* Utility for managing inner content areas */
@@ -1818,6 +1970,8 @@ ul.secondary-actions {
 
 .inner11 { padding: $lineheight/2;}
 
+.inner20 { padding: $lineheight 0;}
+
 .inner02 { padding: 0 $lineheight;}
 
 /* Utility for general button styles */
@@ -2191,3 +2345,211 @@ a.button {
   border: 0;
   background: #fff;
 }
+
+/* Rules for dropdown menus */
+
+.dropdown {
+  position: relative;
+}
+
+.dropdown-toggle {
+  *margin-bottom: -3px;
+}
+
+.dropdown-toggle:active,
+.open .dropdown-toggle {
+  outline: 0;
+}
+
+.caret {
+  display: inline-block;
+  width: 0;
+  height: 0;
+  vertical-align: top;
+  border-top: 4px solid #000000;
+  border-right: 4px solid transparent;
+  border-left: 4px solid transparent;
+  content: "";
+}
+
+.dropdown .caret {
+  margin-top: 8px;
+  margin-left: 2px;
+}
+
+.dropdown-menu {
+  position: absolute;
+  top: 100%;
+  left: 0;
+  z-index: 1000;
+  display: none;
+  float: left;
+  min-width: 160px;
+  padding: 5px 0;
+  margin: 0;
+  list-style: none;
+  background-color: #ffffff;
+  border: 1px solid #ccc;
+  *border-right-width: 2px;
+  *border-bottom-width: 2px;
+  -webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+     -moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+          box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+  -webkit-background-clip: padding-box;
+     -moz-background-clip: padding;
+          background-clip: padding-box;
+}
+
+.dropdown-menu.pull-right {
+  right: 0;
+  left: auto;
+}
+
+.dropdown-menu .divider {
+  *width: 100%;
+  height: 1px;
+  margin: 9px 1px;
+  *margin: -5px 0 5px;
+  overflow: hidden;
+  background-color: #e5e5e5;
+  border-bottom: 1px solid #ffffff;
+}
+
+.dropdown-menu > li > a {
+  display: block;
+  padding: 3px 10px;
+  clear: both;
+  font-weight: normal;
+  line-height: 20px;
+  color: #333333;
+  white-space: nowrap;
+}
+
+.dropdown-menu > li > a:hover,
+.dropdown-menu > li > a:focus,
+.dropdown-submenu:hover > a,
+.dropdown-submenu:focus > a {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+}
+
+.dropdown-menu > .active > a,
+.dropdown-menu > .active > a:hover,
+.dropdown-menu > .active > a:focus {
+  color: #ffffff;
+  text-decoration: none;
+  background-color: #0081c2;
+  outline: 0;
+}
+
+.dropdown-menu > .disabled > a,
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  color: #999999;
+}
+
+.dropdown-menu > .disabled > a:hover,
+.dropdown-menu > .disabled > a:focus {
+  text-decoration: none;
+  cursor: default;
+  background-color: transparent;
+  background-image: none;
+}
+
+.open {
+  *z-index: 1000;
+}
+
+.open > .dropdown-menu {
+  display: block;
+}
+
+.dropdown-backdrop {
+  position: fixed;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: 990;
+}
+
+/* Rules for the "Welcome" page */
+.site-welcome {
+  .center {
+    text-align: center;
+    .sprite { 
+      float: none;
+      margin: auto;
+    }
+  }
+
+  .sprite {
+    background-image: image-url("welcome-sprite.png");
+    background-size: 500px 250px;
+    display: block;
+    float: left;
+  }
+
+  .icon-list { 
+    padding-bottom: 20px;
+    div {
+      margin-bottom: 10px;
+      p {
+        padding-top: 10px;
+      }
+    }
+  }
+  .sprite.small {
+    width: 50px;
+    height: 50px;
+  }
+
+  .sprite.x {
+    background-position: -50px 0;
+  }
+
+  .sprite.term {
+    margin-right: 10px;
+    vertical-align: middle;
+  }
+
+  .sprite.node {
+    background-position: -100px 0;
+  }
+
+  .sprite.way {
+    background-position: -150px 0;
+  }
+
+  .sprite.tag {
+    background-position: -200px 0;
+  }
+
+  .sprite.editor {
+    background-position: -250px 0;
+  }
+
+  .sprite.question {
+    background-position: -300px 0;
+  }
+
+  .start-mapping {
+    margin: auto;
+    cursor: pointer;
+    border: none;
+    padding: 20px 40px;
+    font-size: 30px;
+    text-decoration: none;
+  }
+
+  .note-box {
+    margin-top: 20px;
+    background-color: $offwhite;
+  }
+
+  .icon.note {
+    background-color: #333;
+    border-radius: 4px;
+  }
+}
index a74bc27fd5e5086f943bdf625128e338eb99982f..84efa0e2e1e8c284e7abefa48928d7fb7e1c5a64 100644 (file)
@@ -4,7 +4,6 @@
 #tabnav,
 #sidebar,
 #permalink,
-#editmenu,
 .leaflet-control {
   display: none;
 }
index 5e21ce1861eedfd6c60edd81fa20d2e3dd735e20..419abeac4eab7803fee4da49a9f1bfa919ab9afa 100644 (file)
@@ -84,13 +84,6 @@ h2, h3, h4 {
 
 /* Rules for greeting bar in the top right corner */
 
-#greeting {
-  position: absolute;
-  right: 0;
-  top: 0;
-  background: none;
-}
-
 #browse_map ul.secondary-actions {
   float: right;
   font-size: 10px;
@@ -172,32 +165,6 @@ p.search_results_entry {
   }
 }
 
-/* Rules for the signup form */
-
-#signupForm input[type="text"], #signupForm input[type="password"] {
-  width: 100%;
-}
-
-#signupForm input#user_email {
-  max-width: 30em;
-}
-
-#signupForm input#user_email_confirmation {
-  max-width: 30em;
-}
-
-#signupForm input#user_display_name {
-  max-width: 20em;
-}
-
-#signupForm input#user_pass_crypt {
-  max-width: 20em;
-}
-
-#signupForm input#user_pass_crypt_confirmation {
-  max-width: 20em;
-}
-
 /* Rules for the login form */
 
 #login_login input#user_email {
@@ -281,3 +248,16 @@ p.search_results_entry {
 #message_title, #message_body {
   width: 100% !important;
 }
+
+/* Rules for the sign-up page */
+
+.user-new,
+.user-create {
+  .col6 {
+    width: 100%;
+  }
+
+  .aside {
+    display: none;
+  }
+}
index 69ce8f8b1f07ef9d018c6137103d0dcac6e020a7..94cc647543c0ff526d4a5cc4d93a6b6b014f278c 100644 (file)
@@ -4,27 +4,11 @@ class SiteController < ApplicationController
 
   before_filter :authorize_web
   before_filter :set_locale
-  before_filter :require_user, :only => [:edit]
+  before_filter :redirect_map_params, :only => [:index, :edit, :export]
+  before_filter :require_user, :only => [:edit, :welcome]
   before_filter :require_oauth, :only => [:index]
 
   def index
-    anchor = []
-
-    if params[:lat] && params[:lon]
-      anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}"
-    end
-
-    if params[:layers]
-      anchor << "layers=#{params.delete(:layers)}"
-    elsif params.delete(:notes) == 'yes'
-      anchor << "layers=N"
-    end
-
-    if anchor.present?
-      redirect_to params.merge(:anchor => anchor.join('&'))
-      return
-    end
-
     unless STATUS == :database_readonly or STATUS == :database_offline
       session[:location] ||= OSM::IPLocation(request.env['REMOTE_ADDR'])
     end
@@ -80,6 +64,9 @@ class SiteController < ApplicationController
     @locale = params[:copyright_locale] || I18n.locale
   end
 
+  def welcome
+  end
+
   def preview
     render :text => RichText.new(params[:format], params[:text]).to_html
   end
@@ -87,4 +74,24 @@ class SiteController < ApplicationController
   def id
     render "id", :layout => false
   end
+
+  private
+
+  def redirect_map_params
+    anchor = []
+
+    if params[:lat] && params[:lon]
+      anchor << "map=#{params.delete(:zoom) || 5}/#{params.delete(:lat)}/#{params.delete(:lon)}"
+    end
+
+    if params[:layers]
+      anchor << "layers=#{params.delete(:layers)}"
+    elsif params.delete(:notes) == 'yes'
+      anchor << "layers=N"
+    end
+
+    if anchor.present?
+      redirect_to params.merge(:anchor => anchor.join('&'))
+    end
+  end
 end
index 57d2f7d132c299f4f323959b491cc8b644b2b597..c3cd9fcf22f4cbf994555a00240895ffde9f3b52 100644 (file)
@@ -88,19 +88,27 @@ class UserController < ApplicationController
         if @user.save
           flash[:piwik_goal] = PIWIK_SIGNUP_GOAL if defined?(PIWIK_SIGNUP_GOAL)
 
-          if @user.status == "active"
-            flash[:notice] = t 'user.new.flash welcome', :email => @user.email
+          referer = welcome_path
 
-            Notifier.signup_confirm(@user, nil).deliver
+          begin
+            uri = URI(session[:referer])
+            /map=(.*)\/(.*)\/(.*)/.match(uri.fragment) do |m|
+              editor = Rack::Utils.parse_query(uri.query).slice('editor')
+              referer = welcome_path({'zoom' => m[1],
+                                      'lat' => m[2],
+                                      'lon' => m[3]}.merge(editor))
+            end
+          rescue
+            # Use default
+          end
 
+          if @user.status == "active"
+            session[:referer] = referer
             successful_login(@user)
           else
-            flash[:notice] = t 'user.new.flash create success message', :email => @user.email
             session[:token] = @user.tokens.create.token
-
-            Notifier.signup_confirm(@user, @user.tokens.create(:referer => session.delete(:referer))).deliver
-
-            redirect_to :action => 'login', :referer => params[:referer]
+            Notifier.signup_confirm(@user, @user.tokens.create(:referer => referer)).deliver
+            redirect_to :action => 'confirm', :display_name => @user.display_name
           end
         else
           render :action => 'new', :referer => params[:referer]
@@ -304,55 +312,44 @@ class UserController < ApplicationController
 
   def confirm
     if request.post?
-      if token = UserToken.find_by_token(params[:confirm_string])
-        if token.user.active?
-          flash[:error] = t('user.confirm.already active')
-          redirect_to :action => 'login'
-        else
-          user = token.user
-          user.status = "active"
-          user.email_valid = true
-          user.save!
-          referer = token.referer
-          token.destroy
-
-          if session[:token]
-            token = UserToken.find_by_token(session[:token])
-            session.delete(:token)
-          else
-            token = nil
-          end
-
-          if token.nil? or token.user != user
-            flash[:notice] = t('user.confirm.success')
-            redirect_to :action => :login, :referer => referer
-          else
-            token.destroy
-
-            session[:user] = user.id
-            cookies.permanent["_osm_username"] = user.display_name
-
-            if referer.nil?
-              flash[:notice] = t('user.confirm.success') + "<br /><br />" + t('user.confirm.before you start')
-              redirect_to :action => :account, :display_name => user.display_name
-            else
-              flash[:notice] = t('user.confirm.success')
-              redirect_to referer
-            end
-          end
-        end
+      token = UserToken.find_by_token(params[:confirm_string])
+      if token && token.user.active?
+        flash[:error] = t('user.confirm.already active')
+        redirect_to :action => 'login'
+      elsif !token || token.expired?
+        flash[:error] = t('user.confirm.unknown token')
+        redirect_to :action => 'confirm'
       else
-        user = User.find_by_display_name(params[:display_name])
+        user = token.user
+        user.status = "active"
+        user.email_valid = true
+        user.save!
+        referer = token.referer
+        token.destroy
 
-        if user and user.active?
-          flash[:error] = t('user.confirm.already active')
-        elsif user
-          flash[:error] = t('user.confirm.unknown token') + t('user.confirm.reconfirm', :reconfirm => url_for(:action => 'confirm_resend', :display_name => params[:display_name]))
+        if session[:token]
+          token = UserToken.find_by_token(session[:token])
+          session.delete(:token)
         else
-          flash[:error] = t('user.confirm.unknown token')
+          token = nil
         end
 
-        redirect_to :action => 'login'
+        if token.nil? or token.user != user
+          flash[:notice] = t('user.confirm.success')
+          redirect_to :action => :login, :referer => referer
+        else
+          token.destroy
+
+          session[:user] = user.id
+          cookies.permanent["_osm_username"] = user.display_name
+
+          redirect_to referer || welcome_path
+        end
+      end
+    else
+      user = User.find_by_display_name(params[:display_name])
+      if !user || user.active?
+        redirect_to root_path
       end
     end
   end
@@ -518,7 +515,7 @@ private
     if user = User.authenticate(:username => username, :password => password)
       successful_login(user)
     elsif user = User.authenticate(:username => username, :password => password, :pending => true)
-      failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name))
+      unconfirmed_login(user)
     elsif User.authenticate(:username => username, :password => password, :suspended => true)
       failed_login t('user.login.account is suspended', :webmaster => "mailto:webmaster@openstreetmap.org")
     else
@@ -549,7 +546,7 @@ private
         if user = User.find_by_openid_url(identity_url)
           case user.status
             when "pending" then
-              failed_login t('user.login.account not active', :reconfirm => url_for(:action => 'confirm_resend', :display_name => user.display_name))
+              unconfirmed_login(user)
             when "active", "confirmed" then
               successful_login(user)
             when "suspended" then
@@ -680,6 +677,15 @@ private
     session.delete(:referer)
   end
 
+  ##
+  #
+  def unconfirmed_login(user)
+    redirect_to :action => 'confirm', :display_name => user.display_name
+
+    session.delete(:remember_me)
+    session.delete(:referer)
+  end
+
   ##
   # update a user's details
   def update_user(user, params)
index a5092221453c50b93f7016afd72e8580b3c3ec5f..be6679c41b74cd6730134e2dc629e19a48efc634 100644 (file)
@@ -6,18 +6,10 @@ class Notifier < ActionMailer::Base
 
   def signup_confirm(user, token)
     with_recipient_locale user do
-      # If we are passed an email address verification token, create
-      # the confirumation URL for account activation.
-      #
-      # Otherwise the email has already been verified e.g. through
-      # a trusted openID provider and the account is active and a
-      # confirmation URL is not needed.
-      if token
-        @url = url_for(:host => SERVER_URL,
-                       :controller => "user", :action => "confirm",
-                       :display_name => user.display_name,
-                       :confirm_string => token.token)
-      end
+      @url = url_for(:host => SERVER_URL,
+                     :controller => "user", :action => "confirm",
+                     :display_name => user.display_name,
+                     :confirm_string => token.token)
 
       mail :to => user.email,
            :subject => I18n.t('notifier.signup_confirm.subject')
index 9a754d3442c5deeec13b6b35be7e6e59013dc772..3060b33ea17830012d0b65d864af56aa4dcbc989 100644 (file)
@@ -5,6 +5,10 @@ class UserToken < ActiveRecord::Base
 
   after_initialize :set_defaults
 
+  def expired?
+    expiry < Time.now
+  end
+
 private
 
   def set_defaults
index 9b82753fb237fe3febc990f695e51403d9282b17..ed703665d1e55e8aa8be021fca5ac4dcbdebf59d 100644 (file)
   <%= content_tag "div", "", :id => "small_map", :data => data %>
   <span id="loading"><%= t 'browse.map.loading' %></span>
 
-<ul class='secondary-actions clearfix'>
-  <li>
-    <% if map.instance_of? Note -%>
-      <%= link_to t("browse.map.larger.area"),
-                  root_path(:notes => "yes"),
-                  :id => "area_larger_map",
-                  :class => "geolink bbox" %>
-    <% else -%>
-      <%= link_to t("browse.map.larger.area"),
-                  root_path(:box => "yes"),
-                  :id => "area_larger_map",
-                  :class => "geolink bbox" %>
-    <% end -%>
-  </li>
-  <li>
-    <%= link_to h(t("browse.map.edit.area")) + content_tag(:span, "▼", :class => "menuicon"),
-                edit_path,
-                :id => "area_edit",
-                :data => { :editor => preferred_editor },
-                :class => "geolink bbox" %>
-  </li>
-</ul>
+  <ul class='secondary-actions clearfix'>
+    <li>
+      <% if map.instance_of? Note -%>
+        <%= link_to t("browse.map.larger.area"),
+                    root_path(:notes => "yes"),
+                    :id => "area_larger_map",
+                    :class => "geolink bbox" %>
+      <% else -%>
+        <%= link_to t("browse.map.larger.area"),
+                    root_path(:box => "yes"),
+                    :id => "area_larger_map",
+                    :class => "geolink bbox" %>
+      <% end -%>
+    </li>
+    <li>
+      <%= render :partial => 'layouts/edit_menu',
+                 :locals => { :link_text => t("browse.map.edit.area"),
+                              :link_class => 'bbox' } %>
+    </li>
+  </ul>
 
   <% unless map.instance_of? Changeset %>
   <ul class='secondary-actions clearfix'>
                   :class => "geolink object" %>
     </li>
     <li>
-      <%= link_to h(t("browse.map.edit." + map.class.to_s.downcase)) + content_tag(:span, "▼", :class => "menuicon"),
-                  edit_path,
-                  :id => "object_edit",
-                  :data => { :editor => preferred_editor },
-                  :class => "geolink object" %>
+      <%= render :partial => 'layouts/edit_menu',
+                 :locals => { :link_text => t("browse.map.edit." + map.class.to_s.downcase),
+                              :link_class => 'object' } %>
     </li>
   </ul>
   <% end %>
     <%= t 'browse.map.deleted' %>
   <% end %>
 </div>
-
-<div id="area_edit_menu" class="menu">
-  <ul>
-    <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
-      <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
-                      edit_path(:editor => editor),
-                      :data => {:editor => editor},
-                      :class => "geolink bbox" %></li>
-    <% end %>
-  </ul>
-</div>
-
-<div id="object_edit_menu" class="menu">
-  <ul>
-    <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
-      <li><%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
-                      edit_path(:editor => editor),
-                      :data => {:editor => editor},
-                      :class => "geolink object" %></li>
-    <% end %>
-  </ul>
-</div>
diff --git a/app/views/layouts/_edit_menu.html.erb b/app/views/layouts/_edit_menu.html.erb
new file mode 100644 (file)
index 0000000..78c5dbb
--- /dev/null
@@ -0,0 +1,18 @@
+<div class="dropdown edit_menu">
+  <%= link_to link_text, edit_path,
+              :id => 'editanchor',
+              :class => "geolink tab #{link_class}" %>
+  <a class='dropdown-toggle' data-toggle='dropdown' href='#'>
+    <b class="caret"></b>
+  </a>
+  <ul class='dropdown-menu'>
+    <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
+      <li>
+        <%= link_to t('layouts.edit_with', :editor => t("editor.#{editor}.description")),
+                    edit_path(:editor => editor),
+                    :data => { :editor => editor },
+                    :class => "geolink #{link_class}" %>
+      </li>
+    <% end %>
+  </ul>
+</div>
index fcaa5ae648031e971543f029fb852a06aa671d54..d4054dfaf04913736938c2ae0d7d18780c3f0e46 100644 (file)
@@ -1,13 +1,3 @@
-<%=
-  link_to(
-    t("layouts.inbox_html",
-      :count => @user.new_messages.size > 0 ?
-                content_tag(
-                  :span, @user.new_messages.size, :class => "count-number"
-                ) :
-                ""
-    ),
-    inbox_path(:display_name => @user.display_name),
-    :id => "inboxanchor"
-  )
-%>
+<span id="inboxanchor" class="count-number">
+  <%= user_thumbnail_tiny(@user, :size => 20, :width => 20, :height => 20) %><span><%= @user.new_messages.size %></span>
+</span>
\ No newline at end of file
diff --git a/app/views/layouts/_user_menu.html.erb b/app/views/layouts/_user_menu.html.erb
new file mode 100644 (file)
index 0000000..ab7d955
--- /dev/null
@@ -0,0 +1,28 @@
+<div class='dropdown' id='greeting'>
+  <a class='dropdown-toggle' data-toggle='dropdown' href="#">
+    <%= render :partial => 'layouts/inbox' %>
+    <%= @user.display_name %>
+    <b class="caret"></b>
+  </a>
+  <ul class='dropdown-menu'>
+    <li>
+      <%= link_to inbox_path(:display_name => @user.display_name) do %>
+        <span class='count-number'><%= number_with_delimiter(@user.new_messages.size) %></span>
+        <%= t('message.inbox.my_inbox') %>
+      <% end %>
+    </li>
+    <li>
+      <%= link_to t('user.view.my profile'), user_path(:display_name => @user.display_name) %>
+    </li>
+    <li>
+      <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
+    </li>
+    <li class="divider"></li>
+    <li>
+      <%= yield :greeting %>
+    </li>
+    <li>
+      <%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath) %>
+    </li>
+  </ul>
+</div>
index a0e894e462c315e834dd193ae01fea1a4b403f54..12b5b82c5c358c9aa123e16c739b53fce0b61019 100644 (file)
         <div class='ads'>
           <%= ad = [{:image => 'sotm-birmingham-ad.png',
                      :title => 'State of the Map Birmingham',
-                     :href =>'http://stateofthemap.org/'},
-                    {:image => 'donate-ad.png',
-                     :title => 'Server Donation Drive',
-                     :href =>'http://donate.openstreetmap.org/'}].sample
+                     :href =>'http://stateofthemap.org/'}].sample
 
               link_to ad[:href], :title => ad[:title] do
                 image_tag ad[:image], :class => :ad
       </div>
     </div>
     <div id='top-bar'>
-      <ul class='secondary-actions' id="greeting">
-         <% if @user and @user.id %>
-           <li id="full-greeting"><%=link_to h(@user.display_name), user_path(:display_name => @user.display_name), :title => t('layouts.welcome_user_link_tooltip') %></li>
-           <li><%= yield :greeting %></li>
-           <li><%= render :partial => "layouts/inbox" %></li>
-           <li><%= link_to t('layouts.logout'), logout_path(:session => request.session_options[:id], :referer => request.fullpath), {:id => 'logoutanchor', :title => t('layouts.logout_tooltip')}%></li>
-         <% else %>
-           <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
-           <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
-         <% end %>
-      </ul>
+      <% if @user and @user.id %>
+        <%= render :partial => "layouts/user_menu" %>
+      <% else %>
+        <ul class='secondary-actions' id='greeting'>
+          <li><%= link_to t('layouts.log_in'), login_path(:referer => request.fullpath), {:id => 'loginanchor', :title => t('layouts.log_in_tooltip')} %></li>
+          <li><%= link_to t('layouts.sign_up'), user_new_path, {:id => 'registeranchor', :title => t('layouts.sign_up_tooltip')} %></li>
+        </ul>
+      <% end %>
       <ul id="tabnav">
-        <li><%= link_to t('layouts.view'), root_path, {
-          :id => 'viewanchor',
-          :title => t('layouts.view_tooltip'),
-          :class => 'geolink llz layers'
-        } %></li>
-        <li><%= link_to h(t('layouts.edit')) + content_tag(:span, "▼", :class => "menuicon"), edit_path, {
-          :id => 'editanchor',
-          :title => t('javascripts.site.edit_tooltip'),
-          :data => { :minzoom => 13, :editor => preferred_editor },
-          :class => 'geolink llz object disabled'
-        } %></li>
-        <li><%= link_to t('layouts.history'), browse_changesets_path, {
-          :id => 'historyanchor',
-          :data => { :minzoom => 11 },
-          :title => t('javascripts.site.history_tooltip'),
-          :class => 'geolink bbox'
-        } %></li>
-      </ul>
-    </div>
-    <div id="editmenu" class="menu">
-      <ul>
-        <% Editors::RECOMMENDED_EDITORS.each do |editor| %>
-          <li><%= link_to t('layouts.edit_with',
-            :editor => t("editor.#{editor}.description")),
-            edit_path(:editor => editor), {
-            :data => { :editor => editor },
-            :class => "geolink llz object"
-          } %></li>
-        <% end %>
-        <%= yield :editmenu %>
+        <li id="view_tab">
+          <%= link_to t('layouts.view'), root_path, :class => 'tab geolink llz layers' %>
+        </li><li id="edit_tab">
+          <%= render :partial => 'layouts/edit_menu',
+                     :locals => { :link_text => t('layouts.edit'), :link_class => 'llz object' }%>
+        </li><li id="history_tab">
+          <%= link_to t('layouts.history'), browse_changesets_path, :class => 'tab geolink bbox' %>
+        </li>
       </ul>
     </div>
-    <script type="text/javascript">
-      createMenu("editanchor", "editmenu", "left");
-    </script>
     <div class="wrapper">
       <%= render :partial => "layouts/flash", :locals => { :flash => flash } %>
       <% if content_for? :heading %>
index 0c154c968e1f94fa80baf4cbbae7f0a1b70f3b2c..814deee9171220d93896643b05484d1bb9133076 100644 (file)
@@ -2,23 +2,8 @@
 
 <p><%= t("notifier.signup_confirm.created", :site_url => SERVER_URL) %></p>
 
-<% if @url -%>
 <p><%= t("notifier.signup_confirm.confirm") %></p>
 
 <p><%= link_to @url, @url %></p>
-<% end -%>
 
 <p><%= t("notifier.signup_confirm.welcome") %></p>
-
-<p><%= raw(t("notifier.signup_confirm_html.introductory_video", :introductory_video_link => link_to(t('notifier.signup_confirm_html.video_to_openstreetmap'), "http://showmedo.com/videos/video?name=1800000&fromSeriesID=180"))) %>
-   <%= raw(t("notifier.signup_confirm_html.more_videos", :more_videos_link => link_to(t('notifier.signup_confirm_html.more_videos_here'), "http://showmedo.com/videos/series?name=mS2P1ZqS6"))) %></p>
-
-<p><%= raw(t("notifier.signup_confirm_html.get_reading")) %></p>
-
-<p><%= raw(t("notifier.signup_confirm_html.ask_questions")) %></p>
-
-<p><%= raw(t("notifier.signup_confirm_html.wiki_signup")) %></p>
-
-<p><%= raw(t("notifier.signup_confirm_html.user_wiki_page")) %></p> 
-
-<p><%= raw(t("notifier.signup_confirm_html.current_user")) %></p>
index e52396462ee96825c290358c4a614b01911ea710..aee44782d3e7f79b8bd5693f7bd38cb4e7ddcff7 100644 (file)
@@ -2,41 +2,8 @@
 
 <%= fp(t("notifier.signup_confirm.created", :site_url => SERVER_URL)) %>
 
-<% if @url -%>
 <%= fp(t("notifier.signup_confirm.confirm")) %>
 
   <%= @url %>
 
-<% end -%>
 <%= fp(t("notifier.signup_confirm.welcome")) %>
-
-<%= fp(t("notifier.signup_confirm_plain.introductory_video")) %>
-
-  http://showmedo.com/videos/video?name=1800000&fromSeriesID=180       
-
-<%= fp(t("notifier.signup_confirm_plain.more_videos")) %>
-
-  http://showmedo.com/videos/series?name=mS2P1ZqS6     
-
-<%= fp(t("notifier.signup_confirm_plain.the_wiki")) %>
-
-  <%= t("notifier.signup_confirm_plain.the_wiki_url") %>
-
-<%= fp(t("notifier.signup_confirm_plain.blog_and_twitter")) %>
-
-  http://blog.openstreetmap.org/
-  http://twitter.com/openstreetmap
-
-<%= fp(t("notifier.signup_confirm_plain.ask_questions")) %>
-
-  http://help.openstreetmap.org/
-
-<%= fp(t("notifier.signup_confirm_plain.wiki_signup")) %>
-
-  <%= t("notifier.signup_confirm_plain.wiki_signup_url") %>
-
-<%= fp(t("notifier.signup_confirm_plain.user_wiki_page")) %>
-
-<%= fp(t("notifier.signup_confirm_plain.current_user")) %>
-
-  http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region
index 979ae7681fecfdfc8a3c3ba679a01a28088e005d..e907b3fb1e62008a7c9b78bbd549f4f8454b7505 100644 (file)
@@ -6,7 +6,6 @@
                 :class => "set_position",
                 :data => { :lat => @user.home_lat,
                            :lon => @user.home_lon,
-                           :zoom => 15 },
-                :title => t("layouts.home_tooltip") %>
+                           :zoom => 15 } %>
   <% end %>
 <% end %>
diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
new file mode 100644 (file)
index 0000000..da775e3
--- /dev/null
@@ -0,0 +1,67 @@
+<% content_for :head do %>
+  <%= javascript_include_tag "welcome" %>
+<% end %>
+
+<% content_for :heading do %>
+  <h2><%= t "welcome_page.title" %></h2>
+<% end %>
+
+<p><%= t "welcome_page.introduction_html" %></p>
+
+<h3><%= t "welcome_page.whats_on_the_map.title" %></h3>
+
+<div class=' clearfix'>
+  <div class='col6 inner11'>
+    <div class='center clearfix inner11'>
+      <span class='sprite small check'></span>
+    </div>
+    <p><%= t "welcome_page.whats_on_the_map.on_html" %></p>
+  </div>
+  <div class='col6 inner11'>
+    <div class='center clearfix inner11'>
+      <span class='sprite small x'></span>
+    </div>
+    <p><%= t "welcome_page.whats_on_the_map.off_html" %></p>
+  </div>
+</div>
+
+<h3><%= t "welcome_page.basic_terms.title" %></h3>
+
+<p><%= t "welcome_page.basic_terms.paragraph_1_html" %></p>
+
+<div class='col12 clearfix icon-list'>
+  <div class='clearfix'>
+    <span class='sprite small term editor'></span>
+    <p><%= t "welcome_page.basic_terms.editor_html" %></p>
+  </div>
+  <div class='clearfix'>
+    <span class='sprite small term node'></span>
+    <p><%= t "welcome_page.basic_terms.node_html" %></p>
+  </div>
+  <div class='clearfix'>
+    <span class='sprite small term way'></span>
+    <p><%= t "welcome_page.basic_terms.way_html" %></p>
+  </div>
+  <div class='clearfix'>
+    <span class='sprite small term tag'></span>
+    <p><%= t "welcome_page.basic_terms.tag_html" %></p>
+  </div>
+</div>
+
+<div class='col12 clearfix icon-list'>
+  <h3><%= t "welcome_page.questions.title" %></h3>
+  <span class='sprite small term question'></span>
+  <p><%= t "welcome_page.questions.paragraph_1_html" %></p>
+</div>
+
+<div class='clearfix center'>
+  <a href="<%= edit_path %>" class="button start-mapping"><%= t "welcome_page.start_mapping" %></a>
+</div>
+
+<div class='note-box'>
+  <div class='inner22'>
+    <h3><%= t "welcome_page.add_a_note.title" %></h3>
+    <p><%= t "welcome_page.add_a_note.paragraph_1_html" %></p>
+    <p><%= t "welcome_page.add_a_note.paragraph_2_html", :map_url => root_path %></p>
+  </div>
+</div>
\ No newline at end of file
index a0979d5ae5cb80594954d62d17324a2d6cca61c8..0a2f056c2fe48d75a2437cc5c08f3f703eb029d0 100644 (file)
@@ -7,7 +7,7 @@
 <% end %>
 
 <%= error_messages_for 'user' %>
-<%= form_for :user, :html => { :multipart => true, :id => 'accountForm',:class => 'standard-form' } do |f| %>
+<%= form_for :user, :html => { :multipart => true, :id => 'accountForm', :class => 'standard-form', :autocomplete => :off } do |f| %>
   <fieldset>
     <div class="form-row">
       <label class="standard-label"><%= t 'user.new.display name' %></label>
@@ -24,7 +24,7 @@
 
     <div class="form-row">
       <label class="standard-label"><%= t 'user.account.new email address' %></label>
-      <%= f.email_field :new_email %>
+      <%= f.email_field :new_email, :autocomplete => :off %>
       <span class="form-help deemphasize"><%= t 'user.account.email never displayed publicly' %></span>
     </div>
   </fieldset>
index 71bf292081e0dd2f3dfdd01cdc04cce7c07b70ab..e976954206f08fe892c2405ecc492fdc7fdc22c8 100644 (file)
@@ -41,6 +41,11 @@ xml.osm("version" => API_VERSION, "generator" => GENERATOR) do
           @this_user.languages.split(",") { |lang| xml.tag! "lang", lang }
         end
       end
+      xml.tag! "messages" do
+        xml.tag! "received", :count => @this_user.messages.size,
+                             :unread => @this_user.new_messages.size
+        xml.tag! "sent", :count => @this_user.sent_messages.size
+      end
     end
   end
 end
index 3b68ddd5b0e2ec4516ee4a04863cd1157bfa6eb1..31f29eb6428e72dfa1c8a3fcb19fb2e785b0f055 100644 (file)
@@ -1,19 +1,32 @@
-<script>
-$("#content").hide();
-</script>
-
 <% content_for :heading do %>
-  <h1><%= t 'user.confirm.heading' %></h1>
+  <h2><%= t 'user.confirm.heading' %></h2>
+  <div class='header-illustration confirm-main'></div>
 <% end %>
 
-<p><%= t 'user.confirm.press confirm button' %></p>
+<% if params[:confirm_string] %>
+  <script>
+  $("#content").hide();
+  </script>
 
-<%= form_tag({}, { :id => "confirm" }) do %>
-  <input type="display_name" name="confirm_string" value="<%= params[:display_name] %>">
-  <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
-  <input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>">
-<% end %>
+  <p><%= t 'user.confirm.press confirm button' %></p>
+
+  <%= form_tag({}, { :id => "confirm" }) do %>
+    <input type="display_name" name="confirm_string" value="<%= params[:display_name] %>">
+    <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
+    <input type="submit" name="confirm_action" value="<%= t 'user.confirm.button' %>">
+  <% end %>
 
-<script>
-$("#confirm").submit();
-</script>
+  <script>
+  $("#confirm").submit();
+  </script>
+<% else %>
+  <h1>
+    <%= t "user.confirm.introduction_1" %>
+    <span class="deemphasize">
+      <%= t "user.confirm.introduction_2" %>
+    </span>
+  </h1>
+
+  <p class='deemphasize'><%= t "user.confirm.reconfirm_html",
+                               :reconfirm => url_for(:action => 'confirm_resend')%></p>
+<% end %>
index 7324ddd29773a8edb0c585afa122511245d1a289..d1772f996d99453c42febd457b7e583ef282098d 100644 (file)
 <% content_for :heading do %>
-  <h1><%= t 'user.new.heading' %></h1>
+  <h1><%= t 'user.new.title' %></h1>
+  <div class='header-illustration new-user-main'></div>
+  <div class='header-illustration new-user-arm'></div>
 <% end %>
 
-<p><%= t 'user.new.fill_form' %></p>
-
-<%= error_messages_for 'user' %>
-
-<%= form_for :user, :url => { :action => 'create' } do %>
+<%= form_for :user, :url => { :action => 'create' }, :html => { :class => 'standard-form fillL col6 inner22' } do %>
   <%= hidden_field_tag('referer', h(@referer)) unless @referer.nil? %>
 
-  <div id="signupForm" class="standard-form">
-
-    <fieldset>
-      <div class="form-row">
-        <label for="email" class="standard-label">
-          <%= t 'user.new.email address' %>
-        </label>
-        <%= email_field(:user, :email, { :tabindex => 1 }) %>
-      </div>
-      <div class="form-row">
-        <label for="email_confirmation" class="standard-label">
-          <%= t 'user.new.confirm email address' %>
-        </label>
-        <%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %>
-      </div>
+  <fieldset>
+    <div class="form-row">
+      <label for="email" class="standard-label">
+        <%= t 'user.new.email address' %>
+      </label>
+      <%= email_field(:user, :email, { :tabindex => 1 }) %>
+      <%= error_message_on(:user, :email) %>
+    </div>
+    <div class="form-row">
+      <label for="email_confirmation" class="standard-label">
+        <%= t 'user.new.confirm email address' %>
+      </label>
+      <%= email_field(:user, :email_confirmation, { :tabindex => 2 }) %>
+      <%= error_message_on(:user, :email_confirmation) %>
+    </div>
     <span class="form-help deemphasize"><%= raw(t 'user.new.not displayed publicly') %></span>
-    </fieldset>
-
-    <fieldset>
-      <div class="form-row">
-        <label for="display_name" class="standard-label">
-          <%= t 'user.new.display name' %>
-        </label>
-        <%= text_field(:user, :display_name, { :tabindex => 3 }) %>
-      </div>
-      <span class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
-    </fieldset>
-
-    <fieldset class="form-divider" id="openid_field">
-      <div class="form-row">
-        <label for="openid_url" class="standard-label">
-          <%= raw t 'user.new.openid', :logo => openid_logo %>
-        </label>
-        <%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %>
-      </div>
-      <span id="openid_note" class="deemphasize">
-        <%= t 'user.new.openid no password' %>
-      </span>
-    </fieldset>
-
-    <fieldset>
-      <div class="form-row">
-        <label for='user[pass_crypt]' class="standard-label">
-          <%= t 'user.new.password' %>
-        </label>
-        <%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %>
-      </div>
-      <div class="form-row">
-        <label class="standard-label">
-          <%= t 'user.new.confirm password' %>
-        </label>
-        <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %>
-      </div>
-    </fieldset>
-
-    <div id="openid_prompt" class="form-row">
-      <%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %>
+  </fieldset>
+
+  <fieldset>
+    <div class="form-row">
+      <label for="display_name" class="standard-label">
+        <%= t 'user.new.display name' %>
+      </label>
+      <%= text_field(:user, :display_name, { :tabindex => 3 }) %>
+      <%= error_message_on(:user, :display_name) %>
     </div>
+    <span class="form-help deemphasize"><%= t 'user.new.display name description' %></span>
+  </fieldset>
+
+  <fieldset class="form-divider" id="openid_field">
+    <div class="form-row">
+      <label for="openid_url" class="standard-label">
+        <%= raw t 'user.new.openid', :logo => openid_logo %>
+      </label>
+      <%= url_field(:user, :openid_url, { :id => "openid_url", :tabindex => 4, :class => "openid_url" }) %>
+      <%= error_message_on(:user, :openid_url) %>
+    </div>
+    <span class="form-help deemphasize"><%= t 'user.new.openid no password' %></span>
+  </fieldset>
+
+  <fieldset>
+    <div class="form-row">
+      <label for='user[pass_crypt]' class="standard-label">
+        <%= t 'user.new.password' %>
+      </label>
+      <%= password_field(:user, :pass_crypt, {:tabindex => 5 }) %>
+      <%= error_message_on(:user, :pass_crypt) %>
+    </div>
+    <div class="form-row">
+      <label class="standard-label">
+        <%= t 'user.new.confirm password' %>
+      </label>
+      <%= password_field(:user, :pass_crypt_confirmation, { :tabindex => 6 }) %>
+      <%= error_message_on(:user, :pass_crypt_confirmation) %>
+    </div>
+  </fieldset>
 
-    <%= submit_tag t('user.new.continue'), :tabindex => 6 %>
+  <div id="openid_prompt" class="form-row">
+    <%= link_to raw(t("user.new.use openid", :logo => openid_logo)), "#", :id => "openid_enable" %>
   </div>
+
+  <%= submit_tag t('user.new.continue'), :tabindex => 6 %>
 <% end %>
 
+<div class='aside col6 deemphasize inner22'>
+  <h4><%= t 'user.new.about.header' %></h4>
+  <%= t 'user.new.about.html' %>
+</div>
+
 <script type="text/javascript">
 function enableOpenID()
 {
   $("#openid_prompt").hide();
-
   $("#openid_field").show();
-  $("#openid_note").show();
-
   $("#openid_url").prop("disabled", false);
 }
 
 function disableOpenID()
 {
   $("#openid_prompt").show();
-
   $("#openid_field").hide();
-  $("#openid_note").hide();
-
   $("#openid_url").prop("disabled", true);
 }
 
 $(document).ready(function () {
   $("#openid_enable").click(enableOpenID);
 
-  <% if params[:openid] or (@user and @user.openid_url and not @user.openid_url.empty?) -%>
+  <% if params[:openid] or (@user and @user.openid_url.present?) -%>
   enableOpenID();
   <% else -%>
   disableOpenID();
index 33c528292208fba6dc3db01041d4df658dc69d53..47e2f8b54e7004ec274a41be1dcd1ff1c045e40d 100644 (file)
@@ -1,45 +1,56 @@
 <% content_for :heading do %>
   <h1><%= t 'user.terms.heading' %></h1>
+  <div class='header-illustration new-user-terms'></div>
 <% end %>
 
-<div id="terms">
-  <div class="directions">
-    <p><%= t 'user.terms.read and accept' %></p>
-    
-    <!-- legale is <%= @legale %> -->
-    <%= form_tag :action => 'terms' do %>
-      <p><%= t 'user.terms.legale_select' %></p>
-      <fieldset>
-      <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name,legale| %>
-        <%= radio_button_tag 'legale', legale, @legale == legale %>
-        <%= label_tag "legale_#{legale}", t('user.terms.legale_names.' + name) %>
-        <script type="text/javascript">
-        <!--
+<%= form_tag({:action => "save"}, { :class => " inner22 standard-form fillL" }) do %>
+  <!-- legale is <%= @legale %> -->
+  <div class='form-row horizontal-list'>
+    <label class="standard-label">
+      <%= t 'user.terms.legale_select' %>
+    </label>
+
+    <% [['france', 'FR'], ['italy', 'IT'], ['rest_of_world', 'GB']].each do |name, legale| %>
+      <div class="form-row">
+        <label for="legale_<%= legale %>">
+          <%= radio_button_tag 'legale', legale, @legale == legale %>
+          <%= t('user.terms.legale_names.' + name) %>
+        </label>
+        <script>
           $("#legale_<%= legale %>").change(function () {
             $("#contributorTerms").html("<%=j image_tag 'searching.gif' %>");
             $("#contributorTerms").load("<%= url_for :legale => legale %>");
           });
-        // -->
         </script>
-      <% end %>
-      </fieldset>
+      </div>
     <% end %>
-  </div> 
-  <div id="contributorTerms" class="legale">
+  </div>
+
+  <div id="contributorTerms" class="col12 legale">
     <%= render :partial => "terms" %>
   </div>
-  
-  <%= form_tag({:action => "save"}, { :class => "sign" }) do %>
-    <p>
-      <label for="confirm_pd_checkbox"><%= t 'user.terms.consider_pd' %></label>
+
+  <div class="form-row">
+    <label for="user_consider_pd">
       <%= check_box('user', 'consider_pd') %>
-      <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
-    </p>
+      <%= t 'user.terms.consider_pd' %>
+    </label>
+    <span class="minorNote">(<%= link_to(t('user.terms.consider_pd_why'), t('user.terms.consider_pd_why_url'), :target => :new)%>)</span>
+
     <%= hidden_field_tag('referer', h(params[:referer])) unless params[:referer].nil? %>
-    <div class="signing-buttons buttons">
+
+    <div class="buttons form-row inner20 clearfix">
+      <p class="deemphasize"><%= t 'user.terms.read and accept' %></p>
       <%= submit_tag(t('user.terms.agree'), :name => "agree", :id => "agree") %>
       <%= submit_tag(t('user.terms.decline'), :name => "decline", :id => "decline") %>
     </div>
-    <p id="contributorGuidance"><%= raw t 'user.terms.guidance', :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary', :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %></p>
-  <% end %>
-</terms>
+
+    <div class="deemphasize">
+      <p id="contributorGuidance">
+        <%= raw t 'user.terms.guidance',
+                  :summary => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary',
+                  :translations => 'http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations' %>
+      </p>
+    </div>
+  </div>
+<% end %>
index 6486be003ad427e669409a3a9bc34364245fe158..824c11573f6d8408ae80bfe790429ca24a08726f 100644 (file)
@@ -56,7 +56,7 @@ OpenStreetMap::Application.configure do
   # config.action_controller.asset_host = "http://assets.example.com"
 
   # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
-  config.assets.precompile += %w( index.js edit.js browse.js changeset.js )
+  config.assets.precompile += %w( index.js edit.js browse.js changeset.js welcome.js )
   config.assets.precompile += %w( user.js diary_entry.js pngfix.js swfobject.js )
   config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
   config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
index 760acd0f02aa2a1c4fc8ac1735a0d2b794d31d8b..89d49473efecd4cb614f3286dc73efbb31627bd8 100644 (file)
@@ -1090,6 +1090,50 @@ da:
       native_link: den danske udgave
       text: Du kigger på den engelske udgave af ophavsretsiden. Du kan gå tilbage til %{native_link} af denne side eller du kan holde op med at læse om ophavsret og %{mapping_link}.
       title: Om denne side
+  welcome_page:
+    title: Welcome!
+    introduction_html: |
+      Velkommen til OpenStreetMap, det frie brugerredigerede verdenskort. Nu hvor du er oprettet som 
+      bruger er du klar til tilføje og ændre kortinformationer. Her er en guide med de vigtigste
+      informationer til at komme hurtigt i gang.
+    whats_on_the_map:
+      title: Hvad kortet indholder
+      on_html: |
+        OpenStreetMap indeholder elementer, der <em>konkret og aktuelt</em> findes -
+        f.eks. millioner af bygninger, veje og andre detaljer om steder. Du kan kortlægge
+        enhver detalje fra den virkelige verden som du interesserer dig for.
+      off_html: |
+        Kortet indeholder <em>ikke</em> subjektive informationer (f.eks. anmeldelser), ting
+        der ikke længere eksisterer, fiktive ting og ophavsretsligt beskyttede data fra andre
+        kort. Kopier aldrig nogen som helst information fra andre online- eller papirkort
+        med mindre der forelægger en særlig tilladelse.
+    basic_terms:
+      title: Grundlæggende begreber
+      paragraph_1_html: |
+        Her er nogen få begreber som er nyttige at forstå for at bidrage til OpenStreetMap.
+      editor_html: |
+        En <strong>editor</strong> er et program eller en hjemmeside der kan bruges til at editere kortet.
+      node_html: |
+        En <strong>node</strong> er et punkt på kortet, f.eks. en enkelt restaurant eller et træ.
+      way_html: |
+        En <strong>way</strong> er en linje eller et areal, f.eks. en vej, en å eller en bygning.
+      tag_html: |
+        Et <strong>tag</strong> er en lille bid information om en node eller en way, f.eks. navnet på en restaurant eller
+        hastighedsbegrænsningen på en vej.
+    questions:
+      title: Spørgsmål?
+      paragraph_1_html: |
+        Behøver du hjælp til at kortlægge eller er du usikker på hvordan OpenStreetMap bruges? Få svar på dine spørgsmål på
+        <a href='http://help.openstreetmap.org/'>OpenStreetMaps hjælpeside</a>.
+    start_mapping: Editér kortet
+    add_a_note:
+      title: Har du ikke tid til at kortlægge selv? Tilføj en note!
+      paragraph_1_html: |
+        Hvis du bare vil have en lille detalje rettet, men ikke har tid til at gøre det selv, så kan du tilføje en note.
+      paragraph_2_html: |
+        Bare gå ind på <a href='%{map_url}'>kortet</a> og klik på note-ikonet:
+        <span class='icon note'></span>. Dette vil tilføje et symbol som du kan trække rundt på kortet. Tilføj din besked,
+        klik på gem og lad andre brugere undersøge sagen.
   message: 
     delete: 
       deleted: Besked slettet
index 896caceddeb2deb7a6bf07bdfd65327a6f936fa1..58293fe613a112d75c46c4063af8123f132e7768 100644 (file)
@@ -1206,6 +1206,49 @@ de:
       opened: neuer Fehler (in der Nähe von %{place})
       reopened: reaktivierter Fehler (in der Nähe von %{place})
       title: OpenStreetMap-Fehler
+  welcome_page:
+    title: Willkommen!
+    introduction_html: |
+      Willkommen zu OpenStreetMap, der weltweiten frei und editierbaren Karte. Jetzt wo Du registriert bist, ist alles so weit das Du anfangen kannst zu editieren.
+      Hier sind noch eine paar zusaetzliche Informationen zu den wichtigsten Dingen um erfolgreich zu editieren.
+    whats_on_the_map:
+      title: Was gehoert in die Karte?
+      on_html: |
+        OpenStreetMap ist eine Datenbank in der man alles erfassen kann was <em>derzeit real existiert.</em> -
+        Dies beinhalten sowohl Strassen, Gebaeude und Plaetze mit ihren Informationen als auch z.B. Geschaefte, Briefkaesten oder Hydranten.
+        Eigentlich eben alles was man so dauerhaft in der Umgebung finden kann und einem interessiert.
+      off_html: |
+        Was nicht in die Datenbank gehoert sind subjektive Daten wie Bewertungen, nicht mehr aktuelle
+        historische Fakten oder nicht real existierende Dinge. Ausserdem ist es wichtig nichts von
+        anderen Quellen zu kopieren, da OpenStreetMap Copyright sehr ernst nimmt. 
+    basic_terms:
+      title: Grundbegriffe fuers Mapping
+      paragraph_1_html: |
+        OpenStreetMap hat ein paar eigene Begrifflichkeiten. Hier sind ein paar davon die nuetzlich sein duerften.
+      editor_html: |
+        Ein <strong>Editor</strong> ist ein Programm oder eine Webseite mit der man die Karte editieren kann.
+      node_html: |
+        Ein <strong>Knoten</strong> ist ein Punkt auf der Karte, z.B. ein Restaurant oder ein Baum.
+      way_html: |
+        Ein OSM <strong>Weg</strong> ist eine Linie oder Flaeche wie z.B. eine Strasse, Weg, Fluss oder Gebaeude.
+      tag_html: |
+        Ein <strong>tag</strong> ist eine Eigenschaft die man einem Objekt zuweist. Z.B. der Name eines Restaurant
+        oder die maximale Geschwindigkeit einer Strasse.
+    questions:
+      title: Fragen?
+      paragraph_1_html: |
+        Falls Du zusaetzliche Hilfe beim Mapping brauchst oder etwas nicht klar ist, gibt es zusaetzliche
+        Hilfe auf <a href='http://help.openstreetmap.org/'>the Hilfe Seite</a>.
+    start_mapping: Beginne mit dem Mapping
+    add_a_note:
+      title: Keine Zeit zum editieren? Dann melde einfach einen Fehler!
+      paragraph_1_html: |
+        Es ist sehr einfach eine Notiz fuer andere Mapper zu schreiben die diese dann mit der Zeit abarbeiten koennen,
+        falls man selbst nicht die Zeit hat sich einzuarbeiten und dies zu erledigen.
+      paragraph_2_html: |
+        Gehe einfach auf <a href='%{map_url}'>die Karte</a> und klicke das Sprechblasen Icon:
+        <span class='icon note'></span>. Dies fuegt einen Marker auf der Karte hinzu welchen man zu der Problemstelle ziehen kann.
+        Die Notiz sollte so genau wie moeglich sein, damit ein anderer Mapper die Erklaerung dann verwenden kann um den Fehler zu beheben.
   notifier: 
     diary_comment_notification: 
       footer: Hier gehts zum Eintrag %{readurl}, du kannst ihn kommentieren %{commenturl} oder direkt beantworten %{replyurl}.
@@ -1769,6 +1812,12 @@ de:
       confirm email address: "Bestätige deine E-Mail-Adresse:"
       confirm password: "Passwort bestätigen:"
       contact_webmaster: Bitte kontaktiere den <a href="mailto:webmaster@openstreetmap.org">Webmaster</a> um ein Benutzerkonto erstellt zu bekommen - wir werden die Anfrage so schnell wie möglich bearbeiten.
+      about:
+        header: Frei und editierbar
+        html: |
+          <p>Im Gegensatz zu anderen Karten, OpenStreetMap is vollstaendig von Leuten wie Dir erstellt.
+          Jeder kann sie verbessern, aktualisieren und erweitern, sowie fuer jeden Zweck verwenden.</p>
+          <p>Melde Dich an und beginne mitzuwirken. Wir werden Dir eine email schicken um diese zu bestaetigen.</p>
       continue: Weiter
       display name: "Benutzername:"
       display name description: Dein öffentlich angezeigter Benutzername. Er kann später in den Einstellungen geändert werden.
index 3722498d009403c88a0df967a64c8bb23f45f3a9..a1e26baebefc37a475819c82e9f712a75f1476c0 100644 (file)
@@ -659,6 +659,7 @@ en:
           monument: "Monument"
           museum: "Museum"
           ruins: "Ruins"
+          tomb: "Tomb"
           tower: "Tower"
           wayside_cross: "Wayside Cross"
           wayside_shrine: "Wayside Shrine"
@@ -995,16 +996,8 @@ en:
       h1: OpenStreetMap
     logo:
       alt_text: OpenStreetMap logo
-    welcome_user_link_tooltip: Your user page
-    home: home
-    home_tooltip: Go to home location
-    inbox_html: "inbox %{count}"
-    inbox_tooltip:
-      zero: Your inbox contains no unread messages
-      one: Your inbox contains 1 unread message
-      other: Your inbox contains %{count} unread messages
-    logout: logout
-    logout_tooltip: "Log out"
+    home: Go to Home Location
+    logout: Logout
     log_in: log in
     log_in_tooltip: Log in with an existing account
     sign_up: sign up
@@ -1170,6 +1163,50 @@ en:
         to our <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">takedown
         procedure</a> or file directly at our
         <a href="http://dmca.openstreetmap.org/">on-line filing page</a>.
+  welcome_page:
+    title: Welcome!
+    introduction_html: |
+      Welcome to OpenStreetMap, the free and editable map of the world. Now that you're signed
+      up, you're all set to get started mapping. Here's a quick guide with the most important
+      things you need to know.
+    whats_on_the_map:
+      title: What's on the Map
+      on_html: |
+        OpenStreetMap is a place for mapping things that are both <em>real and current</em> -
+        it includes millions of buildings, roads, and other details about places. You can map
+        whatever real-world features are interesting to you.
+      off_html: |
+        What it <em>doesn't</em> include is opinionated data like ratings, historical or
+        hypothetical features, and data from copyrighted sources. Unless you have special
+        permission, don't copy from online or paper maps.
+    basic_terms:
+      title: Basic Terms For Mapping
+      paragraph_1_html: |
+        OpenStreetMap has some of its own lingo. Here are a few key words that'll come in handy.
+      editor_html: |
+        An <strong>editor</strong> is a program or website you can use to edit the map.
+      node_html: |
+        A <strong>node</strong> is a point on the map, like a single restauraunt or a tree.
+      way_html: |
+        A <strong>way</strong> is a line or area, like a road, stream, lake or building.
+      tag_html: |
+        A <strong>tag</strong> is a bit of data about a node or way, like a
+        restaurant's name or a road's speed limit.
+    questions:
+      title: Any questions?
+      paragraph_1_html: |
+        Need help mapping, or not clear on how to use OpenStreetMap? Get your questions answered
+        on <a href='http://help.openstreetmap.org/'>the help website</a>.
+    start_mapping: Start Mapping
+    add_a_note:
+      title: No Time To Edit? Add a Note!
+      paragraph_1_html: |
+        If you just want something small fixed and don't have the time to sign up and learn how to edit, it's
+        easy to add a note.
+      paragraph_2_html: |
+        Just go to <a href='%{map_url}'>the map</a> and click the note icon:
+        <span class='icon note'></span>. This will add a marker to the map, which you can move
+        by dragging. Add your message, then click save, and other mappers will investigate.
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
@@ -1206,28 +1243,7 @@ en:
       greeting: "Hi there!"
       created: "Someone (hopefully you) just created an account at %{site_url}."
       confirm: "Before we do anything else, we need to confirm that this request came from you, so if it did then please click the link below to confirm your account:"
-      welcome: "We would like to welcome you and provide you with some additional information to get you started."
-    signup_confirm_plain:
-      introductory_video: "You can watch an introductory video to OpenStreetMap here:"
-      more_videos: "There are more videos here:"
-      the_wiki: "Get reading about OpenStreetMap on the wiki:"
-      the_wiki_url: "http://wiki.openstreetmap.org/wiki/Beginners%27_guide"
-      blog_and_twitter: "Catch up with the latest news via the OpenStreetMap blog or Twitter:"
-      ask_questions: "You can ask any questions you may have about OpenStreetMap at our question and answer site:"
-      wiki_signup: "You may also want to sign up to the OpenStreetMap wiki at:"
-      wiki_signup_url: "http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page"
-      user_wiki_page: "It is recommended that you create a user wiki page, which includes category tags noting where you are, such as [[Category:Users_in_London]]."
-      current_user: "A list of current users in categories, based on where in the world they are, is available from:"
-    signup_confirm_html:
-      introductory_video: "You can watch an %{introductory_video_link}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are %{more_videos_link}."
-      more_videos_here: "more videos here"
-      get_reading: Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_guide">on the wiki</a>, and catch up with the latest news via the <a href="http://blog.openstreetmap.org/">OpenStreetMap blog</a> or <a href="http://twitter.com/openstreetmap">Twitter</a>.
-      ask_questions: You can ask any questions you may have about OpenStreetMap at our <a href="http://help.openstreetmap.org/">question and answer site</a>.
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+      welcome: "After you confirm your account, we'll provide you with some additional information to get you started."
     email_confirm:
       subject: "[OpenStreetMap] Confirm your email address"
     email_confirm_plain:
@@ -1270,7 +1286,7 @@ en:
   message:
     inbox:
       title: "Inbox"
-      my_inbox: "My inbox"
+      my_inbox: "My Inbox"
       outbox: "outbox"
       messages: "You have %{new_messages} and %{old_messages}"
       new_messages:
@@ -1697,11 +1713,15 @@ en:
       flash changed: "Your password has been changed."
       flash token bad: "Did not find that token, check the URL maybe?"
     new:
-      title: "Create account"
-      heading: "Create a User Account"
+      title: "Sign Up"
       no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
       contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible.'
-      fill_form: "Fill in the form and we will send you a quick email to activate your account."
+      about:
+        header: Free and editable
+        html: |
+          <p>Unlike other maps, OpenStreetMap is completely created by people like you,
+          and it's free for anyone to fix, update, download and use.</p>
+          <p>Sign up to get started contributing. We'll send an email to confirm your account.</p>
       license_agreement: 'When you confirm your account you will need to agree to the <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">contributor terms</a>.'
       email address: "Email Address:"
       confirm email address: "Confirm Email Address:"
@@ -1723,16 +1743,14 @@ en:
             with your OpenID in your user settings.
           </li>
         </ul>
-      continue: Continue
-      flash welcome: "Thanks for signing up. We've sent a welcome message to %{email} with some hints on getting started."
-      flash create success message: "Thanks for signing up. We've sent a confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+      continue: Sign Up
       terms accepted: "Thanks for accepting the new contributor terms!"
       terms declined: "We are sorry that you have decided to not accept the new Contributor Terms. For more information, please see <a href=\"%{url}\">this wiki page</a>."
       terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
     terms:
       title: "Contributor terms"
       heading: "Contributor terms"
-      read and accept: "Please read the agreement below and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
+      read and accept: "Please read the agreement and press the agree button to confirm that you accept the terms of this agreement for your existing and future contributions."
       consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
@@ -1741,7 +1759,7 @@ en:
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       you need to accept or decline: "Please read and then either accept or decline the new Contributor Terms to continue."
-      legale_select: "Please select your country of residence:"
+      legale_select: "Country of residence:"
       legale_names:
         france: "France"
         italy: "Italy"
@@ -1751,23 +1769,24 @@ en:
       heading: "The user %{user} does not exist"
       body: "Sorry, there is no user with the name %{user}. Please check your spelling, or maybe the link you clicked is wrong."
     view:
-      my diary: my diary
+      my diary: My Diary
       new diary entry: new diary entry
-      my edits: my edits
-      my traces: my traces
-      my notes: my map notes
-      my settings: my settings
-      my comments: my comments
+      my edits: My Edits
+      my traces: My Traces
+      my notes: My Notes
+      my profile: My Profile
+      my settings: My Settings
+      my comments: My Comments
       oauth settings: oauth settings
-      blocks on me: blocks on me
-      blocks by me: blocks by me
-      send message: send message
-      diary: diary
-      edits: edits
-      traces: traces
-      notes: map notes
-      remove as friend: unfriend
-      add as friend: add friend
+      blocks on me: Blocks on Me
+      blocks by me: Blocks by Me
+      send message: Send Message
+      diary: Diary
+      edits: Edits
+      traces: Traces
+      notes: Map Notes
+      remove as friend: Unfriend
+      add as friend: Add Friend
       mapper since: "Mapper since:"
       ago: "(%{time_in_words_ago} ago)"
       ct status: "Contributor terms:"
@@ -1800,7 +1819,7 @@ en:
           moderator: "Revoke moderator access"
       block_history: "blocks received"
       moderator_history: "blocks given"
-      comments: "comments"
+      comments: "Comments"
       create_block: "block this user"
       activate_user: "activate this user"
       deactivate_user: "deactivate this user"
@@ -1869,14 +1888,16 @@ en:
       flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
       flash update success: "User information updated successfully."
     confirm:
-      heading: Confirm a user account
+      heading: Check your email!
+      introduction_1: |
+        We sent you a confirmation email.
+      introduction_2: |
+        Confirm your account by clicking on the link in the email and you'll be able to start mapping.
       press confirm button: "Press the confirm button below to activate your account."
       button: Confirm
-      success: "Confirmed your account, thanks for signing up!"
-      before you start: "We know you're probably in a hurry to start mapping, but before you do you might like to fill in some more information about yourself in the form below."
       already active: "This account has already been confirmed."
-      unknown token: "That token doesn't seem to exist."
-      reconfirm: "If it's been a while since you signed up you might need to <a href=\"%{reconfirm}\">send yourself a new confirmation email</a>."
+      unknown token: "That confirmation code has expired or does not exist."
+      reconfirm_html: "If you need us to resend the confirmation email, <a href=\"%{reconfirm}\">click here</a>."
     confirm_resend:
       success: "We've sent a new confirmation note to %{email} and as soon as you confirm your account you'll be able to get mapping.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
       failure: "User %{name} not found."
@@ -2112,13 +2133,10 @@ en:
     site:
       edit_tooltip: Edit the map
       edit_disabled_tooltip: Zoom in to edit the map
-      edit_zoom_alert: You must zoom in to edit the map
       history_tooltip: View edits for this area
       history_disabled_tooltip: Zoom in to view edits for this area
-      history_zoom_alert: You must zoom in to view edits for this area
       createnote_tooltip: Add a note to the map
       createnote_disabled_tooltip: Zoom in to add a note to the map
-      createnote_zoom_alert: You must zoom in to add a note to the map
     notes:
       new:
         intro: "In order to improve the map the information you enter is shown to other mappers, so please be as descriptive and precise as possible when moving the marker to the correct position and entering your note below."
@@ -2139,6 +2157,7 @@ en:
         reactivate: Reactivate
         comment_and_resolve: Comment & Resolve
         comment: Comment
+    edit_help: Move the map and zoom in on a location you want to edit, then click here.
   redaction:
     edit:
       description: "Description"
index 5484dc1c3204a61cfa307007b22a7c7ffa19f166..99c4d795fb89edc8782c469cecc88824379db13d 100644 (file)
@@ -1207,6 +1207,54 @@ fr:
       opened: nouvelle note (près de %{place})
       reopened: note réactivée (près de %{place})
       title: Notes OpenStreetMap
+  welcome_page:
+    title: Bienvenue !
+    introduction_html: |
+      Bienvenue à OpenStreetMap, la carte du monde libre et éditable. Maintenant que vous
+      êtes enregistré, vous avez tout ce qu'il faut pour commencer à cartographier. Ce qui
+      suit est un petit guide des choses les plus importantes à savoir.
+    whats_on_the_map:
+      title: Ce qu'il y a sur la carte
+      on_html: |
+        OpenStreetMap sert à cartographier des choses à la fois <em>réelles et actuelles</em>
+        - il inclut des millions de bâtiments, de routes, et d'autres détails de lieux. Vous
+        pouvez cartographier n'importe quel élément du monde réel qui vous intéresse.
+      off_html: |
+        Ce qui est par contre <em>exclu</em> sont les données subjectives comme les cotes de
+        popularité, les éléments historiques ou hypothétiques, et les données venant de source
+        copyrightée. À moins d'avoir une permission spéciale, ne copiez pas à partir d'une
+        carte papier ou en ligne.
+    basic_terms:
+      title: Vocabulaire de base de cartographie
+      paragraph_1_html: |
+        OpenStreetMap a son propre jargon. Voici quelques mots clefs qui vous seront utiles.
+      editor_html: |
+        Un <strong>éditeur</strong> est un programme ou site web qui vous permet d'éditer la carte.
+      node_html: |
+        Un <strong>nœud</strong> est un point sur la carte, comme un restaurant ou un arbre individuel.
+      way_html: |
+        Un <strong>chemin</strong est une ligne ou une surface, comme par exemple une rue, un
+        ruisseau, un lac, ou un bâtiment.
+      tag_html: |
+        Un <strong>tag</strong> est une information à propos d'un nœud ou d'un chemin, comme
+        le nom d'un restaurant ou la vitesse limite d'une rue.
+    questions:
+      title: Des questions ?
+      paragraph_1_html: |
+        Besoin d'aide pour cartographier, ou pas sûr de comment utilise OpenStreetMap ?
+        Obtenez les réponses à vos questions sur <a href='http://help.openstreetmap.org/'>
+        le site d'aide</a>.
+    start_mapping: Commencer à cartographier
+    add_a_note:
+      title: Pas le temps d'éditer ? Ajoutez une note !
+      paragraph_1_html: |
+        Si vous voulez juste faire une petite correction et n'avez pas le temps de vous
+        enregistrer et d'apprendre à éditer, il est facile d'ajouter une note.
+      paragraph_2_html: |
+        Allez simplement sur <a href='%{map_url}'>la carte</a> et cliquez sur l'icône note:
+        <span class='icon note'></span>. Cela ajoutera un marqueur sur la carte, que vous
+        pouvez déplacer en faisant glisser la carte. Ajoutez votre message puis cliquez sur
+        "ajouter une note", et d'autres contributeurs iront regarder.
   notifier: 
     diary_comment_notification: 
       footer: Vous pouvez également lire le commentaire sur %{readurl}, commenter sur %{commenturl} ou répondre sur %{replyurl}
index bc473a4b0d74d86724add2413aef7d6f05addc63..0168b6190b3b00f3e213ac2a103a3b87c09594b4 100644 (file)
@@ -122,9 +122,10 @@ OpenStreetMap::Application.routes.draw do
 
   # web site
   root :to => 'site#index', :via => [:get, :post]
-  match '/edit' => 'site#edit', :via => :get
+  match '/edit' => 'site#edit', :via => :get, :as => :edit
   match '/copyright/:copyright_locale' => 'site#copyright', :via => :get
   match '/copyright' => 'site#copyright', :via => :get
+  match '/welcome' => 'site#welcome', :via => :get, :as => :welcome
   match '/history' => 'changeset#list', :via => :get
   match '/history/feed' => 'changeset#feed', :via => :get, :format => :atom
   match '/export' => 'site#index', :export => true, :via => :get
index 770f3e2b5171a7e4af59d4a9b3f156bdaa25ad32..8885fae28fb5de64c7acb078570f3963ea036431 100644 (file)
@@ -34,6 +34,10 @@ class SiteControllerTest < ActionController::TestCase
       { :path => "/copyright/locale", :method => :get },
       { :controller => "site", :action => "copyright", :copyright_locale => "locale" }
     )
+    assert_routing(
+      { :path => "/welcome", :method => :get },
+      { :controller => "site", :action => "welcome" }
+    )
     assert_routing(
       { :path => "/export", :method => :get },
       { :controller => "site", :action => "index", :export => true }
@@ -90,6 +94,17 @@ class SiteControllerTest < ActionController::TestCase
     assert_redirected_to :controller => :site, :action => 'index', :anchor => 'map=3/4/5&layers=T'
   end
 
+  def test_edit_redirect
+    get :edit, :lat => 4, :lon => 5
+    assert_redirected_to :controller => :site, :action => 'edit', :anchor => 'map=5/4/5'
+
+    get :edit, :lat => 4, :lon => 5, :zoom => 3
+    assert_redirected_to :controller => :site, :action => 'edit', :anchor => 'map=3/4/5'
+
+    get :edit, :lat => 4, :lon => 5, :zoom => 3, :editor => 'id'
+    assert_redirected_to :controller => :site, :action => 'edit', :editor => 'id', :anchor => 'map=3/4/5'
+  end
+
   def test_permalink
     get :permalink, :code => 'wBz3--'
     assert_redirected_to :controller => :site, :action => 'index', :anchor => 'map=3/4.8779296875/3.955078125'
index 61286b2845e94c660e5bc930f8649e6841aba262..6a64fd8d81e40a40785da76d19ad43a0e1498f6a 100644 (file)
@@ -199,7 +199,7 @@ class UserControllerTest < ActionController::TestCase
 
     assert_select "html", :count => 1 do
       assert_select "head", :count => 1 do
-        assert_select "title", :text => /Create account/, :count => 1
+        assert_select "title", :text => /Sign Up/, :count => 1
       end
       assert_select "body", :count => 1 do
         assert_select "div#content", :count => 1 do
@@ -209,118 +209,137 @@ class UserControllerTest < ActionController::TestCase
             assert_select "input[id=user_display_name]", :count => 1
             assert_select "input[id=user_pass_crypt][type=password]", :count => 1
             assert_select "input[id=user_pass_crypt_confirmation][type=password]", :count => 1
-            assert_select "input[type=submit][value=Continue]", :count => 1
+            assert_select "input[type=submit][value=Sign Up]", :count => 1
           end
         end
       end
     end
   end
-  
+
+  def new_user
+    user = User.new
+    user.status = "pending"
+    user.display_name = "new_tester"
+    user.email = "newtester@osm.org"
+    user.email_confirmation = "newtester@osm.org"
+    user.pass_crypt = "testtest"
+    user.pass_crypt_confirmation = "testtest"
+    user
+  end
+
   def test_user_create_success
-    new_email = "newtester@osm.org"
-    display_name = "new_tester"
+    user = new_user
+
     assert_difference('User.count') do
       assert_difference('ActionMailer::Base.deliveries.size') do
-        session[:new_user] = User.new({
-          :status => "pending", :display_name => display_name,
-          :email => new_email, :email_confirmation => new_email, 
-          :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
-        }, :without_protection => true)
-
-        post :save
+        post :save, {}, {:new_user => user}
       end
     end
-      
+
     # Check the e-mail
     register_email = ActionMailer::Base.deliveries.first
-  
-    assert_equal register_email.to[0], new_email
+
+    assert_equal register_email.to[0], user.email
     assert_match /#{@url}/, register_email.body.to_s
 
     # Check the page
-    assert_redirected_to :action => 'login', :referer => nil
-      
+    assert_redirected_to :action => 'confirm', :display_name => user.display_name
+
     ActionMailer::Base.deliveries.clear
   end
-  
+
   def test_user_create_submit_duplicate_email
-    email = users(:public_user).email
-    display_name = "new_tester"
-    assert_difference('User.count', 0) do
-      assert_difference('ActionMailer::Base.deliveries.size', 0) do
-        session[:new_user] = User.new({
-          :status => "pending", :display_name => display_name,
-          :email => email, :email_confirmation => email, 
-          :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
-        }, :without_protection => true)
-
-        post :save
+    user = new_user
+    user.email = users(:public_user).email
+
+    assert_no_difference('User.count') do
+      assert_no_difference('ActionMailer::Base.deliveries.size') do
+        post :save, {}, {:new_user => user}
       end
     end
-    assert_response :success                                                                       
+
+    assert_response :success
     assert_template 'new'
-    assert_select "div#errorExplanation"
-    assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email"
+    assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
   end
-  
+
   def test_user_create_submit_duplicate_email_uppercase
-    email = users(:public_user).email.upcase
-    display_name = "new_tester"
-    assert_difference('User.count', 0) do
-      assert_difference('ActionMailer::Base.deliveries.size', 0) do
-        session[:new_user] = User.new({
-          :status => "pending", :display_name => display_name,
-          :email => email, :email_confirmation => email, 
-          :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
-        }, :without_protection => true)
-
-        post :save
+    user = new_user
+    user.email = users(:public_user).email.upcase
+
+    assert_no_difference('User.count') do
+      assert_no_difference('ActionMailer::Base.deliveries.size') do
+        post :save, {}, {:new_user => user}
       end
     end
-    assert_response :success                                                                       
+
+    assert_response :success
     assert_template 'new'
-    assert_select "div#errorExplanation"
-    assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email"
+    assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
   end
     
   def test_user_create_submit_duplicate_name
-    email = "new_tester@example.com"
-    display_name = users(:public_user).display_name
-    assert_difference('User.count', 0) do
-      assert_difference('ActionMailer::Base.deliveries.size', 0) do
-        session[:new_user] = User.new({
-          :status => "pending", :display_name => display_name,
-          :email => email, :email_confirmation => email, 
-          :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
-        }, :without_protection => true)
-
-        post :save
+    user = new_user
+    user.display_name = users(:public_user).display_name
+
+    assert_no_difference('User.count') do
+      assert_no_difference('ActionMailer::Base.deliveries.size') do
+        post :save, {}, {:new_user => user}
       end
     end
-    assert_response :success                                                                       
+
+    assert_response :success
     assert_template 'new'
-    assert_select "div#errorExplanation"
-    assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+    assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
   end
   
   def test_user_create_submit_duplicate_name_uppercase
-    email = "new_tester@example.com"
-    display_name = users(:public_user).display_name.upcase
-    assert_difference('User.count', 0) do
-      assert_difference('ActionMailer::Base.deliveries.size', 0) do
-        session[:new_user] = User.new({
-          :status => "pending", :display_name => display_name,
-          :email => email, :email_confirmation => email, 
-          :pass_crypt => "testtest", :pass_crypt_confirmation => "testtest"
-        }, :without_protection => true)
-
-        post :save
+    user = new_user
+    user.display_name = users(:public_user).display_name.upcase
+
+    assert_no_difference('User.count') do
+      assert_no_difference('ActionMailer::Base.deliveries.size') do
+        post :save, {}, {:new_user => user}
       end
     end
-    assert_response :success                                                                       
+
+    assert_response :success
     assert_template 'new'
-    assert_select "div#errorExplanation"
-    assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+    assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+  end
+
+  def test_user_save_referer_params
+    user = new_user
+
+    post :save, {}, {:new_user => user,
+                     :referer => '/edit?editor=id#map=1/2/3'}
+
+    assert_equal welcome_path(:editor => 'id', :zoom => 1, :lat => 2, :lon => 3),
+                 user.tokens.order("id DESC").first.referer
+  end
+
+  def test_user_confirm_expired_token
+    user = users(:inactive_user)
+    token = user.tokens.new
+    token.expiry = 1.day.ago
+    token.save!
+
+    @request.cookies["_osm_session"] = user.display_name
+    post :confirm, :confirm_string => token.token
+
+    assert_redirected_to :action => 'confirm'
+    assert_match /expired/, flash[:error]
+  end
+
+  def test_user_already_confirmed
+    user = users(:normal_user)
+    token = user.tokens.create
+
+    @request.cookies["_osm_session"] = user.display_name
+    post :confirm, :confirm_string => token.token
+
+    assert_redirected_to :action => 'login'
+    assert_match /confirmed/, flash[:error]
   end
 
   def test_user_terms_new_user
@@ -582,10 +601,33 @@ class UserControllerTest < ActionController::TestCase
     get :api_read, :id => users(:normal_user).id
     assert_response :success
 
+    # check the data that is returned
+    assert_select "description", :count => 1, :text => "test"
+    assert_select "contributor-terms", :count => 1 do
+      assert_select "[agreed=true]"
+    end
+    assert_select "img", :count => 1
+    assert_select "roles", :count => 1 do
+      assert_select "role", :count => 0
+    end
+    assert_select "changesets", :count => 1 do
+      assert_select "[count=0]"
+    end
+    assert_select "traces", :count => 1 do
+      assert_select "[count=0]"
+    end
+    assert_select "blocks", :count => 1 do
+      assert_select "received", :count => 1 do
+        assert_select "[count=0][active=0]"
+      end
+      assert_select "issued", :count => 0
+    end
+
     # check that we aren't revealing private information
     assert_select "contributor-terms[pd]", false
     assert_select "home", false
     assert_select "languages", false
+    assert_select "messages", false
 
     # check that a suspended user is not returned
     get :api_read, :id => users(:suspended_user).id
@@ -601,12 +643,50 @@ class UserControllerTest < ActionController::TestCase
   end
 
   def test_user_api_details
+    # check that nothing is returned when not logged in
     get :api_details
     assert_response :unauthorized
     
+    # check that we get a response when logged in
     basic_authorization(users(:normal_user).email, "test")
     get :api_details
     assert_response :success
+
+    # check the data that is returned
+    assert_select "description", :count => 1, :text => "test"
+    assert_select "contributor-terms", :count => 1 do
+      assert_select "[agreed=true][pd=false]"
+    end
+    assert_select "img", :count => 1
+    assert_select "roles", :count => 1 do
+      assert_select "role", :count => 0
+    end
+    assert_select "changesets", :count => 1 do
+      assert_select "[count=0]", :count => 1
+    end
+    assert_select "traces", :count => 1 do
+      assert_select "[count=0]", :count => 1
+    end
+    assert_select "blocks", :count => 1 do
+      assert_select "received", :count => 1 do
+        assert_select "[count=0][active=0]"
+      end
+      assert_select "issued", :count => 0
+    end
+    assert_select "home", :count => 1 do
+      assert_select "[lat=12.1][lon=12.1][zoom=3]"
+    end
+    assert_select "languages", :count => 1 do
+      assert_select "lang", :count => 1, :text => "en"
+    end
+    assert_select "messages", :count => 1 do
+      assert_select "received", :count => 1 do
+        assert_select "[count=1][unread=0]"
+      end
+      assert_select "sent", :count => 1 do
+        assert_select "[count=1]"
+      end
+    end
   end
 
   def test_user_make_friend
index c565afd1ed132961f2ae4f49175b3995f7c0d275..76397ae28f6c2355d455cf7c33b61c71b5cd7172 100644 (file)
@@ -29,8 +29,7 @@ class UserCreationTest < ActionController::IntegrationTest
       assert_response :success
       assert_template 'user/new'
       assert_equal response.headers['Content-Language'][0..1], localer.to_s[0..1] unless localer == :root
-      assert_select "div#errorExplanation"
-      assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_email"
+      assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_email"
       assert_no_missing_translations
     end
   end
@@ -48,8 +47,7 @@ class UserCreationTest < ActionController::IntegrationTest
       end
       assert_response :success
       assert_template 'user/new'
-      assert_select "div#errorExplanation"
-      assert_select "div#signupForm > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
+      assert_select "form > fieldset > div.form-row > div.field_with_errors > input#user_display_name"
       assert_no_missing_translations
     end
   end
@@ -84,7 +82,7 @@ class UserCreationTest < ActionController::IntegrationTest
 
       # Check the page
       assert_response :success
-      assert_template 'login'
+      assert_template 'user/confirm'
 
       ActionMailer::Base.deliveries.clear
     end
@@ -128,22 +126,20 @@ class UserCreationTest < ActionController::IntegrationTest
 
     # Check the page
     assert_response :success
-    assert_template 'login'
+    assert_template 'user/confirm'
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
-    get 'user/confirm', { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", { :confirm_string => confirm_string }
     assert_response :success
     assert_template 'user/confirm'
 
-    post 'user/confirm', { :confirm_string => confirm_string, :confirm_action => 'submit' }
-    assert_response :redirect # to trace/mine in original referrer
-    follow_redirect!
-    assert_response :redirect # but it not redirects to /user/<display_name>/traces
+    post "user/#{display_name}/confirm", { :confirm_string => confirm_string }
+    assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template 'trace/list'
+    assert_template 'site/welcome'
   end
 
   def test_user_create_openid_success
@@ -167,7 +163,7 @@ class UserCreationTest < ActionController::IntegrationTest
 
     # Check the page
     assert_response :success
-    assert_template 'login'
+    assert_template 'user/confirm'
 
     ActionMailer::Base.deliveries.clear
   end
@@ -223,21 +219,19 @@ class UserCreationTest < ActionController::IntegrationTest
 
     # Check the page
     assert_response :success
-    assert_template 'login'
+    assert_template 'user/confirm'
 
     ActionMailer::Base.deliveries.clear
 
     # Go to the confirmation page
-    get 'user/confirm', { :confirm_string => confirm_string }
+    get "/user/#{display_name}/confirm", { :confirm_string => confirm_string }
     assert_response :success
     assert_template 'user/confirm'
 
-    post 'user/confirm', { :confirm_string => confirm_string, :confirm_action => 'submit' }
-    assert_response :redirect # to trace/mine in original referrer
-    follow_redirect!
-    assert_response :redirect # but it not redirects to /user/<display_name>/traces
+    post "/user/#{display_name}/confirm", { :confirm_string => confirm_string }
+    assert_response :redirect
     follow_redirect!
     assert_response :success
-    assert_template "trace/list"
+    assert_template 'site/welcome'
   end
 end
diff --git a/vendor/assets/bootstrap/bootstrap.dropdown.js b/vendor/assets/bootstrap/bootstrap.dropdown.js
new file mode 100644 (file)
index 0000000..d04da5d
--- /dev/null
@@ -0,0 +1,169 @@
+/* ============================================================
+ * bootstrap-dropdown.js v2.3.2
+ * http://getbootstrap.com/2.3.2/javascript.html#dropdowns
+ * ============================================================
+ * Copyright 2013 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============================================================ */
+
+
+!function ($) {
+
+  "use strict"; // jshint ;_;
+
+
+ /* DROPDOWN CLASS DEFINITION
+  * ========================= */
+
+  var toggle = '[data-toggle=dropdown]'
+    , Dropdown = function (element) {
+        var $el = $(element).on('click.dropdown.data-api', this.toggle)
+        $('html').on('click.dropdown.data-api', function () {
+          $el.parent().removeClass('open')
+        })
+      }
+
+  Dropdown.prototype = {
+
+    constructor: Dropdown
+
+  , toggle: function (e) {
+      var $this = $(this)
+        , $parent
+        , isActive
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      clearMenus()
+
+      if (!isActive) {
+        if ('ontouchstart' in document.documentElement) {
+          // if mobile we we use a backdrop because click events don't delegate
+          $('<div class="dropdown-backdrop"/>').insertBefore($(this)).on('click', clearMenus)
+        }
+        $parent.toggleClass('open')
+      }
+
+      $this.focus()
+
+      return false
+    }
+
+  , keydown: function (e) {
+      var $this
+        , $items
+        , $active
+        , $parent
+        , isActive
+        , index
+
+      if (!/(38|40|27)/.test(e.keyCode)) return
+
+      $this = $(this)
+
+      e.preventDefault()
+      e.stopPropagation()
+
+      if ($this.is('.disabled, :disabled')) return
+
+      $parent = getParent($this)
+
+      isActive = $parent.hasClass('open')
+
+      if (!isActive || (isActive && e.keyCode == 27)) {
+        if (e.which == 27) $parent.find(toggle).focus()
+        return $this.click()
+      }
+
+      $items = $('[role=menu] li:not(.divider):visible a', $parent)
+
+      if (!$items.length) return
+
+      index = $items.index($items.filter(':focus'))
+
+      if (e.keyCode == 38 && index > 0) index--                                        // up
+      if (e.keyCode == 40 && index < $items.length - 1) index++                        // down
+      if (!~index) index = 0
+
+      $items
+        .eq(index)
+        .focus()
+    }
+
+  }
+
+  function clearMenus() {
+    $('.dropdown-backdrop').remove()
+    $(toggle).each(function () {
+      getParent($(this)).removeClass('open')
+    })
+  }
+
+  function getParent($this) {
+    var selector = $this.attr('data-target')
+      , $parent
+
+    if (!selector) {
+      selector = $this.attr('href')
+      selector = selector && /#/.test(selector) && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
+    }
+
+    $parent = selector && $(selector)
+
+    if (!$parent || !$parent.length) $parent = $this.parent()
+
+    return $parent
+  }
+
+
+  /* DROPDOWN PLUGIN DEFINITION
+   * ========================== */
+
+  var old = $.fn.dropdown
+
+  $.fn.dropdown = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('dropdown')
+      if (!data) $this.data('dropdown', (data = new Dropdown(this)))
+      if (typeof option == 'string') data[option].call($this)
+    })
+  }
+
+  $.fn.dropdown.Constructor = Dropdown
+
+
+ /* DROPDOWN NO CONFLICT
+  * ==================== */
+
+  $.fn.dropdown.noConflict = function () {
+    $.fn.dropdown = old
+    return this
+  }
+
+
+  /* APPLY TO STANDARD DROPDOWN ELEMENTS
+   * =================================== */
+
+  $(document)
+    .on('click.dropdown.data-api', clearMenus)
+    .on('click.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.dropdown.data-api'  , toggle, Dropdown.prototype.toggle)
+    .on('keydown.dropdown.data-api', toggle + ', [role=menu]' , Dropdown.prototype.keydown)
+
+}(window.jQuery);
index 8c00db1c2eb4b782b7c8683c925c3ff64099c361..6463f2f1cbed5a44ddb0863888f6205283a32609 100644 (file)
@@ -3506,15 +3506,15 @@ img.wiki-image {
     padding-top: 15px;
 }
 
-.save-success .osm:before {
+.save-success .button.osm:before {
     background-position: 0px -220px;
 }
 
-.save-success .twitter:before {
+.save-success .button.twitter:before {
     background-position: -100px -220px;
 }
 
-.save-success .facebook:before {
+.save-success .button.facebook:before {
     background-position: -200px -220px;
 }
 
index 9aef5671a29fd33db3cd2af179a2a693def0f60d..aeb16e7a4d968f7d6de52252bc37fe19447bbb40 100644 (file)
@@ -15028,12 +15028,19 @@ window.iD = function () {
     // https://github.com/systemed/iD/issues/772
     // http://mathiasbynens.be/notes/localstorage-pattern#comment-9
     try { storage = localStorage; } catch (e) {}
-    storage = storage || {};
+    storage = storage || (function() {
+        var s = {};
+        return {
+            getItem: function(k) { return s[k]; },
+            setItem: function(k, v) { s[k] = v; },
+            removeItem: function(k) { delete s[k] }
+        };
+    })();
 
     context.storage = function(k, v) {
-        if (arguments.length === 1) return storage[k];
-        else if (v === null) delete storage[k];
-        else storage[k] = v;
+        if (arguments.length === 1) return storage.getItem(k);
+        else if (v === null) storage.removeItem(k);
+        else storage.setItem(k, v);
     };
 
     var history = iD.History(context),
@@ -15236,7 +15243,7 @@ window.iD = function () {
     return d3.rebind(context, dispatch, 'on');
 };
 
-iD.version = '1.1.3';
+iD.version = '1.1.4';
 
 (function() {
     var detected = {};
@@ -23730,7 +23737,7 @@ iD.ui.Background = function(context) {
             ['top', [0, -1]],
             ['right', [-1, 0]],
             ['bottom', [0, 1]]],
-        opacityDefault = (context.storage('background-opacity') !== undefined) ?
+        opacityDefault = (context.storage('background-opacity') != undefined) ?
             (+context.storage('background-opacity')) : 0.5;
 
     function background(selection) {
@@ -27753,7 +27760,9 @@ iD.ui.preset.localized = function(field, context) {
 
         if (language) value = language[2];
 
-        t[key(d.lang)] = '';
+        if (d.lang) {
+            t[key(d.lang)] = '';
+        }
 
         if (d.value) {
             t[key(value)] = d.value;
index 6e013dccce51eae447002c45df12291fcd1ceb5c..e3db97831f8e49cf9cc35e4d2748a9eab39dcd5c 100644 (file)
Binary files a/vendor/assets/potlatch2/potlatch2.swf and b/vendor/assets/potlatch2/potlatch2.swf differ