]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 1: cbcc7dc)
Merge remote-tracking branch 'upstream/pull/3489'
authorTom Hughes <tom@compton.nu>
Sat, 5 Mar 2022 10:08:53 +0000 (10:08 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 5 Mar 2022 10:08:53 +0000 (10:08 +0000)
app/views/oauth2_applications/index.html.erb patch | blob | history
app/views/oauth2_applications/show.html.erb patch | blob | history
app/views/oauth2_authorized_applications/index.html.erb patch | blob | history
app/views/site/_id.html.erb patch | blob | history
app/views/site/help.html.erb patch | blob | history
app/views/site/id.html.erb patch | blob | history
app/views/user_blocks/blocks_on.html.erb patch | blob | history
test/controllers/oauth2_applications_controller_test.rb patch | blob | history
test/controllers/oauth2_authorized_applications_controller_test.rb patch | blob | history

diff --git a/app/views/oauth2_applications/index.html.erb b/app/views/oauth2_applications/index.html.erb
index 119bf587807ea184f873219f24ccfcdb8b4bbc72..4ed849f9816dfa71ed2a11edc458a4e4465913d8 100644 (file)
--- a/app/views/oauth2_applications/index.html.erb
+++ b/app/views/oauth2_applications/index.html.erb
@@ -7,10 +7,12 @@
 <% if @applications.length > 0 %>
   <table class="table table-borderless table-striped">
     <thead>
-      <th><%= t ".name" %></th>
-      <th><%= t ".permissions" %></th>
-      <th></th>
-      <th></th>
+      <tr>
+        <th><%= t ".name" %></th>
+        <th><%= t ".permissions" %></th>
+        <th></th>
+        <th></th>
+      </tr>
     </thead>
     <tbody>
       <%= render :partial => "application", :collection => @applications %>
diff --git a/app/views/oauth2_applications/show.html.erb b/app/views/oauth2_applications/show.html.erb
index 2967058119e457fbb864b74033dfda01b7538673..8d9c8516dfd297ad5494e946a082d464bd16631b 100644 (file)
--- a/app/views/oauth2_applications/show.html.erb
+++ b/app/views/oauth2_applications/show.html.erb
@@ -48,4 +48,4 @@
 <div>
   <%= link_to t(".edit"), edit_oauth_application_path(@application), :class => "btn btn-outline-primary" %>
   <%= link_to t(".delete"), oauth_application_path(@application), { :method => :delete, :class => "btn btn-outline-danger", :data => { :confirm => t(".confirm_delete") } } %>
-</td>
+</div>
diff --git a/app/views/oauth2_authorized_applications/index.html.erb b/app/views/oauth2_authorized_applications/index.html.erb
index b9599a9193b1735171897ac9dd40ec189a01c8c5..2d3ad00bdea337b269b3609298ebb0c7d92065ab 100644 (file)
--- a/app/views/oauth2_authorized_applications/index.html.erb
+++ b/app/views/oauth2_authorized_applications/index.html.erb
@@ -7,9 +7,11 @@
 <% if @applications.length > 0 %>
   <table class="table table-borderless table-striped">
     <thead>
-      <th><%= t ".application" %></th>
-      <th><%= t ".permissions" %></th>
-      <th></th>
+      <tr>
+        <th><%= t ".application" %></th>
+        <th><%= t ".permissions" %></th>
+        <th></th>
+      </tr>
     </thead>
     <tbody>
       <%= render :partial => "application", :collection => @applications %>
diff --git a/app/views/site/_id.html.erb b/app/views/site/_id.html.erb
index f1f48c1e10687f71f600f9f5235ff9aff8f1332a..1a3807e4afcc6900c39d4fc429d2b6fd290dfa44 100644 (file)
--- a/app/views/site/_id.html.erb
+++ b/app/views/site/_id.html.erb
@@ -1,10 +1,10 @@
 <%= javascript_include_tag "edit/id" %>
 
 <div id="map">
-  <% data = { :key => Settings.id_key } -%>
-  <% data[:lat] = @lat if @lat -%>
-  <% data[:lon] = @lon if @lon -%>
-  <% data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx] -%>
-  <% data[:url] = id_url(:locale => params[:locale]) -%>
+  <% data = { :key => Settings.id_key }
+     data[:lat] = @lat if @lat
+     data[:lon] = @lon if @lon
+     data[:gpx] = trace_data_url(params[:gpx], :format => :xml) if params[:gpx]
+     data[:url] = id_url(:locale => params[:locale]) %>
   <%= tag.iframe "", :frameBorder => 0, :id => "id-embed", :class => "id-embed", :allowfullscreen => "", :data => data %>
 </div>
diff --git a/app/views/site/help.html.erb b/app/views/site/help.html.erb
index e6c65a99239526629cf72bdfa06e1d6cc9569201..c82893e9d2e6246f19e61a52ea2733741539fc48 100644 (file)
--- a/app/views/site/help.html.erb
+++ b/app/views/site/help.html.erb
@@ -16,7 +16,7 @@
             <a href='<%= t ".#{site}.url" %>'>
               <%= t ".#{site}.title" %>
             </a>
-          </h3>
+          </h6>
           <p class='card-text'><%= t ".#{site}.description" %></p>
         </div>
         <div class="card-footer">
diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index 0178c8f22f817b2d5c58a85e14cd56ce61e53c81..ec067b9e7ae5f285769cf8138d5fe85c7ba81cac 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -8,16 +8,16 @@
   <!-- <![endif]-->
 </head>
 <body>
-<% data = {} -%>
-<% if Settings.key?(:id_key) %>
-<% token = current_user.access_token(Settings.id_key) %>
-<% data[:token] = token.token -%>
-<% data[:token_secret] = token.secret -%>
-<% data[:consumer_key] = token.client_application.key -%>
-<% data[:consumer_secret] = token.client_application.secret -%>
-<% end %>
-<% data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s -%>
-<% data[:asset_map] = assets("iD").to_json -%>
+<% data = {}
+   if Settings.key?(:id_key)
+     token = current_user.access_token(Settings.id_key)
+     data[:token] = token.token
+     data[:token_secret] = token.secret
+     data[:consumer_key] = token.client_application.key
+     data[:consumer_secret] = token.client_application.secret
+   end
+   data[:locale] = ID::LOCALES.preferred(preferred_languages).to_s
+   data[:asset_map] = assets("iD").to_json %>
 <%= tag.div "", :id => "id-container", :data => data %>
 </body>
 </html>
diff --git a/app/views/user_blocks/blocks_on.html.erb b/app/views/user_blocks/blocks_on.html.erb
index e82711a4ee3292a92bf2bc464966e703094e09f2..7d1f83ce357e533edee42e529b6c27d8c172d0b6 100644 (file)
--- a/app/views/user_blocks/blocks_on.html.erb
+++ b/app/views/user_blocks/blocks_on.html.erb
@@ -2,6 +2,7 @@
 <% content_for :heading do %>
   <h1><%= t(".heading_html", :name => link_to(@user.display_name, user_path(@user))) %></h1>
 <% end %>
+
 <% unless @user_blocks.empty? %>
 <%= render :partial => "blocks", :locals => { :show_revoke_link => can?(:revoke, UserBlock), :show_user_name => false, :show_creator_name => true } %>
 <% else %>
diff --git a/test/controllers/oauth2_applications_controller_test.rb b/test/controllers/oauth2_applications_controller_test.rb
index 149b6ee35ec458c3a59305dc474311254cd9412a..1b6eaabfe74785da17127b6ed574fdee07e960a4 100644 (file)
--- a/test/controllers/oauth2_applications_controller_test.rb
+++ b/test/controllers/oauth2_applications_controller_test.rb
@@ -51,7 +51,7 @@ class Oauth2ApplicationsControllerTest < ActionDispatch::IntegrationTest
     get oauth_applications_path
     assert_response :success
     assert_template "oauth2_applications/index"
-    assert_select "tr", 2
+    assert_select "tbody tr", 2
   end
 
   def test_new
diff --git a/test/controllers/oauth2_authorized_applications_controller_test.rb b/test/controllers/oauth2_authorized_applications_controller_test.rb
index 45a60efcbeefdfd1058823f776ebb69f5d880ac6..347d3e40e4a27049c00ed9e2f49a1e212f1a4bda 100644 (file)
--- a/test/controllers/oauth2_authorized_applications_controller_test.rb
+++ b/test/controllers/oauth2_authorized_applications_controller_test.rb
@@ -33,7 +33,7 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe
     get oauth_authorized_applications_path
     assert_response :success
     assert_template "oauth2_authorized_applications/index"
-    assert_select "tr", 2
+    assert_select "tbody tr", 2
   end
 
   def test_destroy
@@ -58,6 +58,6 @@ class Oauth2AuthorizedApplicationsControllerTest < ActionDispatch::IntegrationTe
     get oauth_authorized_applications_path
     assert_response :success
     assert_template "oauth2_authorized_applications/index"
-    assert_select "tr", 1
+    assert_select "tbody tr", 1
   end
 end
The OpenStreetMap web site