From a87154230eed1b1094f708d7b407ef62ccfb327d Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Tue, 10 May 2016 08:51:56 -0300 Subject: [PATCH] Rewrite content_breadcrumbs_block view into slim --- plugins/breadcrumbs/test/unit/content_breadcrumbs_block_test.rb | 2 +- plugins/breadcrumbs/views/blocks/_link.html.erb | 1 - plugins/breadcrumbs/views/blocks/_link.html.slim | 1 + plugins/breadcrumbs/views/blocks/_separator.html.erb | 1 - plugins/breadcrumbs/views/blocks/_separator.slim | 2 ++ plugins/breadcrumbs/views/blocks/content_breadcrumbs.html.erb | 9 --------- plugins/breadcrumbs/views/blocks/content_breadcrumbs.slim | 11 +++++++++++ 7 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 plugins/breadcrumbs/views/blocks/_link.html.erb create mode 100644 plugins/breadcrumbs/views/blocks/_link.html.slim delete mode 100644 plugins/breadcrumbs/views/blocks/_separator.html.erb create mode 100644 plugins/breadcrumbs/views/blocks/_separator.slim delete mode 100644 plugins/breadcrumbs/views/blocks/content_breadcrumbs.html.erb create mode 100644 plugins/breadcrumbs/views/blocks/content_breadcrumbs.slim diff --git a/plugins/breadcrumbs/test/unit/content_breadcrumbs_block_test.rb b/plugins/breadcrumbs/test/unit/content_breadcrumbs_block_test.rb index 411cce7..d8c8df0 100644 --- a/plugins/breadcrumbs/test/unit/content_breadcrumbs_block_test.rb +++ b/plugins/breadcrumbs/test/unit/content_breadcrumbs_block_test.rb @@ -45,6 +45,6 @@ class ContentBreadcrumbsBlockViewTest < ActionView::TestCase should 'render nothing if there is no links to show' do @page = nil - assert_equal "\n", render_block_content(@block) + assert_equal '', render_block_content(@block) end end diff --git a/plugins/breadcrumbs/views/blocks/_link.html.erb b/plugins/breadcrumbs/views/blocks/_link.html.erb deleted file mode 100644 index 478aafc..0000000 --- a/plugins/breadcrumbs/views/blocks/_link.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= link_to link[:name], link[:url], :class => 'item' %> diff --git a/plugins/breadcrumbs/views/blocks/_link.html.slim b/plugins/breadcrumbs/views/blocks/_link.html.slim new file mode 100644 index 0000000..6226155 --- /dev/null +++ b/plugins/breadcrumbs/views/blocks/_link.html.slim @@ -0,0 +1 @@ +== link_to link[:name], link[:url], :class => 'item' diff --git a/plugins/breadcrumbs/views/blocks/_separator.html.erb b/plugins/breadcrumbs/views/blocks/_separator.html.erb deleted file mode 100644 index 2fb13a8..0000000 --- a/plugins/breadcrumbs/views/blocks/_separator.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= content_tag('span', ' > ', :class => 'separator') %> diff --git a/plugins/breadcrumbs/views/blocks/_separator.slim b/plugins/breadcrumbs/views/blocks/_separator.slim new file mode 100644 index 0000000..2566d65 --- /dev/null +++ b/plugins/breadcrumbs/views/blocks/_separator.slim @@ -0,0 +1,2 @@ +span class='separator' + |> diff --git a/plugins/breadcrumbs/views/blocks/content_breadcrumbs.html.erb b/plugins/breadcrumbs/views/blocks/content_breadcrumbs.html.erb deleted file mode 100644 index c56e64e..0000000 --- a/plugins/breadcrumbs/views/blocks/content_breadcrumbs.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<% extend BreadcrumbsPluginHelper %> - -<% links = trail(block, @page, @profile, params).flatten %> -<% unless links.empty? %> - <%= render :partial => 'blocks/link', :collection => links, :as => 'link', :spacer_template => 'blocks/separator' %> - <% if block.show_section_name %> - <%= content_tag('div', (block.show_profile ? links.second[:name] : links.first[:name]), :class => 'section-name') %> - <% end %> -<% end %> diff --git a/plugins/breadcrumbs/views/blocks/content_breadcrumbs.slim b/plugins/breadcrumbs/views/blocks/content_breadcrumbs.slim new file mode 100644 index 0000000..5bf2cf1 --- /dev/null +++ b/plugins/breadcrumbs/views/blocks/content_breadcrumbs.slim @@ -0,0 +1,11 @@ +- extend BreadcrumbsPluginHelper + +- links = trail(block, @page, @profile, params).flatten +- unless links.empty? + == render :partial => 'blocks/link', :collection => links, :as => 'link', :spacer_template => 'blocks/separator' + - if block.show_section_name + div class='section-name' + - if block.show_profile + = links.second[:name] + - else + = links.first[:name] -- libgit2 0.21.2