Merge commit 'refs/merge-requests/298' of git://gitorious.org/noosfero/noosfero …

…into merge-requests/298 Added html_safe that was missing on the block_helper new method Conflicts: app/views/box_organizer/_highlights_block.rhtml test/unit/application_helper_test.rb

Merge commit 'refs/merge-requests/298' of git://gitorious.org/noosfero/noosfero …
…into merge-requests/298 Added html_safe that was missing on the block_helper new method Conflicts: app/views/box_organizer/_highlights_block.rhtml test/unit/application_helper_test.rb
Rodrigo Souto
2 parents e27f555d b1c7003c
Showing 13 changed files with 227 additions and 140 deletions Show diff stats
app/helpers/application_helper.rb
app/helpers/block_helper.rb
app/views/box_organizer/_block_types.rhtml
app/views/box_organizer/_highlights_block.rhtml
app/views/box_organizer/add_block.rhtml
app/views/box_organizer/edit.rhtml
app/views/box_organizer/index.rhtml
app/views/catalog/index.rhtml
app/views/cms/select_article_type.rhtml
po/pt/noosfero.po
public/javascripts/catalog.js
public/stylesheets/application.css
test/unit/application_helper_test.rb
@@ -266,7 +266,10 @@ module ApplicationHelper
   end
   def button_bar(options = {}, &block)
-    concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), { :class => 'button-bar' }.merge(options)))
+    options[:class].nil? ?
+      options[:class]='button-bar' :
+      options[:class]+=' button-bar'
+    concat(content_tag('div', capture(&block) + tag('br', :style => 'clear: left;'), options))
   end
   VIEW_EXTENSIONS = %w[.rhtml .html.erb]
@@ -6,4 +6,21 @@ module BlockHelper
     content_tag 'h3', content_tag('span', h(title)), :class => tag_class
   end
+  def highlights_block_config_image_fields(block, image={})
+    "
+    <tr class=\"image-data-line\">
+      <td>
+        #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
+      </td>
+      <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
+      <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
+    </tr><tr class=\"image-title\">
+      <td colspan=\"3\"><label>#{
+        content_tag('span', _('Title')) +
+        text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
+      }</label></td>
+    </tr>
+    "
+  end
+
 end
@@ -1,10 +0,0 @@
-<% block_types.in_groups_of(2) do |block1, block2| %>
-  <div style='float: left; width: 48%; padding-top: 2px;'>
-    <%= labelled_radio_button(block1.description, :type, block1.name) %>
-  </div>
-  <% if block2 %>
-    <div style='float: left; width: 48%; padding-top: 2px;'>
-      <%= labelled_radio_button(block2.description, :type, block2.name) %>
-    </div>
-  <% end %>
-<% end %>
 <strong><%= _('Highlights') %></strong>
-<div id='edit-highlights-block' style='width:450px'>
-<table id='highlights' class='noborder'>
-  <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th><th><%= _('Title') %></th></tr>
+
+<table class="noborder"><tbody id="highlights-data-table">
+  <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th></tr>
   <% for image in @block.images do %>
-    <tr>
-      <td>
-        <%= select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe, :style => "width: 100px" %></p>
-      </td>
-      <td><%= text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 10 %></td>
-      <td><%= text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 3 %></td>
-      <td><%= text_field_tag 'block[images][][title]', image[:title], :class => 'highlight-title', :size => 10 %></td>
-    </tr>
+    <%= highlights_block_config_image_fields @block, image %>
   <% end %>
-</table>
-</div>
+</tbody></table>
 <%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do |page|
-    page.insert_html :bottom, 'highlights', content_tag('tr',
-                  content_tag('td', select_tag('block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name).html_safe, :style => "width: 100px")) +
-                  content_tag('td', text_field_tag('block[images][][address]', nil, :class => 'highlight-address', :size => 10)) +
-                  content_tag('td', text_field_tag('block[images][][position]', nil, :class => 'highlight-position', :size => 3)) +
-                  content_tag('td', text_field_tag('block[images][][title]', nil, :class => 'highlight-position', :size => 10))
-    ) +
-    javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
+  page.insert_html :bottom, 'highlights-data-table', highlights_block_config_image_fields(@block)
 end %>
 <%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {|item| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
-<div style='height:350px'>
+<div id="add-block-dialog">
   <% form_tag do %>
     <p><%= _('In what area do you want to put your new block?') %></p>
+    <div id="box-position">
     <% @boxes.each do |box| %>
-      <%= labelled_radio_button(_("Area %d") % box.position, :box_id, box.id, box.central?, { :class => 'box-position', 'data-position' => box.position })  %>
+      <% name = box.central? ? _('Main area') : _('Area %d') % box.position %>
+      <%= labelled_radio_button(name, :box_id, box.id, box.central?, { 'data-position' => box.position }) %>
     <% end %>
+    </div>
     <script type="text/javascript">
-      (function ($) {
-        $(document).ready(function () {
-          $(".box-position").live('change', function () {
-            if ($(this).attr('data-position') == '1') {
-              $('#center-block-types').show();
-              $('#side-block-types').hide();
-            } else {
-              $('#center-block-types').hide();
-              $('#side-block-types').show();
-            };
-          });
-      })})(jQuery);
+      jQuery('#box-position input').bind('change',
+        function () {
+          showCenter = jQuery(this).attr('data-position') == '1';
+          jQuery('#center-block-types').toggle(showCenter);
+          jQuery('#side-block-types').toggle(!showCenter);
+        }
+      );
     </script>
     <p><%= _('Select the type of block you want to add to your page.') %></p>
-    <div id='center-block-types'>
-      <%= render :partial => 'block_types', :locals => { :block_types => @center_block_types } %>
+    <div id="center-block-types" class="block-types">
+      <% @center_block_types.each do |block| %>
+        <div>
+          <%= labelled_radio_button(block.description, :type, block.name) %>
+        </div>
+      <% end %>
     </div>
-    <div id='side-block-types' style='display:none'>
-      <%= render :partial => 'block_types', :locals => { :block_types => @side_block_types } %>
+    <div id="side-block-types" class="block-types" style="display:none">
+      <% @side_block_types.each do |block| %>
+        <div>
+          <%= labelled_radio_button(block.description, :type, block.name) %>
+        </div>
+      <% end %>
     </div>
     <br style='clear: both'/>
-<div style='width: 500px;'>
-  <h2><%= _('Editing block') %></h2>
+<div class="block-config-options <%= @block.class.name %>-options">
+  <h2 class="title"><%= _('Editing block') %></h2>
   <% form_tag(:action => 'save', :id => @block.id) do %>
 <h1><%= _('Editing sideboxes')%></h1>
-<% button_bar do %>
+<% button_bar :class=>'design-menu' do %>
   <%= colorbox_button('add', _('Add a block'), { :action => 'add_block' }) %>
   <%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>
 <% end %>
@@ -68,20 +68,20 @@
         <% if product.description %>
           <li class="product-description expand-box">
-            <span id="product-description-button"><%= _('description') %></span>
-            <div>
+            <span class="product-description-button"><%= _('description') %></span>
+            <div class="float-box">
               <div class="arrow"></div>
-              <div class="content" id="product-description"><%= txt2html(product.description || '') %></div>
+              <div class="content"><%= product.description %></div>
             </div>
           </li>
         <% end %>
         <% if product.price_described? %>
           <li class="product-price-composition expand-box">
-            <span id="product-price-composition-button"><%= _('price composition') %></span>
-            <div>
+            <span class="product-price-composition-button"><%= _('price composition') %></span>
+            <div class="float-box">
               <div class="arrow"></div>
-              <div class="content" id="product-price-composition">
+              <div class="content">
                 <% product.inputs.relevant_to_price.each do |i| %>
                   <div class="search-product-input-dots-to-price">
                     <div class="search-product-input-name"><%= i.product_category.name %></div>
@@ -102,9 +102,9 @@
         <% if product.inputs.count > 0 %>
           <li class="product-inputs expand-box">
             <span id="inputs-button"><%= _('inputs and raw materials') %></span>
-            <div>
+            <div class="float-box">
               <div class="arrow"></div>
-              <div class="content" id="inputs-description">
+              <div class="content">
                 <% product.inputs.each do |i| %>
                   <div>
                     <%= _('%{amount_used} %{unit} of') % {:amount_used => i.amount_used, :unit => i.unit.singular} + ' ' if i.has_all_price_details? %>
+<div class="select-article-type">
+
 <h2> <%= _('Choose the type of content:') %> </h2>
-<ul id="article_types">
+<ul class="article-types">
   <% for type in @article_types %>
     <% action = type[:class].name == 'UploadedFile' ? {:action => 'upload_files'} : {:action => 'new', :type => type[:class].name} %>
     <% content_tag('a', :href => url_for(action.merge(:parent_id => @parent_id, :back_to => @back_to))) do %>
@@ -14,3 +16,5 @@
 <br style="clear:both" />
 <%= colorbox_close_button(_('Cancel')) %>
+
+</div>
@@ -2256,7 +2256,7 @@ msgstr &quot;Empreendimentos são desabilitados quando criados&quot;
 #: app/models/environment.rb:121
 msgid "Enterprises are validated when created"
-msgstr "Empreendimentos são validadod quando criados"
+msgstr "Empreendimentos são validadodos quando criados"
 #: app/models/environment.rb:122
 msgid "Show a balloon with profile links when a profile image is clicked"
 (function($) {
-$('#product-list .product .expand-box').live('click', function () {
-  $('.expand-box').each(function(index, element){ this.clicked = false; toggle_expandbox(this); });
-  this.clicked = !this.clicked;
-  toggle_expandbox(this);
-  $.each($(this).siblings('.expand-box'), function(index, value) { value.clicked = false; toggle_expandbox(value); });
-
-  return false;
-});
-
-$(document).live('click', function() {
-  $.each($('#product-list .product .expand-box'), function(index, value) { value.clicked = false; toggle_expandbox(value); });
-});
-
-$(document).click(function (event) {
-   if ($(event.target).parents('.expand-box').length == 0) {
-     $('.expand-box').each(function(index, element){
-       $(element).removeClass('open');
-       $(element).children('div').toggle(false);
-     });
-   }
-});
-
-var rows = {};
-$('#product-list .product').each(function (index, element) {
-  obj = rows[$(element).offset().top] || {};
-
-  obj.heights = obj.heights || [];
-  obj.elements = obj.elements || [];
-  obj.heights.push($(element).height());
-  obj.elements.push(element);
-
-  rows[$(element).offset().top] = obj;
-});
-
-$.each(rows, function(top, obj) {
-  maxWidth = Array.max(obj.heights);
-  $(obj.elements).height(maxWidth);
-});
+  function toggle_expandbox(element, open) {
+    element.clicked = open;
+    $(element).toggleClass('open', open);
+  }
+
+  $('#product-list .expand-box').live('click', function () {
+    var me = this;
+    $('.expand-box').each(function(index, element){
+      if ( element != me ) toggle_expandbox(element, false);
+    });
+    toggle_expandbox(me, !me.clicked);
+    return false;
+  });
+
+  $('#product-list .float-box').live('click', function () {
+    return false;
+  });
+
+  $(document).click(function (event) {
+     if ($(event.target).parents('.expand-box').length == 0) {
+       $('#product-list .expand-box').each(function(index, element){
+         toggle_expandbox(element, false);
+       });
+     }
+  });
 })(jQuery);
-
-function toggle_expandbox(e) {
-  jQuery(e).toggleClass('open', e.clicked);
-  jQuery(e).children('div').toggle(e.clicked).css({left: jQuery(e).position().left-180, top: jQuery(e).position().top-10});
-}
@@ -1538,10 +1538,10 @@ a.button.disabled, input.disabled {
  * style for blocks 
  ***********************************************************/
-  #content .communities-block .profile-image {
-    float: none;
-    padding-left: 0px;
-    max-width: none;
+#content .communities-block .profile-image {
+  float: none;
+  padding-left: 0px;
+  max-width: none;
 }
 #content .communities-block .vcard .profile_link {
   text-align: center;
@@ -1594,30 +1594,30 @@ a.button.disabled, input.disabled {
 .invisible-block a.icon-button {
   position: relative;
 }
-/***********************************************************
- * the handles to where you can drag the blocks
- ***********************************************************/
+/************************************************
+ * the handles to where you can drag the blocks *
+ ************************************************/
-  .block-target {
-    margin: 5px;
-    height: 2px;
-    height: 15px;
-    border: 1px dashed #e0e0e0;
+.block-target {
+  margin: 5px;
+  height: 2px;
+  height: 15px;
+  border: 1px dashed #e0e0e0;
 }
 .block-target-hover {
   background: #ffd;
   border: 1px solid red;
   height: 30px;
 }
-/***********************************************************
- * put borders around boxes and blocks when organizing boxes
- ***********************************************************/
+/*************************************************************
+ * put borders around boxes and blocks when organizing boxes *
+ *************************************************************/
-  #box-organizer div.box {
-    border: 1px solid #ccc;
-    background-color: white;
-    background-repeat: no-repeat;
-    background-position: top right;
+#box-organizer div.box {
+  border: 1px solid #ccc;
+  background-color: white;
+  background-repeat: no-repeat;
+  background-position: top right;
 }
 #box-organizer div.box-1 {
   background-image: url(../images/blocks/1.png);
@@ -1651,6 +1651,36 @@ a.button.disabled, input.disabled {
   margin-top: 1em;
   text-align: center;
 }
+
+/****************************************
+ * Block options editor floating window *
+ ****************************************/
+
+#cboxLoadedContent {
+  background: #FFF;
+  box-shadow: 0 0 15px #888 inset;
+  border-radius: 5px;
+  border: 1px solid #777;
+  border-left: none;
+  border-right: none;
+}
+
+.block-config-options {
+  padding: 0px 10px 0px 30px;
+}
+
+#add-block-dialog {
+  display: inline-block;
+  padding: 0px 5px 0px 20px;
+}
+
+#add-block-dialog .block-types {
+  column-count: 2;
+  -ms-column-count: 2;
+  -moz-column-count: 2;
+  -webkit-column-count: 2;
+}
+
 /* ==> blocks/tags-block.css <<= */ 
 .tags-block {
@@ -2494,6 +2524,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   -webkit-border-radius: 10px 0px 0px 10px;
   border-radius: 10px 0px 0px 10px;
   width: 202px;
+  position: relative;
 }
 #product-list .expand-box > span {
   padding-left: 20px;
@@ -2524,17 +2555,22 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
 #product-list li.product .expand-box > span {
   text-transform: uppercase;
 }
-#product-list li.product .expand-box > div {
+#product-list li.product .expand-box .float-box {
   display: none;
   position: absolute;
+  left: -220px;
+  top: -11px;
   z-index: 10;
 }
+#product-list li.product .expand-box.open .float-box {
+  display: block;
+}
 #product-list li.product .expand-box .content {
   font-size: 11px;
   padding: 6px 5px;
   overflow: auto;
   max-height: 200px;
-  width: 160px;
+  width: 200px;
   border-radius: 5px;
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
@@ -2797,7 +2833,7 @@ div#activation_enterprise label, div#activation_enterprise input, div#activation
   position: relative;
   clear: left;
 }
-#product-description, #product-details, #product-info, .input-item {
+#product-details, #product-info, .input-item {
   overflow: hidden;
 }
 #product-info {
@@ -2993,11 +3029,17 @@ table.cms-articles a.icon, table.cms-articles a.icon-parent-folder {
 table.cms-articles .icon:hover {
   background-color: transparent;
 }
-#article_types {
+
+.select-article-type {
+  padding: 5px 20px;
+  width: 455px;
+}
+
+.article-types {
   padding-left: 5px;
   margin-top: 20px;
 }
-#article_types li {
+.article-types li {
   list-style: none;
   float: left;
   width: 180px;
@@ -3011,18 +3053,18 @@ table.cms-articles .icon:hover {
   -moz-border-radius: 5px;
   -webkit-border-radius: 5px;
 }
-#article_types .description {
+.article-types .description {
   color: #888a85;
   font-size: smaller;
 }
-#article_types .icon-newrss-feed, #content .icon-rss-feed {
+.article-types .icon-newrss-feed, #content .icon-rss-feed {
   background-image: url(../images/icons-mime/rss-feed-16.png);
 }
-#article_types a {
+.article-types a {
   text-decoration: none;
   color: black;
 }
-#article_types li.mouseover {
+.article-types li.mouseover {
   background-color: #eeeeec;
 }
 .controller-cms #article-subitems-hide.hide-button {
@@ -4324,6 +4366,39 @@ h1#agenda-title {
   text-align: center;
   overflow: hidden;
 }
+
+.block-config-options.HighlightsBlock-options {
+  min-width: 450px;
+}
+
+.block-config-options.HighlightsBlock-options .image-data-line select {
+  width: 150px;
+}
+
+.block-config-options.HighlightsBlock-options td {
+  text-align: center;
+}
+
+.block-config-options.HighlightsBlock-options .image-data-line td {
+  padding-top: 7px;
+}
+
+.block-config-options.HighlightsBlock-options .image-title {
+  white-space: nowrap;
+  border-bottom: 1px solid #CCC;
+}
+.block-config-options.HighlightsBlock-options .image-title:last-child {
+  border: none;
+}
+
+.block-config-options.HighlightsBlock-options .image-title td {
+  padding-bottom: 7px;
+}
+
+.block-config-options.HighlightsBlock-options .image-title span {
+  padding-right: 5px;
+}
+
 /* Featured Products stuff */
 .featured-product-items {
@@ -5659,12 +5734,6 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 /* Captcha */
-/* Colorbox */
-
-#cboxClose {
-  display: none !important;
-}
-
 /* Signup interface {{{ */
 #url-check {
@@ -727,7 +727,37 @@ class ApplicationHelperTest &lt; ActiveSupport::TestCase
     assert_nil default_folder_for_image_upload(profile)
   end
+  should 'envelop a html with button-bar div' do
+    result = button_bar { '<b>foo</b>' }
+    assert_equal '<div class="button-bar"><b>foo</b>'+
+                 '<br style=\'clear: left;\' /></div>', result
+  end
+
+  should 'add more classes to button-bar envelope' do
+    result = button_bar :class=>'test' do
+      '<b>foo</b>'
+    end
+    assert_equal '<div class="test button-bar"><b>foo</b>'+
+                 '<br style=\'clear: left;\' /></div>', result
+  end
+
+  should 'add more attributes to button-bar envelope' do
+    result = button_bar :id=>'bt1' do
+      '<b>foo</b>'
+    end
+    assert_equal '<div class="button-bar" id="bt1"><b>foo</b>'+
+                 '<br style=\'clear: left;\' /></div>', result
+  end
+
   protected
   include NoosferoTestHelper
+  def capture
+    yield
+  end
+
+  def concat(str)
+    str
+  end
+
 end
	@@ -6,4 +6,21 @@ module BlockHelper		@@ -6,4 +6,21 @@ module BlockHelper
6	content_tag 'h3', content_tag('span', h(title)), :class => tag_class	6	content_tag 'h3', content_tag('span', h(title)), :class => tag_class
7	end	7	end
8		8
		9	+ def highlights_block_config_image_fields(block, image={})
		10	+ "
		11	+ <tr class=\"image-data-line\">
		12	+ <td>
		13	+ #{select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe}
		14	+ </td>
		15	+ <td>#{text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 20}</td>
		16	+ <td>#{text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 1}</td>
		17	+ </tr><tr class=\"image-title\">
		18	+ <td colspan=\"3\"><label>#{
		19	+ content_tag('span', _('Title')) +
		20	+ text_field_tag('block[images][][title]', image[:title], :class => 'highlight-title', :size => 45)
		21	+ }</label></td>
		22	+ </tr>
		23	+ "
		24	+ end
		25	+
9	end	26	end
	@@ -1,10 +0,0 @@	@@ -1,10 +0,0 @@
1	-<% block_types.in_groups_of(2) do \|block1, block2\| %>
2	- <div style='float: left; width: 48%; padding-top: 2px;'>
3	- <%= labelled_radio_button(block1.description, :type, block1.name) %>
4	- </div>
5	- <% if block2 %>
6	- <div style='float: left; width: 48%; padding-top: 2px;'>
7	- <%= labelled_radio_button(block2.description, :type, block2.name) %>
8	- </div>
9	- <% end %>
10	-<% end %>
1	<strong><%= _('Highlights') %></strong>	1	<strong><%= _('Highlights') %></strong>
2	-<div id='edit-highlights-block' style='width:450px'>
3	-<table id='highlights' class='noborder'>
4	- <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th><th><%= _('Title') %></th></tr>	2	+
		3	+<table class="noborder"><tbody id="highlights-data-table">
		4	+ <tr><th><%= _('Image') %></th><th><%= _('Address') %></th><th><%= _('Position') %></th></tr>
5	<% for image in @block.images do %>	5	<% for image in @block.images do %>
6	- <tr>
7	- <td>
8	- <%= select_tag 'block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name, image[:image_id].to_i).html_safe, :style => "width: 100px" %></p>
9	- </td>
10	- <td><%= text_field_tag 'block[images][][address]', image[:address], :class => 'highlight-address', :size => 10 %></td>
11	- <td><%= text_field_tag 'block[images][][position]', image[:position], :class => 'highlight-position', :size => 3 %></td>
12	- <td><%= text_field_tag 'block[images][][title]', image[:title], :class => 'highlight-title', :size => 10 %></td>
13	- </tr>	6	+ <%= highlights_block_config_image_fields @block, image %>
14	<% end %>	7	<% end %>
15	-</table>
16	-</div>	8	+</tbody></table>
17		9
18	<%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do \|page\|	10	<%= link_to_function(_('New highlight'), nil, :class => 'button icon-add with-text') do \|page\|
19	- page.insert_html :bottom, 'highlights', content_tag('tr',
20	- content_tag('td', select_tag('block[images][][image_id]', content_tag(:option) + option_groups_from_collection_for_select(@block.folder_choices, :images, :name, :id, :name).html_safe, :style => "width: 100px")) +
21	- content_tag('td', text_field_tag('block[images][][address]', nil, :class => 'highlight-address', :size => 10)) +
22	- content_tag('td', text_field_tag('block[images][][position]', nil, :class => 'highlight-position', :size => 3)) +
23	- content_tag('td', text_field_tag('block[images][][title]', nil, :class => 'highlight-position', :size => 10))
24	- ) +
25	- javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")	11	+ page.insert_html :bottom, 'highlights-data-table', highlights_block_config_image_fields(@block)
26	end %>	12	end %>
27		13
28	<%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {\|item\| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>	14	<%= labelled_form_field _('Image transition:'), select('block', 'interval', [[_('No automatic transition'), 0]] + [1, 2, 3, 4, 5, 10, 20, 30, 60].map {\|item\| [n_('Every 1 second', 'Every %d seconds', item) % item, item]}) %>
1	-<div style='width: 500px;'>
2	- <h2><%= _('Editing block') %></h2>	1	+<div class="block-config-options <%= @block.class.name %>-options">
		2	+ <h2 class="title"><%= _('Editing block') %></h2>
3		3
4	<% form_tag(:action => 'save', :id => @block.id) do %>	4	<% form_tag(:action => 'save', :id => @block.id) do %>
5		5
1	<h1><%= _('Editing sideboxes')%></h1>	1	<h1><%= _('Editing sideboxes')%></h1>
2		2
3	-<% button_bar do %>	3	+<% button_bar :class=>'design-menu' do %>
4	<%= colorbox_button('add', _('Add a block'), { :action => 'add_block' }) %>	4	<%= colorbox_button('add', _('Add a block'), { :action => 'add_block' }) %>
5	<%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>	5	<%= button(:back, _('Back to control panel'), :controller => (profile.nil? ? 'admin_panel': 'profile_editor')) %>
6	<% end %>	6	<% end %>
	@@ -2256,7 +2256,7 @@ msgstr "Empreendimentos são desabilitados quando criados"		@@ -2256,7 +2256,7 @@ msgstr "Empreendimentos são desabilitados quando criados"
2256		2256
2257	#: app/models/environment.rb:121	2257	#: app/models/environment.rb:121
2258	msgid "Enterprises are validated when created"	2258	msgid "Enterprises are validated when created"
2259	-msgstr "Empreendimentos são validadod quando criados"	2259	+msgstr "Empreendimentos são validadodos quando criados"
2260		2260
2261	#: app/models/environment.rb:122	2261	#: app/models/environment.rb:122
2262	msgid "Show a balloon with profile links when a profile image is clicked"	2262	msgid "Show a balloon with profile links when a profile image is clicked"
1	(function($) {	1	(function($) {
2		2
3	-$('#product-list .product .expand-box').live('click', function () {
4	- $('.expand-box').each(function(index, element){ this.clicked = false; toggle_expandbox(this); });
5	- this.clicked = !this.clicked;
6	- toggle_expandbox(this);
7	- $.each($(this).siblings('.expand-box'), function(index, value) { value.clicked = false; toggle_expandbox(value); });
8	-
9	- return false;
10	-});
11	-
12	-$(document).live('click', function() {
13	- $.each($('#product-list .product .expand-box'), function(index, value) { value.clicked = false; toggle_expandbox(value); });
14	-});
15	-
16	-$(document).click(function (event) {
17	- if ($(event.target).parents('.expand-box').length == 0) {
18	- $('.expand-box').each(function(index, element){
19	- $(element).removeClass('open');
20	- $(element).children('div').toggle(false);
21	- });
22	- }
23	-});
24	-
25	-var rows = {};
26	-$('#product-list .product').each(function (index, element) {
27	- obj = rows[$(element).offset().top] \|\| {};
28	-
29	- obj.heights = obj.heights \|\| [];
30	- obj.elements = obj.elements \|\| [];
31	- obj.heights.push($(element).height());
32	- obj.elements.push(element);
33	-
34	- rows[$(element).offset().top] = obj;
35	-});
36	-
37	-$.each(rows, function(top, obj) {
38	- maxWidth = Array.max(obj.heights);
39	- $(obj.elements).height(maxWidth);
40	-});	3	+ function toggle_expandbox(element, open) {
		4	+ element.clicked = open;
		5	+ $(element).toggleClass('open', open);
		6	+ }
		7	+
		8	+ $('#product-list .expand-box').live('click', function () {
		9	+ var me = this;
		10	+ $('.expand-box').each(function(index, element){
		11	+ if ( element != me ) toggle_expandbox(element, false);
		12	+ });
		13	+ toggle_expandbox(me, !me.clicked);
		14	+ return false;
		15	+ });
		16	+
		17	+ $('#product-list .float-box').live('click', function () {
		18	+ return false;
		19	+ });
		20	+
		21	+ $(document).click(function (event) {
		22	+ if ($(event.target).parents('.expand-box').length == 0) {
		23	+ $('#product-list .expand-box').each(function(index, element){
		24	+ toggle_expandbox(element, false);
		25	+ });
		26	+ }
		27	+ });
41		28
42	})(jQuery);	29	})(jQuery);
43	-
44	-function toggle_expandbox(e) {
45	- jQuery(e).toggleClass('open', e.clicked);
46	- jQuery(e).children('div').toggle(e.clicked).css({left: jQuery(e).position().left-180, top: jQuery(e).position().top-10});
47	-}
	@@ -727,7 +727,37 @@ class ApplicationHelperTest < ActiveSupport::TestCase		@@ -727,7 +727,37 @@ class ApplicationHelperTest < ActiveSupport::TestCase
727	assert_nil default_folder_for_image_upload(profile)	727	assert_nil default_folder_for_image_upload(profile)
728	end	728	end
729		729
		730	+ should 'envelop a html with button-bar div' do
		731	+ result = button_bar { '<b>foo</b>' }
		732	+ assert_equal '<div class="button-bar"><b>foo</b>'+
		733	+ '<br style=\'clear: left;\' /></div>', result
		734	+ end
		735	+
		736	+ should 'add more classes to button-bar envelope' do
		737	+ result = button_bar :class=>'test' do
		738	+ '<b>foo</b>'
		739	+ end
		740	+ assert_equal '<div class="test button-bar"><b>foo</b>'+
		741	+ '<br style=\'clear: left;\' /></div>', result
		742	+ end
		743	+
		744	+ should 'add more attributes to button-bar envelope' do
		745	+ result = button_bar :id=>'bt1' do
		746	+ '<b>foo</b>'
		747	+ end
		748	+ assert_equal '<div class="button-bar" id="bt1"><b>foo</b>'+
		749	+ '<br style=\'clear: left;\' /></div>', result
		750	+ end
		751	+
730	protected	752	protected
731	include NoosferoTestHelper	753	include NoosferoTestHelper
732		754
		755	+ def capture
		756	+ yield
		757	+ end
		758	+
		759	+ def concat(str)
		760	+ str
		761	+ end
		762	+
733	end	763	end