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

Merge remote-tracking branch 'upstream/master' into routing-ui-tweaks-2

Browse source 
Conflicts:
	config/locales/de.yml
This commit is contained in:
Matt Amos 2015-01-26 13:14:58 +00:00
commit c3e2e6462f
381 changed files with 5384 additions and 1904 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -15,7 +15,7 @@
<div class="buttons clearfix subscribe-buttons">
<form action="#" class="hide_unless_logged_in">
<% if @changeset.subscribers.exists?(@user) %>
<% if @user and @changeset.subscribers.exists?(@user.id) %>
<input class="action-button" type="submit" name="unsubscribe" value="<%= t('javascripts.changesets.show.unsubscribe') %>" data-method="POST" data-url="<%= changeset_unsubscribe_url(@changeset) %>" />
<% else %>
<input class="action-button" type="submit" name="subscribe" value="<%= t('javascripts.changesets.show.subscribe') %>" data-method="POST" data-url="<%= changeset_subscribe_url(@changeset) %>" />