Merge branch 'stable'

Antonio Terceiro
2 parents c60f54db ecbc4517
Showing 28 changed files with 414 additions and 289 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/controllers/public/account_controller.rb
app/helpers/application_helper.rb
app/models/domain.rb
app/models/thumbnail.rb
app/views/account/_signup_form.rhtml
app/views/account/logout_popup.rhtml
app/views/account/wizard.rhtml
app/views/cms/edit.rhtml
app/views/cms/media_listing.rhtml
app/views/home/index.rhtml
app/views/layouts/wizard.rhtml
app/views/memberships/new_community.rhtml
app/views/search/communities.rhtml
app/views/tasks/_approve_article.rhtml
lib/noosfero.rb
po/bg/noosfero.po
po/de/noosfero.po
po/es/noosfero.po
po/fr/noosfero.po
@@ -212,12 +212,12 @@ class CmsController &lt; MyProfileController
   def media_listing
     if params[:image_folder_id]
       folder = profile.articles.find(params[:image_folder_id]) if !params[:image_folder_id].blank?
-      @images = (folder ? folder.children : UploadedFile.find(:all, :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { |c| c.image? }
+      @images = (folder ? folder.children : UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { |c| c.image? }
     elsif params[:document_folder_id]
       folder = profile.articles.find(params[:document_folder_id]) if !params[:document_folder_id].blank?
-      @documents = (folder ? folder.children : UploadedFile.find(:all, :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { |c| c.kind_of?(UploadedFile) && !c.image? }
+      @documents = (folder ? folder.children : UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { |c| c.kind_of?(UploadedFile) && !c.image? }
     else
-      @documents = UploadedFile.find(:all, :conditions => ["profile_id = ? AND parent_id is NULL", profile ])
+      @documents = UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])
       @images = @documents.select(&:image?)
       @documents -= @images
     end
@@ -2,7 +2,7 @@ class AccountController &lt; ApplicationController
   inverse_captcha :field => 'e_mail'
-  require_ssl :except => [ :login_popup, :logout_popup ]
+  require_ssl :except => [ :login_popup, :logout_popup, :wizard, :profile_details ]
   # say something nice, you goof!  something sweet.
   def index
@@ -420,7 +420,7 @@ module ApplicationHelper
     end
     content_tag tag,
         link_to_remote( display,
-	    :update => 'search-results',
+	    :update => 'search-results-and-pages',
             :url => {:controller => 'account', :action => 'profile_details', :profile => profile.identifier},
             :onclick => 'document.location.href = this.href', # work-arround for ie.
             :class => 'profile_link url',
@@ -519,8 +519,8 @@ module ApplicationHelper
     content_tag('div', result)
   end
-  def select_folder(object, method, collection, html_options = {}, js_options = {})
-    labelled_form_field(_('Folder'), select(object, method, collection.map {|f| [ profile.identifier + '/' + f.full_name, f.id ] }, html_options.merge({:include_blank => "#{profile.identifier}"}), js_options))
+  def select_folder(label, object, method, collection, html_options = {}, js_options = {})
+    labelled_form_field(label, select(object, method, collection.map {|f| [ profile.identifier + '/' + f.full_name, f.id ] }, html_options.merge({:include_blank => "#{profile.identifier}"}), js_options))
   end
   def theme_option(opt = nil)
@@ -72,6 +72,7 @@ class Domain &lt; ActiveRecord::Base
   # transfering a domain from a profile to an environment of vice-versa
   # requires restarting the application.
   def self.hosting_profile_at(domainname)
+    return false unless domainname
     @hosting[domainname] ||=
       begin
         domain = Domain.find_by_name(domainname)
 class Thumbnail < ActiveRecord::Base
   has_attachment :storage => :file_system,
-    :content_type => :image
+    :content_type => :image, :max_size => 5.megabytes
   validates_as_attachment
 end
@@ -19,26 +19,30 @@
 <%= required_fields_message %>
+<div id='signup-email'>
+<%= required f.text_field(:email,
+    :help => help=_('This e-mail address will be used to contact you.')) %>
+<div class='help-small-msg'><%= help %></div>
+</div>
+
 <%= required f.text_field(:login,
+      :help => help=_('Insert your login'),
       :onchange => 'this.value = convToValidLogin( this.value )') %>
-<small><%= help %></small>
-
-<%= observe_field 'user_login', :url => {:action => 'check_url'}, :with => 'identifier', :update => 'url-check' %>
-
 <div id='url-check'>
+<div class='help-small-msg'><%= help %></div>
 </div>
-<%= required f.text_field(:email,
-    :help => help=_('This e-mail address will be used to contact you.')) %>
-<small><%= help %></small>
+<%= observe_field 'user_login', :url => {:action => 'check_url'}, :with => 'identifier', :update => 'url-check' %>
+<div id='signup-password'>
 <%= required f.password_field(:password,
     :help => help=_('Choose a password that you can remember easily.')) %>
-<small><%= help %></small>
+<div class='help-small-msg'><%= help %></div>
+</div>
 <%= required f.password_field(:password_confirmation,
     :help => help=_('To confirm, repeat your password.')) %>
-<small><%= help %></small>
+<div class='help-small-msg'><%= help %></div>
 <% labelled_fields_for :profile_data, @person do |f| %>
   <%= render :partial => 'profile_editor/person_form', :locals => {:f => f} %>
@@ -52,7 +56,7 @@
       page['terms-of-use'].show
      end %>
-  <div id='terms-of-use' style='max-height: 200px; overflow: auto; display:none;'>
+  <div id='terms-of-use' style='display: none;'>
     <%= @terms_of_use %>
     <%= link_to_function(_('Hide'), nil) do |page|
       page['terms-of-use'].hide
-<p><%= _('Are you sure you want to get out?') %></p>
-
+<h2><%= _('Are you sure you want to get out?') %></h2>
+<p>
 <% button_bar do %>
   <%= button :ok, _('Yes'), { :controller => 'account', :action => 'logout' } %>
   <%= lightbox_close_button _('No, I want to stay.') %>
 <% end %>
+</p>
 <%= lightbox_close_button _('Close') %>
-<iframe id='wizard-iframe' width=100% height='420px' src="<%= url_for(:controller => 'account', :action => 'signup', :wizard => true) %>" >
+<iframe id='wizard-iframe' width='590px' height='410px' border='0' src="<%= url_for(:controller => 'account', :action => 'signup', :wizard => true) %>" >
   <p><%= _('Your browser does not support iframes.') %></p>
 </iframe>
@@ -51,3 +51,5 @@
 <% if environment.enabled?('media_panel') && [TinyMceArticle, Event, EnterpriseHomepage].any?{|klass| @article.kind_of?(klass)} %>
   <%= render :partial => 'media_listing' %>
 <% end %>
+
+<br style='clear: both'/>
@@ -30,22 +30,9 @@
     }
     registerDocumentSize();
   </script>
-  <div id='media-listing'>
-    <div id='media-listing-images'>
-      <h3><%= _('Images') %></h3>
-      <%= select_folder('folder', 'image_folder_id', @image_folders, {}, :onchange => remote_function(:with => "'image_folder_id=' + value + '&ipage=1'", :url => { :action => :media_listing, :format => 'js' }) ) %>
-      <%= render :partial => 'image_thumb', :locals => { :images => @images } %>
-    </div><!-- id='media-listing-images' -->
-    <div id='media-listing-documents'>
-      <h3><%= _('Documents') %></h3>
-      <%= select_folder('folder', 'document_folder_id', @document_folders, {}, :onchange => remote_function(:with => "'document_folder_id=' + value + '&dpage=1'", :url => { :action => :media_listing }) ) %>
-      <%= render :partial => 'document_link', :locals => { :documents => @documents } %>
-    </div><!-- id='media-listing-documents' -->
-    <br style="clear:both" />
-    <p><big><%= _('Drag images and documents to add them to the text.') %></big></p>
-    <br style="clear:both" />
-  </div><!-- id='media-listing' -->
   <div id='media-listing-upload'>
+    <p><%= _("Include files in some folder or select from the list below to add images and documents to the text editor beside (max size %s)") % UploadedFile.max_size.to_humanreadable %></p>
+
     <div id="notice" onclick="Element.hide('notice');" style="display:none">
       <% unless flash[:notice].nil? %>
         <%= flash[:notice] unless flash[:notice].nil? %>
@@ -58,5 +45,22 @@
       <%= render :partial => 'upload_file_form', :locals => { :size => '30' } %>
     <% end %>
   </div><!-- id='media-listing-upload' -->
+  <hr/>
+  <div id='media-listing'>
+    <h3><%= _('Folders') %></h3>
+    <p><%= _('Drag images and documents to add them to the text. If needed, resize images by clicking the tree icon on editor.') %></p>
+
+    <div id='media-listing-images'>
+      <h4><%= _('Images') %></h4>
+      <%= select_folder('', 'folder', 'image_folder_id', @image_folders, {}, :onchange => remote_function(:with => "'image_folder_id=' + value + '&ipage=1'", :url => { :action => :media_listing, :format => 'js' }) ) %>
+      <%= render :partial => 'image_thumb', :locals => { :images => @images } %>
+    </div><!-- id='media-listing-images' -->
+    <div id='media-listing-documents'>
+      <h4><%= _('Documents') %></h4>
+      <%= select_folder('', 'folder', 'document_folder_id', @document_folders, {}, :onchange => remote_function(:with => "'document_folder_id=' + value + '&dpage=1'", :url => { :action => :media_listing }) ) %>
+      <%= render :partial => 'document_link', :locals => { :documents => @documents } %>
+    </div><!-- id='media-listing-documents' -->
+    <br style="clear:both" />
+  </div><!-- id='media-listing' -->
 </body>
 </html>
 <% if environment.enabled?('display_wizard_signup') && !logged_in? %>
-  <%= lightbox_button(:new, _('Signup'), { :controller => 'account', :action => 'wizard' }, :class => 'wizard') %>
+  <%= lightbox_button(:new, _('Signup'), { :controller => 'account', :action => 'wizard' }, :class => 'wizard', :id => 'signup-wizard') %>
 <% end %>
 <% if @has_news %>
@@ -11,9 +11,9 @@
     <%=
       # Load the principal css files:
-      stylesheet_import( %w( common button search forms)
+      stylesheet_import( %w( common button search forms profiles)
                          ) + "\n" +
-      stylesheet_import( %w( common button search forms),
+      stylesheet_import( %w( common button search forms profiles),
       :themed_source => true ) + "\n" +
       # Load the boxes's css file if each exists:
       import_blocks_stylesheets +
@@ -22,13 +22,9 @@
     %>
   </head>
-  <body class='noosfero'>
-    <div id="iframe">
-      <div id="content">
+  <body class='noosfero' id='wizard'>
         <div id="wizard-content">
           <%= yield %>
         </div><!-- id="wizard-content" -->
-      </div><!-- id="content" -->
-    </div><!-- id="frame" -->
   </body>
 </html>
@@ -17,11 +17,9 @@
   <%= f.text_field('tag_list', :size => 64) %>
   <%= content_tag( 'small', _('Separate tags with commas') ) %>
-  <div id="profile_change_picture">
-    <% f.fields_for :image_builder, @community.image do |i| %>
-      <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
-    <% end %>
-  </div>
+  <% f.fields_for :image_builder, @community.image do |i| %>
+    <%= file_field_or_thumbnail(_('Image:'), @community.image, i) %>
+  <% end %>
   <div style='margin-bottom: 1em; margin-top: 1em;'>
   <%= _('New members must be approved:')%>
@@ -12,11 +12,12 @@
   <div class='atention'><%= __('Choose the communities you want to join and/or create your own.') %></div>
 <% end %>
-<%# FIXME ARMENGUE %>
-<%= display_results(false) %>
-
-<%= pagination_links @results.values.first %>
+<div id='search-results-and-pages'>
+  <%# FIXME ARMENGUE %>
+  <%= display_results(false) %>
+  <%= pagination_links @results.values.first %>
+</div>
 <% if logged_in? %>
   <% button_bar do %>
@@ -21,7 +21,7 @@
     <%= labelled_form_field _('Name for publishing'), f.text_field(:name, :style => 'width:80%;') %>
-    <%= labelled_form_field(_('Select the folder where the article must be published'), select_folder('task', 'article_parent_id', task.target.folders)) %>
+    <%= select_folder(_('Select the folder where the article must be published'), 'task', 'article_parent_id', task.target.folders) %>
     <%= labelled_form_field( _('Highlight'), check_box_tag(:highlighted, true)) %>
     <%= labelled_form_field _('Comment for author'), f.text_area(:closing_statment, :style => 'height:200px; width:80%;') %>
 module Noosfero
   PROJECT = 'noosfero'
-  VERSION = '0.17.0'
+  VERSION = '0.17.1'
   SVN_ROOT = 'https://svn.colivre.coop.br/svn/noosfero'
   def self.pattern_for_controllers_in_directory(dir)
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.16.0\n"
-"POT-Creation-Date: 2009-05-11 22:11-0300\n"
+"Project-Id-Version: noosfero 0.17.0\n"
+"POT-Creation-Date: 2009-05-18 19:12-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -828,11 +828,6 @@ msgstr &quot;&quot;
 msgid "open"
 msgstr ""
-#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
-#: app/models/folder.rb:18
-msgid "Folder"
-msgstr ""
-
 #: app/helpers/application_helper.rb:542
 msgid "Search..."
 msgstr ""
@@ -932,7 +927,7 @@ msgstr &quot;&quot;
 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
-#: app/views/memberships/new_community.rhtml:47
+#: app/views/memberships/new_community.rhtml:45
 #: app/views/profile_editor/header_footer.rhtml:13
 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
@@ -2161,6 +2156,10 @@ msgid &quot;&quot;
 "friend."
 msgstr ""
+#: app/models/folder.rb:8 app/models/folder.rb:18
+msgid "Folder"
+msgstr ""
+
 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
 msgid "Image gallery"
 msgstr ""
@@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
 #: app/views/enterprise_editor/index.rhtml:20
-#: app/views/memberships/new_community.rhtml:45
+#: app/views/memberships/new_community.rhtml:43
 #: app/views/environment_role_manager/index.rhtml:13
 #: app/views/enterprise_validation/details.rhtml:3
 #: app/views/enterprise_validation/list_processed.rhtml:3
@@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
 msgid "Are you sure that you want to remove this item?"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
-msgid "Images"
+#: app/views/cms/media_listing.rhtml:34
+msgid ""
+"Include files in some folder or select from the list below to add images and "
+"documents to the text editor beside (max size %s)"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:40
-msgid "Documents"
+#: app/views/cms/media_listing.rhtml:50
+msgid "Folders"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:51
+msgid ""
+"Drag images and documents to add them to the text. If needed, resize images "
+"by clicking the tree icon on editor."
 msgstr ""
-#: app/views/cms/media_listing.rhtml:45
-msgid "Drag images and documents to add them to the text."
+#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
+msgid "Images"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:59
+msgid "Documents"
 msgstr ""
 #: app/views/cms/_upload_file_form.rhtml:4
@@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
 msgid "Choose the communities you want to join and/or create your own."
 msgstr ""
-#: app/views/search/communities.rhtml:24
+#: app/views/search/communities.rhtml:25
 msgid "New community"
 msgstr ""
@@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
 msgid "Creating new community"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:22
+#: app/views/memberships/new_community.rhtml:21
 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
 #: app/views/manage_products/_form.rhtml:10
 msgid "Image:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:27
+#: app/views/memberships/new_community.rhtml:25
 #: app/views/profile_editor/_organization.rhtml:26
 msgid "New members must be approved:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:32
+#: app/views/memberships/new_community.rhtml:30
 #: app/views/profile_editor/_organization.rhtml:31
 msgid ""
 "<strong>Before</strong> joining this group (a moderator has to accept the "
@@ -4447,14 +4458,14 @@ msgid &quot;&quot;
 "website)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:38
+#: app/views/memberships/new_community.rhtml:36
 #: app/views/profile_editor/_organization.rhtml:37
 msgid ""
 "<strong>After</strong> joining this group (a moderator can always "
 "desactivate access for users later)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
+#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
 msgid "Create"
 msgstr ""
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.16.0\n"
-"POT-Creation-Date: 2009-05-11 22:11-0300\n"
+"Project-Id-Version: noosfero 0.17.0\n"
+"POT-Creation-Date: 2009-05-18 19:12-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -828,11 +828,6 @@ msgstr &quot;&quot;
 msgid "open"
 msgstr ""
-#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
-#: app/models/folder.rb:18
-msgid "Folder"
-msgstr ""
-
 #: app/helpers/application_helper.rb:542
 msgid "Search..."
 msgstr ""
@@ -932,7 +927,7 @@ msgstr &quot;&quot;
 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
-#: app/views/memberships/new_community.rhtml:47
+#: app/views/memberships/new_community.rhtml:45
 #: app/views/profile_editor/header_footer.rhtml:13
 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
@@ -2161,6 +2156,10 @@ msgid &quot;&quot;
 "friend."
 msgstr ""
+#: app/models/folder.rb:8 app/models/folder.rb:18
+msgid "Folder"
+msgstr ""
+
 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
 msgid "Image gallery"
 msgstr ""
@@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
 #: app/views/enterprise_editor/index.rhtml:20
-#: app/views/memberships/new_community.rhtml:45
+#: app/views/memberships/new_community.rhtml:43
 #: app/views/environment_role_manager/index.rhtml:13
 #: app/views/enterprise_validation/details.rhtml:3
 #: app/views/enterprise_validation/list_processed.rhtml:3
@@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
 msgid "Are you sure that you want to remove this item?"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
-msgid "Images"
+#: app/views/cms/media_listing.rhtml:34
+msgid ""
+"Include files in some folder or select from the list below to add images and "
+"documents to the text editor beside (max size %s)"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:40
-msgid "Documents"
+#: app/views/cms/media_listing.rhtml:50
+msgid "Folders"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:51
+msgid ""
+"Drag images and documents to add them to the text. If needed, resize images "
+"by clicking the tree icon on editor."
 msgstr ""
-#: app/views/cms/media_listing.rhtml:45
-msgid "Drag images and documents to add them to the text."
+#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
+msgid "Images"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:59
+msgid "Documents"
 msgstr ""
 #: app/views/cms/_upload_file_form.rhtml:4
@@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
 msgid "Choose the communities you want to join and/or create your own."
 msgstr ""
-#: app/views/search/communities.rhtml:24
+#: app/views/search/communities.rhtml:25
 msgid "New community"
 msgstr ""
@@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
 msgid "Creating new community"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:22
+#: app/views/memberships/new_community.rhtml:21
 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
 #: app/views/manage_products/_form.rhtml:10
 msgid "Image:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:27
+#: app/views/memberships/new_community.rhtml:25
 #: app/views/profile_editor/_organization.rhtml:26
 msgid "New members must be approved:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:32
+#: app/views/memberships/new_community.rhtml:30
 #: app/views/profile_editor/_organization.rhtml:31
 msgid ""
 "<strong>Before</strong> joining this group (a moderator has to accept the "
@@ -4447,14 +4458,14 @@ msgid &quot;&quot;
 "website)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:38
+#: app/views/memberships/new_community.rhtml:36
 #: app/views/profile_editor/_organization.rhtml:37
 msgid ""
 "<strong>After</strong> joining this group (a moderator can always "
 "desactivate access for users later)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
+#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
 msgid "Create"
 msgstr ""
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.16.0\n"
-"POT-Creation-Date: 2009-05-11 22:11-0300\n"
+"Project-Id-Version: noosfero 0.17.0\n"
+"POT-Creation-Date: 2009-05-18 19:12-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -828,11 +828,6 @@ msgstr &quot;&quot;
 msgid "open"
 msgstr ""
-#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
-#: app/models/folder.rb:18
-msgid "Folder"
-msgstr ""
-
 #: app/helpers/application_helper.rb:542
 msgid "Search..."
 msgstr ""
@@ -932,7 +927,7 @@ msgstr &quot;&quot;
 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
-#: app/views/memberships/new_community.rhtml:47
+#: app/views/memberships/new_community.rhtml:45
 #: app/views/profile_editor/header_footer.rhtml:13
 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
@@ -2161,6 +2156,10 @@ msgid &quot;&quot;
 "friend."
 msgstr ""
+#: app/models/folder.rb:8 app/models/folder.rb:18
+msgid "Folder"
+msgstr ""
+
 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
 msgid "Image gallery"
 msgstr ""
@@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
 #: app/views/enterprise_editor/index.rhtml:20
-#: app/views/memberships/new_community.rhtml:45
+#: app/views/memberships/new_community.rhtml:43
 #: app/views/environment_role_manager/index.rhtml:13
 #: app/views/enterprise_validation/details.rhtml:3
 #: app/views/enterprise_validation/list_processed.rhtml:3
@@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
 msgid "Are you sure that you want to remove this item?"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
-msgid "Images"
+#: app/views/cms/media_listing.rhtml:34
+msgid ""
+"Include files in some folder or select from the list below to add images and "
+"documents to the text editor beside (max size %s)"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:40
-msgid "Documents"
+#: app/views/cms/media_listing.rhtml:50
+msgid "Folders"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:51
+msgid ""
+"Drag images and documents to add them to the text. If needed, resize images "
+"by clicking the tree icon on editor."
 msgstr ""
-#: app/views/cms/media_listing.rhtml:45
-msgid "Drag images and documents to add them to the text."
+#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
+msgid "Images"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:59
+msgid "Documents"
 msgstr ""
 #: app/views/cms/_upload_file_form.rhtml:4
@@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
 msgid "Choose the communities you want to join and/or create your own."
 msgstr ""
-#: app/views/search/communities.rhtml:24
+#: app/views/search/communities.rhtml:25
 msgid "New community"
 msgstr ""
@@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
 msgid "Creating new community"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:22
+#: app/views/memberships/new_community.rhtml:21
 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
 #: app/views/manage_products/_form.rhtml:10
 msgid "Image:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:27
+#: app/views/memberships/new_community.rhtml:25
 #: app/views/profile_editor/_organization.rhtml:26
 msgid "New members must be approved:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:32
+#: app/views/memberships/new_community.rhtml:30
 #: app/views/profile_editor/_organization.rhtml:31
 msgid ""
 "<strong>Before</strong> joining this group (a moderator has to accept the "
@@ -4447,14 +4458,14 @@ msgid &quot;&quot;
 "website)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:38
+#: app/views/memberships/new_community.rhtml:36
 #: app/views/profile_editor/_organization.rhtml:37
 msgid ""
 "<strong>After</strong> joining this group (a moderator can always "
 "desactivate access for users later)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
+#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
 msgid "Create"
 msgstr ""
@@ -5,9 +5,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.16.0\n"
+"Project-Id-Version: noosfero 0.17.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-05-11 22:11-0300\n"
+"POT-Creation-Date: 2009-05-18 19:12-0300\n"
 "PO-Revision-Date: 2008-06-13 16:15-0300\n"
 "Last-Translator: Raphael Rousseau <pootle.colivre.coop.br@r4f.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -846,11 +846,6 @@ msgstr &quot;Catégories&quot;
 msgid "open"
 msgstr "ouvrir"
-#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
-#: app/models/folder.rb:18
-msgid "Folder"
-msgstr "Dossier"
-
 #: app/helpers/application_helper.rb:542
 msgid "Search..."
 msgstr "Chercher..."
@@ -958,7 +953,7 @@ msgstr &quot;&quot;
 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
-#: app/views/memberships/new_community.rhtml:47
+#: app/views/memberships/new_community.rhtml:45
 #: app/views/profile_editor/header_footer.rhtml:13
 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
@@ -2270,6 +2265,10 @@ msgstr &quot;&quot;
 "Vous devez être connect(e) à %{system} pour accepter ou refuser %{requestor} "
 "comme contact."
+#: app/models/folder.rb:8 app/models/folder.rb:18
+msgid "Folder"
+msgstr "Dossier"
+
 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
 msgid "Image gallery"
 msgstr "Galerie d'images"
@@ -3206,7 +3205,7 @@ msgstr &quot;Ôter/effacer&quot;
 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
 #: app/views/enterprise_editor/index.rhtml:20
-#: app/views/memberships/new_community.rhtml:45
+#: app/views/memberships/new_community.rhtml:43
 #: app/views/environment_role_manager/index.rhtml:13
 #: app/views/enterprise_validation/details.rhtml:3
 #: app/views/enterprise_validation/list_processed.rhtml:3
@@ -4130,19 +4129,32 @@ msgstr &quot;Partager &quot;
 msgid "Are you sure that you want to remove this item?"
 msgstr "Êtes-vous sûr(e) de vouloir ôter cet élément ?"
-#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
+#: app/views/cms/media_listing.rhtml:34
+msgid ""
+"Include files in some folder or select from the list below to add images and "
+"documents to the text editor beside (max size %s)"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:50
+#, fuzzy
+msgid "Folders"
+msgstr "Dossier"
+
+#: app/views/cms/media_listing.rhtml:51
+msgid ""
+"Drag images and documents to add them to the text. If needed, resize images "
+"by clicking the tree icon on editor."
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
 msgid "Images"
 msgstr "Images"
-#: app/views/cms/media_listing.rhtml:40
+#: app/views/cms/media_listing.rhtml:59
 #, fuzzy
 msgid "Documents"
 msgstr "Commentaires"
-#: app/views/cms/media_listing.rhtml:45
-msgid "Drag images and documents to add them to the text."
-msgstr ""
-
 #: app/views/cms/_upload_file_form.rhtml:4
 #, fuzzy
 msgid "Choose folder to upload files:"
@@ -4327,7 +4339,7 @@ msgstr &quot;Pas de ville&quot;
 msgid "Choose the communities you want to join and/or create your own."
 msgstr ""
-#: app/views/search/communities.rhtml:24
+#: app/views/search/communities.rhtml:25
 msgid "New community"
 msgstr "Nouveau groupe"
@@ -4713,18 +4725,18 @@ msgstr &quot;Oui, je veux le/la détruire.&quot;
 msgid "Creating new community"
 msgstr "Créer un nouveau groupe"
-#: app/views/memberships/new_community.rhtml:22
+#: app/views/memberships/new_community.rhtml:21
 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
 #: app/views/manage_products/_form.rhtml:10
 msgid "Image:"
 msgstr "Image :"
-#: app/views/memberships/new_community.rhtml:27
+#: app/views/memberships/new_community.rhtml:25
 #: app/views/profile_editor/_organization.rhtml:26
 msgid "New members must be approved:"
 msgstr "Les nouveaux membres doivent être approuvés : "
-#: app/views/memberships/new_community.rhtml:32
+#: app/views/memberships/new_community.rhtml:30
 #: app/views/profile_editor/_organization.rhtml:31
 msgid ""
 "<strong>Before</strong> joining this group (a moderator has to accept the "
@@ -4735,7 +4747,7 @@ msgstr &quot;&quot;
 "la requête du nouveau membre avant que celui-ci ne puisse accéder à "
 "l'intranet ou au site web du groupe)."
-#: app/views/memberships/new_community.rhtml:38
+#: app/views/memberships/new_community.rhtml:36
 #: app/views/profile_editor/_organization.rhtml:37
 msgid ""
 "<strong>After</strong> joining this group (a moderator can always "
@@ -4744,7 +4756,7 @@ msgstr &quot;&quot;
 "<strong>Après</strong> avoir rejoint ce groupe (un modérateur peut toujours "
 "désactiver l'accès des membres plus tard)."
-#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
+#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
 msgid "Create"
 msgstr "Créer"
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.16.0\n"
-"POT-Creation-Date: 2009-05-11 22:11-0300\n"
+"Project-Id-Version: noosfero 0.17.0\n"
+"POT-Creation-Date: 2009-05-18 19:12-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -833,11 +833,6 @@ msgstr &quot;Կատեգորիաներ&quot;
 msgid "open"
 msgstr "բացել"
-#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
-#: app/models/folder.rb:18
-msgid "Folder"
-msgstr "Թղթապանակ"
-
 #: app/helpers/application_helper.rb:542
 msgid "Search..."
 msgstr "Որոնել..."
@@ -943,7 +938,7 @@ msgstr &quot;&quot;
 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
-#: app/views/memberships/new_community.rhtml:47
+#: app/views/memberships/new_community.rhtml:45
 #: app/views/profile_editor/header_footer.rhtml:13
 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
@@ -2192,6 +2187,10 @@ msgid &quot;&quot;
 "friend."
 msgstr ""
+#: app/models/folder.rb:8 app/models/folder.rb:18
+msgid "Folder"
+msgstr "Թղթապանակ"
+
 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
 msgid "Image gallery"
 msgstr "Նկարադարան"
@@ -3103,7 +3102,7 @@ msgstr &quot;Հեռացնել&quot;
 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
 #: app/views/enterprise_editor/index.rhtml:20
-#: app/views/memberships/new_community.rhtml:45
+#: app/views/memberships/new_community.rhtml:43
 #: app/views/environment_role_manager/index.rhtml:13
 #: app/views/enterprise_validation/details.rhtml:3
 #: app/views/enterprise_validation/list_processed.rhtml:3
@@ -3976,19 +3975,32 @@ msgstr &quot;&quot;
 msgid "Are you sure that you want to remove this item?"
 msgstr "Վստա՞ք եք, որ ցականում եք այն հեռացնել:"
-#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
+#: app/views/cms/media_listing.rhtml:34
+msgid ""
+"Include files in some folder or select from the list below to add images and "
+"documents to the text editor beside (max size %s)"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:50
+#, fuzzy
+msgid "Folders"
+msgstr "Թղթապանակ"
+
+#: app/views/cms/media_listing.rhtml:51
+msgid ""
+"Drag images and documents to add them to the text. If needed, resize images "
+"by clicking the tree icon on editor."
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
 msgid "Images"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:40
+#: app/views/cms/media_listing.rhtml:59
 #, fuzzy
 msgid "Documents"
 msgstr "մեկնաբանություն"
-#: app/views/cms/media_listing.rhtml:45
-msgid "Drag images and documents to add them to the text."
-msgstr ""
-
 #: app/views/cms/_upload_file_form.rhtml:4
 msgid "Choose folder to upload files:"
 msgstr ""
@@ -4163,7 +4175,7 @@ msgstr &quot;Քաղաք չկա&quot;
 msgid "Choose the communities you want to join and/or create your own."
 msgstr ""
-#: app/views/search/communities.rhtml:24
+#: app/views/search/communities.rhtml:25
 msgid "New community"
 msgstr ""
@@ -4533,18 +4545,18 @@ msgstr &quot;Այո, ես ցանկանում եմ վերացնել:&quot;
 msgid "Creating new community"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:22
+#: app/views/memberships/new_community.rhtml:21
 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
 #: app/views/manage_products/_form.rhtml:10
 msgid "Image:"
 msgstr "Նկար"
-#: app/views/memberships/new_community.rhtml:27
+#: app/views/memberships/new_community.rhtml:25
 #: app/views/profile_editor/_organization.rhtml:26
 msgid "New members must be approved:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:32
+#: app/views/memberships/new_community.rhtml:30
 #: app/views/profile_editor/_organization.rhtml:31
 msgid ""
 "<strong>Before</strong> joining this group (a moderator has to accept the "
@@ -4552,14 +4564,14 @@ msgid &quot;&quot;
 "website)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:38
+#: app/views/memberships/new_community.rhtml:36
 #: app/views/profile_editor/_organization.rhtml:37
 msgid ""
 "<strong>After</strong> joining this group (a moderator can always "
 "desactivate access for users later)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
+#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
 msgid "Create"
 msgstr "Ստեղծել"
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.16.0\n"
-"POT-Creation-Date: 2009-05-11 22:11-0300\n"
+"Project-Id-Version: noosfero 0.17.0\n"
+"POT-Creation-Date: 2009-05-18 19:12-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -828,11 +828,6 @@ msgstr &quot;&quot;
 msgid "open"
 msgstr ""
-#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
-#: app/models/folder.rb:18
-msgid "Folder"
-msgstr ""
-
 #: app/helpers/application_helper.rb:542
 msgid "Search..."
 msgstr ""
@@ -932,7 +927,7 @@ msgstr &quot;&quot;
 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
-#: app/views/memberships/new_community.rhtml:47
+#: app/views/memberships/new_community.rhtml:45
 #: app/views/profile_editor/header_footer.rhtml:13
 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
@@ -2161,6 +2156,10 @@ msgid &quot;&quot;
 "friend."
 msgstr ""
+#: app/models/folder.rb:8 app/models/folder.rb:18
+msgid "Folder"
+msgstr ""
+
 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
 msgid "Image gallery"
 msgstr ""
@@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
 #: app/views/enterprise_editor/index.rhtml:20
-#: app/views/memberships/new_community.rhtml:45
+#: app/views/memberships/new_community.rhtml:43
 #: app/views/environment_role_manager/index.rhtml:13
 #: app/views/enterprise_validation/details.rhtml:3
 #: app/views/enterprise_validation/list_processed.rhtml:3
@@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
 msgid "Are you sure that you want to remove this item?"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
-msgid "Images"
+#: app/views/cms/media_listing.rhtml:34
+msgid ""
+"Include files in some folder or select from the list below to add images and "
+"documents to the text editor beside (max size %s)"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:40
-msgid "Documents"
+#: app/views/cms/media_listing.rhtml:50
+msgid "Folders"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:51
+msgid ""
+"Drag images and documents to add them to the text. If needed, resize images "
+"by clicking the tree icon on editor."
 msgstr ""
-#: app/views/cms/media_listing.rhtml:45
-msgid "Drag images and documents to add them to the text."
+#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
+msgid "Images"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:59
+msgid "Documents"
 msgstr ""
 #: app/views/cms/_upload_file_form.rhtml:4
@@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
 msgid "Choose the communities you want to join and/or create your own."
 msgstr ""
-#: app/views/search/communities.rhtml:24
+#: app/views/search/communities.rhtml:25
 msgid "New community"
 msgstr ""
@@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
 msgid "Creating new community"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:22
+#: app/views/memberships/new_community.rhtml:21
 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
 #: app/views/manage_products/_form.rhtml:10
 msgid "Image:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:27
+#: app/views/memberships/new_community.rhtml:25
 #: app/views/profile_editor/_organization.rhtml:26
 msgid "New members must be approved:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:32
+#: app/views/memberships/new_community.rhtml:30
 #: app/views/profile_editor/_organization.rhtml:31
 msgid ""
 "<strong>Before</strong> joining this group (a moderator has to accept the "
@@ -4447,14 +4458,14 @@ msgid &quot;&quot;
 "website)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:38
+#: app/views/memberships/new_community.rhtml:36
 #: app/views/profile_editor/_organization.rhtml:37
 msgid ""
 "<strong>After</strong> joining this group (a moderator can always "
 "desactivate access for users later)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
+#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
 msgid "Create"
 msgstr ""
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.16.0\n"
-"POT-Creation-Date: 2009-05-11 22:11-0300\n"
+"Project-Id-Version: noosfero 0.17.0\n"
+"POT-Creation-Date: 2009-05-18 19:12-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -828,11 +828,6 @@ msgstr &quot;&quot;
 msgid "open"
 msgstr ""
-#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
-#: app/models/folder.rb:18
-msgid "Folder"
-msgstr ""
-
 #: app/helpers/application_helper.rb:542
 msgid "Search..."
 msgstr ""
@@ -932,7 +927,7 @@ msgstr &quot;&quot;
 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
-#: app/views/memberships/new_community.rhtml:47
+#: app/views/memberships/new_community.rhtml:45
 #: app/views/profile_editor/header_footer.rhtml:13
 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
@@ -2161,6 +2156,10 @@ msgid &quot;&quot;
 "friend."
 msgstr ""
+#: app/models/folder.rb:8 app/models/folder.rb:18
+msgid "Folder"
+msgstr ""
+
 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
 msgid "Image gallery"
 msgstr ""
@@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
 #: app/views/enterprise_editor/index.rhtml:20
-#: app/views/memberships/new_community.rhtml:45
+#: app/views/memberships/new_community.rhtml:43
 #: app/views/environment_role_manager/index.rhtml:13
 #: app/views/enterprise_validation/details.rhtml:3
 #: app/views/enterprise_validation/list_processed.rhtml:3
@@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
 msgid "Are you sure that you want to remove this item?"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
-msgid "Images"
+#: app/views/cms/media_listing.rhtml:34
+msgid ""
+"Include files in some folder or select from the list below to add images and "
+"documents to the text editor beside (max size %s)"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:40
-msgid "Documents"
+#: app/views/cms/media_listing.rhtml:50
+msgid "Folders"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:51
+msgid ""
+"Drag images and documents to add them to the text. If needed, resize images "
+"by clicking the tree icon on editor."
 msgstr ""
-#: app/views/cms/media_listing.rhtml:45
-msgid "Drag images and documents to add them to the text."
+#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
+msgid "Images"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:59
+msgid "Documents"
 msgstr ""
 #: app/views/cms/_upload_file_form.rhtml:4
@@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
 msgid "Choose the communities you want to join and/or create your own."
 msgstr ""
-#: app/views/search/communities.rhtml:24
+#: app/views/search/communities.rhtml:25
 msgid "New community"
 msgstr ""
@@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
 msgid "Creating new community"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:22
+#: app/views/memberships/new_community.rhtml:21
 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
 #: app/views/manage_products/_form.rhtml:10
 msgid "Image:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:27
+#: app/views/memberships/new_community.rhtml:25
 #: app/views/profile_editor/_organization.rhtml:26
 msgid "New members must be approved:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:32
+#: app/views/memberships/new_community.rhtml:30
 #: app/views/profile_editor/_organization.rhtml:31
 msgid ""
 "<strong>Before</strong> joining this group (a moderator has to accept the "
@@ -4447,14 +4458,14 @@ msgid &quot;&quot;
 "website)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:38
+#: app/views/memberships/new_community.rhtml:36
 #: app/views/profile_editor/_organization.rhtml:37
 msgid ""
 "<strong>After</strong> joining this group (a moderator can always "
 "desactivate access for users later)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
+#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
 msgid "Create"
 msgstr ""
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.16.0\n"
-"POT-Creation-Date: 2009-05-11 22:11-0300\n"
+"Project-Id-Version: noosfero 0.17.0\n"
+"POT-Creation-Date: 2009-05-18 19:12-0300\n"
 "PO-Revision-Date: 2007-08-30 18:47-0300\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -828,11 +828,6 @@ msgstr &quot;&quot;
 msgid "open"
 msgstr ""
-#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
-#: app/models/folder.rb:18
-msgid "Folder"
-msgstr ""
-
 #: app/helpers/application_helper.rb:542
 msgid "Search..."
 msgstr ""
@@ -932,7 +927,7 @@ msgstr &quot;&quot;
 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
-#: app/views/memberships/new_community.rhtml:47
+#: app/views/memberships/new_community.rhtml:45
 #: app/views/profile_editor/header_footer.rhtml:13
 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
@@ -2161,6 +2156,10 @@ msgid &quot;&quot;
 "friend."
 msgstr ""
+#: app/models/folder.rb:8 app/models/folder.rb:18
+msgid "Folder"
+msgstr ""
+
 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
 msgid "Image gallery"
 msgstr ""
@@ -3052,7 +3051,7 @@ msgstr &quot;&quot;
 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
 #: app/views/enterprise_editor/index.rhtml:20
-#: app/views/memberships/new_community.rhtml:45
+#: app/views/memberships/new_community.rhtml:43
 #: app/views/environment_role_manager/index.rhtml:13
 #: app/views/enterprise_validation/details.rhtml:3
 #: app/views/enterprise_validation/list_processed.rhtml:3
@@ -3890,16 +3889,28 @@ msgstr &quot;&quot;
 msgid "Are you sure that you want to remove this item?"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
-msgid "Images"
+#: app/views/cms/media_listing.rhtml:34
+msgid ""
+"Include files in some folder or select from the list below to add images and "
+"documents to the text editor beside (max size %s)"
 msgstr ""
-#: app/views/cms/media_listing.rhtml:40
-msgid "Documents"
+#: app/views/cms/media_listing.rhtml:50
+msgid "Folders"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:51
+msgid ""
+"Drag images and documents to add them to the text. If needed, resize images "
+"by clicking the tree icon on editor."
 msgstr ""
-#: app/views/cms/media_listing.rhtml:45
-msgid "Drag images and documents to add them to the text."
+#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
+msgid "Images"
+msgstr ""
+
+#: app/views/cms/media_listing.rhtml:59
+msgid "Documents"
 msgstr ""
 #: app/views/cms/_upload_file_form.rhtml:4
@@ -4074,7 +4085,7 @@ msgstr &quot;&quot;
 msgid "Choose the communities you want to join and/or create your own."
 msgstr ""
-#: app/views/search/communities.rhtml:24
+#: app/views/search/communities.rhtml:25
 msgid "New community"
 msgstr ""
@@ -4428,18 +4439,18 @@ msgstr &quot;&quot;
 msgid "Creating new community"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:22
+#: app/views/memberships/new_community.rhtml:21
 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
 #: app/views/manage_products/_form.rhtml:10
 msgid "Image:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:27
+#: app/views/memberships/new_community.rhtml:25
 #: app/views/profile_editor/_organization.rhtml:26
 msgid "New members must be approved:"
 msgstr ""
-#: app/views/memberships/new_community.rhtml:32
+#: app/views/memberships/new_community.rhtml:30
 #: app/views/profile_editor/_organization.rhtml:31
 msgid ""
 "<strong>Before</strong> joining this group (a moderator has to accept the "
@@ -4447,14 +4458,14 @@ msgid &quot;&quot;
 "website)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:38
+#: app/views/memberships/new_community.rhtml:36
 #: app/views/profile_editor/_organization.rhtml:37
 msgid ""
 "<strong>After</strong> joining this group (a moderator can always "
 "desactivate access for users later)."
 msgstr ""
-#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
+#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
 msgid "Create"
 msgstr ""
@@ -11,9 +11,9 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: noosfero 0.16.0\n"
-"POT-Creation-Date: 2009-05-11 22:11-0300\n"
-"PO-Revision-Date: 2009-05-11 22:48-0300\n"
+"Project-Id-Version: noosfero 0.17.0\n"
+"POT-Creation-Date: 2009-05-18 19:12-0300\n"
+"PO-Revision-Date: 2009-05-18 19:49-0300\n"
 "Last-Translator: Joenio Costa <joenio@colivre.coop.br>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -834,11 +834,6 @@ msgstr &quot;Categorias&quot;
 msgid "open"
 msgstr "aberto"
-#: app/helpers/application_helper.rb:523 app/models/folder.rb:8
-#: app/models/folder.rb:18
-msgid "Folder"
-msgstr "Pasta"
-
 #: app/helpers/application_helper.rb:542
 msgid "Search..."
 msgstr "Busca..."
@@ -942,7 +937,7 @@ msgstr &quot;&quot;
 #: app/views/account/accept_terms.rhtml:24 app/views/account/login.rhtml:22
 #: app/views/cms/edit.rhtml:41 app/views/cms/edit.rhtml:43
 #: app/views/cms/edit.rhtml:45 app/views/cms/select_article_type.rhtml:12
-#: app/views/memberships/new_community.rhtml:47
+#: app/views/memberships/new_community.rhtml:45
 #: app/views/profile_editor/header_footer.rhtml:13
 #: app/views/box_organizer/edit.rhtml:11 app/views/themes/add_css.rhtml:8
 #: app/views/tasks/_task.rhtml:12 app/views/tasks/_ticket.rhtml:15
@@ -2209,6 +2204,10 @@ msgstr &quot;&quot;
 "Você precisa entrar no %{system} para poder aceitar %{requestor} como seu"
 "(sua) amigo(a)."
+#: app/models/folder.rb:8 app/models/folder.rb:18
+msgid "Folder"
+msgstr "Pasta"
+
 #: app/models/folder.rb:8 app/models/image_gallery.rb:4
 msgid "Image gallery"
 msgstr "Galeria de Imagens"
@@ -3124,7 +3123,7 @@ msgstr &quot;Remover&quot;
 #: app/views/profile_members/index.rhtml:21 app/views/role/show.rhtml:10
 #: app/views/role/index.rhtml:12 app/views/account/_profile_details.rhtml:18
 #: app/views/enterprise_editor/index.rhtml:20
-#: app/views/memberships/new_community.rhtml:45
+#: app/views/memberships/new_community.rhtml:43
 #: app/views/environment_role_manager/index.rhtml:13
 #: app/views/enterprise_validation/details.rhtml:3
 #: app/views/enterprise_validation/list_processed.rhtml:3
@@ -4027,18 +4026,33 @@ msgstr &quot;Divulgar&quot;
 msgid "Are you sure that you want to remove this item?"
 msgstr "Tem certeza que quer excluir este ítem?"
-#: app/views/cms/media_listing.rhtml:35 app/views/themes/edit.rhtml:24
+#: app/views/cms/media_listing.rhtml:34
+msgid ""
+"Include files in some folder or select from the list below to add images and "
+"documents to the text editor beside (max size %s)"
+msgstr ""
+"Inclua arquivos em alguma pasta ou selecione da lista abaixo para adicionar "
+"images e documentos ao editor de texto ao lado (tamanho máximo %s)"
+
+#: app/views/cms/media_listing.rhtml:50
+msgid "Folders"
+msgstr "Pastas"
+
+#: app/views/cms/media_listing.rhtml:51
+msgid ""
+"Drag images and documents to add them to the text. If needed, resize images "
+"by clicking the tree icon on editor."
+msgstr "Arraste imagens e documentos para adicioná-los ao texto. Se necessário, "
+"redimensione as imagens clicando no ícone da árvore no editor."
+
+#: app/views/cms/media_listing.rhtml:54 app/views/themes/edit.rhtml:24
 msgid "Images"
 msgstr "Imagens"
-#: app/views/cms/media_listing.rhtml:40
+#: app/views/cms/media_listing.rhtml:59
 msgid "Documents"
 msgstr "Documentos"
-#: app/views/cms/media_listing.rhtml:45
-msgid "Drag images and documents to add them to the text."
-msgstr "Arraste imagens e documentos para adicioná-los ao texto."
-
 #: app/views/cms/_upload_file_form.rhtml:4
 msgid "Choose folder to upload files:"
 msgstr "Escolha uma pasta para incluir arquivos:"
@@ -4216,7 +4230,7 @@ msgid &quot;Choose the communities you want to join and/or create your own.&quot;
 msgstr ""
 "Escolha as comunidades que você deseja participar e/ou crie a sua própria."
-#: app/views/search/communities.rhtml:24
+#: app/views/search/communities.rhtml:25
 msgid "New community"
 msgstr "Uma comunidade"
@@ -4581,18 +4595,18 @@ msgstr &quot;Sim, quero remover.&quot;
 msgid "Creating new community"
 msgstr "Criando nova comunidade"
-#: app/views/memberships/new_community.rhtml:22
+#: app/views/memberships/new_community.rhtml:21
 #: app/views/profile_editor/edit.rhtml:12 app/views/categories/_form.rhtml:27
 #: app/views/manage_products/_form.rhtml:10
 msgid "Image:"
 msgstr "Imagem:"
-#: app/views/memberships/new_community.rhtml:27
+#: app/views/memberships/new_community.rhtml:25
 #: app/views/profile_editor/_organization.rhtml:26
 msgid "New members must be approved:"
 msgstr "Novos membros devem ser aprovados:"
-#: app/views/memberships/new_community.rhtml:32
+#: app/views/memberships/new_community.rhtml:30
 #: app/views/profile_editor/_organization.rhtml:31
 msgid ""
 "<strong>Before</strong> joining this group (a moderator has to accept the "
@@ -4602,7 +4616,7 @@ msgstr &quot;&quot;
 "<strong>Antes</strong> de entrar no grupo (um moderador precisa aceitar uma "
 "solicitação pendente antes do membro poder acessar a intranet e/ou o website."
-#: app/views/memberships/new_community.rhtml:38
+#: app/views/memberships/new_community.rhtml:36
 #: app/views/profile_editor/_organization.rhtml:37
 msgid ""
 "<strong>After</strong> joining this group (a moderator can always "
@@ -4611,7 +4625,7 @@ msgstr &quot;&quot;
 "<strong>Depois</strong> de entrar no grupo (um moderador sempre pode "
 "desativar acesso dos usuários depois)."
-#: app/views/memberships/new_community.rhtml:43 app/views/themes/new.rhtml:8
+#: app/views/memberships/new_community.rhtml:41 app/views/themes/new.rhtml:8
 msgid "Create"
 msgstr "Criar"
@@ -64,6 +64,9 @@ lightbox.prototype = {
 	initialize: function(ctrl) {
 		this.content = ctrl.href;
+		if (ctrl.id != '') {
+		    this.lightbox_className = ctrl.id;
+		}
 		Event.observe(ctrl, 'click', this.activate.bindAsEventListener(this), false);
 		ctrl.onclick = function(){return false;};
 	},
@@ -144,9 +147,13 @@ lightbox.prototype = {
 	// Display Ajax response
 	processInfo: function(response){
-		info = "<div id='lbContent'>" + response.responseText + "</div>";
+		info = "<div id='lbContent'><div id='lbBottomBG'><div id='lbTopBG'>" + response.responseText + "</div></div></div>";
 		new Insertion.Before($('lbLoadMessage'), info)
-		$('lightbox').className = "done";	
+		if (this.lightbox_className) {
+			$('lightbox').className = "done " + this.lightbox_className;
+		} else {
+			$('lightbox').className = "done";
+		}
 		this.actions();			
 	},
@@ -5,12 +5,11 @@ body {
   font-size: 14px;
   color: #444;
   background-color: #F0F0EE;
-  border: 1px solid #CCC;
   overflow: hidden;
 }
 h3, h4, h5 {
-  margin: 10px 0px;
+  margin: 5px 0px;
 }
 h3 {
@@ -23,14 +22,16 @@ h4 {
 #media-listing {
   width: 100%;
-  height: 65%;
+  height: 48%;
   margin: 0px;
   padding: 0px;
-  border-bottom: 2px solid #444;
+  padding-bottom: 5px;
 }
+#media-listing-upload p,
 #media-listing p {
-  font-size: 14px;
+  font-size: 13px;
+  font-weight: bold;
   margin: 5px 5px;
 }
@@ -48,9 +49,7 @@ h4 {
 }
 #media-listing-images {
-  margin-top: 2px;
   width: 46%;
-  height: 80%;
   float: left;
   text-align: center;
 }
@@ -66,40 +65,43 @@ h4 {
   height: 60px;
 }
-#media-listing-folder-images {
-  height: 75%;
+#media-listing-folder-images,
+#media-listing-folder-documents {
+  height: 80%;
 }
 #media-listing ul {
   padding: 0px;
   margin: 5px;
-  height: 65%;
+  height: 40%;
   overflow: auto;
   width: 98%;
 }
+#media-listing ul {
+  height: 85%;
+}
+
+#media-listing-images,
+#media-listing-documents {
+  height: 55%;
+}
+
 #media-listing-documents ul {
   text-align: left;
 }
 #media-listing-documents {
-  margin: 2px 0px 0px 2px;
   width: 52%;
-  height: 80%;
   float: left;
   text-align: center;
 }
-#media-listing-folder-documents {
-  height: 75%;
-}
-
 #media-listing-folder-documents img {
   border: none;
 }
 #media-listing-upload {
-  height: 38%;
   width: 98%;
   padding: 3px;
 }
@@ -116,6 +118,7 @@ h4 {
   overflow-x: hidden;
   overflow-y: scroll;
   height: 100px;
+  margin-top: 5px;
 }
 .msie #uploaded_files {
@@ -133,7 +136,7 @@ h4 {
 div#notice {
   background: #fee;
   border: 1px solid #933;
-  bottom: 150px;
+  top: 150px;
   color: black;
   cursor: pointer;
   font-weight: bold;
@@ -47,27 +47,30 @@ class FileData &lt; StringIO
 end
 class Progress
-  def self.instance
-    @instance ||= self.new
-  end
-  def start(n)
-    @total = n
-    @current = 0
-  end
-  def step
-    @current += 1
-  end
-  def puts(msg)
-    Kernel.puts("[%d/%d] %s" %  [@current, @total, msg])
+  DEBUG = false
+  class << self
+    def start(n)
+      @total = n
+      @current = 0
+    end
+    def step
+      @current += 1
+    end
+    def step_done
+      say('=> done', true)
+    end
+    def say(msg, force = Progress::DEBUG)
+      puts("[%d/%d] %s" %  [@current, @total, msg]) if force
+    end
   end
 end
 FORBIDDEN_LOGINS = %w[
   info
 ]
-Progress.instance.start(ARGV.size)
+Progress.start(ARGV.size)
 for username in ARGV
-  Progress.instance.step
+  Progress.step
   begin
     User.transaction do
       # guess environment
@@ -89,17 +92,17 @@ for username in ARGV
       person.from_xml(File.read(File.join(IMPORT_DIR, username + '.xml')))
       person.preferred_domain = get_domain(domain_name)
       user.save!
-      Progress.instance.puts "I: #{username} data imported"
+      Progress.say "I: #{username} data imported"
       # import articles
       Dir.glob(File.join(IMPORT_DIR, username, 'articles', '*.xml')) do |xml|
-        Progress.instance.puts "I: Trying to import #{username}'s article in #{xml} ..."
+        Progress.say "I: Trying to import #{username}'s article in #{xml} ..."
         article = TinyMceArticle.new
         article.from_xml(File.read(xml))
         article.profile = person
         if article.valid?
           article.save!
-          Progress.instance.puts "I: #{username}'s article #{article.name.inspect} imported"
+          Progress.say "I: #{username}'s article #{article.name.inspect} imported"
         else
           $stderr.puts "W: #{username}'s article #{article.name.inspect} cannot be saved. Errors: #{article.errors.full_messages.join(', ')}"
           next
@@ -108,12 +111,12 @@ for username in ARGV
         if article.is_homepage
           person.home_page = article
           person.save!
-          Progress.instance.puts "I: Article #{article.name.inspect} is #{username}'s homepage!"
+          Progress.say "I: Article #{article.name.inspect} is #{username}'s homepage!"
         end
         File.open("tmp/rewrite.txt", 'w+') do |file|
           file.puts("#{article.id} #{url_for(article.url)}")
-          Progress.instance.puts "I: Article with id = #{article.id} redirected to #{url_for(article.url)}"
+          Progress.say "I: Article with id = #{article.id} redirected to #{url_for(article.url)}"
         end
         # import attachments
@@ -122,16 +125,16 @@ for username in ARGV
           file = UploadedFile.new
           file.from_xml(File.read(attachment_xml))
           if !File.exist?(file.filesystem_location)
-            Progress.instance.puts "W: skipping attachment pointing to unexisting file"
+            Progress.say "W: skipping attachment pointing to unexisting file"
             next
           end
-          Progress.instance.puts "I: about to read data from #{file.filesystem_location} (xml: #{attachment_xml})"
+          Progress.say "I: about to read data from #{file.filesystem_location} (xml: #{attachment_xml})"
           file.uploaded_data = FileData.new(file.filesystem_location, file.filename, file.content_type)
           file.parent = article
           file.profile = person
-          Progress.instance.puts "I: Trying to save attachment \"#{file.filename}/#{file.slug}\""
+          Progress.say "I: Trying to save attachment \"#{file.filename}/#{file.slug}\""
           file.save!
-          Progress.instance.puts "I: attachment added to article #{article.id}"
+          Progress.say "I: attachment added to article #{article.id}"
           file.reload
           if file.image?
@@ -158,7 +161,7 @@ for username in ARGV
         block.title = data['menu']['title']
         block.links = links
         block.save!
-        Progress.instance.puts "imported links: #{links.inspect}"
+        Progress.say "imported links: #{links.inspect}"
       end
     end
@@ -170,4 +173,5 @@ for username in ARGV
     $stderr.puts "=================================="
     $stderr.puts "E: Note that ALL operations above relative to <#{username}> were CANCELLED due to these errors."
   end
+  Progress.step_done
 end
	@@ -212,12 +212,12 @@ class CmsController < MyProfileController		@@ -212,12 +212,12 @@ class CmsController < MyProfileController
212	def media_listing	212	def media_listing
213	if params[:image_folder_id]	213	if params[:image_folder_id]
214	folder = profile.articles.find(params[:image_folder_id]) if !params[:image_folder_id].blank?	214	folder = profile.articles.find(params[:image_folder_id]) if !params[:image_folder_id].blank?
215	- @images = (folder ? folder.children : UploadedFile.find(:all, :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { \|c\| c.image? }	215	+ @images = (folder ? folder.children : UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { \|c\| c.image? }
216	elsif params[:document_folder_id]	216	elsif params[:document_folder_id]
217	folder = profile.articles.find(params[:document_folder_id]) if !params[:document_folder_id].blank?	217	folder = profile.articles.find(params[:document_folder_id]) if !params[:document_folder_id].blank?
218	- @documents = (folder ? folder.children : UploadedFile.find(:all, :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { \|c\| c.kind_of?(UploadedFile) && !c.image? }	218	+ @documents = (folder ? folder.children : UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])).select { \|c\| c.kind_of?(UploadedFile) && !c.image? }
219	else	219	else
220	- @documents = UploadedFile.find(:all, :conditions => ["profile_id = ? AND parent_id is NULL", profile ])	220	+ @documents = UploadedFile.find(:all, :order => 'created_at desc', :conditions => ["profile_id = ? AND parent_id is NULL", profile ])
221	@images = @documents.select(&:image?)	221	@images = @documents.select(&:image?)
222	@documents -= @images	222	@documents -= @images
223	end	223	end
	@@ -2,7 +2,7 @@ class AccountController < ApplicationController		@@ -2,7 +2,7 @@ class AccountController < ApplicationController
2		2
3	inverse_captcha :field => 'e_mail'	3	inverse_captcha :field => 'e_mail'
4		4
5	- require_ssl :except => [ :login_popup, :logout_popup ]	5	+ require_ssl :except => [ :login_popup, :logout_popup, :wizard, :profile_details ]
6		6
7	# say something nice, you goof! something sweet.	7	# say something nice, you goof! something sweet.
8	def index	8	def index
1	class Thumbnail < ActiveRecord::Base	1	class Thumbnail < ActiveRecord::Base
2	has_attachment :storage => :file_system,	2	has_attachment :storage => :file_system,
3	- :content_type => :image	3	+ :content_type => :image, :max_size => 5.megabytes
4	validates_as_attachment	4	validates_as_attachment
5	end	5	end
1	<%= lightbox_close_button _('Close') %>	1	<%= lightbox_close_button _('Close') %>
2		2
3	-<iframe id='wizard-iframe' width=100% height='420px' src="<%= url_for(:controller => 'account', :action => 'signup', :wizard => true) %>" >	3	+<iframe id='wizard-iframe' width='590px' height='410px' border='0' src="<%= url_for(:controller => 'account', :action => 'signup', :wizard => true) %>" >
4	<p><%= _('Your browser does not support iframes.') %></p>	4	<p><%= _('Your browser does not support iframes.') %></p>
5	</iframe>	5	</iframe>
	@@ -51,3 +51,5 @@		@@ -51,3 +51,5 @@
51	<% if environment.enabled?('media_panel') && [TinyMceArticle, Event, EnterpriseHomepage].any?{\|klass\| @article.kind_of?(klass)} %>	51	<% if environment.enabled?('media_panel') && [TinyMceArticle, Event, EnterpriseHomepage].any?{\|klass\| @article.kind_of?(klass)} %>
52	<%= render :partial => 'media_listing' %>	52	<%= render :partial => 'media_listing' %>
53	<% end %>	53	<% end %>
		54	+
		55	+<br style='clear: both'/>
1	<% if environment.enabled?('display_wizard_signup') && !logged_in? %>	1	<% if environment.enabled?('display_wizard_signup') && !logged_in? %>
2	- <%= lightbox_button(:new, _('Signup'), { :controller => 'account', :action => 'wizard' }, :class => 'wizard') %>	2	+ <%= lightbox_button(:new, _('Signup'), { :controller => 'account', :action => 'wizard' }, :class => 'wizard', :id => 'signup-wizard') %>
3	<% end %>	3	<% end %>
4		4
5	<% if @has_news %>	5	<% if @has_news %>
	@@ -21,7 +21,7 @@		@@ -21,7 +21,7 @@
21		21
22	<%= labelled_form_field _('Name for publishing'), f.text_field(:name, :style => 'width:80%;') %>	22	<%= labelled_form_field _('Name for publishing'), f.text_field(:name, :style => 'width:80%;') %>
23		23
24	- <%= labelled_form_field(_('Select the folder where the article must be published'), select_folder('task', 'article_parent_id', task.target.folders)) %>	24	+ <%= select_folder(_('Select the folder where the article must be published'), 'task', 'article_parent_id', task.target.folders) %>
25	<%= labelled_form_field( _('Highlight'), check_box_tag(:highlighted, true)) %>	25	<%= labelled_form_field( _('Highlight'), check_box_tag(:highlighted, true)) %>
26	<%= labelled_form_field _('Comment for author'), f.text_area(:closing_statment, :style => 'height:200px; width:80%;') %>	26	<%= labelled_form_field _('Comment for author'), f.text_area(:closing_statment, :style => 'height:200px; width:80%;') %>
27		27
1	module Noosfero	1	module Noosfero
2	PROJECT = 'noosfero'	2	PROJECT = 'noosfero'
3	- VERSION = '0.17.0'	3	+ VERSION = '0.17.1'
4	SVN_ROOT = 'https://svn.colivre.coop.br/svn/noosfero'	4	SVN_ROOT = 'https://svn.colivre.coop.br/svn/noosfero'
5		5
6	def self.pattern_for_controllers_in_directory(dir)	6	def self.pattern_for_controllers_in_directory(dir)
	@@ -5,12 +5,11 @@ body {		@@ -5,12 +5,11 @@ body {
5	font-size: 14px;	5	font-size: 14px;
6	color: #444;	6	color: #444;
7	background-color: #F0F0EE;	7	background-color: #F0F0EE;
8	- border: 1px solid #CCC;
9	overflow: hidden;	8	overflow: hidden;
10	}	9	}
11		10
12	h3, h4, h5 {	11	h3, h4, h5 {
13	- margin: 10px 0px;	12	+ margin: 5px 0px;
14	}	13	}
15		14
16	h3 {	15	h3 {
	@@ -23,14 +22,16 @@ h4 {		@@ -23,14 +22,16 @@ h4 {
23		22
24	#media-listing {	23	#media-listing {
25	width: 100%;	24	width: 100%;
26	- height: 65%;	25	+ height: 48%;
27	margin: 0px;	26	margin: 0px;
28	padding: 0px;	27	padding: 0px;
29	- border-bottom: 2px solid #444;	28	+ padding-bottom: 5px;
30	}	29	}
31		30
		31	+#media-listing-upload p,
32	#media-listing p {	32	#media-listing p {
33	- font-size: 14px;	33	+ font-size: 13px;
		34	+ font-weight: bold;
34	margin: 5px 5px;	35	margin: 5px 5px;
35	}	36	}
36		37
	@@ -48,9 +49,7 @@ h4 {		@@ -48,9 +49,7 @@ h4 {
48	}	49	}
49		50
50	#media-listing-images {	51	#media-listing-images {
51	- margin-top: 2px;
52	width: 46%;	52	width: 46%;
53	- height: 80%;
54	float: left;	53	float: left;
55	text-align: center;	54	text-align: center;
56	}	55	}
	@@ -66,40 +65,43 @@ h4 {		@@ -66,40 +65,43 @@ h4 {
66	height: 60px;	65	height: 60px;
67	}	66	}
68		67
69	-#media-listing-folder-images {
70	- height: 75%;	68	+#media-listing-folder-images,
		69	+#media-listing-folder-documents {
		70	+ height: 80%;
71	}	71	}
72		72
73	#media-listing ul {	73	#media-listing ul {
74	padding: 0px;	74	padding: 0px;
75	margin: 5px;	75	margin: 5px;
76	- height: 65%;	76	+ height: 40%;
77	overflow: auto;	77	overflow: auto;
78	width: 98%;	78	width: 98%;
79	}	79	}
80		80
		81	+#media-listing ul {
		82	+ height: 85%;
		83	+}
		84	+
		85	+#media-listing-images,
		86	+#media-listing-documents {
		87	+ height: 55%;
		88	+}
		89	+
81	#media-listing-documents ul {	90	#media-listing-documents ul {
82	text-align: left;	91	text-align: left;
83	}	92	}
84		93
85	#media-listing-documents {	94	#media-listing-documents {
86	- margin: 2px 0px 0px 2px;
87	width: 52%;	95	width: 52%;
88	- height: 80%;
89	float: left;	96	float: left;
90	text-align: center;	97	text-align: center;
91	}	98	}
92		99
93	-#media-listing-folder-documents {
94	- height: 75%;
95	-}
96	-
97	#media-listing-folder-documents img {	100	#media-listing-folder-documents img {
98	border: none;	101	border: none;
99	}	102	}
100		103
101	#media-listing-upload {	104	#media-listing-upload {
102	- height: 38%;
103	width: 98%;	105	width: 98%;
104	padding: 3px;	106	padding: 3px;
105	}	107	}
	@@ -116,6 +118,7 @@ h4 {		@@ -116,6 +118,7 @@ h4 {
116	overflow-x: hidden;	118	overflow-x: hidden;
117	overflow-y: scroll;	119	overflow-y: scroll;
118	height: 100px;	120	height: 100px;
		121	+ margin-top: 5px;
119	}	122	}
120		123
121	.msie #uploaded_files {	124	.msie #uploaded_files {
	@@ -133,7 +136,7 @@ h4 {		@@ -133,7 +136,7 @@ h4 {
133	div#notice {	136	div#notice {
134	background: #fee;	137	background: #fee;
135	border: 1px solid #933;	138	border: 1px solid #933;
136	- bottom: 150px;	139	+ top: 150px;
137	color: black;	140	color: black;
138	cursor: pointer;	141	cursor: pointer;
139	font-weight: bold;	142	font-weight: bold;