Merge branch 'stoa' of gitlab.com:colivre/noosfero into feedback

Larissa Reis
2 parents d070f74a 43548e50
Showing 17 changed files with 169 additions and 41 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/models/profile_suggestion.rb
app/views/admin_panel/_signup_welcome_screen.html.erb
app/views/cms/_media_new_folder.html.erb
app/views/cms/_text_editor_sidebar.html.erb
app/views/cms/media_upload.js.erb
app/views/enterprise_registration/creation.html.erb
app/views/home/welcome.html.erb
app/views/memberships/welcome.html.erb
app/views/profile_editor/welcome_page.html.erb
app/views/shared/_lead_and_body.html.erb
config/schedule.rb
lib/profile_suggestions_job.rb
public/designs/icons/tango/style.css
public/javascripts/article.js
public/javascripts/media-panel.js
public/stylesheets/application.css
@@ -114,7 +114,7 @@ class CmsController &lt; MyProfileController
     @success_back_to = params[:success_back_to]
     # user must choose an article type first
-    @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id]
+    @parent = profile.articles.find(params[:parent_id]) if params && params[:parent_id].present?
     record_coming
     @type = params[:type]
     if @type.blank?
@@ -159,7 +159,10 @@ class CmsController &lt; MyProfileController
         if continue
           redirect_to :action => 'edit', :id => @article
         else
-          success_redirect
+          respond_to do |format|
+            format.html { success_redirect }
+            format.json { render :text => {:id => @article.id, :full_name => profile.identifier + '/' + @article.full_name}.to_json }
+          end
         end
         return
       end
@@ -477,7 +480,7 @@ class CmsController &lt; MyProfileController
       files = profile.files
     end
-    files = files.more_recent
+    files = files.reorder('created_at DESC')
     images = files.images
     generics = files.no_images
@@ -157,4 +157,22 @@ class ProfileSuggestion &lt; ActiveRecord::Base
     self.save
   end
+  def self.generate_all_profile_suggestions
+    Delayed::Job.enqueue(ProfileSuggestion::GenerateAllJob.new) unless ProfileSuggestion::GenerateAllJob.exists?
+  end
+
+  def self.generate_profile_suggestions(person_id)
+    Delayed::Job.enqueue ProfileSuggestionsJob.new(person_id) unless ProfileSuggestionsJob.exists?(person_id)
+  end
+
+  class GenerateAllJob
+    def self.exists?
+      Delayed::Job.by_handler("--- !ruby/object:ProfileSuggestion::GenerateAllJob {}\n").count > 0
+    end
+
+    def perform
+      Person.find_each {|person| ProfileSuggestion.generate_profile_suggestions(person.id) }
+    end
+  end
+
 end
 <div class='description'>
-  <%= _('This text will be showed as a welcome message to users after signup.') %><br/><br/>
+  <%= _('If you enable this feature on the "Features" section of the Administration Panel, this text will be shown as a welcome message to users after signup.') %><br/><br/>
 </div>
 <%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
@@ -8,4 +8,4 @@
   <%= _('If this content is left blank, the following page will be displayed to the user:') %><br/><br/>
 </div>
 <p>
-<%= render :file => 'home/welcome' %>
+<%= render :file => 'home/welcome', :locals => {:default_message => true} %>
@@ -0,0 +1,15 @@
+<%= form_tag({:action => 'new', :profile => profile.identifier}, :id => 'new-folder-dialog', :title => _('Create new folder'), :style => 'display: none;') do %>
+  <%= select_profile_folder(
+    _('Choose parent folder:'),
+    :parent_id, profile, default_folder, {}, {},
+    "type='Folder' or type='Gallery'")
+  %>
+
+  <%= content_tag(:label, radio_button_tag(:folder_type, 'Gallery', true) + _('Gallery')) %>
+  <%= content_tag(:label, radio_button_tag(:folder_type, 'Folder', false) +  _('Folder')) %>
+
+  <%= labelled_form_field _('Name:'), text_field_tag(:new_folder, nil, 'data-url' => url_for({:action => 'new', :profile => profile.identifier})) %>
+  <% button_bar do %>
+    <%= submit_button(:newfolder, _('Create')) %>
+  <% end %>
+<% end %>
+<% default_folder = content_id_to_str default_folder_for_image_upload(profile) %>
+
 <div class='text-editor-sidebar'>
   <span class='button-add' data-value='<%= _('Add to the text') %>'></span>
   <span class='button-zoom' data-value='<%= _('Zoom in') %>'></span>
   <span class='button-close' data-value='<%= _('Close') %>'></span>
+  <div class='header'><strong><%= _('Insert media') %></strong><%= button('vertical-toggle', _('Show/Hide'), '#') %></div>
+
   <%= render(:partial => 'textile_quick_reference') if @article.is_a?(TextileArticle) %>
   <div class='text-editor-sidebar-box' id='media-upload-box'>
-    <div class='header'><strong><%= _('Insert media') %></strong></div>
     <div id='media-upload-form'>
       <%= form_tag({ :action => 'media_upload' }, :multipart => true) do %>
         <div class='formfield'>
-          <% default_folder = content_id_to_str default_folder_for_image_upload(profile) %>
           <%= select_profile_folder(
                 _('Choose folder to upload files:'),
                 :parent_id, profile, default_folder, {}, {},
                 "type='Folder' or type='Gallery'"
           ) %>
         </div>
+        <%= button(:newfolder, _('New folder'), '#', :id => 'new-folder-button') %>
         <p><%= file_field_tag('file', :multiple => true) %></p>
       <% end %>
     </div>
@@ -26,7 +29,6 @@
   </div>
   <div id='published-media' class='text-editor-sidebar-box' data-url='<%= url_for({:controller => 'cms', :action => 'published_media_items', :profile => profile.identifier}) %>'>
-    <div class='header'><strong><%= _('Published media') %></strong></div>
     <%= select_profile_folder(nil, :parent_id, profile, 'recent-media', {}, {},
         "type='Folder' or type='Gallery'", {:root_label => _('Recent media')}) %>
     <%= labelled_form_field _('Search'), text_field_tag('q') %>
@@ -45,4 +47,5 @@
   </div>
 </script>
+<%= render :partial => 'media_new_folder', :locals => {:default_folder => default_folder} %>
 <%= javascript_include_tag 'jquery.fileupload.js', 'tmpl.js', 'media-panel.js' %>
-<% klass = @file.class.name.split('::').last.to_css_class %>
-jQuery("#published-media .items .<%= klass.pluralize %> .section-title").after("<%= j render :partial => "cms/media_panel/#{klass}" %>");
-jQuery("#published-media .items .<%= klass.pluralize %>").show();
+loadPublishedMedia();
-<h1><%= __('Enterprise registration completed') %></h1>
-<p><%= __("Your enterprise (%s) was successfully registered.") % @enterprise.name %></p>
-<p><%= link_to __('You can manage your enterprise now.'), @enterprise.admin_url %></p>
+<h1><%= _('Enterprise registration completed') %></h1>
+<p><%= _("Your enterprise (%s) was successfully registered.") % @enterprise.name %></p>
+<p><%= link_to _('You can manage your enterprise now.'), @enterprise.admin_url %></p>
 <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @enterprise.template, :header => _("What can I do with a %s?")} %>
+<% default_message = defined?(default_message) ? default_message : false %>
+
 <div id='thanks-for-signing'>
   <h1><%= _("Welcome to %s!") % environment.name %></h1>
-  <% if environment.has_custom_welcome_screen? %>
+  <% if environment.has_custom_welcome_screen? && !default_message %>
     <%= environment.settings[:signup_welcome_screen_body].html_safe %>
   <% else %>
       <h3><%= _("Thanks for signing up, we're thrilled to have you on our social network!") %></h3>
-<h1><%= __('Community created') %></h1>
-<p><%= __("Your community (%s) was successfully created.") % @community.name %></p>
-<p><%= link_to __('You can manage your community now.'), @community.admin_url %></p>
+<h1><%= _('Community created') %></h1>
+<p><%= _("Your community (%s) was successfully created.") % @community.name %></p>
+<p><%= link_to _('You can manage your community now.'), @community.admin_url %></p>
 <%= render :partial => 'shared/template_welcome_page', :locals => {:template => @community.template, :header => _("What can I do with a %s?")} %>
 <h1><%= _('Edit welcome page') %></h1>
-<% labelled_form_for :welcome_page, @welcome_page do |f| %>
+<%= labelled_form_for :welcome_page do |f| %>
   <%= error_messages_for :welcome_page %>
   <%= f.check_box(:published) %>
@@ -20,16 +20,16 @@
 <div class='article-lead' id="article-lead-<%=lead_id.to_s%>">
   <% if f %>
-    <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
+    <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 100%; height: 200px;', :class => editor_type)) %>
   <% else %>
-    <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>
+    <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, :style => 'width: 100%; height: 200px;', :class => editor_type)) %>
   <% end %>
 </div>
 <div style="margin-top: 10px;">
   <% if f %>
-    <%= labelled_form_field(_(body_label), f.text_area(body_method, :style => 'width: 98%; height: 400px;', :class => editor_type)) %>
+    <%= labelled_form_field(_(body_label), f.text_area(body_method, :style => 'width: 100%; height: 400px;', :class => editor_type)) %>
   <% else %>
-    <%= labelled_form_field(_(body_label), text_area(object, body_method, :style => 'width: 98%; height: 400px;', :class => editor_type)) %>
+    <%= labelled_form_field(_(body_label), text_area(object, body_method, :style => 'width: 100%; height: 400px;', :class => editor_type)) %>
   <% end %>
 </div>
@@ -26,3 +26,7 @@ set :output, &quot;log/cron.log&quot;
 every 1.minute do
   runner "SearchTerm.calculate_scores"
 end
+
+every 90.days do
+  runner "ProfileSuggestion.generate_all_profile_suggestions"
+end
 class ProfileSuggestionsJob < Struct.new(:person_id)
+  def self.exists?(person_id)
+    !find(person_id).empty?
+  end
+
+  def self.find(person_id)
+    Delayed::Job.by_handler("--- !ruby/struct:ProfileSuggestionsJob\nperson_id: #{person_id}\n")
+  end
+
   def perform
+    logger = Delayed::Worker.logger
     begin
       person = Person.find(person_id)
       ProfileSuggestion::RULES.each do |rule|
         ProfileSuggestion.send(rule, person)
       end
-
       UserMailer.profiles_suggestions_email(person).deliver
     rescue Exception => exception
-      Rails.logger.warn("Error with suggestions for person ID %d\n%s" % [person_id, exception.to_s])
+      logger.warn("Error with suggestions for person ID %d: %s" % [person_id, exception.to_s])
     end
   end
@@ -72,6 +72,7 @@
 .icon-newupload-file  { background-image: url(Tango/16x16/actions/filesave.png) }
 .icon-slideshow       { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png) }
 .icon-photos          { background-image: url(Tango/16x16/devices/camera-photo.png) }
+.icon-vertical-toggle { background-image: url(Tango/16x16/actions/mail-send-receive.png) }
 .icon-text-html       { background-image: url(Tango/16x16/mimetypes/text-html.png) }
 .icon-text-plain      { background-image: url(Tango/16x16/mimetypes/text-x-generic.png) }
@@ -74,9 +74,9 @@ jQuery(function($) {
     }
   }
-  function zoom_dialog_html(img) {
+  function zoom_dialog_html(name, img) {
     // FIXME organize this code better
-    return '<div class="item" data-item="div"><div><img src="' + img + '" style="max-width: 640px; max-height: 480px"/></div>' + '<div class="button-bar">' + add_to_text_button('with-text') + '&nbsp;&nbsp;&nbsp;' + close_button('with-text') + '</div></div>'
+    return '<h3 style="text-align: center;">'+ name +'</h3><div class="item" data-item="div"><div><img src="' + img + '" style="max-width: 640px; max-height: 480px"/></div>' + '<div class="button-bar">' + add_to_text_button('with-text') + '&nbsp;&nbsp;&nbsp;' + close_button('with-text') + '</div></div>'
   }
   $('.view-all-images .item').live('click', function(){
@@ -94,9 +94,10 @@ jQuery(function($) {
   $('a.zoom').live('click', function() {
     var $item = $(this).closest('.item');
     var html_selector = $item.attr('data-item');
+    var name = $item.attr('title');
     var img = $item.find(html_selector).find('img').attr('src');
     $.colorbox({
-      html: zoom_dialog_html(img),
+      html: zoom_dialog_html(name, img),
       scrolling: false
     });
     return false;
@@ -84,3 +84,45 @@ jQuery(&quot;#published-media #q&quot;).typeWatch({
 });
 jQuery("#published-media #q").bind('notext', function(){ loadPublishedMedia() });
+
+jQuery("#new-folder-dialog").submit(function( event ) {
+  var name = jQuery('#new_folder').val();
+  var parent_id = jQuery("#new-folder-dialog #parent_id").val();
+    jQuery("#media-upload-box #parent_id").val();
+  jQuery.ajax({
+    url: this.action,
+    type: 'POST',
+    data: {
+      'parent_id': parent_id,
+      'article': {'name': name, 'published': true},
+      'type': jQuery('input[name=folder_type]:checked').val() },
+    dataType: 'json',
+    beforeSend: function(){jQuery("#new-folder-dialog").addClass('fetching')},
+    success: function(response) {
+      var option_selected = "<option value='"+ response.id +"' selected='selected'>"+ response.full_name +"</options>"
+      var option = "<option value='"+ response.id +"'>"+ response.full_name +"</options>"
+      jQuery('#media-upload-form #parent_id').append(option_selected);
+      jQuery('#published-media #parent_id').append(option);
+      jQuery('#new_folder').val('');
+    },
+    error: function(response, textStatus, xhr) {
+      console.log(response);
+      console.log(textStatus);
+    },
+    complete: function(response){
+      jQuery("#new-folder-dialog").removeClass('fetching');
+      jQuery("#new-folder-dialog").dialog('close');
+    }
+  });
+  return false;
+});
+
+jQuery('.text-editor-sidebar .header .icon-vertical-toggle').click(function(){
+  jQuery('#content').toggleClass('show-media-panel');
+  return false;
+});
+
+jQuery('#new-folder-button').click(function(){
+  jQuery('#new-folder-dialog').dialog({modal: true});
+  return false;
+});
@@ -3443,11 +3443,18 @@ table.cms-articles .icon:hover {
 /* Text editors sidebar */
-.controller-cms div.with_media_panel {
+.controller-cms .with_media_panel {
   float: left;
+  width: 900px;
+  transition: 1s 0.5s;
+}
+
+.controller-cms .show-media-panel .with_media_panel {
   width: 600px;
+  transition: 1s;
 }
-div.with_media_panel .formfield input[type="checkbox"] {
+
+.with_media_panel .formfield input[type="checkbox"] {
   width: auto;
 }
@@ -3466,6 +3473,11 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] {
   float: right;
 }
+#media-upload-form .progress {
+  background-color: #ddd;
+  border-radius: 3px;
+}
+
 #media-upload-form .bar {
   height: 10px;
   background: #729fcf;
@@ -3496,13 +3508,14 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] {
 }
 #media-upload-box .upload .file-name{
-  width: 87%;
+  width: 86%;
   white-space: nowrap;
   overflow: hidden;
   text-overflow: ellipsis;
 }
 #media-upload-box .upload .percentage {
+  text-align: right;
   width: 12%;
 }
@@ -3512,6 +3525,14 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] {
   width: 280px;
   right: 20px;
   top: 70px;
+  max-height: 45px;
+  overflow: hidden;
+  transition: 1s;
+}
+
+.show-media-panel .text-editor-sidebar {
+  max-height: 1200px;
+  transition: 1s 0.5s;
 }
 .text-editor-sidebar-box  {
@@ -3521,12 +3542,23 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] {
   margin-bottom: 10px;
 }
-.text-editor-sidebar-box .header {
-	margin: -10px -10px 0px -10px;
-	padding: 10px;
-	font-weight: bold;
-	border-bottom: 1px solid #d3d7cf;
-	background-color: #eeeeec;
+.text-editor-sidebar .header {
+  margin: 0 0 10px 0;
+  padding: 10px;
+  font-weight: bold;
+  border: 1px solid #d3d7cf;
+  background-color: #eeeeec;
+  background-repeat: no-repeat;
+  background-position: 98% 10px;
+  position: relative;
+}
+
+.text-editor-sidebar .header .icon-vertical-toggle {
+  position: absolute;
+  right: 6px;
+  top: 6px;
+  padding-top: 0px;
+  padding-bottom: 0px;
 }
 .text-editor-sidebar code,
@@ -3601,6 +3633,7 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] {
 .text-editor-sidebar select,
 .text-editor-sidebar input {
   width: 100%;
+  margin-bottom: 5px;
 }
 .text-editor-sidebar .items :hover,
@@ -3639,10 +3672,6 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] {
 	margin-top: 4px;
 }
-.text-editor-sidebar .header {
-  background-repeat: no-repeat;
-  background-position: 98% 10px;
-}
 .text-editor-sidebar .media-upload-error {
   color: red;
 }
@@ -6918,3 +6947,7 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
 .fetching {
   opacity: 0.3;
 }
+
+body .ui-widget-overlay {
+  background: #000;
+}
	@@ -157,4 +157,22 @@ class ProfileSuggestion < ActiveRecord::Base		@@ -157,4 +157,22 @@ class ProfileSuggestion < ActiveRecord::Base
157	self.save	157	self.save
158	end	158	end
159		159
		160	+ def self.generate_all_profile_suggestions
		161	+ Delayed::Job.enqueue(ProfileSuggestion::GenerateAllJob.new) unless ProfileSuggestion::GenerateAllJob.exists?
		162	+ end
		163	+
		164	+ def self.generate_profile_suggestions(person_id)
		165	+ Delayed::Job.enqueue ProfileSuggestionsJob.new(person_id) unless ProfileSuggestionsJob.exists?(person_id)
		166	+ end
		167	+
		168	+ class GenerateAllJob
		169	+ def self.exists?
		170	+ Delayed::Job.by_handler("--- !ruby/object:ProfileSuggestion::GenerateAllJob {}\n").count > 0
		171	+ end
		172	+
		173	+ def perform
		174	+ Person.find_each {\|person\| ProfileSuggestion.generate_profile_suggestions(person.id) }
		175	+ end
		176	+ end
		177	+
160	end	178	end
1	<div class='description'>	1	<div class='description'>
2	- <%= _('This text will be showed as a welcome message to users after signup.') %><br/><br/>	2	+ <%= _('If you enable this feature on the "Features" section of the Administration Panel, this text will be shown as a welcome message to users after signup.') %><br/><br/>
3	</div>	3	</div>
4	<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>	4	<%= labelled_form_field(_('Body'), text_area(:environment, :signup_welcome_screen_body, :cols => 40, :style => 'width: 100%', :class => 'mceEditor')) %>
5		5
	@@ -8,4 +8,4 @@		@@ -8,4 +8,4 @@
8	<%= _('If this content is left blank, the following page will be displayed to the user:') %><br/><br/>	8	<%= _('If this content is left blank, the following page will be displayed to the user:') %><br/><br/>
9	</div>	9	</div>
10	<p>	10	<p>
11	-<%= render :file => 'home/welcome' %>	11	+<%= render :file => 'home/welcome', :locals => {:default_message => true} %>
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+<%= form_tag({:action => 'new', :profile => profile.identifier}, :id => 'new-folder-dialog', :title => _('Create new folder'), :style => 'display: none;') do %>
	2	+ <%= select_profile_folder(
	3	+ _('Choose parent folder:'),
	4	+ :parent_id, profile, default_folder, {}, {},
	5	+ "type='Folder' or type='Gallery'")
	6	+ %>
	7	+
	8	+ <%= content_tag(:label, radio_button_tag(:folder_type, 'Gallery', true) + _('Gallery')) %>
	9	+ <%= content_tag(:label, radio_button_tag(:folder_type, 'Folder', false) + _('Folder')) %>
	10	+
	11	+ <%= labelled_form_field _('Name:'), text_field_tag(:new_folder, nil, 'data-url' => url_for({:action => 'new', :profile => profile.identifier})) %>
	12	+ <% button_bar do %>
	13	+ <%= submit_button(:newfolder, _('Create')) %>
	14	+ <% end %>
	15	+<% end %>
1	-<% klass = @file.class.name.split('::').last.to_css_class %>
2	-jQuery("#published-media .items .<%= klass.pluralize %> .section-title").after("<%= j render :partial => "cms/media_panel/#{klass}" %>");
3	-jQuery("#published-media .items .<%= klass.pluralize %>").show();	1	+loadPublishedMedia();
1	-<h1><%= __('Enterprise registration completed') %></h1>
2	-<p><%= __("Your enterprise (%s) was successfully registered.") % @enterprise.name %></p>
3	-<p><%= link_to __('You can manage your enterprise now.'), @enterprise.admin_url %></p>	1	+<h1><%= _('Enterprise registration completed') %></h1>
		2	+<p><%= _("Your enterprise (%s) was successfully registered.") % @enterprise.name %></p>
		3	+<p><%= link_to _('You can manage your enterprise now.'), @enterprise.admin_url %></p>
4		4
5	<%= render :partial => 'shared/template_welcome_page', :locals => {:template => @enterprise.template, :header => _("What can I do with a %s?")} %>	5	<%= render :partial => 'shared/template_welcome_page', :locals => {:template => @enterprise.template, :header => _("What can I do with a %s?")} %>
6		6
1	-<h1><%= __('Community created') %></h1>
2	-<p><%= __("Your community (%s) was successfully created.") % @community.name %></p>
3	-<p><%= link_to __('You can manage your community now.'), @community.admin_url %></p>	1	+<h1><%= _('Community created') %></h1>
		2	+<p><%= _("Your community (%s) was successfully created.") % @community.name %></p>
		3	+<p><%= link_to _('You can manage your community now.'), @community.admin_url %></p>
4		4
5	<%= render :partial => 'shared/template_welcome_page', :locals => {:template => @community.template, :header => _("What can I do with a %s?")} %>	5	<%= render :partial => 'shared/template_welcome_page', :locals => {:template => @community.template, :header => _("What can I do with a %s?")} %>
6		6
1	<h1><%= _('Edit welcome page') %></h1>	1	<h1><%= _('Edit welcome page') %></h1>
2		2
3	-<% labelled_form_for :welcome_page, @welcome_page do \|f\| %>	3	+<%= labelled_form_for :welcome_page do \|f\| %>
4	<%= error_messages_for :welcome_page %>	4	<%= error_messages_for :welcome_page %>
5		5
6	<%= f.check_box(:published) %>	6	<%= f.check_box(:published) %>
	@@ -20,16 +20,16 @@		@@ -20,16 +20,16 @@
20	<div class='article-lead' id="article-lead-<%=lead_id.to_s%>">	20	<div class='article-lead' id="article-lead-<%=lead_id.to_s%>">
21		21
22	<% if f %>	22	<% if f %>
23	- <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>	23	+ <%= labelled_form_field(_(abstract_label), f.text_area(abstract_method, :style => 'width: 100%; height: 200px;', :class => editor_type)) %>
24	<% else %>	24	<% else %>
25	- <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, :style => 'width: 98%; height: 200px;', :class => editor_type)) %>	25	+ <%= labelled_form_field(_(abstract_label), text_area(object, abstract_method, :style => 'width: 100%; height: 200px;', :class => editor_type)) %>
26	<% end %>	26	<% end %>
27	</div>	27	</div>
28	<div style="margin-top: 10px;">	28	<div style="margin-top: 10px;">
29	<% if f %>	29	<% if f %>
30	- <%= labelled_form_field(_(body_label), f.text_area(body_method, :style => 'width: 98%; height: 400px;', :class => editor_type)) %>	30	+ <%= labelled_form_field(_(body_label), f.text_area(body_method, :style => 'width: 100%; height: 400px;', :class => editor_type)) %>
31	<% else %>	31	<% else %>
32	- <%= labelled_form_field(_(body_label), text_area(object, body_method, :style => 'width: 98%; height: 400px;', :class => editor_type)) %>	32	+ <%= labelled_form_field(_(body_label), text_area(object, body_method, :style => 'width: 100%; height: 400px;', :class => editor_type)) %>
33	<% end %>	33	<% end %>
34	</div>	34	</div>
35		35
	@@ -26,3 +26,7 @@ set :output, "log/cron.log"		@@ -26,3 +26,7 @@ set :output, "log/cron.log"
26	every 1.minute do	26	every 1.minute do
27	runner "SearchTerm.calculate_scores"	27	runner "SearchTerm.calculate_scores"
28	end	28	end
		29	+
		30	+every 90.days do
		31	+ runner "ProfileSuggestion.generate_all_profile_suggestions"
		32	+end
	@@ -72,6 +72,7 @@		@@ -72,6 +72,7 @@
72	.icon-newupload-file { background-image: url(Tango/16x16/actions/filesave.png) }	72	.icon-newupload-file { background-image: url(Tango/16x16/actions/filesave.png) }
73	.icon-slideshow { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png) }	73	.icon-slideshow { background-image: url(Tango/16x16/mimetypes/x-office-presentation.png) }
74	.icon-photos { background-image: url(Tango/16x16/devices/camera-photo.png) }	74	.icon-photos { background-image: url(Tango/16x16/devices/camera-photo.png) }
		75	+.icon-vertical-toggle { background-image: url(Tango/16x16/actions/mail-send-receive.png) }
75		76
76	.icon-text-html { background-image: url(Tango/16x16/mimetypes/text-html.png) }	77	.icon-text-html { background-image: url(Tango/16x16/mimetypes/text-html.png) }
77	.icon-text-plain { background-image: url(Tango/16x16/mimetypes/text-x-generic.png) }	78	.icon-text-plain { background-image: url(Tango/16x16/mimetypes/text-x-generic.png) }