Add extended about page stub

diff --git a/app/controllers/about_controller.rb b/app/controllers/about_controller.rb
index 84e5fbbd91786e29d9cfde6920c19fee22a6275a..b69c8e790fef6757d0306dc6e2d5e981ee2ee857 100644 (file)
--- a/app/controllers/about_controller.rb
+++ b/app/controllers/about_controller.rb
@@ -7,6 +7,12 @@ class AboutController < ApplicationController
     @description = Setting.site_description
   end
 
+  def more
+    @extended_description = Setting.site_extended_description
+    @contact_account      = Account.find_local(Setting.site_contact_username)
+    @contact_email        = Setting.site_contact_email
+  end
+
   def terms; end
 
   private

diff --git a/app/lib/settings/extend.rb b/app/lib/settings/extend.rb
index 7241a1221c43312ae2ac454b6e1cb1787fb4ad3a..407c3480f0f39a4c47684bc4cdb94f1eaa165ead 100644 (file)
--- a/app/lib/settings/extend.rb
+++ b/app/lib/settings/extend.rb
@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module Settings
   module Extend
-       extend ActiveSupport::Concern
+    extend ActiveSupport::Concern
 
     def settings
       ScopedSettings.for_thing(self)
     end
   end
-end
\ No newline at end of file
+end

diff --git a/app/lib/settings/scoped_settings.rb b/app/lib/settings/scoped_settings.rb
index f8f22a91b2cd2b84cdd9083fac65c6c3c83b31d9..82b70d12801b152bd2f81c3ad345bd29f438f0b9 100644 (file)
--- a/app/lib/settings/scoped_settings.rb
+++ b/app/lib/settings/scoped_settings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Settings
   class ScopedSettings < ::Setting
     def self.for_thing(object)
@@ -9,4 +11,4 @@ module Settings
       unscoped.where(thing_type: @object.class.base_class.to_s, thing_id: @object.id)
     end
   end
-end
\ No newline at end of file
+end

diff --git a/app/models/account.rb b/app/models/account.rb
index ec0e81f7cde29c9bfbdc49b6b3de5196fd0f357a..5f07615fcf63afcabbaa40e78ee2088b1a841295 100644 (file)
--- a/app/models/account.rb
+++ b/app/models/account.rb
@@ -159,6 +159,7 @@ class Account < ApplicationRecord
     end
 
     def find_remote!(username, domain)
+      return if username.blank?
       where(arel_table[:username].matches(username.gsub(/[%_]/, '\\\\\0'))).where(domain.nil? ? { domain: nil } : arel_table[:domain].matches(domain.gsub(/[%_]/, '\\\\\0'))).take!
     end
 

diff --git a/app/models/setting.rb b/app/models/setting.rb
index f3c65c0548cffdbc4d92bc54d8f0bef018f8b731..3796253d431c1d295557ab1f8a41bacc0c6cb7c6 100644 (file)
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -9,10 +9,9 @@ class Setting < RailsSettings::Base
   end
 
   class << self
-
     def [](key)
       return super(key) unless rails_initialized?
-      
+
       val = Rails.cache.fetch(cache_key(key, @object)) do
         db_val = object(key)
 
@@ -25,7 +24,7 @@ class Setting < RailsSettings::Base
           default_settings[key]
         end
       end
-      
+
       val
     end
 

diff --git a/app/models/web.rb b/app/models/web.rb
index 3c6eebbe2678bcd841f7d734be71db7bf0822e64..58654fd77e1ab6ed3ce6e192a39544c21f3ffc30 100644 (file)
--- a/app/models/web.rb
+++ b/app/models/web.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Web
   def self.table_name_prefix
     'web_'

diff --git a/app/views/about/more.html.haml b/app/views/about/more.html.haml
new file mode 100644 (file)
index 0000000..49a3a0c
--- /dev/null
+++ b/app/views/about/more.html.haml
@@ -0,0 +1,8 @@
+- content_for :page_title do
+  #{Rails.configuration.x.local_domain}
+
+.wrapper
+  = @extended_description.html_safe
+
+  - if @contact_account
+    = render partial: 'authorize_follow/card', locals: { account: @contact_account }
\ No newline at end of file

diff --git a/app/views/admin/settings/index.html.haml b/app/views/admin/settings/index.html.haml
index 4f9ad2fde0727af366eb4a01a83282408cfe00fb..5b482213bac1e18d40d36a000a8eeacbb79f4821 100644 (file)
--- a/app/views/admin/settings/index.html.haml
+++ b/app/views/admin/settings/index.html.haml
@@ -9,6 +9,12 @@
       %th Setting
       %th Click to edit
   %tbody
+    %tr
+      %td{ rowspan: 2 }
+        %strong Contact information
+      %td= best_in_place @settings['site_contact_username'], :value, url: admin_setting_path(@settings['site_contact_username']), place_holder: 'Enter a username'
+    %tr
+      %td= best_in_place @settings['site_contact_email'], :value, url: admin_setting_path(@settings['site_contact_email']), place_holder: 'Enter a public e-mail address'
     %tr
       %td
         %strong Site description
@@ -21,8 +27,10 @@
         %code= '<em>'
       %td= best_in_place @settings['site_description'], :value, as: :textarea, url: admin_setting_path(@settings['site_description'])
     %tr
-      %td{ rowspan: 2 }
-        %strong Contact information
-      %td= best_in_place @settings['site_contact_username'], :value, url: admin_setting_path(@settings['site_contact_username']), place_holder: 'Enter a username'
-    %tr
-      %td= best_in_place @settings['site_contact_email'], :value, url: admin_setting_path(@settings['site_contact_email']), place_holder: 'Enter a public e-mail address'
+      %td
+        %strong Extended site description
+        %br/
+        Displayed on extended information page
+        %br/
+        You can use HTML tags
+      %td= best_in_place @settings['site_extended_description'], :value, as: :textarea, url: admin_setting_path(@settings['site_extended_description'])
\ No newline at end of file

diff --git a/config/routes.rb b/config/routes.rb
index c0262e9334047696f8b62767b5382d348ece64e8..42de503f0b3bd4ff6d5845629f5eef82c1e23bd1 100644 (file)
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -143,9 +143,10 @@ Rails.application.routes.draw do
 
   get '/web/(*any)', to: 'home#index', as: :web
 
-  get :about, to: 'about#index'
-  get :terms, to: 'about#terms'
-
+  get '/about',      to: 'about#index'
+  get '/about/more', to: 'about#more'
+  get '/terms',      to: 'about#terms'
+  
   root 'home#index'
 
   match '*unmatched_route', via: :all, to: 'application#raise_not_found'

diff --git a/config/settings.yml b/config/settings.yml
index 2e309e46ed1151add07278947ebaec1b0f803566..a78bd067d53246beebb4102d7d1e38d750e3f53f 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -1,6 +1,7 @@
 # config/app.yml for rails-settings-cached
 defaults: &defaults
   site_description: ''
+  site_extended_description: ''
   site_contact_username: ''
   site_contact_email: ''
   notification_emails:
@@ -12,7 +13,6 @@ defaults: &defaults
   interactions:
     must_be_follower: false
     must_be_following: false
-
 development:
   <<: *defaults