Consul portability

app/assets/javascripts/application.js

@@ -82,7 +82,6 @@
 //= require globalize
 //= require send_admin_notification_alert
 //= require modal_download
-//= require settings
 //= require cookies
 //= require columns_selector
 //= require budget_edit_associations
@@ -136,8 +135,7 @@ var initialize_modules = function() {
   App.Globalize.initialize();
   App.SendAdminNotificationAlert.initialize();
   App.ModalDownload.initialize();
-  App.Settings.initialize();
-  if ($("#js-columns-selector").length) {
+  if ( $('#js-columns-selector').length) {
     App.ColumnsSelector.initialize();
   }
   App.BudgetEditAssociations.initialize();

app/assets/javascripts/foundation_extras.js

@@ -17,6 +17,9 @@
       $(window).trigger("resize");
       $(document).on("page:before-unload", this.clearSticky);
       window.addEventListener("popstate", this.clearSticky, false);
+      $("#side_menu ul").on("down.zf.accordionMenu", function(e) {
+        Foundation.reInit($("[data-equalizer]"));
+      });
       $(function() {
         if ($(window).width() < 620) {
           App.FoundationExtras.mobile_ui_init();

app/assets/stylesheets/admin.scss

@@ -217,6 +217,13 @@ $sidebar-active: #f4fcd0;
       color: #fff;
     }
 
+    @include breakpoint(medium) {
+      td .enabled,
+      td .disabled {
+        padding: $line-height / 2 0;
+      }
+    }
+
     th {
       background: $brand;
       color: #fff;

app/assets/stylesheets/application.scss

@@ -23,3 +23,4 @@
 @import "autocomplete_overrides";
 @import "jquery-ui/sortable";
 @import "leaflet";
+@import "wizard";

app/assets/stylesheets/wizard.scss

@@ -0,0 +1,46 @@
+.wizard {
+  h3 {
+    margin-bottom: 0;
+  }
+
+  h3,
+  .current-step {
+    display: inline-block;
+    padding: .7em 0;
+  }
+
+  .current-step {
+    @include breakpoint(medium) {
+      margin-left: $line-height;
+    }
+  }
+
+  .btn-back-step {
+    margin-right: $line-height;
+  }
+
+  .btn-back-step i {
+    position: relative;
+    &:before {
+      position: absolute;
+      top: 2px;
+      left: -20px;
+    }
+  }
+
+  .v-aligner {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .button {
+    margin-bottom: 0;
+  }
+
+  @include breakpoint(small) {
+    input.button {
+      padding: 1em 0;
+    }
+  }
+}

app/controllers/admin/settings_controller.rb

@@ -8,29 +8,20 @@ class Admin::SettingsController < Admin::BaseController
                 :poster_feature_short_title_setting, :poster_feature_description_setting
 
   def index
-    all_settings = Setting.all.group_by { |setting| setting.type }
-    @configuration_settings = all_settings["configuration"]
-    @feature_settings = all_settings["feature"]
-    @participation_processes_settings = all_settings["process"]
-    @map_configuration_settings = all_settings["map"]
-    @proposals_settings = all_settings["proposals"]
-    @remote_census_general_settings = all_settings["remote_census.general"]
-    @remote_census_request_settings = all_settings["remote_census.request"]
-    @remote_census_response_settings = all_settings["remote_census.response"]
-    @uploads_settings = all_settings["uploads"]
+    @settings_groups = ["configuration", "process", "feature", "map", "uploads", "proposals", "remote_census", "social", "advanced", "smtp", "regional", "sms"].freeze
   end
 
   def update
     @setting = Setting.find(params[:id])
     @setting.update(settings_params)
-    redirect_to request_referer, notice: t("admin.settings.flash.updated")
+    redirect_to request.referer, notice: t("admin.settings.flash.updated")
   end
 
   def update_map
     Setting["map.latitude"] = params[:latitude].to_f
     Setting["map.longitude"] = params[:longitude].to_f
     Setting["map.zoom"] = params[:zoom].to_i
-    redirect_to admin_settings_path, notice: t("admin.settings.index.map.flash.update")
+    redirect_to request.referer, notice: t("admin.settings.index.map.flash.update")
   end
 
   def update_content_types
@@ -43,6 +34,12 @@ def update_content_types
     redirect_to admin_settings_path, notice: t("admin.settings.flash.updated")
   end
 
+  def show
+    @settings = settings_by_group(params[:id])
+
+    render params[:id]
+  end
+
   private
 
     def settings_params
@@ -53,8 +50,20 @@ def content_type_params
       params.permit(:jpg, :png, :gif, :pdf, :doc, :docx, :xls, :xlsx, :csv, :zip)
     end
 
-    def request_referer
-      return request.referer + params[:setting][:tab] if params[:setting][:tab]
-      request.referer
+    def settings_by_group(group)
+      all_settings = Setting.all.group_by { |setting| setting.type }
+      case group
+      when "remote_census"
+        [all_settings["remote_census.general"]] + [all_settings["remote_census.request"]] + [all_settings["remote_census.response"]]
+      when "social"
+        [all_settings["social.facebook"]] + [all_settings["social.twitter"]] + [all_settings["social.google"]]
+      when "advanced"
+        [all_settings["advanced.auth"]] + [all_settings["advanced.tracking"]]
+      when "regional"
+        [all_settings["regional.default_locale"]] + [all_settings["regional.available_locale"]] + [all_settings["regional.time_zone"]]
+      else
+        all_settings[group]
+      end
     end
+
 end

app/controllers/admin/wizards/installer_controller.rb

@@ -0,0 +1,51 @@
+class Admin::Wizards::InstallerController < Admin::BaseController
+  layout "wizard"
+
+  before_action :set_total_steps
+  before_action :set_settings, only: :show
+
+  def new
+  end
+
+  def show
+    render params[:id]
+  end
+
+  private
+
+    def set_total_steps
+      @total_steps = 7
+    end
+
+    def set_settings
+      case params[:id]
+      when "general_settings"
+        @settings = [Setting.find_by(key: "org_name"),
+                     Setting.find_by(key: "min_age_to_participate")]
+      when "participation_process"
+        @settings = [[Setting.find_by(key: "process.debates"),
+                      Setting.find_by(key: "process.proposals"),
+                      Setting.find_by(key: "votes_for_proposal_success"),
+                      Setting.find_by(key: "process.polls"),
+                      Setting.find_by(key: "process.budgets")]]
+      when "map"
+        @settings = [[Setting.find_by(key: "feature.map"),
+                      Setting.find_by(key: "map.latitude"),
+                      Setting.find_by(key: "map.longitude"),
+                      Setting.find_by(key: "map.zoom")]]
+      when "smtp"
+        @settings = [Setting.find_by(key: "feature.smtp_configuration"),
+                     Setting.find_by(key: "smtp.address"),
+                     Setting.find_by(key: "smtp.port"),
+                     Setting.find_by(key: "smtp.domain"),
+                     Setting.find_by(key: "smtp.username"),
+                     Setting.find_by(key: "smtp.password"),
+                     Setting.find_by(key: "smtp.authentication"),
+                     Setting.find_by(key: "smtp.enable_starttls_auto")]
+      when "regional"
+        all_settings = Setting.all.group_by { |setting| setting.type }
+        @settings = [all_settings["regional.default_locale"]] + [all_settings["regional.available_locale"]] + [all_settings["regional.time_zone"]]
+      end
+    end
+
+end

app/controllers/admin/wizards_controller.rb

@@ -0,0 +1,7 @@
+class Admin::WizardsController < Admin::BaseController
+
+  def index
+    @wizards = ["installation"].freeze
+  end
+
+end

app/controllers/application_controller.rb

@@ -5,6 +5,7 @@ class ApplicationController < ActionController::Base
   include HasFilters
   include HasOrders
   include AccessDeniedHandler
+  include RegionalSettings
 
   default_form_builder ConsulFormBuilder
   protect_from_forgery with: :exception
@@ -28,12 +29,13 @@ class ApplicationController < ActionController::Base
 
     def authenticate_http_basic
       authenticate_or_request_with_http_basic do |username, password|
-        username == Rails.application.secrets.http_basic_username && password == Rails.application.secrets.http_basic_password
+        username == Retrocompatibility.calculate_value("advanced.auth.http_basic_username", "http_basic_username") &&
+        password == Retrocompatibility.calculate_value("advanced.auth.http_basic_password", "http_basic_password")
       end
     end
 
     def http_basic_auth_site?
-      Rails.application.secrets.http_basic_auth
+      Retrocompatibility.calculate_value("advanced.auth.http_basic_auth", "http_basic_auth")
     end
 
     def verify_lock

app/controllers/concerns/regional_settings.rb

@@ -0,0 +1,14 @@
+module RegionalSettings
+  extend ActiveSupport::Concern
+
+  included do
+    before_action :initialize_regional_settings
+  end
+
+  private
+
+    def initialize_regional_settings
+      Regional::Locales.load_default_and_available_locales
+      Regional::Timezone.load_timezone
+    end
+end

app/controllers/users/omniauth_callbacks_controller.rb

@@ -1,15 +1,15 @@
 class Users::OmniauthCallbacksController < Devise::OmniauthCallbacksController
 
   def twitter
-    sign_in_with :twitter_login, :twitter
+    sign_in_with :twitter
   end
 
   def facebook
-    sign_in_with :facebook_login, :facebook
+    sign_in_with :facebook
   end
 
   def google_oauth2
-    sign_in_with :google_login, :google_oauth2
+    sign_in_with :google_oauth2
   end
 
   def after_sign_in_path_for(resource)
@@ -22,8 +22,8 @@ def after_sign_in_path_for(resource)
 
   private
 
-    def sign_in_with(feature, provider)
-      raise ActionController::RoutingError.new("Not Found") unless Setting["feature.#{feature}"]
+    def sign_in_with(provider)
+      raise ActionController::RoutingError.new("Not Found") unless Setting["social.#{provider}.login"]
 
       auth = request.env["omniauth.auth"]
 

app/helpers/admin_helper.rb

@@ -48,7 +48,7 @@ def menu_profiles?
 
   def menu_settings?
     controllers_names = ["settings", "tags", "geozones", "images", "content_blocks",
-      "local_census_records", "imports"]
+      "local_census_records", "imports", "wizards"]
     controllers_names.include?(controller_name) &&
       controller.class.parent != Admin::Poll::Questions::Answers
   end

app/helpers/map_locations_helper.rb

@@ -53,8 +53,9 @@ def prepare_map_settings(map_location, editable, parent_class, investments_coord
         map_center_latitude: map_location_latitude(map_location),
         map_center_longitude: map_location_longitude(map_location),
         map_zoom: map_location_zoom(map_location),
-        map_tiles_provider: Rails.application.secrets.map_tiles_provider,
-        map_tiles_provider_attribution: Rails.application.secrets.map_tiles_provider_attribution,
+        map_tiles_provider: Retrocompatibility.calculate_value("map.tiles_provider", "map_tiles_provider"),
+        map_tiles_provider_attribution: Retrocompatibility.calculate_value("map.tiles_provider_attribution",
+                                                                           "map_tiles_provider_attribution"),
         marker_editable: editable,
         marker_remove_selector: "##{map_location_remove_marker_link_id(map_location)}",
         latitude_input_selector: "##{map_location_input_id(parent_class, "latitude")}",

app/helpers/settings_helper.rb

@@ -1,19 +1,62 @@
 module SettingsHelper
 
   def feature?(name)
-    setting["feature.#{name}"].presence || setting["process.#{name}"].presence
+    setting["feature.#{name}"].presence || setting["process.#{name}"].presence || setting["social.#{name}"].presence
   end
 
   def setting
     @all_settings ||= Hash[Setting.all.map { |s| [s.key, s.value.presence] }]
   end
 
-  def display_setting_name(setting_name)
-    if setting_name == "setting"
-      t("admin.settings.setting_name")
-    else
-      t("admin.settings.#{setting_name}")
+  def is_feature?(setting)
+    social_feature?(setting) ||
+    advanced_feature?(setting) ||
+    smtp_feature?(setting) ||
+    regional_feature?(setting) ||
+    process_feature?(setting) ||
+    map_feature?(setting)
+  end
+
+  def social_feature?(setting)
+    key = setting.key.split(".")
+    key.first == "social" && key.last == "login"
+  end
+
+  def advanced_feature?(setting)
+    setting.key == "advanced.auth.http_basic_auth"
+  end
+
+  def smtp_feature?(setting)
+    setting.key == "smtp.enable_starttls_auto" || setting.key == "feature.smtp_configuration"
+  end
+
+  def process_feature?(setting)
+    key = setting.key.split(".")
+    key.first == "process"
+  end
+
+  def map_feature?(setting)
+    setting.key == "feature.map"
+  end
+
+  def regional_feature?(setting)
+    key = setting.key.split(".")
+    key.first == "regional" && key.second == "available_locale"
+  end
+
+  def options_for_default_locale
+    I18n.available_locales.map do |locale|
+      [name_for_locale(locale), locale]
     end
   end
 
+  def regional_setting?(setting)
+    setting.type.rpartition(".").first == "regional"
+  end
+
+  def need_disable_language?(setting)
+    setting_locale = setting.key.rpartition(".").last.to_sym
+    setting_locale == I18n.default_locale || setting_locale == I18n.locale
+  end
+
 end

app/mailers/application_mailer.rb

@@ -3,4 +3,9 @@ class ApplicationMailer < ActionMailer::Base
   helper :application
   default from: Proc.new { "#{Setting["mailer_from_name"]} <#{Setting["mailer_from_address"]}>" }
   layout "mailer"
+  before_action :set_smtp_settings
+
+  def set_smtp_settings
+    SmtpConfiguration.set_configuration
+  end
 end