Merge branch 'block-admin-mail' into production

Conflicts: app/models/event.rb app/models/profile.rb po/fr/noosfero.po

Merge branch 'block-admin-mail' into production
Conflicts: app/models/event.rb app/models/profile.rb po/fr/noosfero.po
Victor Costa
2 parents 135c10f9 a1f85f37
Showing 73 changed files with 616 additions and 428 deletions Show diff stats
.gitlab-ci.yml
.travis.yml
Gemfile
app/controllers/application_controller.rb
app/controllers/my_profile/cms_controller.rb
app/helpers/application_helper.rb
app/helpers/comment_helper.rb
app/helpers/content_viewer_helper.rb
app/models/article.rb
app/models/event.rb
app/models/image.rb
app/models/organization.rb
app/models/profile.rb
app/models/task.rb
app/models/user.rb
app/views/content_viewer/_article_title.html.erb
app/views/content_viewer/_article_toolbar.html.erb
app/views/content_viewer/_display_compact_format.html.erb
app/views/content_viewer/_publishing_info.html.erb
app/views/content_viewer/event_page.html.erb
@@ -0,0 +1,24 @@
+before_script:
+  - mkdir -p tmp/pids log
+  - bundle check || bundle install
+  - script/noosfero-plugins disableall
+  - rm -f tmp/makemo.stamp && rake makemo &>/dev/null
+# database
+  - cp config/database.yml.gitlab-ci config/database.yml
+  - createdb gitlab_ci_test || true
+  - bundle exec rake db:schema:load &>/dev/null
+  - bundle exec rake db:migrate &>/dev/null
+
+units:
+  script: bundle exec rake test:units
+functionals:
+  script: bundle exec rake test:functionals
+integration:
+  script: bundle exec rake test:integration
+cucumber:
+  script: bundle exec rake cucumber
+selenium:
+  script: bundle exec rake selenium
+plugins:
+  script: bundle exec rake test:noosfero_plugins
+
@@ -0,0 +1,36 @@
+language: ruby
+rvm:
+# for 2.2 support we need to upgrade the pg gem
+  - 2.1.6
+
+before_install:
+# dependencies
+  - sudo apt-get update
+  - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data default-jre
+  - sudo apt-get -y install libmagickwand-dev libpq-dev libreadline-dev libsqlite3-dev libxslt1-dev
+# selenium support
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+
+before_script:
+  - mkdir -p tmp/pids log
+  - bundle check || bundle install
+  - script/noosfero-plugins disableall
+  - rake makemo
+# database
+  - cp config/database.yml.travis config/database.yml
+  - psql -c 'create database myapp_test;' -U postgres
+  - bundle exec rake db:schema:load
+  - bundle exec rake db:migrate
+
+env:
+  - TASK=test:units
+  - TASK=test:functionals
+  - TASK=test:integration
+  - TASK=cucumber
+  - TASK=selenium
+  - TASK=test:noosfero_plugins
+
+script:
+  - bundle exec rake $TASK
+
 source "https://rubygems.org"
-gem 'rails',                    '~> 3.2.21'
+gem 'rails',                    '~> 3.2.22'
 gem 'minitest',                 '~> 3.2.0'
 gem 'fast_gettext',             '~> 0.6.8'
 gem 'acts-as-taggable-on',      '~> 3.4.2'
@@ -40,6 +40,7 @@ group :test do
   gem 'rspec',                  '~> 2.14.0'
   gem 'rspec-rails',            '~> 2.14.1'
   gem 'mocha',                  '~> 1.1.0', :require => false
+  gem 'test-unit' if RUBY_VERSION >= '2.2.0'
 end
 group :cucumber do
@@ -77,8 +77,8 @@ class ApplicationController &lt; ActionController::Base
     FastGettext.available_locales = environment.available_locales
     FastGettext.default_locale = environment.default_locale
     FastGettext.locale = (params[:lang] || session[:lang] || environment.default_locale || request.env['HTTP_ACCEPT_LANGUAGE'] || 'en')
-    I18n.locale = FastGettext.locale
-    I18n.default_locale = FastGettext.default_locale
+    I18n.locale = FastGettext.locale.to_s.gsub '_', '-'
+    I18n.default_locale = FastGettext.default_locale.to_s.gsub '_', '-'
     if params[:lang]
       session[:lang] = params[:lang]
     end
@@ -6,7 +6,7 @@ class CmsController &lt; MyProfileController
   def search_tags
     arg = params[:term].downcase
-    result = ActsAsTaggableOn::Tag.find(:all, :conditions => ['LOWER(name) LIKE ?', "%#{arg}%"])
+    result = ActsAsTaggableOn::Tag.where('name ILIKE ?', "%#{arg}%").limit(10)
     render :text => prepare_to_token_input_by_label(result).to_json, :content_type => 'application/json'
   end
@@ -94,6 +94,11 @@ class CmsController &lt; MyProfileController
     record_coming
     if request.post?
       @article.image = nil if params[:remove_image] == 'true'
+      if @article.image.present? && params[:article][:image_builder] &&
+        params[:article][:image_builder][:label]
+        @article.image.label = params[:article][:image_builder][:label]
+        @article.image.save!
+      end
       @article.last_changed_by = user
       if @article.update_attributes(params[:article])
         if !continue
@@ -1185,7 +1185,7 @@ module ApplicationHelper
       pending_tasks_count = link_to("<i class=\"icon-menu-tasks\"></i><span class=\"task-count\">#{count}</span>", user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
     end
-    (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +
+    (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.url, :id => "homepage-link", :title => _('Go to your homepage'))) +
     render_environment_features(:usermenu) +
     admin_link +
     manage_enterprises +
@@ -1234,7 +1234,7 @@ module ApplicationHelper
   def task_information(task)
     values = {}
-    values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor
+    values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
     values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
     values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
     values.merge!(task.information[:variables]) if task.information[:variables]
@@ -16,7 +16,7 @@ module CommentHelper
         content_tag('span', show_date(article.published_at), :class => 'date') +
         content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
-        :class => 'created-at'
+        :class => 'publishing-info'
       )
     end
     title
@@ -30,7 +30,7 @@ module ContentViewerHelper
         date_format +
         content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
-        :class => 'created-at'
+        :class => 'publishing-info'
       )
     end
     title
@@ -145,7 +145,7 @@ class Article &lt; ActiveRecord::Base
   scope :by_range, lambda { |range| {
     :conditions => [
-      'published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
+      'articles.published_at BETWEEN :start_date AND :end_date', { :start_date => range.first, :end_date => range.last }
     ]
   }}
@@ -748,8 +748,9 @@ class Article &lt; ActiveRecord::Base
     paragraphs.empty? ? '' : paragraphs.first.to_html
   end
-  def lead
-    abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
+  def lead(length = nil)
+    content = abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
+    length.present? ? content.truncate(length) : content
   end
   def short_lead
@@ -99,47 +99,19 @@ class Event &lt; Article
     start_date..(end_date||start_date)
   end
-  # FIXME this shouldn't be needed
-  include ActionView::Helpers::TagHelper
-  include ActionView::Helpers::UrlHelper
-  include DatesHelper
+  def first_paragraph
+    paragraphs = Nokogiri::HTML.fragment(self.body).css('p')
+    paragraphs.empty? ? '' : paragraphs.first.to_html
+  end
   def to_html(options = {})
+    event = self
+    format = options[:format]
-    result = ''
-    html = ::Builder::XmlMarkup.new(:target => result)
-
-    html.div(:class => 'event-info' ) {
-      html.ul(:class => 'event-data' ) {
-        html.li(:class => 'event-dates' ) {
-          html.span _('When:')
-          html.text! show_period(start_date, end_date)
-        } if start_date.present? || end_date.present?
-        html.li {
-          html.span _('URL:')
-          html.a(self.link || "", 'href' => self.link || "")
-        } if self.link.present?
-        html.li {
-          html.span _('Address:')
-          html.text! self.address || ""
-        } if self.address.present?
-      }
-
-      # TODO: some good soul, please clean this ugly hack:
-      if self.body
-        html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description')
-      end
-    }
-
-    if self.body
-      #if options[:format] == 'short'
-      #  result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self))
-      #else
-        result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
-      #end
+    proc do
+      render :file => 'content_viewer/event_page', :locals => { :event => event,
+        :format => format }
     end
-
-    result
   end
   def duration
@@ -23,7 +23,7 @@ class Image &lt; ActiveRecord::Base
   postgresql_attachment_fu
-  attr_accessible :uploaded_data
+  attr_accessible :uploaded_data, :label
   def current_data
     File.file?(full_filename) ? File.read(full_filename) : nil
@@ -154,6 +154,12 @@ class Organization &lt; Profile
     ]
   end
+  def short_name chars = 40
+    s = self.display_name
+    s = super(chars) if s.blank?
+    s
+  end
+
   def notification_emails
     emails = [contact_email].select(&:present?) + admins.map(&:email)
     if emails.empty?
@@ -3,7 +3,7 @@
 # which by default is the one returned by Environment:default.
 class Profile < ActiveRecord::Base
-  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret, :custom_fields
+  attr_accessible :name, :identifier, :public_profile, :nickname, :custom_footer, :custom_header, :address, :zip_code, :contact_phone, :image_builder, :description, :closed, :template_id, :environment, :lat, :lng, :is_template, :fields_privacy, :preferred_domain_id, :category_ids, :country, :city, :state, :national_region_code, :email, :contact_email, :redirect_l10n, :notification_time, :redirection_after_login, :email_suggestions, :allow_members_to_invite, :invite_friends_only, :secret, :custom_fields, :administrator_mail_notification
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -219,6 +219,7 @@ class Profile &lt; ActiveRecord::Base
   settings_items :description
   settings_items :fields_privacy, :type => :hash, :default => {}
   settings_items :email_suggestions, :type => :boolean, :default => false
+  settings_items :administrator_mail_notification, :type => :boolean, :default => true
   validates_length_of :description, :maximum => 550, :allow_nil => true
@@ -70,7 +70,9 @@ class Task &lt; ActiveRecord::Base
       begin
         target_msg = task.target_notification_message
         if target_msg && task.target && !task.target.notification_emails.empty?
-          TaskMailer.target_notification(task, target_msg).deliver
+          if target_profile_accepts_notification?(task)
+            TaskMailer.target_notification(task, target_msg).deliver
+          end
         end
       rescue Exception => ex
         Rails.logger.info ex.to_s
@@ -78,6 +80,18 @@ class Task &lt; ActiveRecord::Base
     end
   end
+  def target_profile_accepts_notification?(task)
+    if target_is_profile?(task)
+      return task.target.administrator_mail_notification
+    else
+      true
+    end
+  end
+
+  def target_is_profile?(task)
+    task.target.kind_of? Profile
+  end
+
   # this method finished the task. It calls #perform, which must be overriden
   # by subclasses. At the end a message (as returned by #finish_message) is
   # sent to the requestor with #notify_requestor.
@@ -334,6 +334,8 @@ class User &lt; ActiveRecord::Base
     {
       'login' => self.login,
+      'name' => self.person.name,
+      'email' => self.email,
       'avatar' => self.person.profile_custom_icon(gravatar_default),
       'is_admin' => self.person.is_admin?,
       'since_month' => self.person.created_at.month,
@@ -0,0 +1,20 @@
+<% if @page.belongs_to_blog? || @page.belongs_to_forum?%>
+  <h1 class="title">
+    <% if no_link %>
+      <%= h(@page.title) %>
+    <% else %>
+      <%= link_to(@page.name, @page.url) %>
+    <% end %>
+  </h1>
+  <%= render :partial => "publishing_info" %>
+  <% unless @page.abstract.blank? %>
+    <div class="preview">
+      <%= @page.lead %>
+    </div>
+  <% end %>
+<% else %>
+  <h1 class="title">
+    <%= h(@page.title) %>
+  </h1>
+  <%= render :partial => "publishing_info" %>
+<% end %>
@@ -64,7 +64,7 @@
     <% end %>
     <%= link_to(image_tag('/images/icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
     <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
-    <%= article_title(@page, :no_link => true) %>
+    <%= render :partial => 'article_title', :locals => {:no_link => true} %>
     <%= article_translations(@page) %>
   </div>
 </div>
@@ -16,6 +16,6 @@
     </div>
   <% end %>
   <div class = <%= className %> >
-      <%= article.abstract.truncate(400) %>
+      <%= article.lead(400) %>
   </div>
 </div>
@@ -0,0 +1,29 @@
+<span class="publishing-info">
+  <span class="date">
+    <%= show_date(@page.published_at) %>
+  </span>
+  <span class="author">
+    <%= _(", by %s") % (@page.author ? link_to(@page.author_name, @page.author_url) : @page.author_name) %>
+  </span>
+<% unless @no_comments %>
+  <span class="comments">
+    <%= (" - %s") % link_to_comments(@page)%>
+  </span>
+<% end %>
+</span>
+
+<% if @page.display_hits? || @page.license.present? %>
+  <div id='article-sub-header'>
+    <% if @page.display_hits? %>
+      <div id="article-hits">
+        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
+      </div>
+    <% end %>
+
+    <% if @page.license.present? %>
+      <div id="article-license">
+        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
@@ -0,0 +1,41 @@
+<div class="event-card">
+  <div class="event-image">
+    <% if event.image %>
+      <%= image_tag(event.image.public_filename(:big)) %>
+    <% end %>
+  </div>
+  <div class="about-event">
+    <% if event.start_date.present? || event.end_date.present? %>
+      <span class="event-date">
+        <%= show_period(event.start_date, event.end_date) %>
+      </span>
+    <% end %>
+    <% if event.link.present? %>
+      <span class="event-link">
+        <%= link_to event.link, event.link %>
+      </span>
+    <% end %>
+    <% if event.address.present? %>
+      <span class="event-address">
+        <span>
+          <%= event.address %>
+        </span>
+      </span>
+    <% end %>
+  </div>
+</div>
+
+<div class="event-body">
+  <% if format == 'short' %>
+    <%= display_short_format event, :comments_link => false, :read_more_link => false %>
+  <% else %>
+    <% unless event.abstract.blank? %>
+      <div class="event-lead">
+        <%= event.article_lead %>
+      </div>
+    <% end %>
+    <div class="event-content">
+      <%= event.body %>
+    </div>
+  <% end %>
+</div>
@@ -24,22 +24,6 @@
   <%= render :partial => 'article_toolbar' %>
 </div>
-<% if @page.display_hits? || @page.license.present? %>
-  <div id='article-sub-header'>
-    <% if @page.display_hits? %>
-      <div id="article-hits">
-        <%= n_('Viewed one time', 'Viewed %{num} times', @page.hits) % { :num => @page.hits } %>
-      </div>
-    <% end %>
-
-    <% if @page.license.present? %>
-      <div id="article-license">
-        <%= _('Licensed under %s') % (@page.license.url.present? ? link_to(@page.license.name, @page.license.url, :target => '_blank') : @page.license.name) %>
-      </div>
-    <% end %>
-  </div>
-<% end %>
-
 <% if NOOSFERO_CONF['addthis_enabled'] %>
   <%= render :partial => 'addthis' %>
 <% end %>
@@ -47,6 +31,12 @@
 <% cache(@page.cache_key(params, user, language)) do %>
   <div class="<%="article-body article-body-" + @page.css_class_name %>">
     <% options = @page.image? ? {:gallery_view => true} : {} %>
+    <% if @page.image.present? && !@page.event? %>
+      <div class="article-body-img">
+        <%= image_tag(@page.image.public_filename) %>
+        <p><%= @page.image.label%></p>
+      </div>
+    <% end %>
     <%= article_to_html(@page, options) %>
     <br style="clear:both" />
   </div> <!-- end class="article-body" -->
@@ -27,6 +27,7 @@
     <script type="text/javascript">
       DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
+      noosfero.profile = <%= (@profile.identifier if @profile).to_json %>
     </script>
   </head>
 <%= text_field_tag 'product_category_id', '', :placeholder => _('type a category for the product') %>
 <%= javascript_include_tag '/javascripts/product_categories.js' %>
-<% javascript_tag do %>
+<%= javascript_tag do %>
   product_categories.autocomplete.search_url = <%= url_for(:controller => :manage_products, :action => :search_categories).to_json %>
   product_categories.autocomplete.select_url = <%= url_for(:controller => :manage_products, :action => :show_category_tree).to_json %>
   product_categories.autocomplete.load('#product_category_id')
 <h2><%= _('Moderation options') %></h2>
 <% if profile.community? %>
   <div style='margin-bottom: 1em'>
+    <h4><%= _('Email Configuration:')%></h4>
+  </div>
+  <div style='margin-bottom: 0.5em'>
+    <%= check_box(:profile_data, :administrator_mail_notification, :style => 'float: left') %>
+    <div style='margin-left: 30px'>
+      <%= _('Send administrator Email for every task (Default: yes)') %>
+    </div>
+  </div>
+
+  <div style='margin-bottom: 1em'>
     <h4><%= _('Invitation moderation:')%></h4>
   </div>
   <div style='margin-bottom: 0.5em'>
-  <%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
-  <%= button_to_function(:cancel,_('Cancel'),"jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :style => 'display: none')%>
+<%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
+<%= labelled_form_field(_("Image Label:"), i.text_field(:label)) %>
+<%= button_to_function(:cancel,_('Cancel'),"jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :style => 'display: none')%>
@@ -0,0 +1,6 @@
+test: &TEST
+  adapter: postgresql
+  database: gitlab_ci_test
+  username: gitlab_ci_runner
+development:
+  <<: *TEST
@@ -0,0 +1,5 @@
+# From http://about.travis-ci.org/docs/user/database-setup/
+test:
+  adapter: postgresql
+  database: myapp_test
+  username: postgres
@@ -0,0 +1,13 @@
+# inherit from production
+require_relative 'production'
+
+Noosfero::Application.configure do
+
+  # expose errors
+  config.consider_all_requests_local = true
+
+  # ease debug
+  config.assets.compress = false
+
+end
+
@@ -3,7 +3,7 @@
 # contributors:
 #  - Alexander Dreher - http://github.com/alexdreher - Rails 3 update
-de:
+de: &de
   date:
     formats:
       default: "%d.%m.%Y"
@@ -221,3 +221,6 @@ de:
       full_messages:
         format: "%{attribute} %{message}"
+
+de-DE:
+  <<: *de
@@ -2,7 +2,7 @@
 #
 # Use this as the base for the locale file of your language.
-"en-US":
+"en-US": &en-US
   date:
     formats:
       default: "%Y-%m-%d"
@@ -220,4 +220,7 @@
       template:
         <<: *errors_template
       full_messages:
-        format: "%{attribute} %{message}"
 \ No newline at end of file
+        format: "%{attribute} %{message}"
+
+en:
+  <<: *en-US
@@ -0,0 +1 @@
+en-US.yml
 \ No newline at end of file
@@ -4,7 +4,7 @@
 #  - Tsutomu Kuroda - http://github.com/kuroda (t-kuroda@oiax.jp)
 # Corrected by Eloy Serra Labán: http://goo.gl/i9Kts, /nQ928, /XfKaX
-"es":
+es: &es
   date:
     formats:
       default: "%d/%m/%Y"
@@ -223,3 +223,6 @@
       full_messages:
         format: "%{attribute} %{message}"
+
+es_ES:
+  <<: *es
@@ -0,0 +1 @@
+fr.yml
 \ No newline at end of file
@@ -5,7 +5,7 @@
 #  - Bruno Michel - http://github.com/nono
 #  - Tsutomu Kuroda - http://github.com/kuroda (t-kuroda@oiax.jp)
-fr:
+fr: &fr
   date:
     formats:
       default: "%d/%m/%Y"
@@ -222,3 +222,7 @@ fr:
         <<: *errors_template
       full_messages:
         format: "%{attribute} %{message}"
+
+fr-FR:
+  <<: *fr
+
@@ -176,4 +176,4 @@
       template:
         <<: *errors_template
       full_messages:
-        format: "%{attribute} %{message}"
 \ No newline at end of file
+        format: "%{attribute} %{message}"
@@ -0,0 +1 @@
+hy.yml
 \ No newline at end of file
@@ -3,7 +3,7 @@
 # FIXME: This is a copy of en-US.yml. Armenian translators, please translate
 # this into Armenian.
-"hy":
+hy: &hy
   date:
     formats:
       default: "%Y-%m-%d"
@@ -222,3 +222,6 @@
         <<: *errors_template
       full_messages:
         format: "%{attribute} %{message}"
+
+hy-AM:
+  <<: *hy
@@ -5,7 +5,7 @@
 # - Simone Carletti (weppos@weppos.net)
 # - Davide Guerri (d.guerri@caspur.it)
-it:
+it: &it
   number:
     format:
       delimiter: ","
@@ -234,3 +234,6 @@ it:
       full_messages:
         format: "%{attribute} %{message}"
+
+it_IT:
+  <<: *it
 # encoding: UTF-8
 # pt-BR translations for Ruby on Rails
-"pt-BR":
+
+"pt-BR": &pt-BR
   # formatos de data e hora
   date:
     formats:
@@ -231,3 +232,6 @@
       full_messages:
         format: "%{attribute} %{message}"
+
+pt:
+  <<: *pt-BR
@@ -1,233 +0,0 @@
-# encoding: UTF-8
-# pt-BR translations for Ruby on Rails
-"pt":
-  # formatos de data e hora
-  date:
-    formats:
-      default: "%d/%m/%Y"
-      short: "%d de %B"
-      long: "%d de %B de %Y"
-
-    day_names:
-      - Domingo
-      - Segunda
-      - Terça
-      - Quarta
-      - Quinta
-      - Sexta
-      - Sábado
-    abbr_day_names:
-      - Dom
-      - Seg
-      - Ter
-      - Qua
-      - Qui
-      - Sex
-      - Sáb
-
-    month_names:
-      - ~
-      - Janeiro
-      - Fevereiro
-      - Março
-      - Abril
-      - Maio
-      - Junho
-      - Julho
-      - Agosto
-      - Setembro
-      - Outubro
-      - Novembro
-      - Dezembro
-    abbr_month_names:
-      - ~
-      - Jan
-      - Fev
-      - Mar
-      - Abr
-      - Mai
-      - Jun
-      - Jul
-      - Ago
-      - Set
-      - Out
-      - Nov
-      - Dez
-    order:
-      - :day
-      - :month
-      - :year
-
-  time:
-    formats:
-      default: "%A, %d de %B de %Y, %H:%M h"
-      short: "%d/%m, %H:%M h"
-      long: "%A, %d de %B de %Y, %H:%M h"
-    am: ''
-    pm: ''
-
-  # Usado no Array.to_sentence
-  support:
-    array:
-      words_connector: ", "
-      two_words_connector: " e "
-      last_word_connector: " e "
-
-    select:
-      prompt: "Por favor selecione"
-
-  number:
-    format:
-      separator: ','
-      delimiter: '.'
-      precision: 3
-      significant: false
-      strip_insignificant_zeros: false
-
-    currency:
-      format:
-        format: '%u %n'
-        unit: 'R$'
-        separator: ','
-        delimiter: '.'
-        precision: 2
-        significant: false
-        strip_insignificant_zeros: false
-
-    percentage:
-      format:
-        delimiter: '.'
-
-    precision:
-      format:
-        delimiter: '.'
-
-    human:
-      format:
-        delimiter: '.'
-        precision: 2
-        significant: true
-        strip_insignificant_zeros: true
-      storage_units:
-        format: "%n %u"
-        units:
-          byte:
-            one: "Byte"
-            other: "Bytes"
-          kb: "KB"
-          mb: "MB"
-          gb: "GB"
-          tb: "TB"
-      # number_to_human()
-      # new in rails 3: please add to other locales
-      decimal_units:
-        format: "%n %u"
-        units:
-          unit: ""
-          thousand: "mil"
-          million:
-            one: milhão
-            other: milhões
-          billion:
-            one: bilhão
-            other: bilhões
-          trillion:
-            one: trilhão
-            other: trilhões
-          quadrillion:
-            one: quatrilhão
-            other: quatrilhões
-
-  # distancia do tempo em palavras
-  datetime:
-    distance_in_words:
-      half_a_minute: 'meio minuto'
-      less_than_x_seconds:
-        one: 'menos de 1 segundo'
-        other: 'menos de %{count} segundos'
-      x_seconds:
-        one: '1 segundo'
-        other: '%{count} segundos'
-      less_than_x_minutes:
-        one: 'menos de um minuto'
-        other: 'menos de %{count} minutos'
-      x_minutes:
-        one: '1 minuto'
-        other: '%{count} minutos'
-      about_x_hours:
-        one: 'aproximadamente 1 hora'
-        other: 'aproximadamente %{count} horas'
-      x_days:
-        one: '1 dia'
-        other: '%{count} dias'
-      about_x_months:
-        one: 'aproximadamente 1 mês'
-        other: 'aproximadamente %{count} meses'
-      x_months:
-        one: '1 mês'
-        other: '%{count} meses'
-      about_x_years:
-        one: 'aproximadamente 1 ano'
-        other: 'aproximadamente %{count} anos'
-      over_x_years:
-        one: 'mais de 1 ano'
-        other: 'mais de %{count} anos'
-      almost_x_years:
-        one: 'quase 1 ano'
-        other: 'quase %{count} anos'
-    prompts:
-      year:   "Ano"
-      month:  "Mês"
-      day:    "Dia"
-      hour:   "Hora"
-      minute: "Minuto"
-      second: "Segundo"
-
-  helpers:
-    select:
-      prompt: "Por favor selecione"
-
-    submit:
-      create: 'Criar %{model}'
-      update: 'Atualizar %{model}'
-      submit: 'Salvar %{model}'
-
-  errors:
-    format: "%{attribute} %{message}"
-    messages: &errors_messages
-      inclusion: "não está incluído na lista"
-      exclusion: "não está disponível"
-      invalid: "não é válido"
-      confirmation: "não está de acordo com a confirmação"
-      accepted: "deve ser aceito"
-      empty: "não pode ficar vazio"
-      blank: "não pode ficar em branco"
-      too_long: "é muito longo (máximo: %{count} caracteres)"
-      too_short: "é muito curto (mínimo: %{count} caracteres)"
-      wrong_length: "não possui o tamanho esperado (%{count} caracteres)"
-      not_a_number: "não é um número"
-      not_an_integer: "não é um número inteiro"
-      greater_than: "deve ser maior que %{count}"
-      greater_than_or_equal_to: "deve ser maior ou igual a %{count}"
-      equal_to: "deve ser igual a %{count}"
-      less_than: "deve ser menor que %{count}"
-      less_than_or_equal_to: "deve ser menor ou igual a %{count}"
-      odd: "deve ser ímpar"
-      even: "deve ser par"
-      taken: "já está em uso"
-      record_invalid: "A validação falhou: %{errors}"
-    template: &errors_template
-      header:
-        one: "Não foi possível gravar %{model}: 1 erro"
-        other: "Não foi possível gravar %{model}: %{count} erros."
-      body: "Por favor, verifique o(s) seguinte(s) campo(s):"
-
-  activerecord:
-    errors:
-      messages:
-        <<: *errors_messages
-      template:
-        <<: *errors_template
-
-      full_messages:
-        format: "%{attribute} %{message}"
@@ -0,0 +1 @@
+pt-BR.yml
 \ No newline at end of file
@@ -10,7 +10,7 @@
 # (http://github.com/yaroslav/russian). Следующие данные -- выдержка их него, чтобы
 # была возможность минимальной локализации приложения на русский язык.
-ru:
+ru: &ru
   date:
     formats:
       default: "%d.%m.%Y"
@@ -300,3 +300,7 @@ ru:
       words_connector: ", "
       two_words_connector: " и "
       last_word_connector: " и "
+
+ru_RU:
+  <<: *ru
+
@@ -0,0 +1,8 @@
+class AddLabelToImage < ActiveRecord::Migration
+  def up
+    add_column :images, :label, :string, :default => ""
+  end
+  def down
+    remove_column :images, :label
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20150602142030) do
+ActiveRecord::Schema.define(:version => 20150603182105) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -377,6 +377,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150602142030) do
     t.integer "width"
     t.integer "height"
     t.boolean "thumbnails_processed", :default => false
+    t.string  "label",                :default => ""
   end
   add_index "images", ["parent_id"], :name => "index_images_on_parent_id"
@@ -160,6 +160,7 @@ Feature: events
     When I am on /search/events
     Then I should see "Colivre.net's Events"
+
   @selenium
   Scenario: published events should be listed in the agenda too
     Given the following community
@@ -7,8 +7,8 @@ msgstr &quot;&quot;
 "Project-Id-Version: 1.1-166-gaf47713\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2015-06-01 17:26-0300\n"
-"PO-Revision-Date: 2015-02-23 11:38+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2015-06-29 14:17+0200\n"
+"Last-Translator: Christophe DANIEL <papaeng@gmail.com>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/noosfero/plugin-"
 "custom-forms/fr/>\n"
 "Language: fr\n"
@@ -16,7 +16,7 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 #: plugins/custom_forms/lib/custom_forms_plugin/form.rb:67
 msgid "Invalid string format of access."
@@ -64,9 +64,8 @@ msgstr &quot;%{fn} est obligatoire&quot;
 #: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:14
 #: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:47
-#, fuzzy
 msgid "Logged users"
-msgstr "Connecté en tant que %s"
+msgstr "Utilisateurs connectés"
 #: plugins/custom_forms/lib/custom_forms_plugin/helper.rb:19
 #, fuzzy
@@ -213,7 +212,7 @@ msgstr &quot;Une entreprise&quot;
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/_edit_select.html.erb:29
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 #: plugins/custom_forms/views/custom_forms_plugin_myprofile/custom_forms_plugin/_alternative.html.erb:10
 #, fuzzy
@@ -7,7 +7,7 @@ class Product
     url: proc{ |p, plugin| plugin.og_url_for p.url },
     gr_hascurrencyvalue: proc{ |p, plugin| p.price.to_f },
     gr_hascurrency: proc{ |p, plugin| p.environment.currency_unit },
-    title: proc{ |a, plugin| "#{p.name} - #{p.profile.name}" },
+    title: proc{ |p, plugin| "#{p.name} - #{p.profile.name}" if p },
     description: proc{ |p, plugin| ActionView::Base.full_sanitizer.sanitize p.description },
     image: proc{ |p, plugin| "#{p.environment.top_url}#{p.image.public_filename}" if p.image },
@@ -17,7 +17,7 @@ class Product
     see_also: [],
     site_name: proc{ |p, plugin| plugin.og_url_for p.profile.url },
-    updated_time: proc{ |p, plugin| p.updated_at.iso8601 },
+    updated_time: proc{ |p, plugin| p.updated_at.iso8601 if p.updated_at },
     'locale:locale' => proc{ |p, plugin| p.environment.default_language },
     'locale:alternate' => proc{ |p, plugin| p.environment.languages - [p.environment.default_language] if p.environment.languages },
@@ -12,7 +12,7 @@ class HomeControllerTest &lt; ActionController::TestCase
     @response   = ActionController::TestResponse.new
     Noosfero::Plugin.stubs(:all).returns([MetadataPlugin.name])
-    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([MetadataPlugin.new])
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([MetadataPlugin.new(@controller)])
   end
   should 'display meta tags for social media' do
@@ -0,0 +1,27 @@
+require 'test_helper'
+require 'home_controller'
+
+# Re-raise errors caught by the controller.
+class ManageProductsController; def rescue_action(e) raise e end; end
+
+class ManageProductsControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = ManageProductsController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @enterprise = fast_create(Enterprise, name: 'test', identifier: 'test_ent')
+    @user = create_user_with_permission('test_user', 'manage_products', @enterprise)
+    @environment = @enterprise.environment
+    @environment.enable('products_for_enterprises')
+    login_as :test_user
+
+    Noosfero::Plugin.stubs(:all).returns([MetadataPlugin.name])
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([MetadataPlugin.new(@controller)])
+  end
+
+  should "not crash on new products" do
+    get :new, profile: @enterprise.identifier
+  end
+
+end
@@ -48,8 +48,11 @@ class RemoteUserPlugin &lt; Noosfero::Plugin
             end
           end
         end
-      rescue ActiveRecord::RecordInvalid => invalid
-        session[:notice] = _('Could not create the remote_user.')
+      rescue ::ActiveRecord::RecordInvalid
+        session[:notice] = _('Could not create the remote user.')
+        render_404
+      rescue
+        session[:notice] = _("Could not log in.")
         render_404
       end
     end
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + &#39;/../../../../test/test_helper&#39;
 # Re-raise errors caught by the controller.
 class AccountController; def rescue_action(e) raise e end; end
-class AccountControllerTest < ActionController::TestCase 
+class AccountControllerTest < ActionController::TestCase
   def setup
     @environment = Environment.default
     @environment.enabled_plugins = ['RemoteUserPlugin']
@@ -125,10 +125,18 @@ class AccountControllerTest &lt; ActionController::TestCase
     get :index
     assert session[:user].blank?
-    
+
     @request.env["HTTP_REMOTE_USER"] = ""
     get :index
     assert session[:user].blank?
   end
+
+  should 'not create a new user if his informations is invalid' do
+    @request.env["HTTP_REMOTE_USER"] = "*%&invalid user name&%*"
+    get :index
+
+    assert session[:user].blank?
+    assert_response 404
+  end
 end
 class ShoppingCartPlugin < Noosfero::Plugin
+  include ModalHelper
+  include ActionView::Helpers::UrlHelper
   class << self
     def plugin_name
@@ -63,4 +65,8 @@ class ShoppingCartPlugin &lt; Noosfero::Plugin
     buttons
   end
+
+  def controller
+    context
+  end
 end
@@ -42,7 +42,7 @@ module ShoppingCartPlugin::CartHelper
       else
         delivery = Product.new(:name => delivery_option || _('Delivery'), :price => settings.delivery_options[delivery_option])
       end
-      delivery.save(false)
+      delivery.save(validate: false)
       items << [delivery.id, '']
     end
@@ -41,5 +41,19 @@ class ShoppingCartPlugin::CartHelperTest &lt; ActiveSupport::TestCase
     assert_equal "#{environment.currency_unit}13#{environment.currency_separator}70", float_to_currency_cart(value,environment)
   end
-end
+  should 'return a table of items' do
+    enterprise = Enterprise.new(name: "Test Enterprise", identifier: "test-enterprise")
+    enterprise.environment = Environment.default
+    enterprise.save!
+
+    product_category = fast_create(ProductCategory, :name => 'Products')
+    product = fast_create(Product, :name => 'test product1', :product_category_id => product_category.id, :profile_id => enterprise.id)
+    setting = Noosfero::Plugin::Settings.new(enterprise, ShoppingCartPlugin)
+    setting.delivery = true
+    setting.save!
+
+    assert_match 'table id="cart-items-table"', items_table([product], enterprise)
+    assert_match '<td>test product1</td>', items_table([product], enterprise)
+  end
+end
@@ -5,7 +5,7 @@
       <a href="cart:clean" onclick="Cart.clean(this); return false" class="cart-clean"><%=_('Clean basket')%></a>
       <ul class="cart-items"></ul>
       <div class="cart-total"><%=_('Total:')%> <b></b></div>
-      <a href="/plugin/shopping_cart/buy" class="cart-buy modal"><%=_('Shopping checkout')%></a>
+      <%= modal_link_to _('Shopping checkout'), { controller: 'shopping_cart_plugin', action: 'buy' }, { class: "cart-buy modal" } %>
     </div>
     <a href="#" onclick="Cart.toggle(this); return false" class="cart-toggle">
       <span class="str-show"><%=_('Show basket')%></span>
@@ -24,7 +24,6 @@
   <% end %>
   <% delivery_option = @settings.delivery_options.first && @settings.delivery_options.first.first %>
   <%= items_table(@cart[:items], @profile, delivery_option) %>
-  <%= link_to_function '', "noosfero.modal.close();", :class => 'cart-box-close icon-cancel' %>
 </div>
 <%= javascript_include_tag '../plugins/shopping_cart/buy' %>
@@ -17,7 +17,6 @@
     </div>
   <% end %>
   <%= items_table(session[:cart][:items], profile) %>
-  <%= link_to_function '', "noosfero.modal.close();", :class => 'cart-box-close icon-cancel' %>
 </div>
 <script type="text/javascript">
@@ -19,12 +19,14 @@ class SocialSharePrivacyPlugin &lt; Noosfero::Plugin
   def article_extra_contents(article)
     proc do
       settings = Noosfero::Plugin::Settings.new(environment, SocialSharePrivacyPlugin)
+      modules = settings.get_setting(:networks).map { |service| "/plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }
       locale = FastGettext.locale
-      javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') + 
-      javascript_include_tag('plugins/social_share_privacy/socialshareprivacy/javascripts/localstorage.js') +
-      javascript_include_tag(settings.get_setting(:networks).map { |service| "plugins/social_share_privacy/socialshareprivacy/javascripts/modules/#{service}.js" }) + 
-      (locale != 'en' ? javascript_include_tag("plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') +
-      javascript_tag("jQuery.fn.socialSharePrivacy.settings.path_prefix = '../../plugins/social_share_privacy/socialshareprivacy/'; jQuery.fn.socialSharePrivacy.settings.order = #{settings.get_setting(:networks)}; jQuery(document).ready(function () { jQuery('.social-buttons').socialSharePrivacy({info_link_target: '_blank'});});") +
+      javascript_include_tag('/plugins/social_share_privacy/socialshareprivacy/javascripts/socialshareprivacy.js') +
+      javascript_include_tag('/plugins/social_share_privacy/socialshareprivacy/javascripts/localstorage.js') +
+      (modules.present? ? javascript_include_tag(*modules) : '') +
+      javascript_include_tag("/plugins/social_share_privacy/socialshareprivacy/javascripts/modules/facebook.js") +
+      (locale != 'en' ? javascript_include_tag("/plugins/social_share_privacy/socialshareprivacy/javascripts/locale/jquery.socialshareprivacy.min.#{locale}.js") : '') +
+      javascript_tag("jQuery.fn.socialSharePrivacy.settings.path_prefix = '/plugins/social_share_privacy/socialshareprivacy/'; jQuery.fn.socialSharePrivacy.settings.order = #{settings.get_setting(:networks)}; jQuery(document).ready(function () { jQuery('.social-buttons').socialSharePrivacy({info_link_target: '_blank'});});") +
       content_tag(:div, '', :class => "social-buttons")
     end
   end
@@ -23,7 +23,7 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     get :view_page, :profile => @profile.identifier, :page => ['test']
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/socialshareprivacy\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/socialshareprivacy\.js\??\d*/}
     assert_tag :tag => 'div', :attributes => {:class => "social-buttons"}
   end
@@ -34,8 +34,8 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     get :view_page, :profile => @profile.identifier, :page => ['test']
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/twitter\.js\??\d*/}
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/gplus\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/twitter\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/modules\/gplus\.js\??\d*/}
   end
   should 'add javascript with string translations if not english' do
@@ -45,12 +45,12 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     get :view_page, :profile => @profile.identifier, :page => ['test']
-    assert_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.pt\.js\??\d*/}
+    assert_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.pt\.js\??\d*/}
     FastGettext.stubs(:locale).returns('en')
     get :view_page, :profile => @profile.identifier, :page => ['test']
-    assert_no_tag :tag => 'script', :attributes => {:src => /\/javascripts\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.en\.js\??\d*/}
+    assert_no_tag :tag => 'script', :attributes => {:src => /\/plugins\/social_share_privacy\/socialshareprivacy\/javascripts\/locale\/jquery\.socialshareprivacy\.min\.en\.js\??\d*/}
   end
 end
@@ -7,8 +7,8 @@ msgid &quot;&quot;
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "POT-Creation-Date: 2013-12-10 15:48-0300\n"
-"PO-Revision-Date: 2015-03-23 19:30+0200\n"
-"Last-Translator: Jérôme Jutteau <j.jutteau@gmail.com>\n"
+"PO-Revision-Date: 2015-06-29 14:38+0200\n"
+"Last-Translator: Christophe DANIEL <papaeng@gmail.com>\n"
 "Language-Team: French "
 "<https://hosted.weblate.org/projects/noosfero/documentation/fr/>\n"
 "Language: fr\n"
@@ -16,7 +16,7 @@ msgstr &quot;&quot;
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.3-dev\n"
+"X-Generator: Weblate 2.4-dev\n"
 # type: Content of: <h1>
 #. type: Content of: <h1>
@@ -470,7 +470,7 @@ msgstr &quot;&quot;
 #. type: Attribute 'alt' of: <p><img>
 #: doc/noosfero/plugins/shopping_cart.en.xhtml:21
 msgid "Catalog"
-msgstr ""
+msgstr "Catalogue"
 # type: Content of: <p>
 #. type: Content of: <p>
@@ -1061,15 +1061,18 @@ hr.pre-posts, hr.sep-posts {
   text-decoration: none;
 }
-#content .main-block .created-at {
+#content .main-block .publishing-info {
   text-align: left;
   color: #AAA;
+  font-size: 11px;
+  /*padding-top: 20px;*/
+  margin-bottom:15px;
 }
-#content .main-block .created-at a {
+#content .main-block .publishing-info a {
   color: #AAA;
   text-decoration: none;
 }
-#content .main-block .created-at a:hover {
+#content .main-block .publishing-info a:hover {
   color: #555;
   text-decoration: underline;
 }
@@ -1415,3 +1418,115 @@ table#recaptcha_table tr:hover td {
   color:#333;
 }
+/************************* Article Page *****************************/
+
+#article-header .preview {
+  font-size: 15px;
+}
+
+.article-body-img {
+  float: left;
+  margin-right: 20px;
+  margin-top: 5px;
+}
+
+#content #article .article-body .article-body-img img {
+  height: auto;
+  width: auto;
+  min-height: 120px;
+  max-height: 180px;
+  max-width: 250px;
+  background-position: center center;
+  background-repeat: no-repeat;
+}
+
+#content #article .article-body .article-body-img p {
+  margin-bottom: 10px;
+  font-size: 10px;
+  min-height: 20px;
+}
+/* Noosfero Events */
+
+.event-card {
+  float: left;
+  padding-top: 25px;
+  width: 494px;
+  height: 116px;
+  background-repeat: no-repeat;
+  margin-bottom: 30px;
+}
+
+.event-image {
+  position: relative;
+  float: left;
+  padding-right: 22px;
+  max-width: 130px;
+  height: 130px;
+}
+
+#content #article .article-body img{
+  max-height: 100%;
+}
+
+.about-event {
+  position: relative;
+  float: left;
+  height: 160px;
+  width: 300px;
+  max-width: 300px;
+}
+
+.about-event > span {
+  display: block;
+  max-width: inherit;
+  margin-left: 20px;
+  padding-left: 21px;
+  line-height: 13px;
+  margin-right: 11px;
+}
+
+.about-event .event-date {
+  margin-top: 3px;
+}
+
+.about-event .event-address {
+  margin-top: 19px;
+}
+
+.about-event .event-address span {
+  display: block;
+  margin-left: 0px;
+  margin-top: 4.4px;
+  line-height: 14px;
+}
+
+.event-date {
+  background: url('/images/calendar_date_select/calendar-icon.png') no-repeat left center;
+  padding: 5px;
+}
+
+.event-link {
+  background: url('/images/globe-icon.png') no-repeat left center;
+  margin-top: 18px;
+}
+
+.event-link a {
+}
+
+.event-address {
+  background: url('/images/icone_pin.png') no-repeat left top;
+}
+
+.event-body {
+  float: left;
+}
+
+.event-body .event-lead {
+  font-size: 15px;
+}
+
+.event-body .event-content p {
+  margin-top: 20px;
+  width: 494px;
+  padding-left: 2px;
+}
@@ -14,6 +14,7 @@
 *= require jquery.ba-bbq.min.js
 *= require jquery.tokeninput.js
 *= require jquery-timepicker-addon/dist/jquery-ui-timepicker-addon.js
+*= require select-or-die/_src/selectordie
 *= require inputosaurus.js
 *= require reflection.js
 *= require rails.js
@@ -845,7 +846,7 @@ Array.min = function(array) {
 function hideAndGetUrl(link) {
   document.body.style.cursor = 'wait';
-  link.hide();
+  jQuery(link).hide();
   url = jQuery(link).attr('href');
   jQuery.get(url, function( data ) {
     document.body.style.cursor = 'default';
@@ -345,7 +345,7 @@ $.TokenList = function (input, url_or_data, options) {
     dropdown.appendTo("body");
     if (!settings.permanentDropdown)
         dropdown.appendTo("body");
-    else 
+    else
         $(input).after(dropdown.show());
     if (settings.permanentDropdown || settings.showAllResults) {
@@ -382,7 +382,7 @@ $.TokenList = function (input, url_or_data, options) {
     if(li_data && li_data.length) {
         $.each(li_data, function (index, value) {
             insert_token(value);
-            checkTokenLimit();
+            checkTokenLimit({init: true});
         });
     }
@@ -425,12 +425,12 @@ $.TokenList = function (input, url_or_data, options) {
     // Private functions
     //
-    function checkTokenLimit() {
+    function checkTokenLimit(options) {
         if(settings.tokenLimit !== null && token_count >= settings.tokenLimit) {
             input_box.hide();
             hide_dropdown();
             return;
-        } else {
+        } else if (options && !options.init) {
             input_box.focus();
         }
     }
@@ -618,7 +618,7 @@ $.TokenList = function (input, url_or_data, options) {
             if (!settings.showAllResults)
               dropdown.empty();
             selected_dropdown_item = null;
-        } 
+        }
         if (settings.showAllResults)
             show_dropdown_hint();
     }
@@ -728,7 +728,7 @@ $.TokenList = function (input, url_or_data, options) {
             item.addClass(settings.classes.selectedDropdownItem);
             selected_dropdown_item = item.get(0);
-            isBefore = item[0].offsetTop <= (dropdown[0].scrollTop + dropdown[0].scrollWidth); 
+            isBefore = item[0].offsetTop <= (dropdown[0].scrollTop + dropdown[0].scrollWidth);
             isAfter = item[0].offsetTop >= dropdown[0].scrollTop;
             visible = isBefore && isAfter;
             if (!visible) {
@@ -1054,6 +1054,11 @@ code input {
   margin-top: 10px;
   display: none;
 }
+
+#change-image {
+  display: table-caption;
+}
+
 .zoomable-image {
   position: relative;
   display: inline-block;
@@ -1520,13 +1525,13 @@ a.comment-picture {
   text-align: right;
   color: gray;
 }
-#content .created-at {
+#content .publishing-info {
   color: gray;
   font-size: 12px;
   display: block;
   text-align: right;
 }
-#content .blog-post .created-at {
+#content .blog-post .publishing-info {
   text-align: left;
 }
 #content #article .pagination .prev_page {
@@ -1598,7 +1603,7 @@ div.article-body p img {
 .blog-post.not-published a {
   text-decoration: none;
 }
-#content .blog-post.not-published .created-at {
+#content .blog-post.not-published .publishing-info {
   text-align: left;
 }
 .blog-post.not-published .metadata {
@@ -1,56 +0,0 @@
-#!/usr/bin/env ruby
-
-# These just forward the signals to the whole process group and
-# then immediately exit.
-pgid = Process.getpgid Process.pid
-Signal.trap(:TERM) { Process.kill(:TERM, -pgid); exit }
-Signal.trap(:INT)  { Process.kill(:INT,  -pgid); exit }
-
-def run command, options = {}
-  command = "#{command} 2>&1 > /dev/null" if options[:output] == false
-  #command = "time #{command}" unless options[:runtime] == false
-  puts "== #{command}"
-  system command
-end
-
-@id = (0...10).map{ ('a'..'z').to_a[rand(26)] }.join
-@db = "gitlab-ci-#{@id}"
-
-def config
-  require 'yaml'
-  db_config = {
-    'adapter' => 'postgresql', 'encoding' => 'unicode', 
-    'database' => @db, 'username' => ENV['USER'],
-  }
-  File.write 'config/database.yml', YAML.dump('test' => db_config, 'development' => db_config)
-end
-
-def prepare
-  run("createdb #{@db}") and
-  run('mkdir -p tmp/pids log') and
-  run('bundle check || bundle install') and
-  run('rake db:schema:load', output: false) and
-  run('script/noosfero-plugins disableall') and
-  run('rake db:migrate')
-end
-
-def test
-  %w[
-    test:units
-    test:functionals
-    test:integration
-    cucumber 
-    test:noosfero_plugins
-  ].each do |task|
-    run "rake #{task}"
-  end
-end
-
-def cleanup
-  run "dropdb #{@db}"
-end
-
-ret = config and prepare and test
-cleanup
-
-exit (if ret == true then 0 else 1 end)
@@ -80,4 +80,5 @@ packages=$(grep-dctrl -n -s Build-Depends,Depends,Recommends -S -X noosfero debi
 run sudo apt-get -y install $packages
 sudo apt-get -y install iceweasel || sudo apt-get -y install firefox
+run rm -f Gemfile.lock
 run bundle --local
@@ -223,6 +223,20 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal profile, a.last_changed_by
   end
+  should 'be able to set label to article image' do
+    login_as(profile.identifier)
+    post :new, :type => TextileArticle.name, :profile => profile.identifier,
+         :article => {
+           :name => 'adding-image-label',
+           :image_builder => {
+             :uploaded_data => fixture_file_upload('/files/tux.png', 'image/png'),
+             :label => 'test-label'
+           }
+         }
+     a = Article.last
+     assert_equal a.image.label, 'test-label'
+  end
+
   should 'edit by using the correct template to display the editor depending on the mime-type' do
     a = profile.articles.build(:name => 'test document')
     a.save!
@@ -318,6 +332,20 @@ class CmsControllerTest &lt; ActionController::TestCase
     end
   end
+  should 'be able to edit an image label' do
+    image = fast_create(Image, :content_type => 'image/png', :filename => 'event-image.png', :label => 'test_label', :size => 1014)
+    article = fast_create(Article, :profile_id => profile.id, :name => 'test_label_article', :body => 'test_content')
+    article.image = image
+    article.save
+    assert_not_nil article
+    assert_not_nil article.image
+    assert_equal 'test_label', article.image.label
+
+    post :edit, :profile => profile.identifier, :id => article.id, :article => {:image_builder => { :label => 'test_label_modified'}}
+    article.reload
+    assert_equal 'test_label_modified', article.image.label
+  end
+
    should 'be able to upload more than one file at once' do
     assert_difference 'UploadedFile.count', 2 do
       post :upload_files, :profile => profile.identifier, :uploaded_files => [fixture_file_upload('/files/test.txt', 'text/plain'), fixture_file_upload('/files/rails.png', 'text/plain')]
@@ -1863,8 +1891,8 @@ class CmsControllerTest &lt; ActionController::TestCase
   end
   should 'return tags found' do
-    tag = mock; tag.stubs(:name).returns('linux')
-    ActsAsTaggableOn::Tag.stubs(:find).returns([tag])
+    a = profile.articles.create(:name => 'blablabla')
+    a.tags.create! name: 'linux'
     get :search_tags, :profile => profile.identifier, :term => 'linux'
     assert_equal '[{"label":"linux","value":"linux"}]', @response.body
   end
@@ -124,6 +124,19 @@ class ContentViewerControllerTest &lt; ActionController::TestCase
     assert_tag :tag => 'div', :attributes => { :id => 'article-tags' }, :descendant => { :content => /This article's tags:/ }
   end
+  should "display image label on article image" do
+    page = TinyMceArticle.create!(
+             :profile => profile,
+             :name => 'myarticle',
+             :image_builder => {
+               :uploaded_data => fixture_file_upload('/files/tux.png', 'image/png'),
+               :label => 'test-label'
+             }
+           )
+    get :view_page, page.url
+    assert_match /test-label/, @response.body
+  end
+
   should "not display current article's tags" do
     page = profile.articles.create!(:name => 'myarticle', :body => 'test article')
@@ -109,17 +109,20 @@ class EventTest &lt; ActiveSupport::TestCase
   end
   should 'provide nice display format' do
-    e = build(Event, :start_date => Date.new(2008,1,1), :end_date => Date.new(2008,1,1), :link => 'http://www.myevent.org', :body => 'my somewhat short description')
+    event = build(Event, :start_date => Date.new(2008,1,1), :end_date => Date.new(2008,1,1), :link => 'http://www.myevent.org', :body => '<p>my somewhat short description</p>')
+    display = instance_eval(&event.to_html)
-    assert_tag_in_string e.to_html, :content => Regexp.new("January 1, 2008")
-    assert_tag_in_string e.to_html, :content => 'my somewhat short description'
-    assert_tag_in_string e.to_html, :tag => 'a', :attributes => { :href  => 'http://www.myevent.org' }, :content => 'http://www.myevent.org'
+    assert_tag_in_string display, :content => Regexp.new("January 1, 2008")
+    assert_tag_in_string display, :content => Regexp.new('my somewhat short description')
+    assert_tag_in_string display, :content => Regexp.new('http://www.myevent.org')
   end
   should 'not crash when body is blank' do
     e = Event.new
     assert_nil e.body
-    assert_no_match(/_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____/, e.to_html)
+    assert_nothing_raised  do
+      instance_eval(&e.to_html)
+    end
   end
   should 'add http:// to the link if not already present' do
@@ -141,10 +144,19 @@ class EventTest &lt; ActiveSupport::TestCase
     assert_equal '', a.link
   end
+  should 'get the first paragraph' do
+    profile = create_user('testuser').person
+    event = create(Event, :profile => profile, :name => 'test',
+    :body => '<p>first paragraph </p><p>second paragraph </p>',
+    :link => 'www.colivre.coop.br', :start_date => Date.today)
+
+    assert_match '<p>first paragraph </p>', event.first_paragraph
+  end
+
   should 'not escape HTML in body' do
     a = build(Event, :body => '<p>a paragraph of text</p>', :link => 'www.gnu.org')
-    assert_match '<p>a paragraph of text</p>', a.to_html
+    assert_match '<p>a paragraph of text</p>', instance_eval(&a.to_html)
   end
   should 'filter HTML in body' do
@@ -324,7 +336,7 @@ class EventTest &lt; ActiveSupport::TestCase
     environment = fast_create(Environment)
     environment.languages = nil
     profile = fast_create(Person, :environment_id => environment.id)
- 
+
     event = Event.new(:profile => profile)
     assert !event.translatable?
@@ -337,11 +349,11 @@ class EventTest &lt; ActiveSupport::TestCase
     event = fast_create(Event, :profile_id => profile.id)
     assert !event.translatable?
- 
+
     environment.languages = ['en','pt','fr']
     environment.save
-    event.reload 
+    event.reload
     assert event.translatable?
   end
@@ -192,6 +192,32 @@ class TaskTest &lt; ActiveSupport::TestCase
     task.save!
   end
+  should 'not send notification to target if notification is disabled in profile' do
+    task = Task.new
+    target = fast_create(Profile)
+    target.stubs(:notification_emails).returns(['adm@example.com'])
+    target.stubs(:administrator_mail_notification).returns(false)
+    task.target = target
+    task.stubs(:target_notification_message).returns('some non nil message to be sent to target')
+    TaskMailer.expects(:target_notification).never
+    task.save!
+  end
+
+  should 'send notification to target if notification is enabled in profile' do
+    task = Task.new
+    target = fast_create(Profile)
+    target.stubs(:notification_emails).returns(['adm@example.com'])
+    target.stubs(:administrator_mail_notification).returns(true)
+    task.target = target
+    task.stubs(:target_notification_message).returns('some non nil message to be sent to target')
+
+    
+    mailer = mock
+    mailer.expects(:deliver).once
+    TaskMailer.expects(:target_notification).returns(mailer).once
+    task.save!
+  end
+
   should 'be able to list pending tasks' do
     Task.delete_all
     t1 = Task.create!
@@ -0,0 +1,24 @@		@@ -0,0 +1,24 @@
	1	+before_script:
	2	+ - mkdir -p tmp/pids log
	3	+ - bundle check \|\| bundle install
	4	+ - script/noosfero-plugins disableall
	5	+ - rm -f tmp/makemo.stamp && rake makemo &>/dev/null
	6	+# database
	7	+ - cp config/database.yml.gitlab-ci config/database.yml
	8	+ - createdb gitlab_ci_test \|\| true
	9	+ - bundle exec rake db:schema:load &>/dev/null
	10	+ - bundle exec rake db:migrate &>/dev/null
	11	+
	12	+units:
	13	+ script: bundle exec rake test:units
	14	+functionals:
	15	+ script: bundle exec rake test:functionals
	16	+integration:
	17	+ script: bundle exec rake test:integration
	18	+cucumber:
	19	+ script: bundle exec rake cucumber
	20	+selenium:
	21	+ script: bundle exec rake selenium
	22	+plugins:
	23	+ script: bundle exec rake test:noosfero_plugins
	24	+
@@ -0,0 +1,36 @@		@@ -0,0 +1,36 @@
	1	+language: ruby
	2	+rvm:
	3	+# for 2.2 support we need to upgrade the pg gem
	4	+ - 2.1.6
	5	+
	6	+before_install:
	7	+# dependencies
	8	+ - sudo apt-get update
	9	+ - sudo apt-get -y install po4a iso-codes tango-icon-theme pidgin-data default-jre
	10	+ - sudo apt-get -y install libmagickwand-dev libpq-dev libreadline-dev libsqlite3-dev libxslt1-dev
	11	+# selenium support
	12	+ - export DISPLAY=:99.0
	13	+ - sh -e /etc/init.d/xvfb start
	14	+
	15	+before_script:
	16	+ - mkdir -p tmp/pids log
	17	+ - bundle check \|\| bundle install
	18	+ - script/noosfero-plugins disableall
	19	+ - rake makemo
	20	+# database
	21	+ - cp config/database.yml.travis config/database.yml
	22	+ - psql -c 'create database myapp_test;' -U postgres
	23	+ - bundle exec rake db:schema:load
	24	+ - bundle exec rake db:migrate
	25	+
	26	+env:
	27	+ - TASK=test:units
	28	+ - TASK=test:functionals
	29	+ - TASK=test:integration
	30	+ - TASK=cucumber
	31	+ - TASK=selenium
	32	+ - TASK=test:noosfero_plugins
	33	+
	34	+script:
	35	+ - bundle exec rake $TASK
	36	+
	@@ -1185,7 +1185,7 @@ module ApplicationHelper		@@ -1185,7 +1185,7 @@ module ApplicationHelper
1185	pending_tasks_count = link_to("<i class=\"icon-menu-tasks\"></i><span class=\"task-count\">#{count}</span>", user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))	1185	pending_tasks_count = link_to("<i class=\"icon-menu-tasks\"></i><span class=\"task-count\">#{count}</span>", user.tasks_url, :id => 'pending-tasks-count', :title => _("Manage your pending tasks"))
1186	end	1186	end
1187		1187
1188	- (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.public_profile_url, :id => "homepage-link", :title => _('Go to your homepage'))) +	1188	+ (_("<span class='welcome'>Welcome,</span> %s") % link_to("<i style='background-image:url(#{user.profile_custom_icon(gravatar_default)})'></i><strong>#{user.identifier}</strong>", user.url, :id => "homepage-link", :title => _('Go to your homepage'))) +
1189	render_environment_features(:usermenu) +	1189	render_environment_features(:usermenu) +
1190	admin_link +	1190	admin_link +
1191	manage_enterprises +	1191	manage_enterprises +
	@@ -1234,7 +1234,7 @@ module ApplicationHelper		@@ -1234,7 +1234,7 @@ module ApplicationHelper
1234		1234
1235	def task_information(task)	1235	def task_information(task)
1236	values = {}	1236	values = {}
1237	- values.merge!({:requestor => link_to(task.requestor.name, task.requestor.public_profile_url)}) if task.requestor	1237	+ values.merge!({:requestor => link_to(task.requestor.name, task.requestor.url)}) if task.requestor
1238	values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject	1238	values.merge!({:subject => content_tag('span', task.subject, :class=>'task_target')}) if task.subject
1239	values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject	1239	values.merge!({:linked_subject => link_to(content_tag('span', task.linked_subject[:text], :class => 'task_target'), task.linked_subject[:url])}) if task.linked_subject
1240	values.merge!(task.information[:variables]) if task.information[:variables]	1240	values.merge!(task.information[:variables]) if task.information[:variables]
	@@ -16,7 +16,7 @@ module CommentHelper		@@ -16,7 +16,7 @@ module CommentHelper
16	content_tag('span', show_date(article.published_at), :class => 'date') +	16	content_tag('span', show_date(article.published_at), :class => 'date') +
17	content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +	17	content_tag('span', [_(", by %s") % link_to(article.author_name, article.author_url)], :class => 'author') +
18	content_tag('span', comments, :class => 'comments'),	18	content_tag('span', comments, :class => 'comments'),
19	- :class => 'created-at'	19	+ :class => 'publishing-info'
20	)	20	)
21	end	21	end
22	title	22	title
	@@ -30,7 +30,7 @@ module ContentViewerHelper		@@ -30,7 +30,7 @@ module ContentViewerHelper
30	date_format +	30	date_format +
31	content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +	31	content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
32	content_tag('span', comments, :class => 'comments'),	32	content_tag('span', comments, :class => 'comments'),
33	- :class => 'created-at'	33	+ :class => 'publishing-info'
34	)	34	)
35	end	35	end
36	title	36	title
	@@ -99,47 +99,19 @@ class Event < Article		@@ -99,47 +99,19 @@ class Event < Article
99	start_date..(end_date\|\|start_date)	99	start_date..(end_date\|\|start_date)
100	end	100	end
101		101
102	- # FIXME this shouldn't be needed
103	- include ActionView::Helpers::TagHelper
104	- include ActionView::Helpers::UrlHelper
105	- include DatesHelper	102	+ def first_paragraph
		103	+ paragraphs = Nokogiri::HTML.fragment(self.body).css('p')
		104	+ paragraphs.empty? ? '' : paragraphs.first.to_html
		105	+ end
106		106
107	def to_html(options = {})	107	def to_html(options = {})
		108	+ event = self
		109	+ format = options[:format]
108		110
109	- result = ''
110	- html = ::Builder::XmlMarkup.new(:target => result)
111	-
112	- html.div(:class => 'event-info' ) {
113	- html.ul(:class => 'event-data' ) {
114	- html.li(:class => 'event-dates' ) {
115	- html.span _('When:')
116	- html.text! show_period(start_date, end_date)
117	- } if start_date.present? \|\| end_date.present?
118	- html.li {
119	- html.span _('URL:')
120	- html.a(self.link \|\| "", 'href' => self.link \|\| "")
121	- } if self.link.present?
122	- html.li {
123	- html.span _('Address:')
124	- html.text! self.address \|\| ""
125	- } if self.address.present?
126	- }
127	-
128	- # TODO: some good soul, please clean this ugly hack:
129	- if self.body
130	- html.div('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', :class => 'event-description')
131	- end
132	- }
133	-
134	- if self.body
135	- #if options[:format] == 'short'
136	- # result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', display_short_format(self))
137	- #else
138	- result.sub!('_____XXXX_DESCRIPTION_GOES_HERE_XXXX_____', self.body)
139	- #end	111	+ proc do
		112	+ render :file => 'content_viewer/event_page', :locals => { :event => event,
		113	+ :format => format }
140	end	114	end
141	-
142	- result
143	end	115	end
144		116
145	def duration	117	def duration
	@@ -23,7 +23,7 @@ class Image < ActiveRecord::Base		@@ -23,7 +23,7 @@ class Image < ActiveRecord::Base
23		23
24	postgresql_attachment_fu	24	postgresql_attachment_fu
25		25
26	- attr_accessible :uploaded_data	26	+ attr_accessible :uploaded_data, :label
27		27
28	def current_data	28	def current_data
29	File.file?(full_filename) ? File.read(full_filename) : nil	29	File.file?(full_filename) ? File.read(full_filename) : nil
	@@ -154,6 +154,12 @@ class Organization < Profile		@@ -154,6 +154,12 @@ class Organization < Profile
154	]	154	]
155	end	155	end
156		156
		157	+ def short_name chars = 40
		158	+ s = self.display_name
		159	+ s = super(chars) if s.blank?
		160	+ s
		161	+ end
		162	+
157	def notification_emails	163	def notification_emails
158	emails = [contact_email].select(&:present?) + admins.map(&:email)	164	emails = [contact_email].select(&:present?) + admins.map(&:email)
159	if emails.empty?	165	if emails.empty?
	@@ -70,7 +70,9 @@ class Task < ActiveRecord::Base		@@ -70,7 +70,9 @@ class Task < ActiveRecord::Base
70	begin	70	begin
71	target_msg = task.target_notification_message	71	target_msg = task.target_notification_message
72	if target_msg && task.target && !task.target.notification_emails.empty?	72	if target_msg && task.target && !task.target.notification_emails.empty?
73	- TaskMailer.target_notification(task, target_msg).deliver	73	+ if target_profile_accepts_notification?(task)
		74	+ TaskMailer.target_notification(task, target_msg).deliver
		75	+ end
74	end	76	end
75	rescue Exception => ex	77	rescue Exception => ex
76	Rails.logger.info ex.to_s	78	Rails.logger.info ex.to_s
	@@ -78,6 +80,18 @@ class Task < ActiveRecord::Base		@@ -78,6 +80,18 @@ class Task < ActiveRecord::Base
78	end	80	end
79	end	81	end
80		82
		83	+ def target_profile_accepts_notification?(task)
		84	+ if target_is_profile?(task)
		85	+ return task.target.administrator_mail_notification
		86	+ else
		87	+ true
		88	+ end
		89	+ end
		90	+
		91	+ def target_is_profile?(task)
		92	+ task.target.kind_of? Profile
		93	+ end
		94	+
81	# this method finished the task. It calls #perform, which must be overriden	95	# this method finished the task. It calls #perform, which must be overriden
82	# by subclasses. At the end a message (as returned by #finish_message) is	96	# by subclasses. At the end a message (as returned by #finish_message) is
83	# sent to the requestor with #notify_requestor.	97	# sent to the requestor with #notify_requestor.
@@ -0,0 +1,20 @@		@@ -0,0 +1,20 @@
	1	+<% if @page.belongs_to_blog? \|\| @page.belongs_to_forum?%>
	2	+ <h1 class="title">
	3	+ <% if no_link %>
	4	+ <%= h(@page.title) %>
	5	+ <% else %>
	6	+ <%= link_to(@page.name, @page.url) %>
	7	+ <% end %>
	8	+ </h1>
	9	+ <%= render :partial => "publishing_info" %>
	10	+ <% unless @page.abstract.blank? %>
	11	+ <div class="preview">
	12	+ <%= @page.lead %>
	13	+ </div>
	14	+ <% end %>
	15	+<% else %>
	16	+ <h1 class="title">
	17	+ <%= h(@page.title) %>
	18	+ </h1>
	19	+ <%= render :partial => "publishing_info" %>
	20	+<% end %>