merge with master

Leandro Santos
2 parents 1c69e2e7 da1968e4
Showing 179 changed files with 927 additions and 4295 deletions Show diff stats
app/jobs/activities_counter_cache_job.rb
app/jobs/create_thumbnails_job.rb
app/models/application_record.rb
app/models/block.rb
app/models/raw_html_block.rb
app/models/recent_documents_block.rb
app/views/admin_panel/set_portal_community.html.erb
config/application.rb
config/environment.rb
config/initializers/00_dependencies.rb
config/initializers/dependencies.rb
config/initializers/plugins.rb
lib/activities_counter_cache_job.rb
lib/acts_as_customizable.rb
lib/acts_as_filesystem.rb
lib/acts_as_having_boxes.rb
lib/acts_as_having_image.rb
lib/acts_as_having_posts.rb
lib/acts_as_having_settings.rb
lib/code_numbering.rb
@@ -0,0 +1,14 @@
+class ActivitiesCounterCacheJob
+
+  def perform
+    person_activities_counts = ApplicationRecord.connection.execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id WHERE (action_tracker.created_at >= #{ApplicationRecord.connection.quote(ActionTracker::Record::RECENT_DELAY.days.ago.to_s(:db))}) AND ( (profiles.type = 'Person' ) ) GROUP BY profiles.id;")
+    organization_activities_counts = ApplicationRecord.connection.execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id WHERE (action_tracker.created_at >= #{ApplicationRecord.connection.quote(ActionTracker::Record::RECENT_DELAY.days.ago.to_s(:db))}) AND ( (profiles.type = 'Community' OR profiles.type = 'Enterprise' OR profiles.type = 'Organization' ) ) GROUP BY profiles.id;")
+    activities_counts = person_activities_counts.entries + organization_activities_counts.entries
+    activities_counts.each do |count|
+      update_sql = ApplicationRecord.__send__(:sanitize_sql, ["UPDATE profiles SET activities_count=? WHERE profiles.id=?;", count['count'].to_i, count['id'] ], '')
+      ApplicationRecord.connection.execute(update_sql)
+    end
+    Delayed::Job.enqueue(ActivitiesCounterCacheJob.new, {:priority => -3, :run_at => 1.day.from_now})
+  end
+
+end
@@ -0,0 +1,11 @@
+class CreateThumbnailsJob < Struct.new(:class_name, :file_id)
+  def perform
+    return unless class_name.constantize.exists?(file_id)
+    file = class_name.constantize.find(file_id)
+    file.create_thumbnails
+    article = Article.where(:image_id => file_id).first
+    if article
+      article.touch
+    end
+  end
+end
 class ApplicationRecord < ActiveRecord::Base
-  self.abstract_class = true
-
-  def self.postgresql?
-    self.connection.adapter_name == 'PostgreSQL'
-  end
+  self.abstract_class       = true
+  self.store_full_sti_class = true
   # an ActionView instance for rendering views on models
   def self.action_view
@@ -25,7 +22,7 @@ class ApplicationRecord &lt; ActiveRecord::Base
   alias :meta_cache_key :cache_key
   def cache_key
     key = [Noosfero::VERSION, meta_cache_key]
-    key.unshift(ApplicationRecord.connection.schema_search_path) if ApplicationRecord.postgresql?
+    key.unshift ApplicationRecord.connection.schema_search_path
     key.join('/')
   end
@@ -76,6 +76,17 @@ class Block &lt; ApplicationRecord
     true
   end
+  def visible_to_user?(user)
+    visible = self.display_to_user?(user)
+    if self.owner.kind_of?(Profile)
+      visible &= self.owner.display_info_to?(user)
+      visible &= (self.visible? || user && user.has_permission?(:edit_profile_design, self.owner))
+    elsif self.owner.kind_of?(Environment)
+      visible &= (self.visible? || user && user.has_permission?(:edit_environment_design, self.owner))
+    end
+    visible
+  end
+
   def display_to_user?(user)
     display_user == 'all' || (user.nil? && display_user == 'not_logged') || (user && display_user == 'logged') || (user && display_user == 'followers' && user.follows?(owner))
   end
@@ -314,6 +325,14 @@ class Block &lt; ApplicationRecord
     self.observers << block
   end
+  def api_content
+    nil
+  end
+
+  def display_api_content_by_default?
+    false
+  end
+
   private
   def home_page_path
@@ -20,4 +20,12 @@ class RawHTMLBlock &lt; Block
     user.has_permission?('edit_raw_html_block', environment)
   end
+  def api_content
+    { html: html }
+  end
+
+  def display_api_content_by_default?
+    true
+  end
+
 end
@@ -29,4 +29,12 @@ class RecentDocumentsBlock &lt; Block
   def self.expire_on
       { :profile => [:article], :environment => [:article] }
   end
+
+  def api_content
+    Noosfero::API::Entities::ArticleBase.represent(docs).as_json
+  end
+
+  def display_api_content_by_default?
+    false
+  end
 end
@@ -9,7 +9,7 @@
     <% end %>
   <% end %>
 <% else %>
-  <%= _('Portal identifier: %s') % link_to(@portal_community.identifier, @portal_community.url) %>
+  <%= _('Portal identifier: %s').html_safe % link_to(@portal_community.identifier, @portal_community.url) %>
   <% button_bar do %>
     <%if @portal_community.environment.enabled?('use_portal_community') %>
-require File.expand_path('../boot', __FILE__)
+require_relative 'boot'
 require 'rails/all'
 require 'active_support/dependencies'
-# FIXME this silences the warnings about Rails 2.3-style plugins under
-# vendor/plugins, which are deprecated. Hiding those warnings makes it easier
-# to work for now, but we should really look at putting those plugins away.
+# Silence Rails 5 deprecation warnings
 ActiveSupport::Deprecation.silenced = true
 Bundler.require(:default, :assets, Rails.env)
+$: << File.expand_path('../lib', File.dirname(__FILE__))
+
+require_dependency 'noosfero'
+require_dependency 'noosfero/plugin'
+require_dependency 'noosfero/multi_tenancy'
 module Noosfero
   class Application < Rails::Application
-    require 'noosfero/plugin'
-
     # The plugin xss_terminator(located in vendor/plugins/xss_terminator) and the helper
     # SanitizeHelper(located in app/helpers/sanitize_helper.rb) use
     # ALLOWED_TAGS and ALLOWED_ATTRIBUTES to make a sanitize with html.
@@ -30,9 +31,6 @@ module Noosfero
     config.action_view.sanitized_allowed_tags = ALLOWED_TAGS
     config.action_view.sanitized_allowed_attributes = ALLOWED_ATTRIBUTES
-    require 'noosfero/multi_tenancy'
-    config.middleware.use Noosfero::MultiTenancy::Middleware
-
     config.action_controller.include_all_helpers = false
     # Settings in config/environments/* take precedence over those specified here.
@@ -40,10 +38,11 @@ module Noosfero
     # -- all .rb files in that directory are automatically loaded.
     # Custom directories with classes and modules you want to be autoloadable.
-    config.autoload_paths += %W( #{config.root.join('app', 'sweepers')} )
-    config.autoload_paths += Dir["#{config.root}/lib"]
-    config.autoload_paths += Dir["#{config.root}/app/controllers/**/"]
-    config.autoload_paths += %W( #{config.root.join('test', 'mocks', Rails.env)} )
+    config.autoload_paths << config.root.join('lib')
+    config.autoload_paths << config.root.join('app/jobs')
+    config.autoload_paths << config.root.join('app/sweepers')
+    config.autoload_paths.concat Dir["#{config.root}/app/controllers/**/"]
+    config.autoload_paths << config.root.join('test', 'mocks', Rails.env)
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
@@ -121,7 +120,8 @@ module Noosfero
     config.eager_load = true
-    Noosfero::Plugin.setup(config)
+    config.middleware.use Noosfero::MultiTenancy::Middleware
+    Noosfero::Plugin.setup(config)
   end
 end
-# Load the rails application
-require File.expand_path('../application', __FILE__)
+require_relative 'application'
-#FIXME Necessary hack to avoid the need of downgrading rubygems on rails 2.3.5
-# http://stackoverflow.com/questions/5564251/uninitialized-constant-activesupportdependenciesmutex
-require 'thread'
-
-# Uncomment below to force Rails into production mode when 
-# you don't control web/app server and can't set it the proper way
-#ENV['RAILS_ENV'] ||= 'production'
-
-# extra directories for controllers organization 
-extra_controller_dirs = %w[
-].map {|item| Rails.root.join(item) }
-
-# Add new inflection rules using the following format 
-# (all these examples are active by default):
-# Inflector.inflections do |inflect|
-#   inflect.plural /^(ox)$/i, '\1en'
-#   inflect.singular /^(ox)en/i, '\1'
-#   inflect.irregular 'person', 'people'
-#   inflect.uncountable %w( fish sheep )
-# end
-
-# Include your application configuration below
-
-ActiveRecord::Base.store_full_sti_class = true
-
-#FIXME: Probably act_as_taggable_on is not being loaded or this should be on another place
-#Tag.hierarchical = true
-
-# several local libraries
-require_dependency 'noosfero'
-#FIXME: error when call lib/sqlite_extention
-#require 'sqlite_extension'
+Noosfero::Application.initialize!
 # load a local configuration if present, but not under test environment.
-if !['test', 'cucumber'].include?(ENV['RAILS_ENV'])
+if ENV['RAILS_ENV'].in? %w[test cucumber]
   localconfigfile = Rails.root.join('config', 'local.rb')
-  if File.exists?(localconfigfile)
-    require localconfigfile
-  end
+  require localconfigfile if File.exists? localconfigfile
 end
-Noosfero::Application.initialize!
@@ -0,0 +1,31 @@
+require 'pp'
+
+# third-party libraries
+require 'will_paginate'
+require 'will_paginate/array'
+require 'nokogiri'
+
+# dependencies at vendor, firstly loaded on Gemfile
+vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
+vendor.each do |dir|
+  init_rb = "#{Rails.root}/#{dir}/init.rb"
+  require init_rb if File.file? init_rb
+end
+
+# extensions
+require 'extensions'
+
+# locally-developed modules
+require 'acts_as_filesystem'
+require 'acts_as_having_settings'
+require 'acts_as_having_boxes'
+require 'acts_as_having_image'
+require 'acts_as_having_posts'
+require 'acts_as_customizable'
+require 'route_if'
+require 'maybe_add_http'
+require 'set_profile_region_from_city_state'
+require 'authenticated_system'
+require 'needs_profile'
+require 'white_list_filter'
+
@@ -1,28 +0,0 @@
-require 'pp'
-
-# third-party libraries
-require 'will_paginate'
-require 'will_paginate/array'
-require 'nokogiri'
-
-# dependencies at vendor, firstly loaded on Gemfile
-vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
-vendor.each do |dir|
-  init_rb = "#{Rails.root}/#{dir}/init.rb"
-  require init_rb if File.file? init_rb
-end
-
-# locally-developed modules
-require 'acts_as_filesystem'
-require 'acts_as_having_settings'
-require 'acts_as_having_boxes'
-require 'acts_as_having_image'
-require 'acts_as_having_posts'
-require 'acts_as_customizable'
-require 'route_if'
-require 'maybe_add_http'
-require 'set_profile_region_from_city_state'
-require 'authenticated_system'
-require 'needs_profile'
-require 'white_list_filter'
-
@@ -5,3 +5,4 @@ require &#39;noosfero/plugin/mailer_base&#39;
 require 'noosfero/plugin/settings'
 require 'noosfero/plugin/spammable'
 Noosfero::Plugin.initialize!
+
@@ -1,14 +0,0 @@
-class ActivitiesCounterCacheJob
-
-  def perform
-    person_activities_counts = ApplicationRecord.connection.execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id WHERE (action_tracker.created_at >= #{ApplicationRecord.connection.quote(ActionTracker::Record::RECENT_DELAY.days.ago.to_s(:db))}) AND ( (profiles.type = 'Person' ) ) GROUP BY profiles.id;")
-    organization_activities_counts = ApplicationRecord.connection.execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id WHERE (action_tracker.created_at >= #{ApplicationRecord.connection.quote(ActionTracker::Record::RECENT_DELAY.days.ago.to_s(:db))}) AND ( (profiles.type = 'Community' OR profiles.type = 'Enterprise' OR profiles.type = 'Organization' ) ) GROUP BY profiles.id;")
-    activities_counts = person_activities_counts.entries + organization_activities_counts.entries
-    activities_counts.each do |count|
-      update_sql = ApplicationRecord.__send__(:sanitize_sql, ["UPDATE profiles SET activities_count=? WHERE profiles.id=?;", count['count'].to_i, count['id'] ], '')
-      ApplicationRecord.connection.execute(update_sql)
-    end
-    Delayed::Job.enqueue(ActivitiesCounterCacheJob.new, {:priority => -3, :run_at => 1.day.from_now})
-  end
-
-end
@@ -122,4 +122,4 @@ module Customizable
   end
 end
-ApplicationRecord.send :include, Customizable
+ActiveRecord::Base.include Customizable
@@ -33,7 +33,7 @@ module ActsAsFileSystem
   module ClassMethods
     def build_ancestry(parent_id = nil, ancestry = '')
-      ApplicationRecord.transaction do
+      ActiveRecord::Base.transaction do
         self.base_class.where(parent_id: parent_id).each do |node|
           node.update_column :ancestry, ancestry
@@ -263,5 +263,5 @@ module ActsAsFileSystem
   end
 end
-ApplicationRecord.extend ActsAsFileSystem::ActsMethods
+ActiveRecord::Base.extend ActsAsFileSystem::ActsMethods
@@ -35,4 +35,4 @@ module ActsAsHavingBoxes
 end
-ApplicationRecord.extend ActsAsHavingBoxes::ClassMethods
+ActiveRecord::Base.extend ActsAsHavingBoxes::ClassMethods
@@ -23,5 +23,5 @@ module ActsAsHavingImage
 end
-ApplicationRecord.extend ActsAsHavingImage::ClassMethods
+ActiveRecord::Base.extend ActsAsHavingImage::ClassMethods
@@ -47,5 +47,5 @@ module ActsAsHavingPosts
 end
-ApplicationRecord.extend ActsAsHavingPosts::ClassMethods
+ActiveRecord::Base.extend ActsAsHavingPosts::ClassMethods
@@ -87,5 +87,5 @@ module ActsAsHavingSettings
 end
-ApplicationRecord.extend ActsAsHavingSettings::ClassMethods
+ActiveRecord::Base.extend ActsAsHavingSettings::ClassMethods
@@ -55,4 +55,4 @@ module CodeNumbering
   end
 end
-ApplicationRecord.extend CodeNumbering::ClassMethods
+ActiveRecord::Base.extend CodeNumbering::ClassMethods
@@ -1,11 +0,0 @@
-class CreateThumbnailsJob < Struct.new(:class_name, :file_id)
-  def perform
-    return unless class_name.constantize.exists?(file_id)
-    file = class_name.constantize.find(file_id)
-    file.create_thumbnails
-    article = Article.where(:image_id => file_id).first
-    if article
-      article.touch
-    end
-  end
-end
@@ -52,5 +52,5 @@ module DelayedAttachmentFu
   end
 end
-ApplicationRecord.extend DelayedAttachmentFu::ClassMethods
+ActiveRecord::Base.extend DelayedAttachmentFu::ClassMethods
@@ -0,0 +1,5 @@
+require_relative 'extensions/string'
+require_relative 'extensions/integer'
+require_relative 'extensions/active_record/calculations'
+require_relative 'extensions/active_record/reflection'
+
@@ -0,0 +1,10 @@
+ActiveRecord::Calculations.class_eval do
+  def count_with_distinct column_name=self.primary_key
+    if column_name
+      distinct.count_without_distinct column_name
+    else
+      count_without_distinct
+    end
+  end
+  alias_method_chain :count, :distinct
+end
@@ -0,0 +1,20 @@
+
+# on STI classes tike Article and Profile, plugins' extensions
+# on associations should be reflected on descendants
+module ActiveRecord
+  module Reflection
+
+    class << self
+
+      def add_reflection_with_descendants(ar, name, reflection)
+        self.add_reflection_without_descendants ar, name, reflection
+        ar.descendants.each do |k|
+          k._reflections.merge!(name.to_s => reflection)
+        end if ar.base_class == ar
+      end
+
+      alias_method_chain :add_reflection, :descendants
+
+    end
+  end
+end
@@ -0,0 +1,39 @@
+class Integer
+  def to_humanreadable
+    value = self
+	  if value < 1023
+	  	return "%i bytes" % value
+    end
+	  value /= 1024
+
+	  if value < 1023
+	  	return "%1.1f KB" % value
+    end
+	  value /= 1024
+
+	  if value < 1023
+	  	return "%1.1f MB" % value
+    end
+	  value /= 1024
+
+	  if value < 1023
+	  	return "%1.1f GB" % value
+    end
+	  value /= 1024
+
+	  if value < 1023
+	  	return "%1.1f TB" % value
+    end
+	  value /= 1024
+
+	  if value < 1023
+	  	return "%1.1f PB" % value
+    end
+	  value /= 1024
+
+	  if value < 1023
+	  	return "%1.1f EB" % value
+    end
+	  value /= 1024
+  end
+end
@@ -0,0 +1,93 @@
+# encoding: utf-8
+
+class String
+
+  TRANSLITERATIONS = {
+    [ 'Á', 'À', 'À', 'Â', 'Ã', 'Ä', 'Å' ] => 'A',
+    [ 'á', 'à', 'à', 'â', 'ã', 'ä', 'å' ,'ª' ] => 'a',
+    [ 'É', 'È', 'Ê', 'Ë' ] => 'E',
+    [ 'é', 'è', 'ê', 'ë' ] => 'e',
+    [ 'Í', 'Ì', 'Î', 'Ï' ] => 'I',
+    [ 'í', 'ì', 'î', 'ï' ] => 'i',
+    [ 'Ó', 'Ò', 'Ô', 'Ö', 'Õ', 'º' ] => 'O',
+    [ 'ó', 'ò', 'ô', 'ö', 'õ', 'º' ] => 'o',
+    [ 'Ú', 'Ù', 'Û', 'Ü' ] => 'U',
+    [ 'ú', 'ù', 'û', 'ü' ] => 'u',
+    [ 'ß' ] => 'ss',
+    [ 'Ç' ] => 'C',
+    [ 'ç' ] => 'c',
+    [ 'Ñ' ] => 'N',
+    [ 'ñ' ] => 'n',
+    [ 'Ÿ' ] => 'Y',
+    [ 'ÿ' ] => 'y',
+# Cyrillic alphabet transliteration
+    [ 'а', 'А' ] => 'a',
+    [ 'б', 'Б' ] => 'b',
+    [ 'в', 'В' ] => 'v',
+    [ 'г', 'Г' ] => 'g',
+    [ 'д', 'Д' ] => 'd',
+    [ 'е', 'Е' ] => 'e',
+    [ 'ё', 'Ё' ] => 'yo',
+    [ 'ж', 'Ж' ] => 'zh',
+    [ 'з', 'З' ] => 'z',
+    [ 'и', 'И' ] => 'i',
+    [ 'й', 'Й' ] => 'y',
+    [ 'к', 'К' ] => 'k',
+    [ 'л', 'Л' ] => 'l',
+    [ 'м', 'М' ] => 'm',
+    [ 'н', 'Н' ] => 'n',
+    [ 'о', 'О' ] => 'o',
+    [ 'п', 'П' ] => 'p',
+    [ 'р', 'Р' ] => 'r',
+    [ 'с', 'С' ] => 's',
+    [ 'т', 'Т' ] => 't',
+    [ 'у', 'У' ] => 'u',
+    [ 'ф', 'Ф' ] => 'f',
+    [ 'х', 'Х' ] => 'h',
+    [ 'ц', 'Ц' ] => 'ts',
+    [ 'ч', 'Ч' ] => 'ch',
+    [ 'ш', 'Ш' ] => 'sh',
+    [ 'щ', 'Щ' ] => 'sch',
+    [ 'э', 'Э' ] => 'e',
+    [ 'ю', 'Ю' ] => 'yu',
+    [ 'я', 'Я' ] => 'ya',
+    [ 'ы', 'Ы' ] => 'i',
+    [ 'ь', 'Ь' ] => '',
+    [ 'ъ', 'Ъ' ] => '',
+# Ukrainian lovely letters
+    [ 'і', 'І' ] => 'i',
+    [ 'ї', 'Ї' ] => 'yi',
+    [ 'є', 'Є' ] => 'ye',
+    [ 'ґ', 'Ґ' ] => 'g',
+  }
+
+  # transliterate a string (assumed to contain UTF-8 data)
+  # into ASCII by replacing non-ascii characters to their
+  # ASCII.
+  #
+  # The transliteration is, of course, lossy, and its performance is poor.
+  # Don't abuse this method.
+  def transliterate
+
+    new = self.dup
+    TRANSLITERATIONS.each { |from,to|
+      from.each { |seq|
+        new.gsub!(seq, to)
+      }
+    }
+    new
+  end
+
+  def to_slug
+    transliterate.downcase.gsub(/[^[[:word:]]~\s:;+=_."'`-]/, '').gsub(/[\s:;+=_"'`-]+/, '-').gsub(/-$/, '').gsub(/^-/, '').to_s
+  end
+
+  def to_css_class
+    underscore.dasherize.gsub('/','_')
+  end
+
+  def fix_i18n
+    self.sub('{fn} ', '')
+  end
+
+end
-# encoding: utf-8
+require_relative 'noosfero/version'
+require_relative 'noosfero/constants'
 module Noosfero
@@ -106,6 +107,3 @@ module Noosfero
 end
-require 'noosfero/version'
-require 'noosfero/constants'
-require 'noosfero/core_ext'
@@ -55,6 +55,7 @@ module Noosfero
       mount V1::Search
       mount V1::Contacts
       mount V1::Boxes
+      mount V1::Blocks
       mount V1::Profiles
       mount V1::Activities
@@ -88,6 +88,7 @@ module Noosfero
         root 'blocks', 'block'
         expose :id, :type, :settings, :position, :enabled
         expose :mirror, :mirror_block_id, :title
+        expose :api_content, if: lambda { |object, options| options[:display_api_content] || object.display_api_content_by_default? }
       end
       class Box < Entity
 require 'grape'
+require 'base64'
+require 'tempfile'
 require_relative '../../find_by_contents'
-  module Noosfero;
-    module API
-      module APIHelpers
+module Noosfero;
+  module API
+    module APIHelpers
       PRIVATE_TOKEN_PARAM = :private_token
       DEFAULT_ALLOWED_PARAMETERS = [:parent_id, :from, :until, :content_type, :author_id, :identifier, :archived]
@@ -255,7 +257,7 @@ require_relative &#39;../../find_by_contents&#39;
         else
           created_at = scope.find(reference_id).created_at
           scope.send("#{params.key?(:oldest) ? 'older_than' : 'younger_than'}", created_at)
-         end
+        end
       end
       def by_categories(scope, params)
@@ -412,6 +414,30 @@ require_relative &#39;../../find_by_contents&#39;
         not_found! if Noosfero::API::API.endpoint_unavailable?(self, @environment)
       end
+      def asset_with_image params
+        if params.has_key? :image_builder
+          asset_api_params = params
+          asset_api_params[:image_builder] = base64_to_uploadedfile(asset_api_params[:image_builder])
+          return asset_api_params
+        end
+          params
+      end
+
+      def base64_to_uploadedfile(base64_image)
+        tempfile = base64_to_tempfile base64_image
+        converted_image = base64_image
+        converted_image[:tempfile] = tempfile
+        return {uploaded_data: ActionDispatch::Http::UploadedFile.new(converted_image)}
+      end
+
+      def base64_to_tempfile base64_image
+        base64_img_str = base64_image[:tempfile]
+        decoded_base64_str = Base64.decode64(base64_img_str)
+        tempfile = Tempfile.new(base64_image[:filename])
+        tempfile.write(decoded_base64_str.encode("ascii-8bit").force_encoding("utf-8"))
+        tempfile.rewind
+        tempfile
+      end
       private
       def parser_params(params)
@@ -56,7 +56,7 @@ module Noosfero
           post ':id' do
             article = environment.articles.find(params[:id])
             return forbidden! unless article.allow_edit?(current_person)
-            article.update_attributes!(params[:article])
+            article.update_attributes!(asset_with_image(params[:article]))
             present_partial article, :with => Entities::Article
           end
@@ -0,0 +1,17 @@
+module Noosfero
+  module API
+    module V1
+
+      class Blocks < Grape::API
+        resource :blocks do
+          get ':id' do
+            block = Block.find(params["id"])
+            return forbidden! unless block.visible_to_user?(current_person)
+            present block, :with => Entities::Block, display_api_content: true
+          end
+        end
+      end
+
+    end
+  end
+end
@@ -55,11 +55,10 @@ module Noosfero
           post ':id' do
             authenticate!
             return forbidden! if current_person.id.to_s != params[:id]
-            current_person.update_attributes!(params[:person])
+            current_person.update_attributes!(asset_with_image(params[:person]))
             present current_person, :with => Entities::Person, :current_person => current_person
           end
-
-          # Example Request:
+          
           #  POST api/v1/people?person[login]=some_login&person[password]=some_password&person[name]=Jack
           #  for each custom field for person, add &person[field_name]=field_value to the request
           desc "Create person"
@@ -76,7 +75,7 @@ module Noosfero
               params[:person][:custom_values][key]=params[:person].delete(key) if Person.custom_fields(environment).any?{|cf| cf.name==key}
             end
-            user = User.build(user_data, params[:person], environment)
+            user = User.build(user_data, asset_with_image(params[:person]), environment)
             begin
               user.signup!
@@ -1,5 +0,0 @@
-require 'noosfero/core_ext/string'
-require 'noosfero/core_ext/integer'
-require 'noosfero/core_ext/active_record/calculations'
-require 'noosfero/core_ext/active_record/reflection'
-
@@ -1,10 +0,0 @@
-ActiveRecord::Calculations.class_eval do
-  def count_with_distinct column_name=self.primary_key
-    if column_name
-      distinct.count_without_distinct column_name
-    else
-      count_without_distinct
-    end
-  end
-  alias_method_chain :count, :distinct
-end
@@ -1,20 +0,0 @@
-
-# on STI classes tike Article and Profile, plugins' extensions
-# on associations should be reflected on descendants
-module ActiveRecord
-  module Reflection
-
-    class << self
-
-      def add_reflection_with_descendants(ar, name, reflection)
-        self.add_reflection_without_descendants ar, name, reflection
-        ar.descendants.each do |k|
-          k._reflections.merge!(name.to_s => reflection)
-        end if ar.base_class == ar
-      end
-
-      alias_method_chain :add_reflection, :descendants
-
-    end
-  end
-end
@@ -1,39 +0,0 @@
-class Integer
-  def to_humanreadable
-    value = self
-	  if value < 1023
-	  	return "%i bytes" % value
-    end
-	  value /= 1024
-
-	  if value < 1023
-	  	return "%1.1f KB" % value
-    end
-	  value /= 1024
-
-	  if value < 1023
-	  	return "%1.1f MB" % value
-    end
-	  value /= 1024
-
-	  if value < 1023
-	  	return "%1.1f GB" % value
-    end
-	  value /= 1024
-
-	  if value < 1023
-	  	return "%1.1f TB" % value
-    end
-	  value /= 1024
-
-	  if value < 1023
-	  	return "%1.1f PB" % value
-    end
-	  value /= 1024
-
-	  if value < 1023
-	  	return "%1.1f EB" % value
-    end
-	  value /= 1024
-  end
-end
@@ -1,93 +0,0 @@
-# encoding: utf-8
-
-class String
-
-  TRANSLITERATIONS = {
-    [ 'Á', 'À', 'À', 'Â', 'Ã', 'Ä', 'Å' ] => 'A',
-    [ 'á', 'à', 'à', 'â', 'ã', 'ä', 'å' ,'ª' ] => 'a',
-    [ 'É', 'È', 'Ê', 'Ë' ] => 'E',
-    [ 'é', 'è', 'ê', 'ë' ] => 'e',
-    [ 'Í', 'Ì', 'Î', 'Ï' ] => 'I',
-    [ 'í', 'ì', 'î', 'ï' ] => 'i',
-    [ 'Ó', 'Ò', 'Ô', 'Ö', 'Õ', 'º' ] => 'O',
-    [ 'ó', 'ò', 'ô', 'ö', 'õ', 'º' ] => 'o',
-    [ 'Ú', 'Ù', 'Û', 'Ü' ] => 'U',
-    [ 'ú', 'ù', 'û', 'ü' ] => 'u',
-    [ 'ß' ] => 'ss',
-    [ 'Ç' ] => 'C',
-    [ 'ç' ] => 'c',
-    [ 'Ñ' ] => 'N',
-    [ 'ñ' ] => 'n',
-    [ 'Ÿ' ] => 'Y',
-    [ 'ÿ' ] => 'y',
-# Cyrillic alphabet transliteration
-    [ 'а', 'А' ] => 'a',
-    [ 'б', 'Б' ] => 'b',
-    [ 'в', 'В' ] => 'v',
-    [ 'г', 'Г' ] => 'g',
-    [ 'д', 'Д' ] => 'd',
-    [ 'е', 'Е' ] => 'e',
-    [ 'ё', 'Ё' ] => 'yo',
-    [ 'ж', 'Ж' ] => 'zh',
-    [ 'з', 'З' ] => 'z',
-    [ 'и', 'И' ] => 'i',
-    [ 'й', 'Й' ] => 'y',
-    [ 'к', 'К' ] => 'k',
-    [ 'л', 'Л' ] => 'l',
-    [ 'м', 'М' ] => 'm',
-    [ 'н', 'Н' ] => 'n',
-    [ 'о', 'О' ] => 'o',
-    [ 'п', 'П' ] => 'p',
-    [ 'р', 'Р' ] => 'r',
-    [ 'с', 'С' ] => 's',
-    [ 'т', 'Т' ] => 't',
-    [ 'у', 'У' ] => 'u',
-    [ 'ф', 'Ф' ] => 'f',
-    [ 'х', 'Х' ] => 'h',
-    [ 'ц', 'Ц' ] => 'ts',
-    [ 'ч', 'Ч' ] => 'ch',
-    [ 'ш', 'Ш' ] => 'sh',
-    [ 'щ', 'Щ' ] => 'sch',
-    [ 'э', 'Э' ] => 'e',
-    [ 'ю', 'Ю' ] => 'yu',
-    [ 'я', 'Я' ] => 'ya',
-    [ 'ы', 'Ы' ] => 'i',
-    [ 'ь', 'Ь' ] => '',
-    [ 'ъ', 'Ъ' ] => '',
-# Ukrainian lovely letters
-    [ 'і', 'І' ] => 'i',
-    [ 'ї', 'Ї' ] => 'yi',
-    [ 'є', 'Є' ] => 'ye',
-    [ 'ґ', 'Ґ' ] => 'g',
-  }
-
-  # transliterate a string (assumed to contain UTF-8 data)
-  # into ASCII by replacing non-ascii characters to their
-  # ASCII.
-  #
-  # The transliteration is, of course, lossy, and its performance is poor.
-  # Don't abuse this method.
-  def transliterate
-
-    new = self.dup
-    TRANSLITERATIONS.each { |from,to|
-      from.each { |seq|
-        new.gsub!(seq, to)
-      }
-    }
-    new
-  end
-
-  def to_slug
-    transliterate.downcase.gsub(/[^[[:word:]]~\s:;+=_."'`-]/, '').gsub(/[\s:;+=_"'`-]+/, '-').gsub(/-$/, '').gsub(/^-/, '').to_s
-  end
-
-  def to_css_class
-    underscore.dasherize.gsub('/','_')
-  end
-
-  def fix_i18n
-    self.sub('{fn} ', '')
-  end
-
-end
@@ -12,14 +12,13 @@ module Noosfero
     def self.db_by_host=(host)
       if host != @db_by_host
         @db_by_host = host
-        ApplicationRecord.connection.schema_search_path = self.mapping[host]
+        ActiveRecord::Base.connection.schema_search_path = self.mapping[host]
       end
     end
     def self.setup!(host)
-      if Noosfero::MultiTenancy.on? and ApplicationRecord.postgresql?
-        Noosfero::MultiTenancy.db_by_host = host
-      end
+      return unless Noosfero::MultiTenancy.on?
+      Noosfero::MultiTenancy.db_by_host = host
     end
     class Middleware
@@ -7,11 +7,11 @@ GC.respond_to?(:copy_on_write_friendly=) and
   GC.copy_on_write_friendly = true
 before_fork do |server, worker|
-  ApplicationRecord.connection.disconnect! if defined?(ApplicationRecord)
+  ActiveRecord::Base.connection.disconnect! if defined? ActiveRecord::Base
 end
 after_fork do |server, worker|
-  ApplicationRecord.establish_connection if defined?(ApplicationRecord)
+  ActiveRecord::Base.establish_connection if defined? ActiveRecord::Base
 end
 # load local configuration file, if it exists
@@ -9,12 +9,12 @@ module PostgresqlAttachmentFu
   module InstanceMethods
     def full_filename(thumbnail = nil)
       file_system_path = (thumbnail ? thumbnail_class : self).attachment_options[:path_prefix].to_s
-      file_system_path = File.join(file_system_path, ApplicationRecord.connection.schema_search_path) if ApplicationRecord.postgresql? and Noosfero::MultiTenancy.on?
+      file_system_path = File.join(file_system_path, ActiveRecord::Base.connection.schema_search_path) if Noosfero::MultiTenancy.on?
       Rails.root.join(file_system_path, *partitioned_path(thumbnail_name_for(thumbnail))).to_s
     end
   end
 end
-ApplicationRecord.extend PostgresqlAttachmentFu::ClassMethods
+ActiveRecord::Base.extend PostgresqlAttachmentFu::ClassMethods
@@ -69,5 +69,5 @@ module SplitDatetime
 end
 Class.extend SplitDatetime::SplitMethods
-ApplicationRecord.extend SplitDatetime::SplitMethods
+ActiveRecord::Base.extend SplitDatetime::SplitMethods
@@ -1,28 +0,0 @@
-if ApplicationRecord.connection.adapter_name.downcase == 'sqlite'
-
-  database = ApplicationRecord.connection.raw_connection
-
-  database.create_function('pow', 2, 1) do |func, base, exponent|
-    func.set_result(base.to_f ** exponent.to_f)
-  end
-
-  database.create_function('sqrt', 1, 1) do |func, value|
-    func.set_result(Math.sqrt(value))
-  end
-
-  database.create_function('radians', 1, 1) do |func, value|
-    func.set_result(value.to_f * Math::PI / 180.0)
-  end
-
-  database.create_function('spheric_distance', 5, 1) do |func, lat1, long1, lat2, long2, radius|
-    func.set_result(
-      radius.to_f * Math.acos(
-	[1,
-        Math.cos(lat1.to_f) * Math.cos(long1.to_f) * Math.cos(lat2.to_f) * Math.cos(long2.to_f) +
-         Math.cos(lat1.to_f) * Math.sin(long1.to_f) * Math.cos(lat2.to_f) * Math.sin(long2.to_f) +
-         Math.sin(lat1.to_f) * Math.sin(lat2.to_f)
-        ].min
-      )
-    )
-  end
-end
@@ -115,7 +115,7 @@ end
 desc 'Removes emails from database'
 task 'restore:remove_emails' => :environment do
-  connection = ApplicationRecord.connection
+  connection = ActiveRecord::Base.connection
   [
     "UPDATE users SET email = concat('user', id, '@localhost.localdomain')",
     "UPDATE environments SET contact_email = concat('environment', id, '@localhost.localdomain')",
 namespace :multitenancy do
   task :create => :environment do
-    db_envs = ApplicationRecord.configurations.keys.select{ |k| k.match(/_development$|_production$|_test$/) }
+    db_envs = ActiveRecord::Base.configurations.keys.select{ |k| k.match(/_development$|_production$|_test$/) }
     cd Rails.root.join('config', 'environments'), :verbose => true
     file_envs = Dir.glob "{*_development.rb,*_production.rb,*_test.rb}"
     (db_envs.map{ |e| e + '.rb' } - file_envs).each { |env| ln_s env.split('_').last, env }
   end
   task :remove => :environment do
-    db_envs = ApplicationRecord.configurations.keys.select{ |k| k.match(/_development$|_production$|_test$/) }
+    db_envs = ActiveRecord::Base.configurations.keys.select{ |k| k.match(/_development$|_production$|_test$/) }
     cd Rails.root.join('config', 'environments'), :verbose => true
     file_envs = Dir.glob "{*_development.rb,*_production.rb,*_test.rb}"
     (file_envs - db_envs.map{ |e| e + '.rb' }).each { |env| safe_unlink env }
@@ -19,7 +19,7 @@ end
 namespace :db do
   task :migrate_other_environments => :environment do
-    envs = ApplicationRecord.configurations.keys.select{ |k| k.match(/_#{Rails.env}$/) }
+    envs = ActiveRecord::Base.configurations.keys.select{ |k| k.match(/_#{Rails.env}$/) }
     envs.each do |e|
       puts "*** Migrating #{e}" if Rake.application.options.trace
       system "rake db:migrate RAILS_ENV=#{e} SCHEMA=/dev/null"
@@ -10,4 +10,4 @@ module UploadSanitizer
   end
 end
-ApplicationRecord.send :include, UploadSanitizer
+ActiveRecord::Base.send :include, UploadSanitizer
-class AdminNotificationsPlugin::NotificationsUser < ActiveRecord::Base
+class AdminNotificationsPlugin::NotificationsUser < ApplicationRecord
   self.table_name = "admin_notifications_plugin_notifications_users"
   belongs_to :user
-class AdminNotificationsPlugin::Notification < ActiveRecord::Base
+class AdminNotificationsPlugin::Notification < ApplicationRecord
   self.table_name = "admin_notifications_plugin_notifications"
@@ -9,12 +9,12 @@
         </div>
       </div>
       <div class="notification-message notification-with-title-message">
-        <%= AdminNotificationsPlugin::NotificationHelper.substitute_variables(notification.message, current_user) %>
+        <%= AdminNotificationsPlugin::NotificationHelper.substitute_variables(notification.message, current_user).html_safe %>
       </div>
     <% else %>
       <div class="<%= notification.type.gsub("AdminNotificationsPlugin::", "").downcase %> notification notification-without-title" data-notification="<%=notification.id%>">
         <div class="notification-message">
-          <%= AdminNotificationsPlugin::NotificationHelper.substitute_variables(notification.message, current_user) %>
+          <%= AdminNotificationsPlugin::NotificationHelper.substitute_variables(notification.message, current_user).html_safe %>
         </div>
       </div>
     <% end %>
@@ -23,7 +23,7 @@
   <% @notifications.each do |notification| %>
     <div class="notification-line">
       <div class="notification-message">
-        <%= truncate(notification.message, length: 50) %>
+        <%= truncate(notification.message.html_safe, length: 50) %>
       </div>
       <div class="notification-action">
         <% if notification.active? %>
@@ -22,7 +22,7 @@
   <% @notifications.each do |notification| %>
     <div class="<%= notification.type.gsub("AdminNotificationsPlugin::", "").downcase %> notification" data-notification="<%=notification.id%>" notification-display-popup="<%=notification.display_popup?%>">
       <div class="notification-message">
-        <%= AdminNotificationsPlugin::NotificationHelper.substitute_variables(notification.message, current_user) %>
+        <%= AdminNotificationsPlugin::NotificationHelper.substitute_variables(notification.message, current_user).html_safe %>
       </div>
       <% if logged_in? %>
         <div class="notification-close" title="<%= _('Do not show anymore') %>"></div>
@@ -22,70 +22,8 @@ class BreadcrumbsPlugin::ContentBreadcrumbsBlock &lt; Block
     _('This block displays breadcrumb trail.')
   end
-  def page_trail(page, params={})
-    links = []
-    if page
-      links = page.ancestors.reverse.map { |p| { :name => p.title, :url => p.url } }
-      links << { :name => page.title, :url => page.url }
-    elsif params[:controller] == 'cms'
-      id = params[:id] || params[:parent_id]
-      links = page_trail(Article.find(id)) if id
-      links << { :name => cms_action(params[:action]), :url => params } if show_cms_action
-    elsif (params[:controller] == 'profile' || params[:controller] == 'events')
-      links << { :name => _('Profile'), :url => {:controller=> 'profile', :action =>'index', :profile =>params[:profile]}}
-      links << { :name => profile_action(params[:action]), :url => params } unless params[:action] == 'index'
-    end
-    links
-  end
-
-  def trail(page, profile=nil, params={})
-    links = page_trail(page, params)
-    if profile && !links.empty? && show_profile
-      [ {:name => profile.name, :url => profile.url} ] + links
-    else
-      links
-    end
-  end
-
-  def content(args={})
-    block = self
-    ret = (proc do
-      trail = block.trail(@page, @profile, params)
-      if !trail.empty?
-        separator = content_tag('span', ' > ', :class => 'separator')
-
-        breadcrumb = trail.map do |t|
-          link_to(t[:name], t[:url], :class => 'item')
-        end.join(separator)
-
-        if block.show_section_name
-          section_name = block.show_profile ? trail.second[:name] : trail.first[:name]
-          breadcrumb << content_tag('div', section_name, :class => 'section-name')
-        end
-
-        breadcrumb.html_safe
-      else
-        ''
-      end
-    end)
-    ret
-  end
-
   def cacheable?
     false
   end
-  protected
-
-  CMS_ACTIONS = {:edit => c_('Edit'), :upload_files => _('Upload Files'), :new => c_('New')}
-  PROFILE_ACTIONS = {:members => _('Members'), :events => _('Events')}
-
-  def cms_action(action)
-    CMS_ACTIONS[action.to_sym] || action
-  end
-
-  def profile_action(action)
-    PROFILE_ACTIONS[action.to_sym] || action
-  end
-
 end
@@ -0,0 +1,43 @@
+module BreadcrumbsPluginHelper
+
+  def action(action)
+    { :edit => c_('Edit'),
+      :upload_files => _('Upload Files'),
+      :new => c_('New'),
+      :members => _('Members'),
+      :events => _('Events')
+    }[action.to_sym] || action
+  end
+
+  def page_trail(page)
+    links = []
+    page.ancestors.reverse.each do |p|
+      links << { :name => p.title, :url => p.url }
+    end
+    links << { :name => page.title, :url => page.url }
+    links
+  end
+
+  def trail(block, page, profile=nil, params={})
+    links = []
+    if page
+      links += page_trail(page)
+    elsif params[:controller] == 'cms' && (id = params[:id] || params[:parent_id])
+      links += page_trail(Article.find(id))
+      if block.show_cms_action
+        links << { :name => action(params[:action]), :url => params }
+      end
+    elsif (params[:controller] == 'profile' || params[:controller] == 'events')
+      _params = {:controller=> 'profile', :action =>'index', :profile => params[:profile]}
+      links << { :name => _('Profile'), :url => _params }
+      unless params[:action] == 'index'
+        links << { :name => action(params[:action]), :url => params }
+      end
+    end
+    if !links.empty? && profile && block.show_profile
+      links.unshift({:name => profile.name, :url => profile.url})
+    end
+    links
+  end
+
+end
@@ -0,0 +1,66 @@
+require 'test_helper'
+
+class BreadcrumbsPluginHelperTest < ActionView::TestCase
+  include BreadcrumbsPluginHelper
+
+  def setup
+    @block = BreadcrumbsPlugin::ContentBreadcrumbsBlock.new
+    @profile = fast_create(Community)
+    @folder = fast_create(Folder, :profile_id => @profile.id)
+    @article = fast_create(Folder, :profile_id => @profile.id, :parent_id => @folder.id)
+    @params = {}
+  end
+
+  attr_reader :params
+
+  should 'return path of links to reach a page' do
+    links = [{:name => @folder.name, :url => @folder.url}, {:name => @article.name, :url => @article.url}]
+    assert_equal links, page_trail(@article)
+  end
+
+  should 'return path of links when current page is at cms controller' do
+    params = {:controller => 'cms', :action => 'edit', :id => @article.id}
+    links = [{:name => @folder.name, :url => @folder.url}, {:name => @article.name, :url => @article.url}, {:url=>params, :name=>"Edit"}]
+    assert_equal links, trail(@block, nil, nil, params)
+  end
+
+  should 'not return cms action link when show_cms_action is false' do
+    params = {:controller => 'cms', :action => 'edit', :id => @article.id}
+    links = [{:name => @folder.name, :url => @folder.url}, {:name => @article.name, :url => @article.url}]
+    @block.show_cms_action = false
+    assert_equal links, trail(@block, nil, nil, params)
+  end
+
+  should 'include profile page link on path of links to reach a profile controller page' do
+    params = {:controller => 'profile', :action => 'members', :profile => @profile.identifier}
+    links = [{:name => 'Profile', :url => {:controller => 'profile', :action => 'index', :profile => @profile.identifier}}, {:name => 'Members', :url => {:controller=>'profile', :action=>'members', :profile=> @profile.identifier}}]
+    assert_equal links, trail(@block, nil, nil, params)
+  end
+
+  should 'include only the profile page link on path links when profile action is index' do
+    params = {:controller => 'profile', :action => 'index', :profile => @profile.identifier}
+    links = [{:name => 'Profile', :url => {:controller => 'profile', :action => 'index', :profile => @profile.identifier}}]
+    assert_equal links, trail(@block, nil, nil, params)
+  end
+
+  should 'profile page be the ancestor page of event profile page calendar' do
+    params = {:controller => 'profile', :action => 'events', :profile => @profile.identifier}
+    links = [{:name => 'Profile', :url => {:controller => 'profile', :action => 'index', :profile => @profile.identifier}}, {:name => 'Events', :url => {:controller=>'profile', :action=>'events', :profile=> @profile.identifier}}]
+    assert_equal links, trail(@block, nil, nil, params)
+  end
+
+  should 'include profile link on path of links to reach a page' do
+    links = [{:name => @profile.name, :url => @profile.url}, {:name => @folder.name, :url => @folder.url}, {:name => @article.name, :url => @article.url}]
+    assert_equal links, trail(@block, @article, @profile)
+  end
+
+  should 'not include profile link on path of links when show_profile is false' do
+    links = [{:name => @folder.name, :url => @folder.url}, {:name => @article.name, :url => @article.url}]
+    @block.show_profile = false
+    assert_equal links, trail(@block, @article, @profile)
+  end
+
+  should 'not include profile link on path of links when trail is empty' do
+    assert_equal [], trail(@block, nil, @profile)
+  end
+end
@@ -6,14 +6,8 @@ class ContentBreadcrumbsBlockTest &lt; ActiveSupport::TestCase
   def setup
     @block = BreadcrumbsPlugin::ContentBreadcrumbsBlock.new
-    @profile = fast_create(Community)
-    @folder = fast_create(Folder, :profile_id => @profile.id)
-    @article = fast_create(Folder, :profile_id => @profile.id, :parent_id => @folder.id)
-    @params = {}
   end
-  attr_reader :params
-
   should 'has a description' do
     assert_not_equal Block.description, BreadcrumbsPlugin::ContentBreadcrumbsBlock.description
   end
@@ -22,60 +16,28 @@ class ContentBreadcrumbsBlockTest &lt; ActiveSupport::TestCase
     assert @block.help
   end
-  should 'return path of links to reach a page' do
-    links = [{:name => @folder.name, :url => @folder.url}, {:name => @article.name, :url => @article.url}]
-    assert_equal links, @block.page_trail(@article)
-  end
-
-  should 'return path of links when current page is at cms controller' do
-    params = {:controller => 'cms', :action => 'edit', :id => @article.id}
-    links = [{:name => @folder.name, :url => @folder.url}, {:name => @article.name, :url => @article.url}, {:url=>{:controller=>"cms", :action=>"edit", :id=>@article.id}, :name=>"Edit"}]
-    assert_equal links, @block.page_trail(nil, params)
-  end
-
-  should 'not return cms action link when show_cms_action is false' do
-    params = {:controller => 'cms', :action => 'edit', :id => @article.id}
-    links = [{:name => @folder.name, :url => @folder.url}, {:name => @article.name, :url => @article.url}]
-    @block.show_cms_action = false
-    assert_equal links, @block.page_trail(nil, params)
-  end
-
-  should 'include profile page link on path of links to reach a profile controller page' do
-    params = {:controller => 'profile', :action => 'members', :profile => @profile.identifier}
-    links = [{:name => 'Profile', :url => {:controller => 'profile', :action => 'index', :profile => @profile.identifier}}, {:name => 'Members', :url => {:controller=>'profile', :action=>'members', :profile=> @profile.identifier}}]
-    assert_equal links, @block.page_trail(nil, params)
-  end
-  should 'include only the profile page link on path links when profile action is index' do
-    params = {:controller => 'profile', :action => 'index', :profile => @profile.identifier}
-    links = [{:name => 'Profile', :url => {:controller => 'profile', :action => 'index', :profile => @profile.identifier}}]
-    assert_equal links, @block.page_trail(nil, params)
+  should 'not be cacheable' do
+    refute @block.cacheable?
   end
-  should 'profile page be the ancestor page of event profile page calendar' do
-    params = {:controller => 'profile', :action => 'events', :profile => @profile.identifier}
-    links = [{:name => 'Profile', :url => {:controller => 'profile', :action => 'index', :profile => @profile.identifier}}, {:name => 'Events', :url => {:controller=>'profile', :action=>'events', :profile=> @profile.identifier}}]
-    assert_equal links, @block.page_trail(nil, params)
-  end
+end
-  should 'include profile link on path of links to reach a page' do
-    links = [{:name => @profile.name, :url => @profile.url}, {:name => @folder.name, :url => @folder.url}, {:name => @article.name, :url => @article.url}]
-    assert_equal links, @block.trail(@article, @profile)
-  end
+require 'boxes_helper'
-  should 'not include profile link on path of links when show_profile is false' do
-    links = [{:name => @folder.name, :url => @folder.url}, {:name => @article.name, :url => @article.url}]
-    @block.show_profile = false
-    assert_equal links, @block.trail(@article, @profile)
-  end
+class ContentBreadcrumbsBlockViewTest < ActionView::TestCase
+  include BoxesHelper
-  should 'not include profile link on path of links when trail is empty' do
-    assert_equal [], @block.trail(nil, @profile)
+  def setup
+    @block = BreadcrumbsPlugin::ContentBreadcrumbsBlock.new
+    @profile = fast_create(Community)
+    @folder = fast_create(Folder, :profile_id => @profile.id)
+    @article = fast_create(Folder, :profile_id => @profile.id, :parent_id => @folder.id)
   end
   should 'render trail if there is links to show' do
     @page = @article
-    trail = instance_eval(&@block.content)
+    trail = render_block_content(@block)
     assert_match /#{@profile.name}/, trail
     assert_match /#{@folder.name}/, trail
     assert_match /#{@page.name}/, trail
@@ -83,11 +45,6 @@ class ContentBreadcrumbsBlockTest &lt; ActiveSupport::TestCase
   should 'render nothing if there is no links to show' do
     @page = nil
-    assert_equal '', instance_eval(&@block.content)
-  end
-
-  should 'not be cacheable' do
-    refute @block.cacheable?
+    assert_equal '', render_block_content(@block)
   end
-
 end
@@ -0,0 +1 @@
+== link_to link[:name], link[:url], :class => 'item'
@@ -0,0 +1,2 @@
+span class='separator'
+  |>
@@ -0,0 +1,11 @@
+- extend BreadcrumbsPluginHelper
+
+- links = trail(block, @page, @profile, params).flatten
+- unless links.empty?
+  == render :partial => 'blocks/link', :collection => links, :as => 'link', :spacer_template => 'blocks/separator'
+  - if block.show_section_name
+    div class='section-name'
+      - if block.show_profile
+        = links.second[:name]
+      - else
+        = links.first[:name]
@@ -161,7 +161,7 @@ class DisplayContentBlock &lt; Block
                 read_more_section = content_tag('div', link_to(_('Read more'), item.url), :class => 'read_more')
               end
             when 'body'
-              content_sections += (block.display_section?(section) ? (content_tag('div', item.body ,:class => 'body')) : '' )
+              content_sections += (block.display_section?(section) ? (content_tag('div', item.body.html_safe ,:class => 'body')) : '' )
             when 'image'
               image_section = image_tag item.image.public_filename if item.image
               if !image_section.blank?
 class EventPlugin::EventBlock < Block
-  include DatesHelper
-
   attr_accessible :all_env_events, :limit, :future_only, :date_distance_limit
   settings_items :all_env_events, :type => :boolean, :default => false
@@ -49,38 +47,6 @@ class EventPlugin::EventBlock &lt; Block
     event_list
   end
-  def content(args={})
-    block = self
-    proc do
-      render(
-        :file => 'blocks/event',
-        :locals => { :block => block }
-      )
-    end
-  end
-
-  def human_time_left(days_left)
-    months_left = (days_left/30.0).round
-    if days_left <= -60
-      n_('One month ago', '%d months ago', -months_left) % -months_left
-    elsif days_left < 0
-      n_('Yesterday', '%d days ago', -days_left) % -days_left
-    elsif days_left == 0
-      _("Today")
-    elsif days_left < 60
-      n_('Tomorrow', '%d days left to start', days_left) % days_left
-    else
-      n_('One month left to start', '%d months left to start', months_left) % months_left
-    end
-  end
-
-  def date_to_html(date)
-    content_tag(:span, show_day_of_week(date, true), :class => 'week-day') +
-    content_tag(:span, month_name(date.month, true), :class => 'month') +
-    content_tag(:span, date.day.to_s, :class => 'day') +
-    content_tag(:span, date.year.to_s, :class => 'year')
-  end
-
   def self.expire_on
       { :profile => [:article], :environment => [:article] }
   end
@@ -0,0 +1,25 @@
+module EventPlugin::EventBlockHelper
+  include DatesHelper
+
+  def date_to_html(date)
+    content_tag(:span, show_day_of_week(date, true), :class => 'week-day') +
+    content_tag(:span, month_name(date.month, true), :class => 'month') +
+    content_tag(:span, date.day.to_s, :class => 'day') +
+    content_tag(:span, date.year.to_s, :class => 'year')
+  end
+
+  def human_time_left(days_left)
+    months_left = (days_left/30.0).round
+    if days_left <= -60
+      n_('One month ago', '%d months ago', -months_left) % -months_left
+    elsif days_left < 0
+      n_('Yesterday', '%d days ago', -days_left) % -days_left
+    elsif days_left == 0
+      _("Today")
+    elsif days_left < 60
+      n_('Tomorrow', '%d days left to start', days_left) % days_left
+    else
+      n_('One month left to start', '%d months left to start', months_left) % months_left
+    end
+  end
+end
@@ -0,0 +1,34 @@
+require 'test_helper'
+
+class EventBlockHelperTest < ActionView::TestCase
+  include EventPlugin::EventBlockHelper
+
+  should 'write formatable data in html' do
+    html = '<span class="week-day">Tue</span>'+
+           '<span class="month">Sep</span>'+
+           '<span class="day">27</span>'+
+           '<span class="year">1983</span>'
+
+    assert_equal html, date_to_html(Date.new 1983, 9, 27)
+  end
+
+  should 'say human left time for an event' do
+    assert_match /Tomorrow/, human_time_left(1)
+    assert_match /5 days left/, human_time_left(5)
+    assert_match /30 days left/, human_time_left(30)
+    assert_match /2 months left/, human_time_left(60)
+    assert_match /3 months left/, human_time_left(85)
+  end
+
+  should 'say human past time for an event' do
+    assert_match /Yesterday/, human_time_left(-1)
+    assert_match /5 days ago/, human_time_left(-5)
+    assert_match /30 days ago/, human_time_left(-30)
+    assert_match /2 months ago/, human_time_left(-60)
+    assert_match /3 months ago/, human_time_left(-85)
+  end
+
+  should 'say human present time for an event' do
+    assert_match /Today/, human_time_left(0)
+  end
+end
@@ -77,35 +77,6 @@ class EventBlockTest &lt; ActiveSupport::TestCase
     assert_equal 2, @block.events.length
   end
-  should 'say human left time for an event' do
-    assert_match /Tomorrow/, @block.human_time_left(1)
-    assert_match /5 days left/, @block.human_time_left(5)
-    assert_match /30 days left/, @block.human_time_left(30)
-    assert_match /2 months left/, @block.human_time_left(60)
-    assert_match /3 months left/, @block.human_time_left(85)
-  end
-
-  should 'say human past time for an event' do
-    assert_match /Yesterday/, @block.human_time_left(-1)
-    assert_match /5 days ago/, @block.human_time_left(-5)
-    assert_match /30 days ago/, @block.human_time_left(-30)
-    assert_match /2 months ago/, @block.human_time_left(-60)
-    assert_match /3 months ago/, @block.human_time_left(-85)
-  end
-
-  should 'say human present time for an event' do
-    assert_match /Today/, @block.human_time_left(0)
-  end
-
-  should 'write formatable data in html' do
-    html = '<span class="week-day">Tue</span>'+
-           '<span class="month">Sep</span>'+
-           '<span class="day">27</span>'+
-           '<span class="year">1983</span>'
-
-    assert_equal html, @block.date_to_html(Date.new 1983, 9, 27)
-  end
-
   should 'show unlimited time distance events' do
     @block.box.owner = @env
     @block.all_env_events = true
+<% extend EventPlugin::EventBlockHelper %>
+
 <%= block_title(block.title, block.subtitle) %>
 <ul class="events">
@@ -10,7 +12,7 @@
                 :event => event,
                 :block => block,
                 :time_class => days_left < 0 ? 'past' : 'future',
-                :time_left_str => block.human_time_left(days_left)
+                :time_left_str => human_time_left(days_left)
               }
             )
         %>
 <%
+  extend EventPlugin::EventBlockHelper
+
   # compute layout values
   ev_days_tag = ''
   if event.duration > 1
@@ -18,7 +20,7 @@
 <%=
   link_to(safe_join([
       content_tag('time',
-        block.date_to_html(event.start_date),
+        date_to_html(event.start_date),
         :itemprop => 'startDate',
         :datetime => show_date(event.start_date),
         :class => 'date ' + img_class, :style => bg,
@@ -53,7 +53,7 @@ class LdapPlugin &lt; Noosfero::Plugin
     return nil if attrs.nil?
     user_login = get_login(attrs, ldap.attr_login, login)
-    user = User.find_or_initialize_by_login(user_login)
+    user = User.find_or_initialize_by(login: user_login)
     return nil if !user.new_record? && !user.activated?
     user.login = user_login
@@ -35,12 +35,4 @@ class ProfileMembersHeadlinesBlock &lt; Block
     result.select{ |p| p.has_headline? }.slice(0..limit-1)
   end
-  def content(args={})
-    block = self
-    members = authors_list
-    proc do
-      render :file => 'blocks/headlines', :locals => { :block => block, :members => members }
-    end
-  end
-
 end
 require 'test_helper'
+require 'boxes_helper'
 class ProfileMembersHeadlinesBlockTest < ActiveSupport::TestCase
   include Noosfero::Plugin::HotSpot
+  include BoxesHelper
   def setup
     @environment = fast_create(Environment)
@@ -32,8 +34,8 @@ class ProfileMembersHeadlinesBlockTest &lt; ActiveSupport::TestCase
     block = ProfileMembersHeadlinesBlock.create
     block.stubs(:owner).returns(community)
-    self.expects(:render).with(:file => 'blocks/headlines', :locals => { :block => block, :members => []}).returns('file-without-authors-and-headlines')
-    assert_equal 'file-without-authors-and-headlines', instance_eval(&block.content)
+    self.expects(:render).with(:template => 'blocks/profile_members_headlines', :locals => { :block => block }).returns('file-without-authors-and-headlines')
+    assert_equal 'file-without-authors-and-headlines', render_block_content(block)
   end
   should 'display headlines file' do
@@ -41,8 +43,8 @@ class ProfileMembersHeadlinesBlockTest &lt; ActiveSupport::TestCase
     block.stubs(:owner).returns(community)
     blog = fast_create(Blog, :profile_id => member1.id)
     post = fast_create(TinyMceArticle, :name => 'headlines', :profile_id => member1.id, :parent_id => blog.id)
-    self.expects(:render).with(:file => 'blocks/headlines', :locals => { :block => block, :members => []}).returns('file-with-authors-and-headlines')
-    assert_equal 'file-with-authors-and-headlines', instance_eval(&block.content)
+    self.expects(:render).with(:template => 'blocks/profile_members_headlines', :locals => { :block => block }).returns('file-with-authors-and-headlines')
+    assert_equal 'file-with-authors-and-headlines', render_block_content(block)
   end
   should 'select only authors with articles and selected roles to display' do
@@ -1,39 +0,0 @@
-<%= block_title(block.title, block.subtitle) %>
-
-<% unless members.empty? %>
-  <div class='headlines-container'>
-    <% members.each do |member| %>
-      <div>
-        <% headline = member.headline %>
-        <%= link_to_profile(profile_image(member, :big) + content_tag(:p, member.short_name), member.identifier, {:class => 'author'})  %>
-        <div class='post'>
-          <h4><%= link_to(headline.title, headline.url, :class => 'title') %></h4>
-          <div class='lead'>
-            <%= headline.short_lead %>
-          </div>
-          <div class='date'>
-            <%= show_date(headline.published_at) %>
-          </div>
-          <div class='tags'>
-            <%= safe_join(headline.tags.map { |t| link_to(t, :controller => 'profile', :profile => member.identifier, :action => 'tags', :id => t.name ) }, "\n") %>
-          </div>
-        </div>
-      </div>
-    <% end %>
-  </div>
-  <% if block.navigation %>
-    <div class='headlines-block-pager'>
-    </div>
-  <% end %>
-
-  <script>
-    (function($) {
-     var options = {fx: 'fade', pause: 1, fastOnEvent: 1, timeout: <%= block.interval * 1000 %>};
-      options.pager = '#block-<%= block.id %> .headlines-block-pager';
-      $('#block-<%= block.id %> .headlines-container').cycle(options);
-    })(jQuery);
-  </script>
-<% else %>
-  <em><%= _('No headlines to be shown.') %></em>
-<% end %>
-
@@ -0,0 +1,40 @@
+<%= block_title(block.title, block.subtitle) %>
+<% members = block.authors_list %>
+
+<% unless members.empty? %>
+  <div class='headlines-container'>
+    <% members.each do |member| %>
+      <div>
+        <% headline = member.headline %>
+        <%= link_to_profile(profile_image(member, :big) + content_tag(:p, member.short_name), member.identifier, {:class => 'author'})  %>
+        <div class='post'>
+          <h4><%= link_to(headline.title, headline.url, :class => 'title') %></h4>
+          <div class='lead'>
+            <%= headline.short_lead %>
+          </div>
+          <div class='date'>
+            <%= show_date(headline.published_at) %>
+          </div>
+          <div class='tags'>
+            <%= safe_join(headline.tags.map { |t| link_to(t, :controller => 'profile', :profile => member.identifier, :action => 'tags', :id => t.name ) }, "\n") %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+  <% if block.navigation %>
+    <div class='headlines-block-pager'>
+    </div>
+  <% end %>
+
+  <script>
+    (function($) {
+     var options = {fx: 'fade', pause: 1, fastOnEvent: 1, timeout: <%= block.interval * 1000 %>};
+      options.pager = '#block-<%= block.id %> .headlines-block-pager';
+      $('#block-<%= block.id %> .headlines-container').cycle(options);
+    })(jQuery);
+  </script>
+<% else %>
+  <em><%= _('No headlines to be shown.') %></em>
+<% end %>
+
@@ -33,7 +33,7 @@ class RecentContentBlock &lt; Block
   end
   def parents
-    self.holder.articles.where(type: 'Blog')
+    self.holder.nil? ? [] : self.holder.articles.where(type: 'Blog')
   end
   def root
@@ -48,4 +48,12 @@ class RecentContentBlock &lt; Block
     attr == self.presentation_mode
   end
+  def api_content
+    children = self.articles_of_folder(self.root, self.total_items)
+    Noosfero::API::Entities::ArticleBase.represent(children).as_json
+  end
+
+  def display_api_content_by_default?
+    false
+  end
 end
@@ -100,7 +100,7 @@ class RecentContentBlockViewTest &lt; ActionView::TestCase
     block.presentation_mode = 'title_only'
     ActionView::Base.any_instance.expects(:block_title).returns("Block Title")
-    ActionView::Base.any_instance.expects(:profile).returns(profile)
+    ActionView::Base.any_instance.stubs(:profile).returns(profile)
     content = render_block_content(block)
@@ -118,7 +118,7 @@ class RecentContentBlockViewTest &lt; ActionView::TestCase
     block.presentation_mode = 'title_and_abstract'
     ActionView::Base.any_instance.expects(:block_title).returns("Block Title")
-    ActionView::Base.any_instance.expects(:profile).returns(profile)
+    ActionView::Base.any_instance.stubs(:profile).returns(profile)
     content = render_block_content(block)
@@ -136,10 +136,35 @@ class RecentContentBlockViewTest &lt; ActionView::TestCase
     block.presentation_mode = ''
     ActionView::Base.any_instance.expects(:block_title).returns("Block Title")
-    ActionView::Base.any_instance.expects(:profile).returns(profile)
+    ActionView::Base.any_instance.stubs(:profile).returns(profile)
     content = render_block_content(block)
     assert_match /Block Title/, content
   end
+
+  should 'return articles in api_content' do
+    profile = create_user('testuser').person
+
+    root = fast_create(Blog, name: 'test-blog', profile_id: profile.id)
+    article = fast_create(TextArticle, parent_id: root.id, profile_id: profile.id)
+
+    block = RecentContentBlock.new
+    block.stubs(:holder).returns(profile)
+    block.selected_folder = root.id
+    block.presentation_mode = ''
+    assert_equal [article.id], block.api_content['articles'].map {|a| a[:id]}
+  end
+
+  should 'parents return an empty array for environment without portal community' do
+    environment = fast_create(Environment)
+    block = RecentContentBlock.new
+    box = mock()
+    block.stubs(:box).returns(box)
+    box.stubs(:owner).returns(environment)
+
+    assert_nil environment.portal_community
+    assert_equal [], block.parents
+  end
+
 end
@@ -36,7 +36,9 @@
       <% end %>
       </div>
     <% end %>
-    <%= link_to _('View All'), :profile => profile.identifier, :controller => 'content_viewer', :action => 'view_page', :page => block.root.path %>
+    <% if profile %>
+      <%= link_to _('View All'), :profile => profile.identifier, :controller => 'content_viewer', :action => 'view_page', :page => block.root.path %>
+    <% end %>
   </div>
 <% else %>
   <span class="alert-block">
@@ -19,11 +19,4 @@ class SiteTourPlugin::TourBlock &lt; Block
     _('Configure a step-by-step tour.')
   end
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/tour', :locals => {:block => block}
-    end
-  end
-
 end
@@ -3,6 +3,7 @@ require &#39;test_helper&#39;
 class TrackListBlockTest < ActionView::TestCase
   ActionView::Base.send :include, ApplicationHelper
+  include BoxesHelper
   def setup
     @block = fast_create(SiteTourPlugin::TourBlock)
@@ -18,24 +19,24 @@ class TrackListBlockTest &lt; ActionView::TestCase
   should 'render script tag in visualization mode' do
     controller.expects(:boxes_editor?).returns(false)
-    assert_tag_in_string instance_eval(&block.content), :tag => 'script'
+    assert_tag_in_string render_block_content(block), :tag => 'script'
   end
   should 'do not render script tag when editing' do
     controller.expects(:boxes_editor?).returns(true)
     controller.expects(:uses_design_blocks?).returns(true)
-    assert_no_tag_in_string instance_eval(&block.content), :tag => 'script'
+    assert_no_tag_in_string render_block_content(block), :tag => 'script'
   end
   should 'display help button' do
     controller.expects(:boxes_editor?).returns(false)
-    assert_tag_in_string instance_eval(&block.content), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
+    assert_tag_in_string render_block_content(block), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
   end
   should 'do not display help button when display_button is false' do
     block.display_button = false
     controller.expects(:boxes_editor?).returns(false)
-    assert_no_tag_in_string instance_eval(&block.content), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
+    assert_no_tag_in_string render_block_content(block), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
   end
 end
@@ -16,22 +16,20 @@ class SnifferPlugin::InterestsBlock &lt; Block
     _("This block show interests of your profile or environment")
   end
-  def content(args = {})
-    block = self
+  def interests
+    results = nil
     profile = block.owner
-    proc do
-      if block.owner.is_a?(Profile)
-        interests = profile.snnifer_opportunities
-        interests |= profile.inputs if sniffer.profile.enterprise?
-      else # Environment
-        interests = SnifferPlugin::Opportunity.product_categories.limit(5).order('created_at DESC').all
-        interests += Input.limit(5).order('created_at DESC').all
-        interests.sort{ |a, b| -1 * a.created_at.to_i <=> b.created_at.to_i }
-      end
-
-      render :file => 'blocks/sniffer_plugin/interests_block',
-        :locals => {:block => block, :interests => interests}
+
+    if profile.is_a?(Profile)
+      results = profile.snnifer_opportunities
+      results |= profile.inputs if sniffer.profile.enterprise?
+    else # Environment
+      results = SnifferPlugin::Opportunity.product_categories.limit(5).order('created_at DESC').all
+      results += Input.limit(5).order('created_at DESC').all
+      results.sort{ |a, b| -1 * a.created_at.to_i <=> b.created_at.to_i }
     end
+
+    return results
   end
 end
@@ -0,0 +1,31 @@
+<%= block_title block.title, block.subtitle %>
+
+<% if block.owner.is_a?(Profile) %>
+  <ul>
+    <% block.interests.each do |interest| %>
+      <li><%= interest.product_category.name %></li>
+    <% end %>
+  </ul>
+
+  <div>
+    <% if logged_in? and (current_user.person.is_admin?(environment) or profile.admins.include?(current_user.person)) %>
+      <%= _('Edit %{inputs} and %{block.interests}') % {
+        :inputs => link_to(_("products' inputs"), :controller => :manage_products, :action => :index),
+        :interests => link_to(_('declared interests'), :controller => :sniffer_plugin_myprofile, :action => :edit),
+      } %>
+    <% end %>
+  </div>
+<% else %>
+  <ul>
+    <% block.interests.each do |interest| %>
+      <li>
+        <% profile = interest.is_a?(SnifferPlugin::Opportunity) ? interest.profile : interest.product.enterprise %>
+        <%= _('%{interest} from %{profile}') % {
+          :interest => interest.product_category.name,
+          :profile => link_to_profile(profile.name, profile),
+        } %>
+      </li>
+    <% end %>
+  </ul>
+<% end %>
+
@@ -1,31 +0,0 @@
-<%= block_title block.title, block.subtitle %>
-
-<% if block.owner.is_a?(Profile) %>
-  <ul>
-    <% interests.each do |interest| %>
-      <li><%= interest.product_category.name %></li>
-    <% end %>
-  </ul>
-
-  <div>
-    <% if logged_in? and (current_user.person.is_admin?(environment) or profile.admins.include?(current_user.person)) %>
-      <%= _('Edit %{inputs} and %{interests}') % {
-        :inputs => link_to(_("products' inputs"), :controller => :manage_products, :action => :index),
-        :interests => link_to(_('declared interests'), :controller => :sniffer_plugin_myprofile, :action => :edit),
-      } %>
-    <% end %>
-  </div>
-<% else %>
-  <ul>
-    <% interests.each do |interest| %>
-      <li>
-        <% profile = interest.is_a?(SnifferPlugin::Opportunity) ? interest.profile : interest.product.enterprise %>
-        <%= _('%{interest} from %{profile}') % {
-          :interest => interest.product_category.name,
-          :profile => link_to_profile(profile.name, profile),
-        } %>
-      </li>
-    <% end %>
-  </ul>
-<% end %>
-
 require_relative '../test_helper'
+
 class StatisticsBlockTest < ActiveSupport::TestCase
   ['user_counter', 'tag_counter', 'comment_counter'].map do |counter|
@@ -140,6 +141,8 @@ class StatisticsBlockTest &lt; ActiveSupport::TestCase
   end
   should 'return the amount of visible environment products' do
+    return unless defined? ProductsPlugin
+
     b = StatisticsBlock.new
     e = fast_create(Environment)
@@ -160,6 +163,8 @@ class StatisticsBlockTest &lt; ActiveSupport::TestCase
   end
   should 'return the amount of visible enterprise products' do
+    return unless defined? ProductsPlugin
+
     b = StatisticsBlock.new
     e = fast_create(Enterprise)
@@ -1,864 +0,0 @@
-// When true, asset path helpers are used, otherwise the regular CSS `url()` is used.
-// When there no function is defined, `fn('')` is parsed as string that equals the right hand side
-// NB: in Sass 3.3 there is a native function: function-exists(twbs-font-path)
-$bootstrap-sass-asset-helper: (twbs-font-path("") != unquote('twbs-font-path("")')) !default;
-
-//
-// Variables
-// --------------------------------------------------
-
-
-//== Colors
-//
-//## Gray and brand colors for use across Bootstrap.
-
-$gray-base:              #000 !default;
-$gray-darker:            lighten($gray-base, 13.5%) !default; // #222
-$gray-dark:              lighten($gray-base, 20%) !default;   // #333
-$gray:                   lighten($gray-base, 33.5%) !default; // #555
-$gray-light:             lighten($gray-base, 46.7%) !default; // #777
-$gray-lighter:           lighten($gray-base, 93.5%) !default; // #eee
-
-$brand-primary:         darken(#428bca, 6.5%) !default;
-$brand-success:         #5cb85c !default;
-$brand-info:            #5bc0de !default;
-$brand-warning:         #f0ad4e !default;
-$brand-danger:          #d9534f !default;
-
-
-//== Scaffolding
-//
-//## Settings for some of the most global styles.
-
-//** Background color for `<body>`.
-$body-bg:               #fff !default;
-//** Global text color on `<body>`.
-$text-color:            $gray-dark !default;
-
-//** Global textual link color.
-$link-color:            $brand-primary !default;
-//** Link hover color set via `darken()` function.
-$link-hover-color:      darken($link-color, 15%) !default;
-//** Link hover decoration.
-$link-hover-decoration: underline !default;
-
-
-//== Typography
-//
-//## Font, line-height, and color for body text, headings, and more.
-
-$font-family-sans-serif:  "Helvetica Neue", Helvetica, Arial, sans-serif !default;
-$font-family-serif:       Georgia, "Times New Roman", Times, serif !default;
-//** Default monospace fonts for `<code>`, `<kbd>`, and `<pre>`.
-$font-family-monospace:   Menlo, Monaco, Consolas, "Courier New", monospace !default;
-$font-family-base:        $font-family-sans-serif !default;
-
-$font-size-base:          14px !default;
-$font-size-large:         ceil(($font-size-base * 1.25)) !default; // ~18px
-$font-size-small:         ceil(($font-size-base * 0.85)) !default; // ~12px
-
-$font-size-h1:            floor(($font-size-base * 2.6)) !default; // ~36px
-$font-size-h2:            floor(($font-size-base * 2.15)) !default; // ~30px
-$font-size-h3:            ceil(($font-size-base * 1.7)) !default; // ~24px
-$font-size-h4:            ceil(($font-size-base * 1.25)) !default; // ~18px
-$font-size-h5:            $font-size-base !default;
-$font-size-h6:            ceil(($font-size-base * 0.85)) !default; // ~12px
-
-//** Unit-less `line-height` for use in components like buttons.
-$line-height-base:        1.428571429 !default; // 20/14
-//** Computed "line-height" (`font-size` * `line-height`) for use with `margin`, `padding`, etc.
-$line-height-computed:    floor(($font-size-base * $line-height-base)) !default; // ~20px
-
-//** By default, this inherits from the `<body>`.
-$headings-font-family:    inherit !default;
-$headings-font-weight:    500 !default;
-$headings-line-height:    1.1 !default;
-$headings-color:          inherit !default;
-
-
-//== Iconography
-//
-//## Specify custom location and filename of the included Glyphicons icon font. Useful for those including Bootstrap via Bower.
-
-//** Load fonts from this directory.
-
-// [converter] Asset helpers such as Sprockets and Node.js Mincer do not resolve relative paths
-$icon-font-path: if($bootstrap-sass-asset-helper, "bootstrap/", "../fonts/bootstrap/") !default;
-
-//** File name for all font files.
-$icon-font-name:          "glyphicons-halflings-regular" !default;
-//** Element ID within SVG icon file.
-$icon-font-svg-id:        "glyphicons_halflingsregular" !default;
-
-
-//== Components
-//
-//## Define common padding and border radius sizes and more. Values based on 14px text and 1.428 line-height (~20px to start).
-
-$padding-base-vertical:     6px !default;
-$padding-base-horizontal:   12px !default;
-
-$padding-large-vertical:    10px !default;
-$padding-large-horizontal:  16px !default;
-
-$padding-small-vertical:    5px !default;
-$padding-small-horizontal:  10px !default;
-
-$padding-xs-vertical:       1px !default;
-$padding-xs-horizontal:     5px !default;
-
-$line-height-large:         1.33 !default;
-$line-height-small:         1.5 !default;
-
-$border-radius-base:        4px !default;
-$border-radius-large:       6px !default;
-$border-radius-small:       3px !default;
-
-//** Global color for active items (e.g., navs or dropdowns).
-$component-active-color:    #fff !default;
-//** Global background color for active items (e.g., navs or dropdowns).
-$component-active-bg:       $brand-primary !default;
-
-//** Width of the `border` for generating carets that indicator dropdowns.
-$caret-width-base:          4px !default;
-//** Carets increase slightly in size for larger components.
-$caret-width-large:         5px !default;
-
-
-//== Tables
-//
-//## Customizes the `.table` component with basic values, each used across all table variations.
-
-//** Padding for `<th>`s and `<td>`s.
-$table-cell-padding:            8px !default;
-//** Padding for cells in `.table-condensed`.
-$table-condensed-cell-padding:  5px !default;
-
-//** Default background color used for all tables.
-$table-bg:                      transparent !default;
-//** Background color used for `.table-striped`.
-$table-bg-accent:               #f9f9f9 !default;
-//** Background color used for `.table-hover`.
-$table-bg-hover:                #f5f5f5 !default;
-$table-bg-active:               $table-bg-hover !default;
-
-//** Border color for table and cell borders.
-$table-border-color:            #ddd !default;
-
-
-//== Buttons
-//
-//## For each of Bootstrap's buttons, define text, background and border color.
-
-$btn-font-weight:                normal;
-
-$btn-default-color:              #fff;
-$btn-default-bg:                 $gray-light;
-$btn-default-border:             $btn-default-bg;
-
-$btn-primary-color:              $btn-default-color;
-$btn-primary-bg:                 $brand-primary;
-$btn-primary-border:             $btn-primary-bg;
-
-$btn-success-color:              $btn-default-color;
-$btn-success-bg:                 $brand-success;
-$btn-success-border:             $btn-success-bg;
-
-$btn-info-color:                 $btn-default-color;
-$btn-info-bg:                    $brand-info;
-$btn-info-border:                $btn-info-bg;
-
-$btn-warning-color:              $btn-default-color;
-$btn-warning-bg:                 $brand-warning;
-$btn-warning-border:             $btn-warning-bg;
-
-$btn-danger-color:               $btn-default-color;
-$btn-danger-bg:                  $brand-danger;
-$btn-danger-border:              $btn-danger-bg;
-
-$btn-link-disabled-color:        $gray-light;
-
-
-//== Forms
-//
-//##
-
-//** `<input>` background color
-$input-bg:                       #fff !default;
-//** `<input disabled>` background color
-$input-bg-disabled:              $gray-lighter !default;
-
-//** Text color for `<input>`s
-$input-color:                    $gray !default;
-//** `<input>` border color
-$input-border:                   #ccc !default;
-
-// TODO: Rename `$input-border-radius` to `$input-border-radius-base` in v4
-//** Default `.form-control` border radius
-$input-border-radius:            $border-radius-base !default;
-//** Large `.form-control` border radius
-$input-border-radius-large:      $border-radius-large !default;
-//** Small `.form-control` border radius
-$input-border-radius-small:      $border-radius-small !default;
-
-//** Border color for inputs on focus
-$input-border-focus:             #66afe9 !default;
-
-//** Placeholder text color
-$input-color-placeholder:        #999 !default;
-
-//** Default `.form-control` height
-$input-height-base:              ($line-height-computed + ($padding-base-vertical * 2) + 2) !default;
-//** Large `.form-control` height
-$input-height-large:             (ceil($font-size-large * $line-height-large) + ($padding-large-vertical * 2) + 2) !default;
-//** Small `.form-control` height
-$input-height-small:             (floor($font-size-small * $line-height-small) + ($padding-small-vertical * 2) + 2) !default;
-
-$legend-color:                   $gray-dark !default;
-$legend-border-color:            #e5e5e5 !default;
-
-//** Background color for textual input addons
-$input-group-addon-bg:           $gray-lighter !default;
-//** Border color for textual input addons
-$input-group-addon-border-color: $input-border !default;
-
-//** Disabled cursor for form controls and buttons.
-$cursor-disabled:                not-allowed !default;
-
-
-//== Dropdowns
-//
-//## Dropdown menu container and contents.
-
-//** Background for the dropdown menu.
-$dropdown-bg:                    #fff !default;
-//** Dropdown menu `border-color`.
-$dropdown-border:                rgba(0,0,0,.15) !default;
-//** Dropdown menu `border-color` **for IE8**.
-$dropdown-fallback-border:       #ccc !default;
-//** Divider color for between dropdown items.
-$dropdown-divider-bg:            #e5e5e5 !default;
-
-//** Dropdown link text color.
-$dropdown-link-color:            $gray-dark !default;
-//** Hover color for dropdown links.
-$dropdown-link-hover-color:      darken($gray-dark, 5%) !default;
-//** Hover background for dropdown links.
-$dropdown-link-hover-bg:         #f5f5f5 !default;
-
-//** Active dropdown menu item text color.
-$dropdown-link-active-color:     $component-active-color !default;
-//** Active dropdown menu item background color.
-$dropdown-link-active-bg:        $component-active-bg !default;
-
-//** Disabled dropdown menu item background color.
-$dropdown-link-disabled-color:   $gray-light !default;
-
-//** Text color for headers within dropdown menus.
-$dropdown-header-color:          $gray-light !default;
-
-//** Deprecated `$dropdown-caret-color` as of v3.1.0
-$dropdown-caret-color:           #000 !default;
-
-
-//-- Z-index master list
-//
-// Warning: Avoid customizing these values. They're used for a bird's eye view
-// of components dependent on the z-axis and are designed to all work together.
-//
-// Note: These variables are not generated into the Customizer.
-
-$zindex-navbar:            1000 !default;
-$zindex-dropdown:          1000 !default;
-$zindex-popover:           1060 !default;
-$zindex-tooltip:           1070 !default;
-$zindex-navbar-fixed:      1030 !default;
-$zindex-modal:             1040 !default;
-
-
-//== Media queries breakpoints
-//
-//## Define the breakpoints at which your layout will change, adapting to different screen sizes.
-
-// Extra small screen / phone
-//** Deprecated `$screen-xs` as of v3.0.1
-$screen-xs:                  480px !default;
-//** Deprecated `$screen-xs-min` as of v3.2.0
-$screen-xs-min:              $screen-xs !default;
-//** Deprecated `$screen-phone` as of v3.0.1
-$screen-phone:               $screen-xs-min !default;
-
-// Small screen / tablet
-//** Deprecated `$screen-sm` as of v3.0.1
-$screen-sm:                  768px !default;
-$screen-sm-min:              $screen-sm !default;
-//** Deprecated `$screen-tablet` as of v3.0.1
-$screen-tablet:              $screen-sm-min !default;
-
-// Medium screen / desktop
-//** Deprecated `$screen-md` as of v3.0.1
-$screen-md:                  992px !default;
-$screen-md-min:              $screen-md !default;
-//** Deprecated `$screen-desktop` as of v3.0.1
-$screen-desktop:             $screen-md-min !default;
-
-// Large screen / wide desktop
-//** Deprecated `$screen-lg` as of v3.0.1
-$screen-lg:                  1200px !default;
-$screen-lg-min:              $screen-lg !default;
-//** Deprecated `$screen-lg-desktop` as of v3.0.1
-$screen-lg-desktop:          $screen-lg-min !default;
-
-// So media queries don't overlap when required, provide a maximum
-$screen-xs-max:              ($screen-sm-min - 1) !default;
-$screen-sm-max:              ($screen-md-min - 1) !default;
-$screen-md-max:              ($screen-lg-min - 1) !default;
-
-
-//== Grid system
-//
-//## Define your custom responsive grid.
-
-//** Number of columns in the grid.
-$grid-columns:              12 !default;
-//** Padding between columns. Gets divided in half for the left and right.
-$grid-gutter-width:         30px !default;
-// Navbar collapse
-//** Point at which the navbar becomes uncollapsed.
-$grid-float-breakpoint:     $screen-sm-min !default;
-//** Point at which the navbar begins collapsing.
-$grid-float-breakpoint-max: ($grid-float-breakpoint - 1) !default;
-
-
-//== Container sizes
-//
-//## Define the maximum width of `.container` for different screen sizes.
-
-// Small screen / tablet
-$container-tablet:             (720px + $grid-gutter-width) !default;
-//** For `$screen-sm-min` and up.
-$container-sm:                 $container-tablet !default;
-
-// Medium screen / desktop
-$container-desktop:            (940px + $grid-gutter-width) !default;
-//** For `$screen-md-min` and up.
-$container-md:                 $container-desktop !default;
-
-// Large screen / wide desktop
-$container-large-desktop:      (1140px + $grid-gutter-width) !default;
-//** For `$screen-lg-min` and up.
-$container-lg:                 $container-large-desktop !default;
-
-
-//== Navbar
-//
-//##
-
-// Basics of a navbar
-$navbar-height:                    50px !default;
-$navbar-margin-bottom:             $line-height-computed !default;
-$navbar-border-radius:             $border-radius-base !default;
-$navbar-padding-horizontal:        floor(($grid-gutter-width / 2)) !default;
-$navbar-padding-vertical:          (($navbar-height - $line-height-computed) / 2) !default;
-$navbar-collapse-max-height:       340px !default;
-
-$navbar-default-color:             white !default;
-$navbar-default-bg:                #2c3e50 !default;
-$navbar-default-border:            lighten($navbar-default-bg, 6.5%) !default;
-
-// Navbar links
-$navbar-default-link-color:                white !default;
-$navbar-default-link-hover-color:          #333 !default;
-$navbar-default-link-hover-bg:             transparent !default;
-$navbar-default-link-active-color:         #555 !default;
-$navbar-default-link-active-bg:            darken($navbar-default-bg, 6.5%) !default;
-$navbar-default-link-disabled-color:       #ccc !default;
-$navbar-default-link-disabled-bg:          transparent !default;
-
-// Navbar brand label
-$navbar-default-brand-color:               $navbar-default-link-color !default;
-$navbar-default-brand-hover-color:         darken($navbar-default-brand-color, 10%) !default;
-$navbar-default-brand-hover-bg:            transparent !default;
-
-// Navbar toggle
-$navbar-default-toggle-hover-bg:           #ddd !default;
-$navbar-default-toggle-icon-bar-bg:        #888 !default;
-$navbar-default-toggle-border-color:       #ddd !default;
-
-
-// Inverted navbar
-// Reset inverted navbar basics
-$navbar-inverse-color:                      lighten($gray-light, 15%) !default;
-$navbar-inverse-bg:                         #222 !default;
-$navbar-inverse-border:                     darken($navbar-inverse-bg, 10%) !default;
-
-// Inverted navbar links
-$navbar-inverse-link-color:                 lighten($gray-light, 15%) !default;
-$navbar-inverse-link-hover-color:           #fff !default;
-$navbar-inverse-link-hover-bg:              transparent !default;
-$navbar-inverse-link-active-color:          $navbar-inverse-link-hover-color !default;
-$navbar-inverse-link-active-bg:             darken($navbar-inverse-bg, 10%) !default;
-$navbar-inverse-link-disabled-color:        #444 !default;
-$navbar-inverse-link-disabled-bg:           transparent !default;
-
-// Inverted navbar brand label
-$navbar-inverse-brand-color:                $navbar-inverse-link-color !default;
-$navbar-inverse-brand-hover-color:          #fff !default;
-$navbar-inverse-brand-hover-bg:             transparent !default;
-
-// Inverted navbar toggle
-$navbar-inverse-toggle-hover-bg:            #333 !default;
-$navbar-inverse-toggle-icon-bar-bg:         #fff !default;
-$navbar-inverse-toggle-border-color:        #333 !default;
-
-
-//== Navs
-//
-//##
-
-//=== Shared nav styles
-$nav-link-padding:                          10px 15px !default;
-$nav-link-hover-bg:                         $gray-lighter !default;
-
-$nav-disabled-link-color:                   $gray-light !default;
-$nav-disabled-link-hover-color:             $gray-light !default;
-
-//== Tabs
-$nav-tabs-border-color:                     #ddd !default;
-
-$nav-tabs-link-hover-border-color:          $gray-lighter !default;
-
-$nav-tabs-active-link-hover-bg:             $body-bg !default;
-$nav-tabs-active-link-hover-color:          $gray !default;
-$nav-tabs-active-link-hover-border-color:   #ddd !default;
-
-$nav-tabs-justified-link-border-color:            #ddd !default;
-$nav-tabs-justified-active-link-border-color:     $body-bg !default;
-
-//== Pills
-$nav-pills-border-radius:                   $border-radius-base !default;
-$nav-pills-active-link-hover-bg:            $component-active-bg !default;
-$nav-pills-active-link-hover-color:         $component-active-color !default;
-
-
-//== Pagination
-//
-//##
-
-$pagination-color:                     $link-color !default;
-$pagination-bg:                        #fff !default;
-$pagination-border:                    #ddd !default;
-
-$pagination-hover-color:               $link-hover-color !default;
-$pagination-hover-bg:                  $gray-lighter !default;
-$pagination-hover-border:              #ddd !default;
-
-$pagination-active-color:              #fff !default;
-$pagination-active-bg:                 $brand-primary !default;
-$pagination-active-border:             $brand-primary !default;
-
-$pagination-disabled-color:            $gray-light !default;
-$pagination-disabled-bg:               #fff !default;
-$pagination-disabled-border:           #ddd !default;
-
-
-//== Pager
-//
-//##
-
-$pager-bg:                             $pagination-bg !default;
-$pager-border:                         $pagination-border !default;
-$pager-border-radius:                  15px !default;
-
-$pager-hover-bg:                       $pagination-hover-bg !default;
-
-$pager-active-bg:                      $pagination-active-bg !default;
-$pager-active-color:                   $pagination-active-color !default;
-
-$pager-disabled-color:                 $pagination-disabled-color !default;
-
-
-//== Jumbotron
-//
-//##
-
-$jumbotron-padding:              30px !default;
-$jumbotron-color:                inherit !default;
-$jumbotron-bg:                   $gray-lighter !default;
-$jumbotron-heading-color:        inherit !default;
-$jumbotron-font-size:            ceil(($font-size-base * 1.5)) !default;
-
-
-//== Form states and alerts
-//
-//## Define colors for form feedback states and, by default, alerts.
-
-$state-success-text:             #3c763d !default;
-$state-success-bg:               #dff0d8 !default;
-$state-success-border:           darken(adjust-hue($state-success-bg, -10), 5%) !default;
-
-$state-info-text:                #31708f !default;
-$state-info-bg:                  #d9edf7 !default;
-$state-info-border:              darken(adjust-hue($state-info-bg, -10), 7%) !default;
-
-$state-warning-text:             #8a6d3b !default;
-$state-warning-bg:               #fcf8e3 !default;
-$state-warning-border:           darken(adjust-hue($state-warning-bg, -10), 5%) !default;
-
-$state-danger-text:              #a94442 !default;
-$state-danger-bg:                #f2dede !default;
-$state-danger-border:            darken(adjust-hue($state-danger-bg, -10), 5%) !default;
-
-
-//== Tooltips
-//
-//##
-
-//** Tooltip max width
-$tooltip-max-width:           200px !default;
-//** Tooltip text color
-$tooltip-color:               #fff !default;
-//** Tooltip background color
-$tooltip-bg:                  #000 !default;
-$tooltip-opacity:             .9 !default;
-
-//** Tooltip arrow width
-$tooltip-arrow-width:         5px !default;
-//** Tooltip arrow color
-$tooltip-arrow-color:         $tooltip-bg !default;
-
-
-//== Popovers
-//
-//##
-
-//** Popover body background color
-$popover-bg:                          #fff !default;
-//** Popover maximum width
-$popover-max-width:                   276px !default;
-//** Popover border color
-$popover-border-color:                rgba(0,0,0,.2) !default;
-//** Popover fallback border color
-$popover-fallback-border-color:       #ccc !default;
-
-//** Popover title background color
-$popover-title-bg:                    darken($popover-bg, 3%) !default;
-
-//** Popover arrow width
-$popover-arrow-width:                 10px !default;
-//** Popover arrow color
-$popover-arrow-color:                 $popover-bg !default;
-
-//** Popover outer arrow width
-$popover-arrow-outer-width:           ($popover-arrow-width + 1) !default;
-//** Popover outer arrow color
-$popover-arrow-outer-color:           fade_in($popover-border-color, 0.05) !default;
-//** Popover outer arrow fallback color
-$popover-arrow-outer-fallback-color:  darken($popover-fallback-border-color, 20%) !default;
-
-
-//== Labels
-//
-//##
-
-//** Default label background color
-$label-default-bg:            $gray-light !default;
-//** Primary label background color
-$label-primary-bg:            $brand-primary !default;
-//** Success label background color
-$label-success-bg:            $brand-success !default;
-//** Info label background color
-$label-info-bg:               $brand-info !default;
-//** Warning label background color
-$label-warning-bg:            $brand-warning !default;
-//** Danger label background color
-$label-danger-bg:             $brand-danger !default;
-
-//** Default label text color
-$label-color:                 #fff !default;
-//** Default text color of a linked label
-$label-link-hover-color:      #fff !default;
-
-
-//== Modals
-//
-//##
-
-//** Padding applied to the modal body
-$modal-inner-padding:         15px !default;
-
-//** Padding applied to the modal title
-$modal-title-padding:         15px !default;
-//** Modal title line-height
-$modal-title-line-height:     $line-height-base !default;
-
-//** Background color of modal content area
-$modal-content-bg:                             #fff !default;
-//** Modal content border color
-$modal-content-border-color:                   rgba(0,0,0,.2) !default;
-//** Modal content border color **for IE8**
-$modal-content-fallback-border-color:          #999 !default;
-
-//** Modal backdrop background color
-$modal-backdrop-bg:           #000 !default;
-//** Modal backdrop opacity
-$modal-backdrop-opacity:      .5 !default;
-//** Modal header border color
-$modal-header-border-color:   #e5e5e5 !default;
-//** Modal footer border color
-$modal-footer-border-color:   $modal-header-border-color !default;
-
-$modal-lg:                    900px !default;
-$modal-md:                    600px !default;
-$modal-sm:                    300px !default;
-
-
-//== Alerts
-//
-//## Define alert colors, border radius, and padding.
-
-$alert-padding:               15px !default;
-$alert-border-radius:         $border-radius-base !default;
-$alert-link-font-weight:      bold !default;
-
-$alert-success-bg:            $state-success-bg !default;
-$alert-success-text:          $state-success-text !default;
-$alert-success-border:        $state-success-border !default;
-
-$alert-info-bg:               $state-info-bg !default;
-$alert-info-text:             $state-info-text !default;
-$alert-info-border:           $state-info-border !default;
-
-$alert-warning-bg:            $state-warning-bg !default;
-$alert-warning-text:          $state-warning-text !default;
-$alert-warning-border:        $state-warning-border !default;
-
-$alert-danger-bg:             $state-danger-bg !default;
-$alert-danger-text:           $state-danger-text !default;
-$alert-danger-border:         $state-danger-border !default;
-
-
-//== Progress bars
-//
-//##
-
-//** Background color of the whole progress component
-$progress-bg:                 #f5f5f5 !default;
-//** Progress bar text color
-$progress-bar-color:          #fff !default;
-//** Variable for setting rounded corners on progress bar.
-$progress-border-radius:      $border-radius-base !default;
-
-//** Default progress bar color
-$progress-bar-bg:             $brand-primary !default;
-//** Success progress bar color
-$progress-bar-success-bg:     $brand-success !default;
-//** Warning progress bar color
-$progress-bar-warning-bg:     $brand-warning !default;
-//** Danger progress bar color
-$progress-bar-danger-bg:      $brand-danger !default;
-//** Info progress bar color
-$progress-bar-info-bg:        $brand-info !default;
-
-
-//== List group
-//
-//##
-
-//** Background color on `.list-group-item`
-$list-group-bg:                 #fff !default;
-//** `.list-group-item` border color
-$list-group-border:             #ddd !default;
-//** List group border radius
-$list-group-border-radius:      $border-radius-base !default;
-
-//** Background color of single list items on hover
-$list-group-hover-bg:           #f5f5f5 !default;
-//** Text color of active list items
-$list-group-active-color:       $component-active-color !default;
-//** Background color of active list items
-$list-group-active-bg:          $component-active-bg !default;
-//** Border color of active list elements
-$list-group-active-border:      $list-group-active-bg !default;
-//** Text color for content within active list items
-$list-group-active-text-color:  lighten($list-group-active-bg, 40%) !default;
-
-//** Text color of disabled list items
-$list-group-disabled-color:      $gray-light !default;
-//** Background color of disabled list items
-$list-group-disabled-bg:         $gray-lighter !default;
-//** Text color for content within disabled list items
-$list-group-disabled-text-color: $list-group-disabled-color !default;
-
-$list-group-link-color:         #555 !default;
-$list-group-link-hover-color:   $list-group-link-color !default;
-$list-group-link-heading-color: #333 !default;
-
-
-//== Panels
-//
-//##
-
-$panel-bg:                    #fff !default;
-$panel-body-padding:          15px !default;
-$panel-heading-padding:       10px 15px !default;
-$panel-footer-padding:        $panel-heading-padding !default;
-$panel-border-radius:         $border-radius-base !default;
-
-//** Border color for elements within panels
-$panel-inner-border:          #ddd !default;
-$panel-footer-bg:             #f5f5f5 !default;
-
-$panel-default-text:          $gray-dark !default;
-$panel-default-border:        #ddd !default;
-$panel-default-heading-bg:    #f5f5f5 !default;
-
-$panel-primary-text:          #fff !default;
-$panel-primary-border:        $brand-primary !default;
-$panel-primary-heading-bg:    $brand-primary !default;
-
-$panel-success-text:          $state-success-text !default;
-$panel-success-border:        $state-success-border !default;
-$panel-success-heading-bg:    $state-success-bg !default;
-
-$panel-info-text:             $state-info-text !default;
-$panel-info-border:           $state-info-border !default;
-$panel-info-heading-bg:       $state-info-bg !default;
-
-$panel-warning-text:          $state-warning-text !default;
-$panel-warning-border:        $state-warning-border !default;
-$panel-warning-heading-bg:    $state-warning-bg !default;
-
-$panel-danger-text:           $state-danger-text !default;
-$panel-danger-border:         $state-danger-border !default;
-$panel-danger-heading-bg:     $state-danger-bg !default;
-
-
-//== Thumbnails
-//
-//##
-
-//** Padding around the thumbnail image
-$thumbnail-padding:           4px !default;
-//** Thumbnail background color
-$thumbnail-bg:                $body-bg !default;
-//** Thumbnail border color
-$thumbnail-border:            #ddd !default;
-//** Thumbnail border radius
-$thumbnail-border-radius:     $border-radius-base !default;
-
-//** Custom text color for thumbnail captions
-$thumbnail-caption-color:     $text-color !default;
-//** Padding around the thumbnail caption
-$thumbnail-caption-padding:   9px !default;
-
-
-//== Wells
-//
-//##
-
-$well-bg:                     #f5f5f5 !default;
-$well-border:                 darken($well-bg, 7%) !default;
-
-
-//== Badges
-//
-//##
-
-$badge-color:                 #fff !default;
-//** Linked badge text color on hover
-$badge-link-hover-color:      #fff !default;
-$badge-bg:                    $gray-light !default;
-
-//** Badge text color in active nav link
-$badge-active-color:          $link-color !default;
-//** Badge background color in active nav link
-$badge-active-bg:             #fff !default;
-
-$badge-font-weight:           bold !default;
-$badge-line-height:           1 !default;
-$badge-border-radius:         10px !default;
-
-
-//== Breadcrumbs
-//
-//##
-
-$breadcrumb-padding-vertical:   8px !default;
-$breadcrumb-padding-horizontal: 15px !default;
-//** Breadcrumb background color
-$breadcrumb-bg:                 #f5f5f5 !default;
-//** Breadcrumb text color
-$breadcrumb-color:              #ccc !default;
-//** Text color of current page in the breadcrumb
-$breadcrumb-active-color:       $gray-light !default;
-//** Textual separator for between breadcrumb elements
-$breadcrumb-separator:          "/" !default;
-
-
-//== Carousel
-//
-//##
-
-$carousel-text-shadow:                        0 1px 2px rgba(0,0,0,.6) !default;
-
-$carousel-control-color:                      #fff !default;
-$carousel-control-width:                      15% !default;
-$carousel-control-opacity:                    .5 !default;
-$carousel-control-font-size:                  20px !default;
-
-$carousel-indicator-active-bg:                #fff !default;
-$carousel-indicator-border-color:             #fff !default;
-
-$carousel-caption-color:                      #fff !default;
-
-
-//== Close
-//
-//##
-
-$close-font-weight:           bold !default;
-$close-color:                 #000 !default;
-$close-text-shadow:           0 1px 0 #fff !default;
-
-
-//== Code
-//
-//##
-
-$code-color:                  #c7254e !default;
-$code-bg:                     #f9f2f4 !default;
-
-$kbd-color:                   #fff !default;
-$kbd-bg:                      #333 !default;
-
-$pre-bg:                      #f5f5f5 !default;
-$pre-color:                   $gray-dark !default;
-$pre-border-color:            #ccc !default;
-$pre-scrollable-max-height:   340px !default;
-
-
-//== Type
-//
-//##
-
-//** Horizontal offset for forms and lists.
-$component-offset-horizontal: 180px !default;
-//** Text muted color
-$text-muted:                  $gray-light !default;
-//** Abbreviations and acronyms border color
-$abbr-border-color:           $gray-light !default;
-//** Headings small color
-$headings-small-color:        $gray-light !default;
-//** Blockquote small color
-$blockquote-small-color:      $gray-light !default;
-//** Blockquote font size
-$blockquote-font-size:        ($font-size-base * 1.25) !default;
-//** Blockquote border color
-$blockquote-border-color:     $gray-lighter !default;
-//** Page header border color
-$page-header-border-color:    $gray-lighter !default;
-//** Width of horizontal description list titles
-$dl-horizontal-offset:        $component-offset-horizontal !default;
-//** Horizontal line color.
-$hr-border:                   $gray-lighter !default;
@@ -1,9 +0,0 @@
-<div class="container">
-  <div id="footer-links">
-    <%= link_to _('Manual'), '/doc', id: "link-to-doc", class: 'icon-help' %>
-  </div><!-- end id="footer-links" -->
-  <div id="copyright">
-    <p><%= _('This social network uses <a href="http://noosfero.org/">Noosfero</a>, developed by %s and licensed under the <a href="http://www.gnu.org/licenses/agpl.html">GNU Affero General Public License</a> version 3 or any later version.') % link_to('Colivre', 'http://colivre.coop.br/') %></p>
-  </div><!-- end id="copyright" -->
-  <%= language_chooser(environment) %>
-</div>
@@ -1,17 +0,0 @@
-<header class="navbar" id="header-navbar">
-  <div class="container">
-    <%= theme_site_title %>
-
-    <div class="clearfix">
-    <button class="navbar-toggle" data-target=".navbar-ex1-collapse" data-toggle="collapse" type="button">
-      <span class="sr-only">Toggle navigation</span>
-      <span class="fa fa-bars"></span>
-    </button>
-
-    <%= theme_header_user_notices %>
-
-    <%= theme_header_user_right_menu %>
-    <%= theme_header_not_user_right %>
-    </div>
-  </div>
-</header>
@@ -1,8 +0,0 @@
-<ul class="nav navbar-nav pull-right">
-<li>
-  <a href="/account/login" class="" id="link_login" onclick="return noosfero.modal.inline('#inlineLoginBox')"><i class="icon-menu-login"></i><strong>Entrar</strong></a>
-</li>
-<li>
-  <a href="/account/signup"><strong>Registre-se</strong></a>
-</li>
-</ul>
@@ -1,181 +0,0 @@
-<div class="nav-no-collapse navbar-left pull-left hidden-sm hidden-xs">
-  <ul class="nav navbar-nav pull-left">
-    <li>
-      <a class="btn" id="make-small-nav">
-        <i><span class="fa fa-bars"></span></i>
-      </a>
-    </li>
-    <li class="dropdown hidden-xs">
-      <a class="btn dropdown-toggle" data-target="#" data-toggle="dropdown">
-        <i class="fa fa-bell"></i>
-        <span class="count">8</span>
-      </a>
-      <ul class="dropdown-menu notifications-list">
-        <li class="pointer">
-          <div class="pointer-inner">
-            <div class="arrow"></div>
-          </div>
-        </li>
-        <li class="item-header">You have 6 new notifications</li>
-        <li class="item">
-          <a href="#">
-            <i class="fa fa-comment"></i>
-            <span class="content">New comment on ‘Awesome P...</span>
-            <span class="time"><i class="fa fa-clock-o"></i>13 min.</span>
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            <i class="fa fa-plus"></i>
-            <span class="content">New user registration</span>
-            <span class="time"><i class="fa fa-clock-o"></i>13 min.</span>
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            <i class="fa fa-envelope"></i>
-            <span class="content">New Message from George</span>
-            <span class="time"><i class="fa fa-clock-o"></i>13 min.</span>
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            <i class="fa fa-shopping-cart"></i>
-            <span class="content">New purchase</span>
-            <span class="time"><i class="fa fa-clock-o"></i>13 min.</span>
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            <i class="fa fa-eye"></i>
-            <span class="content">New order</span>
-            <span class="time"><i class="fa fa-clock-o"></i>13 min.</span>
-          </a>
-        </li>
-        <li class="item-footer">
-          <a href="#">
-            View all notifications
-          </a>
-        </li>
-      </ul>
-    </li>
-    <li class="dropdown hidden-xs">
-      <a class="btn dropdown-toggle" data-target="#" data-toggle="dropdown">
-        <i><span class="fa fa-envelope"></span></i>
-        <span class="count">16</span>
-      </a>
-      <ul class="dropdown-menu notifications-list messages-list">
-        <li class="pointer">
-          <div class="pointer-inner">
-            <div class="arrow"></div>
-          </div>
-        </li>
-        <li class="item first-item">
-          <a href="#">
-            <img src="/designs/themes/cube-responsive-theme/images/samples/messages-photo-1.png" alt=""/>
-            <span class="content">
-              <span class="content-headline">
-                George Clooney
-              </span>
-              <span class="content-text">
-                Look, just because I don't be givin' no man a foot massage don't make it
-                right for Marsellus to throw...
-              </span>
-            </span>
-            <span class="time"><i class="fa fa-clock-o"></i>13 min.</span>
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            <img src="/designs/themes/cube-responsive-theme/images/samples/messages-photo-2.png" alt=""/>
-            <span class="content">
-              <span class="content-headline">
-                Emma Watson
-              </span>
-              <span class="content-text">
-                Look, just because I don't be givin' no man a foot massage don't make it
-                right for Marsellus to throw...
-              </span>
-            </span>
-            <span class="time"><i class="fa fa-clock-o"></i>13 min.</span>
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            <img src="/designs/themes/cube-responsive-theme/images/samples/messages-photo-3.png" alt=""/>
-            <span class="content">
-              <span class="content-headline">
-                Robert Downey Jr.
-              </span>
-              <span class="content-text">
-                Look, just because I don't be givin' no man a foot massage don't make it
-                right for Marsellus to throw...
-              </span>
-            </span>
-            <span class="time"><i class="fa fa-clock-o"></i>13 min.</span>
-          </a>
-        </li>
-        <li class="item-footer">
-          <a href="#">
-            View all messages
-          </a>
-        </li>
-      </ul>
-    </li>
-    <li class="dropdown hidden-xs">
-      <a class="btn dropdown-toggle" data-toggle="dropdown">
-        New Item
-        <i class="fa fa-caret-down"></i>
-      </a>
-      <ul class="dropdown-menu">
-        <li class="item">
-          <a href="#">
-            <i class="fa fa-archive"></i>
-            New Product
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            <i class="fa fa-shopping-cart"></i>
-            New Order
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            <i class="fa fa-sitemap"></i>
-            New Category
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            <i class="fa fa-file-text"></i>
-            New Page
-          </a>
-        </li>
-      </ul>
-    </li>
-    <li class="dropdown hidden-xs">
-      <a class="btn dropdown-toggle" data-toggle="dropdown">
-        English
-        <i class="fa fa-caret-down"></i>
-      </a>
-      <ul class="dropdown-menu">
-        <li class="item">
-          <a href="#">
-            Spanish
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            German
-          </a>
-        </li>
-        <li class="item">
-          <a href="#">
-            Italian
-          </a>
-        </li>
-      </ul>
-    </li>
-  </ul>
-</div>
@@ -1,36 +0,0 @@
-<div class="nav-no-collapse pull-right" id="header-nav">
-  <ul class="nav navbar-nav pull-right">
-    <li class="mobile-search">
-      <a class="btn">
-        <i class="fa fa-search"></i>
-      </a>
-
-      <div class="drowdown-search">
-        <form role="search">
-          <div class="form-group">
-            <input type="text" class="form-control" placeholder="Search...">
-            <i class="fa fa-search nav-search-icon"></i>
-          </div>
-        </form>
-      </div>
-
-    </li>
-    <li class="dropdown profile-dropdown">
-      <a class="dropdown-toggle" data-target="#" data-toggle="dropdown">
-        <img src="/designs/themes/cube-responsive-theme/images/samples/scarlet-159.png" alt=""/>
-        <span class="hidden-xs">Scarlett</span> <b class="caret"></b>
-      </a>
-      <ul class="dropdown-menu dropdown-menu-right">
-        <li><a href="user-profile.html"><i class="fa fa-user"></i>Profile</a></li>
-        <li><a href="#"><i class="fa fa-cog"></i>Settings</a></li>
-        <li><a href="#"><i class="fa fa-envelope-o"></i>Messages</a></li>
-        <li><a href="#"><i class="fa fa-power-off"></i>Logout</a></li>
-      </ul>
-    </li>
-    <li class="hidden-xxs">
-      <a class="btn">
-        <i class="fa fa-power-off"></i>
-      </a>
-    </li>
-  </ul>
-</div>
@@ -1,149 +0,0 @@
-$(function($) {
-
-	setTimeout(function() {
-		$('#content-wrapper > .row').css({
-			opacity: 1
-		});
-	}, 200);
-
-	$('#sidebar-nav,#nav-col-submenu').on('click', '.dropdown-toggle', function (e) {
-		e.preventDefault();
-
-		var $item = $(this).parent();
-
-		if (!$item.hasClass('open')) {
-			$item.parent().find('.open .submenu').slideUp('fast');
-			$item.parent().find('.open').toggleClass('open');
-		}
-
-		$item.toggleClass('open');
-
-		if ($item.hasClass('open')) {
-			$item.children('.submenu').slideDown('fast');
-		}
-		else {
-			$item.children('.submenu').slideUp('fast');
-		}
-	});
-
-	$('body').on('mouseenter', '#page-wrapper.nav-small #sidebar-nav .dropdown-toggle', function (e) {
-		if ($( document ).width() >= 992) {
-			var $item = $(this).parent();
-
-			if ($('body').hasClass('fixed-leftmenu')) {
-				var topPosition = $item.position().top;
-
-				if ((topPosition + 4*$(this).outerHeight()) >= $(window).height()) {
-					topPosition -= 6*$(this).outerHeight();
-				}
-
-				$('#nav-col-submenu').html($item.children('.submenu').clone());
-				$('#nav-col-submenu > .submenu').css({'top' : topPosition});
-			}
-
-			$item.addClass('open');
-			$item.children('.submenu').slideDown('fast');
-		}
-	});
-
-	$('body').on('mouseleave', '#page-wrapper.nav-small #sidebar-nav > .nav-pills > li', function (e) {
-		if ($( document ).width() >= 992) {
-			var $item = $(this);
-
-			if ($item.hasClass('open')) {
-				$item.find('.open .submenu').slideUp('fast');
-				$item.find('.open').removeClass('open');
-				$item.children('.submenu').slideUp('fast');
-			}
-
-			$item.removeClass('open');
-		}
-	});
-	$('body').on('mouseenter', '#page-wrapper.nav-small #sidebar-nav a:not(.dropdown-toggle)', function (e) {
-		if ($('body').hasClass('fixed-leftmenu')) {
-			$('#nav-col-submenu').html('');
-		}
-	});
-	$('body').on('mouseleave', '#page-wrapper.nav-small #nav-col', function (e) {
-		if ($('body').hasClass('fixed-leftmenu')) {
-			$('#nav-col-submenu').html('');
-		}
-	});
-
-	$('#make-small-nav').click(function (e) {
-		$('#page-wrapper').toggleClass('nav-small');
-	});
-
-	$(window).smartresize(function(){
-		if ($( document ).width() <= 991) {
-			$('#page-wrapper').removeClass('nav-small');
-		}
-	});
-
-	$('.mobile-search').click(function(e) {
-		e.preventDefault();
-
-		$('.mobile-search').addClass('active');
-		$('.mobile-search form input.form-control').focus();
-	});
-	$(document).mouseup(function (e) {
-		var container = $('.mobile-search');
-
-		if (!container.is(e.target) // if the target of the click isn't the container...
-			&& container.has(e.target).length === 0) // ... nor a descendant of the container
-		{
-			container.removeClass('active');
-		}
-	});
-
-	// $('.fixed-leftmenu #col-left').nanoScroller({
-  //   	alwaysVisible: false,
-  //   	iOSNativeScrolling: false,
-  //   	preventPageScrolling: true,
-  //   	contentClass: 'col-left-nano-content'
-  //   });
-
-	// build all tooltips from data-attributes
-	$("[data-toggle='tooltip']").each(function (index, el) {
-		$(el).tooltip({
-			placement: $(this).data("placement") || 'top'
-		});
-	});
-});
-
-$.fn.removeClassPrefix = function(prefix) {
-    this.each(function(i, el) {
-        var classes = el.className.split(" ").filter(function(c) {
-            return c.lastIndexOf(prefix, 0) !== 0;
-        });
-        el.className = classes.join(" ");
-    });
-    return this;
-};
-
-(function($,sr){
-	// debouncing function from John Hann
-	// http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/
-	var debounce = function (func, threshold, execAsap) {
-		var timeout;
-
-		return function debounced () {
-			var obj = this, args = arguments;
-			function delayed () {
-				if (!execAsap)
-					func.apply(obj, args);
-				timeout = null;
-			};
-
-			if (timeout)
-				clearTimeout(timeout);
-			else if (execAsap)
-				func.apply(obj, args);
-
-			timeout = setTimeout(delayed, threshold || 100);
-		};
-	}
-	// smartresize
-	$.fn[sr] = function(fn){	return fn ? this.bind('resize', debounce(fn)) : this.trigger(sr); };
-
-})($,'smartresize');
@@ -1,83 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= html_language %>" lang="<%= html_language %>" class="<%= h html_tag_classes %>">
-  <head>
-    <title><%= h page_title %></title>
-    <%= yield(:feeds) %>
-    <!--<meta http-equiv="refresh" content="1"/>-->
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-
-    <% unless defined? MetadataPlugin and environment.enabled_plugins.include? 'MetadataPlugin' %>
-      <meta name="description" content="<%= @environment.name %>" />
-    <% end %>
-
-    <!-- site root -->
-    <meta property="noosfero:root" content="<%= Noosfero.root %>"/>
-
-    <link rel="shortcut icon" href="<%= image_path(theme_favicon) %>" type="image/x-icon" />
-    <%= noosfero_javascript %>
-    <%= noosfero_stylesheets %>
-
-    <%# Add custom tags/styles/etc via content_for %>
-    <%= yield :head %>
-    <%=
-      @plugins.dispatch(:head_ending).map do |content|
-        if content.respond_to?(:call) then instance_exec(&content).to_s.html_safe else content.to_s.html_safe end
-      end.join("\n")
-    %>
-
-    <script type="text/javascript">
-      DEFAULT_LOADING_MESSAGE = <%="'#{ _('loading...') }'" %>;
-    </script>
-
-  </head>
-  <body class="<%= h body_classes %>">
-    <a href="#content" id="link-go-content"><span><%= _("Go to the content") %></span></a>
-
-    <%=
-      @plugins.dispatch(:body_beginning).map do |content|
-        if content.respond_to?(:call) then instance_exec(&content).to_s.html_safe else content.to_s.html_safe end
-      end.join("\n")
-    %>
-    <div id="global-header">
-      <%= global_header %>
-    </div>
-
-    <!-- RESPONSIVE changes !-->
-    <div id="wrap-1" class="container">
-      <div id='theme-header'>
-        <%= theme_header %>
-      </div>
-      <div id="page-wrapper" class="container">
-        <div id="wrap-2">
-          <div class="row">
-            <%= theme_sidebar_user %>
-            <div id="content-wrapper" class="<%= 'full-content' unless logged_in? %>">
-              <div id="content">
-                <%= render partial: 'layouts/menu_responsive' %>
-                <%= render 'layouts/profile_title' if profile %>
-                <%= insert_boxes yield %>
-              </div><!-- end id="content" -->
-            </div>
-          </div>
-        </div><!-- end id="wrap-2" -->
-      </div>
-    </div><!-- end id="wrap-1" -->
-
-    <%= render_environment_features(:logged_in) if logged_in? %>
-    <div id="footer">
-      <div id="theme-footer">
-        <%= theme_footer %>
-      </div><!-- end id="theme-footer" -->
-      <div id="global-footer">
-        <%= global_footer %>
-      </div><!-- end id="global-footer" -->
-    </div><!-- end id="footer" -->
-    <%= noosfero_layout_features %>
-    <%= addthis_javascript %>
-    <%=
-      @plugins.dispatch(:body_ending).map do |content|
-        if content.respond_to?(:call) then instance_exec(&content).html_safe else content.html_safe end
-      end.join("\n")
-    %>
-  </body>
-</html>
@@ -1,4 +0,0 @@
-<%= search_people_menu %>
-<%= search_communities_menu %>
-<%= search_contents_menu %>
-<li><a href="/search/events" class="icon-menu-events"><%= _('Events') %></a></li>
@@ -1,20 +0,0 @@
-// Core variables and mixins
-@import "imports/variables";
-@import "imports/mixins";
-
-// Core layouts
-@import "imports/layouts";
-
-// Navigation, header, footer
-@import "imports/header";
-@import "imports/sidebar";
-@import "imports/footer";
-
-// Layouts
-@import "imports/fixed_layouts";
-
-// Skin support
-@import "imports/skins";
-
-//Noosfero and cube overrides/customs
-@import "imports/customs";
@@ -1,83 +0,0 @@
-/* Noosfero core and Cube Bootstrap styles Overrides/Customizations */
-
-/* Noosfero Overrides */
-#theme-header {
-  min-height: 20px !important;
-  height: 100% !important;
-}
-
-#wrap-2 {
-  padding: 0px !important;
-  border: none !important;
-  background-color: #eee;
-}
-
-#user{
-  margin: {
-    top: 10px;
-  }
-}
-
-//Bootstrap Overrides
-.navbar >.container .navbar-brand {
-  width: 220px !important;
-}
-
-.row {
-  margin: {
-    right: 8px !important;
-  }
-}
-
-.container {
-  padding: {
-    right: 0px !important;
-    left: 0px !important;
-  }
-}
-
-//Cube Theme Overrides
-#nav-col {
-  height: 100%;
-}
-
-#content-wrapper {
-  background: none !important;
-}
-
-#header-navbar {
-  z-index: 999 !important;
-}
-
-#logo.navbar-brand {
-  img {
-    float: left;
-    width: 60px !important;
-    height: 60px !important;
-    margin: 0px {
-      top: -10px;
-    }
-  }
-
-  .logo-title {
-    float: left;
-    font: {
-      family: fantasy;
-      size: 16pt;
-    }
-  }
-}
-
-#content-wrapper {
-  min-height: 100% !important;
-}
-
-//New Classes and Customizations
-
-.full-content {
-  /*
-  * Inform additional rules here to content
-  * when the sidebar is hidden (user not logged in).
-  */
-  margin-left: 0px !important;
-}
@@ -1,49 +0,0 @@
-/* FIXED ELEMENTS */
-.fixed-header {
-	#header-navbar {
-	    left: 0;
-	    position: fixed;
-	    right: 0;
-	    top: 0;
-	    width: 100%;
-	    z-index: 999;
-	}
-	#page-wrapper {
-		padding-top: 50px;
-	}
-}
-.fixed-footer {
-	#footer-bar {
-	    bottom: 0;
-	    left: 0;
-	    margin: 0;
-	    position: fixed;
-	    right: 0;
-	    width: 100%;
-	    z-index: 999;
-	}
-	#content-wrapper {
-		padding-bottom: 36px
-	}
-}
-@media (min-width: $break-sm-min) {
-	.fixed-leftmenu #nav-col {
-		position: fixed;
-		height: 100%;
-	}
-	.fixed-leftmenu.fixed-footer #nav-col {
-		padding-bottom: 36px;
-	}
-	.fixed-leftmenu.fixed-header #nav-col {
-		padding-bottom: 50px;
-	}
-	.fixed-leftmenu.fixed-header.fixed-footer #nav-col {
-		padding-bottom: 86px;
-	}
-}
-@media (max-width: $break-sm-max) {
-	.fixed-header #nav-col {
-		position: fixed;
-		width: 100%;
-	}
-}
 \ No newline at end of file
@@ -1,25 +0,0 @@
-#footer-bar {
-	background: #fff;
-	border-top: 1px solid $main-bg-color;
-    bottom: 0;
-    font-size: 0.8em;
-    height: 37px;
-    line-height: 36px;
-    margin-left: -15px;
-    margin-right: -15px;
-    position: absolute;
-    width: 100%;
-
-    @media (max-width: $break-xs-max) {
-		margin-left: -8px;
-		margin-right: -8px;
-	}
-	@media (max-width: $break-xxs-max) {
-		margin-left: -5px;
-		margin-right: -5px;
-	}
-}
-#footer-copyright {
-	text-align: center;
-	margin: 0;
-}
 \ No newline at end of file
@@ -1,516 +0,0 @@
-.navbar-toggle {
-    border: medium none;
-    font-size: 1.4em;
-    height: 50px;
-    margin: 0;
-    text-shadow: none;
-    width: 50px;
-    z-index: 100;
-    @include border-radius(0);
-
-	.icon-bar {
-	    background: none repeat scroll 0 0 white;
-	}
-}
-.nav > li {
-	float: left;
-}
-.navbar-nav {
-	margin: 0 0 0 10px;
-
-	> li > a {
-	    padding-bottom: 15px;
-	    padding-top: 15px;
-	    line-height: 24px;
-	}
-	> li > .dropdown-menu {
-		@include border-radius($border-radius-base);
-		min-width: 223px;
-	}
-}
-.dropdown-menu > li > a {
-	color: #707070;
-	font-size: 0.875em;
-	line-height: 1.7;
-	padding-left: 35px;
-	@include transition(border-color 0.1s ease-in-out 0s, background-color 0.1s ease-in-out 0s);
-	
-	&:hover, 
-	&:focus {
-		background-color: #f6f6f6;
-		color: #707070;
-	}
-	> i {
-		position: absolute;
-		margin-left: -18px;
-		margin-top: 4px;
-	}
-}
-.nav-pills > li {
-	float: none;
-
-	> a {
-		@include border-radius(0);
-	}
-}
-
-.navbar > .container .navbar-brand {
-	background: #34495e;
-	color: #fff;
-    font-family: 'Titillium Web',Geneva,sans-serif;
-    font-weight: 700;
-    width: 220px;
-    margin-left: -8px;
-    padding: 10px 15px;
-
-    @media (max-width: $break-sm-max) {
-		background: transparent;
-		color: #262626;
-	}
-    @media (max-width: $break-xs-max) {
-		padding-top: 12px;
-		padding-top: 12.5px;
-	}
-}
-#logo {
-	@media (max-width: $break-xs-max) {
-		width: 150px;
-		padding-left: 0;
-		font-size: 1em;
-		margin-left: 6px;
-	}
-	@media (max-width: 400px) {
-		width: auto;
-		margin-left: 15px;
-	}
-
-	img {
-		@media (max-width: $break-xs-max) {
-			height: 19px;
-		}
-	}
-	span {
-		@media (max-width: 400px) {
-			display: none;
-		}
-	}
-	&.navbar-brand > img {
-	    margin: 0 auto;
-	    padding-right: 4px;
-	    height: 30px;
-
-	    @media (max-width: $break-xs-max) {
-			height: 25px;
-		}
-	}
-	&.navbar-brand > img.normal-logo.logo-white {
-		@media (min-width: $break-sm-min) {
-			display: block;
-		}
-		@media (max-width: $break-sm-max) {
-			display: none;
-		}
-	}
-	&.navbar-brand > img.normal-logo.logo-black {
-		@media (min-width: $break-sm-min) {
-			display: none;
-		}
-		@media (max-width: $break-sm-max) {
-			display: block;
-		}
-	}
-}
-#header-navbar {
-    background: #fff;
-    border: 0 none;
-    @include border-radius(0);
-    margin: 0;
-    min-height: 50px;
-    color: #262626;
-    box-shadow: 0px 1px 3px 0 rgba(0,0,0, 0.1);
-    position: relative;
-    z-index: 99;
-
-	.navbar-form {
-		.form-group {
-			position: relative;
-		}
-		.form-control {
-			background: #131313;
-			color: #707070;
-			height: 30px;
-			line-height: 30px;
-			margin-top: 2px;
-			font-size: 0.75em;
-		}
-		.nav-search-icon {
-			position: absolute;
-			color: #707070;
-			right: 6px;
-		    top: 8px;
-		}
-	}
-	.nav > li > a {
-		height: 50px;
-	}
-	.nav > li > a > span.count {
-		background: none repeat scroll 0 0 $red-color;
-	    @include border-radius(50%);
-	    color: #fff;
-	    display: block;
-	    font-size: 9px;
-	    height: 14px;
-	    line-height: 14px;
-	    position: absolute;
-	    right: 10px;
-	    text-align: center;
-	    top: 11px;
-	    width: 14px;
-	}
-	.profile-dropdown > a {
-		padding-top: 8px;
-		padding-bottom: 7px;
-		line-height: 35px;
-	
-		> img {
-			@include border-radius(50%);
-		    float: left;
-		    height: 35px;
-		    margin-right: 5px;
-		    width: 35px;
-		    border: 2px solid #fff;
-		}
-		> span {
-			float: left;
-			display: block;
-			margin-right: 3px;
-			font-size: em;
-		}
-	}
-}
-#header-nav .form-control {
-	@include border-radius(0);
-	border: 0;
-}
-#header-navbar .navbar-left .navbar-nav {
-	margin-left: 0;
-}
-#header-navbar .nav > li > a {
-	font-size: 0.875em;
-	padding-left: 18px;
-	padding-right: 18px;
-	color: #484848;
-	border: none;
-	@include border-radius(0);
-	cursor: pointer;
-}
-#header-navbar .nav > li > a > i,
-#sidebar-nav .nav > li > a > i {
-	font-size: 1.125em;
-}
-#sidebar-nav .nav > li > a:focus,
-#sidebar-nav .nav .open > a, 
-#sidebar-nav .nav .open > a:focus {
-	background: inherit;
-}
-#sidebar-nav .nav > li > a:hover,
-#sidebar-nav .nav .open > a:hover {
-	background: darken(#2c3e50, 4%);
-    color: #fff;
-    outline: none;
-}
-#header-navbar .nav > li > a:hover,
-#header-navbar .nav > li > a:focus,
-#header-navbar .nav .open > a, 
-#header-navbar .nav .open > a:hover, 
-#header-navbar .nav .open > a:focus,
-.navbar-toggle:hover,
-.navbar-toggle:focus, 
-.mobile-search.active > .btn {
-	background: $primary-color;
-    color: #fff;
-}
-#header-navbar .nav > li > a:hover,
-#header-navbar .nav > li > a:focus,
-#header-navbar .nav .open > a, 
-#header-navbar .nav .open > a:hover, 
-#header-navbar .nav .open > a:focus {
-	background-color: $primary-color;
-}
-.nav-pills > li.active > a, 
-.nav-pills > li.active > a:hover, 
-.nav-pills > li.active > a:focus,
-#sidebar-nav .nav-pills > li.active > a, 
-#sidebar-nav .nav-pills > li.active > a:hover, 
-#sidebar-nav .nav-pills > li.active > a:focus,
-.nav-pills > li.open > a, 
-.nav-pills > li.open > a:hover, 
-.nav-pills > li.open > a:focus,
-#sidebar-nav .nav-pills > li.open > a, 
-#sidebar-nav .nav-pills > li.open > a:hover, 
-#sidebar-nav .nav-pills > li.open > a:focus,
-.nav-small #nav-col #sidebar-nav .nav-pills > li.open > a {
-	background-color: darken(#2c3e50, 4%);
-	color: #fff;
-	border-left-color: $primary-color;
-}
-#header-navbar .nav > li .caret {
-	border-top-color: #fff;
-	border-bottom-color: #fff;
-}
-#header-navbar .nav a:hover .caret {
-	border-top-color: #fff;
-	border-bottom-color: #fff;
-}
-.drowdown-search {
-	background: #FFFFFF;
-    display: block;
-    left: 168px;
-    padding: 4px 0;
-    position: absolute;
-    top: 0;
-    @include transition(left 0.25s ease-out 0s, right 0.25s ease-out 0s);
-    width: 0;
-    z-index: 1;
-    overflow: hidden;
-
-    @media (max-width: $break-sm-max) {
-	    box-shadow: 0 1px 1px rgba(0, 0, 0, 0.3);
-	    display: block;
-	    left: 0;
-	    padding: 10px 0;
-	    top: 50px;
-	    width: 100%;
-	    display: none;
-	    @include transition(none);
-	}
-
-	form {
-		.form-group {
-			position: relative;
-			margin: 0 15px;
-		}
-		.form-control {
-		    background: none repeat scroll 0 0 #FFFFFF;
-		    box-shadow: none !important;
-		    color: $text-color;
-		    font-size: 1em;
-		    font-weight: 400;
-		    height: 42px;
-		    line-height: 42px;
-		    padding-left: 5px;
-		    padding-right: 26px;
-
-		    @media (max-width: $break-sm-max) {
-			    font-size: 1.6em;
-			    font-weight: 600;
-			}
-		}
-		.nav-search-icon {
-			color: $text-color;
-		    font-size: 1.2em;
-		    position: absolute;
-		    right: 5px;
-		    top: 13px;
-		    cursor: pointer;
-
-		    @media (max-width: $break-sm-max) {
-			    font-size: 1.8em;
-			    right: 15px;
-			    top: 8px;
-			}
-		}
-		.form-control::-webkit-input-placeholder { /* WebKit browsers */
-		    color: $text-color;
-		}
-		.form-control:-moz-placeholder { /* Mozilla Firefox 4 to 18 */
-		    color: $text-color;
-		}
-		.form-control::-moz-placeholder { /* Mozilla Firefox 19+ */
-		    color: $text-color;
-		}
-		.form-control:-ms-input-placeholder { /* Internet Explorer 10+ */
-		    color: $text-color;
-		}
-	}
-}
-.mobile-search {
-	overflow: hidden;
-
-	@media (max-width: $break-sm-max) {
-		position: inherit !important;
-		overflow: visible;
-	}
-
-	> a.btn {
-		float: right;
-	}
-	&.active {
-		width: 220px;
-
-		@media (max-width: $break-sm-max) {
-			width: auto;
-		}
-	
-		.drowdown-search {
-			width: 220px;
-			left: 0;
-
-			@media (max-width: $break-sm-max) {
-				display: block;
-				width: 100%;
-				left: 0;
-			}
-		}
-	}
-}
-
-.navbar-nav > li > .dropdown-menu.notifications-list {
-	min-width: 310px;
-	padding-bottom: 0;
-	padding-top: 0;
-	//margin-top: 8px;
-	color: #707070;
-	// margin-left: -258px;
-}
-.notifications-list {
-	.item-header {
-		font-size: 0.875em;
-	    font-weight: bold;
-	    line-height: 40px;
-	    text-align: center;
-	}
-	.item {
-		border-top: 1px solid #f6f6f6;
-	    line-height: 1.4;
-	    padding-bottom: 0;
-	    padding-top: 0;
-	    clear: both;
-	
-		> a > i {
-			color: $red-color;
-		}
-		a {
-		    clear: both;
-		    white-space: normal;
-		    padding-bottom: 8px;
-		    padding-top: 8px;
-		
-			.content {
-				
-			}
-			.time {
-				color: $primary-color;
-				margin-left: 10px;
-				position: absolute;
-			    right: 13px;
-			    white-space: normal !important;
-			
-				i {
-					margin-right: 3px;
-				}
-			}
-		}
-	}
-	.item-footer {
-		background: $primary-color;
-	    padding-bottom: 0;
-	    padding-top: 0;
-	    @include border-radius(0 0 $border-radius-base $border-radius-base);
-	
-		a {
-			padding: 8px 20px;
-		    text-align: center;
-		    @include transition(border-color 0.1s ease-in-out 0s, background-color 0.1s ease-in-out 0s);
-		    color: #fff;
-		
-			&:hover,
-			&:focus {
-				background-color: $primary-color-dark;
-				color: #fff;
-			}
-		}
-	}
-	.pointer {
-	    height: 12px;
-	    margin: 0;
-	    padding: 0;
-	    position: absolute;
-	    right: 21px;
-	    top: -12px;
-	    width: 12px;
-	    display: none !important;
-	
-		.pointer-inner {
-			position: relative;
-		}
-		.arrow {
-			border-color: transparent transparent #FFFFFF;
-		    border-style: solid;
-		    border-width: 6px;
-		    cursor: pointer;
-		    left: auto;
-		    position: absolute;
-		    right: 0;
-		    top: 0;
-		    z-index: 1002;
-		}
-		.arrow-border {
-		    border-color: transparent transparent rgba(0, 0, 0, 0.15);
-		    border-style: solid;
-		    border-width: 7px;
-		    cursor: pointer;
-		    left: -1px;
-		    position: absolute;
-		    top: -2px;
-		    z-index: 1001;
-		}
-	}
-}
-.messages-list {
-	.item.first-item {
-		border-top: 0 !important;
-	}
-	.item > a {
-		padding-left: 20px;
-		padding-right: 20px;
-		padding-bottom: 25px;
-		@include transition(border-color 0.1s ease-in-out 0s, background-color 0.1s ease-in-out 0s);
-	
-		> img {
-			position: absolute;
-			margin-top: 10px;
-		}
-		> .content {
-			display: block;
-		    padding-left: 50px;
-		    padding-top: 5px;
-		
-			.content-headline {
-				color: #605F5F;
-			    display: block;
-			    font-weight: 600;
-			}
-			.content-text {
-				display: block;
-			    line-height: 1.4;
-			}
-		}
-	}
-}
-#header-navbar .container {
-	@media (max-width: 400px) {
-		padding: 0;
-	}
-}
-.profile-dropdown .dropdown-toggle {
-	@media (max-width: 400px) {
-		padding-left: 5px !important;
-	    padding-right: 5px !important;
-	}
-}
-#header-nav .nav {
-	@media (max-width: 400px) {
-		margin-left: 0;
-	}
-}
 \ No newline at end of file
@@ -1,273 +0,0 @@
-html, body {
-	font-family: $font-stack;
-	-webkit-font-smoothing: antialiased;
-
-	@media (max-width: $break-xxs-max) {
-		font-size: 12px;
-	}
-}
-body {
-	color: $text-color;
-	background: url("../../img/whitey.jpg") repeat scroll 0 0 #fff;
-	background-size: 220px 220px;
-}
-h1, h2, h3, h4, h5, h6 {	
-    font-family: $heading-font-family;
-    font-weight: $font-hx-weight;
-}
-h1 {
-	clear: both;
-    color: $primary-color;
-    margin: 0 0 20px 0;
-    padding-left: 14px;
-    font-size: $font-size-h1;
-}
-h2 {
-	clear: both;
-    font-size: $font-size-h2;
-    margin-bottom: 10px;
-    padding: 10px 0 10px 30px;
-}
-h3 {
-	border-bottom: 2px solid $gray-color-light;
-	padding-left: 5px;
-	margin-bottom: 15px;
-	margin-top: 30px;
-	font-size: $font-size-h3;
-
-	> span {
-		border-bottom: 2px solid $gray-color-light;
-	    display: inline-block;
-	    padding: 0 5px 5px;
-	}
-}
-h4 {
-	font-size: $font-size-h4;
-}
-h5 {
-	font-size: $font-size-h5;
-}
-h6 {
-	font-size: $font-size-h6;
-}
-
-a {
-	color: $link-color;
-	outline: none !important;
-
-	&:hover,
-	&:focus {
-		color: $link-color-hover;
-	}
-}
-.container {
-	padding-left: 8px;
-	padding-right: 8px;
-
-	@media (max-width: $break-xs-max) {
-		padding-left: 5px;
-		padding-right: 5px;
-	}
-}
-.row {
-    margin-left: -8px;
-    margin-right: -8px;
-
-    @media (max-width: $break-xs-max) {
-	    margin-left: -5px;
-	    margin-right: -5px;
-	}
-}
-.col-xs-1, 
-.col-sm-1, 
-.col-md-1, 
-.col-lg-1, 
-.col-xs-2, 
-.col-sm-2, 
-.col-md-2, 
-.col-lg-2, 
-.col-xs-3, 
-.col-sm-3, 
-.col-md-3, 
-.col-lg-3, 
-.col-xs-4, 
-.col-sm-4, 
-.col-md-4, 
-.col-lg-4, 
-.col-xs-5, 
-.col-sm-5, 
-.col-md-5, 
-.col-lg-5, 
-.col-xs-6, 
-.col-sm-6, 
-.col-md-6, 
-.col-lg-6, 
-.col-xs-7, 
-.col-sm-7, 
-.col-md-7, 
-.col-lg-7, 
-.col-xs-8, 
-.col-sm-8, 
-.col-md-8, 
-.col-lg-8, 
-.col-xs-9, 
-.col-sm-9, 
-.col-md-9, 
-.col-lg-9, 
-.col-xs-10, 
-.col-sm-10, 
-.col-md-10, 
-.col-lg-10, 
-.col-xs-11, 
-.col-sm-11, 
-.col-md-11, 
-.col-lg-11, 
-.col-xs-12, 
-.col-sm-12, 
-.col-md-12, 
-.col-lg-12 {
-	padding-left: 8px;
-	padding-right: 8px;
-
-	@media (max-width: $break-xs-max) {	
-		padding-left: 5px;
-		padding-right: 5px;
-	}
-}
-
-/* new xxs layout for extra small devices */
-@media (max-width: $break-xxs-max) {
-	h1 {
-		padding-left: 5px;
-		font-size: 1.8em;
-	}
-	h2 {
-		font-size: 1.5em;
-	}
-	.hidden-xxs {
-		display: none !important;
-	}
-	tr.hidden-xxs {
-		display: table-row !important;
-	}
-	
-	th.hidden-xxs,
-	td.hidden-xxs {
-		display: table-cell !important;
-	}
-	
-	.visible-xxs {
-		display: block !important;
-	}
-	tr.visible-xxs {
-		display: none !important;
-	}
-	
-	th.visible-xxs,
-	td.visible-xxs {
-		display: none !important;
-	}
-	.breadcrumb {
-		padding-left: 6px;
-	}
-}
-
-#theme-wrapper {
-	box-shadow: 0 0 53px 0 rgba(0, 0, 0, 0.55);
-	max-width: $container-max-width;
-}
-#page-wrapper {
-	background-color: #2c3e50;
-}
-.container {
-	margin: 0;
-	max-width: $container-max-width;
-	width: 100%;
-}
-
-#content-wrapper {
-	background: $main-bg-color;
-	height: 100%;
-	margin-top: 0;
-	margin-bottom: 0;
-	position: relative;
-	min-height: 1200px;
-	padding: 15px 15px 35px 15px;
-	margin-left: 220px;
-
-	@media (max-width: $break-sm-max) {
-		margin-left: 0;
-		border-left: 0 !important;
-		border-right: 0 !important;
-	}
-	@media (max-width: $break-xs-max) {
-		padding: 10px 8px 0 8px;
-	}
-	@media (max-width: $break-xxs-max) {
-		padding: 5px 5px 0 5px;
-	}
-
-	> .row {
-		@include opacity(1);
-		/*transition: opacity 0.8s ease-in-out 0s;*/
-	}
-}
-#content-header {
-	background: lighten($main-bg-color, 4%);
-	margin: -15px -15px 20px -15px;
-	padding: 15px;
-	border-bottom: 1px solid darken($main-bg-color, 3%);
-
-	@media (max-width: $break-xs-max) {
-		margin: -15px -5px 20px -5px;
-	}
-}
-#content-header h1 {
-	margin-bottom: 0;
-	font-size: 1.8em;
-}
-.main-box {
-	background: #FFFFFF;
-    box-shadow: 0px 1px 1px rgba(0,0,0,0.1);
-    margin-bottom: 16px;
-    /* overflow: hidden; */
-    @include border-radius($border-radius-base);
-
-	@media (max-width: $break-xs-max) {
-		margin-bottom: 10px;
-	}
-
-	h2 {
-	    font-size: 1.3em;
-	    line-height: 29px;
-	    margin: 0;
-	    padding: 0;
-
-		@media (max-width: $break-xxs-max) {
-			margin-bottom: 5px;
-		}
-	}
-	&.no-header {
-		padding-top: 20px;
-	}
-	.main-box-header {
-	    min-height: 50px;
-	    padding: 10px 20px;
-	
-		&.with-border {
-			border-bottom: 1px solid #ecf0f1;
-		}
-	}
-	.main-box-body {
-		padding: 0 20px 20px 20px;
-	}
-}
-
-h1 small, 
-h2 small, 
-h3 small, 
-h1 .small, 
-h2 .small, 
-h3 .small {
-	padding-left: 8px;
-}
 \ No newline at end of file
@@ -1,63 +0,0 @@
-// MIXINS
-@mixin border-radius($radius) {
-	border-radius: $radius;
-	background-clip: padding-box; /* stops bg color from leaking outside the border: */
-}
-
-@mixin box-sizing($box-model) {
-	box-sizing: $box-model;
-}
-
-@mixin abs-pos ($top: auto, $right: auto, $bottom: auto, $left: auto) {
-	top: $top;
-	right: $right;
-	bottom: $bottom;
-	left: $left;
-	position: absolute;
-}
-
-@mixin font-size($size: 12, $base: 16) {
-	font-size: $size + px;
-	font-size: ($size / $base) * 1rem;
-}
-
-@mixin keyframes($animation-name) {
-	@-webkit-keyframes #{$animation-name} {
-		@content;
-	}
-	@-moz-keyframes #{$animation-name} {
-		@content;
-	}  
-	@-ms-keyframes #{$animation-name} {
-		@content;
-	}
-	@-o-keyframes #{$animation-name} {
-		@content;
-	}  
-	@keyframes #{$animation-name} {
-		@content;
-	}
-}
-
-@mixin animation($str) {
-	-webkit-animation: #{$str};
-	-moz-animation: #{$str};
-	-ms-animation: #{$str};
-	-o-animation: #{$str};
-	animation: #{$str};      
-}
-
-@mixin transition($args...) {
-	transition: $args;
-}
-
-@mixin opacity($opacity) {
-	opacity: $opacity;
-}
-
-// PLACEHOLDERS
-%text-truncate {
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
 \ No newline at end of file
@@ -1,274 +0,0 @@
-#col-left {
-    position: relative;
-    color: #003940;
-    height: 100%;
-
-	a {
-		color: #e1e1e1;
-	}
-	a:hover,
-	.nav-active a.nav-link,
-	a.active {
-		color: #fff;
-	}
-	* {
-		outline: none;
-	}
-}
-#nav-col {
-	padding: 0;
-	z-index: 100;
-	position: absolute;
-	background: #2c3e50;
-	width: 220px;
-
-	@media (max-width: $break-sm-max) {
-		position: relative;
-		width: auto;
-	}
-}
-#sidebar-nav {
-	max-height: 100%;
-	padding-left: 0;
-	padding-right: 0;
-
-	.nav {
-		> li {
-			margin: 0;
-			/* font-size: 0.875em;
-			font-weight: 600; */
-
-			&.nav-header {
-				color: lighten(#2c3e50, 40%);
-				font-size: 0.8em;
-				padding: 12px 15px 6px 14px;
-				border-top: 2px solid darken(#2c3e50, 4%);
-
-				&.nav-header-first {
-					padding-top: 4px;
-					border-top: 0;
-				}
-			}
-
-			> a {
-				color: #fff;
-				height: 44px;
-			    line-height: 28px;
-			    @include transition(border-color 0.1s ease-in-out 0s, background-color 0.1s ease-in-out 0s, box-shadow 0.1s ease-in-out 0s);
-			    overflow: hidden;
-			    padding: 8px 15px 8px 20px;
-			    border-left: 0 solid transparent;
-			
-				&:hover {
-					border-left-color: $primary-color;
-				}
-				> i {
-					position: absolute;
-					margin-top: 6px;
-				}
-				> span {
-				    margin-left: 35px;
-				    font-size: 0.875em;
-				    font-weight: 700;
-
-					&.label {
-						font-size: 0.75em;
-						margin: 5px 0 0 0;
-					    padding: 4px 0.6em;
-					}
-					&.label.label-circle {
-						margin-right: 5px;
-					}
-				}
-			}
-			&.open > a {
-				border-bottom-color: #252525;
-				outline: none;
-				text-decoration: none;
-			}
-			&.active > .submenu > li.active > .submenu {
-				display: block;
-			}
-		}
-		li {
-			@import "sidebar/submenu";
-
-			&.active > .submenu {
-				display: block;
-			}
-		}
-		> .open,
-		> .active {
-			@import "sidebar/open_active";
-		}
-	}
-}
-.navbar-nav .open .dropdown-menu {
-	background-color: #FFFFFF;
-	border: none;
-	box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176);
-	// left: 0;
-	position: absolute;
-}
-#user-left-box {
-	padding: 20px 15px 20px 25px;
-
-	img {
-		@include border-radius(18%);
-		border: 3px solid #fff;
-	    float: left;
-	    width: 70px;
-	}
-	.user-box {
-		color: #fff;
-	    float: left;
-	    padding-left: 15px;
-	    padding-top: 18px;
-	
-		> .name {
-			display: block;
-		    font-size: 1em;
-		    font-weight: 600;
-		    line-height: 1.2;
-
-		    > a {
-		    	color: #fff;
-
-		    	&:hover,
-		    	&:focus {
-		    		color: #E1E1E1;
-		    		text-decoration: none;
-		    	}
-		    }
-		}
-		> .status {
-			display: block;
-		    font-size: 0.75em;
-		    padding-top: 3px;
-		}
-		> .status > i {
-			color: $green-color;
-			margin-right: 4px;
-		}
-	}
-	&.dropdown {
-		.dropdown-menu {
-			top: 55px;
-			left: 30px;
-
-			a {
-				color: #707070;
-				font-size: 0.875em;
-				
-				&:hover {
-					background-color: #f6f6f6;
-					color: #707070;
-				}
-			}
-		}
-	}
-}
-@media (min-width: $break-sm-min) {
-	.nav-small {
-		#nav-col {
-			width: 64px;
-		}
-		#content-wrapper {
-			margin-left: 64px;
-		}
-		#nav-col {
-			#user-left-box {
-				display: none;
-			}
-			#sidebar-nav {
-				.nav > li > a {
-					padding-left: 15px !important;
-					padding-right: 15px;
-					text-align: center;
-
-					> i {
-						position: relative;
-						font-size: 1.25em;
-					}
-					> span {
-						display: none;
-					}
-				}
-				.nav > li.nav-header {
-					display: none;
-				}
-				.nav li > a.dropdown-toggle > .drop-icon {
-					display: none;
-				}
-				.nav .submenu > li > a.dropdown-toggle > .drop-icon {
-					display: block;
-				}
-				.nav li .submenu {
-					left: 64px;
-				    position: absolute;
-				    top: 0;
-				    width: 210px;
-
-				    > li > a {
-						padding-left: 28px;
-					}
-				}
-				.nav > .open > .submenu > li > .submenu,
-				.nav > .active > .submenu > li > .submenu {
-					left: auto;
-				    position: relative;
-				    top: auto;
-				    width: 100%;
-
-				    a {
-				    	padding-left: 48px
-				    }
-				}
-			}
-		}
-		#sidebar-nav .nav li.active > .submenu {
-			display: none;
-		}
-		#nav-col-submenu {
-			@import "sidebar/submenu";
-			@import "sidebar/open_active";
-
-			.submenu {
-				position: absolute;
-				top: 60px;
-				left: 64px;
-				width: 210px;
-
-			    > li > a {
-					padding-left: 28px;
-
-					&.dropdown-toggle > .drop-icon {
-						display: block;
-					}
-				}
-			}
-			> .submenu {
-				display: block !important;
-			}
-			.submenu > li > .submenu,
-			.submenu > li > .submenu {
-				left: auto;
-			    position: relative;
-			    top: auto;
-			    width: 100%;
-
-			    a {
-			    	padding-left: 48px
-			    }
-			}
-		}
-	}
-}
-@media (max-width: $break-sm-max) {
-	.navbar-toggle {
-		display: block;
-	}
-	#sidebar-nav.navbar-collapse {
-		max-height: 336px;
-	}
-}
 \ No newline at end of file
@@ -1,2 +0,0 @@
-@import "skins/blue";
-@import "skins/blue_gradient";
@@ -1,89 +0,0 @@
-//BASICS
-
-//primary colors
-$primary-color: #03a9f4;
-$primary-color-dark: #0288d1;
-
-$red-color: #e84e40;
-$red-color-dark: #dd191d;
-
-$yellow-color: #ffc107;
-$yellow-color-dark: #ffa000;
-
-$green-color: #8bc34a;
-$green-color-dark: #689f38;
-
-$purple-color: #9c27b0;
-$purple-color-dark: #7b1fa2;
-
-$gray-color: #90a4ae;
-$gray-color-dark: #607d8b;
-$gray-color-light: #b0bec5;
-
-$cyan-color: #00bcd4;
-$cyan-color-dark: #0097a7;
-
-$teal-color: #009688;
-$teal-color-dark: #00796b;
-
-//global text color
-$text-color: #212121;
-
-//global bg color
-$main-bg-color: #e7ebee;
-
-//global link color
-$link-color: $primary-color;
-$link-color-hover: $primary-color;
-
-$default-bg-hover-color: #f8f8f8;
-
-
-//TYPOGRAPHY
-
-//font families
-$font-stack: 'Open Sans', sans-serif;
-
-//headings typo
-$font-size-h1: 2em;
-$font-size-h2: 1.8em;
-$font-size-h3: 1.4em;
-$font-size-h4: 1.2em;
-$font-size-h5: 1em;
-$font-size-h6: 0.875em;
-
-$font-hx-weight: 300;
-
-$line-height-base: 1.428571429 !default;
-
-$heading-font-family: $font-stack;
-
-
-//GRID - media queries breakpoints
-$break-xxs-min: 420px;
-$break-xs-min: 768px;
-$break-sm-min: 992px;
-$break-md-min: 1200px;
-
-$break-xxs-max: ($break-xxs-min - 1);
-$break-xs-max: ($break-xs-min - 1);
-$break-sm-max: ($break-sm-min - 1);
-$break-md-max: ($break-md-min - 1);
-
-$container-max-width: 1920px;
-
-
-//BOXED LAYOUT
-$boxed-layout-max-width: 1200px;
-
-$boxed-layout-breakdown2: 1260px;
-$boxed-layout-max-width2: 1140px;
-
-$boxed-layout-breakdown3: $break-md-max;
-$boxed-layout-max-width3: 1024px;
-
-
-//OTHER
-$border-radius-base: 3px !default;
-$border-radius-large: 6px !default;
-$border-radius-small: 2px !default;
@@ -1,46 +0,0 @@
-.submenu {
-	.submenu {
-		display: none;
-	}
-	> .open > a,
-	> .active > a {
-		background: inherit;
-	    border-bottom-color: darken(#2c3e50, 7%);
-	    box-shadow: 0 -1px 0 darken(#2c3e50, 7%) inset;
-	}
-	> li {
-		a {
-		    position: relative;
-		}
-		> a.dropdown-toggle > .drop-icon {
-			font-size: 10px;
-			margin-top: -5px;
-		}
-		> .submenu {
-			background-color: darken(#2c3e50, 7%);
-		
-			> li a:hover,
-			> li a.active {
-				/* background-color: #232323; */
-				color: $primary-color;
-			}
-			a {
-				border-bottom: 0 none;
-			    border-top: 0 none;
-			    padding-left: 85px;
-			
-				&:before{
-					content: "\f111";
-				    display: inline;
-				    font-family: FontAwesome;
-				    font-size: 4px;
-				    font-style: normal;
-				    font-weight: normal;
-					margin-left: -10px;
-				    margin-top: 1px;
-				    position: absolute;
-				}
-			}
-		}
-	}
-}
 \ No newline at end of file
@@ -1,49 +0,0 @@
-a.dropdown-toggle > .drop-icon {
-	color: #868b98;
-    font-size: 12px;
-    margin-top: -6px;
-    position: absolute;
-    right: 25px;
-    top: 50%;
-    @include transition(transform 0.2s ease-in-out 0.1s);
-}
-&.open > a.dropdown-toggle > .drop-icon,
-&.active > a.dropdown-toggle > .drop-icon {
-	color: #fff;
-	transform:rotate(90deg);
-}
-
-.submenu {
-	display: none;
-	background: darken(#2c3e50, 4%);
-	padding: 5px 0;
-	margin: 0;
-	list-style: none;
-
-	> li {
-		position: relative;
-	
-		> a {
-		    display: block;
-		    font-size: 0.875em;
-		    line-height: 38px;
-		    padding-left: 66px;
-		    color: #fff;
-		    outline: none;
-		    text-decoration: none;
-		    @include transition(border-color 0.1s ease-in-out 0s, background-color 0.1s ease-in-out 0s, box-shadow 0.1s ease-in-out 0s);
-		}
-		&:first-of-type > a {
-			border-top: 0;
-		}
-		> a:hover,
-		> a.active,
-		&.active > a,
-		&.open > a {
-			text-decoration: none;
-			color: #fff;
-			background-color: darken(#2c3e50, 7%);
-			/* box-shadow: 0 -1px 0 0 #8bf2e6 inset; */
-		}
-	}
-}
 \ No newline at end of file
@@ -1,102 +0,0 @@
-$blue-nav-color: #4c5763;
-
-.theme-blue {
-	#header-navbar {
-		background-color: $primary-color;
-	}
-	.navbar > .container .navbar-brand {
-		background-color: $primary-color;
-	}
-	#nav-col,
-	#page-wrapper {
-		background-color: $blue-nav-color;
-	}
-	#sidebar-nav .nav > .open > .submenu > li > .submenu,
-	#sidebar-nav .nav > .active > .submenu > li > .submenu,
-	#sidebar-nav .nav li .submenu > li.open a,
-	#nav-col-submenu .submenu > li > .submenu,
-	#nav-col-submenu li .submenu > li.open > a {
-	    background-color: darken($blue-nav-color, 10%);
-	}
-	#sidebar-nav .nav > .open > .submenu > .open > a, 
-	#sidebar-nav .nav > .active > .submenu > .open > a, 
-	#sidebar-nav .nav > .active > .submenu > .active > a,
-	#nav-col-submenu > .submenu > .open > a,
-	#nav-col-submenu > .submenu > .active > a {
-		border-bottom-color: transparent;
-	    box-shadow: 0 -1px 0 transparent inset;
-	}
-	#sidebar-nav .nav > .open > .submenu > li > .submenu > li a:hover, 
-	#sidebar-nav .nav > .active > .submenu > li > .submenu > li a:hover, 
-	#sidebar-nav .nav > .active > .submenu > li > .submenu > li a.active {
-		color: $primary-color;
-	}
-	.nav-pills > li.active > a, 
-	.nav-pills > li.active > a:hover, 
-	.nav-pills > li.active > a:focus,
-	#sidebar-nav .nav-pills > li.active > a, 
-	#sidebar-nav .nav-pills > li.active > a:hover, 
-	#sidebar-nav .nav-pills > li.active > a:focus,
-	.nav-pills > li.open > a, 
-	.nav-pills > li.open > a:hover, 
-	.nav-pills > li.open > a:focus,
-	#sidebar-nav .nav-pills > li.open > a, 
-	#sidebar-nav .nav-pills > li.open > a:hover, 
-	#sidebar-nav .nav-pills > li.open > a:focus,
-	.nav-small #nav-col #sidebar-nav .nav-pills > li.open > a,
-	.nav-small #nav-col-submenu .submenu > .open > a, 
-	.nav-small #nav-col-submenu .submenu > .active > a,
-	.nav-small #nav-col-submenu .submenu > li > a:hover {
-		background-color: darken($blue-nav-color, 5%);
-	}
-	#sidebar-nav .nav > li > a:hover {
-		background-color: darken($blue-nav-color, 5%);
-	}
-	#header-navbar .nav > li > a {
-		color: #fff;
-	}
-	#header-navbar .nav > li > a:hover,
-	#header-navbar .nav > li > a:focus,
-	#header-navbar .nav .open > a, 
-	#header-navbar .nav .open > a:hover, 
-	#header-navbar .nav .open > a:focus {
-		background-color: #2980b9;
-	}
-	#sidebar-nav .nav li .submenu,
-	#nav-col-submenu .submenu {
-		background-color: darken($blue-nav-color, 5%);
-	}
-	#sidebar-nav .nav li .submenu > li > a:hover,
-	#sidebar-nav .nav li .submenu > li > a.active,
-	#sidebar-nav .nav li .submenu > li.active > a,
-	.nav-small #nav-col-submenu .submenu > .open > a, 
-	.nav-small #nav-col-submenu .submenu > .active > a,
-	.nav-small #nav-col-submenu .submenu > li > a:hover,
-	.nav-small #nav-col-submenu .submenu > li > a.active,
-	.nav-small #nav-col-submenu .submenu > li.active > a {
-		background-color: darken($blue-nav-color, 10%);
-	}
-	#sidebar-nav .nav > li.nav-header {
-		border-top-color: darken($blue-nav-color, 5%);
-		color: lighten($blue-nav-color, 30%);
-	}
-	.navbar > .container .navbar-brand {
-		color: #fff;
-	}
-	.navbar-toggle {
-		color: #fff;
-	}
-	.pace .pace-progress {
-		background-color: #fff;
-	}
-}
-@media (max-width: $break-sm-max) {
-	.theme-blue {
-		#logo.navbar-brand > img.normal-logo.logo-white {
-			display: block;
-		}
-		#logo.navbar-brand > img.normal-logo.logo-black {
-			display: none;
-		}
-	}
-}
 \ No newline at end of file
@@ -1,109 +0,0 @@
-.theme-blue-gradient #header-navbar,
-#config-tool #skin-colors li a.skin-changer.blue-gradient {
-	background: $primary-color; /* Old browsers */
-	background: -moz-linear-gradient(top,  $primary-color 0%, #2980b9 100%); /* FF3.6+ */
-	background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$primary-color), color-stop(100%,#2980b9)); /* Chrome,Safari4+ */
-	background: -webkit-linear-gradient(top,  $primary-color 0%,#2980b9 100%); /* Chrome10+,Safari5.1+ */
-	background: -o-linear-gradient(top,  $primary-color 0%,#2980b9 100%); /* Opera 11.10+ */
-	background: -ms-linear-gradient(top,  $primary-color 0%,#2980b9 100%); /* IE10+ */
-	background: linear-gradient(to bottom,  $primary-color 0%,#2980b9 100%); /* W3C */
-	filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$primary-color', endColorstr='#2980b9',GradientType=0 ); /* IE6-9 */
-}
-.theme-blue-gradient {
-	.navbar > .container .navbar-brand {
-		background: transparent;
-	}
-	#header-navbar .nav > li > a {
-		color: #fff;
-	}
-	#header-navbar .nav > li > a:hover,
-	#header-navbar .nav > li > a:focus,
-	#header-navbar .nav .open > a, 
-	#header-navbar .nav .open > a:hover, 
-	#header-navbar .nav .open > a:focus {
-		background-color: #005486;
-	}
-	.navbar > .container .navbar-brand {
-		color: #fff;
-	}
-	.navbar-toggle {
-		color: #fff;
-	}
-	.red-bg {
-		background: $red-color !important; /* Old browsers */
-		background: -moz-linear-gradient(top,  $red-color 0%, $red-color-dark 100%) !important; /* FF3.6+ */
-		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$red-color), color-stop(100%,$red-color-dark)) !important; /* Chrome,Safari4+ */
-		background: -webkit-linear-gradient(top,  $red-color 0%,$red-color-dark 100%) !important; /* Chrome10+,Safari5.1+ */
-		background: -o-linear-gradient(top,  $red-color 0%,$red-color-dark 100%) !important; /* Opera 11.10+ */
-		background: -ms-linear-gradient(top,  $red-color 0%,$red-color-dark 100%) !important; /* IE10+ */
-		background: linear-gradient(to bottom,  $red-color 0%,$red-color-dark 100%) !important; /* W3C */
-		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$red-color', endColorstr='$red-color-dark',GradientType=0 ) !important; /* IE6-9 */
-	}
-	.emerald-bg {
-		background: $primary-color !important; /* Old browsers */
-		background: -moz-linear-gradient(top,  $primary-color 0%, #2980b9 100%) !important; /* FF3.6+ */
-		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$primary-color), color-stop(100%,#2980b9)) !important; /* Chrome,Safari4+ */
-		background: -webkit-linear-gradient(top,  $primary-color 0%,#2980b9 100%) !important; /* Chrome10+,Safari5.1+ */
-		background: -o-linear-gradient(top,  $primary-color 0%,#2980b9 100%) !important; /* Opera 11.10+ */
-		background: -ms-linear-gradient(top,  $primary-color 0%,#2980b9 100%) !important; /* IE10+ */
-		background: linear-gradient(to bottom,  $primary-color 0%,#2980b9 100%) !important; /* W3C */
-		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$primary-color', endColorstr='#2980b9',GradientType=0 ) !important; /* IE6-9 */
-	}
-	.yellow-bg {
-		background: $yellow-color !important; /* Old browsers */
-		background: -moz-linear-gradient(top,  $yellow-color 0%, $yellow-color-dark 100%) !important; /* FF3.6+ */
-		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$yellow-color), color-stop(100%,$yellow-color-dark)) !important; /* Chrome,Safari4+ */
-		background: -webkit-linear-gradient(top,  $yellow-color 0%,$yellow-color-dark 100%) !important; /* Chrome10+,Safari5.1+ */
-		background: -o-linear-gradient(top,  $yellow-color 0%,$yellow-color-dark 100%) !important; /* Opera 11.10+ */
-		background: -ms-linear-gradient(top,  $yellow-color 0%,$yellow-color-dark 100%) !important; /* IE10+ */
-		background: linear-gradient(to bottom,  $yellow-color 0%,$yellow-color-dark 100%) !important; /* W3C */
-		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$yellow-color', endColorstr='$yellow-color-dark',GradientType=0 ) !important; /* IE6-9 */
-	}
-	.green-bg {
-		background: $green-color !important; /* Old browsers */
-		background: -moz-linear-gradient(top,  $green-color 0%, $green-color-dark 100%) !important; /* FF3.6+ */
-		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$green-color), color-stop(100%,$green-color-dark)) !important; /* Chrome,Safari4+ */
-		background: -webkit-linear-gradient(top,  $green-color 0%,$green-color-dark 100%) !important; /* Chrome10+,Safari5.1+ */
-		background: -o-linear-gradient(top,  $green-color 0%,$green-color-dark 100%) !important; /* Opera 11.10+ */
-		background: -ms-linear-gradient(top,  $green-color 0%,$green-color-dark 100%) !important; /* IE10+ */
-		background: linear-gradient(to bottom,  $green-color 0%,$green-color-dark 100%) !important; /* W3C */
-		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$green-color', endColorstr='$green-color-dark',GradientType=0 ) !important; /* IE6-9 */
-	}
-	.purple-bg {
-		background: $purple-color !important; /* Old browsers */
-		background: -moz-linear-gradient(top,  $purple-color 0%, $purple-color-dark 100%) !important; /* FF3.6+ */
-		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$purple-color), color-stop(100%,$purple-color-dark)) !important; /* Chrome,Safari4+ */
-		background: -webkit-linear-gradient(top,  $purple-color 0%,$purple-color-dark 100%) !important; /* Chrome10+,Safari5.1+ */
-		background: -o-linear-gradient(top,  $purple-color 0%,$purple-color-dark 100%) !important; /* Opera 11.10+ */
-		background: -ms-linear-gradient(top,  $purple-color 0%,$purple-color-dark 100%) !important; /* IE10+ */
-		background: linear-gradient(to bottom,  $purple-color 0%,$purple-color-dark 100%) !important; /* W3C */
-		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$purple-color', endColorstr='$purple-color-dark',GradientType=0 ) !important; /* IE6-9 */
-	}
-	.gray-bg {
-		background: $gray-color !important; /* Old browsers */
-		background: -moz-linear-gradient(top,  $gray-color 0%, $gray-color-dark 100%) !important; /* FF3.6+ */
-		background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,$gray-color), color-stop(100%,$gray-color-dark)) !important; /* Chrome,Safari4+ */
-		background: -webkit-linear-gradient(top,  $gray-color 0%,$gray-color-dark 100%) !important; /* Chrome10+,Safari5.1+ */
-		background: -o-linear-gradient(top,  $gray-color 0%,$gray-color-dark 100%) !important; /* Opera 11.10+ */
-		background: -ms-linear-gradient(top,  $gray-color 0%,$gray-color-dark 100%) !important; /* IE10+ */
-		background: linear-gradient(to bottom,  $gray-color 0%,$gray-color-dark 100%) !important; /* W3C */
-		filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='$gray-color', endColorstr='$gray-color-dark',GradientType=0 ) !important; /* IE6-9 */
-	}
-	.pace .pace-progress {
-		background-color: #fff;
-	}
-	#nav-col, 
-	#page-wrapper {
-	    background-color: #2c3e50;
-	}
-}
-@media (max-width: $break-sm-max) {
-	.theme-blue-gradient {
-		#logo.navbar-brand > img.normal-logo.logo-white {
-			display: block;
-		}
-		#logo.navbar-brand > img.normal-logo.logo-black {
-			display: none;
-		}
-	}
-}
 \ No newline at end of file
@@ -1,418 +0,0 @@
-<div id="nav-col">
-  <section id="col-left" class="col-left-nano">
-    <div id="col-left-inner" class="col-left-nano-content">
-      <div id="user-left-box" class="clearfix hidden-sm hidden-xs dropdown profile2-dropdown">
-        <img alt="" src="/designs/themes/cube-responsive-theme/images/samples/scarlet-159.png" />
-        <div class="user-box">
-          <span class="name">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown">
-              Scarlett J.
-              <i class="fa fa-angle-down"></i>
-            </a>
-            <ul class="dropdown-menu">
-              <li><a href="user-profile.html"><i class="fa fa-user"></i>Profile</a></li>
-              <li><a href="#"><i class="fa fa-cog"></i>Settings</a></li>
-              <li><a href="#"><i class="fa fa-envelope-o"></i>Messages</a></li>
-              <li><a href="#"><i class="fa fa-power-off"></i>Logout</a></li>
-            </ul>
-          </span>
-          <span class="status">
-            <i class="fa fa-circle"></i> Online
-          </span>
-        </div>
-      </div>
-      <div class="collapse navbar-collapse navbar-ex1-collapse" id="sidebar-nav">
-        <ul class="nav nav-pills nav-stacked">
-          <li class="nav-header nav-header-first hidden-sm hidden-xs">
-            Navigation
-          </li>
-          <li class="active">
-            <a href="index.html">
-              <i class="fa fa-dashboard"></i>
-              <span>Dashboard</span>
-              <span class="label label-primary label-circle pull-right">28</span>
-            </a>
-          </li>
-          <li>
-            <a href="#" class="dropdown-toggle">
-              <i class="fa fa-table"></i>
-              <span>Tables</span>
-              <i class="fa fa-angle-right drop-icon"></i>
-            </a>
-            <ul class="submenu">
-              <li>
-                <a href="tables.html">
-                  Simple
-                </a>
-              </li>
-              <li>
-                <a href="tables-advanced.html">
-                  Advanced
-                </a>
-              </li>
-              <li>
-                <a href="users.html">
-                  Users
-                </a>
-              </li>
-            </ul>
-          </li>
-          <li>
-            <a href="#" class="dropdown-toggle">
-              <i class="fa fa-envelope"></i>
-              <span>Email</span>
-              <i class="fa fa-angle-right drop-icon"></i>
-            </a>
-            <ul class="submenu">
-              <li>
-                <a href="email-inbox.html">
-                  Inbox
-                </a>
-              </li>
-              <li>
-                <a href="email-detail.html">
-                  Detail
-                </a>
-              </li>
-              <li>
-                <a href="email-compose.html">
-                  Compose
-                </a>
-              </li>
-            </ul>
-          </li>
-          <li>
-            <a href="#" class="dropdown-toggle">
-              <i class="fa fa-bar-chart-o"></i>
-              <span>Graphs</span>
-              <i class="fa fa-angle-right drop-icon"></i>
-            </a>
-            <ul class="submenu">
-              <li>
-                <a href="graphs-morris.html">
-                  Morris &amp; Mixed
-                </a>
-              </li>
-              <li>
-                <a href="graphs-flot.html">
-                  Flot
-                </a>
-              </li>
-              <li>
-                <a href="graphs-dygraphs.html">
-                  Dygraphs
-                </a>
-              </li>
-              <li>
-                <a href="graphs-xcharts.html">
-                  xCharts
-                </a>
-              </li>
-            </ul>
-          </li>
-          <li>
-            <a href="widgets.html">
-              <i class="fa fa-th-large"></i>
-              <span>Widgets</span>
-              <span class="label label-success pull-right">New</span>
-            </a>
-          </li>
-          <li>
-            <a href="#" class="dropdown-toggle">
-              <i class="fa fa-copy"></i>
-              <span>Pages</span>
-              <i class="fa fa-angle-right drop-icon"></i>
-            </a>
-            <ul class="submenu">
-              <li>
-                <a href="calendar.html">
-                  Calendar
-                </a>
-              </li>
-              <li>
-                <a href="gallery.html">
-                  Gallery
-                </a>
-              </li>
-              <li>
-                <a href="gallery-v2.html">
-                  Gallery v2
-                </a>
-              </li>
-              <li>
-                <a href="pricing.html">
-                  Pricing
-                </a>
-              </li>
-              <li>
-                <a href="projects.html">
-                  Projects
-                </a>
-              </li>
-              <li>
-                <a href="team-members.html">
-                  Team Members
-                </a>
-              </li>
-              <li>
-                <a href="timeline.html">
-                  Timeline
-                </a>
-              </li>
-              <li>
-                <a href="timeline-grid.html">
-                  Timeline Grid
-                </a>
-              </li>
-              <li>
-                <a href="user-profile.html">
-                  User Profile
-                </a>
-              </li>
-              <li>
-                <a href="search.html">
-                  Search Results
-                </a>
-              </li>
-              <li>
-                <a href="invoice.html">
-                  Invoice
-                </a>
-              </li>
-              <li>
-                <a href="intro.html">
-                  Tour Layout
-                </a>
-              </li>
-            </ul>
-          </li>
-          <li class="nav-header hidden-sm hidden-xs">
-            Components
-          </li>
-          <li>
-            <a href="#" class="dropdown-toggle">
-              <i class="fa fa-edit"></i>
-              <span>Forms</span>
-              <i class="fa fa-angle-right drop-icon"></i>
-            </a>
-            <ul class="submenu">
-              <li>
-                <a href="form-elements.html">
-                  Elements
-                </a>
-              </li>
-              <li>
-                <a href="x-editable.html">
-                  X-Editable
-                </a>
-              </li>
-              <li>
-                <a href="form-wizard.html">
-                  Wizard
-                </a>
-              </li>
-              <li>
-                <a href="form-wizard-popup.html">
-                  Wizard popup
-                </a>
-              </li>
-              <li>
-                <a href="form-wysiwyg.html">
-                  WYSIWYG
-                </a>
-              </li>
-              <li>
-                <a href="form-summernote.html">
-                  WYSIWYG Summernote
-                </a>
-              </li>
-              <li>
-                <a href="form-ckeditor.html">
-                  WYSIWYG CKEditor
-                </a>
-              </li>
-              <li>
-                <a href="form-dropzone.html">
-                  Multiple File Upload
-                </a>
-              </li>
-            </ul>
-          </li>
-          <li>
-            <a href="#" class="dropdown-toggle">
-              <i class="fa fa-desktop"></i>
-              <span>UI Kit</span>
-              <i class="fa fa-angle-right drop-icon"></i>
-            </a>
-            <ul class="submenu">
-              <li>
-                <a href="ui-elements.html">
-                  Elements
-                </a>
-              </li>
-              <li>
-                <a href="notifications.html">
-                  Notifications &amp; Alerts
-                </a>
-              </li>
-              <li>
-                <a href="modals.html">
-                  Modals
-                </a>
-              </li>
-              <li>
-                <a href="video.html">
-                  Video
-                </a>
-              </li>
-              <li>
-                <a href="#" class="dropdown-toggle">
-                  Icons
-                  <i class="fa fa-angle-right drop-icon"></i>
-                </a>
-                <ul class="submenu">
-                  <li>
-                    <a href="icons-awesome.html">
-                      Awesome Icons
-                    </a>
-                  </li>
-                  <li>
-                    <a href="icons-halflings.html">
-                      Halflings Icons
-                    </a>
-                  </li>
-                </ul>
-              </li>
-              <li>
-                <a href="ui-nestable.html">
-                  Nestable List
-                </a>
-              </li>
-              <li>
-                <a href="typography.html">
-                  Typography
-                </a>
-              </li>
-              <li>
-                <a href="#" class="dropdown-toggle">
-                  3 Level Menu
-                  <i class="fa fa-angle-right drop-icon"></i>
-                </a>
-                <ul class="submenu">
-                  <li>
-                    <a href="#">
-                      3rd Level
-                    </a>
-                  </li>
-                  <li>
-                    <a href="#">
-                      3rd Level
-                    </a>
-                  </li>
-                  <li>
-                    <a href="#">
-                      3rd Level
-                    </a>
-                  </li>
-                </ul>
-              </li>
-            </ul>
-          </li>
-          <li>
-            <a href="maps.html">
-              <i class="fa fa-map-marker"></i>
-              <span>Google Maps</span>
-              <span class="label label-danger pull-right">Updated</span>
-            </a>
-          </li>
-          <li>
-            <a href="#" class="dropdown-toggle">
-              <i class="fa fa-file-text-o"></i>
-              <span>Extra pages</span>
-              <i class="fa fa-angle-right drop-icon"></i>
-            </a>
-            <ul class="submenu">
-              <li>
-                <a href="faq.html">
-                  FAQ
-                </a>
-              </li>
-              <li>
-                <a href="emails.html">
-                  Email Templates
-                </a>
-              </li>
-              <li>
-                <a href="login.html">
-                  Login
-                </a>
-              </li>
-              <li>
-                <a href="login-full.html">
-                  Login Full
-                </a>
-              </li>
-              <li>
-                <a href="registration.html">
-                  Registration
-                </a>
-              </li>
-              <li>
-                <a href="registration-full.html">
-                  Registration Full
-                </a>
-              </li>
-              <li>
-                <a href="forgot-password.html">
-                  Forgot Password
-                </a>
-              </li>
-              <li>
-                <a href="forgot-password-full.html">
-                  Forgot Password Full
-                </a>
-              </li>
-              <li>
-                <a href="lock-screen.html">
-                  Lock Screen
-                </a>
-              </li>
-              <li>
-                <a href="lock-screen-full.html">
-                  Lock Screen Full
-                </a>
-              </li>
-              <li>
-                <a href="error-404.html">
-                  Error 404
-                </a>
-              </li>
-              <li>
-                <a href="error-404-v2.html">
-                  Error 404 Nested
-                </a>
-              </li>
-              <li>
-                <a href="error-500.html">
-                  Error 500
-                </a>
-              </li>
-              <li>
-                <a href="extra-grid.html">
-                  Grid
-                </a>
-              </li>
-            </ul>
-          </li>
-          <li>
-            <a href="/angularjs">
-              <i class="fa fa-google"></i>
-              <span>AngularJS Demo</span>
-            </a>
-          </li>
-        </ul>
-      </div>
-    </div>
-  </section>
-  <div id="nav-col-submenu"></div>
-</div>
@@ -1,5 +0,0 @@
-<a href="index.html" id="logo" class="navbar-brand">
-  <img src="/designs/themes/cube-responsive-theme/images/logo-noosfero-header.png" alt="" class="normal-logo logo-white"/> <span class="logo-title">Noosfero</span>
-  <img src="/designs/themes/cube-responsive-theme/images/logo-black.png" alt="" class="normal-logo logo-black"/>
-  <img src="/designs/themes/cube-responsive-theme/images/logo-small.png" alt="" class="small-logo hidden-xs hidden-sm hidden"/>
-</a>
@@ -1,10 +0,0 @@
-// bootstrap customizations, bootstrap
-// see also plugins/responsive/public/bootstrap/all.scss
-@import 'bootstrap/variables';
-@import 'bootstrap-core';
-
-// say to base-responsive that we already took care of boostrap
-$bootstrap-loaded: true;
-
-@import 'sass/theme_styles';
-@import '../base-responsive/style';
@@ -1,149 +0,0 @@
-$(function($) {
-
-	setTimeout(function() {
-		$('#content-wrapper > .row').css({
-			opacity: 1
-		});
-	}, 200);
-
-	$('#sidebar-nav,#nav-col-submenu').on('click', '.dropdown-toggle', function (e) {
-		e.preventDefault();
-
-		var $item = $(this).parent();
-
-		if (!$item.hasClass('open')) {
-			$item.parent().find('.open .submenu').slideUp('fast');
-			$item.parent().find('.open').toggleClass('open');
-		}
-
-		$item.toggleClass('open');
-
-		if ($item.hasClass('open')) {
-			$item.children('.submenu').slideDown('fast');
-		}
-		else {
-			$item.children('.submenu').slideUp('fast');
-		}
-	});
-
-	$('body').on('mouseenter', '#page-wrapper.nav-small #sidebar-nav .dropdown-toggle', function (e) {
-		if ($( document ).width() >= 992) {
-			var $item = $(this).parent();
-
-			if ($('body').hasClass('fixed-leftmenu')) {
-				var topPosition = $item.position().top;
-
-				if ((topPosition + 4*$(this).outerHeight()) >= $(window).height()) {
-					topPosition -= 6*$(this).outerHeight();
-				}
-
-				$('#nav-col-submenu').html($item.children('.submenu').clone());
-				$('#nav-col-submenu > .submenu').css({'top' : topPosition});
-			}
-
-			$item.addClass('open');
-			$item.children('.submenu').slideDown('fast');
-		}
-	});
-
-	$('body').on('mouseleave', '#page-wrapper.nav-small #sidebar-nav > .nav-pills > li', function (e) {
-		if ($( document ).width() >= 992) {
-			var $item = $(this);
-
-			if ($item.hasClass('open')) {
-				$item.find('.open .submenu').slideUp('fast');
-				$item.find('.open').removeClass('open');
-				$item.children('.submenu').slideUp('fast');
-			}
-
-			$item.removeClass('open');
-		}
-	});
-	$('body').on('mouseenter', '#page-wrapper.nav-small #sidebar-nav a:not(.dropdown-toggle)', function (e) {
-		if ($('body').hasClass('fixed-leftmenu')) {
-			$('#nav-col-submenu').html('');
-		}
-	});
-	$('body').on('mouseleave', '#page-wrapper.nav-small #nav-col', function (e) {
-		if ($('body').hasClass('fixed-leftmenu')) {
-			$('#nav-col-submenu').html('');
-		}
-	});
-
-	$('#make-small-nav').click(function (e) {
-		$('#page-wrapper').toggleClass('nav-small');
-	});
-
-	$(window).smartresize(function(){
-		if ($( document ).width() <= 991) {
-			$('#page-wrapper').removeClass('nav-small');
-		}
-	});
-
-	$('.mobile-search').click(function(e) {
-		e.preventDefault();
-
-		$('.mobile-search').addClass('active');
-		$('.mobile-search form input.form-control').focus();
-	});
-	$(document).mouseup(function (e) {
-		var container = $('.mobile-search');
-
-		if (!container.is(e.target) // if the target of the click isn't the container...
-			&& container.has(e.target).length === 0) // ... nor a descendant of the container
-		{
-			container.removeClass('active');
-		}
-	});
-
-	// $('.fixed-leftmenu #col-left').nanoScroller({
-  //   	alwaysVisible: false,
-  //   	iOSNativeScrolling: false,
-  //   	preventPageScrolling: true,
-  //   	contentClass: 'col-left-nano-content'
-  //   });
-
-	// build all tooltips from data-attributes
-	$("[data-toggle='tooltip']").each(function (index, el) {
-		$(el).tooltip({
-			placement: $(this).data("placement") || 'top'
-		});
-	});
-});
-
-$.fn.removeClassPrefix = function(prefix) {
-    this.each(function(i, el) {
-        var classes = el.className.split(" ").filter(function(c) {
-            return c.lastIndexOf(prefix, 0) !== 0;
-        });
-        el.className = classes.join(" ");
-    });
-    return this;
-};
-
-(function($,sr){
-	// debouncing function from John Hann
-	// http://unscriptable.com/index.php/2009/03/20/debouncing-javascript-methods/
-	var debounce = function (func, threshold, execAsap) {
-		var timeout;
-
-		return function debounced () {
-			var obj = this, args = arguments;
-			function delayed () {
-				if (!execAsap)
-					func.apply(obj, args);
-				timeout = null;
-			};
-
-			if (timeout)
-				clearTimeout(timeout);
-			else if (execAsap)
-				func.apply(obj, args);
-
-			timeout = setTimeout(delayed, threshold || 100);
-		};
-	}
-	// smartresize
-	$.fn[sr] = function(fn){	return fn ? this.bind('resize', debounce(fn)) : this.trigger(sr); };
-
-})($,'smartresize');
@@ -1,4 +0,0 @@
-name: "Noosfero responsive some Bootstrap styling"
-layout: "application-responsive"
-icon_theme: [awesome, pidgin]
-responsive: true
@@ -0,0 +1,97 @@
+require_relative 'test_helper'
+
+class BlocksTest < ActiveSupport::TestCase
+
+  def setup
+    create_and_activate_user
+    login_api
+    @environment = Environment.default
+    @profile = fast_create(Profile)
+  end
+
+  attr_accessor :environment, :profile
+
+  should 'get an environment block' do
+    box = fast_create(Box, :owner_id => environment.id, :owner_type => Environment.name)
+    block = fast_create(Block, box_id: box.id)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal block.id, json["block"]["id"]
+  end
+
+  should 'get a profile block' do
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal block.id, json["block"]["id"]
+  end
+
+  should 'get a profile block for a not logged in user' do
+    logout_api
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal block.id, json["block"]["id"]
+  end
+
+  should 'not get a profile block for a not logged in user' do
+    logout_api
+    profile = fast_create(Profile, public_profile: false)
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    assert_equal 403, last_response.status
+  end
+
+  should 'not get a profile block for an user without permission' do
+    profile = fast_create(Profile, public_profile: false)
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    assert_equal 403, last_response.status
+  end
+
+  should 'get a block for an user with permission in a private profile' do
+    profile = fast_create(Profile, public_profile: false)
+    profile.add_admin(person)
+    box = fast_create(Box, :owner_id => profile.id, :owner_type => Profile.name)
+    block = fast_create(Block, box_id: box.id)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal block.id, json["block"]["id"]
+  end
+
+  should 'display api content by default' do
+    box = fast_create(Box, :owner_id => environment.id, :owner_type => Environment.name)
+    block = fast_create(Block, box_id: box.id)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert json["block"].key?('api_content')
+  end
+
+  should 'display api content of a specific block' do
+    class SomeBlock < Block
+      def api_content
+        {some_content: { name: 'test'} }
+      end
+    end
+    box = fast_create(Box, :owner_id => environment.id, :owner_type => Environment.name)
+    block = fast_create(SomeBlock, box_id: box.id)
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal "test", json["block"]["api_content"]["some_content"]["name"]
+  end
+
+  should 'display api content of raw html block' do
+    box = fast_create(Box, :owner_id => environment.id, :owner_type => Environment.name)
+    block = fast_create(RawHTMLBlock, box_id: box.id)
+    block.html = '<div>test</div>'
+    block.save!
+    get "/api/v1/blocks/#{block.id}?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert_equal "<div>test</div>", json["block"]["api_content"]["html"]
+  end
+
+end
@@ -38,4 +38,13 @@ class BoxesTest &lt; ActiveSupport::TestCase
     assert_equal box.id, json["boxes"].first["id"]
   end
+  should 'not display block api_content by default' do
+    Environment.delete_all
+    environment = fast_create(Environment, :is_default => true)
+    box = fast_create(Box, :owner_id => environment.id, :owner_type => 'Environment')
+    block = fast_create(Block, box_id: box.id)
+    get "/api/v1/environments/default/boxes?#{params.to_query}"
+    json = JSON.parse(last_response.body)
+    assert !json["boxes"].first["blocks"].first.key?('api_content')
+  end
 end
 require_relative 'test_helper'
+require "base64"
 require 'noosfero/api/helpers'
 class APIHelpersTest < ActiveSupport::TestCase
@@ -251,19 +252,28 @@ class APIHelpersTest &lt; ActiveSupport::TestCase
     present_partial(model, {})
   end
-###### Captcha tests ######
-
- def plugins
-   environment = Environment.default
-   Noosfero::Plugin::Manager.new(environment, self)
- end
+  should 'do not test captcha when there is no captcha plugin enabled' do
+    environment = Environment.new
+    assert verify_captcha("127.0.0.1", {}, environment)
+  end
- should 'do not test captcha when there is no captcha plugin enabled' do
-   environment = Environment.new
-   assert verify_captcha("127.0.0.1", {}, environment)
- end
+  should 'create a :uploaded_data hash, expected by image_builder ' do
+    base64_image = create_base64_image
+    uploadedfile = base64_to_uploadedfile base64_image
+    assert uploadedfile.has_key? :uploaded_data
+    assert_equal uploadedfile[:uploaded_data].original_filename, base64_image[:filename]
+    assert_equal uploadedfile[:uploaded_data].content_type, base64_image[:type]
+    assert uploadedfile[:uploaded_data].tempfile
+  end
-###### END Captcha tests ######
+  should 'return a params copy with a UploadedFile object' do
+    base64_image = create_base64_image
+    params = {}
+    params.merge!({image_builder: base64_image})
+    asset_params = asset_with_image params
+    assert !asset_params[:image_builder][:uploaded_data].nil?
+    assert asset_params[:image_builder][:uploaded_data].is_a? ActionDispatch::Http::UploadedFile
+  end
   protected
@@ -388,4 +388,14 @@ class PeopleTest &lt; ActiveSupport::TestCase
     end
   end
+  should 'update person image' do
+    login_api
+    base64_image = create_base64_image
+    params.merge!({person: {image_builder: base64_image}})
+    assert_nil person.image
+    post "/api/v1/people/#{person.id}?#{params.to_query}"
+    person.reload
+    assert_not_nil person.image
+    assert_equal person.image.filename, base64_image[:filename]
+  end
 end
@@ -69,8 +69,24 @@ class ActiveSupport::TestCase
     @params[:private_token] = @private_token
   end
+  def logout_api
+    @params.delete(:private_token)
+  end
+
   attr_accessor :private_token, :user, :person, :params, :environment
+  def create_base64_image
+    image_path = File.absolute_path(Rails.root + 'public/images/noosfero-network.png')
+    image_name = File.basename(image_path)
+    image_type = "image/#{File.extname(image_name).delete "."}"
+    encoded_base64_img = Base64.encode64(File.open(image_path) {|io| io.read })
+    base64_image = {}
+    base64_image[:tempfile] = encoded_base64_img
+    base64_image[:filename] = image_name
+    base64_image[:type] = image_type
+    base64_image
+  end
+
   private
   def json_response_ids(kind)
@@ -398,4 +398,64 @@ class BlockTest &lt; ActiveSupport::TestCase
     assert block.get_limit.is_a?(Fixnum)
   end
+  should 'return true at visible_to_user? when block is visible' do
+    block = Block.new
+    person = create_user('person_one').person
+    assert block.visible_to_user?(person)
+  end
+
+  should 'return false at visible_to_user? when block is not visible and user is nil' do
+    block = Block.new
+    person = create_user('person_one').person
+    block.stubs(:owner).returns(person)
+    block.expects(:visible?).returns(false)
+    assert !block.visible_to_user?(nil)
+  end
+
+  should 'return false at visible_to_user? when block is not visible and user does not has permission' do
+    block = Block.new
+    person = create_user('person_one').person
+    community = fast_create(Community)
+    block.stubs(:owner).returns(community)
+    block.expects(:visible?).returns(false)
+    assert !block.visible_to_user?(person)
+  end
+
+  should 'return true at visible_to_user? when block is not visible and user has permission' do
+    block = Block.new
+    person = create_user('person_one').person
+    community = fast_create(Community)
+    give_permission(person, 'edit_profile_design', community)
+    block.stubs(:owner).returns(community)
+    block.expects(:visible?).returns(false)
+    assert block.visible_to_user?(person)
+  end
+
+  should 'return false at visible_to_user? when block is not visible and user does not has permission in environment' do
+    block = Block.new
+    environment = Environment.default
+    person = create_user('person_one').person
+    block.stubs(:owner).returns(environment)
+    block.expects(:visible?).returns(false)
+    assert !block.visible_to_user?(person)
+  end
+
+  should 'return true at visible_to_user? when block is not visible and user has permission in environment' do
+    block = Block.new
+    environment = Environment.default
+    person = create_user('person_one').person
+    give_permission(person, 'edit_environment_design', environment)
+    block.stubs(:owner).returns(environment)
+    block.expects(:visible?).returns(false)
+    assert block.visible_to_user?(person)
+  end
+
+  should 'return false at visible_to_user? when block is not visible to user' do
+    block = Block.new
+    person = create_user('person_one').person
+    block.stubs(:owner).returns(person)
+    block.expects(:visible?).returns(true)
+    block.expects(:display_to_user?).returns(false)
+    assert !block.visible_to_user?(nil)
+  end
 end
@@ -128,4 +128,12 @@ class RecentDocumentsBlockViewTest &lt; ActionView::TestCase
     box.expects(:owner).returns(Environment.new).at_least_once
     assert_equal '', render_block_footer(block)
   end
+
+  should 'return articles in api_content' do
+    profile = fast_create(Profile)
+    article = fast_create(TextArticle, profile_id: profile.id)
+    block = RecentDocumentsBlock.new
+    block.stubs(:owner).returns(profile)
+    assert_equal [article.id], block.api_content['articles'].map {|a| a[:id]}
+  end
 end
@@ -0,0 +1,14 @@		@@ -0,0 +1,14 @@
	1	+class ActivitiesCounterCacheJob
	2	+
	3	+ def perform
	4	+ person_activities_counts = ApplicationRecord.connection.execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.user_id WHERE (action_tracker.created_at >= #{ApplicationRecord.connection.quote(ActionTracker::Record::RECENT_DELAY.days.ago.to_s(:db))}) AND ( (profiles.type = 'Person' ) ) GROUP BY profiles.id;")
	5	+ organization_activities_counts = ApplicationRecord.connection.execute("SELECT profiles.id, count(action_tracker.id) as count FROM profiles LEFT OUTER JOIN action_tracker ON profiles.id = action_tracker.target_id WHERE (action_tracker.created_at >= #{ApplicationRecord.connection.quote(ActionTracker::Record::RECENT_DELAY.days.ago.to_s(:db))}) AND ( (profiles.type = 'Community' OR profiles.type = 'Enterprise' OR profiles.type = 'Organization' ) ) GROUP BY profiles.id;")
	6	+ activities_counts = person_activities_counts.entries + organization_activities_counts.entries
	7	+ activities_counts.each do \|count\|
	8	+ update_sql = ApplicationRecord.__send__(:sanitize_sql, ["UPDATE profiles SET activities_count=? WHERE profiles.id=?;", count['count'].to_i, count['id'] ], '')
	9	+ ApplicationRecord.connection.execute(update_sql)
	10	+ end
	11	+ Delayed::Job.enqueue(ActivitiesCounterCacheJob.new, {:priority => -3, :run_at => 1.day.from_now})
	12	+ end
	13	+
	14	+end
@@ -0,0 +1,11 @@		@@ -0,0 +1,11 @@
	1	+class CreateThumbnailsJob < Struct.new(:class_name, :file_id)
	2	+ def perform
	3	+ return unless class_name.constantize.exists?(file_id)
	4	+ file = class_name.constantize.find(file_id)
	5	+ file.create_thumbnails
	6	+ article = Article.where(:image_id => file_id).first
	7	+ if article
	8	+ article.touch
	9	+ end
	10	+ end
	11	+end
	@@ -76,6 +76,17 @@ class Block < ApplicationRecord		@@ -76,6 +76,17 @@ class Block < ApplicationRecord
76	true	76	true
77	end	77	end
78		78
		79	+ def visible_to_user?(user)
		80	+ visible = self.display_to_user?(user)
		81	+ if self.owner.kind_of?(Profile)
		82	+ visible &= self.owner.display_info_to?(user)
		83	+ visible &= (self.visible? \|\| user && user.has_permission?(:edit_profile_design, self.owner))
		84	+ elsif self.owner.kind_of?(Environment)
		85	+ visible &= (self.visible? \|\| user && user.has_permission?(:edit_environment_design, self.owner))
		86	+ end
		87	+ visible
		88	+ end
		89	+
79	def display_to_user?(user)	90	def display_to_user?(user)
80	display_user == 'all' \|\| (user.nil? && display_user == 'not_logged') \|\| (user && display_user == 'logged') \|\| (user && display_user == 'followers' && user.follows?(owner))	91	display_user == 'all' \|\| (user.nil? && display_user == 'not_logged') \|\| (user && display_user == 'logged') \|\| (user && display_user == 'followers' && user.follows?(owner))
81	end	92	end
	@@ -314,6 +325,14 @@ class Block < ApplicationRecord		@@ -314,6 +325,14 @@ class Block < ApplicationRecord
314	self.observers << block	325	self.observers << block
315	end	326	end
316		327
		328	+ def api_content
		329	+ nil
		330	+ end
		331	+
		332	+ def display_api_content_by_default?
		333	+ false
		334	+ end
		335	+
317	private	336	private
318		337
319	def home_page_path	338	def home_page_path
	@@ -20,4 +20,12 @@ class RawHTMLBlock < Block		@@ -20,4 +20,12 @@ class RawHTMLBlock < Block
20	user.has_permission?('edit_raw_html_block', environment)	20	user.has_permission?('edit_raw_html_block', environment)
21	end	21	end
22		22
		23	+ def api_content
		24	+ { html: html }
		25	+ end
		26	+
		27	+ def display_api_content_by_default?
		28	+ true
		29	+ end
		30	+
23	end	31	end
	@@ -29,4 +29,12 @@ class RecentDocumentsBlock < Block		@@ -29,4 +29,12 @@ class RecentDocumentsBlock < Block
29	def self.expire_on	29	def self.expire_on
30	{ :profile => [:article], :environment => [:article] }	30	{ :profile => [:article], :environment => [:article] }
31	end	31	end
		32	+
		33	+ def api_content
		34	+ Noosfero::API::Entities::ArticleBase.represent(docs).as_json
		35	+ end
		36	+
		37	+ def display_api_content_by_default?
		38	+ false
		39	+ end
32	end	40	end
	@@ -9,7 +9,7 @@		@@ -9,7 +9,7 @@
9	<% end %>	9	<% end %>
10	<% end %>	10	<% end %>
11	<% else %>	11	<% else %>
12	- <%= _('Portal identifier: %s') % link_to(@portal_community.identifier, @portal_community.url) %>	12	+ <%= _('Portal identifier: %s').html_safe % link_to(@portal_community.identifier, @portal_community.url) %>
13		13
14	<% button_bar do %>	14	<% button_bar do %>
15	<%if @portal_community.environment.enabled?('use_portal_community') %>	15	<%if @portal_community.environment.enabled?('use_portal_community') %>
1	-# Load the rails application
2	-require File.expand_path('../application', __FILE__)	1	+require_relative 'application'
3		2
4	-#FIXME Necessary hack to avoid the need of downgrading rubygems on rails 2.3.5
5	-# http://stackoverflow.com/questions/5564251/uninitialized-constant-activesupportdependenciesmutex
6	-require 'thread'
7	-
8	-# Uncomment below to force Rails into production mode when
9	-# you don't control web/app server and can't set it the proper way
10	-#ENV['RAILS_ENV'] \|\|= 'production'
11	-
12	-# extra directories for controllers organization
13	-extra_controller_dirs = %w[
14	-].map {\|item\| Rails.root.join(item) }
15	-
16	-# Add new inflection rules using the following format
17	-# (all these examples are active by default):
18	-# Inflector.inflections do \|inflect\|
19	-# inflect.plural /^(ox)$/i, '\1en'
20	-# inflect.singular /^(ox)en/i, '\1'
21	-# inflect.irregular 'person', 'people'
22	-# inflect.uncountable %w( fish sheep )
23	-# end
24	-
25	-# Include your application configuration below
26	-
27	-ActiveRecord::Base.store_full_sti_class = true
28	-
29	-#FIXME: Probably act_as_taggable_on is not being loaded or this should be on another place
30	-#Tag.hierarchical = true
31	-
32	-# several local libraries
33	-require_dependency 'noosfero'
34	-#FIXME: error when call lib/sqlite_extention
35	-#require 'sqlite_extension'	3	+Noosfero::Application.initialize!
36		4
37	# load a local configuration if present, but not under test environment.	5	# load a local configuration if present, but not under test environment.
38	-if !['test', 'cucumber'].include?(ENV['RAILS_ENV'])	6	+if ENV['RAILS_ENV'].in? %w[test cucumber]
39	localconfigfile = Rails.root.join('config', 'local.rb')	7	localconfigfile = Rails.root.join('config', 'local.rb')
40	- if File.exists?(localconfigfile)
41	- require localconfigfile
42	- end	8	+ require localconfigfile if File.exists? localconfigfile
43	end	9	end
44		10
45	-Noosfero::Application.initialize!
@@ -0,0 +1,31 @@		@@ -0,0 +1,31 @@
	1	+require 'pp'
	2	+
	3	+# third-party libraries
	4	+require 'will_paginate'
	5	+require 'will_paginate/array'
	6	+require 'nokogiri'
	7	+
	8	+# dependencies at vendor, firstly loaded on Gemfile
	9	+vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
	10	+vendor.each do \|dir\|
	11	+ init_rb = "#{Rails.root}/#{dir}/init.rb"
	12	+ require init_rb if File.file? init_rb
	13	+end
	14	+
	15	+# extensions
	16	+require 'extensions'
	17	+
	18	+# locally-developed modules
	19	+require 'acts_as_filesystem'
	20	+require 'acts_as_having_settings'
	21	+require 'acts_as_having_boxes'
	22	+require 'acts_as_having_image'
	23	+require 'acts_as_having_posts'
	24	+require 'acts_as_customizable'
	25	+require 'route_if'
	26	+require 'maybe_add_http'
	27	+require 'set_profile_region_from_city_state'
	28	+require 'authenticated_system'
	29	+require 'needs_profile'
	30	+require 'white_list_filter'
	31	+
	@@ -1,28 +0,0 @@	@@ -1,28 +0,0 @@
1	-require 'pp'
2	-
3	-# third-party libraries
4	-require 'will_paginate'
5	-require 'will_paginate/array'
6	-require 'nokogiri'
7	-
8	-# dependencies at vendor, firstly loaded on Gemfile
9	-vendor = Dir.glob('vendor/{,plugins/}*') - ['vendor/plugins']
10	-vendor.each do \|dir\|
11	- init_rb = "#{Rails.root}/#{dir}/init.rb"
12	- require init_rb if File.file? init_rb
13	-end
14	-
15	-# locally-developed modules
16	-require 'acts_as_filesystem'
17	-require 'acts_as_having_settings'
18	-require 'acts_as_having_boxes'
19	-require 'acts_as_having_image'
20	-require 'acts_as_having_posts'
21	-require 'acts_as_customizable'
22	-require 'route_if'
23	-require 'maybe_add_http'
24	-require 'set_profile_region_from_city_state'
25	-require 'authenticated_system'
26	-require 'needs_profile'
27	-require 'white_list_filter'
28	-
	@@ -5,3 +5,4 @@ require 'noosfero/plugin/mailer_base'		@@ -5,3 +5,4 @@ require 'noosfero/plugin/mailer_base'
5	require 'noosfero/plugin/settings'	5	require 'noosfero/plugin/settings'
6	require 'noosfero/plugin/spammable'	6	require 'noosfero/plugin/spammable'
7	Noosfero::Plugin.initialize!	7	Noosfero::Plugin.initialize!
		8	+