diff options
| author | Bruno Perles | 2015-11-12 11:27:31 +0100 |
|---|---|---|
| committer | Bruno Perles | 2015-11-13 11:17:06 +0100 |
| commit | fb245dbf939ce497a8a7355bc994f78164b4204b (patch) | |
| tree | 7e80e805396c1be6c7a4f4c9e04ca691a177d39c | |
| parent | 75ed3616bbc6b2ab0b4a24da3027e896171357ea (diff) | |
| download | chouette-core-fb245dbf939ce497a8a7355bc994f78164b4204b.tar.bz2 | |
#40511 - Fix spinner icon
| -rw-r--r-- | app/helpers/job_status_icon_helper.rb | 15 | ||||
| -rw-r--r-- | config/locales/job_status.en.yml | 4 | ||||
| -rw-r--r-- | config/locales/job_status.fr.yml | 4 |
3 files changed, 15 insertions, 8 deletions
diff --git a/app/helpers/job_status_icon_helper.rb b/app/helpers/job_status_icon_helper.rb index 9b8e485db..697b4d10c 100644 --- a/app/helpers/job_status_icon_helper.rb +++ b/app/helpers/job_status_icon_helper.rb @@ -5,16 +5,16 @@ module JobStatusIconHelper name = object.name object_name = object.class.model_name.human.capitalize - title = "" + title = '' if %w{ aborted canceled }.include?(status) - title += "<span class='name aborted'><i class='fa fa-times'></i>" + title += '<span class="name aborted"><i class="fa fa-times"></i>' elsif %w{ started scheduled }.include?(status) - title += "<span class='name processed'><i class='fa fa-spinner fa-spin'></i>" - elsif %w{terminated}.include?(status) - title += "<span class='name terminated'><i class='fa fa-check'></i>" + title += "<span class=\"name processed progress\" title=\"#{I18n.t('job_status.title.processed')}\"><i class=\"fa fa-clock-o\"></i>" + elsif %w{ terminated }.include?(status) + title += '<span class="name terminated"><i class="fa fa-check"></i>' end - title += "#{object_name} #{truncate(name, :length => 20)}</span>" + title += "#{object_name} #{truncate(name, length: 20)}</span>" title.html_safe end @@ -23,8 +23,7 @@ module JobStatusIconHelper name = object.name object_name = object.class.model_name.human.capitalize - title = "#{object_name} #{truncate(name, :length => 20)}" - title.html_safe + "#{object_name} #{truncate(name, length: 20)}".html_safe end end diff --git a/config/locales/job_status.en.yml b/config/locales/job_status.en.yml new file mode 100644 index 000000000..a0da8e34a --- /dev/null +++ b/config/locales/job_status.en.yml @@ -0,0 +1,4 @@ +en: + job_status: + title: + processed: Launched operation , click to display its progress. diff --git a/config/locales/job_status.fr.yml b/config/locales/job_status.fr.yml new file mode 100644 index 000000000..b6481b602 --- /dev/null +++ b/config/locales/job_status.fr.yml @@ -0,0 +1,4 @@ +fr: + job_status: + title: + processed: Opération lancée, cliquez pour afficher son état d'avancement. |