From 4ec3d8c28376eb65ec15bc36ef0a448332a4bf57 Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Thu, 19 May 2016 13:52:41 -0300 Subject: [PATCH] Scope DislayContentPlugin partials --- plugins/display_content/views/blocks/_document.slim | 4 ---- plugins/display_content/views/blocks/_read_more.slim | 3 --- plugins/display_content/views/blocks/_section.slim | 22 ---------------------- plugins/display_content/views/blocks/_tag.slim | 2 -- plugins/display_content/views/blocks/display_content.slim | 2 +- plugins/display_content/views/blocks/display_content/_document.slim | 4 ++++ plugins/display_content/views/blocks/display_content/_read_more.slim | 3 +++ plugins/display_content/views/blocks/display_content/_section.slim | 22 ++++++++++++++++++++++ plugins/display_content/views/blocks/display_content/_tag.slim | 2 ++ 9 files changed, 32 insertions(+), 32 deletions(-) delete mode 100644 plugins/display_content/views/blocks/_document.slim delete mode 100644 plugins/display_content/views/blocks/_read_more.slim delete mode 100644 plugins/display_content/views/blocks/_section.slim delete mode 100644 plugins/display_content/views/blocks/_tag.slim create mode 100644 plugins/display_content/views/blocks/display_content/_document.slim create mode 100644 plugins/display_content/views/blocks/display_content/_read_more.slim create mode 100644 plugins/display_content/views/blocks/display_content/_section.slim create mode 100644 plugins/display_content/views/blocks/display_content/_tag.slim diff --git a/plugins/display_content/views/blocks/_document.slim b/plugins/display_content/views/blocks/_document.slim deleted file mode 100644 index 068853a..0000000 --- a/plugins/display_content/views/blocks/_document.slim +++ /dev/null @@ -1,4 +0,0 @@ -li - - unless item.folder? || item.class == RssFeed - = render partial: 'blocks/section', collection: block.sections, locals: { block: block, item: item } - = render partial: 'blocks/read_more', locals: { item: item, abstract_section: block.sections.bsearch { |section| section[:value] == 'abstract' }, block: block } \ No newline at end of file diff --git a/plugins/display_content/views/blocks/_read_more.slim b/plugins/display_content/views/blocks/_read_more.slim deleted file mode 100644 index 0c68b51..0000000 --- a/plugins/display_content/views/blocks/_read_more.slim +++ /dev/null @@ -1,3 +0,0 @@ -- if !abstract_section.nil? && block.display_section?(abstract_section) - div class='read_more' - = link_to(_('Read more'), item.url) diff --git a/plugins/display_content/views/blocks/_section.slim b/plugins/display_content/views/blocks/_section.slim deleted file mode 100644 index cb20f82..0000000 --- a/plugins/display_content/views/blocks/_section.slim +++ /dev/null @@ -1,22 +0,0 @@ -- if block.display_section?(section) - - case section[:value] - - when 'publish_date' - div class='published-at' - = show_date(item.published_at, false) - - when 'title' - div class='title' - = link_to(h(item.title), item.url) - - when 'abstract' - div class='lead' - = item.abstract - - when 'body' - div class='body' - = item.body - - when 'image' - - unless item.image || item.image.public_filename - div class='image' - = link_to(image_tag(item.image.public_filename), item.url) - - when 'tags' - - unless item.tags.empty? - div class='tags' - = render partial: 'blocks/tag', collection: item.tags diff --git a/plugins/display_content/views/blocks/_tag.slim b/plugins/display_content/views/blocks/_tag.slim deleted file mode 100644 index bf3c833..0000000 --- a/plugins/display_content/views/blocks/_tag.slim +++ /dev/null @@ -1,2 +0,0 @@ -span - = tag.name \ No newline at end of file diff --git a/plugins/display_content/views/blocks/display_content.slim b/plugins/display_content/views/blocks/display_content.slim index 75193cd..1ab5f5f 100644 --- a/plugins/display_content/views/blocks/display_content.slim +++ b/plugins/display_content/views/blocks/display_content.slim @@ -1,4 +1,4 @@ = block.block_title(block.title, block.subtitle) ul - = render partial: 'blocks/document', collection: block.docs, as: :item, locals: { block: block } + = render partial: 'blocks/display_content/document', collection: block.docs, as: :item, locals: { block: block } diff --git a/plugins/display_content/views/blocks/display_content/_document.slim b/plugins/display_content/views/blocks/display_content/_document.slim new file mode 100644 index 0000000..ec4c857 --- /dev/null +++ b/plugins/display_content/views/blocks/display_content/_document.slim @@ -0,0 +1,4 @@ +li + - unless item.folder? || item.class == RssFeed + = render partial: 'blocks/display_content/section', collection: block.sections, locals: { block: block, item: item } + = render partial: 'blocks/display_content/read_more', locals: { item: item, abstract_section: block.sections.bsearch { |section| section[:value] == 'abstract' }, block: block } \ No newline at end of file diff --git a/plugins/display_content/views/blocks/display_content/_read_more.slim b/plugins/display_content/views/blocks/display_content/_read_more.slim new file mode 100644 index 0000000..0c68b51 --- /dev/null +++ b/plugins/display_content/views/blocks/display_content/_read_more.slim @@ -0,0 +1,3 @@ +- if !abstract_section.nil? && block.display_section?(abstract_section) + div class='read_more' + = link_to(_('Read more'), item.url) diff --git a/plugins/display_content/views/blocks/display_content/_section.slim b/plugins/display_content/views/blocks/display_content/_section.slim new file mode 100644 index 0000000..4b16dec --- /dev/null +++ b/plugins/display_content/views/blocks/display_content/_section.slim @@ -0,0 +1,22 @@ +- if block.display_section?(section) + - case section[:value] + - when 'publish_date' + div class='published-at' + = show_date(item.published_at, false) + - when 'title' + div class='title' + = link_to(h(item.title), item.url) + - when 'abstract' + div class='lead' + = item.abstract + - when 'body' + div class='body' + = item.body + - when 'image' + - unless item.image || item.image.public_filename + div class='image' + = link_to(image_tag(item.image.public_filename), item.url) + - when 'tags' + - unless item.tags.empty? + div class='tags' + = render partial: 'blocks/display_content/tag', collection: item.tags diff --git a/plugins/display_content/views/blocks/display_content/_tag.slim b/plugins/display_content/views/blocks/display_content/_tag.slim new file mode 100644 index 0000000..bf3c833 --- /dev/null +++ b/plugins/display_content/views/blocks/display_content/_tag.slim @@ -0,0 +1,2 @@ +span + = tag.name \ No newline at end of file -- libgit2 0.21.2