Download as
Browse Code »

Commit da702534a97325afa1f1bf8d27383b1f18a6bbf5

Authored by Braulio Bhavamitra
2 parents 46af34c8 c155c06e
Exists in ratings_minor_fixes and in 3 other branches fix_sign_up_form, organization_ratings_improvements, profile_api_improvements

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
Showing 14 changed files with 45 additions and 45 deletions   Show diff stats
plugins/display_content/views/blocks/_document.slim
View file @46af34c
@@ -1,4 +0,0 @@ @@ -1,4 +0,0 @@
1 -li  
2 - - unless item.folder? || item.class == RssFeed  
3 - = render partial: 'blocks/section', collection: block.sections, locals: { block: block, item: item }  
4 - = render partial: 'blocks/read_more', locals: { item: item, abstract_section: block.sections.bsearch { |section| section[:value] == 'abstract' }, block: block }  
5 \ No newline at end of file 0 \ No newline at end of file
plugins/display_content/views/blocks/_read_more.slim
View file @46af34c
@@ -1,3 +0,0 @@ @@ -1,3 +0,0 @@
1 -- if !abstract_section.nil? && block.display_section?(abstract_section)  
2 - div class='read_more'  
3 - = link_to(_('Read more'), item.url)  
plugins/display_content/views/blocks/_section.slim
View file @46af34c
@@ -1,22 +0,0 @@ @@ -1,22 +0,0 @@
1 -- if block.display_section?(section)  
2 - - case section[:value]  
3 - - when 'publish_date'  
4 - div class='published-at'  
5 - = show_date(item.published_at, false)  
6 - - when 'title'  
7 - div class='title'  
8 - = link_to(h(item.title), item.url)  
9 - - when 'abstract'  
10 - div class='lead'  
11 - = item.abstract  
12 - - when 'body'  
13 - div class='body'  
14 - = item.body  
15 - - when 'image'  
16 - - unless item.image || item.image.public_filename  
17 - div class='image'  
18 - = link_to(image_tag(item.image.public_filename), item.url)  
19 - - when 'tags'  
20 - - unless item.tags.empty?  
21 - div class='tags'  
22 - = render partial: 'blocks/tag', collection: item.tags  
plugins/display_content/views/blocks/_tag.slim
View file @46af34c
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
1 -span  
2 - = tag.name  
3 \ No newline at end of file 0 \ No newline at end of file
plugins/display_content/views/blocks/display_content.slim
  Diff comments   View file @da70253
1 = block.block_title(block.title, block.subtitle) 1 = block.block_title(block.title, block.subtitle)
2 2
3 ul 3 ul
4 - = render partial: 'blocks/document', collection: block.docs, as: :item, locals: { block: block } 4 + = render partial: 'blocks/display_content/document', collection: block.docs, as: :item, locals: { block: block }
plugins/display_content/views/blocks/display_content/_document.slim 0 → 100644
  Diff comments   View file @da70253
@@ -0,0 +1,4 @@ @@ -0,0 +1,4 @@
  1 +li
  2 + - unless item.folder? || item.class == RssFeed
  3 + = render partial: 'blocks/display_content/section', collection: block.sections, locals: { block: block, item: item }
  4 + = render partial: 'blocks/display_content/read_more', locals: { item: item, abstract_section: block.sections.bsearch { |section| section[:value] == 'abstract' }, block: block }
0 \ No newline at end of file 5 \ No newline at end of file
plugins/display_content/views/blocks/display_content/_read_more.slim 0 → 100644
  Diff comments   View file @da70253
@@ -0,0 +1,3 @@ @@ -0,0 +1,3 @@
  1 +- if !abstract_section.nil? && block.display_section?(abstract_section)
  2 + div class='read_more'
  3 + = link_to(_('Read more'), item.url)
plugins/display_content/views/blocks/display_content/_section.slim 0 → 100644
  Diff comments   View file @da70253
@@ -0,0 +1,22 @@ @@ -0,0 +1,22 @@
  1 +- if block.display_section?(section)
  2 + - case section[:value]
  3 + - when 'publish_date'
  4 + div class='published-at'
  5 + = show_date(item.published_at, false)
  6 + - when 'title'
  7 + div class='title'
  8 + = link_to(h(item.title), item.url)
  9 + - when 'abstract'
  10 + div class='lead'
  11 + = item.abstract
  12 + - when 'body'
  13 + div class='body'
  14 + = item.body
  15 + - when 'image'
  16 + - unless item.image || item.image.public_filename
  17 + div class='image'
  18 + = link_to(image_tag(item.image.public_filename), item.url)
  19 + - when 'tags'
  20 + - unless item.tags.empty?
  21 + div class='tags'
  22 + = render partial: 'blocks/display_content/tag', collection: item.tags
plugins/display_content/views/blocks/display_content/_tag.slim 0 → 100644
  Diff comments   View file @da70253
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +span
  2 + = tag.name
0 \ No newline at end of file 3 \ No newline at end of file
plugins/relevant_content/views/blocks/_doc.slim
View file @46af34c
@@ -1,2 +0,0 @@ @@ -1,2 +0,0 @@
1 -li  
2 - = link_to(h(doc.title), doc.url)  
plugins/relevant_content/views/blocks/_subcontent.slim
View file @46af34c
@@ -1,6 +0,0 @@ @@ -1,6 +0,0 @@
1 -- unless docs.blank?  
2 - div class="block #{html_class}"  
3 - span class="title #{html_class}"  
4 - = title  
5 - ul  
6 - = render partial: 'blocks/doc', collection: docs  
plugins/relevant_content/views/blocks/relevant_content.slim
  Diff comments   View file @da70253
1 = block_title(block.title, block.subtitle) 1 = block_title(block.title, block.subtitle)
2 2
3 - if block.show_most_read 3 - if block.show_most_read
4 - = render partial: 'blocks/subcontent', locals: {docs: Article.most_accessed(block.owner, block.limit), title: _("Most read articles"), html_class: 'mread'} 4 + = render partial: 'blocks/relevant_content/subcontent', locals: {docs: Article.most_accessed(block.owner, block.limit), title: _("Most read articles"), html_class: 'mread'}
5 - if block.show_most_commented 5 - if block.show_most_commented
6 - = render partial: 'blocks/subcontent', locals: {docs: Article.most_commented_relevant_content(block.owner, block.limit), title: _("Most commented articles"), html_class: 'mcommented'} 6 + = render partial: 'blocks/relevant_content/subcontent', locals: {docs: Article.most_commented_relevant_content(block.owner, block.limit), title: _("Most commented articles"), html_class: 'mcommented'}
7 7
8 - if block.env.plugin_enabled?('VotePlugin') 8 - if block.env.plugin_enabled?('VotePlugin')
9 - if block.show_most_liked 9 - if block.show_most_liked
10 - = render partial: 'blocks/subcontent', locals: {docs: Article.more_positive_votes(block.owner, block.limit), title: _("Most liked articles"), html_class: 'mliked'} 10 + = render partial: 'blocks/relevant_content/subcontent', locals: {docs: Article.more_positive_votes(block.owner, block.limit), title: _("Most liked articles"), html_class: 'mliked'}
11 - if block.show_most_disliked 11 - if block.show_most_disliked
12 - = render partial: 'blocks/subcontent', locals: {docs: Article.more_negative_votes(block.owner, block.limit), title: _("Most disliked articles"), html_class: 'mdisliked'} 12 + = render partial: 'blocks/relevant_content/subcontent', locals: {docs: Article.more_negative_votes(block.owner, block.limit), title: _("Most disliked articles"), html_class: 'mdisliked'}
13 - if block.show_most_voted 13 - if block.show_most_voted
14 - = render partial: 'blocks/subcontent', locals: {docs: Article.most_voted(block.owner, block.limit), title: _("Most voted articles"), html_class: 'mvoted'} 14 + = 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/relevant_content/_doc.slim 0 → 100644
  Diff comments   View file @da70253
@@ -0,0 +1,2 @@ @@ -0,0 +1,2 @@
  1 +li
  2 + = link_to(h(doc.title), doc.url)
plugins/relevant_content/views/blocks/relevant_content/_subcontent.slim 0 → 100644
  Diff comments   View file @da70253
@@ -0,0 +1,6 @@ @@ -0,0 +1,6 @@
  1 +- unless docs.blank?
  2 + div class="block #{html_class}"
  3 + span class="title #{html_class}"
  4 + = title
  5 + ul
  6 + = render partial: 'blocks/relevant_content/doc', collection: docs