From 73927a3cddac154a71d801e53df2299a48956404 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Fri, 18 Mar 2016 16:06:28 -0600 Subject: [PATCH 01/50] Expose user management UI, fix existing bug in users.js --- app/assets/stylesheets/base.scss | 4 +++- app/controllers/admin_controller.rb | 19 +++++++++++-------- app/views/admin/_user.html.erb | 15 ++++++++++++--- app/views/admin/_users.html.erb | 4 ++-- app/views/admin/users.html.erb | 9 ++++++--- app/views/admin/users.js.erb | 4 ++-- config/routes.rb | 2 +- 7 files changed, 37 insertions(+), 20 deletions(-) diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss index b902bdeb8..28f04abf6 100644 --- a/app/assets/stylesheets/base.scss +++ b/app/assets/stylesheets/base.scss @@ -688,12 +688,14 @@ div.status { table#forums, table#topics, -table#posts { +table#posts, +table#users { width: 100%; margin-bottom: 20px; } #forums tbody tr, +#users tbody tr, #forums tbody tr td { border-bottom: 1px solid #eee; } diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index d17f63a48..bf40ae6cf 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -169,17 +169,20 @@ def create_ticket def topic_search # search for user, if [one] found, we'll give details on that person - # if more than one found, we'll list them - users = User.user_search(params[:q]) + # if more than one found, we'll list them, if search is for "users" then show all + if params[:q] == 'users' + users = User.all + else + users = User.user_search(params[:q]) + end if users.size == 0 # not a user search, so look for topics @topics = Topic.admin_search(params[:q]).page params[:page] template = 'tickets' @tracker.event(category: "Admin Search", action: "Topic Search", label: params[:q]) - - else - if users.size == 1 + logger.info("Topic Search") + elsif users.size == 1 @user = users.first @topics = Topic.admin_search(params[:q]).page params[:page] @topic = Topic.where(user_id: @user.id).first unless @user.nil? @@ -187,12 +190,12 @@ def topic_search @tracker.event(category: "Admin Search", action: "User Search", label: params[:q]) @tracker.event(category: "Agent: #{current_user.name}", action: "Viewed User Profile", label: @user.name) - - else + logger.info("Single User") + else @users = users.page params[:page] template = 'users' @tracker.event(category: "Admin Search", action: "User Search", label: params[:q]) - end + logger.info("User Search") end respond_to do |format| diff --git a/app/views/admin/_user.html.erb b/app/views/admin/_user.html.erb index 5ed093e22..38712a3fa 100644 --- a/app/views/admin/_user.html.erb +++ b/app/views/admin/_user.html.erb @@ -8,9 +8,18 @@ <%= link_to user.name.titleize, user_profile_path(user.id), remote: true, class: 'user-link' %>
Last Seen: <%= last_active_time(user.last_sign_in_at) %> - - - <%= user.topics.count %> + + <%= user.topics.count %> + + + +
+ + +
diff --git a/app/views/admin/_users.html.erb b/app/views/admin/_users.html.erb index 7bf746656..faf9a53a0 100644 --- a/app/views/admin/_users.html.erb +++ b/app/views/admin/_users.html.erb @@ -1,4 +1,4 @@ - +
@@ -6,6 +6,6 @@ <%= render partial: 'user', collection: @users if @users %>
-
+
<%= paginate @users if @users %>
diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb index e962054b4..673d146f0 100644 --- a/app/views/admin/users.html.erb +++ b/app/views/admin/users.html.erb @@ -1,5 +1,8 @@ - -
+

+

+ +
+
<%= render 'users' %>
- +
diff --git a/app/views/admin/users.js.erb b/app/views/admin/users.js.erb index 7e2fc1758..9ea515687 100644 --- a/app/views/admin/users.js.erb +++ b/app/views/admin/users.js.erb @@ -2,8 +2,8 @@ $('#tickets').html("<%= escape_javascript(render 'users') %>"); //$('#left-col-ticket-nav').html("<%= escape_javascript(render 'ticket_nav') %>"); $('.ticket-stats').html("<%= j render 'admin/ticket_stats' %>"); $('#user-info').html("<%= j render 'admin/user_info_horizontal' if @user %>"); -$('#ticket-page-title').html("<%= t(:users_found, count: @users.size, query: params[:q].titleize, default: 'Search Results') %>: <%= status_label(@status) if @status %> <%= escape_javascript(render 'admin/ticket_nav_dropdown') %>"); -$(document).prop('title', "Discussion Management: <%= @status.titleize if @status %>"); +$('#ticket-page-title').html("<%= t(:users_found, count: @users.size, query: params[:q].titleize, default: 'Search Results') unless params[:q] == 'users'%> <%= status_label(@status) if @status %> <%= escape_javascript(render 'admin/ticket_nav_dropdown') %>"); +//$(document).prop('title', "Discussion Management: <%= @status.titleize if @status %>"); window.location.hash = 'users'; // Empty ticket search field diff --git a/config/routes.rb b/config/routes.rb index c02fb7639..c80d03fd3 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -73,7 +73,7 @@ get '/tickets/toggle_privacy' => 'admin#toggle_privacy', as: :toggle_privacy get '/tickets/:id/toggle' => 'admin#toggle_post', as: :toggle_post get '/communities' => 'admin#communities', as: :admin_communities - #get '/users' + get '/users' => 'admin#users', as: :admin_users get '/user/:id/edit' => 'admin#edit_user', as: :admin_user get '/user/:id' => 'admin#user_profile', as: :user_profile get '/topic_search' => 'admin#topic_search', as: :admin_search From 93561082defc9f8a7fb249ca16958faa86d922ba Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Wed, 30 Mar 2016 09:26:03 -0600 Subject: [PATCH 02/50] Install cached setting gem --- Gemfile | 2 ++ Gemfile.lock | 3 +++ app/models/app_settings.rb | 3 +++ db/migrate/20160330152420_create_settings.rb | 17 +++++++++++++++++ db/schema.rb | 13 ++++++++++++- 5 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 app/models/app_settings.rb create mode 100644 db/migrate/20160330152420_create_settings.rb diff --git a/Gemfile b/Gemfile index 2a1b542e2..bd1b6cb4c 100644 --- a/Gemfile +++ b/Gemfile @@ -28,6 +28,8 @@ gem 'ranked-model' # Google Analytics Measurement Protocol gem 'staccato' +gem "rails-settings-cached" + gem 'devise' gem 'devise-i18n' gem 'devise-bootstrap-views' diff --git a/Gemfile.lock b/Gemfile.lock index 0c333102f..2ed227105 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -312,6 +312,8 @@ GEM rails-i18n (4.0.8) i18n (~> 0.7) railties (~> 4.0) + rails-settings-cached (0.5.4) + rails (>= 4.2.0) rails-timeago (2.13.0) actionpack (>= 3.1) activesupport (>= 3.1) @@ -520,6 +522,7 @@ DEPENDENCIES quiet_assets rails (= 4.2.6) rails-i18n (~> 4.0.0) + rails-settings-cached rails-timeago rails_12factor ranked-model diff --git a/app/models/app_settings.rb b/app/models/app_settings.rb new file mode 100644 index 000000000..8782ae1a2 --- /dev/null +++ b/app/models/app_settings.rb @@ -0,0 +1,3 @@ +# RailsSettings Model +class AppSettings < RailsSettings::CachedSettings +end diff --git a/db/migrate/20160330152420_create_settings.rb b/db/migrate/20160330152420_create_settings.rb new file mode 100644 index 000000000..43852edcf --- /dev/null +++ b/db/migrate/20160330152420_create_settings.rb @@ -0,0 +1,17 @@ +class CreateSettings < ActiveRecord::Migration + def self.up + create_table :settings do |t| + t.string :var, null: false + t.text :value, null: true + t.integer :thing_id, null: true + t.string :thing_type, null: true, limit: 30 + t.timestamps + end + + add_index :settings, %i(thing_type thing_id var), unique: true + end + + def self.down + drop_table :settings + end +end diff --git a/db/schema.rb b/db/schema.rb index 0c72351e0..019bcb74d 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20160222043130) do +ActiveRecord::Schema.define(version: 20160330152420) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -138,6 +138,17 @@ t.datetime "updated_at", null: false end + create_table "settings", force: :cascade do |t| + t.string "var", null: false + t.text "value" + t.integer "thing_id" + t.string "thing_type", limit: 30 + t.datetime "created_at" + t.datetime "updated_at" + end + + add_index "settings", ["thing_type", "thing_id", "var"], name: "index_settings_on_thing_type_and_thing_id_and_var", unique: true, using: :btree + create_table "taggings", force: :cascade do |t| t.integer "tag_id" t.integer "taggable_id" From aa0ef213591666e705323c4e94b20f9a3100f90e Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Wed, 30 Mar 2016 09:44:14 -0600 Subject: [PATCH 03/50] Config: Use AppSettings.site_name --- app/controllers/admin_controller.rb | 2 +- app/controllers/categories_controller.rb | 6 +++--- app/controllers/docs_controller.rb | 2 +- app/controllers/forums_controller.rb | 4 ++-- app/controllers/locales_controller.rb | 2 +- app/controllers/posts_controller.rb | 2 +- app/controllers/topics_controller.rb | 10 +++++----- app/controllers/users_controller.rb | 2 +- app/mailers/topic_mailer.rb | 2 +- app/mailers/user_mailer.rb | 2 +- app/views/layouts/_head.html.erb | 4 ++-- app/views/layouts/_header.html.erb | 2 +- app/views/layouts/widget.html.erb | 2 +- app/views/posts/index.rss.builder | 2 +- app/views/topics/index.rss.builder | 2 +- lib/email_processor.rb | 2 +- test/factories.rb | 4 ++-- 17 files changed, 26 insertions(+), 26 deletions(-) diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index d17f63a48..595536383 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -109,7 +109,7 @@ def new_ticket def create_ticket @page_title = t(:start_discussion, default: "Start a New Discussion") - @title_tag = "#{Settings.site_name}: #{@page_title}" + @title_tag = "#{AppSettings.site_name}: #{@page_title}" @forum = Forum.find(1) @user = User.where(email: params[:topic][:user][:email]).first diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index a8d1eb8e6..f740466c7 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -34,8 +34,8 @@ def index # @categories = Category.active.alpha #end @page_title = I18n.t :knowledgebase, default: "Knowledgebase" - @title_tag = "#{Settings.site_name}: " + @page_title - @meta_desc = "Knowledgebase for #{Settings.site_name}" + @title_tag = "#{AppSettings.site_name}: " + @page_title + @meta_desc = "Knowledgebase for #{AppSettings.site_name}" @keywords = "Knowledgebase, Knowledge base, support, articles, documentation, how-to, faq, frequently asked questions" add_breadcrumb @page_title, categories_path @@ -58,7 +58,7 @@ def show @related = Doc.in_category(@doc.category_id) if @doc @page_title = @category.name - @title_tag = "#{Settings.site_name}: #{@page_title}" + @title_tag = "#{AppSettings.site_name}: #{@page_title}" @meta_desc = @category.meta_description @keywords = @category.keywords diff --git a/app/controllers/docs_controller.rb b/app/controllers/docs_controller.rb index 75ccb9bad..df8bb0aa6 100644 --- a/app/controllers/docs_controller.rb +++ b/app/controllers/docs_controller.rb @@ -45,7 +45,7 @@ def show @page_title = @doc.title @custom_title = @doc.title_tag.blank? ? @page_title : @doc.title_tag - @title_tag = "#{Settings.site_name}: #{@custom_title}" + @title_tag = "#{AppSettings.site_name}: #{@custom_title}" add_breadcrumb t(:knowledgebase, default: "Knowledgebase"), categories_path add_breadcrumb @doc.category.name, category_path(@doc.category) if @doc.category.name diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index 455009e2b..67a522a1e 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -30,8 +30,8 @@ def index @forums = Forum.where(private: false).order('name ASC') add_breadcrumb @page_title - @title_tag = "#{Settings.site_name}: #{@page_title}" - @meta_desc = "Community discussion for #{Settings.site_name}" + @title_tag = "#{AppSettings.site_name}: #{@page_title}" + @meta_desc = "Community discussion for #{AppSettings.site_name}" @keywords = "support, articles, documentation, how-to, faq, frequently asked questions, forum, discussion" respond_to do |format| diff --git a/app/controllers/locales_controller.rb b/app/controllers/locales_controller.rb index 4fb051704..72cc2e010 100644 --- a/app/controllers/locales_controller.rb +++ b/app/controllers/locales_controller.rb @@ -5,7 +5,7 @@ def select @page_title = t(:select_locale, default: "Change your Locale") add_breadcrumb @page_title - @title_tag = "#{Settings.site_name}: #{@page_title}" + @title_tag = "#{AppSettings.site_name}: #{@page_title}" respond_to do |format| format.html diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb index c3fabe8ab..86d41cf5c 100644 --- a/app/controllers/posts_controller.rb +++ b/app/controllers/posts_controller.rb @@ -37,7 +37,7 @@ def index #@feed_link = "" @page_title = "#{@topic.name}" - @title_tag = "#{Settings.site_name}: #{@page_title}" + @title_tag = "#{AppSettings.site_name}: #{@page_title}" add_breadcrumb t(:community, default: "Community"), forums_path add_breadcrumb @topic.forum.name, forum_topics_path(@topic.forum) add_breadcrumb @topic.name diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 7fa7e0e71..d12f37779 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -45,7 +45,7 @@ def index #@feed_link = "" @page_title = @forum.name - @title_tag = "#{Settings.site_name}: #{@page_title}" + @title_tag = "#{AppSettings.site_name}: #{@page_title}" add_breadcrumb t(:community, default: "Community"), forums_path add_breadcrumb @forum.name end @@ -67,7 +67,7 @@ def tickets @page_title = t(:tickets, default: 'Tickets') add_breadcrumb @page_title - @title_tag = "#{Settings.site_name}: #{@page_title}" + @title_tag = "#{AppSettings.site_name}: #{@page_title}" #@feed_link = "" @@ -89,7 +89,7 @@ def ticket add_breadcrumb t(:tickets, default: 'Tickets'), tickets_path add_breadcrumb @page_title - @title_tag = "#{Settings.site_name}: #{@page_title}" + @title_tag = "#{AppSettings.site_name}: #{@page_title}" end respond_to do |format| @@ -117,7 +117,7 @@ def new @page_title = t(:start_discussion, default: "Start a New Discussion") add_breadcrumb @page_title - @title_tag = "#{Settings.site_name}: #{@page_title}" + @title_tag = "#{AppSettings.site_name}: #{@page_title}" @forums = Forum.ispublic.all @topic = Topic.new @@ -136,7 +136,7 @@ def create @page_title = t(:start_discussion, default: "Start a New Discussion") add_breadcrumb @page_title - @title_tag = "#{Settings.site_name}: #{@page_title}" + @title_tag = "#{AppSettings.site_name}: #{@page_title}" params[:id].nil? ? @forum = Forum.find(params[:topic][:forum_id]) : @forum = Forum.find(params[:id]) logger.info(@forum.name) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index b5662e6e4..92bb69ea7 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -54,7 +54,7 @@ def show def edit @page_title = t(:my_profile) - @title_tag = "#{Settings.site_name} Support: My Profile" + @title_tag = "#{AppSettings.site_name} Support: My Profile" add_breadcrumb @page_title, categories_path @user = current_user diff --git a/app/mailers/topic_mailer.rb b/app/mailers/topic_mailer.rb index dbce04333..aca68e07a 100644 --- a/app/mailers/topic_mailer.rb +++ b/app/mailers/topic_mailer.rb @@ -5,7 +5,7 @@ class TopicMailer < ActionMailer::Base def new_ticket(topic) @topic = topic email_with_name = %("#{topic.user.name}" <#{topic.user.email}>) - mail(to: email_with_name, subject: "[#{Settings.site_name}] ##{topic.id}-#{topic.name}") + mail(to: email_with_name, subject: "[#{AppSettings.site_name}] ##{topic.id}-#{topic.name}") end end diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 1c1b5d68d..da85cb2a1 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -6,7 +6,7 @@ def new_user(user, token) @user = user @token = token email_with_name = %("#{user.name}" <#{user.email}>) - mail(to: email_with_name, subject: "Welcome to #{Settings.site_name}") + mail(to: email_with_name, subject: "Welcome to #{AppSettings.site_name}") end end diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 27a28fa90..2f52dd087 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -1,5 +1,5 @@ -<%#= @page_title || Settings.site_name %> -<%= @title_tag || Settings.site_name %> +<%#= @page_title || AppSettings.site_name %> +<%= @title_tag || AppSettings.site_name %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 01d58832d..acad12e74 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -3,7 +3,7 @@ - <%= nav_bar brand: image_tag("#{Settings.app_mini_logo}", width: 40, class: "pull-left logo") + "#{Settings.product_name + " " if Settings.product_name}" "#{Settings.site_name}", responsive: true do %> + <%= nav_bar brand: image_tag("#{Settings.app_mini_logo}", width: 40, class: "pull-left logo") + "#{Settings.product_name + " " if Settings.product_name}" "#{AppSettings.site_name}", responsive: true do %> <%= menu_group pull: :right do %> <%= menu_divider %> diff --git a/app/views/layouts/widget.html.erb b/app/views/layouts/widget.html.erb index 8cee8a60c..27f9ca98d 100644 --- a/app/views/layouts/widget.html.erb +++ b/app/views/layouts/widget.html.erb @@ -2,7 +2,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - <%= @title_tag || Settings.site_name %> + <%= @title_tag || AppSettings.site_name %> diff --git a/app/views/posts/index.rss.builder b/app/views/posts/index.rss.builder index c84b6dbfb..f7532d0c6 100644 --- a/app/views/posts/index.rss.builder +++ b/app/views/posts/index.rss.builder @@ -2,7 +2,7 @@ xml.instruct! :xml, :version => "1.0" xml.rss :version => "2.0" do xml.channel do - xml.title "#{Settings.site_name} Support Thread" + xml.title "#{AppSettings.site_name} Support Thread" xml.description "" xml.link "#{topic_posts_url(@topic)}" diff --git a/app/views/topics/index.rss.builder b/app/views/topics/index.rss.builder index 18babd575..3f91834e7 100644 --- a/app/views/topics/index.rss.builder +++ b/app/views/topics/index.rss.builder @@ -2,7 +2,7 @@ xml.instruct! :xml, :version => "1.0" xml.rss :version => "2.0" do xml.channel do - xml.title "#{Settings.site_name} #{@forum.name} Feed" + xml.title "#{AppSettings.site_name} #{@forum.name} Feed" xml.description "" xml.link "#{forum_topics_url(@forum)}" diff --git a/lib/email_processor.rb b/lib/email_processor.rb index 13bc48a53..403fcab22 100644 --- a/lib/email_processor.rb +++ b/lib/email_processor.rb @@ -17,7 +17,7 @@ def process create_user end - sitename = Settings.site_name + sitename = AppSettings.site_name message = @email.body subject = @email.subject diff --git a/test/factories.rb b/test/factories.rb index 1d8c9dbc3..cb40ecce8 100644 --- a/test/factories.rb +++ b/test/factories.rb @@ -17,14 +17,14 @@ factory :reply, class: OpenStruct do to [{ full: 'to_user@email.com', email: 'to_user@email.com', token: 'to_user', host: 'email.com', name: nil }] from({ token: 'scott.miller', host: 'test.com', email: 'scott.miller@test.com', full: 'Scott Miller ', name: 'Scott Miller' }) - subject "Re: [Helpy Support] #1-Pending private topic" + subject "Re: [#{AppSettings.site_name}] #1-Pending private topic" body 'Hello!' end factory :reply_to_closed_ticket, class: OpenStruct do to [{ full: 'to_user@email.com', email: 'to_user@email.com', token: 'to_user', host: 'email.com', name: nil }] from({ token: 'scott.miller', host: 'test.com', email: 'scott.miller@test.com', full: 'Scott Miller ', name: 'Scott Miller' }) - subject "Re: [Helpy Support] #3-Closed private topic" + subject "Re: [#{AppSettings.site_name}] #3-Closed private topic" body 'Hello!' end From 7d7549a141fd93c60a33a0f715a539bf85ae84fb Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Wed, 30 Mar 2016 09:58:43 -0600 Subject: [PATCH 04/50] Config: User AppSettings.parent_company --- app/views/layouts/_above_header.html.erb | 2 +- app/views/layouts/_header.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_above_header.html.erb b/app/views/layouts/_above_header.html.erb index 4167c268a..6dbe1c564 100644 --- a/app/views/layouts/_above_header.html.erb +++ b/app/views/layouts/_above_header.html.erb @@ -1,4 +1,4 @@ -<%= link_to "#{t(:back_to, default: "Back to")} #{Settings.parent_company}", Settings.parent_site %> | +<%= link_to "#{t(:back_to, default: "Back to")} #{AppSettings.parent_company}", Settings.parent_site %> | <% unless user_signed_in? %> <%= link_to t('devise.sessions.new.sign_in'), '#', class: 'login-link', data: {toggle: "modal", target: "#login-modal"} %> <% else %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index acad12e74..51dfe10ab 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -13,7 +13,7 @@ <%= menu_item t(:community), forums_path if Settings.forums %> <%= menu_item t(:ask_a_question), new_topic_path %> <%= menu_divider %> - <%= menu_item "#{t(:back_to).titleize} #{Settings.parent_company}", Settings.parent_site, :class => 'hidden-lg hidden-md hidden-sm border-bottom' %> + <%= menu_item "#{t(:back_to).titleize} #{AppSettings.parent_company}", Settings.parent_site, :class => 'hidden-lg hidden-md hidden-sm border-bottom' %> <%= menu_item t(:locale), select_locale_path, :class => 'header-login hidden-lg hidden-md hidden-sm' %> <% if user_signed_in? %> From b448a2be281cf93f291791563bef8dc7cdf8f976 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Wed, 30 Mar 2016 10:01:24 -0600 Subject: [PATCH 05/50] Config: Use AppSettings.parent_site --- app/views/layouts/_above_header.html.erb | 2 +- app/views/layouts/_header.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_above_header.html.erb b/app/views/layouts/_above_header.html.erb index 6dbe1c564..67a1c8f31 100644 --- a/app/views/layouts/_above_header.html.erb +++ b/app/views/layouts/_above_header.html.erb @@ -1,4 +1,4 @@ -<%= link_to "#{t(:back_to, default: "Back to")} #{AppSettings.parent_company}", Settings.parent_site %> | +<%= link_to "#{t(:back_to, default: "Back to")} #{AppSettings.parent_company}", AppSettings.parent_site %> | <% unless user_signed_in? %> <%= link_to t('devise.sessions.new.sign_in'), '#', class: 'login-link', data: {toggle: "modal", target: "#login-modal"} %> <% else %> diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 51dfe10ab..182ef318a 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -13,7 +13,7 @@ <%= menu_item t(:community), forums_path if Settings.forums %> <%= menu_item t(:ask_a_question), new_topic_path %> <%= menu_divider %> - <%= menu_item "#{t(:back_to).titleize} #{AppSettings.parent_company}", Settings.parent_site, :class => 'hidden-lg hidden-md hidden-sm border-bottom' %> + <%= menu_item "#{t(:back_to).titleize} #{AppSettings.parent_company}", AppSettings.parent_site, :class => 'hidden-lg hidden-md hidden-sm border-bottom' %> <%= menu_item t(:locale), select_locale_path, :class => 'header-login hidden-lg hidden-md hidden-sm' %> <% if user_signed_in? %> From 0216dbbcce4f40a9f4c622a7015c2a8608fcad66 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Wed, 30 Mar 2016 10:19:41 -0600 Subject: [PATCH 06/50] Config: Use AppSettings.product_name --- app/views/layouts/_header.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 182ef318a..0d0befadb 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -3,7 +3,7 @@ - <%= nav_bar brand: image_tag("#{Settings.app_mini_logo}", width: 40, class: "pull-left logo") + "#{Settings.product_name + " " if Settings.product_name}" "#{AppSettings.site_name}", responsive: true do %> + <%= nav_bar brand: image_tag("#{Settings.app_mini_logo}", width: 40, class: "pull-left logo") + "#{AppSettings.product_name + " " if AppSettings.product_name}" "#{AppSettings.site_name}", responsive: true do %> <%= menu_group pull: :right do %> <%= menu_divider %> From f1690862c50c4d7d7606951b54a455af7e438a74 Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Wed, 30 Mar 2016 10:21:54 -0600 Subject: [PATCH 07/50] Config: Use AppSettings.app_favicon --- app/views/layouts/_head.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 2f52dd087..885683c23 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -19,7 +19,7 @@ <%= csrf_meta_tags %> -<%= favicon_link_tag "#{Settings.app_favicon}" %> +<%= favicon_link_tag "#{AppSettings.app_favicon}" %> <%= cloudinary_js_config %> <% unless Rails.env.test? %> From 07a6119d8452212da309cc4f66b69b052f98fd6a Mon Sep 17 00:00:00 2001 From: Scott Miller Date: Wed, 30 Mar 2016 10:26:08 -0600 Subject: [PATCH 08/50] Config: Use AppSettings.app_large|mini_icon --- app/views/layouts/_footer.html.erb | 2 +- app/views/layouts/_header.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 75eb98bd2..43ba16899 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,7 +1,7 @@