Some changes to add a new theme

* Adding div's on blocks, blog, footer and home/index * Adding separator as argument on language chooser * Adding slideshowblock on available blocks of Environment (ActionItem1398)

Some changes to add a new theme
* Adding div's on blocks, blog, footer and home/index * Adding separator as argument on language chooser * Adding slideshowblock on available blocks of Environment (ActionItem1398)
Daniela Feitosa · Joenio Costa
1 parent 3d76539d
Showing 7 changed files with 72 additions and 28 deletions Show diff stats
app/controllers/admin/environment_design_controller.rb
app/helpers/blog_helper.rb
app/helpers/boxes_helper.rb
app/helpers/language_helper.rb
app/views/home/index.rhtml
test/functional/environment_design_controller_test.rb
test/unit/blog_helper_test.rb
@@ -3,7 +3,7 @@ class EnvironmentDesignController &lt; BoxOrganizerController
   protect 'edit_environment_design', :environment
   def available_blocks
-    @available_blocks ||= [ LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock ]
+    @available_blocks ||= [ LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock ]
   end
 end
@@ -24,14 +24,18 @@ module BlogHelper
     artic_len = articles.length
     articles.each_with_index{ |art,i|
       css_add = [ 'position-'+(i+1).to_s() ]
+      position = (i%2 == 0) ? 'odd-post' : 'even-post'
       if art.published? || (user==art.profile)
         css_add << 'first' if i == 0
         css_add << 'last'  if i == (artic_len-1)
         css_add << 'not-published' if !art.published?
+        css_add << position + '-inner'
         content << content_tag('div',
+                    content_tag('div',
                        display_post(art) + '<br style="clear:both"/>',
                        :class => 'blog-post ' + css_add.join(' '),
-                       :id => "post-#{art.id}")
+                       :id => "post-#{art.id}"), :class => position
+                   )
       end
     }
     content.join("\n<hr class='sep-posts'/>\n") + (pagination or '')
@@ -8,7 +8,13 @@ module BoxesHelper
       if @controller.send(:uses_design_blocks?)
         display_boxes(@controller.boxes_holder, content)
       else
-        content_tag('div', content, :class => 'no-boxes')
+        content_tag('div',
+          content_tag('div',
+            content_tag('div', content, :class => 'no-boxes-inner-2'),
+            :class => 'no-boxes-inner-1'
+          ),
+          :class => 'no-boxes'
+        )
       end +
       maybe_display_custom_element(@controller.boxes_holder, :custom_footer_expanded, :id => 'profile-footer')
     end
@@ -95,8 +101,13 @@ module BoxesHelper
     end
     box_decorator.block_target(block.box, block) +
-    content_tag('div', result + footer_content + box_decorator.block_edit_buttons(block),
-                options) +
+      content_tag('div',
+       content_tag('div',
+         content_tag('div',
+           result + footer_content + box_decorator.block_edit_buttons(block),
+           :class => 'block-inner-2'),
+         :class => 'block-inner-1'),
+       options) +
     box_decorator.block_handle(block)
   end
@@ -20,6 +20,7 @@ module LanguageHelper
   def language_chooser(options = {})
     current = language
+    separator = options[:separator] || ' &mdash; '
     if options[:element] == 'dropdown'
       select_tag('lang', 
@@ -34,7 +35,7 @@ module LanguageHelper
         else
           link_to(name, params.merge(:lang => code), :rel => 'nofollow')
         end
-      end.join(' &mdash; ')
+      end.join(separator)
       content_tag('div', languages, :id => 'language-chooser', :help => _('The language you choose here is the language used for options, buttons, etc. It does not affect the language of the content created by other users.'))
     end
   end
@@ -8,15 +8,17 @@
     <div id='highlighted-news'>
       <% @highlighted_news.each_with_index do |highlighted, index| %>
         <div class='highlighted-news-item post-<%= index + 1 %>'>
-          <h2><%= link_to(highlighted.title, highlighted.url, :class => 'post-title') %></h2>
-          <span class="post-date"><%= show_date(highlighted.published_at, true) %> </span></p>
-          <p class='headline'><%= highlighted.first_paragraph %></p>
-          <p class='highlighted-news-read-more'>
-            <%= link_to(_('Read more'), highlighted.url) %>
-          </p>
-          <br style='clear:both' />
+          <div class='highlighted-news-item post-<%= index + 1 %>-inner'>
+            <h2><%= link_to(highlighted.title, highlighted.url, :class => 'post-title') %></h2>
+            <span class="post-date"><%= show_date(highlighted.published_at, true) %> </span></p>
+            <p class='headline'><%= highlighted.first_paragraph %></p>
+            <p class='highlighted-news-read-more'>
+              <%= link_to(_('Read more'), highlighted.url) %>
+            </p>
+            <br style='clear:both' />
+          </div>
         </div>
-      <% end%>
+      <% end %>
     </div>
     <div class='sep'></div>
@@ -28,7 +30,7 @@
           <span class="post-date"><%= show_date(news.published_at, true) %> </span>
           <%= link_to(news.title, news.url, :class =>  'post-title' ) %>
           </li>
-        <% end%>
+        <% end %>
       </ul>
     </div>
@@ -36,14 +38,18 @@
     <% @area_news.each_with_index do |folder, i| %>
       <% content_tag(:div, :class => ["news-area", ['even', 'odd'][i%2]].join(' ')) do %>
-        <h3><%= link_to folder.title, folder.url %></h3>
-          <ul>
-          <% folder.news(environment.news_amount_by_folder).each do |news| %>
-            <li> <%= link_to(news.title, news.url) %></li>
-          <% end%>
-          </ul>
-        <%= link_to _('View more'), folder.url, :class => 'news-see-more'  %>
-      <%end %>
+        <% content_tag(:div, :class => 'news-area-inner-1') do %>
+          <% content_tag(:div, :class => 'news-area-inner-2') do %>
+            <h3><%= link_to folder.title, folder.url %></h3>
+            <ul>
+              <% folder.news(environment.news_amount_by_folder).each do |news| %>
+                <li> <%= link_to(news.title, news.url) %></li>
+              <% end%>
+            </ul>
+            <%= link_to _('View more'), folder.url, :class => 'news-see-more'  %>
+          <% end %>
+        <% end %>
+      <% end %>
     <% end %>
   <% end %>
 <% else %>
@@ -27,6 +27,10 @@ class EnvironmentDesignControllerTest &lt; Test::Unit::TestCase
     assert_includes @controller.available_blocks, LinkListBlock
   end
+  should 'SlideshowBlock be available' do
+    assert_includes @controller.available_blocks, SlideshowBlock
+  end
+
   should 'be able to edit LinkListBlock' do
     login_as(create_admin_user(Environment.default))
     l = LinkListBlock.create!(:links => [{:name => 'link 1', :address => '/address_1'}])
@@ -21,7 +21,8 @@ class BlogHelperTest &lt; Test::Unit::TestCase
     blog.children << published_post = TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => true)
     expects(:display_post).with(anything).returns('POST')
-    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last', :id => "post-#{published_post.id}").returns('RESULT')
+    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last odd-post-inner', :id => "post-#{published_post.id}").returns('POST')
+    expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
     assert_equal 'RESULT', list_posts(profile, blog.posts)
   end
@@ -30,8 +31,8 @@ class BlogHelperTest &lt; Test::Unit::TestCase
     blog.children << unpublished_post = TextileArticle.create!(:name => 'Post', :profile => profile, :parent => blog, :published => false)
     expects(:display_post).with(anything).returns('POST')
-    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last not-published', :id => "post-#{unpublished_post.id}").returns('RESULT')
-
+    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first last not-published odd-post-inner', :id => "post-#{unpublished_post.id}").returns('POST')
+    expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
     assert_equal 'RESULT', list_posts(profile, blog.posts)
   end
@@ -41,12 +42,29 @@ class BlogHelperTest &lt; Test::Unit::TestCase
     blog.children << published_post = TextileArticle.create!(:name => 'Second post', :profile => profile, :parent => blog, :published => true)
     expects(:display_post).with(anything).returns('POST')
-    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", has_entries(:id => "post-#{published_post.id}")).returns('RESULT')
     expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", has_entries(:id => "post-#{unpublished_post.id}")).never
-
+    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", has_entries(:id => "post-#{published_post.id}")).returns('POST')
+    expects(:content_tag).with('div', 'POST', {:class => 'odd-post'}).returns('RESULT')
     assert_equal 'RESULT', list_posts(nil, blog.posts)
   end
+  should 'list even/odd posts with a different class' do
+    blog.children << older_post = TextileArticle.create!(:name => 'First post', :profile => profile, :parent => blog, :published => true)
+
+    blog.children << newer_post = TextileArticle.create!(:name => 'Second post', :profile => profile, :parent => blog, :published => true)
+
+    expects(:display_post).with(anything).returns('POST').times(2)
+
+    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-1 first odd-post-inner', :id => "post-#{newer_post.id}").returns('POST 1')
+    expects(:content_tag).with('div', "POST 1", :class => 'odd-post').returns('ODD-POST')
+
+    expects(:content_tag).with('div', "POST<br style=\"clear:both\"/>", :class => 'blog-post position-2 last even-post-inner', :id => "post-#{older_post.id}").returns('POST 2')
+    expects(:content_tag).with('div', "POST 2", :class => 'even-post').returns('EVEN-POST')
+
+    assert_equal "ODD-POST\n<hr class='sep-posts'/>\nEVEN-POST", list_posts(nil, blog.posts)
+  end
+
+
   should 'display post' do
     blog.children << article = TextileArticle.create!(:name => 'Second post', :profile => profile, :parent => blog, :published => true)
     expects(:article_title).with(article).returns('TITLE')
	@@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController		@@ -3,7 +3,7 @@ class EnvironmentDesignController < BoxOrganizerController
3	protect 'edit_environment_design', :environment	3	protect 'edit_environment_design', :environment
4		4
5	def available_blocks	5	def available_blocks
6	- @available_blocks \|\|= [ LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock ]	6	+ @available_blocks \|\|= [ LoginBlock, EnvironmentStatisticsBlock, RecentDocumentsBlock, EnterprisesBlock, CommunitiesBlock, PeopleBlock, SellersSearchBlock, LinkListBlock, FeedReaderBlock, SlideshowBlock ]
7	end	7	end
8		8
9	end	9	end