Refs #1295: convert erb to slim (organisations)

4 files changed, 52 insertions, 73 deletions

diff --git a/app/views/organisations/edit.html.erb b/app/views/organisations/edit.html.erb
deleted file mode 100644
index cd1dacc7b..000000000
--- a/app/views/organisations/edit.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<%= title_tag t(".title") %>
-
-<%= semantic_form_for @organisation, :url => organisation_path do |form| %>
-  <%= form.inputs do %>
-  <%= form.input :name %>
-  <%= form.input :data_format, :label => true, :include_blank => false %>
-  <% end %>
-
-  <%= form.actions do %>
-    <%= form.action :submit, :as => :button %>
-    <%= form.action :cancel, :as => :link %>
-  <% end %>
-<% end %>
-
diff --git a/app/views/organisations/edit.html.slim b/app/views/organisations/edit.html.slim
new file mode 100644
index 000000000..a78d59f3d
--- /dev/null
+++ b/app/views/organisations/edit.html.slim
@@ -0,0 +1,10 @@
+= title_tag t('.title')
+
+= semantic_form_for @organisation, :url => organisation_path do |form|
+  = form.inputs do
+    = form.input :name
+    = form.input :data_format, :label => true, :include_blank => false
+
+  = form.actions do
+    = form.action :submit, as: :button
+    = form.action :cancel, as: :link
\ No newline at end of file
diff --git a/app/views/organisations/show.html.erb b/app/views/organisations/show.html.erb
deleted file mode 100644
index 3994228fd..000000000
--- a/app/views/organisations/show.html.erb
+++ /dev/null
@@ -1,59 +0,0 @@
-<%= title_tag @organisation.name %>
-
-<div class="summary">
-  <p>
-<label><%= Organisation.human_attribute_name("data_format_restrictions_by_default") %>: </label>
-<%= @organisation.data_format %>
-  </p>
-</div>
-
-<div class="panel-group" id="accordion">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion" href="#users">
-          <%= t('.users') %>
-        </a>
-      </h4>
-    </div>
-    <div id="users" class="panel-collapse collapse">
-      <div class="panel-body">
-        <div class="users paginated_content">
-          <%= paginated_content(@organisation.users, "users/user") %>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<div class="panel-group" id="accordion">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion" href="#rule_parameter_sets">
-          <%= t('.rule_parameter_sets') %>
-        </a>
-      </h4>
-    </div>
-    <div id="rule_parameter_sets" class="panel-collapse collapse">
-      <div class="panel-body">
-        <div class="rule_parameter_sets paginated_content">
-          <%= paginated_content(@organisation.rule_parameter_sets, "rule_parameter_sets/rule_parameter_set") %>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-
-<% content_for :sidebar do %>
-<ul class="actions">
-<!-- FIXME ref #819 -->
-<% if false %>
-  <li><%= link_to t('organisations.actions.edit'), edit_organisation_path, :class => "edit" %></li>
-  <li><%= link_to t('users.actions.new'), new_organisation_user_path, :class => "add" %></li>
-<% end %>
-  <li><%= link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, :class => "add" %></li>
-</ul>
-<% end %>
-
diff --git a/app/views/organisations/show.html.slim b/app/views/organisations/show.html.slim
new file mode 100644
index 000000000..b9259150a
--- /dev/null
+++ b/app/views/organisations/show.html.slim
@@ -0,0 +1,42 @@
+= title_tag @organisation.name
+
+.summary
+  p
+    label = "#{Organisation.human_attribute_name('data_format_restrictions_by_default')} : "
+    = @organisation.data_format
+
+#accordion.panel-group
+  .panel.panel-default
+    .panel-heading
+      h4.panel-title
+        a data-toggle="collapse" data-parent="#accordion" href="#users"
+          = t('.users')
+
+    #users.panel-collapse.collapse
+      .panel-body
+        .users.paginated_content
+          = paginated_content(@organisation.users, "users/user")
+
+#accordion.panel-group
+  .panel.panel-default
+    .panel-heading
+      h4.panel-title
+        a data-toggle="collapse" data-parent="#accordion" href="#rule_parameter_sets"
+          = t('.rule_parameter_sets')
+
+    #rule_parameter_sets.panel-collapse.collapse
+      .panel-body
+        .rule_parameter_sets.paginated_content
+          = paginated_content(@organisation.rule_parameter_sets, "rule_parameter_sets/rule_parameter_set")
+
+- content_for :sidebar do
+  ul.actions
+    / FIXME ref #819
+    - if false
+      li
+        = link_to t('organisations.actions.edit'), edit_organisation_path, class: 'edit'
+      li
+        = link_to t('users.actions.new'), new_organisation_user_path, class: 'add'
+
+    li
+      = link_to t('rule_parameter_sets.actions.new'), new_organisation_rule_parameter_set_path, class: 'add'
\ No newline at end of file