refinerycms 0.9.5.31 → 0.9.6

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

@@ -5,7 +5,7 @@
     "branch_start"
   end
 -%>
-<li class='clearfix record<%= " #{branch}" %>' id="<%= dom_id(page) -%>">
+<li class='record<%= " #{branch}" %>' id="<%= dom_id(page) -%>">
   <div class='clearfix'>
     <span class='actions'>
     <%= link_to refinery_icon_tag('application_go.png'), page.url, :target => "_blank",
@@ -13,17 +13,17 @@
     <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_page_path(page),
                  :title => "Edit this page" %>
     <%= link_to refinery_icon_tag('delete.png'), admin_page_path(page),
-                          :confirm => "Are you sure you want to delete '#{page.title}'?",
-                          :class => "cancel", :method => :delete,
-                          :title => "Remove this page forever" if page.deletable? %>
+                  :class => "cancel confirm-delete",
+                  :title => "Remove this page forever" if page.deletable? %>
     </span>
     <%= h page.title %> <%= "<em>(hidden)</em>" unless page.show_in_menu? %>
     <%= "<em>(draft)</em>" if page.draft? %>
   </div>
-  <ul<%= " class='#{page.children.empty? ? 'empty' : 'nested'}'" %>>
-  <% page.children.each do |child| %>
-    <%= render :partial => 'list', :locals => {:page => child} %>
+  <% unless (children = page.children).empty? %>
+    <ul<%= " class='nested'" %>>
+      <% children.each do |child| %>
+        <%= render :partial => 'list', :locals => {:page => child} %>
+      <% end %>
+    </ul>
   <% end %>
-    <span class='spacing'>&nbsp;</span>
-  </ul>
-</li>
+</li>

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

@@ -1,4 +1,4 @@
-<div class='page_part field' id='part_<%= title.downcase.gsub(" ", "_") %>'>
-  <%= hidden_field_tag "page[parts_attributes][#{part_index}][title]", title if new_part %>
-  <%= text_area_tag "page[parts_attributes][#{part_index}][body]", body, :rows => 20, :cols => 140, :class => 'wymeditor' %>
-</div>
+<div class='page_part field' id='<%= new_part ? "page_part_new_#{part_index}" : dom_id(part) %>'>
+  <%= hidden_field_tag "page[parts_attributes][#{part_index}][title]", part.title if new_part %>
+  <%= text_area_tag "page[parts_attributes][#{part_index}][body]", part.body, :rows => 20, :cols => 140, :class => 'wymeditor' %>
+</div>

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

@@ -1,4 +1,4 @@
 <% @pages.each do |page| %>
    <%= render :partial => 'list', :locals => {:page => page} %>
 <% end %>
-<%= render :partial => "/shared/admin/sortable_list" %>
+<%= render :partial => "/shared/admin/sortable_list", :locals => {:continue_reordering => (defined?(continue_reordering) ? continue_reordering : true)} %>

data/vendor/plugins/pages/pages.md

@@ -4,7 +4,7 @@
 
 ## About
 
-One core part of is Pages. Plugins such as news and inquiries hook to pages. The menu is rendered based off the structure of your pages.
+One core part of is Pages. Plugins such as News and Inquiries hook to pages. The menu is rendered based off the structure of your pages.
 
 Pages have one key thing about them that is unique - page parts.
 
@@ -12,25 +12,31 @@ Pages have one key thing about them that is unique - page parts.
 
 ![Refinery Page Parts](http://refinerycms.com/system/images/0000/0586/editing-page.png)
 
-### What are they
+### What are they?
 
 Think of a page part is a single piece of content on your page. At [Resolve Digital](http://www.resolvedigital.co.nz) we often simply use ``body`` and ``side_body``. One is for the main content and one is for the content which goes on a side bit of the page to display other information.
 
 ### Default Page Parts
 
-You can change what the default page parts are called or add more by editing the "Default Page Parts" setting. This is a serialize array of names. The default looks like this
+You can change what the default page parts are called or add more by editing the "Default Page Parts" setting. This is a serialized array of names. The default looks like this
 
     --- 
     - body
     - side_body
   
-Add more to this setting if you want more default page parts.
+Edit this setting to suit your taste.
 
-### Adding Page Parts for Specify Pages
+### Adding Page Parts for Specific Pages
 
-You can add extra page parts to your pages by setting the "New Page Parts" to ``true`` and editing the page you want to add a part to and clicked the little "+" icon.
+You can add extra page parts to your pages by setting the "New Page Parts" to ``true``.
 
-Note in the user-facing front end we call them "content sections" not "page parts".
+Now do this
+
+* Edit the page you want to add a part to
+* Click the little "+" icon up by the page part tabs
+* Type the name of your new part and hit add.
+
+_Note: in the user-facing front end we call them "content sections" not "page parts"._
 
 ## Page Options
 
@@ -44,36 +50,35 @@ There are three options for how the page title will be rendered on the front end
 
 * ``None``: will just default to the page title
 * ``Text``: allows you to have a different name for the page in the backend to the front end (sometimes good for SEO)
-* ``Image``: If you're designer is using a custom non-standard web font, this is ideal. Bang the image of your title right in there (_we don't recommend this though!_)
+* ``Image``: If your designer is using a custom non-standard web font, this is ideal. Bang the image of your title right in there (_we don't recommend this though! Standard web fonts are always a good idea_)
 
-### Show in menu
+### Show in Menu
 
-You can hide a page from the navigation if you like by unchecking "show in menu"
+You can hide a page from the navigation if you like by unchecking "show in menu". This is good for extra reference pages or even pages you might want to link someone up to directly but not "advertise" the pages existence on the menu.
 
 ### Custom URL
 
-This allows you to make your page not link to a normal page but make it show something else. This could be a donation link to a completely different site for example. Or as Refinery uses it, you might want to link to another plugin.
+This allows you to make your page not link to a normal page but make it show something else. This could be a donation link to a completely different site or as Refinery uses it, you might want to link to another plugin.
 
-The "contact us" page for example has a Custom URL of ``/inquiries/new`` because we want it to load the inquiries form from the inquiries plugin instead.
+The "contact us" page for example has a Custom URL of ``/inquiries/new``, this is because we want it to load the inquiries form from the inquiries plugin instead.
 
 ### WYMEditor (the visual editor)
 
 Refinery is backed by [WYMEditor](http://www.wymeditor.org/)
 
-It's a standards compliant editor that we've trimmed to only have what we feel is absolutely necessary. When you're editing the content is a page part you're using [WYMEditor](http://www.wymeditor.org/).
+It's a standards compliant editor that we've trimmed to only have what we feel is absolutely necessary. When you're editing the content in a page part you're using [WYMEditor](http://www.wymeditor.org/).
 
-You can also switch to "source" view and edit XHTML manually.
+You can also switch to "source" view and edit XHTML manually if the visual editor is not playing nice.
 
-### Custom selectable styles in WYMEditor
+### Custom Selectable Styles in WYMEditor
 
 ![Refinery Page Editor Styles](http://refinerycms.com/system/images/0000/0596/editing-page-style.png)
 
-Some sites require a little more than just your standard bold and heading controls. This is where the "css" style drop down comes in hand.
+Some sites require a little more than just your standard bold and heading controls. This is where the "css" style drop down comes in handy.
 
-It allows your customers to select a style you define. You need to edut/create a CSS file called ``theme.css``. You could have this in one of two places
+It allows your users to select a style you define. You need to edit/create a CSS file called ``theme.css``.
 
-1. ``/public/stylesheets/themes.css``
-2. ``/themes/your_theme_name/stylesheets/themes.css``
+This file should be located in ``/public/stylesheets/themes.css``
 
 Inside that file you define your styles like this
 
@@ -81,7 +86,7 @@ Inside that file you define your styles like this
       // apply your CSS rules here
     }
     
-For example if I wanted to add a style that allowed my users to highlight their text a light yellow colour I would put this
+For example, if I wanted to add a style that allowed my users to highlight their text a light yellow colour, I would put this
 
     .text-highlight-yellow {
       background: LightYellow;
@@ -97,7 +102,7 @@ Currently your ``admin.js`` file will have something like this
      ,  {name: 'font-size', rules:['small','normal','large'], join: '-'}
     ]
     
-Let's just breakdown a single WYMeditor class line and understand it:
+Let's just breakdown a single WYMeditor line and understand it:
 
     {name: 'font-size', rules:['small','normal','large'], join: '-'}
     
@@ -107,7 +112,7 @@ Let's just breakdown a single WYMeditor class line and understand it:
     .font-size-normal { // CSS rules here }
     .font-size-large { // CSS rules here }
     
-So going back to our text highlighting above we make the new style show up in the editor by changing our ``admin.js`` file to:
+So going back to our text highlighting style above, we make the new style show up in the editor by changing our ``admin.js`` file to:
 
     var wymeditorClassesItems = [
         {name: 'text-align', rules:['left', 'center', 'right', 'justify'], join: '-'}
@@ -122,7 +127,7 @@ So going back to our text highlighting above we make the new style show up in th
 
 ## Page Link dialog
 
-The link dialog lets you link in several different ways
+The link dialog lets you link in several different ways:
 
 * To an internal page
 * To an external page
@@ -135,7 +140,7 @@ Simply lets you select from an existing image found in the Images tab or upload
 
 ## Refinery Default Pages
 
-Some pages you have to keep in order for Refinery to fully function.
+Some pages you have to keep in order for Refinery to stay fully functional:
 
-* Page not found - the default 404 page, it's hidden from the navigation
+* Page not found - the default 404 page
 * Down for maintenance - renders when you're site is being updated.

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

@@ -7,22 +7,13 @@
   <% if (using_google_libs = RefinerySetting.find_or_set(:use_google_ajax_libraries, true)) and !local_request? -%>
     <script type='text/javascript' src="http://www.google.com/jsapi"></script>
     <script type='text/javascript'>
-      google.load("prototype", "1.6.1");
-      google.load("scriptaculous", "1.8.3");
-      google.load("jquery", "1.3");
+      google.load("jquery", "1.4");
+      google.load("jqueryui", "1.8");
     </script>
   <% end %>
-  <% if !using_google_libs or local_request? %>
-    <% if use_caching %>
-      <%= javascript_include_tag 'prototype', 'scriptaculous', 'builder', 'effects', 'dragdrop', 'controls', 'slider', 'jquery', :cache => "cache/libraries" %>
-    <% else %>
-      <%= javascript_include_tag 'prototype', 'scriptaculous', 'jquery' %>
-    <% end %>
-  <% end %>
-  <script type='text/javascript'>jQuery.noConflict();</script>
-  <%= javascript_include_tag 'admin' %>
-  <%= javascript_include_tag 'refinery/prototype.enhancements.js', 'fastinit', 'refinery/tooltips', 'livepipe', 'tabs', 'thickbox', "wymeditor/jquery.refinery.wymeditor.js", 'refinery/boot_wym', 'refinery/admin', :cache => (use_caching ? "cache/admin" : false) %>
-  <%= "<script type='text/javascript' src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>" if RefinerySetting.find_or_set(:show_firebug_lite, false) == true -%>
+  <%= javascript_include_tag 'jquery', 'jquery-ui-1.8rc1.min.js', :cache => (use_caching ? "cache/libraries" : nil) if !using_google_libs or local_request? %>
+  <%= javascript_include_tag 'admin', 'thickbox', 'wymeditor/jquery.refinery.wymeditor.js', 'refinery/boot_wym', 'refinery/admin', :cache => (use_caching ? "cache/admin" : false) %>
+  <%= javascript_include_tag "http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js" if RefinerySetting.find_or_set(:show_firebug_lite, false) -%>
   <%= "<script type='text/javascript'>jQuery(document).ready(function(){ jQuery('#flash').fadeIn(550); });</script>" unless flash.empty? -%>
   <%= yield :head %>
 </head>

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

@@ -8,7 +8,7 @@
     </li>
   <% end
   end -%>
-  <% if Refinery::Plugins.active.in_menu.size > 1 %>
+  <% if Refinery::Plugins.active.in_menu.size > 1 -%>
     <li>
       <%= link_to "&nbsp;", "", :id => "menu_reorder", :title => "Reorder menu" %>
       <%= link_to "&nbsp;", "", :id => "menu_reorder_done", :title => "I'm done reordering the menu", :style => "display: none;" %>
@@ -18,68 +18,6 @@
     <%= link_to "Log out", logout_url %>
   </li>
 </ul>
-<input type='hidden' id='admin_menu_reorder_authenticity_token' value='<%= form_authenticity_token %>' />
-<script type='text/javascript'>
-  disable_menu_reordering = function(e)
-  {
-    Sortable.destroy("menu");
 
-    menu = $('menu');
-    menu.removeClassName('reordering_menu');
+<input type='hidden' id='admin_authenticity_token' value='<%= form_authenticity_token %>' />
 
-    $('menu_reorder_done').hide();
-    $('menu_reorder').show();
-
-    [$('header').childElements().without(menu), $('content'), $('logout')].flatten().each(function(element) {
-      new Effect.Appear(element, { duration: 0.5});
-    });
-
-    $$('#menu li a').each(function(anchor) {
-      if (!anchor.id.startsWith("menu_reorder")) {
-        anchor.stopObserving('click');
-      }
-    });
-
-    e.stop();
-  }
-
-  enable_menu_reordering = function(e)
-  {
-    $('menu_reorder_done').show();
-    $('menu_reorder').hide();
-
-    menu = $('menu');
-    menu.addClassName('reordering_menu');
-
-    Sortable.create($('menu'), {
-      constraint: 'horizontal'
-      , only: 'tab'
-      , onUpdate:function() {
-        new Ajax.Request('<%= url_for :controller => "/admin", :action => "update_menu_positions" %>',
-        {
-          asynchronous:true
-          , evalScripts:true
-          , parameters: Sortable.serialize('menu') + '&authenticity_token=' + encodeURIComponent($('admin_menu_reorder_authenticity_token').value)
-        });
-      }
-    });
-
-    [$('header').childElements().without(menu), $('content'), $('logout')].flatten().each(function(element) {
-      new Effect.Fade(element, { duration: 0.5, from: 1, to: 0.2 });
-    });
-
-    $$('#menu li a').each(function(anchor) {
-      if (!anchor.id.startsWith("menu_reorder")) {
-        anchor.observe('click', function(e){e.stop();});
-      }
-    });
-
-    e.stop();
-  }
-
-  FastInit.addOnLoad(function()
-  {
-    $('menu_reorder').observe('click', enable_menu_reordering);
-    $('menu_reorder_done').observe('click', disable_menu_reordering);
-  });
-</script>

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

@@ -1,11 +1,5 @@
 <% flash.each do |key, value| %>
 <div id="flash" class="flash_<%= key %>" style='display: none;' >
   <%= value %> (<%= link_to "close", "", {:id => "flash_close"} %>)
-  <script type="text/javascript">
-     jQuery('#flash_close').click(function(e) {
-       jQuery('#flash').fadeOut({duration: 330});
-       e.preventDefault();
-     });
-  </script>
 </div>
 <% end %>

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

@@ -1,7 +1,2 @@
 <%= error_messages_for symbol %>
-<% fields = []; object.errors.each { |attrib, msg| fields << "#{object.class.name.underscore}_#{attrib}" } %>
-<script type='text/javascript'>
-  $$('#<%= fields.join("','#") %>').each(function(error_field) {
-    error_field.up('div.field').addClassName('fieldWithErrors').removeClassName('field');
-  });
-</script>
+<input type='hidden' id='fieldsWithErrors' value='<%= object.errors.collect { |attrib, msg| "#{object.class.name.underscore}_#{attrib}"}.join(",") %>' />

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

@@ -1,15 +1,13 @@
 <div class='form-actions'>
-  <%= f.submit 'Save', :id => "submit_button", :class => "wymupdate" %>
-
-  <% if (continue_editing ||= false and !f.object.new_record?) %>
+  <%= f.submit '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 ||= false) %>
+    <%= render :partial => "/shared/admin/continue_editing", :locals => {:f => f} -%>
+  <% end -%>
+  <% unless (hide_cancel ||= from_dialog?) -%>
     or
     <%= link_to "Cancel", (cancel_url ||= send("admin_#{f.object.class.name.pluralize.underscore}_url")),
           :title => (title ||= "Cancelling will lose all changes you've made to this #{f.object.class.name.underscore.gsub("_", " ")}"),
-          :id => "cancel_button", :class => "close_dialog" %>
-  <% end %>
-</div>
+          :id => "#{cancel_button_id ||= "cancel_button"}", :class => "close_dialog" %>
+  <% end -%>
+</div>

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

@@ -1,50 +1,34 @@
-<%= link_to "Show", "", :id => "current_image_toggler" if (toggle_image_display ||= false) %>
-<%= f.hidden_field field %>
-<div id='current_image_container'<%= " style='display: none'" if (toggle_image_display ||= false) %>>
-  <a id='current_image_link' href="<%= insert_admin_images_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=<%= f.object.class.name.underscore.downcase %>_<%= field %>&amp;update_image=current_picked_image&amp;callback=picked_image_changed&amp;thumbnail=&amp;KeepThis=true&amp;TB_iframe=true&amp;width=<%= width ||= 950 %>&amp;height=<%= height ||= 510 %>" style='border: 0px' title='Change <%= (description ||= "image").titleize %>' name='Change <%= (description ||= "image").titleize %>' class='thickbox'>
-    <% unless image.nil? %>
+<%
+  description ||= "image"
+  thumbnail ||= "medium"
+  toggle_image_display ||= false
+-%>
+<%= link_to "Show", "", :id => "current_image_toggler" if toggle_image_display -%>
+<%= f.hidden_field field, :id => 'custom_title_field' -%>
+
+<div id='current_image_container'<%= " style='display: none'" if toggle_image_display %> style="margin-top: 10px;">
+  <a id='current_image_link' href="<%= insert_admin_images_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=custom_title_field&amp;thumbnail=&amp;KeepThis=true&amp;TB_iframe=true&amp;width=958&amp;height=510" style='border: 0px' title='Change <%= description.titleize %>' name='Change <%= description.titleize %>' class='thickbox'>
+    <% unless image.nil? -%>
       <%= image_fu image, nil, {:class => "brown_border", :id => "current_picked_image"} %>
-    <% else %>
+    <% else -%>
       <img id="current_picked_image" class="" src="" alt="" style='display: none' />
-    <% end %>
+    <% end -%>
     <p id='no_picked_image_selected' <%= "style='display: none;'" unless image.nil? %>>
-      There is currently no <%= description ||= "image" %> selected, please click here to add one.
+      There is currently no <%= description %> selected, please click here to add one.
     </p>
   </a>
   <br/>
-  <%= link_to "Remove current #{description ||= "image"}", "", :id => "remove_picked_image", :style => "margin-top:8px;display:inline-block;width:auto;#{"display:none;" if image.nil?}" %>
+  <%= link_to "Remove current #{description}", "#", :id => "remove_picked_image", :style => "#{"display:none;" if image.nil?}" %>
 </div>
-<% content_for :head do %>
-  <script type='text/javascript'>
-    picked_image_changed = function()
-    {
-      $('remove_picked_image').show();
-      $('current_picked_image').show();
-      $('current_picked_image').addClassName('brown_border');
-      $('no_picked_image_selected').hide();
-    }
 
-    FastInit.addOnLoad(function() {
-      $('remove_picked_image').observe('click', function(e)
-      {
-        $('current_picked_image').removeClassName('brown_border');
-        $('current_picked_image').src = '';
-        $('current_picked_image').alt = 'There is currently no <%= description ||= "image" %> selected, please click here to add one.';
-        $('<%= f.object.class.name.underscore.downcase %>_<%= field %>').value = '';
-        $('current_picked_image').style.width = "auto";
-        $('current_picked_image').style.height = "auto";
-        $('no_picked_image_selected').show();
-        $('current_picked_image').hide();
-        this.hide();
-        e.stop();
-      });
-<% if toggle_image_display ||= false -%>
-      jQuery('#current_image_toggler').click(function(e){
-        jQuery(this).html((jQuery(this).html() == 'Show' ? 'Hide' : 'Show'));
-        jQuery("#current_image_container").toggle();
-        e.preventDefault();
+<% content_for :head do -%>
+  <script type='text/javascript'>
+    $(document).ready(function(){
+      image_picker.init({
+        thumbnail: '<%= thumbnail %>'
+        , toggle_image_display: <%= toggle_image_display.to_s %>
+        , description: '<%= description %>'
       });
-<% end -%>
     });
   </script>
 <% end %>

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

@@ -1,69 +1,10 @@
-<%
-  list_id ||= "sortable_list"
-  update_url ||= url_for(:action => "update_positions")
-  tree ||= false
-
-  content_for :head do
-%>
+<% content_for :head do -%>
 <script type='text/javascript'>
-  reordering_button_enabled = true;
-  FastInit.addOnLoad(function()
-  {
-    $('reorder_action').observe('click', enable_reordering);
-    $('reorder_action_done').observe('click', disable_reordering);
+  $(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();
   });
-
-  disable_reordering = function(e)
-  {
-    if (reordering_button_enabled) {
-      $('<%= list_id %>').removeClassName('reordering');
-
-      Sortable.destroy("<%= list_id %>");
-
-      $('reorder_action_done').hide();
-      $('reorder_action').show();
-    }
-    if (e) { e.stop(); }
-  }
-
-  enable_reordering = function(e)
-  {
-    sortable_list = $('<%= list_id %>');
-    sortable_list.addClassName('reordering');
-
-    nest_id = 0;
-    sortable_list.select('ul.nested').each(function(nested)
-    {
-      nested.id = nested.id.length > 0 ? nested.id : "nested_" + nest_id++;
-      Sortable.create(nested.id, {
-        constraint: <%= tree ? "false" : "'vertical'" %>
-        , hoverclass: 'hover'
-        , scroll: window
-        , tree: <%= tree %>
-      });
-    });
-
-    Sortable.create("<%= list_id %>", {
-      constraint: <%= tree ? "false" : "'vertical'" %>
-      , hoverclass: 'hover'
-      , scroll: window
-      , tree: <%= tree %>
-      , onUpdate:function() {
-        reordering_button_enabled = false;
-        new Ajax.Updater('<%= list_id %>', '<%= update_url %>',
-        {
-          asynchronous:true
-          , evalScripts:true
-          , parameters: Sortable.serialize('<%= list_id %>') + '&tree=<%= tree %>' + '&authenticity_token=' + encodeURIComponent($('reorder_authenticity_token').value)
-          , onComplete: function(e) { reordering_button_enabled = true; }
-        });
-      }
-    });
-
-    $('reorder_action').hide();
-    $('reorder_action_done').show();
-
-    if (e) { e.stop(); }
-  }
 </script>
 <% end %>