Fixups to have new things and old things still working

Author: parndt

core/app/assets/stylesheets/refinery/mixins/_labels.scss

@@ -8,7 +8,6 @@
 @import 'mixins/icon_base';
 @import 'mixins/icon';
 @import 'mixins/rounded';
-@import 'mixins/labels';
 @import 'mixins/locales';
 @import 'mixins/images';
 

core/app/assets/stylesheets/refinery/refinery.scss

@@ -742,9 +742,7 @@ textarea {
   width: auto;
   height: 25px;
 }
-
-//label, .label_with_help {
-label {
+label, .label_with_help {
   margin-bottom: 5px;
   font-weight: bold;
   margin-top: 20px;
@@ -1631,21 +1629,20 @@ input.button.close_dialog:active, a.button.close_dialog:active, #content a.butto
 }
 
 .label_with_help {
-  @include label_with_help
-}
-
-//.label_with_help label, .label_with_help span.help, .label_with_help img.help {
-//  display: inline;
-//}
-//.label_with_help img.help {
-//  vertical-align: middle;
-//}
-//.label_with_help span.help {
-//  font-weight: normal;
-//  margin-left: 3px;
-//  border-bottom: 1px dotted #727272;
-//  cursor: help;
-//}
+  vertical-align: middle;
+}
+.label_with_help label, .label_with_help span.help, .label_with_help img.help {
+  display: inline;
+}
+.label_with_help img.help {
+  vertical-align: middle;
+}
+.label_with_help span.help {
+  font-weight: normal;
+  margin-left: 3px;
+  border-bottom: 1px dotted #727272;
+  cursor: help;
+}
 #more_options_field {
   position: relative;
 }

core/app/assets/stylesheets/refinery/sections/_layout.scss

@@ -61,13 +61,14 @@ def edit_in_locale(locale, url:, title: nil, **options)
       end
     end
 
-
-    def edit_in_locales(edit_url, locales = [])
-      return if locales.empty? || locales.one?
+    def edit_in_locales(edit_url, locales = [], i18n_scope: %i[refinery admin locale_picker])
+      return if locales.empty?
 
       edit_links = locales.map do |locale|
-        edit_in_locale(locale, url: edit_url, title: t('.edit_in_locale', locale: locale))
+        language = ::Refinery::I18n.config.locales.fetch(locale, locale)
+        edit_in_locale(locale, url: edit_url, title: t('edit_in_language', language: language, scope: i18n_scope))
       end
+
       tag.span edit_links.compact.join(' ').html_safe, class: :locales
     end
   end

core/app/helpers/refinery/action_helper.rb

@@ -1,22 +1,25 @@
+# frozen_string_literal: true
+
 module Refinery
   module SiteBarHelper
 
     # Generates the link to determine where the site bar switch button returns to.
     def site_bar_switch_link
       link_to_if(admin?, t('.switch_to_your_website', **site_bar_translate_locale_args),
                          refinery.root_path(site_bar_translate_locale_args),
-                         'data-turbolinks' => false) do
+                         data: {turbolinks: false}) do
         link_to t('.switch_to_your_website_editor', **site_bar_translate_locale_args),
                 Refinery::Core.backend_path, 'data-turbolinks' => false
       end
     end
 
     def site_bar_edit_link
       return nil if admin? || @page.nil?
-      link_to t('refinery.admin.pages.edit', **site_bar_translate_locale_args),
+
+      link_to t('refinery.admin.pages.page.edit', **site_bar_translate_locale_args),
               refinery.admin_edit_page_path(@page.nested_url,
-              :switch_locale => (@page.translations.first.locale unless @page.translated_to_default_locale?)),
-              'data-turbolinks' => false
+              switch_locale: (@page.translations.first.locale unless @page.translated_to_default_locale?)),
+              data: {turbolinks: false}
     end
 
     def site_bar_translate_locale_args

core/app/helpers/refinery/site_bar_helper.rb

@@ -1,12 +1,13 @@
 module Refinery
   module TagHelper
+    include ActionHelper
 
     # Returns <img class='help' tooltip='Your Input' src='refinery/icons/information.png' />
 
     # Remember to wrap your block with <span class='label_with_help'></span> if you're using a label next to the help tag.
     def refinery_help_tag(title='Tip')
       title = title.html_safe? ? title : h(title)
-      tag.span title, class: :help
+      action_icon(:info, '#', title, {tooltip: title})
     end
 
     # This is just a quick wrapper to render an image tag that lives inside refinery/icons.
@@ -16,7 +17,7 @@ def refinery_icon_tag(filename, options = {})
 
       filename = "#{filename}.png" unless filename.split('.').many?
       path = image_path "refinery/icons/#{filename}", skip_pipeline: true
-      image_tag path, {:width => 16, :height => 16}.merge(options)
+      image_tag path, {width: 16, height: 16}.merge(options)
     end
 
   end

core/app/helpers/refinery/tag_helper.rb

@@ -18,12 +18,12 @@ def translated_field(record, field)
     def locales_with_translated_field(record, field_name, include_current: true)
       field_name = field_name.to_sym
       translations = record.translations.where.not(field_name => [nil, ""])
-      translations = translations.where.not(locale: current_locale) unless include_current
-      translations.map { |t| t.locale.to_sym }.sort_by { |locale| Refinery::I18n.frontend_locales.index(locale) }
-    end
+      translations = translations.where.not(locale: Refinery::I18n.default_frontend_locale.to_s) unless include_current
 
-    private def current_locale
-      Refinery::I18n.current_locale.to_s
+      translations.pluck(:locale).map(&:to_sym).sort_by do |locale|
+        index = Refinery::I18n.frontend_locales.index(locale)
+        index ? [0, index] : [1, locale]
+      end
     end
   end
 end

core/app/helpers/refinery/translation_helper.rb

@@ -1,7 +1,7 @@
-<input type="hidden" name="switch_locale" id="switch_locale" value="<%= local_assigns[:current_locale] %>" />
+<input type="hidden" name="switch_locale" id="switch_locale" value="<%= local_assigns[:current_locale] %>">
 <% if Refinery::I18n.frontend_locales.many? %>
   <label><%= t('.language') %></label>
-  <div id="switch_locale_picker" class='locales'>
+  <div id="switch_locale_picker" class="locales">
     <% Refinery::I18n.frontend_locales.each do |locale, language| %>
         <% classes = locale.to_s == local_assigns[:current_locale].to_s ? 'selected' : '' %>
         <%= edit_in_locale(locale,

core/app/views/refinery/admin/_locale_picker.html.erb

@@ -44,7 +44,7 @@ en:
         show: Show
       locale_picker:
         language: Language,
-        edit_in_locale: Edit in %{locale}
+        edit_in_locale: Edit in '%{locale_code}'
         edit_in_language: Edit in %{language}
       resource_picker:
         download_current: Download current file

core/config/locales/en.yml

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require "spec_helper"
 
 module Refinery
-  describe "site bar", :type => :system do
+  describe "site bar", type: :system do
     refinery_login
 
     describe "logout link" do
@@ -62,7 +64,7 @@ module Refinery
       end
 
       it "has an 'edit this page' button" do
-        expect(page).to have_link("Edit this page", :href => refinery.edit_admin_page_path(root_page))
+        expect(page).to have_link("Edit this page", href: refinery.edit_admin_page_path(root_page))
       end
 
     end