atreides 2.0.3 → 2.0.4

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Lachlan Laycock, Chad Jackson, Harry Bernstein, Mathieu Ravaux, Jérémy Van de Wyngaert, William Alton, Adam Copeland, Benjamin Manns
+Copyright (c) Love the 88 LLC, 2012 Lachlan Laycock, Chad Jackson, Harry Bernstein, Mathieu Ravaux, Jérémy Van de Wyngaert, William Alton, Adam Copeland, Benjamin Manns
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

data/app/assets/javascripts/atreides/admin_base.js.erb

@@ -26,12 +26,6 @@ $.removeDiacriticalMarks = function(string) {
       }
   }
   pattern = new RegExp( "[" + pattern + "]", 'gi');
-  // return function(string) {
-  //     return string ? string.replace(pattern, function(char){
-  //         return char in map ? map[char] : char;
-  //     }) : string;
-  // };
-
   return string ? string.replace(pattern, function(char){
       return char in map ? map[char] : char;
   }) : string;
@@ -127,26 +121,27 @@ $(document).ready(function() {
   }
 
   // Post state drop-down
-  var state_select_css = '.post-states select, .page-states select, .product-states select'
-  var state_input_css = '#post_published_at_input, #page_published_at_input, #product_published_at_input'
-  var state_hidden_css = '.post-hidden input, .page-hidden input, .product-hidden input'
+  var stateSelect = 'select.publish-input',
+      stateInput = 'input.state-input',
+      dateInput = '.date-input'
   function update_state_select() {
-    $(state_input_css).hide()
+
+    $(dateInput).hide()
     switch(this.value) {
       case 'publish_now':
-        $(state_hidden_css).val("published");
+        $(stateInput).val("published");
         break;
       case 'published_at':
-        $(state_hidden_css).val("published");
-        $(state_input_css).show();
+        $(stateInput).val("published");
+        $(dateInput).show();
         break;
       default:
-        $(state_hidden_css).val(this.value);
+        $(stateInput).val(this.value);
         break;
     }
   }
-  $(state_select_css).change(update_state_select);
-  $(state_select_css).trigger('change'); // Make sure it shows correctly on load
+  $(stateSelect).on("change", update_state_select);
+  $(stateSelect).trigger('change'); // Make sure it shows correctly on load
 
   // Photo display types
   var photo_types = $(".photos-display-type input")

data/app/assets/stylesheets/atreides/admin_base.css.erb

@@ -1550,9 +1550,8 @@ fieldset.actions a {
   box-shadow:none;
 }
 
-fieldset.actions .create,
-fieldset.actions input:not([type="checkbox"]):not([type="radio"]):not([type="file"]).create,
-fieldset.actions input:not([type="checkbox"]):not([type="radio"]):not([type="file"]).update {
+
+fieldset.actions button[type="submit"] {
   color:#5D9A25;
 }
 

data/app/controllers/atreides/admin_controller.rb

@@ -26,15 +26,29 @@ class Atreides::AdminController < Atreides::ApplicationController
 
   before_filter :set_date, :only => [:index, :filter]
   before_filter :set_expires, :only => [:analytics]
+
   around_filter :cache, :only => [:analytics]
   skip_before_filter :verify_authenticity_token, :only => [:analytics]
   after_filter :set_last_modified
   before_filter :set_resource_request_name
 
+  before_filter :determine_timezone, :only => [:update, :create]
+  after_filter :reset_timezone, :only => [:update, :create]
+
   layout 'admin'
 
   private
 
+  def determine_timezone
+    if params[@resource_request_name.to_sym].key?(:time_zone)
+      Time.zone = params[@resource_request_name.to_sym][:time_zone] || Atreides::TimeZone::DEFAULT
+    end
+  end
+
+  def reset_timezone
+    Time.zone = Atreides::TimeZone::DEFAULT
+  end
+
   def set_resource_request_name
     @resource_request_name = self.resources_configuration[:self][:request_name]
   end

data/app/models/atreides/{preferences.rb → preference.rb}

@@ -1,4 +1,4 @@
-class Atreides::Preferences < Atreides::Base
+class Atreides::Preference < Atreides::Base
 
   #
   # Constants

data/app/views/admin/atreides/common/_sidebar_publish.html.haml

@@ -0,0 +1,16 @@
+- selected = (resource.pending? || resource.published?) ? (resource.published_at? ? :published_at : :published_now) : resource.state.to_sym
+- timezone = resource.time_zone || Atreides::TimeZone::DEFAULT
+- resource.published_at = (resource.published_at || Time.now).in_time_zone(timezone)
+- label = resource.published_at.past? ? "Published on: " : "Will be published on:"
+= f.input :state, :as => "select", :collection => resource.states_for_select, :selected => selected, :include_blank => false, :wrapper_html => { :class => "post-states" }, :input_html => {:class => "publish-input"}
+= f.input :state, :as => "hidden", :wrapper_html => { :class => "post-hidden" }, :input_html => {:class => "state-input"}
+.date-input{:style => "padding-bottom: 15px"}
+  = f.input :published_at, :label => label, :as => "string", :wrapper_html => { :class => "date-input date-picker", :style => "display:#{selected==:published_at ? 'block' : 'none'}"}
+  - unless defined?(no_timezone) && no_timezone == true
+    - resource_name = resource.class.name.split("::").last.underscore
+    - selected_timezone = resource.time_zone || "newyork"
+    %label Select Time Zone:
+    - Atreides::TimeZone::ZONES.each do |zone|
+      .input.radio
+        %input{:type => "radio", :name => "#{resource_name}[time_zone]", :value => zone, :id => "#{resource_name}_time_zone_#{zone.parameterize}", :checked => zone == selected_timezone}
+        %label{:for => "#{resource_name}_time_zone_#{zone.parameterize}"}= zone

data/app/views/admin/atreides/features/_form.html.haml

@@ -1,15 +1,15 @@
 = render :partial => 'admin/edit_head_content'
-= semantic_form_for @feature, :url => (@feature.new_record? ? admin_features_path : admin_feature_path(@feature)), :as => "feature" do |f|
+= semantic_form_for resource, :url => (resource.new_record? ? admin_features_path : admin_feature_path(resource)), :as => "feature" do |f|
 
   #form_content{:class => "span-17"}
     %h2= ttt("#{params[:action].to_s}_feature").html_safe
-    = error_messages_for :resource, :header_message => ttt(:validation_error_header, :model => @feature.class.to_s.demodulize),  :message => ttt(:validation_error_message)
+    = error_messages_for :resource, :header_message => ttt(:validation_error_header, :model => resource.class.to_s.demodulize),  :message => ttt(:validation_error_message)
     = f.semantic_errors
     = f.inputs do
       = f.input :title, :input_html => { :class => "title" }
       %li.photos-upload
         %label #{ttt :'.photo'}
-        = multi_file_uploader(:url => admin_feature_photo_path((@feature.new_record? ? '-' : @feature), :format => :js), :css_parent_class => "photos-upload", :resource_type => "feature")
+        = multi_file_uploader(:url => admin_feature_photo_path((resource.new_record? ? '-' : resource), :format => :js), :css_parent_class => "photos-upload", :resource_type => "feature")
         .clear
       %li.photos-choose
         %label #{ttt :'.existing_post'}
@@ -19,10 +19,10 @@
       %li.photo
         #feature_photo.media-list
           %ul#feature_photo_ul
-            - if @feature.photo
-              = photo_for_assoc(@feature.photo, @feature, "photos_list")
-            - elsif @feature.post && @feature.video
-              = image_tag @feature.video.thumb_url
+            - if resource.photo
+              = photo_for_assoc(resource.photo, resource, "photos_list")
+            - elsif resource.post && resource.video
+              = image_tag resource.video.thumb_url
 
         #feature_post_browser{:style => 'display:none;'}
           .close= link_to_function 'close', "$('#feature_post_browser').hide();$(this).find('.archives').remove()"
@@ -37,24 +37,17 @@
       %li.cancel
         = link_to ttt(:back), admin_features_path, :class => "cancel"
       %li.delete
-        = link_to ttt(:delete), admin_feature_path(@feature), :class => "cancel", :confirm => ttt(:are_you_absolutely_sure), :method => "delete" unless @feature.new_record?
+        = link_to ttt(:delete), admin_feature_path(resource), :class => "cancel", :confirm => ttt(:are_you_absolutely_sure), :method => "delete" unless resource.new_record?
 
   #form_sidebar{:class => "sidebar span-6 last"}
     = f.inputs do
-      - selected = (@feature.pending? || @feature.published?) ? (@feature.published_at? ? :published_at : :published_now) : @feature.state.to_sym
-
-      - @feature.published_at = (@feature.published_at || Time.now).in_time_zone # Needed to show time in user's TZ
-      - label = @feature.published_at.past? ? "Published on: " : "Will be published on:"
-
-      = f.input :state, :as => "select", :collection => @feature.states_for_select, :selected => selected, :include_blank => false, :wrapper_html => { :class => "post-states" }
-      = f.input :state, :as => "hidden", :wrapper_html => { :class => "post-hidden" }
-      = f.input :published_at, :label => label, :as => "string", :wrapper_html => { :class => "date-picker", :style => "display:#{selected==:published_at ? 'block' : 'none'}"}
+      = render(:partial => "/admin/atreides/common/sidebar_publish", :locals => {:f => f})
 
       - if defined?(Settings.tags.posts.features)
         %li{:class => "features-tag-group tag-picker"}
           %label #{ttt :'.location'}
           %ul
             - Settings.tags.posts.features.each do |tag|
-              %li.machine_tag.feature_tag{:class => @feature.tag_list.include?(tag) ? "selected" : "" }
-                = radio_button_tag 'feature[tag_list][]', tag, @feature.tag_list.include?(tag)
+              %li.machine_tag.feature_tag{:class => resource.tag_list.include?(tag) ? "selected" : "" }
+                = radio_button_tag 'feature[tag_list][]', tag, resource.tag_list.include?(tag)
                 = tag.humanize.titleize

data/app/views/admin/atreides/pages/_form.html.haml

@@ -20,10 +20,7 @@
 
   #form_sidebar{:class => "sidebar span-6 last"}
     = f.inputs do
-      - selected = (resource.pending? || resource.published?) ? (resource.published_at? ? :published_at : :publish_now) : resource.state.to_sym
-      = f.input :state, :as => "select", :collection => resource.states_for_select, :selected => selected, :include_blank => false, :wrapper_html => { :class => "post-states" }
-      = f.input :state, :as => "hidden", :wrapper_html => { :class => "page-hidden" }
-      = f.input :published_at, :label => ttt(:'.publish_on'), :as => "string", :wrapper_html => { :class => "date-picker" }
+      = render(:partial => "/admin/atreides/common/sidebar_publish", :locals => {:f => f})
       = f.input :parent_id, :as => "select", :label => ttt(:'.parent'), :wrapper_html => { :class => "parent-picker" }, :collection => Atreides::Page.published.all.map{|p| [p.title, p.id]}
       = f.input :tag_list, :label => ttt(:'.tags'), :as => "text", :wrapper_html => { :class => "tag-picker" }
       = f.input :slug, :label => ttt(:'.custom_url'), :as => "underline", :prefix => "/", :hint => ttt(:".leave_blank_to_create_automatically"), :wrapper_html => { :class => "underlined-input" }

data/app/views/admin/atreides/posts/_form_sidebar.html.haml

@@ -20,14 +20,7 @@
             },
           }); })
 
-    - selected = (resource.pending? || resource.published?) ? (resource.published_at? ? :published_at : :publish_now) : resource.state.to_sym
-
-    - resource.published_at = (resource.published_at || Time.now).in_time_zone # Needed to show time in user's TZ
-    - label = (resource.published_at.past? ? tt(:'.published_on') : tt('.will_be_published_on')) + ": "
-
-    = f.input :state, :as => "select", :collection => resource.states_for_select, :selected => selected, :include_blank => false, :wrapper_html => { :class => "post-states" }
-    = f.input :state, :as => "hidden", :wrapper_html => { :class => "post-hidden" }
-    = f.input :published_at, :label => label, :as => "string", :wrapper_html => { :class => "date-picker", :style => "display:#{selected==:published_at ? 'block' : 'none'}"}
+    = render(:partial => "/admin/atreides/common/sidebar_publish", :locals => {:f => f})
 
     / Tags
     - if defined?(Settings.tags.posts.groups)

data/app/views/admin/common/_list_table.html.haml

@@ -0,0 +1,30 @@
+- records ||= []
+- class_obj ||= records.first.class
+- record_name = class_obj.to_s.underscore
+- ignore_cols ||= []
+- ignore_cols.uniq!
+- action_cols ||= %w(show edit destroy)
+- nosort_cols ||= []
+- list_cols ||= class_obj.column_names
+- cols_hash = class_obj.columns_hash
+- record_param = record_name.pluralize.parameterize('_')
+- list_id ||= "sortable_table"
+
+%table{:id => "#{record_param}_list_#{records.object_id}", :class => "remote_sort_table sort_table #{record_param}_table", :cellspacing => 0, :cellpadding => 0}
+  %thead
+    %tr
+      - list_cols.each do |col|
+        - next if cols_hash[col] and cols_hash[col].primary
+        - next if ignore_cols.include?(col)
+        - field_func = "#{col}_column"
+        - label_func = "#{col}_label"
+        %th{:class => "#{sort_col(cols_hash[col])} #{"sort#{params[:dir]}" if params[:sort]==col} #{"sortcol" unless nosort_cols.include?(col)}"}
+          = self.respond_to?(label_func) ? send(label_func, col) : ttt(col.to_s)
+      - unless action_cols.empty?
+        %th.nosort.actions{:colspan => action_cols.size}
+          = image_tag("atreides/blank.gif")
+  %tbody{:id => list_id}
+    = render :partial => 'admin/common/list_table_row', :collection => records, :as => :record, :locals => { :list_cols => list_cols, :cols_hash => cols_hash, :ignore_cols => ignore_cols, :action_cols => action_cols, :record_name => record_name }
+
+.pagination
+  = will_paginate records if records.respond_to? :total_pages

data/app/views/admin/common/_list_table_row.html.haml

@@ -0,0 +1,11 @@
+%tr{:class => cycle('even','odd'), :id => record.dom_id('tablerow')}
+  - list_cols.each do |col|
+    - next if cols_hash[col] and cols_hash[col].primary
+    - next if ignore_cols.include?(col)
+    - field_func = "#{col}_column"
+    %td{:class => field_func}
+      = content_tag(:span, (self.respond_to?(field_func) ? send(field_func, record) : record.send(col)))
+  - action_cols.each do |action|
+    - action_func = "#{action}_link"
+    %td.action_link
+      = self.respond_to?(action_func) ? send(action_func, record) : action_link(action, record, record_name)

data/app/views/admin/common/_pagination.html.haml

@@ -0,0 +1 @@
+= will_paginate collection, :container => false, :inner_window => 2, :outer_window => 1, :params => {:query => params[:query]}

data/app/views/admin/common/_search_form.html.haml

@@ -0,0 +1,4 @@
+.search-form{:style => "float:right;clear:none;margin-left:0.5em;"}
+  = form_tag "", :method => "get", :class => "auto-hide-text" do
+    = link_to ttt(:'.reset'), url_for(:controller => params[:controller], :action => controller.action_name), :class => "submit_btn", :style => "float:right;clear:none;margin-left:0.5em;"
+    = text_field_tag :search, (params[:search] || "Search...")

data/lib/assets/images/atreides/share/license.txt

@@ -0,0 +1,9 @@
+If you use these icons, please place an attribution link to komodomedia.com. Social Network Icon Pack by Rogie King is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License (http://creativecommons.org/licenses/by-nc-sa/3.0/). 
+
+Based on a work at www.komodomedia.com.
+
+More rad downloads can be found at http://www.komodomedia.com/download/
+
+Feelin' the love? Donate to Paypal: rogie@komodomedia.com
+
+I claim no right of ownership to the respective company logos and glyphs in each one of these icons.

data/lib/assets/javascripts/atreides/facebox.js

@@ -0,0 +1,309 @@
+/*
+ * Facebox (for jQuery)
+ * version: 1.3
+ * @requires jQuery v1.2 or later
+ * @homepage https://github.com/defunkt/facebox
+ *
+ * Licensed under the MIT:
+ *   http://www.opensource.org/licenses/mit-license.php
+ *
+ * Copyright Forever Chris Wanstrath, Kyle Neath
+ *
+ * Usage:
+ *
+ *  jQuery(document).ready(function() {
+ *    jQuery('a[rel*=facebox]').facebox()
+ *  })
+ *
+ *  <a href="#terms" rel="facebox">Terms</a>
+ *    Loads the #terms div in the box
+ *
+ *  <a href="terms.html" rel="facebox">Terms</a>
+ *    Loads the terms.html page in the box
+ *
+ *  <a href="terms.png" rel="facebox">Terms</a>
+ *    Loads the terms.png image in the box
+ *
+ *
+ *  You can also use it programmatically:
+ *
+ *    jQuery.facebox('some html')
+ *    jQuery.facebox('some html', 'my-groovy-style')
+ *
+ *  The above will open a facebox with "some html" as the content.
+ *
+ *    jQuery.facebox(function($) {
+ *      $.get('blah.html', function(data) { $.facebox(data) })
+ *    })
+ *
+ *  The above will show a loading screen before the passed function is called,
+ *  allowing for a better ajaxy experience.
+ *
+ *  The facebox function can also display an ajax page, an image, or the contents of a div:
+ *
+ *    jQuery.facebox({ ajax: 'remote.html' })
+ *    jQuery.facebox({ ajax: 'remote.html' }, 'my-groovy-style')
+ *    jQuery.facebox({ image: 'stairs.jpg' })
+ *    jQuery.facebox({ image: 'stairs.jpg' }, 'my-groovy-style')
+ *    jQuery.facebox({ div: '#box' })
+ *    jQuery.facebox({ div: '#box' }, 'my-groovy-style')
+ *
+ *  Want to close the facebox?  Trigger the 'close.facebox' document event:
+ *
+ *    jQuery(document).trigger('close.facebox')
+ *
+ *  Facebox also has a bunch of other hooks:
+ *
+ *    loading.facebox
+ *    beforeReveal.facebox
+ *    reveal.facebox (aliased as 'afterReveal.facebox')
+ *    init.facebox
+ *    afterClose.facebox
+ *
+ *  Simply bind a function to any of these hooks:
+ *
+ *   $(document).bind('reveal.facebox', function() { ...stuff to do after the facebox and contents are revealed... })
+ *
+ */
+(function($) {
+  $.facebox = function(data, klass) {
+    $.facebox.loading()
+
+    if (data.ajax) fillFaceboxFromAjax(data.ajax, klass)
+    else if (data.image) fillFaceboxFromImage(data.image, klass)
+    else if (data.div) fillFaceboxFromHref(data.div, klass)
+    else if ($.isFunction(data)) data.call($)
+    else $.facebox.reveal(data, klass)
+  }
+
+  /*
+   * Public, $.facebox methods
+   */
+
+  $.extend($.facebox, {
+    settings: {
+      opacity      : 0.2,
+      overlay      : true,
+      loadingImage : '/images/loading.gif',
+      closeImage   : '/images/closelabel.png',
+      imageTypes   : [ 'png', 'jpg', 'jpeg', 'gif' ],
+      faceboxHtml  : '\
+    <div id="facebox" style="display:none;"> \
+      <div class="popup"> \
+        <div class="content"> \
+        </div> \
+        <a href="#" class="close"></a> \
+      </div> \
+    </div>'
+    },
+
+    loading: function() {
+      init()
+      if ($('#facebox .loading').length == 1) return true
+      showOverlay()
+
+      $('#facebox .content').empty().
+        append('<div class="loading"><img src="'+$.facebox.settings.loadingImage+'"/></div>')
+
+      $('#facebox').show().css({
+        top:	getPageScroll()[1] + (getPageHeight() / 10),
+        left:	$(window).width() / 2 - ($('#facebox .popup').outerWidth() / 2)
+      })
+
+      $(document).bind('keydown.facebox', function(e) {
+        if (e.keyCode == 27) $.facebox.close()
+        return true
+      })
+      $(document).trigger('loading.facebox')
+    },
+
+    reveal: function(data, klass) {
+      $(document).trigger('beforeReveal.facebox')
+      if (klass) $('#facebox .content').addClass(klass)
+      $('#facebox .content').empty().append(data)
+      $('#facebox .popup').children().fadeIn('normal')
+      $('#facebox').css('left', $(window).width() / 2 - ($('#facebox .popup').outerWidth() / 2))
+      $(document).trigger('reveal.facebox').trigger('afterReveal.facebox')
+    },
+
+    close: function() {
+      $(document).trigger('close.facebox')
+      return false
+    }
+  })
+
+  /*
+   * Public, $.fn methods
+   */
+
+  $.fn.facebox = function(settings) {
+    if ($(this).length == 0) return
+
+    init(settings)
+
+    function clickHandler() {
+      $.facebox.loading(true)
+
+      // support for rel="facebox.inline_popup" syntax, to add a class
+      // also supports deprecated "facebox[.inline_popup]" syntax
+      var klass = this.rel.match(/facebox\[?\.(\w+)\]?/)
+      if (klass) klass = klass[1]
+
+      fillFaceboxFromHref(this.href, klass)
+      return false
+    }
+
+    return this.bind('click.facebox', clickHandler)
+  }
+
+  /*
+   * Private methods
+   */
+
+  // called one time to setup facebox on this page
+  function init(settings) {
+    if ($.facebox.settings.inited) return true
+    else $.facebox.settings.inited = true
+
+    $(document).trigger('init.facebox')
+    makeCompatible()
+
+    var imageTypes = $.facebox.settings.imageTypes.join('|')
+    $.facebox.settings.imageTypesRegexp = new RegExp('\\.(' + imageTypes + ')(\\?.*)?$', 'i')
+
+    if (settings) $.extend($.facebox.settings, settings)
+    $('body').append($.facebox.settings.faceboxHtml)
+
+    var preload = [ new Image(), new Image() ]
+    preload[0].src = $.facebox.settings.closeImage
+    preload[1].src = $.facebox.settings.loadingImage
+
+    $('#facebox').find('.b:first, .bl').each(function() {
+      preload.push(new Image())
+      preload.slice(-1).src = $(this).css('background-image').replace(/url\((.+)\)/, '$1')
+    })
+
+    $('#facebox .close')
+      .click($.facebox.close)
+      .append('<img src="'
+              + $.facebox.settings.closeImage
+              + '" class="close_image" title="close">')
+  }
+
+  // getPageScroll() by quirksmode.com
+  function getPageScroll() {
+    var xScroll, yScroll;
+    if (self.pageYOffset) {
+      yScroll = self.pageYOffset;
+      xScroll = self.pageXOffset;
+    } else if (document.documentElement && document.documentElement.scrollTop) {	 // Explorer 6 Strict
+      yScroll = document.documentElement.scrollTop;
+      xScroll = document.documentElement.scrollLeft;
+    } else if (document.body) {// all other Explorers
+      yScroll = document.body.scrollTop;
+      xScroll = document.body.scrollLeft;
+    }
+    return new Array(xScroll,yScroll)
+  }
+
+  // Adapted from getPageSize() by quirksmode.com
+  function getPageHeight() {
+    var windowHeight
+    if (self.innerHeight) {	// all except Explorer
+      windowHeight = self.innerHeight;
+    } else if (document.documentElement && document.documentElement.clientHeight) { // Explorer 6 Strict Mode
+      windowHeight = document.documentElement.clientHeight;
+    } else if (document.body) { // other Explorers
+      windowHeight = document.body.clientHeight;
+    }
+    return windowHeight
+  }
+
+  // Backwards compatibility
+  function makeCompatible() {
+    var $s = $.facebox.settings
+
+    $s.loadingImage = $s.loading_image || $s.loadingImage
+    $s.closeImage = $s.close_image || $s.closeImage
+    $s.imageTypes = $s.image_types || $s.imageTypes
+    $s.faceboxHtml = $s.facebox_html || $s.faceboxHtml
+  }
+
+  // Figures out what you want to display and displays it
+  // formats are:
+  //     div: #id
+  //   image: blah.extension
+  //    ajax: anything else
+  function fillFaceboxFromHref(href, klass) {
+    // div
+    if (href.match(/#/)) {
+      var url    = window.location.href.split('#')[0]
+      var target = href.replace(url,'')
+      if (target == '#') return
+      $.facebox.reveal($(target).html(), klass)
+
+    // image
+    } else if (href.match($.facebox.settings.imageTypesRegexp)) {
+      fillFaceboxFromImage(href, klass)
+    // ajax
+    } else {
+      fillFaceboxFromAjax(href, klass)
+    }
+  }
+
+  function fillFaceboxFromImage(href, klass) {
+    var image = new Image()
+    image.onload = function() {
+      $.facebox.reveal('<div class="image"><img src="' + image.src + '" /></div>', klass)
+    }
+    image.src = href
+  }
+
+  function fillFaceboxFromAjax(href, klass) {
+    $.get(href, function(data) { $.facebox.reveal(data, klass) })
+  }
+
+  function skipOverlay() {
+    return $.facebox.settings.overlay == false || $.facebox.settings.opacity === null
+  }
+
+  function showOverlay() {
+    if (skipOverlay()) return
+
+    if ($('#facebox_overlay').length == 0)
+      $("body").append('<div id="facebox_overlay" class="facebox_hide"></div>')
+
+    $('#facebox_overlay').hide().addClass("facebox_overlayBG")
+      .css('opacity', $.facebox.settings.opacity)
+      .click(function() { $(document).trigger('close.facebox') })
+      .fadeIn(200)
+    return false
+  }
+
+  function hideOverlay() {
+    if (skipOverlay()) return
+
+    $('#facebox_overlay').fadeOut(200, function(){
+      $("#facebox_overlay").removeClass("facebox_overlayBG")
+      $("#facebox_overlay").addClass("facebox_hide")
+      $("#facebox_overlay").remove()
+    })
+
+    return false
+  }
+
+  /*
+   * Bindings
+   */
+
+  $(document).bind('close.facebox', function() {
+    $(document).unbind('keydown.facebox')
+    $('#facebox').fadeOut(function() {
+      $('#facebox .content').removeClass().addClass('content')
+      $('#facebox .loading').remove()
+      $(document).trigger('afterClose.facebox')
+    })
+    hideOverlay()
+  })
+
+})(jQuery);