refinerycms-core 2.0.10 → 2.1.0

data/app/assets/javascripts/wymeditor/validators.js.erb

@@ -338,8 +338,9 @@ WYMeditor.XhtmlValidator = {
         "readonly":/^(readonly)$/,
         "size":/^(\d)+$/,
         "3":"src",
-        "type":/^(button|checkbox|file|hidden|image|password|radio|reset|submit|text|tel|search|url|email|datetime|date|month|week|time|datetime-local|number|range|color|placeholder)$/,
-        "4":"value"
+        "type":/^(button|checkbox|file|hidden|image|password|radio|reset|submit|text|tel|search|url|email|datetime|date|month|week|time|datetime-local|number|range|color)$/,
+        "4":"value",
+        "5":"placeholder"
       },
       "inside":"form"
     },

data/app/assets/stylesheets/refinery/layout.css.scss

@@ -20,11 +20,6 @@
   -webkit-border-bottom-left-radius: $radius;
   -webkit-border-bottom-right-radius: $radius;
 }
-* {
-  color: #41403C;
-  font-family: Arial;
-  font-size: 13px;
-}
 p {
   font-size: 14px;
   line-height: 18px;
@@ -36,9 +31,10 @@ body {
   min-height: 100%;
   margin: 0;
   padding: 0;
-  font-size: 10px;
-  font-family: Verdana;
+  font-family: Arial, sans-serif;
+  font-size: 13px;
   line-height: 1.5em;
+  color: #41403C;
   background: #303030 image_url('refinery/page_bg.png') repeat;
 }
 acronym {
@@ -91,7 +87,7 @@ select.widest {
     }
   }
   li {
-    margin-top: 10px;
+    margin-bottom: 10px;
     a {
       background-color: #dbedff;
       background-position: 12px;
@@ -431,7 +427,7 @@ header {
   }
   a {
     display: block;
-    padding: 9px 13px;
+    padding: 7px 13px;
     font-size: 13px;
     background: image_url('refinery/nav_inactive_background.png') transparent repeat;
     margin-top:4px;
@@ -445,7 +441,7 @@ header {
       color: #ff5500;
     }
     &.active {
-      padding: 11px 13px;
+      padding: 9px 13px;
       margin-top: 0px;
     }
   }
@@ -494,6 +490,13 @@ pre {
 #records > #recent_activity > ul li, #records > #recent_inquiries > ul li {
   max-height: 35px;
 }
+#recent_activity li a, #recent_inquiries li a {
+  overflow: hidden;
+  white-space: nowrap;
+  -o-text-overflow: ellipsis;
+  -ms-text-overflow: ellipsis;
+  text-overflow: ellipsis;
+}
 #content #records > ul li .actions a, #content #records .pagination_container > ul li .actions a {
   line-height: 29px;
 }
@@ -1018,6 +1021,9 @@ ul#menu.reordering_menu li a {
   font-size: 16px;
   width: 180px;
 }
+.cancel-search {
+  float: right;
+}
 .pt-BR #search {
   width: 187px;
 }
@@ -1355,7 +1361,7 @@ input.button.close_dialog:active, a.button.close_dialog:active, #content a.butto
 .form-actions a.confirm-delete:active, #content .form-actions a.confirm-delete:active {
   background: #bb0000;
 }
-.field input[type=text], .field input[type=password], .field textarea {
+.field input[type=text], .field input[type=password], .field input[type=email], .field input[type=tel], .field input[type=number], .field textarea {
   border: 1px solid #7f9db9;
   padding: 0.4% 0.5%;
   line-height: 20px;
@@ -1536,6 +1542,30 @@ a.information:hover {
 .tooltip, .tooltip span {
   @include rounded(6px);
 }
+.label {
+  padding: 1px 3px 2px;
+  font-size: 9.75px;
+  font-weight: bold;
+  color: #ffffff;
+  text-transform: uppercase;
+  white-space: nowrap;
+  background-color: #bfbfbf;
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  border-radius: 3px;
+}
+.label.important {
+  background-color: #c43c35;
+}
+.label.warning {
+  background-color: #f89406;
+}
+.label.success {
+  background-color: #46a546;
+}
+.label.notice {
+  background-color: #62cffc;
+}
 
 .label {
   padding: 1px 3px 2px;

data/app/controllers/refinery/sitemap_controller.rb

@@ -7,11 +7,7 @@ module ::Refinery
 
       respond_to do |format|
         format.xml do
-          @locales = if defined?(::Refinery::I18n) && ::Refinery::I18n.enabled?
-                       ::Refinery::I18n.frontend_locales
-                     else
-                       [::I18n.locale]
-                     end
+          @locales = Refinery::I18n.frontend_locales
         end
       end
     end

data/app/helpers/refinery/admin_helper.rb

@@ -1,4 +1,10 @@
 module Refinery
   module AdminHelper
+
+    def current_admin_locale
+      # TODO: move current_admin_locale to Refinery::I18n
+      ::I18n.locale
+    end
+
   end
 end

data/app/helpers/refinery/image_helper.rb

@@ -24,7 +24,8 @@ module Refinery
       if image.present?
         dimensions = (image.thumbnail_dimensions(geometry) rescue {})
 
-        image_tag(image.thumbnail(geometry).url, {
+        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

data/app/helpers/refinery/menu_helper.rb

@@ -13,54 +13,5 @@ module Refinery
       nil
     end
 
-    # This was extracted from app/views/refinery/_menu_branch.html.erb
-    # to remove the complexity of that template by reducing logic in the view.
-    def menu_branch_css(local_assigns)
-      options = local_assigns.dup
-      options.update(:sibling_count => options[:menu_branch].shown_siblings.length) unless options[:sibling_count]
-
-      css = []
-      css << Refinery::Core.menu_css[:selected] if selected_page_or_descendant_page_selected?(local_assigns[:menu_branch]) unless Refinery::Core.menu_css[:selected].nil?
-      css << Refinery::Core.menu_css[:first] if options[:menu_branch_counter] == 0 unless Refinery::Core.menu_css[:first].nil?
-      css << Refinery::Core.menu_css[:last] if options[:menu_branch_counter] == options[:sibling_count] unless Refinery::Core.menu_css[:last].nil?
-      css
-    end
-
-    # Determines whether any page underneath the supplied page is the current page according to rails.
-    # Just calls selected_page? for each descendant of the supplied page
-    # unless it first quickly determines that there are no descendants.
-    def descendant_page_selected?(page)
-      (page.rgt != page.lft + 1) && page.descendants.any? { |descendant| selected_page?(descendant) }
-    end
-
-    def selected_page_or_descendant_page_selected?(page)
-      selected_page?(page) || descendant_page_selected?(page)
-    end
-
-    # Determine whether the supplied page is the currently open page according to Refinery.
-    # Also checks whether Rails thinks it is selected after that using current_page?
-    def selected_page?(page)
-      path = request.path.sub("//", "/")
-      path = path.force_encoding('utf-8') if path.respond_to?(:force_encoding)
-
-      # Ensure we match the path without the locale, if present.
-      if ::Refinery.i18n_enabled? and path =~ %r{^/#{::I18n.locale}/}
-        path = path.split(%r{^/#{::I18n.locale}}).last
-        path = "/" if path.blank?
-      end
-
-      # First try to match against a "menu match" value, if available.
-      return true if page.try(:menu_match).present? && path =~ Regexp.new(page.menu_match)
-
-      # Find the first url that is a string.
-      url = [page.url]
-      url << ['', page.url[:path]].compact.flatten.join('/') if page.url.respond_to?(:keys)
-      url = url.last.match(%r{^/#{::I18n.locale.to_s}(/.*)}) ? $1 : url.detect{|u| u.is_a?(String)}
-
-      # Now use all possible vectors to try to find a valid match,
-      # finally passing to rails' "current_page?" method.
-      [path, URI.decode(path)].include?(url) || path == "/#{page.original_id}"
-    end
-
   end
 end

data/app/helpers/refinery/meta_helper.rb

@@ -5,10 +5,10 @@ module Refinery
     #
     def browser_title(yield_title=nil)
       [
-        (yield_title if yield_title.present?),
-        @meta.browser_title.present? ? @meta.browser_title : @meta.path,
+        yield_title,
+        @meta.browser_title.presence || @meta.path,
         Refinery::Core.site_name
-      ].compact.join(" - ")
+      ].reject(&:blank?).join(" - ")
     end
 
     # you can override the object used for the title by supplying options[:object]
@@ -48,5 +48,9 @@ module Refinery
       end
     end
 
+    def canonical_id(page)
+      "#{page.canonical_slug}-page" if page
+    end
+
   end
 end

data/app/helpers/refinery/site_bar_helper.rb

@@ -4,26 +4,14 @@ 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),
-                (if session.keys.map(&:to_sym).include?(:website_return_to) and session[:website_return_to].present?
-                  session[:website_return_to]
-                 else
-                  refinery.root_path(:locale => (Refinery::I18n.default_frontend_locale if Refinery.i18n_enabled?))
-                 end)) do
+                         refinery.root_path(site_bar_translate_locale_args)) do
         link_to t('.switch_to_your_website_editor', site_bar_translate_locale_args),
-                (if session.keys.map(&:to_sym).include?(:refinery_return_to) and session[:refinery_return_to].present?
-                  session[:refinery_return_to]
-                else
-                  refinery.admin_root_path
-                 end rescue refinery.admin_root_path)
+                refinery.admin_root_path
       end
     end
 
     def site_bar_translate_locale_args
-      if Refinery.i18n_enabled?
-        { :locale => Refinery::I18n.current_locale }
-      else
-        {}
-      end
+      { :locale => Refinery::I18n.current_locale }
     end
 
   end

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

@@ -1,3 +1,5 @@
+require 'active_record'
+
 module Refinery
   module Core
     class BaseModel < ActiveRecord::Base

data/{lib → app/presenters}/refinery/base_presenter.rb

@@ -5,8 +5,7 @@ module Refinery
       :title              => proc { |p| (p.model.class.name.titleize if p.model.present?) },
       :path               => proc { |p| p.title },
       :browser_title      => nil,
-      :meta_description   => nil,
-      :meta_keywords      => nil
+      :meta_description   => nil
     }
 
     attr_reader :model

data/app/views/layouts/application.html.erb

@@ -1,21 +1,22 @@
 <!DOCTYPE html>
-<%= render '/refinery/html_tag' %>
+<%= render "/refinery/html_tag" %>
   <% site_bar = render('/refinery/site_bar', :head => true) -%>
-  <%= render '/refinery/head' %>
-  <body>
+  <head>
+    <%= render "/refinery/head" %>
+  </head>
+  <body id="<%= canonical_id @page %>">
     <%= site_bar -%>
-    <%= render '/refinery/ie6check' if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
     <div id="page_container">
       <header id="header">
-        <%= render '/refinery/header' -%>
+        <%= render "/refinery/header" -%>
       </header>
       <section id="page">
         <%= yield %>
       </section>
       <footer>
-        <%= render '/refinery/footer' -%>
+        <%= render "/refinery/footer" -%>
       </footer>
     </div>
-    <%= render '/refinery/javascripts' %>
+    <%= render "/refinery/javascripts" %>
   </body>
 </html>

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.nil? or @page.live? -%>
+<%= render '/refinery/draft_page_message' unless @page.try(:live?) -%>

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

@@ -1,8 +1,15 @@
 <% page_code = Refinery::Core.google_analytics_page_code.to_s.strip %>
 <% unless local_request? or refinery_user? or page_code =~ /^(UA-xxxxxx-x)?$/ -%>
-<!-- asynchronous google analytics: mathiasbynens.be/notes/async-analytics-snippet -->
-<script>var _gaq=[['_setAccount','<%= page_code %>'],['_trackPageview'],['_trackPageLoadTime']];(function(d,t){
-var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
-g.async=1;g.src='//www.google-analytics.com/ga.js';s.parentNode.insertBefore(g,s)
-}(document,'script'))</script>
+<!-- asynchronous google analytics snippet -->
+<script type="text/javascript">
+  var _gaq = _gaq || [];
+  _gaq.push(['_setAccount', '<%= page_code %>']);
+  _gaq.push(['_trackPageview']);
+
+  (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);
+  })();
+</script>
 <% end -%>

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

@@ -1,18 +1,14 @@
-<head>
-  <meta charset='<%= Rails.application.config.encoding %>' />
-  <!--[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 %(<meta name="keywords" content="#{@meta.meta_keywords}">) if @meta.meta_keywords.present? -%>
-  <%= raw %(<link rel="canonical" content="#{@canonical}" />) if @canonical.present? -%>
-  <%= csrf_meta_tags if Refinery::Core.authenticity_token_on_frontend -%>
-  <%= yield :meta %>
+<meta charset='<%= Rails.application.config.encoding %>' />
+<!--[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? -%>
+<%= csrf_meta_tags if Refinery::Core.authenticity_token_on_frontend -%>
+<%= yield :meta %>
 
-  <%= stylesheet_link_tag "application", "formatting", "theme" %>
-  <%= stylesheet_link_tag "home" if home_page? %>
-  <%= yield :stylesheets %>
+<%= stylesheet_link_tag "application" %>
+<%= yield :stylesheets %>
 
-  <%= render '/refinery/google_analytics' %>
+<%= render '/refinery/google_analytics' %>
 
-  <%= javascript_include_tag 'modernizr-min' %>
-</head>
+<%= javascript_include_tag 'modernizr-min' %>

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

@@ -1,7 +1,4 @@
 <h1 id='logo'>
   <%= link_to Refinery::Core.site_name, refinery.root_path %>
 </h1>
-<%= render(:partial => "/refinery/menu", :locals => {
-             :dom_id => 'menu',
-             :css => 'menu'
-           }) %>
+<%= Refinery::Pages::MenuPresenter.new(refinery_menu_pages, self).to_html %>

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

@@ -1,11 +1,17 @@
-<%= yield :before_javascript_libraries -%>
-<%= yield :javascript_libraries %>
-<%= yield :after_javascript_libraries %>
-<% if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
-  <!--[if lt IE 7 ]>
-    <%= javascript_include_tag 'dd_belatedpng' %>
-    <script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
-  <![endif]-->
+<% 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/_site_bar.html.erb

@@ -1,14 +1,14 @@
-<% if refinery_user? && "#{controller_name}##{action_name}" != 'pages#preview' %>
+<% if refinery_user? && "#{controller_name}##{action_name}" !~ %r{preview#show} %>
   <% 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] or 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 -%>
       </div>
-      <%= link_to image_tag("#{"http://refinerycms.com/images/" unless local_request?}refinery/logo-site-bar.png", :alt => "Refinery (tm) Content Manager"),
+      <%= 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' %>
@@ -19,7 +19,7 @@
         </span>
 
         <%= link_to t('.log_out', site_bar_translate_locale_args),
-                    refinery.destroy_refinery_user_session_path, :id => 'logout' %>
+                    refinery.logout_path, :id => 'logout' %>
       </div>
     </div>
   </div>