Merge pull request #42 from Firefishy/master

Use protocol relative urls for (trac|wiki|www).openstreetmap.org

10 files changed, 27 insertions, 27 deletions

diff --git a/web/views/about.erb b/web/views/about.erb
index 4ffde59..80d400a 100644
--- a/web/views/about.erb
+++ b/web/views/about.erb
@@ -26,7 +26,7 @@
             how they are used and what they mean.</p>
 
             <p>The taginfo software was created and is maintained by
-            <a class="extlink" href="http://wiki.openstreetmap.org/wiki/User:Joto">Jochen Topf</a>.
+            <a class="extlink" href="//wiki.openstreetmap.org/wiki/User:Joto">Jochen Topf</a>.
             He also maintains the main taginfo web site.
             <a class="extlink" href="http://www.ctd-studio.co.uk/">Christian Topf</a>
             created the web design.</p>
@@ -38,14 +38,14 @@
             <p>Icons and styles are taken from the <b>JOSM</b> editor
             configuration.</p>
             <p>The data is updated regularly, see <a href="/sources">when this was last done</a>.</p>
-            <p><a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo/Sources">More information about the sources on the wiki...</a></p>
+            <p><a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/Sources">More information about the sources on the wiki...</a></p>
         </td>
         <td class="box">
             <p>Bug reports should be filed in the
-            <a class="extlink" href="http://trac.openstreetmap.org/query?status=accepted&status=assigned&status=new&status=reopened&component=taginfo&order=priority">OSM bug tracker</a>
+            <a class="extlink" href="//trac.openstreetmap.org/query?status=accepted&status=assigned&status=new&status=reopened&component=taginfo&order=priority">OSM bug tracker</a>
             using the 'taginfo' component.</p>
             <p>Taginfo developers and site maintainers hang out on the<br/>
-            <a class="extlink" href="http://lists.openstreetmap.org/listinfo/taginfo-dev">taginfo mailing list</a>.</p>
+            <a class="extlink" href="//lists.openstreetmap.org/listinfo/taginfo-dev">taginfo mailing list</a>.</p>
             <p>You can contact the taginfo maintainer at<br/>
             <a class="extlink" href="mailto:jochen@remote.org">jochen@remote.org</a>.</p>
         </td>
@@ -68,10 +68,10 @@
 
             <p>Taginfo data can also be accessed through a REST <b>API</b>. See the
             <a href="/taginfo/apidoc">API call documentation</a> for the details, some general information is
-            <a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo/API">on the wiki</a>.
+            <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/API">on the wiki</a>.
             The server running the taginfo API does not have unlimited resources.
             Please use the API responsibly. If in doubt contact the taginfo maintainers.</p>
-            <p>The data available through taginfo is available under the <a href="http://www.openstreetmap.org/copyright">same
+            <p>The data available through taginfo is available under the <a href="//www.openstreetmap.org/copyright">same
             license as OpenStreetMap itself</a>.</p>
         </td>
         <td class="box" colspan="3">
@@ -81,14 +81,14 @@
             <p>We also need <b>translators</b> for the taginfo user interface. The
             <a class="extlink" href="https://github.com/joto/taginfo/tree/master/web/i18n">translation
             files</a> are on Github. More info on how to translate on the 
-            <a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo/I18N">wiki</a>.</p>
+            <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/I18N">wiki</a>.</p>
             <p>You can run your own
-            <a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo/Sites">taginfo site</a>,
+            <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/Sites">taginfo site</a>,
             for instance with data for just your own country.</p>
-            <p>Contact us on the <a class="extlink" href="http://lists.openstreetmap.org/listinfo/taginfo-dev">taginfo mailing list</a>
+            <p>Contact us on the <a class="extlink" href="//lists.openstreetmap.org/listinfo/taginfo-dev">taginfo mailing list</a>
             if you can offer any help.</p>
             <p>See the
-            <a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo">wiki</a> for
+            <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo">wiki</a> for
             more information.</p>
         </td>
     </tr>
diff --git a/web/views/embed/key.erb b/web/views/embed/key.erb
index 1dd0ac6..e948b05 100644
--- a/web/views/embed/key.erb
+++ b/web/views/embed/key.erb
@@ -1,11 +1,11 @@
 <% if @key == '{{{key}}}' %>
-<a target="_blank" title="More information about key '<%= escape_html(@key) %>' at Taginfo" href="http://taginfo.openstreetmap.org/">tag<b>info</b> [More...]</a>
+<a target="_blank" title="More information about key '<%= escape_html(@key) %>' at Taginfo" href="//taginfo.openstreetmap.org/">tag<b>info</b> [More...]</a>
 <p>Statistics about the key will appear here.</p>
 <% elsif @dbkey.nil? %>
-<a target="_blank" title="More information about key '<%= escape_html(@key) %>' at Taginfo" href="http://taginfo.openstreetmap.org/keys/?key=<%= escape(@key) %>">tag<b>info</b> [More...]</a>
+<a target="_blank" title="More information about key '<%= escape_html(@key) %>' at Taginfo" href="//taginfo.openstreetmap.org/keys/?key=<%= escape(@key) %>">tag<b>info</b> [More...]</a>
 <p>This key does not appear in the OSM database.</p>
 <% else %>
-<a target="_blank" title="More information about key '<%= escape_html(@key) %>' at Taginfo" href="http://taginfo.openstreetmap.org/keys/?key=<%= escape(@key) %>">tag<b>info</b> [More...]</a>
+<a target="_blank" title="More information about key '<%= escape_html(@key) %>' at Taginfo" href="//taginfo.openstreetmap.org/keys/?key=<%= escape(@key) %>">tag<b>info</b> [More...]</a>
 <div class="content"><table>
     <tr>
         <td class="ft"><img src="/img/types/node.16.png" width="16" height="16" alt="Nodes" title="Nodes with key '<%= escape_html(@key) %>' in database"></td>
diff --git a/web/views/embed/relation.erb b/web/views/embed/relation.erb
index 8bc8cdd..233a0d9 100644
--- a/web/views/embed/relation.erb
+++ b/web/views/embed/relation.erb
@@ -1,11 +1,11 @@
 <% if @rtype == '{{{type}}}' %>
-<a target="_blank" title="More information about relation type '<%= escape_html(@rtype) %>' at Taginfo" href="http://taginfo.openstreetmap.org/">tag<b>info</b> [More...]</a>
+<a target="_blank" title="More information about relation type '<%= escape_html(@rtype) %>' at Taginfo" href="//taginfo.openstreetmap.org/">tag<b>info</b> [More...]</a>
 <p>Statistics about the relation type will appear here.</p>
 <% elsif @dbrtype.nil? %>
-<a target="_blank" title="More information about relation type '<%= escape_html(@rtype) %>' at Taginfo" href="http://taginfo.openstreetmap.org/relations/?rtype=<%= escape(@rtype) %>">tag<b>info</b> [More...]</a>
+<a target="_blank" title="More information about relation type '<%= escape_html(@rtype) %>' at Taginfo" href="//taginfo.openstreetmap.org/relations/?rtype=<%= escape(@rtype) %>">tag<b>info</b> [More...]</a>
 <p>This relation type does not appear in the OSM database.</p>
 <% else %>
-<a target="_blank" title="More information about relation type '<%= escape_html(@rtype) %>' at Taginfo" href="http://taginfo.openstreetmap.org/relations/?rtype=<%= escape(@rtype) %>">tag<b>info</b> [More...]</a>
+<a target="_blank" title="More information about relation type '<%= escape_html(@rtype) %>' at Taginfo" href="//taginfo.openstreetmap.org/relations/?rtype=<%= escape(@rtype) %>">tag<b>info</b> [More...]</a>
 <p>There are<br/>
 <b><%= @dbrtype['count'].to_i.to_s_with_ts %> relations</b><br/>
 of type '<%= escape_html(@rtype) %>' with<br/>
diff --git a/web/views/embed/tag.erb b/web/views/embed/tag.erb
index 763a1dd..5dca062 100644
--- a/web/views/embed/tag.erb
+++ b/web/views/embed/tag.erb
@@ -1,11 +1,11 @@
 <% if @key == '{{{key}}}' && @value == '{{{value}}}' %>
-<a target="_blank" title="More information about tag '<%= escape_html(@key) %>=<%= escape_html(@value) %>' at Taginfo" href="http://taginfo.openstreetmap.org/">tag<b>info</b> [More...]</a>
+<a target="_blank" title="More information about tag '<%= escape_html(@key) %>=<%= escape_html(@value) %>' at Taginfo" href="//taginfo.openstreetmap.org/">tag<b>info</b> [More...]</a>
 <p>Statistics about the tag will appear here.</p>
 <% elsif @dbtag.nil? %>
-<a target="_blank" title="More information about tag '<%= escape_html(@key) %>=<%= escape_html(@value) %>' at Taginfo" href="http://taginfo.openstreetmap.org/tags/?key=<%= escape(@key) %>&value=<%= escape(@value) %>">tag<b>info</b> [More...]</a>
+<a target="_blank" title="More information about tag '<%= escape_html(@key) %>=<%= escape_html(@value) %>' at Taginfo" href="//taginfo.openstreetmap.org/tags/?key=<%= escape(@key) %>&value=<%= escape(@value) %>">tag<b>info</b> [More...]</a>
 <p>This tag does not appear in the OSM database.</p>
 <% else %>
-<a target="_blank" title="More information about tag '<%= escape_html(@key) %>=<%= escape_html(@value) %>' at Taginfo" href="http://taginfo.openstreetmap.org/tags/?key=<%= escape(@key) %>&value=<%= escape(@value) %>">tag<b>info</b> [More...]</a>
+<a target="_blank" title="More information about tag '<%= escape_html(@key) %>=<%= escape_html(@value) %>' at Taginfo" href="//taginfo.openstreetmap.org/tags/?key=<%= escape(@key) %>&value=<%= escape(@value) %>">tag<b>info</b> [More...]</a>
 <div class="content"><table>
     <tr>
         <td class="ft"><img src="/img/types/node.16.png" width="16" height="16" alt="Nodes" title="Nodes with tag '<%= escape_html(@key) %>=<%= escape_html(@value) %>' in database"></td>
diff --git a/web/views/index.erb b/web/views/index.erb
index 0c986df..dd1eda6 100644
--- a/web/views/index.erb
+++ b/web/views/index.erb
@@ -50,7 +50,7 @@
         </td>
         <td class="box">
             <p><%= TaginfoConfig.get('instance.description') %></p>
-            <p class="emphasis" style="margin-top: 20px;"><a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo/Sites"><%= h(t.pages.index.international.see) %></a></p>
+            <p class="emphasis" style="margin-top: 20px;"><a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo/Sites"><%= h(t.pages.index.international.see) %></a></p>
         </td>
     </tr>
 </table>
diff --git a/web/views/key.erb b/web/views/key.erb
index bbff984..298258f 100644
--- a/web/views/key.erb
+++ b/web/views/key.erb
@@ -82,7 +82,7 @@
             </table>
         <% else %>
             <p class="empty"><%= h(t.pages.key.wiki_pages.none_found) %></p>
-            <p><a class="extlink" target="_blank" rel="nofollow" href="http://wiki.openstreetmap.org/w/index.php?action=edit&title=Key:<%= @key_uri %>"><%= h(t.pages.key.wiki_pages.create) %></a></p>
+            <p><a class="extlink" target="_blank" rel="nofollow" href="//wiki.openstreetmap.org/w/index.php?action=edit&title=Key:<%= @key_uri %>"><%= h(t.pages.key.wiki_pages.create) %></a></p>
         <% end %>
     </div>
     <div id="josm">
diff --git a/web/views/layout.erb b/web/views/layout.erb
index 0c9e321..ecd1e2f 100644
--- a/web/views/layout.erb
+++ b/web/views/layout.erb
@@ -38,14 +38,14 @@
 <%= yield %>
     </div>
     <div id="footer" class="no-print">
-        <div id="footer_left"><a class="extlink" href="http://www.openstreetmap.org/"><b>OpenStreetMap</b> - The Free Wiki World Map</a> &middot;
-            <a href="http://www.openstreetmap.org/copyright">Data &copy; OpenStreetMap contributors (ODbL)</a></div>
+        <div id="footer_left"><a class="extlink" href="//www.openstreetmap.org/"><b>OpenStreetMap</b> - The Free Wiki World Map</a> &middot;
+            <a href="//www.openstreetmap.org/copyright">Data &copy; OpenStreetMap contributors (ODbL)</a></div>
         <div id="footer_right">
             <a href="/keys"><%= h(t.osm.keys) %></a> &middot; <a href="/tags"><%= h(t.osm.tags) %></a> &middot; <a href="/relations"><%= h(t.osm.relations) %></a> &middot;
             <a href="/reports"><%= h(t.taginfo.reports) %></a> &middot; <a href="/sources"><%= h(t.taginfo.sources) %></a> &middot;
             <a href="/download"><%= h(t.taginfo.download) %></a> &middot; <a href="/about"><%= h(t.taginfo.about) %></a> &middot;
             <a id="help_link" href="#help"><%= h(t.misc.help) %></a> &middot;
-            <a class="extlink" href="http://wiki.openstreetmap.org/wiki/Taginfo"><%= h(t.taginfo.wiki) %></a>
+            <a class="extlink" href="//wiki.openstreetmap.org/wiki/Taginfo"><%= h(t.taginfo.wiki) %></a>
         </div>
     </div>
     <div id="javascriptmsg">This website only works with Javascript! Please enable Javascript in your browser.</div>
diff --git a/web/views/relation.erb b/web/views/relation.erb
index 6c120bf..888772b 100644
--- a/web/views/relation.erb
+++ b/web/views/relation.erb
@@ -54,7 +54,7 @@
             </table>
         <% else %>
             <p class="empty"><%= h(t.pages.relation.wiki_pages.none_found) %></p>
-            <p><a class="extlink" target="_blank" rel="nofollow" href="http://wiki.openstreetmap.org/w/index.php?action=edit&title=Relation:<%= @rtype_uri %>"><%= h(t.pages.relation.wiki_pages.create) %></a></p>
+            <p><a class="extlink" target="_blank" rel="nofollow" href="//wiki.openstreetmap.org/w/index.php?action=edit&title=Relation:<%= @rtype_uri %>"><%= h(t.pages.relation.wiki_pages.create) %></a></p>
         <% end %>
     </div>
 </div>
diff --git a/web/views/tag.erb b/web/views/tag.erb
index 2c4f62c..eca2ad8 100644
--- a/web/views/tag.erb
+++ b/web/views/tag.erb
@@ -55,7 +55,7 @@
             </table>
         <% else %>
             <p class="empty"><%= h(t.pages.tag.wiki_pages.none_found) %> <%= @wiki_count_key > 0 ? t.pages.tag.wiki_pages.suggest_key_wiki_page('<span id="keylink"></span>') : '' %></p>
-            <p><a class="extlink" target="_blank" rel="nofollow" href="http://wiki.openstreetmap.org/w/index.php?action=edit&title=Tag:<%= escape(@tag) %>"><%= h(t.pages.tag.wiki_pages.create) %></a></p>
+            <p><a class="extlink" target="_blank" rel="nofollow" href="//wiki.openstreetmap.org/w/index.php?action=edit&title=Tag:<%= escape(@tag) %>"><%= h(t.pages.tag.wiki_pages.create) %></a></p>
         <% end %>
     </div>
     <div id="josm">
diff --git a/web/views/taginfo/apidoc.erb b/web/views/taginfo/apidoc.erb
index 0dcd903..c4d29c8 100644
--- a/web/views/taginfo/apidoc.erb
+++ b/web/views/taginfo/apidoc.erb
@@ -1,6 +1,6 @@
 <h1 class="section">API Documentation</h1>
 
-<p>See <a href="http://wiki.openstreetmap.org/wiki/Taginfo/API">the OSM wiki</a> for general information about the API.</p>
+<p>See <a href="//wiki.openstreetmap.org/wiki/Taginfo/API">the OSM wiki</a> for general information about the API.</p>
 
 <% if params[:show_deprecated] %>
 <p><span class="button"><a href="/taginfo/apidoc">Do not show deprecated API calls</a></span></p>