[Git][noosfero/noosfero][master] 3 commits: Scope DislayContentPlugin partials

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
4ec3d8c2 by Rafael Reggiani Manzo at 2016-05-19T13:52:41-03:00
Scope DislayContentPlugin partials

By moving them into a folder we avoid possible name clashes with other
plugins.

- - - - -
c155c06e by Rafael Reggiani Manzo at 2016-05-19T13:55:48-03:00
Scope RelevantContentPlugin partials

By moving them into a folder we avoid possible name clashes with other
plugins.

- - - - -
da702534 by Bráulio Bhavamitra at 2016-05-19T17:12:23+00:00
Merge branch 'scope_plugin_partials' into 'master'

Scope plugin partials

This affects RelevantContent and DislayContent plugins for which I've created unscoped partials which can conflict with ohter plugins.

See merge request !931
- - - - -


9 changed files:

- − plugins/display_content/views/blocks/_document.slim
- plugins/display_content/views/blocks/display_content.slim
- + plugins/display_content/views/blocks/display_content/_document.slim
- plugins/display_content/views/blocks/_read_more.slim → plugins/display_content/views/blocks/display_content/_read_more.slim
- plugins/display_content/views/blocks/_section.slim → plugins/display_content/views/blocks/display_content/_section.slim
- plugins/display_content/views/blocks/_tag.slim → plugins/display_content/views/blocks/display_content/_tag.slim
- plugins/relevant_content/views/blocks/relevant_content.slim
- plugins/relevant_content/views/blocks/_doc.slim → plugins/relevant_content/views/blocks/relevant_content/_doc.slim
- plugins/relevant_content/views/blocks/_subcontent.slim → plugins/relevant_content/views/blocks/relevant_content/_subcontent.slim


Changes:

=====================================
plugins/display_content/views/blocks/_document.slim deleted
=====================================
--- 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


=====================================
plugins/display_content/views/blocks/display_content.slim
=====================================
--- 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 }


=====================================
plugins/display_content/views/blocks/display_content/_document.slim
=====================================
--- /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


=====================================
plugins/display_content/views/blocks/_read_more.slim → plugins/display_content/views/blocks/display_content/_read_more.slim
=====================================
--- a/plugins/display_content/views/blocks/_read_more.slim
+++ b/plugins/display_content/views/blocks/display_content/_read_more.slim


=====================================
plugins/display_content/views/blocks/_section.slim → plugins/display_content/views/blocks/display_content/_section.slim
=====================================
--- a/plugins/display_content/views/blocks/_section.slim
+++ b/plugins/display_content/views/blocks/display_content/_section.slim
@@ -19,4 +19,4 @@
   - when 'tags'
     - unless item.tags.empty?
       div class='tags'
-        = render partial: 'blocks/tag', collection: item.tags
+        = render partial: 'blocks/display_content/tag', collection: item.tags


=====================================
plugins/display_content/views/blocks/_tag.slim → plugins/display_content/views/blocks/display_content/_tag.slim
=====================================
--- a/plugins/display_content/views/blocks/_tag.slim
+++ b/plugins/display_content/views/blocks/display_content/_tag.slim


=====================================
plugins/relevant_content/views/blocks/relevant_content.slim
=====================================
--- 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'}


=====================================
plugins/relevant_content/views/blocks/_doc.slim → plugins/relevant_content/views/blocks/relevant_content/_doc.slim
=====================================
--- a/plugins/relevant_content/views/blocks/_doc.slim
+++ b/plugins/relevant_content/views/blocks/relevant_content/_doc.slim


=====================================
plugins/relevant_content/views/blocks/_subcontent.slim → plugins/relevant_content/views/blocks/relevant_content/_subcontent.slim
=====================================
--- a/plugins/relevant_content/views/blocks/_subcontent.slim
+++ b/plugins/relevant_content/views/blocks/relevant_content/_subcontent.slim
@@ -3,4 +3,4 @@
     span class="title #{html_class}"
       = title
     ul
-      = render partial: 'blocks/doc', collection: docs
+      = render partial: 'blocks/relevant_content/doc', collection: docs



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/46af34c89aa189edb86cea304b6815208877a4c0...da702534a97325afa1f1bf8d27383b1f18a6bbf5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160519/3936efbe/attachment-0001.html>