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

app/views/browse/changeset.html.erb

@@ -15,7 +15,7 @@
 
   <% if current_user %>
     <div class="buttons clearfix subscribe-buttons">
-      <form action="#">
+      <form action="#" class="standard-form">
         <% if @changeset.subscribers.exists?(current_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 %>
@@ -29,7 +29,7 @@
 
   <% if @comments.length > 0 %>
     <div class='changeset-comments'>
-      <form action="#">
+      <form action="#" class="standard-form">
         <ul class="list-unstyled">
           <% @comments.each do |comment| %>
             <% if comment.visible %>
@@ -71,7 +71,7 @@
 
   <% if current_user %>
     <% unless @changeset.is_open? %>
-      <form action="#">
+      <form action="#" class="standard-form">
         <textarea class="comment" name="text" cols="40" rows="5"></textarea>
         <div class="buttons clearfix">
           <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" />

app/views/browse/new_note.html.erb

@@ -7,7 +7,7 @@
 
 <div class="note browse-section">
   <p class="alert alert-info"><%= t("javascripts.notes.new.intro") %></p>
-  <form action="#">
+  <form action="#" class="standard-form">
     <input type="hidden" name="lon">
     <input type="hidden" name="lat">
     <textarea class="comment" name="text" cols="40" rows="10" maxlength="2000" placeholder="<%= t("javascripts.notes.new.advice") %>"></textarea>

app/views/browse/note.html.erb

@@ -47,7 +47,7 @@
 
   <% if @note.status == "open" %>
     <% if current_user -%>
-      <form action="#">
+      <form action="#" class="standard-form">
         <textarea class="comment" name="text" cols="40" rows="5" maxlength="2000"></textarea>
         <div class="buttons clearfix">
           <% if current_user.moderator? -%>
@@ -59,7 +59,7 @@
       </form>
     <% end -%>
   <% else %>
-    <form action="#">
+    <form action="#" class="standard-form">
       <input type="hidden" name="text" value="">
       <div class="buttons clearfix">
         <% if current_user and current_user.moderator? -%>

app/views/diary_entries/show.html.erb

@@ -13,7 +13,7 @@
 <%= render :partial => "diary_comment", :collection => @comments %>
 </div>
 
-<div>
+<div class="standard-form">
   <% if current_user %>
     <h3 id="newcomment"><%= t ".leave_a_comment" %></h3>
 

app/views/friendships/make_friend.html.erb

@@ -2,7 +2,7 @@
   <h1><%= t ".heading", :user => @new_friend.display_name %></h1>
 <% end %>
 
-<%= form_tag do %>
+<%= form_tag(nil, :class => "standard-form") do %>
   <% if params[:referer] -%>
   <%= hidden_field_tag("referer", params[:referer]) %>
   <% end -%>

app/views/friendships/remove_friend.html.erb

@@ -2,7 +2,7 @@
   <h1><%= t ".heading", :user => @friend.display_name %></h1>
 <% end %>
 
-<%= form_tag do %>
+<%= form_tag(nil, :class => "standard-form") do %>
   <% if params[:referer] -%>
   <%= hidden_field_tag("referer", params[:referer]) %>
   <% end -%>

app/views/issues/_comments.html.erb

@@ -14,7 +14,7 @@
   <% end %>
 </div>
 <br />
-<div class="comment">
+<div class="comment standard-form">
   <%= form_for @new_comment, :url => issue_comments_path(@issue) do |f| %>
   <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %>
   <%= label_tag :reassign, t(".reassign_param") %> <%= check_box_tag :reassign, true %>

app/views/issues/index.html.erb

@@ -2,7 +2,7 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
-<%= form_tag(issues_path, :method => :get) do %>
+<%= form_tag(issues_path, :method => :get, :class => "standard-form") do %>
 <p><%= t ".search_guidance" %></p>
 <%= select_tag :status, options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]), :include_blank => t(".select_status"), :data => { :behavior => "category_dropdown" } %>
 <%= select_tag :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => "category_dropdown" } %>

app/views/layouts/_search.html.erb

@@ -1,4 +1,4 @@
-<div class="search_forms">
+<div class="search_forms standard-form">
   <form method="GET" action="<%= search_path %>" class="search_form">
     <%= link_to image_tag("directions.png", :class => "button"), directions_path, :class => "button switch_link", :title => t("site.search.get_directions_title") %>
     <%= submit_tag t("site.search.submit_text"), :class => "float", :data => { :disable_with => false } %>

app/views/messages/_message_summary.html.erb

@@ -1,4 +1,4 @@
-<tr id="inbox-<%= message_summary.id %>" class="inbox-row<%= "-unread" unless message_summary.message_read? %>">
+<tr id="inbox-<%= message_summary.id %>" class="standard-form inbox-row<%= "-unread" unless message_summary.message_read? %>">
   <td class="inbox-sender"><%= link_to message_summary.sender.display_name, user_path(message_summary.sender) %></td>
   <td class="inbox-subject"><%= link_to message_summary.title, message_path(message_summary) %></td>
   <td class="inbox-sent"><%= l message_summary.sent_on, :format => :friendly %></td>

app/views/oauth_clients/edit.html.erb

@@ -2,7 +2,7 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
-<%= form_for @client_application, :url => oauth_client_path(@client_application.user.display_name, @client_application), :html => { :method => :put } do |f| %>
+<%= form_for @client_application, :url => oauth_client_path(@client_application.user.display_name, @client_application), :html => { :method => :put, :class => "standard-form" } do |f| %>
   <%= render :partial => "form", :locals => { :f => f } %>
   <%= f.submit %>
 <% end %>

app/views/oauth_clients/index.html.erb

@@ -18,7 +18,7 @@
       <td><%= link_to token.client_application.name, token.client_application.url %></td>
       <td><%= token.authorized_at %></td>
       <td>
-        <%= form_tag :controller => "oauth", :action => "revoke" do %>
+        <%= form_tag({ :controller => "oauth", :action => "revoke" }, { :class => "standard-form" }) do %>
           <%= hidden_field_tag "token", token.token %>
           <%= submit_tag t(".revoke") %>
         <% end %>

app/views/oauth_clients/show.html.erb

@@ -27,7 +27,7 @@
 
   <p><%= t ".support_notice" %></p>
 </div>
-<div class="buttons">
+<div class="buttons standard-form">
   <%= button_to t(".edit"), edit_oauth_client_path(@client_application.user.display_name, @client_application), :method => :get, :class => "oauth-edit" %>
   <%= button_to t(".delete"), oauth_client_path(@client_application.user.display_name, @client_application), :method => :delete, :data => { :confirm => t(".confirm") }, :class => "oauth-delete deemphasize" %>
 </div>

app/views/redactions/edit.html.erb

@@ -4,7 +4,7 @@
   <h1><%= t ".heading" %></h1>
 <% end %>
 
-<%= form_for(@redaction) do |f| %>
+<%= form_for(@redaction, :html => { :class => "standard-form" }) do |f| %>
   <%= f.error_messages %>
 
   <p>

app/views/redactions/new.html.erb

@@ -3,7 +3,7 @@
   <h1><%= t ".heading" %></h1>
 <% end %>
 
-<%= form_for(@redaction) do |f| %>
+<%= form_for(@redaction, :html => { :class => "standard-form" }) do |f| %>
   <%= f.error_messages %>
 
   <p>

app/views/site/export.html.erb

@@ -5,7 +5,7 @@
   <%= t ".title" %>
 </h2>
 
-<%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form" }) do %>
+<%= form_tag({ :controller => "export", :action => "finish" }, { :class => "export_form standard-form" }) do %>
   <%= hidden_field_tag "format", "osm" %>
 
   <div class='export_area_inputs'>

app/views/traces/edit.html.erb

@@ -4,52 +4,16 @@
 
 <img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">
 
-<%= form_for @trace do |f| %>
-
-<div id='edit-trace-form' class='standard-form'>
-  <fieldset>
-    <div class='standard-form-row'>
-      <label class='standard-label'><%= t ".filename" %></label>
-      <p class='deemphasize'><%= @trace.name %> (<%= link_to t(".download"), trace_data_path(@trace) %>)</p>
-    </div>
-    <div class='standard-form-row'>
-      <label class='standard-label'><%= t ".uploaded_at" %></label>
-      <p class='deemphasize'><%= l @trace.timestamp, :format => :friendly %></p>
-    </div>
-  <% if @trace.inserted? %>
-    <div class='standard-form-row'>
-      <label class='standard-label'><%= t ".points" %></label>
-      <p class='deemphasize'><%= @trace.size.to_s.gsub(/(\d)(?=(\d{3})+$)/, '\1,') %></p>
-    </div>
-    <div class='standard-form-row'>
-      <label class='standard-label'><%= t ".start_coord" %></label>
-    </div>
-    <div class="geo">
-      <span class="latitude"><%= @trace.latitude %></span>;
-      <span class="longitude"><%= @trace.longitude %></span>
-    </div>
-    (<%= link_to t(".map"), :controller => "site", :action => "index", :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %> / <%= link_to t(".edit"), :controller => "site", :action => "edit", :gpx => @trace.id, :anchor => "map=14/#{@trace.latitude}/#{@trace.longitude}" %>)
-  <% end %>
-    <div class='standard-form-row'>
-      <label class='standard-label'><%= t ".owner" %></label>
-      <p class='deemphasize'><%= link_to @trace.user.display_name, user_path(@trace.user) %></p>
-    </div>
-    <div class='standard-form-row'>
-      <label class='standard-label'><%= t ".description" %></label>
-      <%= f.text_field :description %>
-    </div>
-    <div class='standard-form-row'>
-      <label class='standard-label'><%= t ".tags" %></label>
-      <%= f.text_field :tagstring %> (<%= t ".tags_help" %>)
-    </div>
-    <div class='standard-form-row'>
-      <label class='standard-label'><%= t ".visibility" %></label>
-      <%= f.select :visibility, [[t("traces.visibility.private"), "private"], [t("traces.visibility.public"), "public"], [t("traces.visibility.trackable"), "trackable"], [t("traces.visibility.identifiable"), "identifiable"]] %> (<a href="<%= t ".visibility_help_url" %>"><%= t ".visibility_help" %></a>)
-    </div>
-  </fieldset>
-
-</div>
-
-<%= f.submit %>
-
+<%= bootstrap_form_for @trace do |f| %>
+  <%= f.text_field :name, :disabled => true %>
+  <%= f.text_field :description %>
+  <%= f.text_field :tagstring %>
+  <%= f.select :visibility,
+               [[t("traces.visibility.private"), "private"],
+                [t("traces.visibility.public"), "public"],
+                [t("traces.visibility.trackable"), "trackable"],
+                [t("traces.visibility.identifiable"), "identifiable"]],
+               :help => link_to(t(".visibility_help"), t(".visibility_help_url")) %>
+  <%= f.primary %>
+  <%= link_to t(".cancel"), show_trace_path(@trace.user, @trace), :class => "btn btn-link" %>
 <% end %>

app/views/traces/new.html.erb

@@ -2,32 +2,16 @@
   <h1><%= t ".upload_trace" %></h1>
 <% end %>
 
-<%= error_messages_for "trace" %>
-
-<%= form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
-  <div class="standard-form">
-    <fieldset>
-      <div class='standard-form-row'>
-        <label for="trace_gpx_file" class="standard-label"><%= t ".upload_gpx" %></label>
-        <%= f.file_field :gpx_file %>
-      </div>
-      <div class='standard-form-row'>
-        <label class="standard-label"><%= t ".description" %></label>
-        <%= f.text_field :description %>
-      </div>
-      <div class='standard-form-row'>
-        <label class="standard-label"><%= t ".tags" %></label>
-        <%= f.text_field :tagstring %>
-        <span class="form-help deemphasize">(<%= t ".tags_help" %>)</span>
-      </div>
-      <div class='standard-form-row'>
-        <label class="standard-label"><%= t ".visibility" %></label>
-        <%= f.select :visibility, [[t("traces.visibility.private"), "private"], [t("traces.visibility.public"), "public"], [t("traces.visibility.trackable"), "trackable"], [t("traces.visibility.identifiable"), "identifiable"]] %>
-        <span class="form-help deemphasize">(<a href="<%= t ".visibility_help_url" %>"><%= t ".visibility_help" %></a>)</span>
-      </div>
-    </fieldset>
-
-    <%= f.submit %>
-    <span class="form-help deemphasize"><a href="<%= t ".help_url" %>"><%= t ".help" %></a></span>
-  </div>
+<%= bootstrap_form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
+  <%= f.file_field :gpx_file, :placeholder => t("helpers.file.prompt") %>
+  <%= f.text_field :description %>
+  <%= f.text_field :tagstring %>
+  <%= f.select :visibility,
+               [[t("traces.visibility.private"), "private"],
+                [t("traces.visibility.public"), "public"],
+                [t("traces.visibility.trackable"), "trackable"],
+                [t("traces.visibility.identifiable"), "identifiable"]],
+               :help => link_to(t(".visibility_help"), t(".visibility_help_url")) %>
+  <%= f.primary %>
+  <%= link_to t(".help"), t(".help_url"), :class => "btn btn-link" %>
 <% end %>

app/views/traces/show.html.erb

@@ -55,10 +55,10 @@
 <br /><br />
 
 <% if current_user && (current_user==@trace.user || current_user.administrator? || current_user.moderator?) %>
-  <div class="buttons">
+  <div>
     <% if current_user == @trace.user %>
-      <%= link_to t(".edit_trace"), edit_trace_path(@trace), :class => "button" %>
+      <%= link_to t(".edit_trace"), edit_trace_path(@trace), :class => "btn btn-outline-primary" %>
     <% end %>
-    <%= button_to t(".delete_trace"), { :controller => "traces", :action => "destroy", :id => @trace.id }, { :method => :delete, :data => { :confirm => t(".confirm_delete") } } %>
+    <%= link_to t(".delete_trace"), { :controller => "traces", :action => "destroy", :id => @trace.id }, { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_delete") } } %>
   </div>
 <% end %>

app/views/user_blocks/edit.html.erb

@@ -9,7 +9,7 @@
   </ul>
 <% end %>
 
-<%= form_for(@user_block) do |f| %>
+<%= form_for(@user_block, :html => { :class => "standard-form" }) do |f| %>
   <%= f.error_messages %>
 
   <p>

app/views/user_blocks/new.html.erb

@@ -4,7 +4,7 @@
             :name => link_to(@user.display_name,
                              user_path(@user))) %></h1>
 <% end %>
-<%= form_for(@user_block) do |f| %>
+<%= form_for(@user_block, :html => { :class => "standard-form" }) do |f| %>
   <%= f.error_messages %>
 
   <p>

app/views/user_blocks/revoke.html.erb

@@ -15,7 +15,7 @@
   <%= t(".time_future", :time => distance_of_time_in_words_to_now(@user_block.ends_at)) %>
 </b></p>
 
-<%= form_for :revoke, :url => { :action => "revoke" } do |f| %>
+<%= form_for :revoke, :url => { :action => "revoke" }, :html => { :class => "standard-form" } do |f| %>
   <%= f.error_messages %>
 <p>
   <%= check_box_tag "confirm", "yes" %>

app/views/users/confirm.html.erb

@@ -12,7 +12,7 @@
 
   <p><%= t ".press confirm button" %></p>
 
-  <%= form_tag({}, { :id => "confirm" }) do %>
+  <%= form_tag({}, { :id => "confirm", :class => "standard-form" }) do %>
     <input type="display_name" name="confirm_string" value="<%= params[:display_name] %>">
     <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
     <input type="submit" name="confirm_action" value="<%= t ".button" %>">

app/views/users/confirm_email.html.erb

@@ -10,7 +10,7 @@
 
 <p><%= t ".press confirm button" %></p>
 
-<%= form_tag({}, { :id => "confirm" }) do %>
+<%= form_tag({}, { :id => "confirm", :class => "standard-form" }) do %>
   <input type="hidden" name="confirm_string" value="<%= params[:confirm_string] %>">
   <input type="submit" name="confirm_action" value="<%= t ".button" %>">
 <% end %>

app/views/users/logout.html.erb

@@ -2,7 +2,7 @@
   <h1><%= t ".heading" %></h1>
 <% end %>
 
-<%= form_tag :action => "logout" do %>
+<%= form_tag({ :action => "logout" }, { :class => "standard-form" }) do %>
   <%= hidden_field_tag("referer", h(params[:referer])) %>
   <%= submit_tag t(".logout_button") %>
 <% end %>