refinerycms 0.9.6.34 → 0.9.7

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

@@ -1,4 +1,4 @@
 <div id='header_content'>
-  <h1><%= link_to RefinerySetting[:site_name], root_url %></h1>
+  <h1><%= link_to RefinerySetting[:site_name], root_url(:only_path => true) %></h1>
   <%= render :partial => "/shared/menu" %>
 </div>

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

@@ -1,4 +1,5 @@
 <% if RefinerySetting.find_or_set(:ie6_upgrade_message_enabled, true) -%>
+  <% unless admin? %>
   <!--[if lte IE 6]>
     <div id="ie6msg_wrapper">
       <div id="ie6msg">
@@ -11,13 +12,52 @@
           </p>
           <p>
             If you want to you may also try some other popular and <strong>free</strong> Internet browsers like:<br/>
-            <a class="ie6expl" href="http://getfirefox.com" target='_blank'>Firefox</a>,
-            <a class="ie6expl" href="http://www.opera.com" target='_blank'>Opera</a>,
-            <a class="ie6expl" href="http://www.apple.com/safari/download/" target='_blank'>Safari</a> or
-            <a class="ie6expl" href="http://www.google.com/chrome" target='_blank'>Chrome</a>
+            <a class="ie6expl" href="http://www.google.com/chrome" target='_blank'>Google Chrome</a>,
+            <a class="ie6expl" href="http://www.apple.com/safari/download/" target='_blank'>Safari</a>,
+            <a class="ie6expl" href="http://getfirefox.com" target='_blank'>Firefox</a> or
+            <a class="ie6expl" href="http://www.opera.com" target='_blank'>Opera</a>
           </p>
         </div>
       </div>
     </div>
   <![endif]-->
+  <% else %>
+    <!--[if lte IE 8]>
+      <div id='upgrade_wrapper'>
+        <h2>Want to have a better experience with Refinery?</h2>
+        <p>
+          To get the best possible experience using Refinery, we recommend that you switch your web browser.
+        </p>
+        <p>
+          There are a number of web browsers available that will give you a better experience and they are all available <strong>free of charge</strong>. Installing a new web browser will not remove Internet Explorer which you will still be able to use when you need to.
+        </p>
+        <p>
+          <ul>
+            <li>
+              <a class="ie6expl" href="http://www.google.com/chrome" target='_blank'>Google Chrome</a>
+            </li>
+            <li>
+              <a class="ie6expl" href="http://www.apple.com/safari/download/" target='_blank'>Apple Safari</a>
+            </li>
+            <li>
+              <a class="ie6expl" href="http://getfirefox.com" target='_blank'>Mozilla Firefox</a>
+            </li>
+            <li>
+              <a class="ie6expl" href="http://www.opera.com" target='_blank'>Opera</a>
+            </li>
+          </ul>
+        </p>
+      </div>
+    <![endif]-->
+    <% content_for :head do %>
+      <script type='text/javascript'>
+        $(document).ready(function() {
+          $('#flash.flash_message:has("#upgrade_wrapper") #flash_close').click(function(e) {
+            e.preventDefault();
+            $.get('<%= admin_disable_upgrade_message_path %>');
+          });
+        });
+      </script>
+    <% end %>
+  <% end %>
 <% end -%>

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

@@ -0,0 +1,5 @@
+<div id="language_switcher">
+  <select onchange="location.href = this.options[this.selectedIndex].value;">
+    <%= options_for_select(Refinery::I18n.locales.collect { |key, value| [value.html_safe, url_for(params.dup.tap{ |p| p[:locale] = key })] }, :selected => request.path ) %>
+  </select>
+</div>

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

@@ -1,8 +1,17 @@
-<% cache(:action_suffix => RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")) do %>
-  <ul id='<%= dom_id ||= "menu" %>' class='menu clearfix'>
-    <%= render :partial => "/shared/menu_branch", :collection => (collection ||= @menu_pages), :locals => {
-      :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false),
-      :sibling_count => (collection ||= @menu_pages).size-1
-    } -%>
-  </ul>
-<% end %>
+<%
+cache("#{Refinery.base_cache_key}_#{RefinerySetting.find_or_set(:refinery_menu_cache_action_suffix, "site_menu")}_#{request.path}") do
+  if (collection ||= @menu_pages).any?
+-%>
+    <nav id='<%= dom_id ||= "menu" %>' class='<%= [css ||= "menu", 'clearfix'].join(' ') %>'>
+      <%= render :partial => "/shared/menu_branch",
+                 :collection => collection,
+                 :locals => {
+                   :hide_children => RefinerySetting.find_or_set(:menu_hide_children, false),
+                   :sibling_count => collection.size - 1
+                 }
+      -%>
+    </nav>
+<%
+  end
+end
+-%>

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

@@ -1,23 +1,21 @@
 <%
-  css = []
-  css << "selected" if selected_page?(menu_branch) or descendant_page_selected?(menu_branch)
-  css << "first" if menu_branch_counter == 0
-  css << "last" if menu_branch_counter == (sibling_count ||= menu_branch.shown_siblings.size)
-  domid = "item_#{menu_branch_counter}" unless menu_branch.parent_id.present? or menu_branch.title.blank?
+  css = (css = css_for_menu_branch(menu_branch, menu_branch_counter)).any? ? " class='#{css.join(' ')}'" : nil
+  dom_id = (menu_branch.parent_id.nil? and menu_branch.title.present?) ? " id='item_#{menu_branch_counter}'" : nil
 -%>
-<% if menu_branch.in_menu? %>
-  <li<%= " class='#{css.join(' ')}'" if css.present? -%><%= " id='#{domid}'" if domid.present? -%>>
-    <%= link_to menu_branch.title, menu_branch.url %>
-    <%
-      unless hide_children or
-        menu_branch.parent_id.present? or
-        (children = menu_branch.children.collect{|c| c if c.in_menu?}.compact).empty?
-    -%>
-      <ul class='clearfix'>
-        <%= render :partial => "/shared/menu_branch",
-                    :collection => children,
-                    :locals => {:hide_children => hide_children, :sibling_count => children.size-1} -%>
-      </ul>
-    <% end -%>
-  </li>
-<% end -%>
+<div<%= css -%><%= dom_id -%>>
+  <%= link_to menu_branch.title, menu_branch.url %>
+
+  <% unless hide_children or
+            menu_branch.parent_id.present? or
+            (children = menu_branch.children.reject{|c| !c.in_menu?}).empty? %>
+    <nav class='clearfix'>
+      <%=
+        render :partial => "/shared/menu_branch",
+               :collection => children,
+               :locals => {
+                 :hide_children => hide_children,
+                 :sibling_count => children.size - 1
+               } -%>
+    </nav>
+  <% end %>
+</div>

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

@@ -1,5 +1,10 @@
 <% flash.each do |key, value| %>
 <div id="flash" class="flash_<%= key %>" style='display: none;' >
-  <%= value %> (<%= link_to "close", "", {:id => "flash_close"} %>)
+  <%= value %>
+  <% if key.to_s == "message" %>
+    <%= link_to t('.close_this_message'), "", {:id => "flash_close"} %>
+  <% else %>
+    <%= link_to t('.close'), "", {:id => "flash_close"} %>
+  <% end %>
 </div>
 <% end %>

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

@@ -1,18 +1,41 @@
-<div id='site_bar'>
-  <div id='site_bar_content' class='clearfix'>
-    <div id='editor_switch'>
-      <% if admin? %>
-        <%= link_to "Switch to live view", "/" %>
-      <% else %>
-        <%= link_to "Switch to editor view", admin_root_url %>
+<% if refinery_user? %>
+
+  <% unless admin? or login? # jquery scripts should already be cached when using the site bar as login has happened. %>
+    <%= stylesheet_link_tag('refinery/site_bar') %>
+    <%= jquery_include_tags %>
+    <%= javascript_include_tag 'jquery/jquery.corner.js' %>
+    <script type='text/javascript'>
+      $(document).ready(function() {
+        logo = $('#site_bar_content #site_bar_refinery_cms_logo');
+        $(logo).css('left', ($('#site_bar_content').width() / 2) - ($(logo).width() / 2));
+        $('#editor_switch a').corner('6px').appendTo(
+          $('<span></span>').prependTo('#editor_switch').corner('6px')
+        );
+      });
+    </script>
+  <% end -%>
+
+  <div id='site_bar'>
+    <div id='site_bar_content' class='clearfix'>
+      <% unless login? %>
+        <div id='editor_switch'>
+          <%= site_bar_switch_link -%>
+        </div>
+      <% end %>
+      <%= link_to image_tag("#{"http://refinerycms.com/images/" unless local_request?}refinery/logo-site-bar.png",
+                  :alt => "Refinery (tm) Content Manager"), "http://refinerycms.com",
+                  :target => "_blank",
+                  :id => "site_bar_refinery_cms_logo" %>
+
+      <% unless login? %>
+        <div id='site_bar_branding'>
+          <span id='site_bar_company_name'>
+            <%= RefinerySetting[:site_name] %>
+          </span>
+
+          <%= link_to "Log out", logout_url(:only_path => true), :id => "logout" %>
+        </div>
       <% end %>
-    </div>
-    <div id='site_bar_branding'>
-      <%= RefinerySetting[:site_name] %>
-      <%= link_to image_tag("#{"http://refinerycms.com/images/" unless local_request?}refinery/logo-tiny.png",
-                    :alt => "Refinery (tm) Content Manager"), "http://refinerycms.com",
-                    :target => "_blank" %>
     </div>
   </div>
-</div>
-<%= stylesheet_link_tag('refinery/site_bar') %>
+<% end %>

data/vendor/plugins/refinery/app/views/shared/admin/_continue_editing.html.erb

@@ -1,4 +1,3 @@
 <% unless f.object.new_record? -%>
-  <%= hidden_field_tag :continue_editing, false %>
-  <%= f.submit 'Save &amp; Continue Editing', :id => "submit_continue_button", :class => "wymupdate" %>
+  <%= f.submit t('.save_and_continue_editing'), :id => "submit_continue_button", :class => "wymupdate button" %>
 <% end -%>

data/vendor/plugins/refinery/app/views/shared/admin/_form_actions.html.erb

@@ -1,15 +1,59 @@
-<div class='form-actions'>
-  <%= f.submit "#{submit_button_text ||= 'Save'}", :id => "#{submit_button_id ||= "submit_button"}", :class => "wymupdate" -%>
-  <% if (continue_editing ||= false and !f.object.new_record?) -%>
-    or
-    <%= render :partial => "/shared/admin/continue_editing", :locals => {:f => f} -%>
-  <% end -%>
-  <% unless (hide_cancel ||= from_dialog?) -%>
-    or
-    <%= link_to "#{cancel_button_text ||= 'Cancel'}",
-                (cancel_url ||= ((back=url_for(:back)).include?('javascript') ? send("admin_#{f.object.class.name.pluralize.underscore}_url") : back)),
-                :title => (title ||= "Cancelling will lose all changes you've made to this #{f.object.class.name.underscore.gsub("_", " ")}"),
-                :id => "#{cancel_button_id ||= "cancel_button"}",
-                :class => "close_dialog" %>
-  <% end -%>
+<%
+  submit_button_text ||= t('.save')
+  submit_button_id   ||= "submit_button"
+  submit_button_title ||= nil
+
+  cancel_button_text ||= t('.cancel')
+  cancel_title       ||= t('.cancel_lose_changes', :object_name => f.object.class.name.underscore.gsub("_", " "))
+  cancel_button_id   ||= "cancel_button"
+  hide_cancel        ||= from_dialog?
+  cancel_url         ||= (( back = url_for(:back)).include?('javascript') ? send("admin_#{f.object.class.name.pluralize.underscore}_url") : back) unless hide_cancel
+
+  delete_button_text ||= t('.delete')
+
+  continue_editing = defined?(continue_editing) ? continue_editing : (f.object.present? and !f.object.new_record?)
+
+  unless defined?(hide_delete).presence
+    hide_delete = (from_dialog? or
+                   f.object.nil? or f.object.new_record? or
+                   (f.object.respond_to?(:deletable?) && !f.object.deletable?))
+  end
+
+  unless hide_delete
+    delete_title       ||= nil
+    delete_button_id   ||= "delete_button"
+    delete_url         ||= eval("admin_#{f.object.class.name.underscore}_url(#{f.object.id})")
+  end
+-%>
+<div class='form-actions<%= ' form-actions-dialog' if from_dialog? %>'>
+  <div class='form-actions-left'>
+    <%= submit_tag submit_button_text,
+                   :id => submit_button_id,
+                   :class => "wymupdate button",
+                   :tooltip => submit_button_title %>
+
+    <%= render :partial => "/shared/admin/continue_editing", :locals => {:f => f} if continue_editing -%>
+    <%= hidden_field_tag :continue_editing, false %>
+
+    <%= link_to(cancel_button_text,
+                cancel_url,
+                :title => cancel_title,
+                :id => cancel_button_id,
+                :class => "close_dialog button") unless hide_cancel %>
+  </div>
+  <div class='form-actions-right'>
+    <%= link_to(delete_button_text,
+                delete_url,
+                :title => delete_title,
+                :id => delete_button_id,
+                :class => "button confirm-delete") unless hide_delete %>
+
+    <%= will_paginate paginate[:collection],
+                      :previous_label => '&laquo; ' + t('.previous'),
+                      :next_label => t('.next') + ' &raquo;',
+                      :renderer => Refinery::LinkRenderer,
+                      :url => paginate[:url] if ((paginate ||= {}).length > 0 &&
+                                                  paginate.keys.include?(:collection) &&
+                                                  paginate.keys.include?(:url)) %>
+  </div>
 </div>

data/vendor/plugins/refinery/app/views/shared/admin/_image_picker.html.erb

@@ -4,22 +4,23 @@
   toggle_image_display ||= false
   randomiser = rand(Time.now.yesterday.to_i * Time.now.to_i)
 -%>
-<%= link_to "Show", "", :id => "current_image_toggler_#{randomiser}" if toggle_image_display -%>
+<%= link_to t('.show'), "", :id => "current_image_toggler_#{randomiser}" if toggle_image_display %>
 <%= f.hidden_field field, :id => "current_image_id_#{randomiser}" -%>
 
 <div id='current_image_container_<%= randomiser %>'<%= " style='display: none'" if toggle_image_display %> style="margin-top: 10px;">
-  <a id='current_image_link_<%= randomiser %>' href="<%= insert_admin_images_url(:dialog => true, :callback => "image_picker_#{randomiser}_changed", :width => 958, :height => 510) %>" style='border: 0px' title='Change <%= description.titleize %>' name='Change <%= description.titleize %>' class='dialog'>
+<%# TODO translate update :what of .change %>
+  <a id='current_image_link_<%= randomiser %>' href="<%= insert_admin_images_url(:dialog => true, :callback => "image_picker_#{randomiser}_changed", :width => 958, :height => 510) %>" style='border: 0px' title='<%= t('.change', :what =>  description.titleize) %>' name='<%= t('.change', :what => description.titleize) %>' class='dialog'>
     <% unless image.nil? -%>
       <%= image_fu image, :medium, {:class => "brown_border", :id => "current_picked_image_#{randomiser}"} %>
     <% else -%>
       <img id="current_picked_image_<%= randomiser %>" class="" src="" alt="" style='display: none' />
     <% end -%>
-    <p id='no_picked_image_selected_<%= randomiser %>' <%= "style='display: none;'" if image.present? %>>
-      There is currently no <%= description %> selected, please click here to add one.
-    </p>
+    <span id='no_picked_image_selected_<%= randomiser %>' class='nothing_selected' <%= "style='display: none;'" if image.present? %>>
+      <%= t('.none_selected', :what => t('.' + description )) %>
+    </span>
   </a>
   <br/>
-  <%= link_to "Remove current #{description}", "#", :id => "remove_picked_image_#{randomiser}", :style => "#{"display:none;" if image.nil?}" %>
+  <%= link_to t('.remove_current', :what => t('.' + description )), "#", :id => "remove_picked_image_#{randomiser}", :style => "#{"display:none;" if image.nil?}" %>
 </div>
 
 <% content_for :head do -%>

data/vendor/plugins/refinery/app/views/shared/admin/_make_sortable.html.erb

@@ -1,10 +1,11 @@
-<% content_for :head do -%>
-<script type='text/javascript'>
-  $(document).ready(function(){
-    list_reorder.update_url     = '<%= update_url ||= url_for(:action => "update_positions") %>';
-    list_reorder.sortable_list  = $('#<%= list_id ||= "sortable_list" %>');
-    list_reorder.tree           = <%= tree ||= false %>;
-    list_reorder.init();
-  });
-</script>
+<% content_for :head_after_javascript_libraries, javascript_include_tag('jquery/jquery.nestedsortables.js') if (tree ||= false) %>
+<% content_for :head do %>
+  <script type='text/javascript'>
+    $(document).ready(function(){
+      list_reorder.update_url     = '<%= update_url ||= url_for(:action => "update_positions") %>';
+      list_reorder.sortable_list  = $('#<%= list_id ||= "sortable_list" %>');
+      list_reorder.tree           = <%= tree %>;
+      list_reorder.init();
+    });
+  </script>
 <% end %>

data/vendor/plugins/refinery/app/views/shared/admin/_resource_picker.html.erb

@@ -1,13 +1,16 @@
+<%# TODO: Move description ||= "resource" to top of file %>
 <%= f.hidden_field field %>
 <div>
-  <%= link_to "<span id='no_resource_selected' #{"style='display: none;'" if resource.present?}>
+  <%# TODO translate %>
+  <%= link_to "<span id='no_resource_selected' class='nothing_selected' #{"style='display: none;'" if resource.present?}>
         There is currently no #{description ||= resource} selected, click here to add one.
       </span>", insert_admin_resources_url(:dialog => true,
                   :update_resource => 'current_resource',
                   :update_text => 'current_resource_text',
                   :callback => 'resource_changed',
                   :field => "#{f.object.class.name.underscore.downcase}_#{field}",
-                  :current_link => "#{resource.public_filename if resource.present?}"),
+                  :current_link => "#{resource.public_filename if resource.present?}",
+                  :height => 480),
                 :name => "Add #{(description ||= 'resource').titleize}",
                 :id => "current_resource_link"
   %>
@@ -17,12 +20,12 @@
       <%= "#{resource.title} (#{resource.public_filename})" if resource.present? %>
     </span>
     <br/>
-    <%= link_to "#{refinery_icon_tag("page_white_put.png")} Download current #{description ||= "resource"} (<em>Opens in a new window</em>)", "#{resource.public_filename if resource.present?}",
+    <%= link_to "#{refinery_icon_tag("page_white_put.png")} #{t('.download_current', :what => t('.' + (description ||= "resource")))} (<em>#{t('.opens_in_new_window')}</em>)", "#{resource.public_filename if resource.present?}",
             :id => "current_resource",
             :target => "_blank" %>
   </div>
   <br/>
-  <%= link_to "Remove current #{description ||= "resource"}", "",
+  <%= link_to t('.remove_current', :what => t('.'+ (description ||= "resource"))), "",
                 :id => "remove_resource",
                 :style => "#{"display:none;" unless resource.present?}" %>
 </div>

data/vendor/plugins/refinery/app/views/shared/admin/_search.html.erb

@@ -1,5 +1,4 @@
-<form method="GET" action="<%= url %>">
-  Search
-  <input id="search" name="search" size="35" type="search" value="<%= params[:search] %>" />
-  <%= submit_tag 'Go', :name => "" %>
+<form method="GET" action="<%= url %>" class="search_fornm">
+  <input id="search" name="search" size="22" type="search" value="<%= params[:search] %>" />
+  <%= submit_tag t('admin.search'), :name => "" %>
 </form>

data/vendor/plugins/refinery/app/views/shared/admin/_sortable_list.html.erb

@@ -2,7 +2,7 @@
 <% unless params[(list_id ||= "sortable_list").to_sym].blank? %>
   <script type='text/javascript'>
     $(document).ready(function(){
-      <%= "list_reorder.enable_reordering();" if (defined?(continue_reordering) ? continue_reordering : true) -%>
+      <%= "list_reorder.enable_reordering();" if (defined?(continue_reordering) ? continue_reordering == "true" : true) %>
       init_tooltips();
     });
   </script>

data/vendor/plugins/refinery/app/views/welcome.html.erb

@@ -1,13 +1,11 @@
+<% content_for :header, t('.there_are_no_users') %>
 <p>
-  <strong>There are no users yet, so we'll set you up first.</strong>
+  <%=t('.remember_admin_location')%>
 </p>
 <p>
-  Remember your Refinery admin area is at:
+  <strong>http://<%= request.host %>/refinery</strong>
 </p>
 <p>
-  <strong>http://<%= request.host %>/admin</strong>
+  <%= t('.lets_start') %>
 </p>
-<p>
-  Alright, let's get you set up so you can log in...
-</p>
-<%= button_to "Continue...", new_user_url %>
+<%= button_to t('.continue'), new_user_url %>

data/vendor/plugins/refinery/app/views/wymiframe.html.erb

@@ -1,9 +1,17 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<!DOCTYPE html>
+<html>
   <head>
-    <%= "<meta http-equiv='X-UA-Compatible' content='IE-EmulateIE7' />" if request.env['HTTP_USER_AGENT'] =~ /MSIE/ %>
+    <% if request.env['HTTP_USER_AGENT'] =~ /MSIE/%>
+      <!--[if lt IE 9]>
+        <%= javascript_include_tag('http://html5shiv.googlecode.com/svn/trunk/html5.js') %>
+      <![endif]-->
+      <meta http-equiv='X-UA-Compatible' content='IE-EmulateIE7' />
+    <% end %>
     <title>WYMeditor</title>
-    <%= stylesheet_link_tag "wymeditor/skins/refinery/wymiframe", "formatting", "theme", :media => "all" %>
+    <%= stylesheet_link_tag "wymeditor/skins/refinery/wymiframe", :media => "all" %>
+    <%= stylesheet_link_tag "#{"/theme/stylesheets/" if RefinerySetting[:theme].present?}formatting", :media => "all" %>
+    <%= stylesheet_link_tag "theme", :media => "all" %>
   </head>
-  <body class="wym_iframe"></body>
+  <body class="wym_iframe<%= " #{params[:id]}" if params[:id].present? %>">
+  </body>
 </html>