cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Simon Poole 2015-06-16 18:36:18 +01:00 • committed by Tom Hughes
parent 876d5614da
commit cf8a20962b
5 changed files with 58 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/assets/images/welcome-sprite.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7 KiB

After

Width:  |  Height:  |  Size: 18 KiB

Before After
Before After

52
app/assets/images/welcome-sprite.svg
View file

@ -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>

Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 14 KiB

Before After
Before After

4
app/assets/stylesheets/common.scss
View file

@ -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;

6
app/views/site/welcome.html.erb
View file

@ -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>

8
config/locales/en.yml
View file

@ -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: |