diff --git a/plugins/display_content/lib/display_content_block.rb b/plugins/display_content/lib/display_content_block.rb index 0a0fc24..18af8fb 100644 --- a/plugins/display_content/lib/display_content_block.rb +++ b/plugins/display_content/lib/display_content_block.rb @@ -49,21 +49,31 @@ class DisplayContentBlock < Block block_title(title) + content_tag('ul', docs.map {|item| + + read_more_section = '' + sections.select { |section| case section[:name] when 'title' content_sections += (display_section?(section) ? (content_tag('div', link_to(h(item.title), item.url), :class => 'title') ) : '') when 'abstract' content_sections += (display_section?(section) ? (content_tag('div', item.abstract ,:class => 'lead')) : '' ) + if display_section?(section) + content_sections += (display_section?(section) ? (content_tag('div', item.abstract ,:class => 'lead')) : '' ) + read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more') + end when 'body' content_sections += (display_section?(section) ? (content_tag('div', item.body ,:class => 'body')) : '' ) when 'image' image_section = image_tag item.image.public_filename if item.image if !image_section.blank? - content_sections += (display_section?(section) ? (content_tag('div', image_section ,:class => 'image')) : '' ) + content_sections += (display_section?(section) ? (content_tag('div', link_to( image_section, item.url ) ,:class => 'image')) : '' ) end end } + + content_sections += read_more_section if !read_more_section.blank? + content_tag('li', content_sections) }.join("\n")) diff --git a/plugins/display_content/public/style.css b/plugins/display_content/public/style.css index b0212ae..4bc3106 100644 --- a/plugins/display_content/public/style.css +++ b/plugins/display_content/public/style.css @@ -18,24 +18,8 @@ .block.display-content-block .title, .block.display-content-block .lead, .block.display-content-block .body, -.block.display-content-block .image { +.block.display-content-block .image, +.block.display-content-block .read_more { margin: 2px 0px 2px 0px; } -.block.display-content-block .title { - //border: 1px solid green; -} - -.block.display-content-block .lead { - //border: 1px solid purple; -} - -.block.display-content-block .body { - //border: 1px solid blue; -} - -.block.display-content-block .image { - //border: 1px solid yellow; - display: table; -} - -- libgit2 0.21.2