fae-rails 2.1.0 → 3.0.0

data/app/views/fae/deploy_hooks/_form.html.slim

@@ -0,0 +1,18 @@
+ruby:
+	form_options = {
+		html: {
+			multipart: true,
+			novalidate: true,
+			class: 'js-file-form',
+			remote: true,
+			data: {
+				type: "html"
+			}
+		}
+	}
+= simple_form_for(@deploy_hook, form_options) do |f|
+  = fae_input f, :environment
+  = fae_input f, :url, label: 'URL'
+
+  = f.submit
+  = button_tag 'Cancel', type: 'button', class: 'js-cancel-nested cancel-nested-button'

data/app/views/fae/deploy_hooks/_table.html.slim

@@ -0,0 +1,28 @@
+section.addedit-form.js-addedit-form
+  a.js-add-link.table-add-link.button.-small href=fae.new_deploy_hook_path = t('fae.deploy_hook.add_deploy_hook')
+  h2 = t('fae.deploy_hook.section_heading')
+  - if t('fae.deploy_hook.section_helper_text').present?
+    h6.table-helper-text = t('fae.deploy_hook.section_helper_text')
+  == render 'fae/application/flash_messages'
+  table.js-sort-row
+    thead
+      tr
+        th.th-sortable-handle
+        th = t('fae.deploy_hooks.environment')
+        th = t('fae.deploy_hooks.url')
+        th.-action
+    tbody
+      - if @deploy_hooks.present?
+        - @deploy_hooks.each do |item|
+          tr id=tr_id(item)
+            td.sortable-handle: i.icon-sort
+            td: a.js-edit-link href=edit_deploy_hook_path(item) #{item.environment}
+            td = item.url
+            td = fae_delete_button item, item, class: 'js-tooltip table-action js-delete-link', remote: true
+
+      - else
+        tr
+          - td_link = link_to 'add some', fae.new_deploy_hook_path, class: 'js-add-link'
+          td colspan="4" No #{t('fae.deploy_hook.section_heading')} yet, #{td_link}.
+
+  .js-addedit-form-wrapper

data/app/views/fae/deploy_hooks/edit.html.slim

@@ -0,0 +1,3 @@
+.nested-form
+  h2 = t('fae.deploy_hook.edit_deploy_hook')
+  == render 'form'

data/app/views/fae/deploy_hooks/new.html.slim

@@ -0,0 +1,3 @@
+.nested-form
+  h2 = t('fae.deploy_hook.new_deploy_hook')
+  == render 'form'

data/app/views/fae/images/_image_uploader.html.slim

@@ -15,15 +15,19 @@ ruby:
   attached_as         ||= image_name.to_s
   languages             = f.object.class.try(:fae_fields).try(:[], image_name).try(:[], :languages)
   language            ||= nil
+  show_form_manager   ||= true
 
 - if languages.present?
   - languages.each do |lang|
-    = render 'fae/images/image_uploader', f: f, item: item, image_name: "#{image_name}_#{lang}".to_sym, label: "#{label} (#{lang.to_s})", alt_label: "#{alt_label} (#{lang.to_s})", caption_label: "#{caption_label} (#{lang.to_s})", helper_text: helper_text, alt_helper_text: alt_helper_text, caption_helper_text: caption_helper_text, show_caption: show_caption, required: required, attached_as: attached_as, language: lang
+    = render 'fae/images/image_uploader', f: f, item: item, image_name: "#{image_name}_#{lang}".to_sym, label: "#{label} (#{lang.to_s})", alt_label: "#{alt_label} (#{lang.to_s})", caption_label: "#{caption_label} (#{lang.to_s})", helper_text: helper_text, alt_helper_text: alt_helper_text, caption_helper_text: caption_helper_text, show_caption: show_caption, required: required, attached_as: attached_as, language: lang, show_form_manager: show_form_manager
 
 - else
+  ruby:
+    form_manager_id = show_form_manager ? "#{item.class.name}_#{attached_as}" : nil
+    form_manager_id += "_#{language}" if language.present?
   - wrapper_html = language.present? ? { data: { language: language } } : {}
   = f.simple_fields_for image_name, defaults: { wrapper_html: wrapper_html } do |i|
-    .field.input*wrapper_html
+    .input.field.image*wrapper_html class="#{image_name}" data-form-manager-id=form_manager_id
       label class="#{'required' if required}"
         - if required
           abbr title="required" *
@@ -31,7 +35,8 @@ ruby:
         = " #{label.html_safe}"
 
         - if helper_text.present?
-          h6.helper_text = helper_text
+          h6.helper_text
+            span.helper_text_text = helper_text
 
       - if the_image.asset.present?
         .asset-actions
@@ -52,6 +57,8 @@ ruby:
         options = { label: caption_label.html_safe }
         options[:helper_text] = caption_helper_text if caption_helper_text.present?
         options[:wrapper_html] = wrapper_html
+        options[:wrapper_html].merge!({class: "#{form_manager_id}_caption_container"})
+        options[:show_form_manager] = false
 
       = fae_input i, :caption, options
 
@@ -60,6 +67,8 @@ ruby:
         options = { label: alt_label.html_safe }
         options[:helper_text] = alt_helper_text if alt_helper_text.present?
         options[:wrapper_html] = wrapper_html
+        options[:wrapper_html].merge!({class: "#{form_manager_id}_alt_container"})
+        options[:show_form_manager] = false
 
       = fae_input i, :alt, options
 

data/app/views/fae/options/_form.html.slim

@@ -3,14 +3,18 @@
     h1 Root Settings
     .content-header-buttons
       a.button#js-header-cancel href=fae.root_path(cancelled: true) = t('fae.form.cancel')
-      = f.submit t('fae.form.save')
+      input name="commit" type="submit" value=t('fae.form.save')
 
   == render 'flash_messages'
 
-  section.content
+  main.content
     = fae_input f, :title, label: t('fae.options.project.name')
     = fae_input f, :time_zone, wrapper_class: 'select'
+    = fae_input f, :colorway, label: t('fae.options.colorway'), helper_text: t('fae.options.colorway_helper')
     = fae_input f, :live_url, label: t('fae.options.live_url'), helper_text: t('fae.options.url_helper')
     = fae_input f, :stage_url, label: t('fae.options.stage_url'), helper_text: t('fae.options.url_helper')
     = fae_image_form f, :logo, helper_text: t('fae.options.logo_helper')
     = fae_image_form f, :favicon
+
+section.content#deploy_hooks
+  == render "fae/deploy_hooks/table"

data/app/views/fae/pages/activity_log.html.slim

@@ -1,12 +1,16 @@
-== render 'fae/shared/index_header', title: 'Activity Log', new_button: false
+header.content-header.js-content-header
+  h1 = t('fae.application.activity_log_heading')
 
 main.content
 
   == fae_filter_form title: t('fae.changes.title'), action: fae.activity_log_filter_path do
-    == fae_filter_select :user, options: Fae::User.all.map { |u| [u.full_name, u.id] }, translation_path: 'fae.changes.models'
-    == fae_filter_select :model, options: Fae::Change.unique_changeable_types, translation_path: 'fae.changes.models'
     == fae_filter_select :type, options: [t('fae.changes.created'), t('fae.changes.updated'), t('fae.changes.deleted')], translation_path: 'fae.changes.models'
+    == fae_filter_datepicker :start_date, placeholder: 'MM/DD/YYYY', class: 'test'
+    == fae_filter_datepicker :end_date, placeholder: 'MM/DD/YYYY'
     == fae_filter_select :date, options: [t('fae.changes.last_hour'), t('fae.changes.last_day'), t('fae.changes.last_week'), t('fae.changes.last_month')], placeholder: t('fae.changes.all_time')
+    br
+    == fae_filter_select :user, options: Fae::User.all.map { |u| [u.full_name, u.id] }, translation_path: 'fae.changes.models'
+    == fae_filter_select :model, options: Fae::Change.unique_changeable_types, translation_path: 'fae.changes.models'
 
   table.js-results-table
     thead

data/app/views/fae/pages/home.html.slim

@@ -19,8 +19,8 @@ header.content-header.js-content-header.-dashboard
         - @list.each do |item|
           - begin
             - parent = item.respond_to?(:fae_parent) ? item.fae_parent : nil
-            - edit_path = edit_polymorphic_path([main_app, fae_scope, parent, item])
-            - index_path = polymorphic_path([main_app, fae_scope, parent, item.class.to_s.pluralize.underscore])
+            - edit_path = edit_polymorphic_path([main_app, fae_scope.to_sym, parent, item])
+            - index_path = polymorphic_path([main_app, fae_scope.to_sym, parent, item.class.to_s.pluralize.underscore.to_sym])
             tr
               td: a href=edit_path = item.fae_display_field
               td: a href=index_path = item.class.to_s
@@ -33,5 +33,4 @@ header.content-header.js-content-header.-dashboard
       p
         = t('fae.page.no_objs_start')
         br
-        a href="https://www.faecms.com/documentation/quickstart-guide" target="_blank"
-        = t('fae.page.no_objs.end')
+        a href="https://www.faecms.com/documentation/quickstart-guide" target="_blank" = t('fae.page.no_objs_end')

data/app/views/fae/shared/_errors.slim

@@ -1,4 +1 @@
-- unless flash.present?
-  .flash-message.alert.hide = t('fae.save_error')
-
 == render 'flash_messages'

data/app/views/fae/shared/_form_header.html.slim

@@ -1,16 +1,17 @@
 ruby:
   require_locals ['header'], local_assigns
-  save_button_text    ||= t('fae.form.save')
-  cancel_button_text  ||= t('fae.form.cancel')
-  cloneable           ||= false
-  clone_button_text   ||= t('fae.form.clone')
-  subnav              ||= []
-  header_as_string      = header.is_a?(String) ? header : header.class.name.split('::').last
-  header_as_string      = header_as_string.singularize
-  title               ||= "#{params[:action]} #{header_as_string}".titleize
-  breadcrumb            = !local_assigns[:breadcrumbs].eql?(false)
-  languages           ||= false
-  show_flash_messages   = !local_assigns[:show_flash_messages].eql?(false)
+  save_button_text          ||= t('fae.form.save')
+  cancel_button_text        ||= t('fae.form.cancel')
+  cloneable                 ||= false
+  clone_button_text         ||= t('fae.form.clone')
+  launch_manager_text       ||= t('fae.form.launch_form_manager')
+  subnav                    ||= []
+  header_as_string          = header.is_a?(String) ? header : header.class.name.split('::').last
+  header_as_string          = header_as_string.singularize
+  title                     ||= "#{params[:action]} #{header_as_string}".titleize
+  breadcrumb                = !local_assigns[:breadcrumbs].eql?(false)
+  languages                 ||= false
+  show_flash_messages       = !local_assigns[:show_flash_messages].eql?(false)
 
 header.content-header.js-content-header
   - if breadcrumb
@@ -25,9 +26,12 @@ header.content-header.js-content-header
       .content-header-select
         = select_tag 'fae-languages', options_for_select(Fae.languages.map(&:reverse), selected), id: 'js-language', class: 'small_pulldown', prompt: 'All Languages'
 
+    - if Fae.use_form_manager
+      a.button.js-launch-form-manager href='#' = launch_manager_text
+
     a.button#js-header-cancel href=@index_path = cancel_button_text
     - if cloneable.present? && params[:id].present?
-      a.button data-method="post" href="#{@index_path}?from_existing=#{params[:id]}" = clone_button_text
+      a.button#js-header-clone data-method="post" href="#{@index_path}?from_existing=#{params[:id]}" = clone_button_text
     input name="commit" type="submit" value=save_button_text
 
   - if subnav.present?
@@ -38,3 +42,7 @@ header.content-header.js-content-header
 
 - if show_flash_messages
   == render 'fae/shared/errors'
+
+.errors-bar-wrapper
+  h2 = t('fae.save_error')
+  .errors-bar

data/app/views/fae/shared/_nested_table.html.slim

@@ -11,6 +11,8 @@ ruby:
   assoc_name          ||= assoc.to_s                      # 'restaurant_bars'
   title               ||= assoc_name.titleize             # 'Restaurant Bars'
   add_button_text     ||= t('fae.common.add', title: title.singularize)
+  hide_add_button     ||= false
+  hide_delete_button  ||= false
   ordered             ||= false
   has_thumb           ||= false
   edit_column         ||= false
@@ -33,7 +35,7 @@ ruby:
     new_path += "item_id=#{parent_item.id}&=item_class=#{parent_item.class.to_s}"
   end
 
-  options_for_table = { index: index, assoc: assoc, assoc_name: assoc_name, title: title, add_button_text: add_button_text, ordered: ordered, has_thumb: has_thumb, edit_column: edit_column, cols: cols, assoc_name_singular: assoc_name_singular, new_path: new_path, edit_path: edit_path }
+  options_for_table = { index: index, assoc: assoc, assoc_name: assoc_name, title: title, add_button_text: add_button_text, hide_add_button: hide_add_button, hide_delete_button: hide_delete_button, ordered: ordered, has_thumb: has_thumb, edit_column: edit_column, cols: cols, assoc_name_singular: assoc_name_singular, new_path: new_path, edit_path: edit_path }
   options_for_table[:parent_item] = parent_item unless index
 
 section.addedit-form.js-addedit-form class="#{'content' if index}"
@@ -41,7 +43,8 @@ section.addedit-form.js-addedit-form class="#{'content' if index}"
     == render 'fae/shared/shared_nested_table', options_for_table
 
   - else
-    a.js-add-link.table-add-link.button.-small href=new_path = add_button_text
+    - unless hide_add_button
+      a.js-add-link.table-add-link.button.-small href=new_path = add_button_text
     h2 = title
     - if helper_text.present?
       h6.table-helper-text = helper_text

data/app/views/fae/shared/_recent_changes.html.slim

@@ -8,7 +8,7 @@
             th = t('fae.changes.user')
             th = t('fae.changes.type')
             th = t('fae.changes.attrs')
-            th.-action-wide t('fea.changes.modified')
+            th.-action-wide = t('fea.changes.modified')
         tbody
           - if @item.try(:tracked_changes).present?
             - @item.tracked_changes.each do |change|

data/app/views/fae/shared/_shared_nested_table.html.slim

@@ -2,6 +2,7 @@ ruby:
   colspan = cols.length + 1
   colspan += 1 if ordered
   colspan += 1 if has_thumb
+  colspan -= 1 if hide_delete_button
   table_class = ordered ? 'js-sort-row' : nil
 
   options_for_td = { cols: cols, edit_path: edit_path, edit_column: edit_column }
@@ -17,7 +18,8 @@ table class=table_class
         = th_columns(col)
       - if edit_column
         th.-action data-sorter="false"
-      th.-action
+      - unless hide_delete_button
+        th.-action
   tbody
     - records = index ? @items : parent_item.send(assoc)
     - if records.present?
@@ -35,12 +37,16 @@ table class=table_class
             td
               a.js-edit-link.js-tooltip.table-action title=t('fae.common.edit') href=self.send(edit_path, item)
                 i.icon-edit
-          td = fae_delete_button item, "/#{fae_path}/#{assoc_name}/#{item.id.to_s}", class: 'js-tooltip table-action js-delete-link', remote: true
+          - unless hide_delete_button
+            td = fae_delete_button item, "/#{fae_path}/#{assoc_name}/#{item.id.to_s}", class: 'js-tooltip table-action js-delete-link', remote: true
 
-    - else
+    - elsif !hide_add_button
       tr
         - td_link = link_to 'add some', new_path, class: 'js-add-link'
 
         td colspan=colspan.to_s No #{title} yet, #{td_link}.
+    - else
+      tr
+        td colspan=colspan.to_s No #{title} yet.
 
 .js-addedit-form-wrapper

data/app/views/layouts/fae/application.html.slim

@@ -9,9 +9,10 @@ html
     == javascript_include_tag 'fae/application'
     == csrf_meta_tags
 
-  body class=body_class
+  body class=body_class style=('--highlight-color:' + '#' + @option.colorway if @option.colorway.present?)
     == render 'mobilenav'
     == render 'header'
+    .js-form-manager-container
     section.main-content#js-main-content
       == render 'sidenav'
 

data/config/deploy.rb

@@ -38,7 +38,8 @@ namespace :deploy do
   desc 'Symlink secrets.yml'
   task :symlink_secrets do
     on roles(:app) do
-      execute "ln -s #{shared_path}/secrets.yml #{release_path}/config/secrets.yml"
+      execute "rm #{release_path}/spec/dummy/config/secrets.yml"
+      execute "ln -s #{shared_path}/secrets.yml #{release_path}/spec/dummy/config/secrets.yml"
     end
   end
 
@@ -68,6 +69,7 @@ namespace :deploy do
     end
   end
 
+  after 'deploy:updating', 'deploy:symlink_secrets'
   after :finishing, 'deploy:cleanup'
 
 end

data/config/initializers/carrierwave.rb

@@ -1,3 +1,42 @@
- CarrierWave.configure do |config|
-    config.cache_dir = "#{Rails.root}/tmp/fae/uploads"
+CarrierWave.configure do |config|
+   config.cache_dir = "#{Rails.root}/tmp/fae/uploads"
+
+   if Rails.env.production? || Rails.env.remote_development?
+     config.fog_provider = 'fog/aws'
+     config.fog_credentials = {
+       provider: 'AWS',
+       aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+       aws_secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+       region: 'us-west-2'
+     }
+     config.storage = :fog
+   else
+     config.storage = :file
+   end
+
+   if Rails.env.production?
+      config.asset_host = 'https://s3.us-west-2.amazonaws.com/fae-engine-test-fly'
+      config.fog_directory = 'fae-engine-test-fly'
+   elsif Rails.env.remote_development?
+
+   end
+
+   # uncomment to deliver production assets to the local CMS
+   # if Rails.env.development?
+   #   config.asset_host = ''
+   #   config.fog_directory = ''
+   # end
+
+   # uncomment to upload to bucket/cdn in local dev
+   # if Rails.env.development?
+   #   config.fog_provider = 'fog/aws'
+   #   config.fog_credentials = {
+   #     provider: 'AWS',
+   #     aws_access_key_id: ENV['AWS_ACCESS_KEY_ID'],
+   #     aws_secret_access_key: ENV['AWS_SECRET_ACCESS_KEY'],
+   #     region: 'us-west-2'
+   #   }
+   #   config.storage = :fog
+   # end
+
  end

data/config/initializers/devise.rb

@@ -156,27 +156,27 @@ Devise.setup do |config|
   # Defines which strategy will be used to lock an account.
   # :failed_attempts = Locks an account after a number of failed attempts to sign in.
   # :none            = No lock strategy. You should handle locking by yourself.
-  # config.lock_strategy = :failed_attempts
+  config.lock_strategy = :failed_attempts
 
   # Defines which key will be used when locking and unlocking an account
-  # config.unlock_keys = [ :email ]
+  config.unlock_keys = [ :email ]
 
   # Defines which strategy will be used to unlock an account.
   # :email = Sends an unlock link to the user email
   # :time  = Re-enables login after a certain amount of time (see :unlock_in below)
   # :both  = Enables both strategies
   # :none  = No unlock strategy. You should handle unlocking by yourself.
-  # config.unlock_strategy = :both
+  config.unlock_strategy = :both
 
   # Number of authentication tries before locking an account if lock_strategy
   # is failed attempts.
-  # config.maximum_attempts = 20
+  config.maximum_attempts = 5
 
   # Time interval to unlock the account if :time is enabled as unlock_strategy.
-  # config.unlock_in = 1.hour
+  config.unlock_in = 1.hour
 
   # Warn on the last attempt before the account is locked.
-  # config.last_attempt_warning = false
+  config.last_attempt_warning = true
 
   # ==> Configuration for :recoverable
   #

data/config/initializers/fae_judge.rb

@@ -1,3 +1,5 @@
-Judge.configure do
-  expose Fae::User, :email
+Rails.application.config.to_prepare do
+  Judge.configure do
+    expose Fae::User, :email
+  end
 end

data/config/locales/fae.en.yml

@@ -12,6 +12,9 @@ en:
       save: 'Save'
       cancel: 'Cancel'
       clone: 'Clone'
+      launch_form_manager: 'Manage Form'
+      save_form_manager: 'Save Changes'
+      cancel_form_manager: 'Cancel'
       attribute:
         first_name: 'First Name'
         last_name: 'Last Name'
@@ -31,6 +34,13 @@ en:
       last_login: 'Last Logged In'
       active: 'Active'
       add_user: 'Add User'
+    deploy_hook:
+      environment: 'Environment'
+      add_deploy_hook: 'Add Deploy Hook'
+      new_deploy_hook: 'New Deploy Hook'
+      edit_deploy_hook: 'Edit Deploy Hook'
+      section_heading: 'Deploy Hooks'
+      section_helper_text: ''
     page:
       title: 'Pages'
       disabled_title: 'Disabled Admin'
@@ -41,7 +51,7 @@ en:
       error_end: 'to be taken to our home page.'
       hello: 'Hello'
       welcome: 'Welcome to Fae'
-      no_objs_start: "You don'thave any objects setup to manage. If you need help getting started, check out the"
+      no_objs_start: "You don't have any objects setup to manage. If you need help getting started, check out the"
       no_objs_end: 'Quickstart Guide and Documentation site.'
     navbar:
       logout: 'Log Out'
@@ -52,6 +62,8 @@ en:
       jump_to: 'Jump to...'
       root_settings: 'Root Settings'
       no_results: 'No Results'
+      deployments: 'Deploy'
+      deploy_hooks: 'Deploy Hooks'
     changes:
       recent: 'Recent Changes'
       user: 'User'
@@ -69,6 +81,8 @@ en:
       last_day: 'Last Day'
       last_week: 'Last Week'
       last_month: 'Last Month'
+      on_prod: 'On Prod'
+      on_stage: 'On Stage'
       models:
         users: 'Users'
         types: 'Types'
@@ -76,18 +90,42 @@ en:
         user: 'User'
         type: 'Type'
         model: 'Model'
+    deploy:
+        page:
+          heading: 'Deploy'
+        ctas:
+          deploy: 'Deploy'
+        table:
+          past_heading: 'Past Deploys'
+          deploying_heading: 'Deploying'
+          deploying_helper: "After making changes in the CMS, click a deploy button above to push these changes to the respective front-end environment. Once your deployment posts to the “Past Deploys” table below, updates will be ready to review in the front-end environment.<br><br>Please note that each environment is distinct and will need to be deployed separately."
+          title: 'Activity'
+          deployed: 'Date/Time'
+          duration: 'Duration'
+          branch: 'Branch'
+          committer: 'Committer'
+          context: 'Environment'
+          state: 'State'
+          error_msg: 'Error Msg'
+          no_deploys: 'No deploys were found.'
+        changes:
+          production_heading: 'Changes since last production deploy'
+          staging_heading: 'Changes since last staging deploy'
     setup:
       prompt: 'Please create your super admin user.'
       password: 'Passwords must contain at least 8 characters.'
     options:
       project_name: 'Project Name'
       live_url: 'Live URL'
+      colorway: 'Highlight Color'
+      colorway_helper: 'Use 6 digit hex code to set the highlight color. Omit the "#"'
       url_helper: 'Include http:// for external links.'
       stage_url: 'Stage URL'
       logo_helper: 'Used on login page, 300x300px .jpg'
     images:
-      alt_helper: 'Brief description of image contents, used in hover text and by visually impaired users.'
+      alt_helper: 'Read by search engines and visually impaired readers.'
     application:
+      activity_log_heading: 'Activity Log'
       user_absent: 'user no longer exists'
       no_logs: 'No logs available.'
       view_site: 'View Site'
@@ -111,9 +149,16 @@ en:
       paragraph_break: 'Paragraph break'
       paragraph_break_help: 'Adding a blank line in between your paragraphs makes a paragraph break.'
     seo_title: 'A descriptive page title of ~50-65 characters. Displayed in search engine results.'
-    seo_description: 'A helpful page summary of 320 characters or less. Displayed in search engine results.'
+    seo_description: 'A helpful page summary of 200 characters or less. Displayed in search engine results.'
     search: 'Search %{search}'
     reset_search: 'Reset Search'
     apply_filters: 'Apply Filters'
     all_items: 'All %{items}'
-    keyword_search: 'Search by Keyword'
+    keyword_search: 'Search by Keyword'
+  activerecord:
+    errors:
+      models:
+        fae/image:
+          attributes:
+            asset:
+              size_too_big: 'size is too big'

data/config/locales/fae.zh-CN.yml

@@ -41,7 +41,7 @@ zh-CN:
       error_end: 'to be taken to our home page.'
       hello: 'Hello'
       welcome: 'Welcome to Fae'
-      no_objs_start: "You don'thave any objects setup to manage. If you need help getting started, check out the"
+      no_objs_start: "You don't have any objects setup to manage. If you need help getting started, check out the"
       no_objs_end: 'Quickstart Guide and Documentation site.'
     navbar:
       logout: 'Log Out'
@@ -86,7 +86,7 @@ zh-CN:
       stage_url: 'Stage URL'
       logo_helper: 'Used on login page, 300x300px .jpg'
     images:
-      alt_helper: 'Brief description of image contents, used in hover text and by visually impaired users.'
+      alt_helper: 'Read by search engines and visually impaired readers.'
     application:
       user_absent: 'user no longer exists'
       no_logs: 'No logs available.'

data/config/puma.rb

@@ -0,0 +1,82 @@
+# Puma can serve each request in a thread from an internal thread pool.
+# The `threads` method setting takes two numbers: a minimum and maximum.
+# Any libraries that use thread pools should be configured to match
+# the maximum value specified for Puma. Default is set to 5 threads for minimum
+# and maximum; this matches the default thread size of Active Record.
+#
+max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
+threads min_threads_count, max_threads_count
+
+# Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+#
+port        ENV.fetch("PORT") { 3000 }
+
+# Specifies the `environment` that Puma will run in.
+#
+environment ENV.fetch("RAILS_ENV") { "development" }
+
+# Specifies the `pidfile` that Puma will use.
+pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
+
+# Specifies the number of `workers` to boot in clustered mode.
+# Workers are forked web server processes. If using threads and workers together
+# the concurrency of the application would be max `threads` * `workers`.
+# Workers do not work on JRuby or Windows (both of which do not support
+# processes).
+#
+workers ENV.fetch("WEB_CONCURRENCY") { 4 }
+# Use the `preload_app!` method when specifying a `workers` number.
+# This directive tells Puma to first boot the application and load code
+# before forking the application. This takes advantage of Copy On Write
+# process behavior so workers use less memory.
+#
+preload_app!
+# Allow puma to be restarted by `rails restart` command.
+plugin :tmp_restart
+
+# Old setup for fly.io
+
+# # Puma can serve each request in a thread from an internal thread pool.
+# # The `threads` method setting takes two numbers: a minimum and maximum.
+# # Any libraries that use thread pools should be configured to match
+# # the maximum value specified for Puma. Default is set to 5 threads for minimum
+# # and maximum; this matches the default thread size of Active Record.
+# #
+# max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+# min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
+# threads min_threads_count, max_threads_count
+
+# # Specifies the `worker_timeout` threshold that Puma will use to wait before
+# # terminating a worker in development environments.
+# #
+# worker_timeout 3600 if ENV.fetch("RAILS_ENV", "development") == "development"
+
+# # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
+# #
+# port ENV.fetch("PORT") { 3000 }
+
+# # Specifies the `environment` that Puma will run in.
+# #
+# environment ENV.fetch("RAILS_ENV") { "development" }
+
+# # Specifies the `pidfile` that Puma will use.
+# pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
+
+# # Specifies the number of `workers` to boot in clustered mode.
+# # Workers are forked web server processes. If using threads and workers together
+# # the concurrency of the application would be max `threads` * `workers`.
+# # Workers do not work on JRuby or Windows (both of which do not support
+# # processes).
+# #
+# workers ENV.fetch("WEB_CONCURRENCY") { 4 }
+
+# # Use the `preload_app!` method when specifying a `workers` number.
+# # This directive tells Puma to first boot the application and load code
+# # before forking the application. This takes advantage of Copy On Write
+# # process behavior so workers use less memory.
+# #
+# preload_app!
+
+# # Allow puma to be restarted by `bin/rails restart` command.
+# plugin :tmp_restart