refinerycms 0.9.5.31 → 0.9.6

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

@@ -1,14 +1,14 @@
 <%= f.hidden_field field %>
 <div>
-  <a id='current_resource_link' href="<%= insert_admin_resources_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=<%= "#{f.object.class.name.underscore.downcase}_#{field}" %><%= "&amp;current_link=#{resource.public_filename unless resource.nil?}" %>&amp;update_resource=current_resource&amp;update_text=current_resource_text&amp;callback=resource_changed&amp;KeepThis=true&amp;TB_iframe=true&amp;width=<%= width ||= 950 %>&amp;height=<%= height ||= 510 %>" style='border: 0px' title='Add <%= (description ||= "resource").titleize %>' name='Add <%= (description ||= "resource").titleize %>' class='thickbox'>
-    <span id='no_resource_selected' <%= "style='display: none;'" unless resource.nil? %>>
+  <a id='current_resource_link' href="<%= insert_admin_resources_url %>?thickbox=true&amp;modal=true&amp;titlebar=true&amp;field=<%= "#{f.object.class.name.underscore.downcase}_#{field}" %><%= "&amp;current_link=#{resource.public_filename if resource.present?}" %>&amp;update_resource=current_resource&amp;update_text=current_resource_text&amp;callback=resource_changed&amp;KeepThis=true&amp;TB_iframe=true&amp;width=<%= width ||= 950 %>&amp;height=<%= height ||= 510 %>" style='border: 0px' title='Add <%= (description ||= "resource").titleize %>' name='Add <%= (description ||= "resource").titleize %>' class='thickbox'>
+    <span id='no_resource_selected' <%= "style='display: none;'" if resource.present? %>>
       There is currently no <%= description ||= "resource" %> selected, click here to add one.
     </span>
   </a>
-  <div id='current_resource_container' <%= "style='display:none'" if resource.nil? %>>
+  <div id='current_resource_container' <%= "style='display:none'" unless resource.present? %>>
     Current <%= description ||= "resource" %>:
     <span id='current_resource_text'>
-      <%= "#{resource.title} (#{resource.public_filename})" unless resource.nil? %>
+      <%= "#{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 unless resource.nil?}",
@@ -24,20 +24,20 @@
 <% content_for :head do %>
   <script type='text/javascript'>
     resource_changed = function() {
-      $('current_resource_link').href = $('current_resource_link').href.gsub(/current_link=([^&])*&/, "current_link=" + $('current_resource').href + "&");
-      $('remove_resource').show();
-      $('current_resource_container').show();
-      $('no_resource_selected').hide();
+      $('#current_resource_link').attr('href', $('#current_resource_link').attr('href').replace(/current_link=([^&])*&/, "current_link=" + $('#current_resource').attr('href') + "&");
+      $('#remove_resource').show();
+      $('#current_resource_container').show();
+      $('#no_resource_selected').hide();
     }
 
-    FastInit.addOnLoad(function() {
-      $('remove_resource').observe('click', function(e) {
-        $('<%= f.object.class.name.underscore.downcase %>_<%= field %>').value = "";
-        $('current_resource_container').hide();
-        $('current_resource_text').innerHTML = '';
-        $('no_resource_selected').show();
-        $('current_resource_link').href = $('current_resource_link').href.gsub(/current_link=([^&])*&/, "current_link=&");
-        this.hide();
+    $(document).ready(function(e) {
+      $('#remove_resource').click(function(e) {
+        $('#<%= f.object.class.name.underscore.downcase %>_<%= field %>').value = "";
+        $('#current_resource_container').hide();
+        $('#current_resource_text').innerHTML = '';
+        $('#no_resource_selected').show();
+        $('#current_resource_link').attr('href', $('#current_resource_link').attr('href').replace(/current_link=([^&])*&/, "current_link=&");
+        $(this).hide();
         e.preventDefault();
       });
     });

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

@@ -1,10 +1,9 @@
 <input type='hidden' id='reorder_authenticity_token' name='reorder_authenticity_token' value='<%= form_authenticity_token %>'/>
 <% unless params[(list_id ||= "sortable_list").to_sym].blank? %>
   <script type='text/javascript'>
-    FastInit.addOnLoad(function()
-    {
-      enable_reordering();
+    $(document).ready(function(){
+      <%= "list_reorder.enable_reordering();" if (defined?(continue_reordering) ? continue_reordering : true) -%>
       init_tooltips();
     });
   </script>
-<% end %>
+<% end %>

data/vendor/plugins/refinery/lib/crud.rb

@@ -199,7 +199,7 @@ module Crud
             end
 
             find_all_#{plural_name}
-            render :partial => 'sortable_list', :layout => false
+            render :partial => 'sortable_list', :layout => false, :locals => {:continue_reordering => params[:continue_reordering]}
           end
 
           # takes in a single branch and saves the nodes inside it

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_singular_name.html.erb

@@ -8,7 +8,7 @@
            :title => 'Edit this <%= $title_name.downcase %>' %>
       <%%= link_to refinery_icon_tag("delete.png"), admin_<%= singular_name %>_path(<%= singular_name %>),
           :confirm => 'Are you sure you want to remove this <%= $title_name.downcase %> forever?',
-          :class => "cancel", :method => :delete,
+          :class => "cancel confirm-delete",
           :title => 'Remove this <%= $title_name.downcase %> forever' %>
     </span>
     <%%=h <%= singular_name %>.<%= attributes.first.name %> %> <span class="preview">&nbsp;</span>

data/vendor/plugins/refinery/lib/generators/refinery/templates/views/admin/_sortable_list.html.erb

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

data/vendor/plugins/refinery/plugins.md

@@ -2,23 +2,25 @@
 
 ## Introduction
 
-Refinery is designed to be easily extended so you can quickly customise your Refinery site to manage new areas you want to add to your site. If you see something you want to customise, the chances are you can customise it.
+__Refinery is designed to be easily extended so you can quickly customise your Refinery site to manage new areas you want to add to your site. If you see something you want to customise, the chances are you can customise it.__
 
 The main way of extending Refinery is through adding new plugins to your app. By default you can edit pages in Refinery's backend, but how do you add a new section to manage like products?
 
 ## The Refinery Generator
 
-The Refinery generator is a standard Rails generator that functions just like the scaffold generator. It allows you to quickly add new "tabs" to the Refinery backend and the front end views.
+The Refinery generator is a standard Rails generator that functions just like the scaffold generator. It allows you to quickly add new managed sections to the Refinery backend and get the front end views for free.
 
 To see how to use the generator run
 
     ruby script/generate refinery
+    
+Usage instructions should appear.
 
 ## Example of Using the Generator
 
-Let's say you have a client who has a range of products they want to show on their website.
+Let's say you have a client who has a range of products they want to show on their website. You've considered using a few pages to manage the products but you've decided it would be much nicer if there was a separate place that had forms dedicated to managing products.
 
-First decide what fields they need to manage. In our case the client is going to want to edit the title and description of each product. They would also like a little "facts panel" to show on the right of the page. 
+First decide what fields they need to manage. In our case, the client is going to want to edit the title and description of each product. They would also like a little "facts panel" to show on the right of the page. 
 
 So go to the root of your project and run
 
@@ -36,7 +38,7 @@ A new database migration has been added to add the products table in so run:
 
 Start up your app by running ``ruby script/server`` go to [http://localhost:3000](http://localhost:3000) and you'll see instantly a new menu item called "products". Click on that and you'll see there are no products yet.
 
-Now go to the backend of your site by visiting [http://localhost:3000/admin](http://localhost:3000/admin) and logging in. You'll see a new tab called "Products", click on that and then click "Add a new product", fill the form and to add an example product. Now go back to the front end and you'll see your product is showing up in the products part of your site.
+Now go to the backend of your site by visiting [http://localhost:3000/admin](http://localhost:3000/admin) and logging in. You'll see a new tab called "Products", click on that and then click "Add a new product", fill the form and add an example product. Now go back to the front end and you'll see your product is showing up in the products part of your site.
 
 Now you have a fully managed products section in Refinery, nice.
 
@@ -89,9 +91,9 @@ This bit is important. It's where all the controllers are held to manage pages i
 
     end
   
-This single controller allows us to create, read, update and delete pages in the backend. With a little bit of Refinery magic we utilise the crudify mixin which gives us all of these regular features out of the box.
+This single controller allows us to create, read, update and delete pages in the backend. With a little bit of Refinery magic we utilise the [crudify mixin](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/crud.md) which gives us all of these regular features out of the box.
 
-To read more about how crudify works, checkout the crudify.md file.
+How crudify works is an entire topic of it's own. Checkout the [crudify documentation](http://github.com/resolve/refinerycms/blob/master/vendor/plugins/refinery/crud.md) to get an insight into how that works.
 
 ### app/views and app/helpers
 
@@ -103,7 +105,7 @@ Works exactly the same as ``config/routes.rb`` in your app except this routes fi
 
 ### rails/init.rb
 
-This file runs when your site is started up. All is does is registers this plugin with Refinery so it knows that it exists, how to handle it in the Refinery admin menu and how to render recent activity on the Dashboard (see "Getting your plugin to report activity in the dashboard")
+This file runs when your site is started up. All is does is registers this plugin with Refinery so it knows that it exists, how to handle it in the Refinery admin menu and how to render recent activity on the Dashboard (see "Getting your Plugin to Report Activity in the Dashboard")
 
     Refinery::Plugin.register do |plugin|
       plugin.title = "Pages"
@@ -117,7 +119,7 @@ This file runs when your site is started up. All is does is registers this plugi
                          :updated_image => "page_edit.png"}
     end
   
-## Getting your plugin to report activity in the dashboard
+## Getting your Plugin to Report Activity in the Dashboard
   
 Recent activity reporting is built right in, so all you need to do is follow the convention below and your plugin will start showing up in the recent activity list of the Dashboard.
   
@@ -143,9 +145,12 @@ Here's what the different activity options mean:
     # the name of the class we're watching.
 
     :url_prefix
-    # when it says "'About Us' page was updated about 4 hours ago", the page title "About Us" 
-    # is linked to that page in a way we specify.  So by setting "_edit" as a :url_preview what
+    # Just use "_edit" if you're not sure how this works.
+    #
+    # When it says "'About Us' page was updated about 4 hours ago", the page title "About Us" 
+    # is linked to that page in a way we specify.  So by setting "_edit" as a :url_prefix what
     # we're doing is making it link to the page that allows us to edit this page.
+    # So the next result is edit_admin_page_url(page)
 
     :title
     # which attribute on the :class should be in the activty message. In our case it's "title"
@@ -158,7 +163,7 @@ Here's what the different activity options mean:
     # depending on how you want that to look. You can specify the filename to any image you 
     # want in the public/images/refinery/icons/ directory.
 
-## Improving the URLs
+## Search Engine Optimisation: Improving the default URLs
 
 In our example above we extended Refinery to manage a products area. The problem is when I look at a product on the front end I get a URL like [http://localhost:3000/products/1](http://localhost:3000/products/1) but I would really like it to be something like [http://localhost:3000/products/my-product](http://localhost:3000/products/my-product)
 
@@ -179,6 +184,8 @@ Now all the products in your database will have nice URLs.
 
 Refinery uses a standards compliant visual editor called [WYMeditor](http://www.wymeditor.org/)
 
+_Note: When using the Refinery generator, if you apply a field type of "text" to any of your fields, they automatically load as a WYMEditor._
+
 The WYSIWYG editor can only be applied to a ``textarea``. All you need to do is add a class of "wymeditor" to a ``textarea`` in your form and a WYSIWYG WYMEditor will load right in place.
 
 ### Example

data/vendor/plugins/refinery_dialogs/app/controllers/admin/dialogs_controller.rb

@@ -3,18 +3,20 @@ class Admin::DialogsController < Admin::BaseController
   layout 'admin_dialog'
 
   def show
-    unless (@dialog_type = params[:id]).blank?
+    @dialog_type = params[:id].try(:downcase)
+    
+    if @dialog_type
       @submit_button_text = "Insert"
 
       url_params = params.reject {|key, value| key =~ /(action)|(controller)/}
 
-      if @dialog_type.downcase.split("&")[0] == "image"
+      if @dialog_type == 'image'
         @iframe_src = insert_admin_images_url(:dialog => true)
-      elsif @dialog_type.downcase.split("&")[0] == "link"
+      elsif @dialog_type == 'link'
         @iframe_src = link_to_admin_pages_dialogs_url(url_params)
       end
 
-      render :layout => false#"admin_dialog"
+      render :layout => false #"admin_dialog"
 
     else
       render :nothing => true

data/vendor/plugins/refinery_dialogs/app/views/admin/dialogs/show.html.erb

@@ -1,12 +1,12 @@
-<form class='wym_dialog wym_dialog_<%= @dialog_type.downcase.split("&")[0] %>'>
+<form class='wym_dialog wym_dialog_<%= @dialog_type %>'>
   <input type='hidden' id='wym_dialog_type' class='wym_dialog_type' value='<%= @dialog_type %>' />
   <iframe src='<%= @iframe_src %>' id='dialog_frame' frameborder='0'></iframe>
   <div class='wym_hideables'>
-  <% if @dialog_type.downcase.split("&")[0] == "image" %>
+  <% if @dialog_type == "image" %>
     <input type='text' id='wym_src' class='wym_src' value='' size='40' />
     <input type='text' id='wym_alt' class='wym_alt' value='' size='40' />
     <input type='text' id='wym_title' class='wym_title' value='' size='40' />
-  <% elsif @dialog_type.downcase.split("&")[0] == "link" %>
+  <% elsif @dialog_type == "link" %>
     <input type='text' id='wym_href' class='wym_href' value='' size='40' />
     <input type='text' id='wym_title' class='wym_title' value='' size='40' />
     <input type='text' id='wym_target' class='wym_target' value='' size='40' />

data/vendor/plugins/refinery_dialogs/app/views/layouts/admin_dialog.html.erb

@@ -1,26 +1,19 @@
+<% use_caching = RefinerySetting.find_or_set(:use_resource_caching, false) -%>
 <!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">
   <head>
     <%= stylesheet_link_tag 'refinery/refinery' %>
-    <% unless local_request? %>
+    <% 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");
-        google.load("scriptaculous", "1.8.2");
+        google.load("jquery", "1.4");
+        google.load("jqueryui", "1.8");
       </script>
-    <% else %>
-      <%= javascript_include_tag "prototype", "scriptaculous" %>
     <% end %>
-    <%= javascript_include_tag "fastinit", "refinery/tooltips", "refinery/dialog" %>
+    <%= javascript_include_tag('jquery.js', 'jquery-ui-1.8rc1.min.js', :cache => (use_caching ? "cache/libraries" : false)) if !using_google_libs or local_request? %>
+    <%= javascript_include_tag 'refinery/admin', :cache => (use_caching ? "cache/admin_dialog" : false) %>
     <%= yield :head %>
-    <%= "<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 %>
-    <% if @flash %>
-    <script type='text/javascript'>
-      document.observe('dom:loaded', function() {
-        $('flash').appear();
-      });
-    </script>
-    <% end %>
+    <%= javascript_include_tag "http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js" if RefinerySetting.find_or_set(:show_firebug_lite, false) -%>
   </head>
   <body id='dialog_container' class='dialog'>
     <div id="flash_container">

data/vendor/plugins/refinery_settings/app/views/admin/refinery_settings/_refinery_setting.html.erb

@@ -5,7 +5,7 @@
            :title => 'Edit this setting' %>
       <%= link_to refinery_icon_tag("delete.png"), admin_refinery_setting_path(refinery_setting),
           :confirm => 'Are you sure you want to remove this setting forever?',
-          :class => "cancel", :method => :delete,
+          :class => "cancel confirm-delete",
           :title => 'Remove this setting forever' if refinery_setting.destroyable %>
     </span>
     <%=h refinery_setting.name.titleize %> <span class="preview">- <%=h truncate(refinery_setting.value.to_s, :length => 40) %></span>

data/vendor/plugins/refinery_settings/settings.md

@@ -2,4 +2,54 @@
 
 ![Refinery Settings](http://refinerycms.com/system/images/0000/0666/settings.png)
 
-need to add info in here about how to use a setting in your plugin.
+## About
+
+Refinery comes out of the box with a full settings area that is populated with smart defaults to avoid configuration.
+
+## Settings of Interest
+
+Here's an overview of what comes out of the box
+
+### Google Analytics
+
+Just edit the setting called "Analytics Page Code" and enter just your account number. It will look something like this
+
+    UA-XXXXXX-X
+    
+Save this and Refinery will automatically note you have set the page code up and start rendering it on the front end so tracking can begin.
+
+### Firebug Lite Support
+
+[Firebug lite](http://getfirebug.com/lite) is fantastic for debugging your site in Internet Explorer.
+
+Set the 'Show Firebug Lite' setting to ``true`` and you'll be able to debug your views in Internet Explorer in no time.
+
+_Note: you'll want to turn this off once your site is live_
+
+### Use Google Ajax Libraries
+
+This setting will automatically change your AJAX libraries to use the ones delivered by Google's CDN (Content Delivery Network) which means your Javascript will be cached and delivery as quickly as possible.
+
+## How do I Make my Own Settings?
+
+Settings can be really useful, especially when you have custom display logic or new plugins that need to behave in different ways.
+
+To best explain how settings work let's use an example.  Say you have a client who has a display in a local trade show every year and 2 months before the trade show they want to display a little banner in the header of all pages.
+
+But once the trade show is finsihed, the client needs to be able to hide it again until next year. This is what my ``application.html.erb`` file might look like:
+
+    ...
+    <div id='header'>
+      <h1>My Company</h1>
+      
+      <% if RefinerySetting.find_or_set(:show_trade_show_banner, false) %> 
+        <%= image_tag ('trade-show-banner.jpg') %>
+      <% end %>
+    </div>
+    ...
+    
+The following will automatically create a new Refinery setting called "show_trade_show_banner" and default it to ``false``. If that setting already exists, it just reads in what the current value is.
+
+So as you can see this is quite clever because you can quickly define new settings and their defaults right from the view as you need them.
+
+This setting would then show up in the backend in the 'Settings' area where the client could change the value as their trade show approaches. Easy as pie!

data/vendor/plugins/resources/app/controllers/admin/resources_controller.rb

@@ -1,9 +1,10 @@
 class Admin::ResourcesController < Admin::BaseController
 
   crudify :resource, :order => "updated_at DESC"
+  before_filter :init_dialog
 
   def new
-    @resource = Resource.new
+    @resource = Resource.new unless @resource.present?
 
     @url_override = admin_resources_url(:dialog => from_dialog?)
   end
@@ -20,6 +21,7 @@ class Admin::ResourcesController < Admin::BaseController
           render :text => "<script type='text/javascript'>parent.window.location = '#{admin_resources_url}';</script>"
         end
       else
+        self.new # important for dialogs
         render :action => 'new'
       end
     else
@@ -51,16 +53,8 @@ class Admin::ResourcesController < Admin::BaseController
 
   def insert
     self.new if @resource.nil?
-    @dialog = from_dialog?
-    @thickbox = !params[:thickbox].blank?
-    @field = params[:field]
-    @update_resource = params[:update_resource]
-    @update_text = params[:update_text]
-    @thumbnail = params[:thumbnail]
-    @callback = params[:callback]
-    @conditions = params[:conditions]
-    @current_link = params[:current_link]
-    @url_override = admin_resources_url(:dialog => @dialog, :insert => true)
+
+    @url_override = admin_resources_url(:dialog => from_dialog?, :insert => true)
 
     unless params[:conditions].blank?
       extra_condition = params[:conditions].split(',')
@@ -77,6 +71,17 @@ class Admin::ResourcesController < Admin::BaseController
 
 protected
 
+  def init_dialog
+    @thickbox = params[:thickbox].present?
+    @field = params[:field]
+    @update_resource = params[:update_resource]
+    @update_text = params[:update_text]
+    @thumbnail = params[:thumbnail]
+    @callback = params[:callback]
+    @conditions = params[:conditions]
+    @current_link = params[:current_link]
+  end
+
   def paginate_resources(conditions={})
     @resources = Resource.paginate   :page => (@paginate_page_number ||= params[:page]),
                                      :conditions => conditions,

data/vendor/plugins/resources/app/views/admin/resources/_form.html.erb

@@ -13,7 +13,7 @@
 
   <%= render :partial => "/shared/admin/form_actions", :locals => {:f => f, :continue_editing => false} %>
 
-  <% if @thickbox %>
+  <% if @thickbox -%>
     <input type='hidden' name='thickbox' value='<%= @thickbox %>' />
     <input type='hidden' name='field' value='<%= @field %>' />
     <input type='hidden' name='update_resource' value='<%= @update_resource %>' />
@@ -22,5 +22,12 @@
     <input type='hidden' name='callback' value='<%= @callback %>' />
     <input type='hidden' name='conditions' value='<%= @conditions %>' />
     <input type='hidden' name='current_link' value='<%= @current_link %>' />
-  <% end %>
+  <% end -%>
 <% end -%>
+<% content_for :head do %>
+  <script type='text/javascript'>
+    $(document).ready(function(){
+      link_dialog.init();
+    });
+  </script>
+<% end if from_dialog? %>

data/vendor/plugins/resources/app/views/admin/resources/_resource.html.erb

@@ -5,9 +5,7 @@
                           :title => "Download this file (#{number_to_human_size(resource.size)})" %>
       <%= link_to refinery_icon_tag('application_edit.png'), edit_admin_resource_url(resource),
                           :title => "Edit this file" %>
-      <%= link_to refinery_icon_tag('delete.png'), admin_resource_path(resource),
-                          :confirm => "Are you sure you want to delete '#{resource.title}'?",
-                          :class => "cancel",  :method => :delete,
+      <%= link_to refinery_icon_tag('delete.png'), admin_resource_path(resource), :class => "cancel confirm-delete",
                           :title => "Remove this file forever" %>
     </span>
     <%=h resource.title %>

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

@@ -4,7 +4,7 @@
       <%= render :partial => "/shared/admin/search", :locals => {:url => admin_resources_url} %>
     </li>
     <li>
-      <%= link_to "Upload New File", new_admin_resource_url, :class => "add_icon" %>
+      <%= link_to "Upload New File", new_admin_resource_url(:dialog => true, :width => 600, :height => 300), :class => "add_icon" %>
     </li>
   </ul>
 </div>
@@ -38,4 +38,4 @@
       </p>
     <% end -%>
   <% end %>
-</div>
+</div>

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

@@ -29,7 +29,11 @@
             </ul>
           </div>
         </div>
-        <%= will_paginate @resources, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;', :renderer => Refinery::LinkRenderer, :url => {:controller => "admin/resources", :action => "insert", :dialog => @dialog} unless @thickbox %>
+        <%= will_paginate @resources, 
+                          :previous_label => '&laquo; Previous', 
+                          :next_label => 'Next &raquo;', 
+                          :renderer => Refinery::LinkRenderer, 
+                          :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog?} unless @thickbox %>
       </div>
     <% end %>
     <div id='upload_resource_area' class='dialog_area' <%= "style='display:none;'" if @resources.empty? %>>
@@ -43,68 +47,18 @@
     or
     <%= link_to "Cancel", "", :id => "cancel_button", :class => "close_dialog" %>
 
-    <%= will_paginate @resources, :previous_label => '&laquo; Previous', :next_label => 'Next &raquo;', :renderer => Refinery::LinkRenderer, :url => {:controller => "admin/resources", :action => "insert", :dialog => @dialog } %>
+    <%= will_paginate @resources, 
+                          :previous_label => '&laquo; Previous', 
+                          :next_label => 'Next &raquo;', 
+                          :renderer => Refinery::LinkRenderer, 
+                          :url => {:controller => "admin/resources", :action => "insert", :dialog => from_dialog? } %>
   </div>
 <% end %>
+
 <% content_for :head do %>
-  <%= javascript_include_tag 'refinery/parse_url' %>
   <script type='text/javascript'>
-    set_resource = function(anchor)
-    {
-      if (anchor != null) {
-        $$('#existing_resource_area_content ul li.linked').each(function(linked)
-        {
-          $(linked).removeClassName('linked');
-        });
-        $(anchor.parentNode).addClassName('linked');
-      }
-    }
-
-    FastInit.addOnLoad(function()
-    {
-<% unless @resource_id.nil? %>
-      set_resource($('resource_<%= @resource_id %>'));
-<% end %>
-      $$('#existing_resource_area_content ul li a').each(function(anchor)
-      {
-        anchor.observe('click', function(e){set_resource(this);e.preventDefault()});
-      });
-
-<% if @thickbox %>
-      $('dialog-form-actions').down('#submit_button').observe('click', function(e)
-      {
-        linked = null;
-        $$('#existing_resource_area_content ul li.linked a').each(function(linked_anchor)
-        {
-          linked = linked_anchor;
-        });
-        if (linked != null)
-        {
-  <% unless @field.blank? %>
-          if ((field = parent.document.getElementById('<%= @field %>')) != null)
-          {
-            field.value = linked.id.replace("resource_", "");
-          }
-          if ((resource = parent.document.getElementById('<%= @update_resource %>')) != null)
-          {
-            resourceUrl = parseURL(linked.href);
-            relevant_href = resourceUrl.pathname;
-            // Add any alternate resource stores that need a absolute URL in the regex below
-            if( resourceUrl.hostname.match(/s3.amazonaws.com/) ) {
-              relevant_href = resourceUrl.protocol + '//' + resourceUrl.host + relevant_href;
-            }
-            resource.href = relevant_href;
-          }
-          if ((text = parent.document.getElementById('<%= @update_text %>')) != null) {
-            text.innerHTML = linked.innerHTML;
-          }
-  <% end %>
-          <%= "self.parent.#{@callback}();" unless @callback.blank? %>
-          self.parent.tb_remove();
-        }
-        e.stop();
-      });
-<% end %>
+    $(document).ready(function(){
+      link_dialog.init();
     });
   </script>
-<% end %>
+<% end %>