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

Merge remote-tracking branch 'upstream/pull/3377'

Browse source
This commit is contained in:
Tom Hughes 2021-11-25 17:12:26 +00:00
commit b6f0c40a60
15 changed files with 65 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -79,6 +79,16 @@ a {
color: $blue; color: $blue;
} }
/* Rules for borders */
/* These add additional colours to those provided by bootstrap */
.border-grey {
border-color: $grey !important;
}
.border-lightgrey {
border-color: $lightgrey !important;
}
/* Rules for the header */ /* Rules for the header */
#menu-icon { #menu-icon {
@ -216,11 +226,6 @@ nav.secondary {
} }
} }
img.user_thumbnail_tiny {
border: 0;
border-radius: 3px;
}
#inboxanchor { #inboxanchor {
display: inline-block; display: inline-block;
height: 25px; height: 25px;
@ -388,23 +393,6 @@ body.compact-nav {
top: 20px; top: 20px;
} }
} }
.icon.close {
float: right;
cursor: pointer;
}
.flash {
padding: 15px;
picture {
margin-right: -25px;
}
div.message {
margin-left: 30px;
}
}
} }
.overlay-sidebar #sidebar { .overlay-sidebar #sidebar {
@ -819,38 +807,8 @@ tr.turn:hover {
border-bottom: none; border-bottom: none;
} }
.paginate {
float: right;
padding: 1px 6px;
border: 1px solid $lightgrey;
border-radius: 3px;
}
.browse-field {
margin-bottom: 10px;
h4 {
padding: 5px 0 5px 10px;
font-size: 12px;
border: 1px solid $grey;
border-radius: 4px 4px 0 0;
background-color: $offwhite;
}
p {
padding: 7px 10px;
font-size: 12px;
background-color: #FFF;
border: 1px solid $grey;
border-top: 0;
border-radius: 0 0 4px 4px;
}
}
.browse-tag-list { .browse-tag-list {
background-color: $offwhite; background-color: $offwhite;
border: 1px solid $grey;
border-radius: 3px;
table-layout: fixed; table-layout: fixed;
border-collapse: separate; border-collapse: separate;
border-spacing: 0; border-spacing: 0;
@ -902,16 +860,6 @@ tr.turn:hover {
} }
} }
.comments-header {
float: left;
}
.subscribe-buttons {
float: left;
margin: 0 10px;
min-width: 80px;
}
.subscribe-buttons input { .subscribe-buttons input {
font-size: 90%; font-size: 90%;
line-height: 15px; line-height: 15px;
@ -973,8 +921,6 @@ tr.turn:hover {
.export_boxy { .export_boxy {
background: $lightgrey; background: $lightgrey;
border: 1px solid $grey;
border-radius: 3px;
#maxlat { margin-top: -1px; } #maxlat { margin-top: -1px; }
#minlon { #minlon {
@ -1082,7 +1028,6 @@ tr.turn:hover {
.content_map { .content_map {
height: 200px; height: 200px;
border: 1px solid $grey;
margin-bottom: $lineheight; margin-bottom: $lineheight;
} }
@ -1124,26 +1069,9 @@ tr.turn:hover {
padding-bottom: $lineheight/2; padding-bottom: $lineheight/2;
border-top: 1px solid $grey; border-top: 1px solid $grey;
&:first-of-type {
margin-top: $lineheight/2;
}
&.deleted { &.deleted {
background-color: #fee; background-color: #fee;
} }
.post_heading {
margin-bottom: $lineheight;
h2 {
margin-top: 0;
margin-bottom: $lineheight/2;
}
}
img.user_thumbnail {
float: left;
}
} }
/* Rules for the diary entry page */ /* Rules for the diary entry page */
@ -1151,7 +1079,6 @@ tr.turn:hover {
.diary_entries { .diary_entries {
#map { #map {
height: 400px; height: 400px;
border: 1px solid $grey;
display: none; display: none;
margin-bottom: $lineheight; margin-bottom: $lineheight;
} }
@ -1180,10 +1107,6 @@ tr.turn:hover {
} }
} }
.diary_entries-show img.user_thumbnail {
float: left;
}
/* Rules for the log in page */ /* Rules for the log in page */
#login_auth_buttons { #login_auth_buttons {
@ -1199,7 +1122,6 @@ tr.turn:hover {
.users-terms { .users-terms {
.legale { .legale {
border: 1px solid $grey;
padding: $lineheight; padding: $lineheight;
margin-bottom: $lineheight; margin-bottom: $lineheight;
overflow: auto; overflow: auto;
@ -1397,13 +1319,11 @@ tr.turn:hover {
img.user_image { img.user_image {
max-width: 100px; max-width: 100px;
max-height: 100px; max-height: 100px;
border: 1px solid $grey;
} }
img.user_thumbnail { img.user_thumbnail {
max-width: 50px; max-width: 50px;
max-height: 50px; max-height: 50px;
border: 1px solid $grey;
} }
img.user_thumbnail_tiny { img.user_thumbnail_tiny {
@ -1411,7 +1331,6 @@ img.user_thumbnail_tiny {
height: auto; height: auto;
max-width: 25px; max-width: 25px;
max-height: 25px; max-height: 25px;
border: 1px solid $grey;
} }
/* Rules for geo microformats */ /* Rules for geo microformats */

1
app/assets/stylesheets/parameters.scss
View file

@ -15,6 +15,5 @@ $hovercolor: 20%;
$headerHeight: 55px; $headerHeight: 55px;
$sidebarWidth: 350px; $sidebarWidth: 350px;
$keyline: 1px solid $lightgrey; $keyline: 1px solid $lightgrey;
$border-radius: 3px;
$list-highlight: #FFFFC0; $list-highlight: #FFFFC0;
$border: 1px solid $grey; $border: 1px solid $grey;

6
app/helpers/user_helper.rb
View file

@ -2,7 +2,7 @@ module UserHelper
# User images # User images
def user_image(user, options = {}) def user_image(user, options = {})
options[:class] ||= "user_image" options[:class] ||= "user_image border border-grey"
options[:alt] ||= "" options[:alt] ||= ""
if user.image_use_gravatar if user.image_use_gravatar
@ -15,7 +15,7 @@ module UserHelper
end end
def user_thumbnail(user, options = {}) def user_thumbnail(user, options = {})
options[:class] ||= "user_thumbnail" options[:class] ||= "user_thumbnail border border-grey"
options[:alt] ||= "" options[:alt] ||= ""
if user.image_use_gravatar if user.image_use_gravatar
@ -28,7 +28,7 @@ module UserHelper
end end
def user_thumbnail_tiny(user, options = {}) def user_thumbnail_tiny(user, options = {})
options[:class] ||= "user_thumbnail_tiny" options[:class] ||= "user_thumbnail_tiny border border-grey"
options[:alt] ||= "" options[:alt] ||= ""
if user.image_use_gravatar if user.image_use_gravatar

19
app/views/browse/_paging_nav.html.erb
View file

@ -1,5 +1,14 @@
<% if pages.page_count > 1 %> <div class="row">
<span class="paginate"> <div class="col">
<%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %> <h4><%= heading %></h4>
</span> </div>
<% end %> <% if pages.page_count > 1 %>
<div class="col-auto">
<h4>
<span class="border border-lightgrey rounded p-1">
<%= raw pagination_links_each(pages, {}) { |n| link_to(n, page_param => n) } %>
</span>
</h4>
</div>
<% end %>
</div>

2
app/views/browse/_tag_details.html.erb
View file

@ -1,6 +1,6 @@
<% unless tag_details.empty? %> <% unless tag_details.empty? %>
<h4><%= t ".tags" %></h4> <h4><%= t ".tags" %></h4>
<table class='browse-tag-list'> <table class='browse-tag-list border border-grey rounded'>
<%= render :partial => "tag", :collection => tag_details.sort %> <%= render :partial => "tag", :collection => tag_details.sort %>
</table> </table>
<% end %> <% end %>

47
app/views/browse/changeset.html.erb
View file

@ -10,21 +10,25 @@
<%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %> <%= render :partial => "tag_details", :object => @changeset.tags.except("comment") %>
<h4 class="comments-header"><%= t(".discussion") %></h4> <div class="row">
<div class="col">
<% if current_user %> <h4><%= t(".discussion") %></h4>
<div class="buttons clearfix subscribe-buttons">
<form action="#">
<% if @changeset.subscribers.exists?(current_user.id) %>
<input class="action-button btn btn-sm btn-primary" type="submit" name="unsubscribe" value="<%= t("javascripts.changesets.show.unsubscribe") %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
<% else %>
<input class="action-button btn btn-sm btn-primary" type="submit" name="subscribe" value="<%= t("javascripts.changesets.show.subscribe") %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
<% end %>
</form>
</div> </div>
<% end %>
<div class="clearfix"></div> <% if current_user %>
<div class="col-auto">
<div class="subscribe-buttons">
<form action="#">
<% if @changeset.subscribers.exists?(current_user.id) %>
<input class="action-button btn btn-sm btn-primary" type="submit" name="unsubscribe" value="<%= t("javascripts.changesets.show.unsubscribe") %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
<% else %>
<input class="action-button btn btn-sm btn-primary" type="submit" name="subscribe" value="<%= t("javascripts.changesets.show.subscribe") %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />
<% end %>
</form>
</div>
</div>
<% end %>
</div>
<% if @comments.length > 0 %> <% if @comments.length > 0 %>
<div class='changeset-comments'> <div class='changeset-comments'>
@ -74,7 +78,7 @@
<div class="form-group"> <div class="form-group">
<textarea class="form-control" name="text" cols="40" rows="5"></textarea> <textarea class="form-control" name="text" cols="40" rows="5"></textarea>
</div> </div>
<div class="buttons clearfix"> <div>
<input type="submit" name="comment" value="<%= t("javascripts.changesets.show.comment") %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" class="btn btn-sm btn-primary" /> <input type="submit" name="comment" value="<%= t("javascripts.changesets.show.comment") %>" data-changeset-id="<%= @changeset.id %>" data-method="POST" data-url="<%= changeset_comment_url(@changeset) %>" disabled="1" class="btn btn-sm btn-primary" />
</div> </div>
</form> </form>
@ -86,10 +90,7 @@
<% end %> <% end %>
<% unless @ways.empty? %> <% unless @ways.empty? %>
<h4> <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("way", @way_pages), :pages => @way_pages, :page_param => "way_page" } %>
<%= type_and_paginated_count("way", @way_pages) %>
<%= render :partial => "paging_nav", :locals => { :pages => @way_pages, :page_param => "way_page" } %>
</h4>
<ul class="list-unstyled"> <ul class="list-unstyled">
<% @ways.each do |way| %> <% @ways.each do |way| %>
<li><%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li> <li><%= link_to printable_name(way, :version => true), { :action => "way", :id => way.way_id.to_s }, { :class => link_class("way", way), :title => link_title(way) } %></li>
@ -98,10 +99,7 @@
<% end %> <% end %>
<% unless @relations.empty? %> <% unless @relations.empty? %>
<h4> <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("relation", @relation_pages), :pages => @relation_pages, :page_param => "relation_page" } %>
<%= type_and_paginated_count("relation", @relation_pages) %>
<%= render :partial => "paging_nav", :locals => { :pages => @relation_pages, :page_param => "relation_page" } %>
</h4>
<ul class="list-unstyled"> <ul class="list-unstyled">
<% @relations.each do |relation| %> <% @relations.each do |relation| %>
<li><%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %></li> <li><%= link_to printable_name(relation, :version => true), { :action => "relation", :id => relation.relation_id.to_s }, { :class => link_class("relation", relation), :title => link_title(relation) } %></li>
@ -110,10 +108,7 @@
<% end %> <% end %>
<% unless @nodes.empty? %> <% unless @nodes.empty? %>
<h4> <%= render :partial => "paging_nav", :locals => { :heading => type_and_paginated_count("node", @node_pages), :pages => @node_pages, :page_param => "node_page" } %>
<%= type_and_paginated_count("node", @node_pages) %>
<%= render :partial => "paging_nav", :locals => { :pages => @node_pages, :page_param => "node_page" } %>
</h4>
<ul class="list-unstyled"> <ul class="list-unstyled">
<% @nodes.each do |node| %> <% @nodes.each do |node| %>
<li><%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %></li> <li><%= link_to printable_name(node, :version => true), { :action => "node", :id => node.node_id.to_s }, { :class => link_class("node", node), :title => link_title(node), :rel => link_follow(node) } %></li>

4
app/views/dashboards/show.html.erb
View file

@ -6,7 +6,7 @@
<% if current_user and @user.id == current_user.id %> <% if current_user and @user.id == current_user.id %>
<div class="col-md order-md-last"> <div class="col-md order-md-last">
<% if @user.home_lat.nil? or @user.home_lon.nil? %> <% if @user.home_lat.nil? or @user.home_lon.nil? %>
<div id="map" class="content_map"> <div id="map" class="content_map border border-grey">
<p class="m-3"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p> <p class="m-3"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>
</div> </div>
<% else %> <% else %>
@ -19,7 +19,7 @@
:icon => image_path("marker-red.png"), :icon => image_path("marker-red.png"),
:description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" }) :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
} %> } %>
<%= tag.div "", :id => "map", :class => "content_map", :data => { :user => user_data } %> <%= tag.div "", :id => "map", :class => "content_map border border-grey rounded", :data => { :user => user_data } %>
<% end %> <% end %>
<% friends = @user.friends %> <% friends = @user.friends %>

2
app/views/diary_entries/_diary_entry.html.erb
View file

@ -1,5 +1,5 @@
<div class='diary_post<%= " text-muted px-3 deleted" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'> <div class='diary_post<%= " text-muted px-3 deleted" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
<div class='post_heading'> <div class='mb-3'>
<% if @user %> <% if @user %>
<h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2> <h2><%= link_to diary_entry.title, diary_entry_path(diary_entry.user, diary_entry) %></h2>
<% else %> <% else %>

2
app/views/diary_entries/_form.html.erb
View file

@ -5,7 +5,7 @@
<fieldset> <fieldset>
<legend><%= t ".location" -%></legend> <legend><%= t ".location" -%></legend>
<%= tag.div "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %> <%= tag.div "", :id => "map", :class => "border border-grey rounded", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
<div class="form-row"> <div class="form-row">
<%= f.text_field :latitude, :wrapper_class => "col-sm-4", :id => "latitude" %> <%= f.text_field :latitude, :wrapper_class => "col-sm-4", :id => "latitude" %>

2
app/views/layouts/_header.html.erb
View file

@ -81,7 +81,7 @@
<% if current_user && current_user.id %> <% if current_user && current_user.id %>
<div class='d-inline-flex dropdown user-menu logged-in clearfix'> <div class='d-inline-flex dropdown user-menu logged-in clearfix'>
<a class='dropdown-toggle btn btn-outline-secondary pl-2 py-1 flex-grow-1' data-toggle='dropdown' href="#"> <a class='dropdown-toggle btn btn-outline-secondary pl-2 py-1 flex-grow-1' data-toggle='dropdown' href="#">
<%= user_thumbnail_tiny(current_user, :width => 25, :height => 25) %> <%= user_thumbnail_tiny(current_user, :width => 25, :height => 25, :class => "user_thumbnail_tiny rounded-sm") %>
<%= render :partial => "layouts/inbox" %> <%= render :partial => "layouts/inbox" %>
<span class="user-button"> <span class="user-button">
<span class='username'> <span class='username'>

2
app/views/profiles/edit.html.erb
View file

@ -53,7 +53,7 @@
<input class="form-check-input" type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" /> <input class="form-check-input" type="checkbox" name="updatehome" value="1" <% unless current_user.home_lat and current_user.home_lon %> checked="checked" <% end %> id="updatehome" />
<label class="form-check-label" for="updatehome"><%= t ".update home location on click" %></label> <label class="form-check-label" for="updatehome"><%= t ".update home location on click" %></label>
</div> </div>
<%= tag.div "", :id => "map", :class => "content_map set_location" %> <%= tag.div "", :id => "map", :class => "content_map set_location border border-grey rounded" %>
</fieldset> </fieldset>
<%= f.primary t(".save") %> <%= f.primary t(".save") %>

2
app/views/site/export.html.erb
View file

@ -6,7 +6,7 @@
<%= hidden_field_tag "format", "osm", :autocomplete => "off" %> <%= hidden_field_tag "format", "osm", :autocomplete => "off" %>
<div class='export_area_inputs'> <div class='export_area_inputs'>
<div class='export_boxy'> <div class='export_boxy border border-grey rounded'>
<%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %> <%= text_field_tag("maxlat", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control mx-auto") %>
<div class="clearfix"> <div class="clearfix">
<%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control") %> <%= text_field_tag("minlon", nil, :size => 10, :autocomplete => "off", :class => "export_bound form-control") %>

2
app/views/users/terms.html.erb
View file

@ -30,7 +30,7 @@
<% end %> <% end %>
</div> </div>
<div id="contributorTerms" class="legale"> <div id="contributorTerms" class="legale border border-grey rounded">
<%= render :partial => "terms" %> <%= render :partial => "terms" %>
</div> </div>

4
test/controllers/diary_entries_controller_test.rb
View file

@ -319,7 +319,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1 assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1
end end
assert_select "div#content", :count => 1 do assert_select "div#content", :count => 1 do
assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 assert_select "h2", :text => /#{new_title}/, :count => 1
# This next line won't work if the text has been run through the htmlize function # This next line won't work if the text has been run through the htmlize function
# due to formatting that could be introduced # due to formatting that could be introduced
assert_select "p", :text => /#{new_body}/, :count => 1 assert_select "p", :text => /#{new_body}/, :count => 1
@ -339,7 +339,7 @@ class DiaryEntriesControllerTest < ActionDispatch::IntegrationTest
assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1 assert_select "h1", :text => /#{entry.user.display_name}'s Diary/, :count => 1
end end
assert_select "div#content", :count => 1 do assert_select "div#content", :count => 1 do
assert_select "div.post_heading", :text => /#{new_title}/, :count => 1 assert_select "h2", :text => /#{new_title}/, :count => 1
# This next line won't work if the text has been run through the htmlize function # This next line won't work if the text has been run through the htmlize function
# due to formatting that could be introduced # due to formatting that could be introduced
assert_select "p", :text => /#{new_body}/, :count => 1 assert_select "p", :text => /#{new_body}/, :count => 1

12
test/helpers/user_helper_test.rb
View file

@ -8,12 +8,12 @@ class UserHelperTest < ActionView::TestCase
gravatar_user = create(:user, :image_use_gravatar => true) gravatar_user = create(:user, :image_use_gravatar => true)
image = user_image(user) image = user_image(user)
assert_match %r{^<img class="user_image" .* src="/images/avatar_large.png" />$}, image assert_match %r{^<img class="user_image border border-grey" .* src="/images/avatar_large.png" />$}, image
image = user_image(user, :class => "foo") image = user_image(user, :class => "foo")
assert_match %r{^<img class="foo" .* src="/images/avatar_large.png" />$}, image assert_match %r{^<img class="foo" .* src="/images/avatar_large.png" />$}, image
image = user_image(gravatar_user) image = user_image(gravatar_user)
assert_match %r{^<img class="user_image" .* src="http://www.gravatar.com/avatar/.*" />$}, image assert_match %r{^<img class="user_image border border-grey" .* src="http://www.gravatar.com/avatar/.*" />$}, image
image = user_image(gravatar_user, :class => "foo") image = user_image(gravatar_user, :class => "foo")
assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image
@ -24,13 +24,13 @@ class UserHelperTest < ActionView::TestCase
gravatar_user = create(:user, :image_use_gravatar => true) gravatar_user = create(:user, :image_use_gravatar => true)
image = user_thumbnail(user) image = user_thumbnail(user)
assert_match %r{^<img class="user_thumbnail" .* src="/images/avatar_small.png" />$}, image assert_match %r{^<img class="user_thumbnail border border-grey" .* src="/images/avatar_small.png" />$}, image
image = user_thumbnail(user, :class => "foo") image = user_thumbnail(user, :class => "foo")
assert_match %r{^<img class="foo" .* src="/images/avatar_small.png" />$}, image assert_match %r{^<img class="foo" .* src="/images/avatar_small.png" />$}, image
image = user_thumbnail(gravatar_user) image = user_thumbnail(gravatar_user)
assert_match %r{^<img class="user_thumbnail" .* src="http://www.gravatar.com/avatar/.*" />$}, image assert_match %r{^<img class="user_thumbnail border border-grey" .* src="http://www.gravatar.com/avatar/.*" />$}, image
image = user_thumbnail(gravatar_user, :class => "foo") image = user_thumbnail(gravatar_user, :class => "foo")
assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image
@ -41,13 +41,13 @@ class UserHelperTest < ActionView::TestCase
gravatar_user = create(:user, :image_use_gravatar => true) gravatar_user = create(:user, :image_use_gravatar => true)
image = user_thumbnail_tiny(user) image = user_thumbnail_tiny(user)
assert_match %r{^<img class="user_thumbnail_tiny" .* src="/images/avatar_small.png" />$}, image assert_match %r{^<img class="user_thumbnail_tiny border border-grey" .* src="/images/avatar_small.png" />$}, image
image = user_thumbnail_tiny(user, :class => "foo") image = user_thumbnail_tiny(user, :class => "foo")
assert_match %r{^<img class="foo" .* src="/images/avatar_small.png" />$}, image assert_match %r{^<img class="foo" .* src="/images/avatar_small.png" />$}, image
image = user_thumbnail_tiny(gravatar_user) image = user_thumbnail_tiny(gravatar_user)
assert_match %r{^<img class="user_thumbnail_tiny" .* src="http://www.gravatar.com/avatar/.*" />$}, image assert_match %r{^<img class="user_thumbnail_tiny border border-grey" .* src="http://www.gravatar.com/avatar/.*" />$}, image
image = user_thumbnail_tiny(gravatar_user, :class => "foo") image = user_thumbnail_tiny(gravatar_user, :class => "foo")
assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image assert_match %r{^<img class="foo" .* src="http://www.gravatar.com/avatar/.*" />$}, image