diff options
| author | jpl | 2016-07-29 12:15:17 +0200 |
|---|---|---|
| committer | jpl | 2016-07-29 12:15:17 +0200 |
| commit | 4a1ca5de810a7d31045e2ed53675965d7cab396b (patch) | |
| tree | 2e69d8cf5596380a1a86aca16ad48aa0a4fa1f51 | |
| parent | 4e1dd0cb9dd032fca53f845f3bfdee071b2aa92a (diff) | |
| download | chouette-core-4a1ca5de810a7d31045e2ed53675965d7cab396b.tar.bz2 | |
Refs #1295: convert erb to slim (exports)
| -rw-r--r-- | app/views/exports/_export.erb | 25 | ||||
| -rw-r--r-- | app/views/exports/_export.html.slim | 20 | ||||
| -rw-r--r-- | app/views/exports/_exports.html.erb | 9 | ||||
| -rw-r--r-- | app/views/exports/_exports.html.slim | 9 | ||||
| -rw-r--r-- | app/views/exports/index.html.erb | 11 | ||||
| -rw-r--r-- | app/views/exports/index.html.slim | 10 | ||||
| -rw-r--r-- | app/views/exports/index.js.erb | 1 | ||||
| -rw-r--r-- | app/views/exports/index.js.slim | 1 | ||||
| -rw-r--r-- | app/views/exports/show.html.erb | 31 | ||||
| -rw-r--r-- | app/views/exports/show.html.slim | 26 |
10 files changed, 66 insertions, 77 deletions
diff --git a/app/views/exports/_export.erb b/app/views/exports/_export.erb deleted file mode 100644 index 005ac011a..000000000 --- a/app/views/exports/_export.erb +++ /dev/null @@ -1,25 +0,0 @@ -<div id="index_item" class="panel panel-default export"> - <div class="panel-heading"> - <div class="panel-title clearfix"> - <span class="pull-right"> - <%= link_to referential_export_path(@referential, export.id), :method => :delete, :data => {:confirm => t('exports.actions.destroy_confirm')}, :class => "btn btn-danger btn-sm" do %> - <span class="fa fa-trash-o"></span> - <% end %> - </span> - <h5> - <%= link_to( referential_export_path(@referential, export.id), :class => "preview", :title => "#{Export.model_name.human.capitalize} #{export.name}") do %> - <%= job_status_title(export) %> - <% end %> - </h5> - </div> - </div> - <div class="panel-body"> - <p><%= link_to( font_awesome_classic_tag("fa-file-#{export.filename_extension}-o") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, export.id) ) if export.file_path %></p> - </div> - <div class="panel-footer"> - <%= export_attributes_tag(export) %> - <div class="history"> - <%= l export.created_at, :format => "%d/%m/%Y %H:%M" %> | <%= export.user_name %> - </div> - </div> -</div> diff --git a/app/views/exports/_export.html.slim b/app/views/exports/_export.html.slim new file mode 100644 index 000000000..f1f7e9753 --- /dev/null +++ b/app/views/exports/_export.html.slim @@ -0,0 +1,20 @@ +#index_item.panel.panel-default.export + .panel-heading + .panel-title.clearfix + span.pull-right + = link_to referential_export_path(@referential, export.id), :method => :delete, :data => {:confirm => t('exports.actions.destroy_confirm')}, class: 'btn btn-danger btn-sm' do + span.fa.fa-trash-o + + h5 + = link_to( referential_export_path(@referential, export.id), :class => "preview", :title => "#{Export.model_name.human.capitalize} #{export.name}") do + = job_status_title(export) + + .panel-body + p + = link_to( font_awesome_classic_tag("fa-file-#{export.filename_extension}-o") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, export.id) ) if export.file_path + + .panel-footer + = export_attributes_tag(export) + .history + = l export.created_at, :format => "%d/%m/%Y %H:%M" + = " | #{export.user_name}"
\ No newline at end of file diff --git a/app/views/exports/_exports.html.erb b/app/views/exports/_exports.html.erb deleted file mode 100644 index 343b57cdd..000000000 --- a/app/views/exports/_exports.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<div class="page_info"> - <span class="search"> <%= t("will_paginate.page_entries_info.search") %></span> <%= page_entries_info @exports %> -</div> -<div class="exports paginated_content"> - <%= paginated_content @exports, "exports/export" %> -</div> -<div class="pagination"> - <%= will_paginate @exports, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer %> -</div> diff --git a/app/views/exports/_exports.html.slim b/app/views/exports/_exports.html.slim new file mode 100644 index 000000000..7a0461def --- /dev/null +++ b/app/views/exports/_exports.html.slim @@ -0,0 +1,9 @@ +.page_info + span.search = t("will_paginate.page_entries_info.search") + = page_entries_info @exports + +.exports.paginated_content + = paginated_content @exports, "exports/export" + +.pagination + = will_paginate @exports, :container => false, renderer: RemoteBootstrapPaginationLinkRenderer
\ No newline at end of file diff --git a/app/views/exports/index.html.erb b/app/views/exports/index.html.erb deleted file mode 100644 index df66225fa..000000000 --- a/app/views/exports/index.html.erb +++ /dev/null @@ -1,11 +0,0 @@ -<%= title_tag t('.title') %> -<div class="warning"><%= t('.warning') %> </div> - -<div id="exports"><%= render 'exports' %></div> - - -<% content_for :sidebar do %> - <ul class="actions"> - <li><%= link_to t('exports.actions.new'), new_referential_export_task_path(@referential), :class => "add" %></li> - </ul> -<% end %> diff --git a/app/views/exports/index.html.slim b/app/views/exports/index.html.slim new file mode 100644 index 000000000..bbcb2a5a7 --- /dev/null +++ b/app/views/exports/index.html.slim @@ -0,0 +1,10 @@ += title_tag t('.title') + +.warning = t('.warning') + +#exports = render 'exports' + +- content_for :sidebar do + ul.actions + li + = link_to t('exports.actions.new'), new_referential_export_task_path(@referential), class: 'add'
\ No newline at end of file diff --git a/app/views/exports/index.js.erb b/app/views/exports/index.js.erb deleted file mode 100644 index e9f06f09e..000000000 --- a/app/views/exports/index.js.erb +++ /dev/null @@ -1 +0,0 @@ -$('#exports').html('<%= escape_javascript(render("exports")) %>');
\ No newline at end of file diff --git a/app/views/exports/index.js.slim b/app/views/exports/index.js.slim new file mode 100644 index 000000000..0bb790b7a --- /dev/null +++ b/app/views/exports/index.js.slim @@ -0,0 +1 @@ +$('#exports').html("#{escape_javascript(render('exports'))}");
\ No newline at end of file diff --git a/app/views/exports/show.html.erb b/app/views/exports/show.html.erb deleted file mode 100644 index fc7ef2c9a..000000000 --- a/app/views/exports/show.html.erb +++ /dev/null @@ -1,31 +0,0 @@ -<div class="title row"> - <div class="col-md-8"> - <%= title_tag job_status_title(@export) %> - </div> - <div class="col-md-4"> - <%= export_attributes_tag(@export) %> - </div> -</div> -<% if @export.report.failure_code? %> -<div class="alert alert-danger"> - <%= t("iev.failure.#{@export.report.failure_code}") %> -</div> -<% end %> -<div class="progress_bars"> - <%= progress_bar_tag(@export) %> -</div> -<div class="export_show"> - <div class="links"> - <%= link_to( font_awesome_classic_tag("fa-file-#{@export.filename_extension}-o") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, @export.id) ) if @export.file_path %> - </div> - <%= render( partial: "shared/ie_report.html", locals: { job: @export, line_items: @line_items } ) %> -</div> - -<% content_for :sidebar do %> - <ul class="actions"> - <li><%= link_to t('exports.actions.destroy'), referential_export_path(@referential, @export.id), :method => :delete, :data => {:confirm => t('exports.actions.destroy_confirm')}, :class => "remove" %></li> - </ul> - - <%= history_tag(@export) %> - -<% end %> diff --git a/app/views/exports/show.html.slim b/app/views/exports/show.html.slim new file mode 100644 index 000000000..1631e0e7e --- /dev/null +++ b/app/views/exports/show.html.slim @@ -0,0 +1,26 @@ +.title.row + .col-md-8 + = title_tag job_status_title(@export) + + .col-md-4 + = export_attributes_tag(@export) + +- if @export.report.failure_code? + .alert.alert-danger + = t("iev.failure.#{@export.report.failure_code}") + +.progress_bars + = progress_bar_tag(@export) + +.export_show + .links + = link_to( font_awesome_classic_tag("fa-file-#{@export.filename_extension}-o") + t("exports.show.exported_file"), exported_file_referential_export_path(@referential, @export.id) ) if @export.file_path + + = render partial: "shared/ie_report.html", locals: { job: @export, line_items: @line_items } + +- content_for :sidebar do + ul.actions + li + = link_to t('exports.actions.destroy'), referential_export_path(@referential, @export.id), :method => :delete, :data => {:confirm => t('exports.actions.destroy_confirm')}, class: 'remove' + + = history_tag(@export)
\ No newline at end of file |
