Merge branch 'master' into mapquest

diff --git a/.gitignore b/.gitignore
index f3b6c16954ebc40c1806456e68a824a008a3e3a4..b07f60640d27aae37960809ceebbec12cc17a021 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,13 +2,18 @@ build.properties
 l10n/locale/bundles
 version.as
 halcyon.tmproj
+Potlatch2.as3proj
 
 resources/locales
 resources/*.swf
 resources/*.cache
 resources/docs
+resources/mapquest
 
 /tests/bin/
 /tests/report/
 
 /generated
+
+bin/
+obj/

diff --git a/embedded/save.svg b/embedded/save.svg
index 67415d55e0fd36e82581fe3de1ba3f37df1dff53..0f5627a3a507ce560a3950199644753373056096 100644 (file)
--- a/embedded/save.svg
+++ b/embedded/save.svg
@@ -1,107 +1,36 @@
-<?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="24"
-   height="24"
-   id="svg2383"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="save.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0">
-  <defs
-     id="defs2385">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective2391" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="17.258093"
-     inkscape:cy="3.7405397"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="875"
-     inkscape:window-height="723"
-     inkscape:window-x="123"
-     inkscape:window-y="47" />
-  <metadata
-     id="metadata2388">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <g
-       id="g2384"
-       transform="scale(0.75,0.75)">
-      <path
-         id="rect3163"
-         d="M 1.1875,0 C 0.52269997,0 -2.6888214e-17,0.52269997 0,1.1875 L 0,30.8125 C 0,31.4773 0.52269997,32 1.1875,32 L 30.8125,32 C 31.4773,32 32,31.477301 32,30.8125 L 32,28.0625 L 30.375,28.0625 L 30.375,26.09375 L 32,26.09375 L 32,1.1875 C 32,0.52269997 31.477301,-4.3657207e-17 30.8125,0 L 1.1875,0 z M 16,10.71875 C 18.908428,10.71875 21.28125,13.091572 21.28125,16 C 21.28125,18.908428 18.908428,21.28125 16,21.28125 C 13.091572,21.281251 10.71875,18.908428 10.71875,16 C 10.71875,13.091572 13.091572,10.71875 16,10.71875 z"
-         style="fill:#292929;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         transform="matrix(0.9076923,0,0,0.9076923,17.134838,0.9772032)"
-         d="M 4.5544651,16.550539 A 5.8047104,5.8047104 0 1 1 -7.0549557,16.550539 A 5.8047104,5.8047104 0 1 1 4.5544651,16.550539 z"
-         sodipodi:ry="5.8047104"
-         sodipodi:rx="5.8047104"
-         sodipodi:cy="16.550539"
-         sodipodi:cx="-1.2502453"
-         id="path3170"
-         style="fill:none;fill-opacity:1;stroke:#816868;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
-      <rect
-         rx="0.89999998"
-         y="1.9048082"
-         x="15.374877"
-         height="6.3405299"
-         width="1.2502453"
-         id="rect3175"
-         style="fill:none;fill-opacity:1;stroke:#816868;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <path
-         transform="matrix(2.6000001,0,0,2.6000001,-10.573504,-16.336016)"
-         d="M 7.054956,10.433268 A 0.22325809,0.22325809 0 1 1 6.6084398,10.433268 A 0.22325809,0.22325809 0 1 1 7.054956,10.433268 z"
-         sodipodi:ry="0.22325809"
-         sodipodi:rx="0.22325809"
-         sodipodi:cy="10.433268"
-         sodipodi:cx="6.8316979"
-         id="path3177"
-         style="fill:#523d3d;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
-      <rect
-         rx="0.79342103"
-         y="24.230619"
-         x="3.750736"
-         height="5.9833174"
-         width="13.068825"
-         id="rect3179"
-         style="fill:#eaeded;fill-opacity:1;stroke:none;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    </g>
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+        id="svg2383" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="save.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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px"
+        viewBox="3 3 18 18" enable-background="new 3 3 18 18" xml:space="preserve">
+<defs>
+       
+       
+               <inkscape:perspective  id="perspective2391" inkscape:persp3d-origin="16 : 10.666667 : 1" sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="32 : 16 : 1">
+               </inkscape:perspective>
+</defs>
+<sodipodi:namedview  id="base" showgrid="true" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:zoom="11.197802" inkscape:cx="17.258093" inkscape:cy="3.7405397" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:current-layer="layer1" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="875" inkscape:window-height="723" inkscape:window-x="123" inkscape:window-y="47">
+       </sodipodi:namedview>
+<g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
+       <g id="g2384" transform="scale(0.75,0.75)">
+               <path id="rect3163" fill="#009ADE" d="M4.891,4C4.392,4,4,4.392,4,4.891v22.218C4,27.607,4.392,28,4.891,28h22.218
+                       C27.607,28,28,27.607,28,27.109v-2.063h-1.219V23.57H28V4.891C28,4.392,27.607,4,27.109,4H4.891z M16,12.039
+                       c2.182,0,3.961,1.78,3.961,3.961c0,2.182-1.779,3.961-3.961,3.961c-2.181,0-3.961-1.779-3.961-3.961
+                       C12.039,13.819,13.819,12.039,16,12.039z"/>
+               
+                       <path id="path3170" sodipodi:ry="5.8047104" sodipodi:rx="5.8047104" sodipodi:cy="16.550539" sodipodi:cx="-1.2502453" sodipodi:type="arc" fill="none" stroke="#816868" stroke-width="1.425" d="
+                       M19.951,16c0,2.182-1.768,3.951-3.951,3.951c-2.183,0-3.952-1.768-3.952-3.951s1.77-3.952,3.952-3.952S19.951,13.818,19.951,16z"
+                       />
+               <path id="rect3175" fill="none" stroke="#816868" stroke-width="1.425" d="M16,5.428L16,5.428c0.259,0,0.469,0.303,0.469,0.675
+                       v3.406c0,0.372-0.21,0.675-0.469,0.675l0,0c-0.259,0-0.469-0.303-0.469-0.675V6.103C15.531,5.731,15.741,5.428,16,5.428z"/>
+               
+                       <path id="path3177" sodipodi:ry="0.22325809" sodipodi:rx="0.22325809" sodipodi:cy="10.433268" sodipodi:cx="6.8316979" sodipodi:type="arc" fill="#523D3D" d="
+                       M9.827,12.092c0,0.242-0.195,0.436-0.435,0.436c-0.241,0-0.436-0.195-0.436-0.435c0-0.001,0-0.001,0-0.001
+                       c-0.001-0.24,0.195-0.435,0.436-0.435C9.631,11.657,9.827,11.852,9.827,12.092L9.827,12.092z"/>
+               <path id="rect3179" fill="#EAEDED" d="M7.408,22.173h8.611c0.329,0,0.596,0.267,0.596,0.595v3.297
+                       c0,0.328-0.267,0.595-0.596,0.595H7.408c-0.329,0-0.595-0.267-0.595-0.595v-3.297C6.813,22.44,7.079,22.173,7.408,22.173z"/>
+       </g>
+</g>
 </svg>

diff --git a/embedded/save_disabled.svg b/embedded/save_disabled.svg
index 93296e6c6d4b1f2921363872ecb1036c74ff9f5d..80d85e632b67e5a29b278eacebc156e2a25e8fb3 100644 (file)
--- a/embedded/save_disabled.svg
+++ b/embedded/save_disabled.svg
@@ -1,107 +1,36 @@
-<?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="24"
-   height="24"
-   id="svg2383"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="save.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.0">
-  <defs
-     id="defs2385">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 16 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="32 : 16 : 1"
-       inkscape:persp3d-origin="16 : 10.666667 : 1"
-       id="perspective2391" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="0.78164521"
-     inkscape:cy="3.7405397"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1680"
-     inkscape:window-height="1021"
-     inkscape:window-x="1280"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata2388">
-    <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
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       inkscape:connector-curvature="0"
-       style="fill:#adadad;fill-opacity:1;stroke:none"
-       d="M 0.890625,0 C 0.39202498,0 0,0.39202498 0,0.890625 l 0,22.21875 C 0,23.607975 0.39202498,24 0.890625,24 l 22.21875,0 C 23.607975,24 24,23.607976 24,23.109375 l 0,-2.0625 -1.21875,0 0,-1.476563 1.21875,0 0,-18.679687 C 24,0.39202498 23.607976,0 23.109375,0 L 0.890625,0 z M 12,8.0390625 c 2.181321,0 3.960938,1.7796165 3.960938,3.9609375 0,2.181321 -1.779617,3.960938 -3.960938,3.960938 C 9.818679,15.960938 8.0390625,14.181321 8.0390625,12 8.0390625,9.818679 9.818679,8.0390625 12,8.0390625 z"
-       id="rect3163" />
-    <path
-       sodipodi:type="arc"
-       style="fill:none;stroke:#c1b2b2;stroke-width:1.89999998000000003;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="path3170"
-       sodipodi:cx="-1.2502453"
-       sodipodi:cy="16.550539"
-       sodipodi:rx="5.8047104"
-       sodipodi:ry="5.8047104"
-       d="m 4.5544651,16.550539 a 5.8047104,5.8047104 0 1 1 -11.6094208,0 5.8047104,5.8047104 0 1 1 11.6094208,0 z"
-       transform="matrix(0.68076923,0,0,0.68076923,12.851128,0.7329024)" />
-    <rect
-       style="fill:none;stroke:#c1b3b3;stroke-width:1.42499994999999990;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect3175"
-       width="0.937684"
-       height="4.7553973"
-       x="11.531157"
-       y="1.4286062"
-       rx="0.67499995" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#c4b0b0;fill-opacity:1;stroke:none"
-       id="path3177"
-       sodipodi:cx="6.8316979"
-       sodipodi:cy="10.433268"
-       sodipodi:rx="0.22325809"
-       sodipodi:ry="0.22325809"
-       d="m 7.054956,10.433268 a 0.22325809,0.22325809 0 1 1 -0.4465162,0 0.22325809,0.22325809 0 1 1 0.4465162,0 z"
-       transform="matrix(1.9500001,0,0,1.9500001,-7.930128,-12.252012)" />
-    <rect
-       style="fill:#eaeded;fill-opacity:1;stroke:none"
-       id="rect3179"
-       width="9.8016186"
-       height="4.4874878"
-       x="2.8130519"
-       y="18.172964"
-       rx="0.59506577" />
-  </g>
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+        id="svg2383" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="save.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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px"
+        viewBox="0 0 18 18" enable-background="new 0 0 18 18" xml:space="preserve">
+<defs>
+       
+       
+               <inkscape:perspective  id="perspective2391" inkscape:persp3d-origin="16 : 10.666667 : 1" inkscape:vp_z="32 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_x="0 : 16 : 1" sodipodi:type="inkscape:persp3d">
+               </inkscape:perspective>
+</defs>
+<sodipodi:namedview  id="base" inkscape:cy="3.7405397" inkscape:cx="17.258093" inkscape:zoom="11.197802" borderopacity="1.0" bordercolor="#666666" pagecolor="#ffffff" showgrid="true" inkscape:window-y="47" inkscape:window-x="123" inkscape:window-height="723" inkscape:window-width="875" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:current-layer="layer1" inkscape:pageshadow="2" inkscape:pageopacity="0.0">
+       </sodipodi:namedview>
+<g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
+       <g id="g2384" transform="scale(0.75,0.75)">
+               <path id="rect3163" fill="#ADADAD" d="M0.939,0.092c-0.499,0-0.891,0.392-0.891,0.891v22.218c0,0.497,0.392,0.891,0.891,0.891
+                       h22.218c0.497,0,0.891-0.393,0.891-0.891v-2.063h-1.219v-1.477h1.219V0.984c0-0.499-0.393-0.891-0.891-0.891H0.939z M12.048,8.131
+                       c2.182,0,3.961,1.78,3.961,3.961c0,2.182-1.779,3.961-3.961,3.961c-2.181,0-3.961-1.779-3.961-3.961
+                       C8.087,9.911,9.867,8.131,12.048,8.131z"/>
+               
+                       <path id="path3170" sodipodi:cx="-1.2502453" sodipodi:cy="16.550539" sodipodi:rx="5.8047104" sodipodi:ry="5.8047104" sodipodi:type="arc" fill="none" stroke="#818181" stroke-width="1.425" d="
+                       M15.999,12.092c0,2.182-1.768,3.951-3.951,3.951s-3.952-1.768-3.952-3.951s1.77-3.952,3.952-3.952S15.999,9.91,15.999,12.092z"/>
+               <path id="rect3175" fill="none" stroke="#818181" stroke-width="1.425" d="M12.048,1.52L12.048,1.52
+                       c0.259,0,0.469,0.303,0.469,0.675v3.406c0,0.372-0.21,0.675-0.469,0.675l0,0c-0.259,0-0.469-0.303-0.469-0.675V2.195
+                       C11.579,1.824,11.789,1.52,12.048,1.52z"/>
+               
+                       <path id="path3177" sodipodi:cx="6.8316979" sodipodi:cy="10.433268" sodipodi:rx="0.22325809" sodipodi:ry="0.22325809" sodipodi:type="arc" fill="#525252" d="
+                       M5.875,8.184c0,0.242-0.195,0.436-0.435,0.436c-0.241,0-0.436-0.195-0.436-0.435c0-0.001,0-0.001,0-0.001
+                       C5.003,7.945,5.199,7.749,5.44,7.749C5.679,7.749,5.875,7.945,5.875,8.184L5.875,8.184z"/>
+               <path id="rect3179" fill="#EDEDED" d="M3.456,18.266h8.61c0.331,0,0.596,0.267,0.596,0.595v3.297c0,0.328-0.266,0.595-0.596,0.595
+                       h-8.61c-0.329,0-0.595-0.267-0.595-0.595v-3.297C2.861,18.533,3.127,18.266,3.456,18.266z"/>
+       </g>
+</g>
 </svg>

diff --git a/embedded/upload.svg b/embedded/upload.svg
index 30c1ece31b7158be218f2622a911aac927dc6c58..8843446dcc958063cc971057ce9bd9be44b7e0bc 100644 (file)
--- a/embedded/upload.svg
+++ b/embedded/upload.svg
@@ -1,83 +1,26 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-
-<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"
-   version="1.1"
-   id="svg2383"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="upload.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   x="0px"
-   y="0px"
-   width="18px"
-   height="18px"
-   viewBox="0 0 18 18"
-   enable-background="new 0 0 18 18"
-   xml:space="preserve"><metadata
-   id="metadata3059"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata>
-<defs
-   id="defs3048">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+        id="svg2383" 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="save.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px"
+        viewBox="0 0 18 18" enable-background="new 0 0 18 18" xml:space="preserve">
+<defs>
        
        
-               <inkscape:perspective
-   sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 16 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="32 : 16 : 1"
-   id="perspective2391"
-   inkscape:persp3d-origin="16 : 10.666667 : 1">
+               <inkscape:perspective  sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="32 : 16 : 1" id="perspective2391" inkscape:persp3d-origin="16 : 10.666667 : 1">
                </inkscape:perspective>
 </defs>
-<sodipodi:namedview
-   showgrid="true"
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1.0"
-   inkscape:zoom="11.197802"
-   inkscape:cx="0.78164521"
-   inkscape:cy="3.7405397"
-   id="base"
-   inkscape:pageopacity="0.0"
-   inkscape:pageshadow="2"
-   inkscape:current-layer="svg2383"
-   inkscape:grid-bbox="true"
-   inkscape:document-units="px"
-   inkscape:window-width="1680"
-   inkscape:window-height="1021"
-   inkscape:window-x="1280"
-   inkscape:window-y="0"
-   inkscape:window-maximized="1">
+<sodipodi:namedview  showgrid="true" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:zoom="11.197802" inkscape:cx="17.258093" inkscape:cy="3.7405397" id="base" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:current-layer="layer1" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="875" inkscape:window-height="723" inkscape:window-x="123" inkscape:window-y="47">
        </sodipodi:namedview>
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="9.0161"
-   y1="18.0352"
-   x2="9.0161"
-   y2="4.882813e-004">
-       <stop
-   offset="0"
-   style="stop-color:#08ff00;stop-opacity:1;"
-   id="stop3053" />
-       <stop
-   offset="1"
-   style="stop-color:#66ff6f;stop-opacity:1;"
-   id="stop3055" />
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.0161" y1="18.0352" x2="9.0161" y2="4.882813e-004">
+       <stop  offset="0" style="stop-color:#0000FF"/>
+       <stop  offset="1" style="stop-color:#6666FF"/>
 </linearGradient>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="url(#SVGID_1_)"
-   d="M9.321,3.018L4.205,8.132c-0.226,0.226-0.226,0.589,0,0.813  l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0l5.115-5.115l2.033,2.034l0.007,0.006c0.224,0.219,0.585,0.217,0.809-0.006  c0.122-0.122,0.177-0.284,0.166-0.443l-0.408-9.302c0.003-0.151-0.054-0.307-0.169-0.422c-0.117-0.117-0.272-0.174-0.426-0.168  L7.729,0.001c-0.16-0.009-0.322,0.047-0.443,0.168c-0.225,0.225-0.225,0.59,0,0.814L9.321,3.018z M3.017,10.137  c-0.225-0.225-0.588-0.225-0.813,0l-2.035,2.034c-0.225,0.224-0.225,0.589,0,0.813l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0  l2.034-2.036c0.225-0.224,0.225-0.588,0-0.813L3.017,10.137z"
-   id="path3057" />
-</svg>
\ No newline at end of file
+<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M9.321,3.018L4.205,8.132c-0.226,0.226-0.226,0.589,0,0.813
+       l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0l5.115-5.115l2.033,2.034l0.007,0.006c0.224,0.219,0.585,0.217,0.809-0.006
+       c0.122-0.122,0.177-0.284,0.166-0.443l-0.408-9.302c0.003-0.151-0.054-0.307-0.169-0.422c-0.117-0.117-0.272-0.174-0.426-0.168
+       L7.729,0.001c-0.16-0.009-0.322,0.047-0.443,0.168c-0.225,0.225-0.225,0.59,0,0.814L9.321,3.018z M3.017,10.137
+       c-0.225-0.225-0.588-0.225-0.813,0l-2.035,2.034c-0.225,0.224-0.225,0.589,0,0.813l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0
+       l2.034-2.036c0.225-0.224,0.225-0.588,0-0.813L3.017,10.137z"/>
+</svg>

diff --git a/embedded/upload_disabled.svg b/embedded/upload_disabled.svg
index 411cdf71e5b4040e74682193c54a737ecbf08aae..763c20808152248fe08dd85b8cdc817abb19c0e8 100644 (file)
--- a/embedded/upload_disabled.svg
+++ b/embedded/upload_disabled.svg
@@ -1,88 +1,28 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 14.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 43363)  -->
-
-<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"
-   version="1.1"
-   id="svg2383"
-   sodipodi:version="0.32"
-   inkscape:version="0.48.0 r9654"
-   sodipodi:docname="upload_disabled.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   x="0px"
-   y="0px"
-   width="18px"
-   height="18px"
-   viewBox="0 0 18 18"
-   enable-background="new 0 0 18 18"
-   xml:space="preserve"><metadata
-   id="metadata3905"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata>
-<defs
-   id="defs3893">
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+        id="svg2383" 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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:version="0.32" inkscape:version="0.46" sodipodi:docname="save.svg" inkscape:output_extension="org.inkscape.output.svg.inkscape"
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="18px" height="18px"
+        viewBox="0 0 18 18" enable-background="new 0 0 18 18" xml:space="preserve">
+<defs>
        
        
-               <inkscape:perspective
-   sodipodi:type="inkscape:persp3d"
-   inkscape:vp_x="0 : 16 : 1"
-   inkscape:vp_y="0 : 1000 : 0"
-   inkscape:vp_z="32 : 16 : 1"
-   id="perspective2391"
-   inkscape:persp3d-origin="16 : 10.666667 : 1">
+               <inkscape:perspective  sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 16 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="32 : 16 : 1" id="perspective2391" inkscape:persp3d-origin="16 : 10.666667 : 1">
                </inkscape:perspective>
 </defs>
-<sodipodi:namedview
-   showgrid="true"
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1.0"
-   inkscape:zoom="11.197802"
-   inkscape:cx="8.1359176"
-   inkscape:cy="3.7405397"
-   id="base"
-   inkscape:pageopacity="0.0"
-   inkscape:pageshadow="2"
-   inkscape:current-layer="svg2383"
-   inkscape:grid-bbox="true"
-   inkscape:document-units="px"
-   inkscape:window-width="875"
-   inkscape:window-height="722"
-   inkscape:window-x="1459"
-   inkscape:window-y="137"
-   inkscape:window-maximized="0">
+<sodipodi:namedview  showgrid="true" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:zoom="11.197802" inkscape:cx="17.258093" inkscape:cy="3.7405397" id="base" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:current-layer="layer1" inkscape:grid-bbox="true" inkscape:document-units="px" inkscape:window-width="875" inkscape:window-height="723" inkscape:window-x="123" inkscape:window-y="47">
        </sodipodi:namedview>
-<g
-   id="layer1"
-   inkscape:label="Layer 1"
-   inkscape:groupmode="layer">
+<g id="layer1" inkscape:label="Layer 1" inkscape:groupmode="layer">
 </g>
-<linearGradient
-   id="SVGID_1_"
-   gradientUnits="userSpaceOnUse"
-   x1="9.0161"
-   y1="18.0352"
-   x2="9.0161"
-   y2="4.882813e-004">
-       <stop
-   offset="0"
-   style="stop-color:#5555bb;stop-opacity:1;"
-   id="stop3899" />
-       <stop
-   offset="1"
-   style="stop-color:#5d5ded;stop-opacity:1;"
-   id="stop3901" />
+<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="9.0161" y1="18.0352" x2="9.0161" y2="4.882813e-004">
+       <stop  offset="0" style="stop-color:#999999"/>
+       <stop  offset="1" style="stop-color:#CCCCCC"/>
 </linearGradient>
-<path
-   fill-rule="evenodd"
-   clip-rule="evenodd"
-   fill="url(#SVGID_1_)"
-   d="M9.321,3.018L4.205,8.132c-0.226,0.226-0.226,0.589,0,0.813  l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0l5.115-5.115l2.033,2.034l0.007,0.006c0.224,0.219,0.585,0.217,0.809-0.006  c0.122-0.122,0.177-0.284,0.166-0.443l-0.408-9.302c0.003-0.151-0.054-0.307-0.169-0.422c-0.117-0.117-0.272-0.174-0.426-0.168  L7.729,0.001c-0.16-0.009-0.322,0.047-0.443,0.168c-0.225,0.225-0.225,0.59,0,0.814L9.321,3.018z M3.017,10.137  c-0.225-0.225-0.588-0.225-0.813,0l-2.035,2.034c-0.225,0.224-0.225,0.589,0,0.813l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0  l2.034-2.036c0.225-0.224,0.225-0.588,0-0.813L3.017,10.137z"
-   id="path3903" />
-</svg>
\ No newline at end of file
+<path fill-rule="evenodd" clip-rule="evenodd" fill="url(#SVGID_1_)" d="M9.321,3.018L4.205,8.132c-0.226,0.226-0.226,0.589,0,0.813
+       l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0l5.115-5.115l2.033,2.034l0.007,0.006c0.224,0.219,0.585,0.217,0.809-0.006
+       c0.122-0.122,0.177-0.284,0.166-0.443l-0.408-9.302c0.003-0.151-0.054-0.307-0.169-0.422c-0.117-0.117-0.272-0.174-0.426-0.168
+       L7.729,0.001c-0.16-0.009-0.322,0.047-0.443,0.168c-0.225,0.225-0.225,0.59,0,0.814L9.321,3.018z M3.017,10.137
+       c-0.225-0.225-0.588-0.225-0.813,0l-2.035,2.034c-0.225,0.224-0.225,0.589,0,0.813l4.882,4.883c0.225,0.224,0.59,0.224,0.814,0
+       l2.034-2.036c0.225-0.224,0.225-0.588,0-0.813L3.017,10.137z"/>
+</svg>

diff --git a/embedded/zoom_in.png b/embedded/zoom_in.png
new file mode 100644 (file)
index 0000000..36d623a
Binary files /dev/null and b/embedded/zoom_in.png differ

diff --git a/embedded/zoom_out.png b/embedded/zoom_out.png
new file mode 100644 (file)
index 0000000..9188c2b
Binary files /dev/null and b/embedded/zoom_out.png differ

diff --git a/net/systemeD/potlatch2/TagViewer.mxml b/net/systemeD/potlatch2/TagViewer.mxml
index b107fe0da2988a5bc608f1cca9a4a3c257da73f7..26acee82d1ac1ac6c73281c29d6ab234e0d1cb33 100644 (file)
--- a/net/systemeD/potlatch2/TagViewer.mxml
+++ b/net/systemeD/potlatch2/TagViewer.mxml
@@ -21,7 +21,7 @@
                </mx:HBox>
 
                <mx:TileList dataProvider="{dndRep.currentItem.getFeaturesForType('point', true)}" width="100%" height="1"
-                                    rowHeight="32" columnWidth="32" updateComplete="resizePOIGrid(event)" styleName="dndPanelTileList">
+                                    updateComplete="resizePOIGrid(event)" styleName="dndPanelTileList">
                        <mx:itemRenderer>
                                <mx:Component>
                                        <mx:VBox toolTip="{data.name}">
@@ -44,7 +44,7 @@
                                                                DragManager.doDrag(dragInitiator, dragSource, event, dragProxy);
                                                        }
                                                ]]></mx:Script>
-                                               <mx:Image id="foo" source="{data.dndimage}" height="24" width="24" mouseMove="dragPOI(event, data.tags)" toolTip="{data.name}" />
+                                               <mx:Image id="foo" source="{data.dndimage}" height="20" width="20" mouseMove="dragPOI(event, data.tags)" toolTip="{data.name}" />
                                        </mx:VBox>
                                </mx:Component>
                        </mx:itemRenderer>

diff --git a/net/systemeD/potlatch2/Toolbox.mxml b/net/systemeD/potlatch2/Toolbox.mxml
index a553ab6a26ee6b7be38e1db1e0e386dbac23adcf..241d5f42adc75a754a3db32ee79ccdab9ac9de1a 100644 (file)
--- a/net/systemeD/potlatch2/Toolbox.mxml
+++ b/net/systemeD/potlatch2/Toolbox.mxml
@@ -2,18 +2,13 @@
 <mx:Panel
        xmlns:mx="http://www.adobe.com/2006/mxml"
        xmlns:potlatch2="net.systemeD.potlatch2.*"
-       height="76" width="129" layout="absolute"
-       styleName="theToolBox">
+       borderThicknessRight="1" borderThicknessLeft="1" borderThicknessBottom="3"
+       title="Edit Pathways and Areas" layout="horizontal" styleName="theToolBox">
 
         <!-- the animation effect that controls the rotation of the reverse arrow.
               We could get more fancy by using previous angle in angleFrom, and a longer duration, to give a nice animated effect -->
         <mx:Rotate id="rotate" angleFrom="{angle-1}" angleTo="{angle}" target="{arrowBox}" originX="{arrowBox.width/2}" originY="{arrowBox.height/2}" duration="4"/>
 
-
-               <mx:Image data="@Embed('../../../embedded/close_small.png')"
-                       includeInLayout="false" id="toolboxClose" click="toggle();" 
-                       y="-6" x="115" />
-
                <!-- Top row -->
 
                <mx:Button icon="@Embed('../../../embedded/delete.svg')"
@@ -21,10 +16,10 @@
                        enabled="{canDo('delete')}" 
                        alpha="{getAlpha('delete')}" 
                        toolTip="{deleteToolTipText()}" 
-                       width="28" height="28" textAlign="left" y="4" x="6" paddingLeft="6" paddingRight="0" />
+                       width="24" height="24" />
 
-        <mx:HBox id="reverseButton" width="28" height="28" y="4" x="36" borderStyle="solid" cornerRadius="4"
-                  click="reverseClicked();" horizontalAlign="center" verticalAlign="middle" toolTip="Reverse direction (V)">
+        <mx:HBox id="reverseButton" width="24" height="24" y="4" x="36" borderStyle="solid" cornerRadius="12" 
+                         click="reverseClicked();" horizontalAlign="center" verticalAlign="middle" toolTip="Reverse direction (V)">
             <mx:ViewStack id="rotateButtonStack" creationPolicy="all">
                 <mx:HBox id="arrowBoxWrapper"><!-- changing the viewstack back onto a rotated hbox causes positioning glitches, hence this wrapper -->
                     <!-- I can totally recommend adding borderStyle="solid" to arrowBox when debugging -->
@@ -54,14 +49,14 @@
                        enabled="{canDo('split')}" 
                        alpha="{getAlpha('split')}" 
                        toolTip="Split way (X)" 
-                       width="28" height="28" textAlign="left" y="4" x="66" paddingLeft="8" paddingRight="0" />
+                       width="24" height="24" />
                <mx:Button icon="@Embed('../../../embedded/merge.svg')" 
                        id="mergeButton"
                        click='doMerge();'
                        enabled="{canDo('merge')}" 
                        alpha="{getAlpha('merge')}" 
                        toolTip="Merge ways" 
-                       width="28" height="28" textAlign="left" y="4" x="96" paddingLeft="3" paddingRight="0" />
+                       width="24" height="24" />
 
                <!-- Second row -->
 
@@ -71,28 +66,28 @@
                        enabled="{canDo('straighten')}" 
                        alpha="{getAlpha('straighten')}" 
                        toolTip="Straighten way" 
-                       width="28" height="28" textAlign="left" y="34" x="6" paddingLeft="5" paddingRight="0" />
+                       width="24" height="24" />
                <mx:Button icon="@Embed('../../../embedded/circle.svg')" 
                        id="circulariseButton"
                        click='doCircularise();' 
                        enabled="{canDo('circularise')}" 
                        alpha="{getAlpha('circularise')}" 
                        toolTip="Make circular" 
-                       width="28" height="28" textAlign="left" y="34" x="36" paddingLeft="4" paddingRight="0" />
+                       width="24" height="24" />
                <mx:Button icon="@Embed('../../../embedded/quadrilateralise.svg')" 
                        id="quadrilateraliseButton"
                        click='doQuadrilateralise();' 
                        enabled="{canDo('quadrilateralise')}" 
                        alpha="{getAlpha('quadrilateralise')}" 
-                       toolTip="Make right-angled (Q)"
-                       width="28" height="28" textAlign="left" y="34" x="66" paddingLeft="6" paddingRight="0" />
+                       toolTip="Make right-angled (Q)" 
+                       width="24" height="24" />
                <mx:Button icon="@Embed('../../../embedded/parallel.svg')" 
                        id="parralleliseButton"
                        click='doParallelise();' 
                        enabled="{canDo('parallelise')}" 
                        alpha="{getAlpha('parallelise')}" 
                        toolTip="Create parallel way (P)" 
-                       width="28" height="28" textAlign="left" y="34" x="96" paddingLeft="8" paddingRight="0" />
+                       width="24" height="24" />
 
        <mx:Script><![CDATA[
 

diff --git a/net/systemeD/potlatch2/save/OAuthPanel.mxml b/net/systemeD/potlatch2/save/OAuthPanel.mxml
index 096222e27a549f15739fb3bf3525fb80affd2b0a..090b08494cd733ae0bb61ec91d2cd21b4d8ea1c4 100644 (file)
--- a/net/systemeD/potlatch2/save/OAuthPanel.mxml
+++ b/net/systemeD/potlatch2/save/OAuthPanel.mxml
@@ -67,11 +67,14 @@
        </mx:ControlBar>
        
        <mx:Script><![CDATA[
+               import flash.display.InteractiveObject;
         import flash.events.Event;
         import flash.net.*;
+               import flash.system.Capabilities;
         import mx.managers.PopUpManager;
         import net.systemeD.halcyon.connection.*;
         import org.iotashan.oauth.*;
+               import flash.external.ExternalInterface;
 
         private var connection:Connection;
         private var requestToken:OAuthToken;
@@ -87,9 +90,19 @@
         }
         
         private function openURL(url:String):void {
-            var urlRequest:URLRequest = new URLRequest(url);
-            navigateToURL(urlRequest, "_blank");
-        }
+                       if (ExternalInterface.available) {
+                               var winH:int = 560;
+                               var winW:int = 600;
+                               var leftPos:int  = (Capabilities.screenResolutionX - winW) / 2;
+                               var topPos:int = (Capabilities.screenResolutionY - winH) / 2;
+                               ExternalInterface.call( "window.open", url,"oAuthWin","height=" + winH + ",width=" + winW +",top=" + topPos + ", left=" + leftPos +", toolbar=no,scrollbars=no,status=no,location=no,menubar=no,directories=no");
+                               }               
+                       else
+                       {
+                               var urlRequest:URLRequest = new URLRequest(url);
+                               navigateToURL(urlRequest,"_blank");
+                       }
+               }
         
         private function getRequestToken():void {
             connection = Connection.getConnectionInstance();
@@ -134,8 +147,8 @@
             
             var url:String = Connection.getParam("oauth_auth_url", "http://127.0.0.1:3000/oauth/authorize");            
             link.label = url;
-            authoriseURL = url + "?oauth_token="+requestToken.key;
-            progress.visible = false;
+                       authoriseURL = url + "?oauth_token="+requestToken.key;
+                       progress.visible = false;
             gotLinkBox.visible = true;
         }
 

diff --git a/potlatch2.mxml b/potlatch2.mxml
index fbf700e56f28d06f559188ed520809e240d8f6ba..72153cc000fba3eb44a324b3279f3229cabd6e4f 100644 (file)
--- a/potlatch2.mxml
+++ b/potlatch2.mxml
@@ -15,15 +15,15 @@
        <mx:Style source="styles/Application.css"/>
 
     <mx:Glow id="glowImage" duration="100" 
-        alphaFrom="0.3" alphaTo="1.0" 
+        alphaFrom="0" alphaTo="0.8"
         blurXFrom="0.0" blurXTo="5.0" 
         blurYFrom="0.0" blurYTo="5.0" 
-        color="0xFF8000"/>
+        color="0x009ADE"/>
     <mx:Glow id="unglowImage" duration="100" 
-        alphaFrom="1.0" alphaTo="0.3" 
+        alphaFrom="0.8" alphaTo="0"
         blurXFrom="5.0" blurXTo="0.0" 
         blurYFrom="5.0" blurYTo="0.0" 
-        color="0xFF8000"/>
+        color="0x009ADE"/>
     <mx:WipeLeft id="wipeOut" duration="250"/>
     <mx:WipeRight id="wipeIn" duration="250"/>
 
@@ -68,11 +68,11 @@
         <mx:Canvas id="map_area" resize="onResizeMap()"
             top="0" left="0" width="100%" height="100%" dragEnter="dragEnterHandler(event);" dragDrop="dragDropHandler(event);">
         </mx:Canvas>
-        <mx:Image source="@Embed('embedded/zoomIn.svg')" right="3" top="3" click="theMap.zoomIn();"
+        <mx:Image source="@Embed('embedded/zoom_in.png')" right="7" top="3" click="theMap.zoomIn();"
             rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="{'Zoom in - currently z'+getScale()}" />
-        <mx:Image source="@Embed('embedded/zoomOut.svg')" right="3" top="20" click="theMap.zoomOut();"
+        <mx:Image source="@Embed('embedded/zoom_out.png')" right="7" top="30" click="theMap.zoomOut();"
             rollOverEffect="glowImage" rollOutEffect="unglowImage" toolTip="{'Zoom out - currently z'+getScale()}" />
-        <mx:TextArea id="dataWorking" text="" right="20" top="3" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="18"
+        <mx:TextArea id="dataWorking" text="" right="35" top="3" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="18"
             enabled="false" borderThickness="0"
             showEffect="{wipeIn}" hideEffect="{wipeOut}"/>
         <mx:TextArea id="coordsbox" left="0" top="0" disabledColor="black" backgroundDisabledColor="0xFFFFEA" height="33"

diff --git a/resources/imagery.xml b/resources/imagery.xml
index f09c1bda6cc42e282a8b127b31bd35e697750491..ddb2b29384a26d336ff8f05858ec6b1893032df9 100644 (file)
--- a/resources/imagery.xml
+++ b/resources/imagery.xml
@@ -12,6 +12,10 @@
                <terms_url>http://opengeodata.org/microsoft-imagery-details</terms_url>
                <default>yes</default>
        </set>
+    <set>
+        <name>MapQuest Open Aerial</name>
+        <url>http://oatile1.mqcdn.com/naip/$z/$x/$y.png</url>
+    </set>
        <set>
                <name>OSM - Mapnik</name>
                <url>http://c.tile.openstreetmap.org/$z/$x/$y.png</url>
@@ -27,6 +31,11 @@
     <set>
         <name>OSM - MapQuest</name>
         <url>http://otile1.mqcdn.com/tiles/1.0.0/osm/$z/$x/$y.png</url>
+    </set>
+    <set minlat="17" minlon="175" maxlat="72" maxlon="-46">
+      <name>OSM - Tiger Edited Map</name>
+      <type>900913</type>
+      <url>http://tiger-osm.mapquest.com/tiles/1.0.0/tiger/$z/$x/$y.png</url>
     </set>
        <set minlat="49.8" minlon="-9" maxlat="61.1" maxlon="1.9">
                <name>OS OpenData Streetview</name>

diff --git a/resources/mapquest b/resources/mapquest
new file mode 120000 (symlink)
index 0000000..5fc97ca
--- /dev/null
+++ b/resources/mapquest
@@ -0,0 +1 @@
+../../MapQuest-Potlatch2-resources/
\ No newline at end of file

diff --git a/resources/ok_go.html b/resources/ok_go.html
new file mode 100644 (file)
index 0000000..9599d33
--- /dev/null
+++ b/resources/ok_go.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+       <script language="javascript">
+        function sendBack() {
+               if (window.self.opener) {
+                        window.self.opener.focus();
+               }
+               window.self.close();
+        }
+       </script>
+</head>
+<body onload="sendBack()">
+SUCCESS!
+<br />
+<br />
+go <a href="http://www.macromedia.com/support/documentation/en/flashplayer/help/settings_manager07.html" target="_new">here</A> to clear cache and see this window again
+
+</body>
+</html>
\ No newline at end of file

diff --git a/resources/potlatch2.html b/resources/potlatch2.html
index f4533ca618f8ae9601f79c2fec74e34fb1fa7c96..15649da6b1e97d12de98d4a85d554c5f9619b652 100644 (file)
--- a/resources/potlatch2.html
+++ b/resources/potlatch2.html
@@ -69,6 +69,9 @@
        fo.addVariable("oauth_consumer_key", "fiM1IoqnKJk4JCfcl63DA");
        fo.addVariable("oauth_consumer_secret", "7fYgJK9M4vB1CvBZ6jEsPGxYK9UD1hEnI6NqTxNGs");
        fo.addVariable("serverName", "api06 Test On Dev");
+    fo.addVariable("show_help", "once");
+    fo.addVariable("site_name", "MapQuest");
+    fo.addVariable("force_auth", "force");
        fo.write("map");
 
 

diff --git a/resources/stylesheets.xml b/resources/stylesheets.xml
index 0e1d910a3211dc073d5607fc86d69e906930526b..309fd21bb4c4e8da9acbc09184d9b051bb71c424 100644 (file)
--- a/resources/stylesheets.xml
+++ b/resources/stylesheets.xml
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
 <stylesheets>
+    <stylesheet>
+        <name>MapQuest UK</name>
+        <url>mapquest/mapquest-uk.css</url>
+    </stylesheet>
+    <stylesheet>
+        <name>MapQuest EU</name>
+        <url>mapquest/mapquest-eu.css</url>
+    </stylesheet>
+    <stylesheet>
+        <name>MapQuest US</name>
+        <url>mapquest/mapquest-us.css</url>
+    </stylesheet>
        <stylesheet>
                <name>Potlatch</name>
                <url>stylesheets/potlatch.css</url>

diff --git a/styles/Application.css b/styles/Application.css
index b76f2074bd0fa345dd9c6012808ae5575f5b246c..6db93a92ec9573b34e6e228b508fce40664a299e 100644 (file)
--- a/styles/Application.css
+++ b/styles/Application.css
@@ -4,108 +4,77 @@ TitleWindow {
        borderAlpha: 1;
        borderThicknessLeft: 5;
        borderThicknessRight: 5;
-       cornerRadius: 0px;
-       borderColor: #6495ED;
-       titleStyleName: "titleHeader";
+       cornerRadius: 12px;
+       backgroundColor: #eeeeee;
+       borderColor: #dddddd;
+       color: #3b7700;
+       fontWeight: bold;
+       fontSize: 11pt;
 }
 
-.titleHeader { font-size: 14; font-weight: bold; color: white; }
-
-.titleWindowButton { 
+PopUpButton, Button {
        fontFamily: Arial;
        fontSize: 11;
        fontWeight: bold;
        cornerRadius: 12;
-       paddingLeft: 5;
-       paddingRight: 5;
+       paddingLeft: 10;
+       paddingRight: 10;
        highlightAlphas: 0, 0;
-       fillAlphas: 1,1;
-       fillColors: white, white;
-       color: black;
-       borderColor: haloBlue;
-}
-
-Button {
-       color: black;
-       textRollOverColor: black;
+       fillAlphas: 1, 1, 1, 1;
+       fillColors: #ffffff, #ffffff, #ffffff, #ffffff;
+       color: #51214d;
+       textRollOverColor: #51214d;
+       borderColor: #dddddd;
 }
 
 VScrollBar {
        cornerRadius: 0;
        highlightAlphas: 0, 0;
        fillAlphas: 0, 0, 0, 0;
-       fillColors: white, white, white, white;
+       fillColors: #ffffff, #ffffff, #ffffff, #ffffff;
        trackColors: #eeeeee, #eeeeee;
        borderColor: #999999;
        thumbOffset: 1;
 }
 
-CheckBox, List, StyleSelector, BackgroundSelector { color: black; }
-
-TabNavigator {
-       horizontalGap: 3;
-}
-
 TextInput {
        color: #333333;
 }
 
-Label {
-       fontWeight: normal;
-}
-
 /* Main window */
 
 Application {
-       padding-left: 4;
-       padding-right: 4;
-       padding-top: 2;
-       padding-bottom: 4;
-       backgroundColor: #6495ED;
-       themeColor: #0000ff;
+       padding-left: 0;
+       padding-right: 0;
+       padding-top: 0;
+       padding-bottom: 0;
+       backgroundColor: #eeeeee;
+       backgroundGradientColors: #eeeeee, #eeeeee;
+       backgroundGradientAlphas: 1, 1;
+       themeColor: #bbbbbb;
+       color: #333333;
+       backgroundGradientAlphas: 0, 0;
        borderStyle: none;
        fontFamily: Arial;
 }
 
 HDividedBox {
        dividerAlpha: 1;
-       dividerColor: #0000ff;
-       backgroundColor: #6495ED;
-       dividerAffordance: 6;
-       horizontalGap: 6;
-/*   backgroundColor: #ffff99; */
+       dividerColor: #51214d;
+       backgroundColor: #009ade;
 }
 
 ApplicationControlBar {
-       padding-top: 2;
-       padding-bottom: 0;
-       padding-left: 4;
-       padding-right: 4;
+       padding-top: 4;
+       padding-bottom: 1;
        highlightAlphas: 0, 0;
        fillAlphas: 1,1;
-       fillColors: haloBlue, #6495ED;
-       /*fillColors: #ffffcc, #ffff99;*/
-       backgroundColor: #ffffcc;
+       fillColors: #eeeeee, #eeeeee;
+       backgroundColor: #eeeeee;
        dropShadowEnabled: false;
        /*borderSkin: ClassReference("mx.skins.halo.ApplicationBackground");*/
 }
 
-.appBarButton {
-       fontFamily: Arial;
-       fontSize: 11;
-       fontWeight: bold;
-       cornerRadius: 12;
-       paddingLeft: 5;
-       paddingRight: 5;
-       highlightAlphas: 0, 0;
-       fillAlphas: 1,1;
-       fillColors: haloBlue, #6495ED;
-       color: white;
-       textRollOverColor: white;
-       disabledColor: #5555bb;
-       borderColor: haloBlue;
-}
-
 /* General text classes */
 
 .failText { color: red; }
@@ -121,8 +90,7 @@ ApplicationControlBar {
 /* Drag-and-drop panel */
 
 .dndPanelTileList {
-       borderColor: #dddddd;
-       backgroundColor: #dddddd;
+       borderColor: #ffffff;
 }
 
 .dndEditorContainer {
@@ -130,8 +98,8 @@ ApplicationControlBar {
        paddingTop: 3;
        paddingLeft: 3;
        paddingRight: 3;
-       backgroundColor: white;
-       color: #333333;
+       backgroundColor: #eeeeee;
+       color: #3b7700;
        fontSize: 11;
        fontWeight: bold;
 }
@@ -139,19 +107,17 @@ ApplicationControlBar {
 .dndPanelVbox {
        paddingRight: 3;
        paddingLeft: 3;
-       paddingTop: 5;
+       paddingTop: 15;
        verticalGap: 0;
-       backgroundColor: #dddddd;
        borderColor: #aaaaaa;
-       fontWeight: normal;
 }
 
 .catToggleButtonBar {
-       themeColor: #0000ff;
+       themeColor: #51214d;
        buttonStyleName: "mytoggleButtonBarButtonStyle";
 }
 
-.mytoggleButtonBarButtonStyle { fillColors: #dddddd, #eeeeee, #eeeeee, #eeeeee; borderColor: white; }
+.mytoggleButtonBarButtonStyle { fillColors: #dddddd, #dddddd, #dddddd, #dddddd; }
 
 .catToggleTiles {
        themeColor: #cccccc;
@@ -160,20 +126,19 @@ ApplicationControlBar {
 /* Drag-and-drop POI icons */
 
 .helpInfo {
-       paddingLeft: 0;
-       paddingRight: 0;
-       paddingBottom: 6;
-}
-.dndRepeater {
-}
-.dndPanelCategory {
-       backgroundColor: white;
+       fontSize: 13;
+       color: #777777;
+       textAlign: right;
+       paddingLeft: 30;
+       paddingRight: 15;
 }
+
 .dndPanelCategoryLabel {
-       paddingTop: 0;
-       color: #444444;
+       paddingTop: 9;
+       color: #3b7700;
        fontSize: 11;
        fontWeight: bold;
+       paddingBottom: 0;
 }
 
 /* Simple tag view - header */
@@ -183,21 +148,19 @@ ApplicationControlBar {
 }
 
 .featureSelector {
-       paddingTop: 0;
+       paddingTop: 3;
        paddingLeft: 3;
        paddingRight: 3;
-       paddingBottom: 7;
+       verticalAlign: middle;
 }
 
 .dndTagPopUpMenu {
-       fillColors: white, white, white, white;
+       fillColors: #dddddd, #dddddd, #dddddd, #dddddd;
        borderColor: #aaaaaa;
-       fontSize: 11;
-       fontWeight: bold;
 }
 
 .dndIconText {
-       color: black;
+       color: #009ade;
        fontSize: 14;
        fontWeight: bold;
 }
@@ -205,10 +168,9 @@ ApplicationControlBar {
 /* Simple tag view - editor container */
 
 .dndStackTab {
-       backgroundColor: white;
+       backgroundColor: #eeeeee;
        themeColor: #bbbbbb;
        cornerRadius: 0;
-       color: #333333;
        borderColor: #999999;
        tabStyleName: "myTabs";
        firstTabStyleName: "myTabs";
@@ -216,29 +178,37 @@ ApplicationControlBar {
        selectedTabTextStyleName: "mySelectedTabs";
 }
 
-.myTabs { font-size: 11; font-weight: normal; cornerRadius: 0; fillColors: white, white; borderColor: #999999; themeColor: #999999; }
-.mySelectedTabs { fillColors: white, white; }
+.myTabs {
+       cornerRadius: 12;
+       fillColors: #ffffff, #ffffff;
+       borderColor: #999999;
+       themeColor: #999999;
+}
+
+.mySelectedTabs {}
 
 .dndStackAccordion {
        themeColor: #bbbbbb;
        cornerRadius: 0;
        borderColor: #999999;
-       headerStyleName: "accordionHeader";
 }
 
-.accordionHeader { fillColors: #888888, #999999; fillAlphas: 1,1; color: white; fontWeight: bold; fontSize: 11; }
-
 /* Toolbox */
 
 .theToolBox {
-       headerColors: haloBlue, #6495ED;
-       headerAlphas: 1,1;
-       headerHeight: 6;
-       borderThicknessRight: 0; borderThicknessLeft: 0; borderThicknessBottom: 0;
-       paddingLeft: 4; paddingTop: 4;
+       backgroundColor: #eeeeee;
+       cornerRadius: 12;
+       headerHeight: 21;
+       titleStyleName: "mypanelTitle";
+       borderAlpha: 1.0;
 }
 
-.mypanelTitle { textAlign: center; color: #333333; fontSize: 10; fontWeight: bold; }
+.mypanelTitle {
+       textAlign: center;
+       color: #3b7700;
+       fontSize: 11;
+       fontWeight: bold;
+}
 
 /* Help */
 
@@ -254,8 +224,11 @@ ApplicationControlBar {
 }
 
 .helpTN {
-       cornerRadius: 0px;
+       borderColor: #dddddd;
+       cornerRadius: 5px;
        tabOffset: 10px;
+       color: #333333;
+       fontWeight: regular;
 }
 
 

diff --git a/version.as.template b/version.as.template
index 8e51cc0602d80492eee433fc208b69ecaf896e47..9288362868aea30333261613baa71a05c74d5ab7 100644 (file)
--- a/version.as.template
+++ b/version.as.template
@@ -3,4 +3,5 @@
 // at some point in the future.
 
 public var build_number:String="@@@buildnumber@@@";
-public var version:String="2.0";
+public var version:String="2.0-MQ";
+