- <%= link_to image_tag("openid.png",
+ <%= link_to image_tag("openid.svg",
:alt => t("application.auth_providers.openid.title"),
:size => "24"),
"#",
diff --git a/app/views/changesets/index.atom.builder b/app/views/changesets/index.atom.builder
index c8ffe1a81c..62c5d51dc8 100644
--- a/app/views/changesets/index.atom.builder
+++ b/app/views/changesets/index.atom.builder
@@ -11,7 +11,7 @@ atom_feed(:language => I18n.locale, :schema_date => 2009,
feed.rights :type => "xhtml" do |xhtml|
xhtml.a :href => "https://creativecommons.org/licenses/by-sa/2.0/" do |a|
- a.img :src => image_url("cc_button.png"), :alt => "CC by-sa 2.0"
+ a.img :src => image_url("cc-by-sa.svg"), :alt => "CC by-sa 2.0"
end
end
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index 8942eb49c5..6bc5c9f159 100644
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -1,7 +1,7 @@
- <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :width => 30, :height => 30, :class => "logo" %> + <%= image_tag "osm_logo.svg", :alt => t("layouts.logo.alt_text"), :width => 30, :height => 30, :class => "logo" %> <%= t "layouts.project_name.h1" %>
diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb index 435de30153..dfcb3cb91c 100644 --- a/app/views/layouts/error.html.erb +++ b/app/views/layouts/error.html.erb @@ -8,7 +8,7 @@ - <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :class => "logo" %> + <%= image_tag "osm_logo.svg", :alt => t("layouts.logo.alt_text"), :class => "logo" %>
<%= yield %>
diff --git a/app/views/notes/index.html.erb b/app/views/notes/index.html.erb
index 8622bbf297..d5efe0d79c 100644
--- a/app/views/notes/index.html.erb
+++ b/app/views/notes/index.html.erb
@@ -27,9 +27,9 @@
class="table-primary"<% end %>>
<% if note.closed? %>
- <%= image_tag("closed_note_marker.png", :alt => "closed", :size => "25x40") %>
+ <%= image_tag("closed_note_marker.svg", :alt => "closed", :width => 25, :height => 40) %>
<% else %>
- <%= image_tag("open_note_marker.png", :alt => "open", :size => "25x40") %>
+ <%= image_tag("open_note_marker.svg", :alt => "open", :width => 25, :height => 40) %>
<% end %>
<%= link_to note.id, note %>
diff --git a/app/views/site/_any_questions.html.erb b/app/views/site/_any_questions.html.erb
index b330d8035e..5098a1eee7 100644
--- a/app/views/site/_any_questions.html.erb
+++ b/app/views/site/_any_questions.html.erb
@@ -1,4 +1,6 @@
diff --git a/app/views/site/welcome.html.erb b/app/views/site/welcome.html.erb
index f8f339284f..eacccf5789 100644
--- a/app/views/site/welcome.html.erb
+++ b/app/views/site/welcome.html.erb
@@ -29,22 +29,22 @@
<%= t ".title" %>
+<%= t ".paragraph_1_html", :help_link => link_to(t(".get_help_here"), help_path), :welcome_mat_link => link_to(t(".welcome_mat"), t(".welcome_mat_url")) %>
+<%= t ".basic_terms.paragraph_1" %>
-
-
-
-
<%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %>
+
+
+
+ <%= t ".basic_terms.an_editor_html", :editor => tag.strong(t(".basic_terms.editor")) %>
-
-
-
<%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %>
+
+
+ <%= t ".basic_terms.a_node_html", :node => tag.strong(t(".basic_terms.node")) %>
-
-
- 
$}, logo
+ assert_match %r{^
$}, logo
end
def test_auth_button
<%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %>
+
+
+ <%= t ".basic_terms.a_way_html", :way => tag.strong(t(".basic_terms.way")) %>
-
-
-
diff --git a/test/helpers/user_helper_test.rb b/test/helpers/user_helper_test.rb
index c2883c2c09..3cd53e1699 100644
--- a/test/helpers/user_helper_test.rb
+++ b/test/helpers/user_helper_test.rb
@@ -111,7 +111,7 @@ def test_user_image_sizes_gravatar
def test_openid_logo
logo = openid_logo
- assert_match %r{^<%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %>
+
+
+ <%= t ".basic_terms.a_tag_html", :tag => tag.strong(t(".basic_terms.tag")) %>
$}, logo
+ assert_match %r{^$}, logo
end
def test_auth_button