Refs #1295: convert erb to slim (shared)

6 files changed, 111 insertions, 143 deletions

diff --git a/app/views/shared/_ie_report.html.erb b/app/views/shared/_ie_report.html.erb
deleted file mode 100644
index 11a49879b..000000000
--- a/app/views/shared/_ie_report.html.erb
+++ /dev/null
@@ -1,27 +0,0 @@
-<div class="resume">
-  <% if job.respond_to?(:file_path) %>
-  <ul class="nav nav-tabs" role="tablist">
-    <li role="presentation" class="active">
-      <a href="#ie_tab_line" class="ie_tab_line"  aria-controls="ie_tab_line" role="tab" data-toggle="tab">
-        <%=t('.tab.line')%>
-      </a>
-    </li>
-    <li role="presentation">
-      <a href="#ie_tab_file" class="ie_tab_file" aria-controls="ie_tab_file" role="tab" data-toggle="tab">
-        <%=t('.tab.file')%>
-      </a>
-    </li>
-  </ul>
-
-  <div class="tab-content">
-    <div role="tabpanel" class="tab-pane active" id="ie_tab_line">
-        <%= render partial: 'shared/ie_report_line', locals: { job: job, line_items: line_items, type: (defined?(type) ? type : :default) } %>
-    </div>
-    <div role="tabpanel" class="tab-pane" id="ie_tab_file">
-      <%= render partial: 'shared/ie_report_file', locals: { job: job } %>
-    </div>
-  </div>
-  <% else %>
-    <%= render partial: 'shared/ie_report_line', locals: { job: job, line_items: line_items, type: (defined?(type) ? type : :default) } %>
-  <% end %>
-</div>
diff --git a/app/views/shared/_ie_report.html.slim b/app/views/shared/_ie_report.html.slim
new file mode 100644
index 000000000..9c197ea58
--- /dev/null
+++ b/app/views/shared/_ie_report.html.slim
@@ -0,0 +1,16 @@
+.resume
+  - if job.respond_to?(:file_path)
+    ul.nav.nav-tabs role="tablist" 
+      li.active role="presentation" 
+        a.ie_tab_line aria-controls="ie_tab_line" data-toggle="tab" href="#ie_tab_line" role="tab" 
+          = t('.tab.line')
+      li role="presentation" 
+        a.ie_tab_file aria-controls="ie_tab_file" data-toggle="tab" href="#ie_tab_file" role="tab" 
+          = t('.tab.file')
+    .tab-content
+      #ie_tab_line.tab-pane.active role="tabpanel" 
+        = render partial: 'shared/ie_report_line', locals: { job: job, line_items: line_items, type: (defined?(type) ? type : :default) }
+      #ie_tab_file.tab-pane role="tabpanel" 
+        = render partial: 'shared/ie_report_file', locals: { job: job }
+  - else
+    = render partial: 'shared/ie_report_line', locals: { job: job, line_items: line_items, type: (defined?(type) ? type : :default) }
\ No newline at end of file
diff --git a/app/views/shared/_ie_report_file.html.erb b/app/views/shared/_ie_report_file.html.erb
deleted file mode 100644
index fdd97f128..000000000
--- a/app/views/shared/_ie_report_file.html.erb
+++ /dev/null
@@ -1,45 +0,0 @@
-<p class="lead">
-<p class="caption"><%= t(".title_default", {:job => job.class.model_name.human, :extension => job.filename_extension} ) %></p>
-</p>
-<div class="report results" data-refresh-interval="<%= job_refresh_interval(job) %>">
-  <p>
-    <form class="form-inline">
-      <div class="form-group">
-        <label><%= t("shared.ie_report.search") %></label>
-        <input id="filter-file" type="text" class="form-control">
-      </div>
-      <div class="form-group">
-        <label><%= t(".table.state") %></label>
-        <select class="filter-file-status form-control">
-          <option></option>
-          <option value="ok"><%=t(".table.ok")%></option>
-          <option value="error"><%=t(".table.error")%></option>
-          <option value="ignored"><%=t(".table.ignored")%></option>
-        </select>
-      </div>
-    </form>
-  </p>
-  <table id="table-file" class="table table-hover table-striped data-table" data-filter="#filter-file" data-page-size="20">
-    <thead>
-      <tr>
-        <th class="state"><%= t(".table.state") %></th>
-        <th class="name"><%= t(".table.name") %></th>
-        <th class="error"><%= t(".table.error") %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% job.report.files.each do |file| %>
-        <tr class="<%= file.status == 'ERROR' ? 'danger' : nil %>">
-          <td data-value="<%= file.status.downcase %>"><%= t(".table.#{file.status.downcase}") %></td>
-          <td><%= file.name %></td>
-          <td><%= file.errors.map{|e| "#{e.code} : #{e.description}"}.join(' | ') if file.errors.present? %></td>
-        </tr>
-      <% end %>
-    </tbody>
-    <tfoot>
-      <tr>
-        <td colspan="5"><ul class="pagination pagination-centered"></ul></td>
-      </tr>
-    </tfoot>
-  </table>
-</div>
diff --git a/app/views/shared/_ie_report_file.html.slim b/app/views/shared/_ie_report_file.html.slim
new file mode 100644
index 000000000..b0cd0b427
--- /dev/null
+++ b/app/views/shared/_ie_report_file.html.slim
@@ -0,0 +1,34 @@
+p.lead
+  p.caption = t('.title_default',  job=job.class.model_name.human extension=job.filename_extension  )
+
+.report.results data-refresh-interval="#{job_refresh_interval(job)}" 
+  p
+    form.form-inline
+      .form-group
+        label= t('shared.ie_report.search')
+        input#filter-file.form-control type="text"
+      .form-group
+        label= t('.table.state')
+        select.filter-file-status.form-control
+          option
+          option value="ok" = t('.table.ok')
+          option value="error" = t('.table.error')
+          option value="ignored" = t('.table.ignored')
+
+  table#table-file.table.table-hover.table-striped.data-table data-filter="#filter-file" data-page-size="20" 
+    thead
+      tr
+        th.state = t('.table.state')
+        th.name = t('.table.name')
+        th.error = t('.table.error')
+    tbody
+      - job.report.files.each do |file|
+        tr class=("#{file.status == 'ERROR' ? 'danger' : nil}") 
+          td data-value="#{file.status.downcase}"
+            = t(".table.#{file.status.downcase}")
+          td = file.name
+          td = file.errors.map |e| "#{e.code} : #{e.description}" .join(' | ') if file.errors.present?
+    tfoot
+      tr
+        td colspan="5" 
+          ul.pagination.pagination-centered
\ No newline at end of file
diff --git a/app/views/shared/_ie_report_line.html.erb b/app/views/shared/_ie_report_line.html.erb
deleted file mode 100644
index 2f5332e5b..000000000
--- a/app/views/shared/_ie_report_line.html.erb
+++ /dev/null
@@ -1,71 +0,0 @@
-<p class='lead'>
-  <dl class="inline">
-    <dt><%=t('.read_lines') %> :</dt>
-    <dd><%= job.report.lines %></dd>
-    <dt><%=t('.saved_lines') %> :</dt>
-    <dd><%= job.report.saved_lines %></dd>
-    <dt><%=t('.unsaved_lines') %> :</dt>
-    <dd><%= job.report.unsaved_lines %></dd>
-  </dl>
-</p>
-<div class="report" data-refresh-interval="<%= job_refresh_interval(job) %>">
-  <p>
-    <form class="form-inline">
-      <div class="form-group">
-        <label><%= t("shared.ie_report.search") %></label>
-        <input id="filter-line" type="text" class="form-control">
-      </div>
-      <div class="form-group">
-        <label><%= t(".table.line.state") %></label>
-        <select class="filter-line-status form-control">
-          <option></option>
-          <option value="true"><%=t(".state.#{type}.valid") %></option>
-          <option value="false"><%=t(".state.#{type}.invalid") %></option>
-        </select>
-      </div>
-    </form>
-  </p>
-  <table class="table table-hover table-striped data-table toggle-circle toggle-medium" data-filter="#filter-line" id="table-line" data-page-size="20"<% if line_items.respond_to?(:total_pages) %> data-no-pagination="true"<% end %>>
-    <thead>
-      <tr>
-        <th><%= t(".table.line.state") %></th>
-        <th><%= t(".table.line.lines") %></th>
-        <th data-toggle="true" data-sort-ignore="true"><%= t(".table.line.details") %></th>
-        <th data-hide="all"><%= t(".table.line.routes") %></th>
-        <th data-hide="all"><%= t(".table.line.connection_links") %></th>
-        <th data-hide="all"><%= t(".table.line.time_tables") %></th>
-        <th data-hide="all"><%= t(".table.line.stop_areas") %></th>
-        <th data-hide="all"><%= t(".table.line.access_points") %></th>
-        <th data-hide="all"><%= t(".table.line.vehicle_journeys") %></th>
-        <th data-hide="all"><%= t(".table.line.journey_patterns") %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% line_items.each_with_index do |line_item, index| %>
-        <tr>
-          <td data-value="<%=line_item.status%>"><%= line_item.status ? font_awesome_classic_tag("fa-check") : font_awesome_classic_tag("fa-times")  %></td>
-          <td><%= line_item.name %></td>
-          <td></td>
-          <td><%= line_item.routes %></td>
-          <td><%= line_item.connection_links %></td>
-          <td><%= line_item.time_tables %></td>
-          <td><%= line_item.stop_areas %></td>
-          <td><%= line_item.access_points %></td>
-          <td><%= line_item.vehicle_journeys %></td>
-          <td><%= line_item.journey_patterns %></td>
-        </tr>
-      <% end %>
-    </tbody>
-    <tfoot>
-      <tr>
-        <td colspan="10">
-          <% if line_items.respond_to?(:total_pages) %>
-            <%= will_paginate line_items, renderer: BootstrapPagination::Rails %>
-          <% else %>
-            <ul class="pagination pagination-centered hide-if-no-paging"></ul>
-          <% end %>
-        </td>
-      </tr>
-    </tfoot>
-  </table>
-</div>
diff --git a/app/views/shared/_ie_report_line.html.slim b/app/views/shared/_ie_report_line.html.slim
new file mode 100644
index 000000000..c2a24f1e4
--- /dev/null
+++ b/app/views/shared/_ie_report_line.html.slim
@@ -0,0 +1,61 @@
+p.lead
+  dl.inline
+    dt = "#{t('.read_lines')} :"
+    dd = job.report.lines
+    dt = "#{t('.saved_lines')} :"
+    dd = job.report.saved_lines
+    dt = "#{t('.unsaved_lines')} :"
+    dd = job.report.unsaved_lines
+
+.report data-refresh-interval="#{job_refresh_interval(job)}"
+  p
+    form.form-inline
+      .form-group
+        label = t('shared.ie_report.search')
+        input#filter-line.form-control type="text" 
+        
+      .form-group
+        label= t('.table.line.state')
+        select.filter-line-status.form-control
+          option
+          option value="true" = t(".state.#{type}.valid")
+          option value="false" = t(".state.#{type}.invalid")
+
+  table#table-line.table.table-hover.table-striped.data-table.toggle-circle.toggle-medium data-filter="#filter-line" data-page-size="20" data-no-pagination=('true' if line_items.respond_to?(:total_pages) )
+    thead
+      tr
+        th = t('.table.line.state')
+        th = t('.table.line.lines')
+        th data-sort-ignore="true" data-toggle="true"
+          = t('.table.line.details')
+        th data-hide="all" = t('.table.line.routes')
+        th data-hide="all" = t('.table.line.connection_links')
+        th data-hide="all" = t('.table.line.time_tables')
+        th data-hide="all" = t('.table.line.stop_areas')
+        th data-hide="all" = t('.table.line.access_points')
+        th data-hide="all" = t('.table.line.vehicle_journeys')
+        th data-hide="all" = t('.table.line.journey_patterns')
+
+    tbody
+      - line_items.each_with_index do |line_item, index|
+        tr
+          td data-value="#{line_item.status}"
+            = line_item.status ? font_awesome_classic_tag(fa-check) : font_awesome_classic_tag(fa-times)
+
+          td = line_item.name
+          td
+          td = line_item.routes
+          td = line_item.connection_links
+          td = line_item.time_tables
+          td = line_item.stop_areas
+          td = line_item.access_points
+          td = line_item.vehicle_journeys
+          td = line_item.journey_patterns
+   
+    tfoot
+      tr
+        td colspan="10" 
+          - if line_items.respond_to?(:total_pages)
+            = will_paginate line_items, renderer: BootstrapPagination::Rails
+          - else
+            ul.pagination.pagination-centered.hide-if-no-paging
\ No newline at end of file