Add a paragraph on the rules in OSM or the lack of them

diff --git a/app/assets/images/welcome-sprite.png b/app/assets/images/welcome-sprite.png
index f904f00cddbb73d0b88c7990956414b70e093b60..30d93d7e1a1dda1d40cf266ff67c5502825d6c8e 100644 (file)
Binary files a/app/assets/images/welcome-sprite.png 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
index 0151c5ced086994a25fe0409a67638cf7f86c3a4..4af03a213ee00ee4134232632f182287ed5dbc30 100644 (file)
--- a/app/assets/images/welcome-sprite.svg
+++ b/app/assets/images/welcome-sprite.svg
@@ -13,9 +13,9 @@
    height="500"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.2 r9819"
+   inkscape:version="0.48.4 r9939"
    sodipodi:docname="welcome-sprite.svg"
-   inkscape:export-filename="/Users/saman/work_repos/openstreetmap-website/app/assets/images/welcome-sprite.png"
+   inkscape:export-filename="C:\Users\simon\Downloads\welcome-sprite.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -28,7 +28,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="424.69193"
+     inkscape:cx="372.09193"
      inkscape:cy="435.3413"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
@@ -40,10 +40,12 @@
      inkscape:window-maximized="0"
      showguides="true"
      inkscape:guide-bbox="true"
-     inkscape:snap-bbox="true"
+     inkscape:snap-bbox="false"
      inkscape:snap-nodes="true"
      inkscape:object-paths="true"
-     inkscape:object-nodes="true">
+     inkscape:object-nodes="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-global="false">
     <inkscape:grid
        type="xygrid"
        id="grid2985"
@@ -87,6 +89,10 @@
        orientation="0,1"
        position="420,400"
        id="guide3038" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="799,715"
+       id="guide3196" />
   </sodipodi:namedview>
   <metadata
      id="metadata7">
@@ -125,7 +131,7 @@
        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"
+       d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
        transform="matrix(1.0588235,0,0,1.0588235,5,557.36218)" />
     <path
        sodipodi:type="arc"
@@ -135,7 +141,7 @@
        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"
+       d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 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"
@@ -151,7 +157,7 @@
        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"
+       d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 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"
@@ -179,7 +185,7 @@
        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"
+       d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 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"
@@ -207,7 +213,7 @@
        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"
+         d="m 335,80 c 0,8.284271 -6.71573,15 -15,15 -8.28427,0 -15,-6.715729 -15,-15 0,-8.284271 6.71573,-15 15,-15 8.28427,0 15,6.715729 15,15 z"
          sodipodi:ry="15"
          sodipodi:rx="15"
          sodipodi:cy="80"
@@ -223,12 +229,12 @@
          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"
+         d="m 335,80 c 0,8.284271 -6.71573,15 -15,15 -8.28427,0 -15,-6.715729 -15,-15 0,-8.284271 6.71573,-15 15,-15 8.28427,0 15,6.715729 15,15 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"
+       d="M 85,42.5 C 85,65.972102 65.972102,85 42.5,85 19.027898,85 0,65.972102 0,42.5 0,19.027898 19.027898,0 42.5,0 65.972102,0 85,19.027898 85,42.5 z"
        sodipodi:ry="42.5"
        sodipodi:rx="42.5"
        sodipodi:cy="42.5"
@@ -256,5 +262,27 @@
        y="597.36218"
        rx="3"
        ry="2.2500007" />
+    <path
+       transform="matrix(1.0588235,0,0,1.0588235,705,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-7"
+       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:48px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:#ffffff;font-family:Sans;stroke-opacity:1"
+       x="736.80469"
+       y="614.78406"
+       id="text3795"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3797"
+         x="736.80469"
+         y="614.78406"
+         style="font-weight:normal;-inkscape-font-specification:Sans;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-opacity:1">§</tspan></text>
   </g>
 </svg>

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index c5d0254b58789d4d94ff93c2eb936b7e81591d52..e8696d665ef32b9c71c54d8f42b9e224d3a1fa15 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -2516,6 +2516,10 @@ input.richtext_title[type="text"] {
     background-position: -300px 0;
   }
 
+  .sprite.rules {
+    background-position: -350px 0;
+  }
+
   .start-mapping {
     margin: auto;
     cursor: pointer;

diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index 4edcf361ebb26a4a902fa0afd46e4983b0cc8e18..92220039a0ea86609dc3093bca70173d351c3b81 100644 (file)
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -48,6 +48,12 @@
   </div>
 </div>
 
+<div class='col12 clearfix icon-list'>
+  <h3><%= t "welcome_page.rules.title" %></h3>
+  <span class='sprite small term rules'></span>
+  <p><%= t "welcome_page.rules.paragraph_1_html" %></p>
+</div>
+
 <div class='col12 clearfix icon-list'>
   <h3><%= t "welcome_page.questions.title" %></h3>
   <span class='sprite small term question'></span>

diff --git a/config/locales/en.yml b/config/locales/en.yml
index a19a75763a11df6653a3ddcbb1e02463d468f004..6c5c23da014a00201c9f26073a8e67999f0bdd82 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1114,6 +1114,14 @@ en:
       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.
+    rules:
+      title: Rules!
+      paragraph_1_html: |
+        OpenStreetMap has few formal rules but we expect all participants to collaborate
+        with, and communicate with, the community. If you are considering
+        any activities other than editing by hand, please read and follow the guidelines on 
+        <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and 
+        <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
     questions:
       title: Any questions?
       paragraph_1_html: |