typo 5.2 → 5.2.98

data/db/migrate/078_add_textfilter_to_users.rb

@@ -0,0 +1,19 @@
+class AddTextfilterToUsers < ActiveRecord::Migration
+  def self.up
+    f = TextFilter.find(:first, :conditions => ["name = ?", "none"])
+    add_column :users, :text_filter_id, :string, :default => f.id
+
+    unless Blog.default.nil?
+      t = TextFilter.find(:first, :conditions => "name= '#{Blog.default.text_filter}'")
+      User.find(:all).each do |user|
+        STDERR.puts "Adding textfilter #{t.name} to #{user.login}"
+        user.text_filter_id = t.id
+        user.save
+      end
+    end    
+  end
+
+  def self.down
+    remove_column :text_filter_id, :integer
+  end
+end

data/db/migrate/079_move_editor_as_string.rb

@@ -0,0 +1,20 @@
+class MoveEditorAsString < ActiveRecord::Migration
+  def self.up
+    remove_column :users, :editor
+    add_column :users, :editor, :string, :default => 'simple'
+    
+    unless $schema_generator
+      users = User.find(:all)
+      users.each do |user|
+        user.editor = 'simple'
+        user.save!
+      end
+    end
+    
+  end
+
+  def self.down
+    remove_column :users, :editor
+    add_column :users, :editor, :integer, :default => 0
+  end
+end

data/db/migrate/080_add_state_to_user.rb

@@ -0,0 +1,18 @@
+class AddStateToUser < ActiveRecord::Migration
+  def self.up
+    add_column :users, :state, :string, :default => 'active'
+    
+    unless $schema_generator
+      users = User.find(:all)
+      users.each do |user|
+        user.state = 'active'
+        user.save!
+      end
+    end
+    
+  end
+
+  def self.down
+    remove_column :users, :state
+  end
+end

data/db/migrate/081_create_cache_informations.rb

@@ -0,0 +1,28 @@
+class CreateCacheInformations < ActiveRecord::Migration
+  def self.up
+
+    # With this migration, Old cache is useless. So we need delete all old cache
+    # Now what page is in cache is manage by cache_informations table
+    PageCache.old_sweep_all
+
+    # In commit before, cache manage by file. We delete this cache if exist.
+    # It's use only to all edge blog updated several time
+    if File.exist?(File.join(Rails.root,'path_cache'))
+      File.read(File.join(Rails.root,'path_cache')).split("\n").each do |page_save|
+        FileUtils.rm File.join(PageCache.public_path, page_save)
+      end
+      FileUtils.rm_f File.join(Rails.root,'path_cache')
+    end
+
+    create_table :cache_informations do |t|
+      t.string :path
+      t.timestamps
+    end
+    # Add index on path because there are validates_uniqueness on it
+    add_index :cache_informations, :path
+  end
+
+  def self.down
+    drop_table :cache_informations
+  end
+end

data/db/schema.rb

@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 77) do
+ActiveRecord::Schema.define(:version => 81) do
 
   create_table "articles_tags", :id => false, :force => true do |t|
     t.integer "article_id"
@@ -28,6 +28,14 @@ ActiveRecord::Schema.define(:version => 77) do
     t.string "base_url"
   end
 
+  create_table "cache_informations", :force => true do |t|
+    t.string   "path"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
+  add_index "cache_informations", ["path"], :name => "index_cache_informations_on_path"
+
   create_table "categories", :force => true do |t|
     t.string  "name"
     t.integer "position"
@@ -218,7 +226,9 @@ ActiveRecord::Schema.define(:version => 77) do
     t.integer  "profile_id"
     t.string   "remember_token"
     t.datetime "remember_token_expires_at"
-    t.integer  "editor",                    :default => 2
+    t.string   "text_filter_id",            :default => "1"
+    t.string   "editor",                    :default => "simple"
+    t.string   "state",                     :default => "active"
   end
 
 end

data/doc/typo-5.3-release-notes.txt

@@ -0,0 +1,105 @@
+Typo 5.3
+========
+
+Welcome to Typo 5.3.  Typo is a blogging platform, like Movable Type or 
+Wordpress, written using Ruby on Rails. This was supposed to be a 2 month minor release, but we went so far that we can't call it this way anymore.
+
+
+New features since Typo 5.2
+===========================
+
+* The main goal for Typo 5.3 was the dynamic permalink scheme, which forced us to completely rewrite our URL generation system and our cache system.
+
+* Feedburner support directly into your admin.
+
+* Semi static caching was buggy, and heavy, so we removed it. Typo now only does static caching. 
+
+* Text filters configuration are now on a per user and on a per article basis. When migrating, all users will be given the blog default's text filter.
+
+* More performance improvement, Typo is really fast now
+
+* Even more SEO capabilities. Tags and categories can be removed from search engines, using noindex, removed from sitemap.xml, and Typo now has a robots.txt editor.
+
+* Old drop down menus were replaced with some fancy calendar like date pickers.
+
+* Notifications for sidebar save and autosave are now done using growler, a nice growl like javascript thing.
+
+* Inline editor switching à la Wordpress. Isn't that one cool?
+
+* Admin can now deactivate users. 
+
+Bug Fixes
+=========
+
+#11 Movable Type API brocken with Windows Live Writer.
+
+#17 Fix flickr_sidebar plugin
+
+#18 Fix admin CSS
+
+#19 Fixed an old bug on javascript admin tasks using cookies.
+
+#26 Brocken autocomplete.
+
+#27 Simple_format inserts excessive p or br
+
+#32 Fixes a XSS vulnerability in Feedback view.
+
+#36 xml_sidebar wrong in show article
+
+#37 Search with empty result failed
+
+#42 When logged in, /accounts/login should redirect to /admin
+
+#43 User id is never added into comments
+
+#47 Search displays drafts
+
+#52 Search route is wrong
+
+#53 title_url should be CGI.escaped
+
+#54 Cache is brocken since URL change
+
+#55 /archives is brocken
+
+#59 Text filters are not applied on trackbacks
+
+#60 Upgrade from 5.0.3 fails with PgSQL
+
+#61 Cache brocken on comments RSS and Atom
+
+#62 Dynamic permalinks break comment feed by article
+
+
+Upgrading TYPO
+==============
+
+Read UPGRADE file
+
+
+How to Install Typo
+-------------------
+
+There are two ways to install Typo: automatically, using the new Typo installer, or manually, by downloading the source and building a working Rails environment (database, etc) for it.
+
+New users should use the installer wherever possible because it's substantially easier and less trouble-prone.
+
+
+### Installing Typo via the Typo Installer 
+
+The documentation has moved to http://github.com/fdv/typo/wikis/install-typo-with-typo-installer
+
+
+### Installing Typo Manually
+
+The documentation has moved to  http://github.com/fdv/typo/wikis/install-typo-from-sources
+
+
+Support, or where to turn when things break
+-------------------------------------------
+
+Typo development occurs via http://typosphere.org.  If you find a bug, please
+file a bug report via http://typosphere.org/projects/typo/issues
+
+If you have problems, please send mail to typo-list@rubyforge.org.  You can also visit Typo's IRC channel, #typo on irc.freenode.net and ask for help.

data/lib/tasks/release.rake

@@ -1,7 +1,7 @@
 require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
-PKG_VERSION = "5.2"
+PKG_VERSION = "5.2.98"
 PKG_NAME = "typo"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = 'typo'

data/migrate.txt

@@ -0,0 +1,142 @@
+UPGRADING TO TYPO 5.2.98 HOWTO
+
+Remember: Even though Typo 5.2.98 is suposed to be usable in production, it's still a bêta version, released for testing purpose. That's the reason why it wasn't released as a gem. So use it at your own risks. 
+
+*** BEFORE UPGRADING ***
+
+Pre migration steps are divided into 2 categories : things you should do, and things you must do.
+
+You should make a backup of your current blog, either using a file transfer software or an archiver like zip or tar.
+
+You should make a backup of your database, using either mysqldump, pgdump or phpmyadmin, whichever you feel safe with.
+
+If you're using a pre 5.0 version, you should remove all the following sidebars before migrating:
+
+* AIM presence
+* Audioscrobbler
+* Backpack
+* Delicious
+* Flickr
+* 43 things
+* 43 places
+* Magnolia
+* Recent comments
+* Tada
+* Upcoming
+* Xbox
+
+These sidebars have been removed from Typo core at 5.0 and are now hosted on a separate repository. You can also migrate, then reinstall those plugins before trying to access your blog frontend or admin.
+
+If you're using a Typo version priori to 5.1, you must manually remove the lib directory inside your typo install.
+
+If you're using a third party theme, you'll have do some changes to your template as well. This is explained later.
+
+*** UPGRADING ***
+
+Upgrading should be a really easy process, depending on how you installed your typo first.
+
+** UPGRADING WITH TYPO INSTALLER FROM TYPO 2.0 to 5.0 **
+
+Automagically upgrading Typo 2.0 to 5.0 using Typo instaler is not possible, but you can catch on the train anyway, it will just be a little harder. By default Typo uses MySQL database. If you want to use something else, check our installation documentation.
+
+* UPGRADING FILES *
+
+First, move your production Typo directory somewhere else :
+
+$ mv typo_path old_typo
+
+If you have root access to your host, launch:
+
+$ sudo gem install typo
+$ typo install typo_path
+
+or 
+
+$ sudo gem update typo
+$ typo install typo_path
+
+If you don't have root access, things are just a bit more complicated
+
+$ export GEM_PATH=~/gems
+$ gem install -i ~/gems typo
+$ ~/gems/bin/typo install typo_path
+
+or
+
+$ export GEM_PATH=~/gems
+$ gem update -i ~/gems typo
+$ ~/gems/bin/typo install typo_path
+
+Then, move your theme (which is certainly not compatible anymore at all), your database confiuration and your uploaded files to your new blog:
+
+$ mv old_typo/public/files/* typo_path/public/files
+$ mv old_typo/themes/your_theme typo_path/themes/
+$ mv old_typo/config/database.yml typo_path/config
+
+Ensure all your typo files have the good perms, then restart your Typo instance.
+
+* UPGRADING DATABASE *
+
+Login in to your Typo admin using your favourite web browser. You'll access to the database migration page. Just click on the "migrate" button.
+
+If something goes wrong, go back to your terminal, and run
+
+$ cd typo_path
+$ rake RAILS_ENV=production db:migrate
+
+If things really goes wrong, then please ask for help on the Typo mailing list or on IRC #typo@irc.freenode.net
+
+** UPGRADING WITH TYPO INSTALLER FROM TYPO 5.0 and later **
+
+* UPGRADING FILES *
+
+First, install or update your Typo gem.
+
+If you have root access to your host, launch:
+
+$ sudo gem install typo
+$ typo install typo_path
+
+or 
+
+$ sudo gem update typo
+$ typo install typo_path
+
+If you don't have root access, things are just a bit more complicated
+
+$ export GEM_PATH=~/gems
+$ gem install -i ~/gems typo
+$ ~/gems/bin/typo install typo_path
+
+or
+
+$ export GEM_PATH=~/gems
+$ gem update -i ~/gems typo
+$ ~/gems/bin/typo install /some/path
+
+Ensure all your typo files have the good perms, then restart your Typo instance.
+
+* UPGRADING DATABASE *
+
+Login in to your Typo admin using your favourite web browser. You'll access to the database migration page. Just click on the "migrate" button.
+
+If something goes wrong, go back to your terminal, and run
+
+$ cd typo_path
+$ rake RAILS_ENV=production db:migrate
+
+If things really goes wrong, then please ask for help on the Typo mailing list or on IRC #typo@irc.freenode.net
+
+*** UPGRADING YOUR THEME ***
+
+** UPGRADING FROM TYPO 5.2 **
+
+* In articles/_comment_box.html.erb use @article.comment_url instead of comments_path(@article)
+
+* all link preview_new_comment_path(@article) are changed to @article.preview_comment_url
+
+* all link url_for formatted_article_path(@article, :rss) are changed to @article.feed_url(:rss)
+
+* all link formatted_article_url(@article, @format) are changed to   @article.permalink_by_format(@format)
+
+* The classical search has moved to sidebar. So if you want, you can delete the render of shared/search in your layout and use the search_sidebar instead of.

data/public/javascripts/administration.js

@@ -1,12 +1,29 @@
 function autosave_request(e) {
-  new Form.Observer (e, 60, function(element, value) {
+  new Form.Observer (e, 30, function(element, value) {
+			if ($('current_editor').value == 'visual') {
+				$('article__body_and_extended_editor').value = FCKeditorAPI.GetInstance('article__body_and_extended_editor').GetHTML();
+			}
+			
       new Ajax.Request(e.action.gsub(/\/new\/{0,1}/, '/autosave/') , {
                                         asynchronous:true, 
                                         evalScripts:true, 
                                         parameters: Form.serialize(e)
-                                      })})
+                                      })
+			var g = new k.Growler({location : 'br'}); 
+			g.info('Article was successfully saved', {life: 3});
+})
+  
 }
 
 Event.observe(window, 'load', function() {
   $$('.autosave').each(function(e){autosave_request(e)})
 })
+
+function FCKeditor_OnComplete( editorInstance )
+{
+	if((editorInstance.Name == 'article__body_and_extended_editor' || editorInstance.Name == 'page__body_editor') && typeof(html2) != 'undefined') {
+		FCKeditorAPI.GetInstance(editorInstance.Name).InsertHtml(html2);
+		html2 = null;
+		$('simple_editor').innerHTML = "";
+	} 
+}

data/public/javascripts/calendar_date_select/calendar_date_select.js

@@ -0,0 +1,443 @@
+// CalendarDateSelect version 1.13 - a prototype based date picker
+// Questions, comments, bugs? - see the project page: http://code.google.com/p/calendardateselect
+if (typeof Prototype == 'undefined') alert("CalendarDateSelect Error: Prototype could not be found. Please make sure that your application's layout includes prototype.js (.g. <%= javascript_include_tag :defaults %>) *before* it includes calendar_date_select.js (.g. <%= calendar_date_select_includes %>).");
+if (Prototype.Version < "1.6") alert("Prototype 1.6.0 is required.  If using earlier version of prototype, please use calendar_date_select version 1.8.3");
+
+Element.addMethods({
+  purgeChildren: function(element) { $A(element.childNodes).each(function(e){$(e).remove();}); },
+  build: function(element, type, options, style) {
+    var newElement = Element.buildAndAppend(type, options, style);
+    element.appendChild(newElement);
+    return newElement;
+  }
+});
+
+Element.buildAndAppend = function(type, options, style)
+{
+  var e = $(document.createElement(type));
+  $H(options).each(function(pair) { e[pair.key] = pair.value });
+  if (style) e.setStyle(style);
+  return e;
+};
+nil = null;
+
+Date.one_day = 24*60*60*1000;
+Date.weekdays = $w("S M T W T F S");
+Date.first_day_of_week = 0;
+Date.months = $w("January February March April May June July August September October November December" );
+Date.padded2 = function(hour) { var padded2 = parseInt(hour, 10); if (hour < 10) padded2 = "0" + padded2; return padded2; }
+Date.prototype.getPaddedMinutes = function() { return Date.padded2(this.getMinutes()); }
+Date.prototype.getAMPMHour = function() { var hour = this.getHours(); return (hour == 0) ? 12 : (hour > 12 ? hour - 12 : hour ) }
+Date.prototype.getAMPM = function() { return (this.getHours() < 12) ? "AM" : "PM"; }
+Date.prototype.stripTime = function() { return new Date(this.getFullYear(), this.getMonth(), this.getDate());};
+Date.prototype.daysDistance = function(compare_date) { return Math.round((compare_date - this) / Date.one_day); };
+Date.prototype.toFormattedString = function(include_time){
+  var hour, str;
+  str = Date.months[this.getMonth()] + " " + this.getDate() + ", " + this.getFullYear();
+  
+  if (include_time) { hour = this.getHours(); str += " " + this.getAMPMHour() + ":" + this.getPaddedMinutes() + " " + this.getAMPM() }
+  return str;
+}
+Date.parseFormattedString = function(string) { return new Date(string);}
+Math.floor_to_interval = function(n, i) { return Math.floor(n/i) * i;}
+window.f_height = function() { return( [window.innerHeight ? window.innerHeight : null, document.documentElement ? document.documentElement.clientHeight : null, document.body ? document.body.clientHeight : null].select(function(x){return x>0}).first()||0); }
+window.f_scrollTop = function() { return ([window.pageYOffset ? window.pageYOffset : null, document.documentElement ? document.documentElement.scrollTop : null, document.body ? document.body.scrollTop : null].select(function(x){return x>0}).first()||0 ); }
+
+_translations = {
+  "OK": "OK",
+  "Now": "Now",
+  "Today": "Today",
+  "Clear": "Clear"
+}
+SelectBox = Class.create();
+SelectBox.prototype = {
+  initialize: function(parent_element, values, html_options, style_options) {
+    this.element = $(parent_element).build("select", html_options, style_options);
+    this.populate(values);
+  },
+  populate: function(values) {
+    this.element.purgeChildren();
+    var that = this; $A(values).each(function(pair) { if (typeof(pair)!="object") {pair = [pair, pair]}; that.element.build("option", { value: pair[1], innerHTML: pair[0]}) });
+  },
+  setValue: function(value) {
+    var e = this.element;
+    var matched = false;
+    $R(0, e.options.length - 1 ).each(function(i) { if(e.options[i].value==value.toString()) {e.selectedIndex = i; matched = true;}; } );
+    return matched;
+  },
+  getValue: function() { return $F(this.element)}
+}
+CalendarDateSelect = Class.create();
+CalendarDateSelect.prototype = {
+  initialize: function(target_element, options) {
+    this.target_element = $(target_element); // make sure it's an element, not a string
+    if (!this.target_element) { alert("Target element " + target_element + " not found!"); return false;}
+    if (this.target_element.tagName != "INPUT") this.target_element = this.target_element.down("INPUT")
+    
+    this.target_element.calendar_date_select = this;
+    this.last_click_at = 0;
+    // initialize the date control
+    this.options = $H({
+      embedded: false,
+      popup: nil,
+      time: false,
+      buttons: true,
+      clear_button: true,
+      year_range: 10,
+      close_on_click: nil,
+      minute_interval: 5,
+      popup_by: this.target_element,
+      month_year: "dropdowns",
+      onchange: this.target_element.onchange,
+      valid_date_check: nil
+    }).merge(options || {});
+    this.use_time = this.options.get("time");
+    this.parseDate();
+    this.callback("before_show")
+    this.initCalendarDiv();
+    if(!this.options.get("embedded")) {
+      this.positionCalendarDiv()
+      // set the click handler to check if a user has clicked away from the document
+      Event.observe(document, "mousedown", this.closeIfClickedOut_handler = this.closeIfClickedOut.bindAsEventListener(this));
+      Event.observe(document, "keypress", this.keyPress_handler = this.keyPress.bindAsEventListener(this));
+    }
+    this.callback("after_show")
+  },
+  positionCalendarDiv: function() {
+    var above = false;
+    var c_pos = this.calendar_div.cumulativeOffset(), c_left = c_pos[0], c_top = c_pos[1], c_dim = this.calendar_div.getDimensions(), c_height = c_dim.height, c_width = c_dim.width; 
+    var w_top = window.f_scrollTop(), w_height = window.f_height();
+    var e_dim = $(this.options.get("popup_by")).cumulativeOffset(), e_top = e_dim[1], e_left = e_dim[0], e_height = $(this.options.get("popup_by")).getDimensions().height, e_bottom = e_top + e_height;
+    
+    if ( (( e_bottom + c_height ) > (w_top + w_height)) && ( e_bottom - c_height > w_top )) above = true;
+    var left_px = e_left.toString() + "px", top_px = (above ? (e_top - c_height ) : ( e_top + e_height )).toString() + "px";
+    
+    this.calendar_div.style.left = left_px;  this.calendar_div.style.top = top_px;
+    
+    this.calendar_div.setStyle({visibility:""});
+    
+    // draw an iframe behind the calendar -- ugly hack to make IE 6 happy
+    if(navigator.appName=="Microsoft Internet Explorer") this.iframe = $(document.body).build("iframe", {src: "javascript:false", className: "ie6_blocker"}, { left: left_px, top: top_px, height: c_height.toString()+"px", width: c_width.toString()+"px", border: "0px"})
+  },
+  initCalendarDiv: function() {
+    if (this.options.get("embedded")) {
+      var parent = this.target_element.parentNode;
+      var style = {}
+    } else {
+      var parent = document.body
+      var style = { position:"absolute", visibility: "hidden", left:0, top:0 }
+    }
+    this.calendar_div = $(parent).build('div', {className: "calendar_date_select"}, style);
+    
+    var that = this;
+    // create the divs
+    $w("top header body buttons footer bottom").each(function(name) {
+      eval("var " + name + "_div = that." + name + "_div = that.calendar_div.build('div', { className: 'cds_"+name+"' }, { clear: 'left'} ); ");
+    });
+    
+    this.initHeaderDiv();
+    this.initButtonsDiv();
+    this.initCalendarGrid();
+    this.updateFooter("&#160;");
+    
+    this.refresh();
+    this.setUseTime(this.use_time);
+  },
+  initHeaderDiv: function() {
+    var header_div = this.header_div;
+    this.close_button = header_div.build("a", { innerHTML: "x", href:"#", onclick:function () { this.close(); return false; }.bindAsEventListener(this), className: "close" });
+    this.next_month_button = header_div.build("a", { innerHTML: "&gt;", href:"#", onclick:function () { this.navMonth(this.date.getMonth() + 1 ); return false; }.bindAsEventListener(this), className: "next" });
+    this.prev_month_button = header_div.build("a", { innerHTML: "&lt;", href:"#", onclick:function () { this.navMonth(this.date.getMonth() - 1 ); return false; }.bindAsEventListener(this), className: "prev" });
+    
+    if (this.options.get("month_year")=="dropdowns") {
+      this.month_select = new SelectBox(header_div, $R(0,11).map(function(m){return [Date.months[m], m]}), {className: "month", onchange: function () { this.navMonth(this.month_select.getValue()) }.bindAsEventListener(this)}); 
+      this.year_select = new SelectBox(header_div, [], {className: "year", onchange: function () { this.navYear(this.year_select.getValue()) }.bindAsEventListener(this)}); 
+      this.populateYearRange();
+    } else {
+      this.month_year_label = header_div.build("span")
+    }
+  },
+  initCalendarGrid: function() {
+    var body_div = this.body_div;
+    this.calendar_day_grid = [];
+    var days_table = body_div.build("table", { cellPadding: "0px", cellSpacing: "0px", width: "100%" })
+    // make the weekdays!
+    var weekdays_row = days_table.build("thead").build("tr");
+    Date.weekdays.each( function(weekday) { 
+      weekdays_row.build("th", {innerHTML: weekday});
+    });
+    
+    var days_tbody = days_table.build("tbody")
+    // Make the days!
+    var row_number = 0, weekday;
+    for(var cell_index = 0; cell_index<42; cell_index++)
+    {
+      weekday = (cell_index+Date.first_day_of_week ) % 7;
+      if ( cell_index % 7==0 ) days_row = days_tbody.build("tr", {className: 'row_'+row_number++});
+      (this.calendar_day_grid[cell_index] = days_row.build("td", {
+          calendar_date_select: this,
+          onmouseover: function () { this.calendar_date_select.dayHover(this); },
+          onmouseout: function () { this.calendar_date_select.dayHoverOut(this) },
+          onclick: function() { this.calendar_date_select.updateSelectedDate(this, true); },
+          className: (weekday==0) || (weekday==6) ? " weekend" : "" //clear the class
+        },
+        { cursor: "pointer" }
+      )).build("div");
+      this.calendar_day_grid[cell_index];
+    }
+  },
+  initButtonsDiv: function()
+  {
+    var buttons_div = this.buttons_div;
+    if (this.options.get("time"))
+    {
+      var blank_time = $A(this.options.get("time")=="mixed" ? [[" - ", ""]] : []);
+      buttons_div.build("span", {innerHTML:"@", className: "at_sign"});
+      
+      var t = new Date();
+      this.hour_select = new SelectBox(buttons_div,
+        blank_time.concat($R(0,23).map(function(x) {t.setHours(x); return $A([t.getAMPMHour()+ " " + t.getAMPM(),x])} )),
+        { 
+          calendar_date_select: this, 
+          onchange: function() { this.calendar_date_select.updateSelectedDate( { hour: this.value });},
+          className: "hour" 
+        }
+      );
+      buttons_div.build("span", {innerHTML:":", className: "seperator"});
+      var that = this;
+      this.minute_select = new SelectBox(buttons_div,
+        blank_time.concat($R(0,59).select(function(x){return (x % that.options.get('minute_interval')==0)}).map(function(x){ return $A([ Date.padded2(x), x]); } ) ),
+        { 
+          calendar_date_select: this, 
+          onchange: function() { this.calendar_date_select.updateSelectedDate( {minute: this.value }) }, 
+          className: "minute" 
+        }
+      );
+      
+    } else if (! this.options.get("buttons")) buttons_div.remove();
+    
+    if (this.options.get("buttons")) {
+      buttons_div.build("span", {innerHTML: "&#160;"});
+      if (this.options.get("time")=="mixed" || !this.options.get("time")) b = buttons_div.build("a", {
+          innerHTML: _translations["Today"],
+          href: "#",
+          onclick: function() {this.today(false); return false;}.bindAsEventListener(this)
+        });
+      
+      if (this.options.get("time")=="mixed") buttons_div.build("span", {innerHTML: "&#160;|&#160;", className:"button_seperator"})
+      
+      if (this.options.get("time")) b = buttons_div.build("a", {
+        innerHTML: _translations["Now"],
+        href: "#",
+        onclick: function() {this.today(true); return false}.bindAsEventListener(this)
+      });
+      
+      if (!this.options.get("embedded") && !this.closeOnClick())
+      {
+        buttons_div.build("span", {innerHTML: "&#160;|&#160;", className:"button_seperator"})
+        buttons_div.build("a", { innerHTML: _translations["OK"], href: "#", onclick: function() {this.close(); return false;}.bindAsEventListener(this) });
+      }
+      if (this.options.get('clear_button')) {
+        buttons_div.build("span", {innerHTML: "&#160;|&#160;", className:"button_seperator"})
+        buttons_div.build("a", { innerHTML: _translations["Clear"], href: "#", onclick: function() {this.clearDate(); if (!this.options.get("embedded")) this.close(); return false;}.bindAsEventListener(this) });
+      }
+    }
+  },
+  refresh: function ()
+  {
+    this.refreshMonthYear();
+    this.refreshCalendarGrid();
+    
+    this.setSelectedClass();
+    this.updateFooter();
+  },
+  refreshCalendarGrid: function () {
+    this.beginning_date = new Date(this.date).stripTime();
+    this.beginning_date.setDate(1);
+    this.beginning_date.setHours(12); // Prevent daylight savings time boundaries from showing a duplicate day
+    var pre_days = this.beginning_date.getDay() // draw some days before the fact
+    if (pre_days < 3) pre_days += 7;
+    this.beginning_date.setDate(1 - pre_days + Date.first_day_of_week);
+    
+    var iterator = new Date(this.beginning_date);
+    
+    var today = new Date().stripTime();
+    var this_month = this.date.getMonth();
+    vdc = this.options.get("valid_date_check");
+    for (var cell_index = 0;cell_index<42; cell_index++)
+    {
+      day = iterator.getDate(); month = iterator.getMonth();
+      cell = this.calendar_day_grid[cell_index];
+      Element.remove(cell.childNodes[0]); div = cell.build("div", {innerHTML:day});
+      if (month!=this_month) div.className = "other";
+      cell.day = day; cell.month = month; cell.year = iterator.getFullYear();
+      if (vdc) { if (vdc(iterator.stripTime())) cell.removeClassName("disabled"); else cell.addClassName("disabled") };
+      iterator.setDate( day + 1);
+    }
+    
+    if (this.today_cell) this.today_cell.removeClassName("today");
+    
+    if ( $R( 0, 41 ).include(days_until = this.beginning_date.stripTime().daysDistance(today)) ) {
+      this.today_cell = this.calendar_day_grid[days_until];
+      this.today_cell.addClassName("today");
+    }
+  },
+  refreshMonthYear: function() {
+    var m = this.date.getMonth();
+    var y = this.date.getFullYear();
+    // set the month
+    if (this.options.get("month_year") == "dropdowns") 
+    {
+      this.month_select.setValue(m, false);
+      
+      var e = this.year_select.element; 
+      if (this.flexibleYearRange() && (!(this.year_select.setValue(y, false)) || e.selectedIndex <= 1 || e.selectedIndex >= e.options.length - 2 )) this.populateYearRange();
+      
+      this.year_select.setValue(y);
+      
+    } else {
+      this.month_year_label.update( Date.months[m] + " " + y.toString()  );
+    }
+  },
+  populateYearRange: function() {
+    this.year_select.populate(this.yearRange().toArray());
+  },
+  yearRange: function() {
+    if (!this.flexibleYearRange())
+      return $R(this.options.get("year_range")[0], this.options.get("year_range")[1]);
+      
+    var y = this.date.getFullYear();
+    return $R(y - this.options.get("year_range"), y + this.options.get("year_range"));
+  },
+  flexibleYearRange: function() { return (typeof(this.options.get("year_range")) == "number"); },
+  validYear: function(year) { if (this.flexibleYearRange()) { return true;} else { return this.yearRange().include(year);}  },
+  dayHover: function(element) {
+    var hover_date = new Date(this.selected_date);
+    hover_date.setYear(element.year); hover_date.setMonth(element.month); hover_date.setDate(element.day);
+    this.updateFooter(hover_date.toFormattedString(this.use_time));
+  },
+  dayHoverOut: function(element) { this.updateFooter(); },
+  clearSelectedClass: function() {if (this.selected_cell) this.selected_cell.removeClassName("selected");},
+  setSelectedClass: function() {
+    if (!this.selection_made) return;
+    this.clearSelectedClass()
+    if ($R(0,42).include( days_until = this.beginning_date.stripTime().daysDistance(this.selected_date.stripTime()) )) {
+      this.selected_cell = this.calendar_day_grid[days_until];
+      this.selected_cell.addClassName("selected");
+    }
+  },
+  reparse: function() { this.parseDate(); this.refresh(); },
+  dateString: function() {
+    return (this.selection_made) ? this.selected_date.toFormattedString(this.use_time) : "&#160;";
+  },
+  parseDate: function()
+  {
+    var value = $F(this.target_element).strip()
+    this.selection_made = (value != "");
+    this.date = value=="" ? NaN : Date.parseFormattedString(this.options.get("date") || value);
+    if (isNaN(this.date)) this.date = new Date();
+    if (!this.validYear(this.date.getFullYear())) this.date.setYear( (this.date.getFullYear() < this.yearRange().start) ? this.yearRange().start : this.yearRange().end);
+    this.selected_date = new Date(this.date);
+    this.use_time = /[0-9]:[0-9]{2}/.exec(value) ? true : false;
+    this.date.setDate(1);
+  },
+  updateFooter:function(text) { if (!text) text = this.dateString(); this.footer_div.purgeChildren(); this.footer_div.build("span", {innerHTML: text }); },
+  clearDate:function() {
+    if ((this.target_element.disabled || this.target_element.readOnly) && this.options.get("popup") != "force") return false;
+    var last_value = this.target_element.value;
+    this.target_element.value = "";
+    this.clearSelectedClass();
+    this.updateFooter('&#160;');
+    if (last_value!=this.target_element.value) this.callback("onchange");
+  },
+  updateSelectedDate:function(partsOrElement, via_click) {
+    var parts = $H(partsOrElement);
+    if ((this.target_element.disabled || this.target_element.readOnly) && this.options.get("popup") != "force") return false;
+    if (parts.get("day")) {
+      var t_selected_date = this.selected_date, vdc = this.options.get("valid_date_check");
+      for (var x = 0; x<=3; x++) t_selected_date.setDate(parts.get("day"));
+      t_selected_date.setYear(parts.get("year"));
+      t_selected_date.setMonth(parts.get("month"));
+      
+      if (vdc && ! vdc(t_selected_date.stripTime())) { return false; }
+      this.selected_date = t_selected_date;
+      this.selection_made = true;
+    }
+    
+    if (!isNaN(parts.get("hour"))) this.selected_date.setHours(parts.get("hour"));
+    if (!isNaN(parts.get("minute"))) this.selected_date.setMinutes( Math.floor_to_interval(parts.get("minute"), this.options.get("minute_interval")) );
+    if (parts.get("hour") === "" || parts.get("minute") === "") 
+      this.setUseTime(false);
+    else if (!isNaN(parts.get("hour")) || !isNaN(parts.get("minute")))
+      this.setUseTime(true);
+    
+    this.updateFooter();
+    this.setSelectedClass();
+    
+    if (this.selection_made) this.updateValue();
+    if (this.closeOnClick()) { this.close(); }
+    if (via_click && !this.options.get("embedded")) {
+      if ((new Date() - this.last_click_at) < 333) this.close();
+      this.last_click_at = new Date();
+    }
+  },
+  closeOnClick: function() {
+    if (this.options.get("embedded")) return false;
+    if (this.options.get("close_on_click")===nil )
+      return (this.options.get("time")) ? false : true
+    else
+      return (this.options.get("close_on_click"))
+  },
+  navMonth: function(month) { (target_date = new Date(this.date)).setMonth(month); return (this.navTo(target_date)); },
+  navYear: function(year) { (target_date = new Date(this.date)).setYear(year); return (this.navTo(target_date)); },
+  navTo: function(date) {
+    if (!this.validYear(date.getFullYear())) return false;
+    this.date = date;
+    this.date.setDate(1);
+    this.refresh();
+    this.callback("after_navigate", this.date);
+    return true;
+  },
+  setUseTime: function(turn_on) {
+    this.use_time = this.options.get("time") && (this.options.get("time")=="mixed" ? turn_on : true) // force use_time to true if time==true && time!="mixed"
+    if (this.use_time && this.selected_date) { // only set hour/minute if a date is already selected
+      var minute = Math.floor_to_interval(this.selected_date.getMinutes(), this.options.get("minute_interval"));
+      var hour = this.selected_date.getHours();
+      
+      this.hour_select.setValue(hour);
+      this.minute_select.setValue(minute)
+    } else if (this.options.get("time")=="mixed") {
+      this.hour_select.setValue(""); this.minute_select.setValue("");
+    }
+  },
+  updateValue: function() {
+    var last_value = this.target_element.value;
+    this.target_element.value = this.dateString();
+    if (last_value!=this.target_element.value) this.callback("onchange");
+  },
+  today: function(now) {
+    var d = new Date(); this.date = new Date();
+    var o = $H({ day: d.getDate(), month: d.getMonth(), year: d.getFullYear(), hour: d.getHours(), minute: d.getMinutes()});
+    if ( ! now ) o = o.merge({hour: "", minute:""}); 
+    this.updateSelectedDate(o, true);
+    this.refresh();
+  },
+  close: function() {
+    if (this.closed) return false;
+    this.callback("before_close");
+    this.target_element.calendar_date_select = nil;
+    Event.stopObserving(document, "mousedown", this.closeIfClickedOut_handler);
+    Event.stopObserving(document, "keypress", this.keyPress_handler);
+    this.calendar_div.remove(); this.closed = true;
+    if (this.iframe) this.iframe.remove();
+    if (this.target_element.type != "hidden" && ! this.target_element.disabled) this.target_element.focus();
+    this.callback("after_close");
+  },
+  closeIfClickedOut: function(e) {
+    if (! $(Event.element(e)).descendantOf(this.calendar_div) ) this.close();
+  },
+  keyPress: function(e) {
+    if (e.keyCode==Event.KEY_ESC) this.close();
+  },
+  callback: function(name, param) { if (this.options.get(name)) { this.options.get(name).bind(this.target_element)(param); } }
+}