refinerycms 0.9.7.10 → 0.9.7.11

data/public/javascripts/refinery/admin.js

@@ -32,9 +32,6 @@ init_interface = function() {
   // make sure that users can tab to wymeditor fields and add an overlay while loading.
   $('textarea.wymeditor').each(function() {
     textarea = $(this);
-    /*overlay = $("<div class='wym_loading_overlay'>&nbsp;</div>")
-              .css({'height': textarea.height(), 'width': textarea.width()});
-    textarea.before(overlay);*/
     if ((instance = WYMeditor.INSTANCES[$((textarea.next('.wym_box').find('iframe').attr('id')||'').split('_')).last().get(0)]) != null) {
       if ((next = textarea.parent().next()) != null && next.length > 0) {
         next.find('input, textarea').keydown($.proxy(function(e) {
@@ -62,9 +59,21 @@ init_interface = function() {
   $('form input[type=text]:first').focus();
 
   // ensure that the menu isn't wider than the page_container or else it looks silly to round that corner.
-  var last_item_offset = (last_item = $('#menu a:visible:last')).offset();
-  if (last_item_offset && ((last_item_offset.left + last_item.outerWidth() - $('#menu').offset().left + 5) < $('#page_container').outerWidth())) {
-    $("#page_container:not('.login #page_container')").corner('5px tr');
+  if (($menu = $('#menu')).length > 0) {
+    $menu.jcarousel({
+      vertical: false
+      , scroll: 1
+      , buttonNextHTML: "<img src='/images/refinery/carousel-right.png' alt='down' height='15' width='10' />"
+      , buttonPrevHTML: "<img src='/images/refinery/carousel-left.png' alt='up' height='15' width='10' />"
+      , listTag: $menu.get(0).tagName.toLowerCase()
+      , itemTag: $menu.children(':first').get(0).tagName.toLowerCase()
+    });
+
+    if ($menu.outerWidth() < $('#page_container').outerWidth()) {
+      $("#page_container:not('.login #page_container')").corner('5px tr');
+    } else {
+      $("#page_container:not('.login #page_container')").uncorner();
+    }
   }
 
   $('#current_locale li a').click(function(e) {
@@ -107,8 +116,8 @@ init_flash_messages = function(){
 init_modal_dialogs = function(){
   $('a[href*="dialog=true"]').not('#dialog_container a').each(function(i, anchor) {
     $(anchor).data({
-      'dialog-width': parseInt($(anchor.href.match("width=([0-9]*)")).last().get(0), 928)||928
-      , 'dialog-height': parseInt($(anchor.href.match("height=([0-9]*)")).last().get(0), 473)||473
+      'dialog-width': parseInt($($(anchor).attr('href').match("width=([0-9]*)")).last().get(0))||928
+      , 'dialog-height': parseInt($($(anchor).attr('href').match("height=([0-9]*)")).last().get(0))||473
       , 'dialog-title': ($(anchor).attr('title') || $(anchor).attr('name') || $(anchor).html() || null)
     }).attr('href', $(anchor).attr('href').replace(/(\&(amp\;)?)?dialog\=true/, '')
                                           .replace(/(\&(amp\;)?)?width\=\d+/, '')
@@ -257,8 +266,9 @@ init_tooltips = function(args){
         tooltip.css({
           'opacity': 0
           , 'maxWidth': '300px'
-          , 'left': ((left = $(this).offset().left - (tooltip.outerWidth() / 2) + ($(this).outerWidth() / 2)) >= 0 ? left : 0)
         });
+        required_left_offset = $(this).offset().left - (tooltip.outerWidth() / 2) + ($(this).outerWidth() / 2);
+        tooltip.css('left', (required_left_offset > 0 ? required_left_offset : 0));
 
         var tooltip_offset = tooltip.offset();
         var tooltip_outer_width = tooltip.outerWidth();
@@ -276,7 +286,7 @@ init_tooltips = function(args){
 
         if (tooltip_offset = tooltip.offset()) {
           nib.css({
-            'left': tooltip_offset.left + (tooltip_outer_width / 2) - 5
+            'left': $(this).offset().left + ($(this).outerWidth() / 2) - 5
             , 'top': tooltip_offset.top + tooltip.height()
           });
         }
@@ -298,18 +308,26 @@ init_tooltips = function(args){
 
     }, function(e) {
       $(this).stopTime('tooltip');
-      (tooltip = $('.tooltip')).css('z-index', '-1').animate({
-        top: tooltip.offset().top - 20
+      if ((tt_offset = (tooltip = $('.tooltip')).css('z-index', '-1').offset()) == null) {
+        tt_offset = {'top':0,'left':0};
+      }
+      tooltip.animate({
+        top: tt_offset.top - 20
         , opacity: 0
       }, 125, 'swing', function(){
         $(this).remove();
       });
-      (nib = $('.tooltip-nib')).animate({
-        top: nib.offset().top - 20
+      if ((nib_offset = (nib = $('.tooltip-nib')).offset()) == null) {
+        nib_offset = {'top':0,'left':0};
+      }
+      nib.animate({
+        top: nib_offset.top - 20
         , opacity: 0
       }, 125, 'swing', function(){
         $(this).remove();
-      })
+      });
+    }).click(function(e) {
+      $(this).stopTime('tooltip');
     });
     if ($(element).attr('tooltip') == null) {
       $(element).attr('tooltip', $(element).attr('title'));
@@ -823,9 +841,24 @@ var list_reorder = {
       serialized += "&continue_reordering=false";
 
       $.post(list_reorder.update_url, serialized, function(data) {
-        $(list_reorder.sortable_list).html(data);
+        // handle the case where we get the whole list back including the <ul> or whatever.
+        if (data.match(new RegExp("^"+ $(list_reorder.sortable_list).get(0).tagName.toLowerCase() + "\ id=\"|\'" + list_reorder.sortable_list + "\"|\'>")).length == 1) {
+          // replace reorder authenticity token's value.
+          $('#reorder_authenticity_token').val($($(data.split('reorder_authenticity_token')).last().get(0).split('value=\'')).last().get(0).split('\'')[0]);
+          // replace actual list content.
+          $(list_reorder.sortable_list).html($(data).html());
+        } else {
+          $(list_reorder.sortable_list).html(data);
+        }
 
-        list_reorder.restore_controls(e);
+        // if we get passed a script tag, re-enable reordering.
+        matches = data.replace('"', "'")
+                      .match(/<script\ type='text\/javascript'>([^<]*)<\/script>/im);
+        if (matches != null && matches.length > 1) {
+          list_reorder.enable_reordering();
+        } else {
+          list_reorder.restore_controls(e);
+        }
       });
     } else {
       list_reorder.restore_controls(e);

data/public/javascripts/wymeditor/lang/da.js

@@ -0,0 +1,47 @@
+WYMeditor.STRINGS['da'] = {
+  Strong:           'Kraftig',
+  Bold:             'Fed',
+  Emphasis:         'Fremhævet',
+  Superscript:      'Superscript',
+  Subscript:        'Subscript',
+  Ordered_List:     'Sorteret liste',
+  Unordered_List:   'Punktopstillet liste',
+  Indent:           'Ryk ind',
+  Outdent:          'Ryk ud',
+  Undo:             'Fortryd',
+  Redo:             'Igen',
+  Link:             'Tilføj link',
+  Unlink:           'Fjern link',
+  Image:            'Indsæt billede',
+  Table:            'Indsæt tabel',
+  HTML:             'HTML',
+  Paragraph:        'Afsnit',
+  Heading_1:        'Overskrift 1',
+  Heading_2:        'Overskrift 2',
+  Heading_3:        'Overskrift 3',
+  Heading_4:        'Overskrift 4',
+  Heading_5:        'Overskrift 5',
+  Heading_6:        'Overskrift 6',
+  Preformatted:     'Præformattet',
+  Blockquote:       'Blockquote',
+  Table_Header:     'Tabel overskrift',
+  URL:              'URL',
+  Title:            'Titel',
+  Alternative_Text: 'Alternativ tekst',
+  Caption:          'Overskrift',
+  Summary:          'Resume',
+  Number_Of_Rows:   'Antal rækker',
+  Number_Of_Cols:   'Antal kolonner',
+  Insert:           'Indsæt',
+  Submit:           'Gem',
+  Cancel:           'Annullér',
+  Choose:           'Vælg',
+  Preview:          'Vis',
+  Paste_From_Word:  'Indsæt tekst her under',
+  Tools:            'Værktøjer',
+  Containers:       'Containere',
+  Classes:          'Klasser',
+  Status:           'Status',
+  Source_Code:      'Kilde kode',
+  Css_Class:        'Tilføj CSS klasse'
+};

data/public/stylesheets/refinery/refinery.css

@@ -295,7 +295,7 @@ body.login #header_content h1 {
   padding-bottom: 0px;
   line-height: 60px;
 }
-#menu {
+#menu, #header_content .jcarousel-container {
   display: block;
   margin: 0px;
   padding: 0px;
@@ -305,6 +305,25 @@ body.login #header_content h1 {
   right: 0px;
   background: transparent;
 }
+#header_content .jcarousel-container {
+  position: absolute !important;
+}
+#header_content .jcarousel-container .jcarousel-prev,
+  #header_content .jcarousel-container .jcarousel-next {
+  position: absolute;
+  top: 13px;
+  cursor: pointer;
+}
+#header_content .jcarousel-container .jcarousel-prev {
+  left: -20px;
+}
+#header_content .jcarousel-container .jcarousel-next {
+  right: -20px;
+}
+#header_content .jcarousel-container .jcarousel-prev-disabled,
+  #header_content .jcarousel-container .jcarousel-next-disabled {
+  display: none !important;
+}
 #menu.ui-sortable a {
   cursor: move;
 }

data/vendor/plugins/images/app/controllers/admin/images_controller.rb

@@ -2,19 +2,19 @@ class Admin::ImagesController < Admin::BaseController
 
   include Admin::ImagesHelper
 
-  crudify :image, :order => "created_at DESC", :conditions => "parent_id is NULL", :sortable => false
+  crudify :image,
+          :order => "created_at DESC",
+          :conditions => "parent_id is NULL",
+          :search_conditions => "parent_id IS NULL",
+          :sortable => false
+
   before_filter :change_list_mode_if_specified, :init_dialog
 
   def index
     if searching?
-      @images = Image.paginate_search params[:search],
-                                               :page => params[:page],
-                                               :order => "created_at DESC",
-                                               :conditions => "parent_id IS NULL"
+      search_and_paginate_all_images
     else
-      @images = Image.paginate :page => params[:page],
-                                               :order => "created_at DESC",
-                                               :conditions => "parent_id IS NULL"
+      paginate_all_images
     end
 
     if RefinerySetting.find_or_set(:group_images_by_date_uploaded, true)

data/vendor/plugins/images/app/views/admin/images/_existing_image.html.erb

@@ -45,6 +45,6 @@
                :submit_button_text => t('.submit_insert'),
                :hide_cancel => false,
                :hide_delete => true,
-               :cancel_title => ''
+               :cancel_title => nil
              } if @app_dialog or @images.any? %>
 </div>

data/vendor/plugins/images/app/views/admin/images/_grid_view.html.erb

@@ -11,7 +11,8 @@
         <%= link_to refinery_icon_tag('delete.png'), admin_image_path(image),
                     :class => "cancel confirm-delete",
                     :title => t('admin.images.image.delete.title'),
-                    :'data-confirm' => t('admin.images.image.delete.message', :title => image.filename) %>
+                    :'data-confirm' => t('admin.images.image.delete.message', :title => image.filename),
+                    :'data-method' => "delete" %>
       </span>
     </li>
   <% end -%>

data/vendor/plugins/images/app/views/admin/images/_list_view_image.html.erb

@@ -12,7 +12,8 @@
       <%= link_to refinery_icon_tag('delete.png'), admin_image_path(list_view_image),
                   :class => "cancel confirm-delete",
                   :title => t('admin.images.image.delete.title'),
-                  :'data-confirm' => t('admin.images.image.delete.message', :title => list_view_image.filename) %>
+                  :'data-confirm' => t('admin.images.image.delete.message', :title => list_view_image.filename),
+                  :'data-method' => "delete" %>
     </span>
   </li>
 <% end %>

data/vendor/plugins/images/app/views/admin/images/insert.html.erb

@@ -33,7 +33,7 @@
                  :hide_delete => true,
                  :hide_submit => true,
                  :cancel_button_text => t('shared.admin.message.close'),
-                 :cancel_title => ''
+                 :cancel_title => nil
                } %>
   <% end %>
 </div>

data/vendor/plugins/inquiries/app/controllers/admin/inquiries_controller.rb

@@ -5,17 +5,13 @@ class Admin::InquiriesController < Admin::BaseController
   before_filter :get_spam_count, :only => [:index, :spam]
 
   def index
-    if searching?
-      @inquiries = Inquiry.ham.find_with_index params[:search]
-    end
+    @inquiries = Inquiry.ham.with_query(params[:search]) if searching?
 
     @grouped_inquiries = group_by_date(Inquiry.ham)
   end
 
   def spam
-    if searching?
-      @inquiries = Inquiry.spam.find_with_index params[:search]
-    end
+    @inquiries = Inquiry.spam.with_query(params[:search]) if searching?
 
     @grouped_inquiries = group_by_date(Inquiry.spam)
   end

data/vendor/plugins/inquiries/app/views/admin/inquiries/_inquiry.html.erb

@@ -7,7 +7,8 @@
     <%= link_to refinery_icon_tag('delete.png'), admin_inquiry_url(inquiry),
                 :class => "cancel confirm-delete",
                 :title => t('.title'),
-                :'data-confirm' => t('.remove_inquiry', :name => inquiry.name) -%>
+                :'data-confirm' => t('.remove_inquiry', :name => inquiry.name),
+                :'data-method' => "delete" -%>
 
     <%= link_to refinery_icon_tag('zoom.png'), admin_inquiry_url(inquiry),
                 :title => t('.read_inquiry') -%>

data/vendor/plugins/inquiries/app/views/admin/inquiries/show.html.erb

@@ -16,7 +16,8 @@
     <li>
       <%= link_to t('.title'), admin_inquiry_url(@inquiry), :class => 'delete_icon no-tooltip confirm-delete',
                                                             :title => t('.title'),
-                                                            :'data-confirm' => t('admin.inquiries.inquiry.remove_inquiry', :name => @inquiry.name) %>
+                                                            :'data-confirm' => t('admin.inquiries.inquiry.remove_inquiry', :name => @inquiry.name),
+                                                            :'data-method' => "delete" %>
     </li>
   </ul>
 </div>

data/vendor/plugins/inquiries/config/locales/pt-BR.yml

@@ -40,6 +40,8 @@ pt-BR:
       submenu:
         update_notified: Atualizar quem recebe a notificação
         edit_confirmation_email: Editar email de confirmação
+        inbox: Caixa de Entrada
+        spam: Spam
       index:
         search_results_for: Resultados da busca por {{query}}
         open_inquiries: Mensagens abertas

data/vendor/plugins/pages/app/views/admin/pages/_form_new_page_parts.html.erb

@@ -1,7 +1,7 @@
 <div id='new_page_part_dialog' style='display: none'>
   <div class='field'>
-    <label for='new_page_part_title'>Title</label>
-    <input id='new_page_part_title' value='' class='larger' size='40' />
+    <label for='new_page_part_title'><%= t('.title')  %></label>
+    <input id='new_page_part_title' value='' class='larger widest' />
     <input id='new_page_part_index' type='hidden' value='<%= @page.parts.size %>' />
   </div>
   <%= render :partial => "/shared/admin/form_actions", :locals => {

data/vendor/plugins/pages/app/views/admin/pages/_form_page_parts.html.erb

@@ -3,13 +3,13 @@
     <li>
       <%= link_to refinery_icon_tag('add.png'), '#',
                   :id => 'add_page_part',
-                  :title => 'Create Content Section' %>
+                  :title => t('admin.pages.form_advanced_options.create_content_section') %>
     </li>
     <li>
       <%= link_to refinery_icon_tag('delete.png'), '#',
-                  :title => 'Delete content section',
+                  :title => t('admin.pages.form_advanced_options.delete_content_section'),
                   :class => 'delete_page_part',
-                  :name => 'Delete Content Section',
+                  :name => t('admin.pages.form_advanced_options.delete_content_section'),
                   :id => 'delete_page_part' %>
     </li>
   </ul>

data/vendor/plugins/pages/app/views/admin/pages/_page.html.erb

@@ -20,6 +20,7 @@
                   :title => t('.edit_this_page') %>
       <%= link_to refinery_icon_tag('delete.png'), admin_page_url(page),
                   :class => "cancel confirm-delete",
+                  :'data-method' => "delete",
                   :title => t('.confirm_delete_page_title') if page.deletable? %>
     </span>
   </div>

data/vendor/plugins/pages/app/views/admin/pages/_sortable_list.html.erb

@@ -1,2 +1,4 @@
-<%= render :partial => "page", :collection => @pages %>
+<ul id='sortable_list'>
+  <%= render :partial => "page", :collection => @pages %>
+</ul>
 <%= render :partial => "/shared/admin/sortable_list", :locals => {:continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)} %>

data/vendor/plugins/pages/app/views/admin/pages/index.html.erb

@@ -18,17 +18,13 @@
   <% if searching? %>
     <h2><%= t('admin.search_results_for', :query => h(params[:search])) %></h2>
     <% if @pages.any? %>
-      <ul id='sortable_list'>
-        <%= render :partial => "sortable_list" %>
-      </ul>
+      <%= render :partial => "sortable_list" %>
     <% else %>
       <p><%= t('admin.search_no_results') %></p>
     <% end %>
   <% else %>
     <% if @pages.any? %>
-      <ul id='sortable_list'>
-        <%= render :partial => "sortable_list" %>
-      </ul>
+      <%= render :partial => "sortable_list" %>
     <% else %>
       <p>
         <strong><%=t('.no_pages_yet')%></strong>

data/vendor/plugins/pages/config/locales/en.yml

@@ -37,6 +37,8 @@ en:
         confirm_delete_page_message: "Are you sure you want to delete the page '{{title}}'?"
         hidden: hidden
         draft: draft
+      form_new_page_parts:
+        title: Title
       form_advanced_options:
         toggle_advanced_options: Click to access meta tag settings and menu options
         parent_page: Parent page

data/vendor/plugins/pages/config/locales/pt-BR.yml

@@ -55,6 +55,8 @@ pt-BR:
         confirm_delete_page_message: "Você tem certeza que quer deletar a página '{{title}}'?"
         hidden: oculta
         draft: rascunho
+      form_new_page_parts:
+        title: Título
       form_advanced_options:
         toggle_advanced_options: Clique aqui para acessar as configurações de meta tag e opções do menu
         create_content_section: Criar seção de conteúdo

data/vendor/plugins/refinery/app/views/admin/_head.html.erb

@@ -5,10 +5,11 @@
   css_caching = js_caching && request.env['HTTP_USER_AGENT'] !~ /MSIE/
 -%>
 <head>
-<% if request.env['HTTP_USER_AGENT'] =~ /MSIE/%>
-  <!--[if lt IE 9]>
-    <%= javascript_include_tag('http://html5shiv.googlecode.com/svn/trunk/html5.js') %>
-  <![endif]-->
+<% # IE only html5 enabling script
+if request.env['HTTP_USER_AGENT'] =~ /MSIE/%>
+  <script type='text/javascript'>
+    <%= render :partial => '/shared/html5_for_ie.js' %>
+  </script>
 <% end %>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title><%= RefinerySetting.find_or_set(:site_name, 'Company Name') %> - Refinery</title>
@@ -28,6 +29,7 @@
                              'jquery/jquery.textTruncate.js',
                              'jquery/jquery.html5-placeholder-shim.js',
                              'jquery/jquery.timers.js',
+                             'jquery/jquery.jcarousel.js',
                              :cache => (js_caching ? "cache/jquery-plugins" : false) %>
 
   <%= javascript_include_tag 'refinery/i18n' %>

data/vendor/plugins/refinery/app/views/shared/_head.html.erb

@@ -2,15 +2,16 @@
 <head>
   <title><%= browser_title(yield(:title)) %></title>
   <%= render :partial => 'shared/google_analytics' unless local_request? %>
-  <%= "<!--[if lt IE 9]>#{javascript_include_tag('http://html5shiv.googlecode.com/svn/trunk/html5.js')}<![endif]-->".html_safe if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
+  <%= # IE only HTML5 enabling script:
+    "<script type='text/javascript'>#{render :partial => '/shared/html5_for_ie.js'}</script>" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
   <%= stylesheet_link_tag "application", "formatting", :theme => theme %>
   <%= stylesheet_link_tag "theme" %>
   <%= stylesheet_link_tag "home", :theme => theme if home_page? %>
   <%= "<!--[if IE 7]>#{stylesheet_link_tag 'ie7'}<![endif]-->" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ -%>
   <link rel="shortcut icon" href="/favicon.ico" />
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <%= "<meta name=\"keywords\" content=\"#{@meta.meta_keywords}\" />" if @meta.meta_keywords.present? %>
-  <%= "<meta name=\"description\" content=\"#{@meta.meta_description}\" />" if @meta.meta_description.present? -%>
+  <%= "<meta name=\"keywords\" content=\"#{h @meta.meta_keywords}\" />" if @meta.meta_keywords.present? %>
+  <%= "<meta name=\"description\" content=\"#{h @meta.meta_description}\" />" if @meta.meta_description.present? -%>
   <%= yield :head_libraries %>
   <%= yield :head %>
 </head>