Skip to content

Commit dad4f2b

Browse files
Indicate loading in progress in source view
1 parent 8080b0d commit dad4f2b

File tree

6 files changed

+29
-9
lines changed

6 files changed

+29
-9
lines changed

app/assets/stylesheets/lit/application.css

+6
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,9 @@ padding: 5px 7px;
5151
.localization_row em{
5252
color: #bbb;
5353
}
54+
.loading {
55+
display: inline;
56+
}
57+
.loaded {
58+
display: none;
59+
}

app/controllers/lit/sources_controller.rb

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ def edit
2020

2121
def synchronize
2222
@source = Source.find(params[:id])
23+
@source.update_column(:sync_complete, false)
2324
if defined?(ActiveJob)
2425
SynchronizeSourceJob.perform_later(@source)
2526
else

app/helpers/lit/sources_helper.rb

+3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
module Lit
22
module SourcesHelper
3+
def source_loading_class(source)
4+
source.sync_complete ? 'loaded' : 'loading'
5+
end
36
end
47
end

app/models/lit/source.rb

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ def synchronize
5454
last_change = get_last_change
5555
last_change = DateTime.parse(last_change) unless last_change.nil?
5656
touch_last_updated_at(last_change)
57+
update_column(:sync_complete, true)
5758
save
5859
end
5960
end

app/views/lit/incomming_localizations/index.html.erb

+13-9
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
<h1>Incomming localizations</h1>
2-
<div class="row">
3-
<span class="pull-right">
4-
<%= link_to accept_all_source_incomming_localizations_path(@source), :class=>"btn btn-success btn-sm", :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
5-
<%= t('lit.common.accept_all', :default=>"Accept all") %>
6-
<% end %>
7-
<%= link_to reject_all_source_incomming_localizations_path(@source), :class=>"btn btn-danger btn-sm", :method=>:post, :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
8-
<%= t('lit.common.reject_all', :default=>"Reject all") %>
9-
<% end %>
10-
</span>
2+
<div class="container">
3+
<div class="row inline-headers">
4+
<h4 class="<%= source_loading_class(@source) %>">Please wait...</h2>
5+
<span class="pull-right">
6+
<%= link_to accept_all_source_incomming_localizations_path(@source), :class=>"btn btn-success btn-sm", :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
7+
<%= t('lit.common.accept_all', :default=>"Accept all") %>
8+
<% end %>
9+
<%= link_to reject_all_source_incomming_localizations_path(@source), :class=>"btn btn-danger btn-sm", :method=>:post, :data=>{:confirm=>t('lit.common.you_sure', :default=>"Are you sure?")} do %>
10+
<%= t('lit.common.reject_all', :default=>"Reject all") %>
11+
<% end %>
12+
</span>
13+
</div>
1114
</div>
1215

16+
1317
<table class="table table-bordered table-striped incomming-localizations-table">
1418
<tr>
1519
<th>Current value</th>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
class AddSyncCompleteToLitSources < ActiveRecord::Migration
2+
def change
3+
add_column :lit_sources, :sync_complete, :boolean
4+
end
5+
end

0 commit comments

Comments
 (0)