refinerycms-core 2.1.5 → 3.0.0

data/app/controllers/refinery/admin/core_controller.rb

@@ -1,13 +1,8 @@
 module Refinery
   module Admin
     class CoreController < ::Refinery::AdminController
-      def update_plugin_positions
-        params[:menu].each_with_index do |plugin_name, index|
-          if (plugin = current_refinery_user.plugins.find_by_name(plugin_name))
-            plugin.update_attributes :position => index
-          end
-        end
-        render :nothing => true
+      def index
+        redirect_to refinery_admin_root_path
       end
     end
   end

data/app/controllers/refinery/admin/dialogs_controller.rb

@@ -3,10 +3,10 @@ module ::Refinery
     class DialogsController < ::Refinery::AdminController
       TYPES = %w[image link]
 
-      before_filter :find_dialog_type, :find_iframe_src, :only => [:show]
+      before_action :find_dialog_type, :find_iframe_src, :only => [:show]
 
       def index
-        redirect_to refinery.admin_root_path
+        redirect_to Refinery::Core.backend_path
       end
 
       def show
@@ -18,6 +18,7 @@ module ::Refinery
       end
 
       protected
+
       def find_dialog_type
         error_404 if TYPES.exclude? params[:id].downcase
 
@@ -35,7 +36,7 @@ module ::Refinery
       end
 
       def url_params
-        params.reject {|key, value| /(action)|(controller)/ === key}.
+        params.reject { |key, value| /(action)|(controller)/ === key}.
                merge :id => nil
       end
 

data/app/controllers/refinery/admin_controller.rb

@@ -3,7 +3,6 @@
 module Refinery
   class AdminController < ::ActionController::Base
     include ::Refinery::ApplicationController
-    helper ApplicationHelper
     helper Refinery::Core::Engine.helpers
     include Refinery::Admin::BaseController
 

data/app/controllers/refinery/fast_controller.rb

@@ -1,10 +1,6 @@
 module Refinery
   class FastController < ActionController::Base
 
-    def wymiframe
-      render :template => "/refinery/wymiframe", :layout => false
-    end
-
     def message
       render :partial => '/refinery/message', :layout => false
     end

data/app/helpers/refinery/admin/visual_editor_helper.rb

@@ -0,0 +1,13 @@
+module Refinery
+  module Admin
+    module VisualEditorHelper
+      def visual_editor_javascripts
+        Refinery::Core.visual_editor_javascripts.uniq
+      end
+
+      def visual_editor_stylesheets
+        Refinery::Core.visual_editor_stylesheets.uniq(&:path)
+      end
+    end
+  end
+end

data/app/helpers/refinery/admin_helper.rb

@@ -6,5 +6,9 @@ module Refinery
       ::I18n.locale
     end
 
+    def locale_country(locale)
+      locale.to_s.upcase.split('-').last
+    end
+
   end
 end

data/app/helpers/refinery/custom_assets_helper.rb

@@ -1,11 +1,11 @@
 module Refinery
   module CustomAssetsHelper
     def custom_javascripts
-      ::Refinery::Core.javascripts
+      ::Refinery::Core.javascripts.uniq
     end
 
     def custom_stylesheets
-      ::Refinery::Core.stylesheets
+      ::Refinery::Core.stylesheets.uniq(&:path)
     end
   end
 end

data/app/helpers/refinery/image_helper.rb

@@ -20,15 +20,16 @@ module Refinery
     # Say for example that we had a @model.image (@model having a belongs_to :image relationship)
     # and we wanted to display a thumbnail cropped to 200x200 then we can use image_fu like this:
     # <%= image_fu @model.image, '200x200' %> or with no thumbnail: <%= image_fu @model.image %>
-    def image_fu(image, geometry = nil, options={})
-      if image.present?
-        dimensions = (image.thumbnail_dimensions(geometry) rescue {})
+    def image_fu(image, geometry = nil, options = {})
+      return nil if image.blank?
 
-        image_tag(image.thumbnail(:geometry => geometry,
-                                  :strip => options[:strip]).url, {
-          :alt => image.respond_to?(:title) ? image.title : image.image_name,
-        }.merge(dimensions).merge(options))
-      end
+      thumbnail_args = options.slice(:strip)
+      thumbnail_args[:geometry] = geometry if geometry
+
+      image_tag_args = (image.thumbnail_dimensions(geometry) rescue {})
+      image_tag_args[:alt] = image.respond_to?(:title) ? image.title : image.image_name
+
+      image_tag(image.thumbnail(thumbnail_args).url, image_tag_args.merge(options))
     end
   end
 end

data/app/helpers/refinery/meta_helper.rb

@@ -3,7 +3,7 @@ module Refinery
 
     # This is used to display the title of the current object (normally a page) in the browser's titlebar.
     #
-    def browser_title(yield_title=nil)
+    def browser_title(yield_title = nil)
       [
         yield_title,
         @meta.browser_title.presence || @meta.path,

data/app/helpers/refinery/site_bar_helper.rb

@@ -4,15 +4,29 @@ module Refinery
     # 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)) do
+                         refinery.root_path(site_bar_translate_locale_args),
+                         'data-no-turbolink' => true) do
         link_to t('.switch_to_your_website_editor', site_bar_translate_locale_args),
-                refinery.admin_root_path
+                Refinery::Core.backend_path, 'data-no-turbolink' => true
       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),
+              refinery.admin_edit_page_path(@page.nested_url,
+              :switch_locale => (@page.translations.first.locale unless @page.translated_to_default_locale?)),
+              'data-no-turbolink' => true
+    end
+
     def site_bar_translate_locale_args
       { :locale => Refinery::I18n.current_locale }
     end
 
+    def display_site_bar?
+      authorisation_manager.allow?(:read, :site_bar) &&
+        "#{controller_name}##{action_name}" !~ %r{preview#show}
+    end
+
   end
 end

data/app/helpers/refinery/tag_helper.rb

@@ -2,11 +2,10 @@ module Refinery
   module TagHelper
 
     # 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='')
-      title = h(title) unless title.html_safe?
 
-      refinery_icon_tag('information', :class => 'help', :tooltip => title)
+    # 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')
+      action_icon(:info, '#', title.html_safe? ? title : h(title), {tooltip: title})
     end
 
     # This is just a quick wrapper to render an image tag that lives inside refinery/icons.
@@ -16,5 +15,39 @@ module Refinery
       image_tag "refinery/icons/#{filename}", {:width => 16, :height => 16}.merge(options)
     end
 
+    def action_icon(action, url, title, options={})
+      action_icon_label(action, url, title, options, false)
+    end
+
+    def action_label(action, url, title, options={})
+      action_icon_label(action, url, title, options, true)
+    end
+
+    def action_icon_label(action, url, title, options={}, label = true)
+#   See icons.scss for defined icons/classes
+
+      options[:title] = title
+      options[:class].presence ? options[:class] << " #{action}_icon " : options[:class] = "#{action}_icon"
+      options[:class] << ' icon_label' if label
+
+      case action
+      when :preview
+        options[:target] = '_blank'
+      when :delete
+        options[:method] = :delete
+      when :reorder_done
+        options[:class] << ' hidden'
+      end
+
+      link_to(label && title || '', url, options)
+    end
+
+    # this stacks the text onto the locale icon (actually a comment balloon)
+    def locale_text_icon(text)
+      content_tag(:span, class: 'fa-stack') do
+        content_tag(:i, '', class: 'fa fa-comment') << content_tag(:strong, text)
+      end
+    end
+
   end
-end
+end

data/app/models/refinery/core/base_model.rb

@@ -3,9 +3,11 @@ require 'active_record'
 module Refinery
   module Core
     class BaseModel < ActiveRecord::Base
-
       self.abstract_class = true
 
+      def users_manager
+        @users_manager ||= Refinery::Core::UsersManager.new
+      end
     end
   end
 end

data/app/views/layouts/refinery/admin.html.erb

@@ -5,17 +5,19 @@
   <body class="<%= action_name %> <%= I18n.locale %>">
     <%= render '/refinery/site_bar' %>
     <div id='tooltip_container'></div>
-    <header id="header">
-      <%= render 'refinery/admin/menu' %>
-    </header>
-    <div id="page_container">
-      <div id="page">
-        <div id="content" class="clearfix">
-          <div id="flash_container">
-            <%= render '/refinery/no_script' %>
-            <%= render '/refinery/message' %>
+    <div id="admin_container" class="clearfix">
+      <header id="header">
+        <%= render 'refinery/admin/menu' %>
+      </header>
+      <div id="page_container">
+        <div id="page">
+          <div id="content" class="clearfix">
+            <div id="flash_container">
+              <%= render '/refinery/no_script' %>
+              <%= render '/refinery/message' %>
+            </div>
+            <%= yield %>
           </div>
-          <%= yield %>
         </div>
       </div>
     </div>

data/app/views/layouts/refinery/admin_dialog.html.erb

@@ -4,11 +4,8 @@
     <%= render '/refinery/admin/dialog_success' %>
   <% else %>
     <%= render '/refinery/admin/head' %>
-    <body id='dialog_container' class='dialog <%= I18n.locale %><%= ' wym_iframe_body' if params[:wymeditor].presence %>'>
+    <body id='dialog_container' class='dialog <%= I18n.locale %><%= ' visual_editor_iframe_body' if params[:visual_editor].presence %>'>
       <div id='tooltip_container'></div>
-      <div id="flash_container">
-        <%= render '/refinery/message' %>
-      </div>
       <div id='content' class='clearfix'>
         <%= yield %>
       </div>

data/app/views/refinery/_content_page.html.erb

@@ -2,4 +2,4 @@
       :hide_sections => local_assigns[:hide_sections],
       :can_use_fallback => !local_assigns[:show_empty_sections] && !local_assigns[:remove_automatic_sections]
     }) %>
-<%= render '/refinery/draft_page_message' unless @page.try(:live?) -%>
+<%= render '/refinery/draft_page_message' if @page && @page.draft? -%>

data/app/views/refinery/_google_analytics.html.erb

@@ -1,15 +1,14 @@
 <% page_code = Refinery::Core.google_analytics_page_code.to_s.strip %>
-<% unless local_request? or refinery_user? or page_code =~ /^(UA-xxxxxx-x)?$/ -%>
+<% unless local_request? or admin? or page_code =~ /^(UA-xxxxxx-x)?$/ -%>
 <!-- asynchronous google analytics snippet -->
 <script type="text/javascript">
-  var _gaq = _gaq || [];
-  _gaq.push(['_setAccount', '<%= page_code %>']);
-  _gaq.push(['_trackPageview']);
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
 
-  (function() {
-    var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
-    ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
-  })();
+  ga('create', '<%= page_code %>', 'auto');
+  ga('send', 'pageview');
 </script>
+<!-- End Google Analytics -->
 <% end -%>

data/app/views/refinery/_head.html.erb

@@ -2,7 +2,7 @@
 <!--[if IE]><meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" /><![endif]-->
 <title><%= browser_title(yield(:title)) %></title>
 <%= raw %(<meta name="description" content="#{@meta.meta_description}" />) if @meta.meta_description.present? -%>
-<%= raw %(<link rel="canonical" content="#{@canonical}" />) if @canonical.present? -%>
+<%= raw %(<link rel="canonical" href="#{request.protocol}#{request.host_with_port}#{@canonical}" />) if @canonical.present? -%>
 <%= csrf_meta_tags if Refinery::Core.authenticity_token_on_frontend -%>
 <%= yield :meta %>
 

data/app/views/refinery/_javascripts.html.erb

@@ -1,17 +1,2 @@
-<% if content_for? :before_javascript_libraries %>
-  <% Refinery.deprecate "content_for :before_javascript_libraries", :when => '2.2', :replacement => "content_for :javascripts" %>
-  <% content_for :javascripts, yield(:before_javascript_libraries) %>
-<% end %>
-
-<% if content_for? :javascript_libraries %>
-  <% Refinery.deprecate "content_for :javascript_libraries", :when => '2.2', :replacement => "content_for :javascripts" %>
-  <% content_for :javascripts, yield(:javascript_libraries) %>
-<% end %>
-
-<% if content_for? :after_javascript_libraries %>
-  <% Refinery.deprecate "content_for :after_javascript_libraries", :when => '2.2', :replacement => "content_for :javascripts" %>
-  <% content_for :javascripts, yield(:after_javascript_libraries) %>
-<% end %>
-
 <%= javascript_include_tag 'application' %>
 <%= yield :javascripts -%>

data/app/views/refinery/_message.html.erb

@@ -1,5 +1,5 @@
 <% flash.each do |key, value| %>
-<div id='flash' class="flash flash_<%= key %>" style='visibility: hidden;' >
+<div id='flash' class="flash flash_<%= key %>">
   <%= value %>
   <%= link_to t(".close#{'_this_message' if key.to_s == "message"}"), "",
               :id => "flash_close" %>

data/app/views/refinery/_site_bar.html.erb

@@ -1,17 +1,19 @@
-<% if refinery_user? && "#{controller_name}##{action_name}" !~ %r{preview#show} %>
+<% if display_site_bar? %>
   <% unless admin? # all required JS included by backend. %>
     <% content_for :stylesheets, stylesheet_link_tag('refinery/site_bar') unless !!local_assigns[:exclude_css] %>
     <%= yield(:stylesheets) unless local_assigns[:head] || local_assigns[:exclude_css] %>
   <% end -%>
   <div id='site_bar'>
     <div id='site_bar_content' class='clearfix'>
+
       <div id='editor_switch'>
         <%= site_bar_switch_link -%>
+        <%= site_bar_edit_link -%>
       </div>
-      <%= link_to image_tag("#{"http://refinerycms.com/images/" unless local_request? || request.ssl? }refinery/logo-site-bar.png", :alt => "Refinery (tm) Content Manager"),
-                  'http://refinerycms.com',
-                  :target => '_blank',
-                  :id => 'site_bar_refinery_cms_logo' %>
+
+      <%= link_to 'http://refinerycms.com', :id => 'site_bar_refinery_cms_logo', :target => '_blank' do %>
+        <span>Refinery CMS™</span>
+      <% end %>
 
       <div id='site_bar_branding'>
         <span id='site_bar_company_name'>
@@ -19,7 +21,8 @@
         </span>
 
         <%= link_to t('.log_out', site_bar_translate_locale_args),
-                    refinery.logout_path, :id => 'logout' %>
+                    ::Refinery::Core.refinery_logout_path,
+                    :id => 'logout' if ::Refinery::Core.refinery_logout_path.present? %>
       </div>
     </div>
   </div>

data/app/views/refinery/admin/_error_messages.html.erb

@@ -1,13 +1,13 @@
 <% if object.errors.any? %>
-<div class="errorExplanation" id="errorExplanation">
+<div class="errorExplanation error_icon" id="errorExplanation">
   <p><%= t('.problems_in_following_fields') %>:</p>
   <ul>
-  <% unless defined?(include_object_name) and include_object_name %>
-    <% object.errors.each do |key, value| %>
+  <% if defined?(include_object_name) and include_object_name %>
+    <% object.errors.full_messages.each do |value| %>
       <li><%= value %></li>
     <% end %>
   <% else %>
-    <% object.errors.full_messages.each do |value| %>
+    <% object.errors.each do |key, value| %>
       <li><%= value %></li>
     <% end %>
   <% end %>

data/app/views/refinery/admin/_form_actions.html.erb

@@ -57,6 +57,7 @@
                 :class => "close_dialog button") unless hide_cancel %>
 
     <%= local_assigns[:after_cancel_button] -%>
+    <i id='spinner' class='loading_icon hidden_icon'></i>
   </div>
   <div class='form-actions-right'>
     <%= local_assigns[:before_delete_button] -%>

data/app/views/refinery/admin/_form_advanced_options_menu.html.erb

@@ -1,12 +1,11 @@
 <div id="more_options_field" >
   <p>
-    <%= link_to t('.advanced_options'), '#',
-                :id => 'toggle_advanced_options',
-                :title => t('.toggle_advanced_options') %>
-  </p>
+    <%= action_label(:settings, '#', t('.toggle_advanced_options'), id: 'toggle_advanced_options') %>
+
   <span id="draft_field">
     <%= f.check_box :draft %>
     <%= f.label :draft, t('.save_as_draft'),
                 :class => 'stripped' %>
   </span>
+   </p>
 </div>