From c155c06efc1565f8ae717c31b1c6bfb5edc58d0a Mon Sep 17 00:00:00 2001 From: Rafael Reggiani Manzo Date: Thu, 19 May 2016 13:55:48 -0300 Subject: [PATCH] Scope RelevantContentPlugin partials --- plugins/relevant_content/views/blocks/_doc.slim | 2 -- plugins/relevant_content/views/blocks/_subcontent.slim | 6 ------ plugins/relevant_content/views/blocks/relevant_content.slim | 10 +++++----- plugins/relevant_content/views/blocks/relevant_content/_doc.slim | 2 ++ plugins/relevant_content/views/blocks/relevant_content/_subcontent.slim | 6 ++++++ 5 files changed, 13 insertions(+), 13 deletions(-) delete mode 100644 plugins/relevant_content/views/blocks/_doc.slim delete mode 100644 plugins/relevant_content/views/blocks/_subcontent.slim create mode 100644 plugins/relevant_content/views/blocks/relevant_content/_doc.slim create mode 100644 plugins/relevant_content/views/blocks/relevant_content/_subcontent.slim diff --git a/plugins/relevant_content/views/blocks/_doc.slim b/plugins/relevant_content/views/blocks/_doc.slim deleted file mode 100644 index 07518a8..0000000 --- a/plugins/relevant_content/views/blocks/_doc.slim +++ /dev/null @@ -1,2 +0,0 @@ -li - = link_to(h(doc.title), doc.url) diff --git a/plugins/relevant_content/views/blocks/_subcontent.slim b/plugins/relevant_content/views/blocks/_subcontent.slim deleted file mode 100644 index 28b0470..0000000 --- a/plugins/relevant_content/views/blocks/_subcontent.slim +++ /dev/null @@ -1,6 +0,0 @@ -- unless docs.blank? - div class="block #{html_class}" - span class="title #{html_class}" - = title - ul - = render partial: 'blocks/doc', collection: docs diff --git a/plugins/relevant_content/views/blocks/relevant_content.slim b/plugins/relevant_content/views/blocks/relevant_content.slim index 3d42fb0..d6971f8 100644 --- a/plugins/relevant_content/views/blocks/relevant_content.slim +++ b/plugins/relevant_content/views/blocks/relevant_content.slim @@ -1,14 +1,14 @@ = block_title(block.title, block.subtitle) - if block.show_most_read - = render partial: 'blocks/subcontent', locals: {docs: Article.most_accessed(block.owner, block.limit), title: _("Most read articles"), html_class: 'mread'} + = render partial: 'blocks/relevant_content/subcontent', locals: {docs: Article.most_accessed(block.owner, block.limit), title: _("Most read articles"), html_class: 'mread'} - if block.show_most_commented - = render partial: 'blocks/subcontent', locals: {docs: Article.most_commented_relevant_content(block.owner, block.limit), title: _("Most commented articles"), html_class: 'mcommented'} + = render partial: 'blocks/relevant_content/subcontent', locals: {docs: Article.most_commented_relevant_content(block.owner, block.limit), title: _("Most commented articles"), html_class: 'mcommented'} - if block.env.plugin_enabled?('VotePlugin') - if block.show_most_liked - = render partial: 'blocks/subcontent', locals: {docs: Article.more_positive_votes(block.owner, block.limit), title: _("Most liked articles"), html_class: 'mliked'} + = render partial: 'blocks/relevant_content/subcontent', locals: {docs: Article.more_positive_votes(block.owner, block.limit), title: _("Most liked articles"), html_class: 'mliked'} - if block.show_most_disliked - = render partial: 'blocks/subcontent', locals: {docs: Article.more_negative_votes(block.owner, block.limit), title: _("Most disliked articles"), html_class: 'mdisliked'} + = render partial: 'blocks/relevant_content/subcontent', locals: {docs: Article.more_negative_votes(block.owner, block.limit), title: _("Most disliked articles"), html_class: 'mdisliked'} - if block.show_most_voted - = render partial: 'blocks/subcontent', locals: {docs: Article.most_voted(block.owner, block.limit), title: _("Most voted articles"), html_class: 'mvoted'} + = render partial: 'blocks/relevant_content/subcontent', locals: {docs: Article.most_voted(block.owner, block.limit), title: _("Most voted articles"), html_class: 'mvoted'} diff --git a/plugins/relevant_content/views/blocks/relevant_content/_doc.slim b/plugins/relevant_content/views/blocks/relevant_content/_doc.slim new file mode 100644 index 0000000..07518a8 --- /dev/null +++ b/plugins/relevant_content/views/blocks/relevant_content/_doc.slim @@ -0,0 +1,2 @@ +li + = link_to(h(doc.title), doc.url) diff --git a/plugins/relevant_content/views/blocks/relevant_content/_subcontent.slim b/plugins/relevant_content/views/blocks/relevant_content/_subcontent.slim new file mode 100644 index 0000000..c1e970c --- /dev/null +++ b/plugins/relevant_content/views/blocks/relevant_content/_subcontent.slim @@ -0,0 +1,6 @@ +- unless docs.blank? + div class="block #{html_class}" + span class="title #{html_class}" + = title + ul + = render partial: 'blocks/relevant_content/doc', collection: docs -- libgit2 0.21.2