From e72f4e1da7d2ac9fa2a77d4eec2d451ed5a96c87 Mon Sep 17 00:00:00 2001
From: MrZYX <pr0fkill@gmail.com>
Date: Sat, 20 Nov 2010 16:35:22 +0100
Subject: [PATCH 1/8] translatable status is good again

made default aspects translatable
fix all the misssing translations I found
cleanup en.yml
---
 app/helpers/dashboards_helper.rb              |  2 +-
 app/models/user.rb                            |  4 +-
 app/views/aspects/index.html.haml             |  4 +-
 app/views/devise/confirmations/new.html.haml  |  2 +-
 app/views/devise/passwords/edit.html.haml     |  2 +-
 app/views/devise/shared/_links.haml           |  4 +-
 app/views/devise/unlocks/new.html.haml        |  2 +-
 app/views/home/show.html.haml                 | 23 ++---
 app/views/invitations/edit.html.haml          |  2 +-
 app/views/layouts/_header.html.haml           |  4 +-
 app/views/people/_profile_sidebar.html.haml   |  4 +-
 app/views/photos/_new_photo.haml              |  6 ++
 app/views/photos/show.html.haml               | 10 +--
 .../requests/_new_request_to_person.haml      |  2 +-
 app/views/shared/_add_contact.html.haml       |  8 +-
 app/views/shared/_aspect_contacts.haml        | 32 +++----
 app/views/shared/_author_info.html.haml       |  2 +-
 app/views/shared/_contact_list.html.haml      |  2 +-
 app/views/shared/_publisher.haml              |  4 +-
 app/views/status_messages/show.html.haml      |  2 +-
 app/views/users/getting_started.html.haml     |  2 +-
 .../users/getting_started/_step_1.html.haml   |  2 +-
 .../users/getting_started/_step_4.html.haml   |  2 +-
 config/locales/devise/devise.en.yml           |  9 +-
 config/locales/diaspora/en.yml                | 83 ++++++++++++-------
 public/javascripts/view.js                    |  1 +
 26 files changed, 123 insertions(+), 97 deletions(-)

diff --git a/app/helpers/dashboards_helper.rb b/app/helpers/dashboards_helper.rb
index 57d64397c..a5cf68cd5 100644
--- a/app/helpers/dashboards_helper.rb
+++ b/app/helpers/dashboards_helper.rb
@@ -4,6 +4,6 @@
 
 module DashboardsHelper
   def title_for_page
-    I18n.t('dashboards.helper.home')
+    I18n.t('_home')
   end
 end
diff --git a/app/models/user.rb b/app/models/user.rb
index 269804111..44190e99b 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -382,8 +382,8 @@ class User
 
 
   def seed_aspects
-    self.aspects.create(:name => "Family")
-    self.aspects.create(:name => "Work")
+    self.aspects.create(:name => I18n.t('aspects.seed.family'))
+    self.aspects.create(:name => I18n.t('aspects.seed.work'))
   end
 
   def as_json(opts={})
diff --git a/app/views/aspects/index.html.haml b/app/views/aspects/index.html.haml
index 6331458a6..be12ea3db 100644
--- a/app/views/aspects/index.html.haml
+++ b/app/views/aspects/index.html.haml
@@ -4,11 +4,11 @@
 
 .span-24.last
   %h2{:style => "position:relative;"}
-    Home
+    = t('_home')
     .right
       %span.description
         = current_user.diaspora_handle
-        = info_text("This is your diaspora handle.  Like an email address, you can give this to people to reach you.")
+        = info_text(t('.handle_explanation'))
 
 .span-15.last
   = render 'aspects/no_contacts_message', :aspect => @aspect, :contact_count => @contacts.count
diff --git a/app/views/devise/confirmations/new.html.haml b/app/views/devise/confirmations/new.html.haml
index 548a024bc..04965f756 100644
--- a/app/views/devise/confirmations/new.html.haml
+++ b/app/views/devise/confirmations/new.html.haml
@@ -6,5 +6,5 @@
     %br/
     = f.text_field :email
   %p
-  = f.submit "Resend confirmation instructions"
+  = f.submit t('.resend_confirmation')
 = render :partial => "devise/shared/links"
diff --git a/app/views/devise/passwords/edit.html.haml b/app/views/devise/passwords/edit.html.haml
index 025c214b0..267436a63 100644
--- a/app/views/devise/passwords/edit.html.haml
+++ b/app/views/devise/passwords/edit.html.haml
@@ -11,5 +11,5 @@
     %br/
     = f.password_field :password_confirmation
   %p
-  = f.submit "Change my password"
+  = f.submit t('.change_password')
 = render :partial => "devise/shared/links"
diff --git a/app/views/devise/shared/_links.haml b/app/views/devise/shared/_links.haml
index ef8b2c6e1..9d0c4d843 100644
--- a/app/views/devise/shared/_links.haml
+++ b/app/views/devise/shared/_links.haml
@@ -8,8 +8,8 @@
   = link_to t('.forgot_your_password'), new_password_path(resource_name)
   %br/
 - if devise_mapping.confirmable? && controller_name != 'confirmations'
-  = link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name)
+  = link_to t('.receive_confirmation'), new_confirmation_path(resource_name)
   %br/
 - if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
-  = link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name)
+  = link_to t('.receive_unlock'), new_unlock_path(resource_name)
   %br/
diff --git a/app/views/devise/unlocks/new.html.haml b/app/views/devise/unlocks/new.html.haml
index 24b7eb862..6fff589eb 100644
--- a/app/views/devise/unlocks/new.html.haml
+++ b/app/views/devise/unlocks/new.html.haml
@@ -6,5 +6,5 @@
     %br/
     = f.text_field :email
   %p
-  = f.submit "Resend unlock instructions"
+  = f.submit t('.resend_unlock')
 = render :partial => "devise/shared/links"
diff --git a/app/views/home/show.html.haml b/app/views/home/show.html.haml
index 39f6ff848..554e0a766 100644
--- a/app/views/home/show.html.haml
+++ b/app/views/home/show.html.haml
@@ -13,27 +13,20 @@
     #why.span-22.prepend-1.last
       .span-7
         %h2
-          Choice
+          = t('.choice')
         %p
-          Diaspora allows you to sort your connections into groups called Aspects.
-          Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared
-          with only the people you want them to be.
+          = t('.choice_explanation')
           
       .span-7
         %h2
-          Ownership
+          = t('.ownership')
         %p
-          You own your pictures, and you shouldn’t have to give that up just in order
-          to share them. You maintain ownership of everything you share on Diaspora,
-          giving you full control over how it is distributed.
-
+          = t('.ownership_explanation')
       .span-7
         %h2
-          Simplicity
+          = t('.simplicity')
         %p
-          Diaspora makes sharing clean and easy – this goes doubly so for privacy.
-          Innherently private, Diaspora doesn’t have pages of settings and options to
-          wade through to keep your profile secure and to your liking.
+          = t('.simplicity_explanation')
 
 
     .span-22.prepend-1.last
@@ -47,12 +40,12 @@
     #info_links.span-22.prepend-1.last          
       .span-10
         %h3
-          Learn about how to host your own Diaspora server
+          = t('.learn_about_host')
 
 
       .span-11
         %h3
-          Learn more about Diaspora as an open source project.
+          = t('.learn_about_open_source')
     
 
 .span-24.last{:style=>"text-align:center;"}
diff --git a/app/views/invitations/edit.html.haml b/app/views/invitations/edit.html.haml
index 957432bb5..1eac967f6 100644
--- a/app/views/invitations/edit.html.haml
+++ b/app/views/invitations/edit.html.haml
@@ -10,5 +10,5 @@
     = f.password_field :password_confirmation
 
     = f.hidden_field :invitation_token
-  = f.submit 'sign_up'
+  = f.submit t('.sign_up')
 = render :partial => "devise/shared/links"
diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml
index 4749e3511..4c3bbc1e1 100644
--- a/app/views/layouts/_header.html.haml
+++ b/app/views/layouts/_header.html.haml
@@ -33,13 +33,13 @@
     #aspect_nav
       %ul
         %li{:class => ("selected" if @aspect == :all)}
-          = link_to ((@request_count == 0)? "Home" : "Home (#{@request_count})"), root_path, :class => new_request(@request_count)
+          = link_to ((@request_count == 0)? t('_home') : "#{t('_home')} (#{@request_count})"), root_path, :class => new_request(@request_count)
 
         - for aspect in @aspects
           %li{:class => ("selected" if current_aspect?(aspect))}
             = link_for_aspect aspect
         %li
-          = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('.add_a_new_aspect')
+          = link_to '+', '#add_aspect_pane', :class => "add_aspect_button", :title => t('aspects.manage.add_a_new_aspect')
 
       .fancybox_content
         #add_aspect_pane
diff --git a/app/views/people/_profile_sidebar.html.haml b/app/views/people/_profile_sidebar.html.haml
index 954fcc92b..0f678a460 100644
--- a/app/views/people/_profile_sidebar.html.haml
+++ b/app/views/people/_profile_sidebar.html.haml
@@ -10,7 +10,7 @@
       });
 
       $('.delete').bind('ajax:failure', function() {
-        alert("Cannot remove #{person.real_name} from last aspect.");
+        alert("#{t('.cannot_remove', :name => person.real_name)}");
       });
     });
 
@@ -30,7 +30,7 @@
           - for aspect in @aspects_with_person
             %li
               = link_to aspect.name, aspect
-              = link_to "x", {:controller => "aspects", :action => "remove_from_aspect", :person_id => person.id, :aspect_id => aspect.id}, :confirm => "Remove #{person.real_name} from #{aspect}?", :remote => true, :class => "delete"
+              = link_to "x", {:controller => "aspects", :action => "remove_from_aspect", :person_id => person.id, :aspect_id => aspect.id}, :confirm => t('.remove_from', :name => person.real_name, :aspect => aspect), :remote => true, :class => "delete"
               
 
   -if is_contact || person == current_user.person
diff --git a/app/views/photos/_new_photo.haml b/app/views/photos/_new_photo.haml
index a9b6bc29c..f17a3a0b4 100644
--- a/app/views/photos/_new_photo.haml
+++ b/app/views/photos/_new_photo.haml
@@ -18,6 +18,12 @@
         var progress = Math.round(loaded / total * 100 );
          $('#fileInfo').text(fileName + ' ' + progress + '%');
        },
+       
+       messages: {
+           typeError: "#{t('.invalid_ext')}",
+           sizeError: "#{t('.size_error')}",
+           emptyError: "#{t('.empty')}"
+       },
 
        onSubmit: function(id, fileName){
         $('#file-upload').addClass("loading");
diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index 8a12ac3be..c94cfb7a9 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -43,7 +43,7 @@
         .photo_options{:data=>{:actor=>"#{@photo.person.owner.id}",:actor_person=>"#{@photo.person.id}",:image_url=>"#{@photo.url(:thumb_large)}"}}
           = link_to t('.make_profile_photo'), '#', :class => 'make_profile_photo'
           |
-          = link_to 'edit', '#', :id => "edit_photo_toggle"
+          = link_to t('.edit'), '#', :id => "edit_photo_toggle"
 
       -else
         = image_tag @photo.url(:scaled_full)
@@ -55,7 +55,7 @@
 
   -if @ownership
     #photo_edit_options
-      %h4 Edit photo description / delete photo
+      %h4= t('.edit_delete_photo')
       %p
         = form_for @photo, :remote => true do |p|
           = p.text_field :caption, :value => @photo.caption
@@ -67,8 +67,8 @@
   - if @photo.status_message_id
     #original_post_info
       %h4{:style=>"position:relative;"}
-        Original Post
-        = link_to 'view', @photo.status_message
+        = t('.original_post')
+        = link_to t('.view'), @photo.status_message
 
       %p
         = @photo.status_message.message
@@ -77,7 +77,7 @@
         - for photo in @photo.status_message.photos
           = link_to (image_tag photo.url(:thumb_small)), object_path(photo)
 
-  %h4 Comments
+  %h4= t('_comments')
   
   - if @photo.status_message_id
     %div{:id => 'status_message_stream', :class => 'stream show'}
diff --git a/app/views/requests/_new_request_to_person.haml b/app/views/requests/_new_request_to_person.haml
index b1fbee6c9..52f207b74 100644
--- a/app/views/requests/_new_request_to_person.haml
+++ b/app/views/requests/_new_request_to_person.haml
@@ -8,4 +8,4 @@
     = request.hidden_field :to, :value => destination_handle
     = request.submit t('people.person.add_contact'), :disable_with => t('requests.create.sending')
   .message.hidden
-    %i sent!
+    %i= t('.sent')
diff --git a/app/views/shared/_add_contact.html.haml b/app/views/shared/_add_contact.html.haml
index ced70b7af..fb6fd8480 100644
--- a/app/views/shared/_add_contact.html.haml
+++ b/app/views/shared/_add_contact.html.haml
@@ -3,14 +3,14 @@
 -#   the COPYRIGHT file.
 
 
-%h3 Add a new contact
+%h3= t('aspects.manage.add_a_new_contact')
 
 = form_tag(person_by_handle_path, :id => "new_request_to_#{aspect.id}", :class => "webfinger_form", :remote => true) do
   =t('.enter_a_diaspora_username')
   %br
   %i= t '.your_diaspora_username_is', :diaspora_handle  => current_user.diaspora_handle
 
-  = search_field_tag :diaspora_handle,'', :id => "request_d_handle_to_#{aspect.id}", :results => 5, :placeholder => "Diaspora handle"
+  = search_field_tag :diaspora_handle,'', :id => "request_d_handle_to_#{aspect.id}", :results => 5, :placeholder => t('.diaspora_handle')
   = hidden_field_tag :aspect_id, aspect.id
 
   - if defined?(getting_started)
@@ -18,13 +18,13 @@
   - if defined?(manage)
     = hidden_field_tag :manage, true
 
-  = submit_tag t('.create_request')
+  = submit_tag t('requests.manage_aspect_contacts.create_request')
 %br
 #loader.hidden= image_tag 'ajax-loader.gif'
 %ul#request_result{:aspect_id => aspect.id}
   %li.error.hidden
     #message
-      = link_to "Know their email address? You should invite them", "#invite_user_pane", :class => "invite_user_button"
+      = link_to t('requests.manage_aspect_contacts.know_email'), "#invite_user_pane", :class => "invite_user_button"
     %br
     .yo{ :style => "display:none;"}
       #invite_user_pane
diff --git a/app/views/shared/_aspect_contacts.haml b/app/views/shared/_aspect_contacts.haml
index a2b726a61..c01d80fab 100644
--- a/app/views/shared/_aspect_contacts.haml
+++ b/app/views/shared/_aspect_contacts.haml
@@ -25,13 +25,13 @@
         $("#edit_aspect_pane").addClass("active");
         $(".contact_pictures").fadeOut(200, function(){
           $("#edit_aspect_pane").fadeIn(200);
-          trigger.html("done editing");
+          trigger.html("#{t('.done_editing')}");
         });
       },
 
       fadeOut: function(){
         var trigger = $("#edit_aspect_trigger");
-        trigger.html("edit aspect");
+        trigger.html("#{t('.edit_aspect')}");
 
         $("#edit_aspect_pane").removeClass("active");
         $("#edit_aspect_pane").fadeOut(200, function(){
@@ -51,9 +51,9 @@
   #new_request_pane{:class => "everyone"}
     %h1.new_request
       - if @request_count > 1
-        = link_to "#{@request_count} new requests!", aspects_manage_path
+        = link_to t('.new_requests', :count => @request_count), aspects_manage_path
       - else
-        = link_to "#{@request_count} new request!", aspects_manage_path
+        = link_to t('.new_request', :count => @request_count), aspects_manage_path
 
 #left_pane{:class => ("everyone" if aspect == :all)}
   - if aspect == :all
@@ -62,26 +62,26 @@
     %h2{:style=>"position:relative;margin-bottom:0;"}
       = aspect
       .right
-        = link_to "edit aspect", "#", :id => "edit_aspect_trigger", :class => "button"
+        = link_to t('.edit_aspect'), "#", :id => "edit_aspect_trigger", :class => "button"
 
     %span.aspect_contact_count{:style=>"color:#999;font-size:14px;"}
       = aspect.contacts.count
       - if aspect.contacts.count == 1
-        contact
+        = t('.contact')
       - else
-        contacts
+        = t('.contacts')
 
   - unless aspect == :all
     #edit_aspect_pane
       - if @contacts.count > 0 
-        %h3 Add an existing contact
+        %h3= t('.add_existing')
         = render 'shared/contact_list', :aspect => aspect, :contacts => @contacts, :manage => defined?(manage)
 
       = render 'shared/add_contact', :aspect => aspect
 
-      %h3 Aspect settings
+      %h3= t('.aspect_settings')
       .big_buttons
-        = button_to "Remove Aspect", aspect, :method => "delete", :confirm => "Remove aspect?"
+        = button_to t('.remove_aspect'), aspect, :method => "delete", :confirm => t('.confirm_remove_aspect')
 
   .contact_pictures
     - for contact in contacts
@@ -89,7 +89,7 @@
 
     - if aspect == :all && @contacts.count == 0
       %h4
-        You currently have no contacts.  Find your contacts here.
+        = t('.no_contacts')
       = form_tag(people_path, :method => 'get') do
         = text_field_tag 'q', nil, :placeholder => t('search'), :type => 'search', :results => 5
 
@@ -101,9 +101,9 @@
       %br
 
       %h3{:style=>"position:relative;"}
-        Aspects
+        = t('.aspects')
         .right{:style=>"font-size:12px;top:7px;"}
-          = link_to 'add aspect', '#add_aspect_pane', :class => "add_aspect_button"
+          = link_to t('.add_aspect'), '#add_aspect_pane', :class => "add_aspect_button"
 
       - for user_aspect in current_user.aspects
 
@@ -111,7 +111,7 @@
           %h4.aspect_title_right{:style => "margin-bottom:0;"}
             = link_to user_aspect, user_aspect
             %span{:style=>"font-size:12px;color:#888;"}
-              = "#{user_aspect.contacts.count} contacts"
+              = "#{user_aspect.contacts.count} #{t('.contacts')}"
 
           - if user_aspect.contacts.count > 0 
             - for aspect_contact in user_aspect.contacts[0..8]
@@ -124,7 +124,7 @@
       %br
       %br
 
-      %h3 Invites
-      %p invite people to join Diaspora.
+      %h3= t('.invites')
+      %p= t('.invite_people')
       = render "shared/invitations", :invites => @invites
 
diff --git a/app/views/shared/_author_info.html.haml b/app/views/shared/_author_info.html.haml
index 9cebe4f87..65ba39764 100644
--- a/app/views/shared/_author_info.html.haml
+++ b/app/views/shared/_author_info.html.haml
@@ -13,5 +13,5 @@
               - for aspect in current_user.aspects_with_post( post.id )
                 %li= link_to aspect.name, aspect
     #person_nav_links
-      = link_to t('.view_profile'), person_path(person)
+      = link_to t('layouts.header.view_profile'), person_path(person)
       = link_to t('_photos'), person_photos_path(person)
diff --git a/app/views/shared/_contact_list.html.haml b/app/views/shared/_contact_list.html.haml
index 29aae463c..9b998dced 100644
--- a/app/views/shared/_contact_list.html.haml
+++ b/app/views/shared/_contact_list.html.haml
@@ -45,7 +45,7 @@
       });
 
       $('.remove').live('ajax:failure', function(data, html, xhr) {
-        alert("Cannot remove person from last aspect.");
+        alert("#{t('.cannot_remove')}");
       });
 
       $('.add').live('ajax:success', function(data, html, xhr) {
diff --git a/app/views/shared/_publisher.haml b/app/views/shared/_publisher.haml
index 265991084..7551a55c6 100644
--- a/app/views/shared/_publisher.haml
+++ b/app/views/shared/_publisher.haml
@@ -27,11 +27,11 @@
     %ul#photodropzone
     = status.error_messages
     #file-upload.button
-      add photos
+      = t('.add_photos')
 
     %p
       %params
-        = status.label :message, t('.post_a_message_to', :aspect => (aspect == :all ? "all contacts" : aspect))
+        = status.label :message, t('.post_a_message_to', :aspect => (aspect == :all ? t('.all_contacts') : aspect))
         = status.text_area :message, :rows => 2, :value => params[:prefill]
 
     = status.hidden_field :to, :value => (aspect == :all ? aspect : aspect.id)
diff --git a/app/views/status_messages/show.html.haml b/app/views/status_messages/show.html.haml
index 3ffde4d07..5aa7c9104 100644
--- a/app/views/status_messages/show.html.haml
+++ b/app/views/status_messages/show.html.haml
@@ -19,7 +19,7 @@
     = link_to t('.destroy'), @status_message, :confirm => t('are_you_sure'), :method => :delete
 
 .span-9.last
-  %h4{:style=>"margin-bottom:5px;"} Comments
+  %h4{:style=>"margin-bottom:5px;"}= t('_comments')
   %div{:class => 'stream show', :id => 'status_message_stream'}
     %li.message{:data=>{:guid=>@status_message.id}}
       = render "comments/comments", :post => @status_message
diff --git a/app/views/users/getting_started.html.haml b/app/views/users/getting_started.html.haml
index 68e822261..8b2a5b617 100644
--- a/app/views/users/getting_started.html.haml
+++ b/app/views/users/getting_started.html.haml
@@ -12,7 +12,7 @@
 
       $(".aspects li").find(".delete").live("click", function(){
         var aspectElement = $(this).parent("li");
-        if (confirm("are you sure?")){
+        if (confirm(#{t('are_you_sure')})){
           aspectElement.fadeOut(300, function(){aspectElement.remove();});
         }
       });
diff --git a/app/views/users/getting_started/_step_1.html.haml b/app/views/users/getting_started/_step_1.html.haml
index 038d9a724..c24bc0519 100644
--- a/app/views/users/getting_started/_step_1.html.haml
+++ b/app/views/users/getting_started/_step_1.html.haml
@@ -5,7 +5,7 @@
 
 = form_for @person, :html => { :multipart => true } do |person|
   %h3
-    = t('.your_profile')
+    = t('people.edit.your_profile')
     .description
       = t('people.edit.info_available_to')
 
diff --git a/app/views/users/getting_started/_step_4.html.haml b/app/views/users/getting_started/_step_4.html.haml
index 99c6c5512..d749110ed 100644
--- a/app/views/users/getting_started/_step_4.html.haml
+++ b/app/views/users/getting_started/_step_4.html.haml
@@ -31,7 +31,7 @@
   = t('.user_menu')
 %p
   = t('.manage_aspects')
-  %b #{t('shared.aspect_nav.manage')}
+  %b #{t('.manage')}
   = t('.tab_also_added')
 
 .submit_block
diff --git a/config/locales/devise/devise.en.yml b/config/locales/devise/devise.en.yml
index c6cec0c6c..77ead1831 100644
--- a/config/locales/devise/devise.en.yml
+++ b/config/locales/devise/devise.en.yml
@@ -27,12 +27,16 @@ en:
     passwords:
       send_instructions: 'You will receive an email with instructions about how to reset your password in a few minutes.'
       updated: 'Your password was changed successfully. You are now signed in.'
+      edit:
+        change_password: "Change my password"
       new:
         forgot_password: "Forgot your password?"
         send_password_instructions: "Send me reset password instructions"
     confirmations:
       send_instructions: 'You will receive an email with instructions about how to confirm your account in a few minutes.'
       confirmed: 'Your account was successfully confirmed. You are now signed in.'
+      new:
+        resend_confirmation: "Resend confirmation instructions" 
     registrations:
       signed_up: 'You have signed up successfully. If enabled, a confirmation was sent to your e-mail.'
       updated: 'You updated your account successfully.'
@@ -40,6 +44,8 @@ en:
     unlocks:
       send_instructions: 'You will receive an email with instructions about how to unlock your account in a few minutes.'
       unlocked: 'Your account was successfully unlocked. You are now signed in.'
+      new:
+        resend_unlock: "Resend unlock instructions"
     invitations:
       send_instructions: 'Your invitation has been sent.'
       invitation_token_invalid: 'The invitation token provided is not valid!'
@@ -76,4 +82,5 @@ en:
         sign_in: 'Sign in'
         sign_up: 'Sign up'
         forgot_your_password: 'Forgot your password?'
-        
+        receive_confirmation: "Didn't receive confirmation instructions?"
+        receive_unlock: "Didn't receive unlock instructions?"
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 66506aad5..3f93bbf92 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -26,6 +26,8 @@ en:
   back: "Back"
   the_world: "the world"
   search: "Search"
+  _home: "Home"
+  _comments: "Comments"
   
   activemodel:
       errors:
@@ -60,10 +62,6 @@ en:
         blog: "blog"
         developers: "developers"
         login: "login"
-        add_a_new_aspect: "add a new aspect"
-        manage: "Manage"
-        manage_your_aspects: "Manage your Aspects"
-        everyone: "Everyone"
       application:
         powered_by: "POWERED BY DIASPORA*"
   shared:
@@ -77,27 +75,34 @@ en:
           share_with_all: "Share with all aspects"
           share_with: "Share with %{aspect}"
           all: "all"
+          add_photos: "add photos"
+          all_contacts: "all contacts"
       aspect_contacts:
-          add_contacts: "add contacts"
-          everyone: "Everyone"
           add_to: "add to %{aspect}"
-          add_a_new_contact_to: "Add a new contact to"
+          done_editing: "done editing"
+          new_requests: "%{count} new requests!"
+          new_request: "%{count} new request!"
+          edit_aspect: "edit aspect"
+          contact: "contact"
+          contacts: "contacts"
+          add_existing: "Add an existing contact"
+          aspect_settings: "Aspect settings"
+          remove_aspect: "Remove Aspect"
+          confirm_remove_aspect: "Remove aspect?"
+          no_contacts: "You currently have no contacts.  Find your contacts here."
+          aspects: "Aspects"
+          add_aspect: "add aspect"
+          invites: "Invites"
+          invite_people: "invite people to join Diaspora."
       add_contact:
           enter_a_diaspora_username: "Enter a Diaspora username:"
           your_diaspora_username_is: "Your Diaspora username is: %{diaspora_handle}"
-          contact_username: "Contact's username"
-          create_request: "Create request"
+          diaspora_handle: "Diaspora handle"
       invitations:
-          invites: "Invites"
           invite_someone: "Invite someone"
           invitations_left: "(%{count} left)"
       reshare:
           reshare: "Reshare"
-      author_info:
-          view_profile: "View profile"
-          status_messages: "status messages"
-          viewing: "viewing"
-          all: "all"
       public_explain:
           title: "You are about to post a public message!"
           outside: "Public messages will be available for others outside of Diaspora to see."
@@ -107,8 +112,7 @@ en:
           new: "New %{type} from %{from}"
       contact_list:
           search_contacts: "Search contacts"
-          add_to: "Add %{name} to %{aspect}"
-          remove_from: "Remove %{name} from %{aspect}"
+          cannot_remove: "Cannot remove person from last aspect."
   aspects:
       no_contacts_message:
           nobody: "We know you know people — bring them to Diaspora!"
@@ -149,6 +153,11 @@ en:
       remove_from_aspect:
           success: "Successfully removed person from aspect"
           failure: "Failed to remove person from aspect"
+      seed:
+          family: "Family"
+          work: "Work"
+      index:
+          handle_explanation: "This is your diaspora handle.  Like an email address, you can give this to people to reach you."
   users:
       edit:
           invite_contacts: "Invite contacts"
@@ -169,8 +178,6 @@ en:
           finished: "Finished!"
           skip: "skip getting started"
           save_and_continue: "Save and continue"
-          step_1:
-              your_profile: "Your Profile"
           step_2:
               your_aspects: "Your aspects"
               description: "Tell Diaspora what different aspects of you are seen by different contacts.  You can manage these later by clicking the manage tab on the top right.  Your aspects are unique to you, and not visible by others."
@@ -189,6 +196,7 @@ en:
               manage_aspects: "You can manage your aspects any time by clicking the"
               tab_also_added: "tab.  Your contacts can also be added while on a particular aspect page, as well."
               finish: "Finish"
+              manage: "Manage"
       update:
           password_changed: "Password Changed"
           password_not_changed: "Password Change Failed"
@@ -203,13 +211,12 @@ en:
   photos:
       show:
           delete_photo: "Delete Photo"
-          prev: "prev"
-          full_size: "full size"
-          next: "next"
-          edit_photo: "Edit Photo"
-          add_a_description: "Add a description"
           make_profile_photo: "make profile photo"
           update_photo: "Update Photo"
+          view: "view"
+          edit: "edit"
+          edit_delete_photo: "Edit photo description / delete photo"
+          original_post: "Original Post"
       edit:
           editing: "Editing"
       photo:
@@ -228,9 +235,6 @@ en:
       destroy:
           notice: "Photo deleted."
       new_photo:
-          drop: "Drop photos here to upload"
-          upload: "Upload a photo"
-          failed: "Failed"
           invalid_ext: "{file} has invalid extension. Only {extensions} are allowed."
           size_error: "{file} is too large, maximum file size is {sizeLimit}."
           empty: "{file} is empty, please select files again without it."
@@ -263,6 +267,8 @@ en:
           send_invitation: "Send invitation"
       check_token:
           not_found: "Invitation token not found"
+      edit:
+          sign_up: "sign_up"
   status_messages:
       new_status_message:
           tell_me_something_good: "tell me something good"
@@ -305,11 +311,12 @@ en:
       profile_sidebar:
           remove_contact: "remove contact"
           edit_my_profile: "Edit my profile"
-          last_seen: "last seen: %{how_long_ago}"
           bio: "bio"
           gender: "gender"
           born: "born"
           in_aspects: "in aspects"
+          cannot_remove: "Cannot remove %{name} from last aspect."
+          remove_from: "Remove %{name} from %{aspect}?"
       helper:
            results_for: " results for %{params}"
            people_on_pod_are_aware_of: " people on pod are aware of"
@@ -329,7 +336,8 @@ en:
       create:
           sending: "Sending..."
           sent: "You've asked to share with %{name}.  They should see it next time they log in to Diaspora."
-          tried: "we tried our best to send a message to %{account}"
+      new_request_to_person:
+          sent: "sent!"
   services:
       index:
         logged_in_as: "logged in as"
@@ -341,9 +349,6 @@ en:
           success: "Authentication successful."
       destroy:
           success: "Successfully destroyed authentication."
-  dashboards:
-      helper:
-          home: "Home"
   notifier:
       hello: "Hello %{name}!"
       love: "love,"
@@ -362,3 +367,17 @@ en:
           share_what_you_want: "Share what you want, with who you want."
           already_account: "already have an account?"
           login_here: "log in here"
+          choice: "Choice"
+          choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects.
+Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared
+with only the people you want them to be."
+          ownership: "Ownership"
+          ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just in order
+to share them. You maintain ownership of everything you share on Diaspora,
+giving you full control over how it is distributed."
+          simplicity: "Simplicity"
+          simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy.
+Innherently private, Diaspora doesn’t have pages of settings and options to
+wade through to keep your profile secure and to your liking."
+          learn_about_host: "Learn about how to host your own Diaspora server"
+          learn_about_open_source: "Learn more about Diaspora as an open source project."
diff --git a/public/javascripts/view.js b/public/javascripts/view.js
index f67dc0d7d..3e8138c19 100644
--- a/public/javascripts/view.js
+++ b/public/javascripts/view.js
@@ -121,6 +121,7 @@ $.fn.clearForm = function() {
 
 var video_active_container = null;
 
+
 function openVideo(type, videoid, link) {
   var container = document.createElement('div'),
       $container = $(container);

From ab37fd0d9863b2fb3e2242c92ebe5ea11f44cd22 Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Mon, 22 Nov 2010 14:11:27 -0800
Subject: [PATCH 2/8] Fix type-o on front page, copy edit a bit.

---
 config/locales/diaspora/en.yml | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 3f93bbf92..51901b871 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -368,16 +368,10 @@ en:
           already_account: "already have an account?"
           login_here: "log in here"
           choice: "Choice"
-          choice_explanation: "Diaspora allows you to sort your connections into groups called Aspects.
-Unique to Diaspora, Aspects ensure your photos, stories and jokes are shared
-with only the people you want them to be."
+          choice_explanation: "Diaspora lets you sort your connections into groups called aspects. Unique to Diaspora, aspects ensure that your photos, stories and jokes are shared only with the people you intend."
           ownership: "Ownership"
-          ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just in order
-to share them. You maintain ownership of everything you share on Diaspora,
-giving you full control over how it is distributed."
+          ownership_explanation: "You own your pictures, and you shouldn’t have to give that up just to share them. You maintain ownership of everything you share on Diaspora, giving you full control over how it's distributed."
           simplicity: "Simplicity"
-          simplicity_explanation: "Diaspora makes sharing clean and easy – this goes doubly so for privacy.
-Innherently private, Diaspora doesn’t have pages of settings and options to
-wade through to keep your profile secure and to your liking."
+          simplicity_explanation: "Diaspora makes sharing clean and easy – and this goes for privacy too. Inherently private, Diaspora doesn’t make you wade through pages of settings and options just to keep your profile secure."
           learn_about_host: "Learn about how to host your own Diaspora server"
           learn_about_open_source: "Learn more about Diaspora as an open source project."

From 0e7b1f5eb718fac9b68b7637bc5b757dc49232e6 Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Mon, 22 Nov 2010 13:26:00 -0800
Subject: [PATCH 3/8] status messages and comments made by user will ajax onto
 the current page, and websocket everywhere else.

---
 app/controllers/comments_controller.rb        | 10 +++-
 app/controllers/status_messages_controller.rb | 13 ++++-
 app/helpers/sockets_helper.rb                 |  3 +-
 app/views/comments/_comment.html.haml         |  2 +-
 public/javascripts/stream.js                  | 17 ++++++
 public/javascripts/web-socket-receiver.js     | 56 ++++++++++---------
 6 files changed, 71 insertions(+), 30 deletions(-)

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index b8f051e57..5b39a1008 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -3,6 +3,7 @@
 #   the COPYRIGHT file.
 
 class CommentsController < ApplicationController
+  include ApplicationHelper
   before_filter :authenticate_user!
 
   respond_to :html
@@ -15,7 +16,14 @@ class CommentsController < ApplicationController
     @comment = current_user.comment(text, :on => target) if target
     if @comment
       Rails.logger.info("event=comment_create user=#{current_user.inspect} status=success comment=#{@comment.inspect}")
-      render :nothing => true, :status => 201
+
+      respond_to do |format|
+        format.js{ render :json => { :post_id => @comment.post_id,
+                                     :comment_id => @comment.id,
+                                     :html => render_to_string(:partial => type_partial(@comment), :locals => {:post => @comment, :current_user => current_user})},
+                                     :status => 201 }
+        format.html{ render :nothing => true, :status => 201 }
+      end
     else
       render :nothing => true, :status => 401
     end
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 54487dbeb..d4992fb25 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -26,9 +26,18 @@ class StatusMessagesController < ApplicationController
       for photo in photos
         current_user.dispatch_post(photo, :to => params[:status_message][:to])
       end
+
+      respond_to do |format|
+        format.js{ render :json => { :post_id => @status_message.id,
+                                     :html => render_to_string(:partial => 'shared/stream_element', :locals => {:post => @status_message, :current_user => current_user})},
+                                     :status => 201 }
+        format.html{ respond_with @status_message }
+      end
+    else
+      respond_to do |format|
+        format.js{ render :status => 401 }
+      end
     end
-  
-    render :nothing => true
   end
 
 
diff --git a/app/helpers/sockets_helper.rb b/app/helpers/sockets_helper.rb
index d646f0e4e..214665ef3 100644
--- a/app/helpers/sockets_helper.rb
+++ b/app/helpers/sockets_helper.rb
@@ -23,13 +23,14 @@ module SocketsHelper
       Rails.logger.error("web socket view rendering failed for object #{object.inspect}.")
       raise e
     end
-    action_hash = {:class =>object.class.to_s.underscore.pluralize,  :html => v, :post_id => obj_id(object)}
+    action_hash = {:class =>object.class.to_s.underscore.pluralize, :html => v, :post_id => obj_id(object)}
     action_hash.merge! opts
     if object.is_a? Photo
       action_hash[:photo_hash] = object.thumb_hash
     end
 
     if object.is_a? Comment
+      action_hash[:comment_id] = object.id
       action_hash[:my_post?] = (object.post.person.owner.id == uid)
       action_hash[:notification] = notification(object)
     end
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index f84d4b6d5..fe94bd6fd 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -2,7 +2,7 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-%li.comment
+%li.comment{:data=>{:guid=>post.id}}
   = person_image_link(post.person)
   .content
     .from
diff --git a/public/javascripts/stream.js b/public/javascripts/stream.js
index a3495e720..1a8e9b31b 100644
--- a/public/javascripts/stream.js
+++ b/public/javascripts/stream.js
@@ -6,6 +6,7 @@
 
 $(document).ready(function(){
   var $stream = $(".stream");
+  var $publisher = $("#publisher");
   // expand all comments on page load
 	$(".stream:not('.show')").find('.comments').each(function(index) {
       var comments = $(this);
@@ -51,6 +52,22 @@ $(document).ready(function(){
     }
   });
 
+  $(".new_status_message").bind('ajax:success', function(data, json, xhr){
+    json = $.parseJSON(json); 
+    WebSocketReceiver.addPostToStream(json['post_id'],json['html']);
+  });
+  $(".new_status_message").bind('ajax:failure', function(data, html, xhr){
+    alert('failed to post message!');
+  });
+
+  $(".new_comment").live('ajax:success', function(data, json, xhr){
+    json = $.parseJSON(json); 
+    WebSocketReceiver.processComment(json['post_id'],json['comment_id'],json['html'],false);
+  });
+  $(".new_comment").live('ajax:failure', function(data, html, xhr){
+    alert('failed to post message!');
+  });
+
 });//end document ready
 
 
diff --git a/public/javascripts/web-socket-receiver.js b/public/javascripts/web-socket-receiver.js
index 4fa546f93..66b044cc2 100644
--- a/public/javascripts/web-socket-receiver.js
+++ b/public/javascripts/web-socket-receiver.js
@@ -27,10 +27,10 @@ var WebSocketReceiver = {
           WebSocketReceiver.processRetraction(obj['post_id']);
 
         }else if (obj['class']=="comments"){
-          WebSocketReceiver.processComment(obj['post_id'], obj['html'], {'notification':obj['notification'], 'mine?':obj['mine?'], 'my_post?':obj['my_post?']})
+          WebSocketReceiver.processComment(obj['post_id'], obj['comment_id'], obj['html'], {'notification':obj['notification'], 'mine?':obj['mine?'], 'my_post?':obj['my_post?']})
 
         }else{
-          WebSocketReceiver.processPost(obj['class'], obj['html'], obj['aspect_ids'])
+          WebSocketReceiver.processPost(obj['class'], obj['post_id'], obj['html'], obj['aspect_ids'])
         }
       }
   },
@@ -62,44 +62,50 @@ var WebSocketReceiver = {
     }
   },
 
-  processComment: function(post_id, html, opts){
-    post = $("*[data-guid='"+post_id+"']'");
-    $('.comments li:last', post ).before(
-      $(html).fadeIn("fast", function(){})
-    );
-    toggler = $('.show_post_comments', post);
+  processComment: function(postId, commentId, html, opts){
 
-    if(toggler.length > 0){
-      toggler.html(
-        toggler.html().replace(/\d+/,$('.comments', post)[0].childElementCount -1)
+    if( $(".comment[data-guid='"+commentId+"']").length == 0 ){
+
+      post = $("*[data-guid='"+postId+"']'");
+      $('.comments li:last', post ).before(
+        $(html).fadeIn("fast", function(){})
       );
+      toggler = $('.show_post_comments', post);
 
-      if( !$(".comments", post).is(':visible') ){
-        toggler.click();
+      if(toggler.length > 0){
+        toggler.html(
+          toggler.html().replace(/\d+/,$('.comments', post)[0].childElementCount -1)
+        );
+
+        if( !$(".comments", post).is(':visible') ){
+          toggler.click();
+        }
       }
-    }
 
-    if( !opts['mine?'] && opts['my_post?']) {
-      WebSocketReceiver.processNotification(opts['notification']);
+      if( !opts['mine?'] && opts['my_post?']) {
+        WebSocketReceiver.processNotification(opts['notification']);
+      }
     }
   },
 
-  processPost: function(className, html, aspectIds){
+  processPost: function(className, postId, html, aspectIds){
     if(WebSocketReceiver.onPageForAspects(aspectIds)){
       if( $("#no_posts").is(":visible") ){
-        $("#no_posts").fadeOut(400, WebSocketReceiver.addPostToStream(html)).hide();
+        $("#no_posts").fadeOut(400, WebSocketReceiver.addPostToStream(postId, html)).hide();
       } else {
-        WebSocketReceiver.addPostToStream(html);
+        WebSocketReceiver.addPostToStream(postId, html);
       }
     }
   },
 
-  addPostToStream: function(html){
-    $("#main_stream:not('.show')").prepend(
-      $(html).fadeIn("fast", function(){
-        $("#main_stream").find("label").first().inFieldLabels();
-      })
-    );
+  addPostToStream: function(postId, html){
+    if( $(".message[data-guid='"+postId+"']").length == 0 ){
+      $("#main_stream:not('.show')").prepend(
+        $(html).fadeIn("fast", function(){
+          $("#main_stream").find("label").first().inFieldLabels();
+        })
+      );
+    }
   },
 
   onPageForClass: function(className){

From 26a11f7ab60205336ed33624db93281c7c276dfb Mon Sep 17 00:00:00 2001
From: danielvincent <danielgrippi@gmail.com>
Date: Mon, 22 Nov 2010 14:52:01 -0800
Subject: [PATCH 4/8] firefox bugfix on photo#show

---
 public/stylesheets/sass/application.sass | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 4cc044cc5..1859a8e91 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -159,8 +159,9 @@ header
     :background
       :color #000
     
-    :border
-      :radius 5px
+    :-webkit-border-radius 5px
+    :-moz-border-radius 5px
+    :border-radius 5px
 
     :position absolute
     :display inline
@@ -688,6 +689,8 @@ li.message .from .right
   :-moz-border-radius 3px
   :border-radius 3px
 
+  :max-width 100%
+
   img
     :z-index 2
     :position relative
@@ -1261,7 +1264,10 @@ ul#settings_nav
     :color rgb(250,250,250)
   :border 1px solid #ddd
   :padding 11px
+
   :-webkit-border-radius 4px
+  :-moz-border-radius 4px
+  :border-radius 4px
 
   h2,h3
     :border
@@ -1954,6 +1960,8 @@ h3,h4
     :color #ccc
 
   :-webkit-border-radius 10px
+  :-moz-border-radius 10px
+  :border-radius 10px
 
   :width 15px
   :max-width 12px

From edbb0bdf07c6dbbb225b5a42cec2682fea4ed835 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Mon, 22 Nov 2010 14:52:39 -0800
Subject: [PATCH 5/8] slightly more discriptive cannot remove the person from
 the last aspect messagge

---
 config/deploy_config.yml       | 2 +-
 config/locales/diaspora/en.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/deploy_config.yml b/config/deploy_config.yml
index 6538e273c..06a6747e1 100644
--- a/config/deploy_config.yml
+++ b/config/deploy_config.yml
@@ -6,7 +6,7 @@ cross_server:
   deploy_to: '/usr/local/app/diaspora'
   user: 'root'
   repo: 'git://github.com/diaspora/diaspora.git'
-  branch: 'homepage'
+  branch: 'master'
   default_env: 'development'
 servers:
   tom:
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 51901b871..58a4e5b4a 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -112,7 +112,7 @@ en:
           new: "New %{type} from %{from}"
       contact_list:
           search_contacts: "Search contacts"
-          cannot_remove: "Cannot remove person from last aspect."
+          cannot_remove: "Cannot remove person from last aspect.(If you want to disconnect from this person you must remove contact.)"
   aspects:
       no_contacts_message:
           nobody: "We know you know people — bring them to Diaspora!"

From e84ce5591f594faa0907bd020bd79e9dadad13a1 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Mon, 22 Nov 2010 14:55:30 -0800
Subject: [PATCH 6/8] The discription in several places

---
 config/locales/diaspora/en.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 58a4e5b4a..e33a0d542 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -112,7 +112,7 @@ en:
           new: "New %{type} from %{from}"
       contact_list:
           search_contacts: "Search contacts"
-          cannot_remove: "Cannot remove person from last aspect.(If you want to disconnect from this person you must remove contact.)"
+          cannot_remove: "Cannot remove person from last aspect. (If you want to disconnect from this person you must remove contact.)"
   aspects:
       no_contacts_message:
           nobody: "We know you know people — bring them to Diaspora!"
@@ -315,7 +315,7 @@ en:
           gender: "gender"
           born: "born"
           in_aspects: "in aspects"
-          cannot_remove: "Cannot remove %{name} from last aspect."
+          cannot_remove: "Cannot remove %{name} from last aspect. (If you want to disconnect from this person you must remove contact.)"
           remove_from: "Remove %{name} from %{aspect}?"
       helper:
            results_for: " results for %{params}"

From bedc7ca41b250487d24e0f748ed47d08365a5978 Mon Sep 17 00:00:00 2001
From: Sarah Mei <sarahmei@gmail.com>
Date: Mon, 22 Nov 2010 15:02:25 -0800
Subject: [PATCH 7/8] Made landing page and log in views content-type agnostic.
 Added an un-minified version of jquery-mobile for debugging.

---
 app/views/aspects/index.mobile.haml           |   12 +-
 .../sessions/{new.html.haml => new.haml}      |    0
 app/views/home/{show.html.haml => show.haml}  |    0
 config/assets.yml                             |    1 -
 public/javascripts/custom-mobile-scripting.js |   14 +-
 public/javascripts/vendor/jquery_mobile_a2.js | 3541 +++++++++++++++++
 6 files changed, 3552 insertions(+), 16 deletions(-)
 rename app/views/devise/sessions/{new.html.haml => new.haml} (100%)
 rename app/views/home/{show.html.haml => show.haml} (100%)
 create mode 100644 public/javascripts/vendor/jquery_mobile_a2.js

diff --git a/app/views/aspects/index.mobile.haml b/app/views/aspects/index.mobile.haml
index 95c790844..51b700fe0 100644
--- a/app/views/aspects/index.mobile.haml
+++ b/app/views/aspects/index.mobile.haml
@@ -1,13 +1,9 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
 %div{:data => {:role => 'content'}}
   %div{:data => {:role => 'fieldcontain'}}
     =render 'shared/publisher', :aspect => @aspect
 
 = render 'shared/stream', :posts => @posts
-
-/%div{:data => {:role => 'footer', :id => 'footer-toolbar', :position => 'fixed'}}
-/  %div{:data => {:role => 'navbar'}}
-/    %ul
-/      %li{:class => 'ui-btn-active'} 
-/        = link_to 'posts', '#'
-/      %li 
-/        =link_to 'contacts', '#'
diff --git a/app/views/devise/sessions/new.html.haml b/app/views/devise/sessions/new.haml
similarity index 100%
rename from app/views/devise/sessions/new.html.haml
rename to app/views/devise/sessions/new.haml
diff --git a/app/views/home/show.html.haml b/app/views/home/show.haml
similarity index 100%
rename from app/views/home/show.html.haml
rename to app/views/home/show.haml
diff --git a/config/assets.yml b/config/assets.yml
index 4a194cd3f..5a14264ae 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -17,7 +17,6 @@ javascripts:
   mobile:
     - public/javascripts/vendor/jquery144.min.js
     - public/javascripts/custom-mobile-scripting.js
-    - public/javascripts/rails.js
     - public/javascripts/vendor/jquery-ui-1.8.6.custom.min.js
     - public/javascripts/vendor/jquery_mobile_a2.min.js
     - public/javascripts/mobile.js
diff --git a/public/javascripts/custom-mobile-scripting.js b/public/javascripts/custom-mobile-scripting.js
index e435105d3..6d7583b6a 100644
--- a/public/javascripts/custom-mobile-scripting.js
+++ b/public/javascripts/custom-mobile-scripting.js
@@ -1,7 +1,7 @@
-$(document).bind("mobileinit", function(){
-  $.extend(  $.mobile , {
-
-    ajaxLinksEnabled : false
-    ajaxFormsEnabled : false
-  });
-});
+// $(document).bind("mobileinit", function(){
+//   $.extend(  $.mobile , {
+// 
+//     ajaxLinksEnabled : false
+//     ajaxFormsEnabled : false
+//   });
+// });
diff --git a/public/javascripts/vendor/jquery_mobile_a2.js b/public/javascripts/vendor/jquery_mobile_a2.js
new file mode 100644
index 000000000..6b9484d23
--- /dev/null
+++ b/public/javascripts/vendor/jquery_mobile_a2.js
@@ -0,0 +1,3541 @@
+/*!
+ * jQuery Mobile v1.0a2
+ * http://jquerymobile.com/
+ *
+ * Copyright 2010, jQuery Project
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ */
+/*!
+ * jQuery UI Widget @VERSION
+ *
+ * Copyright 2010, AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ *
+ * http://docs.jquery.com/UI/Widget
+ */
+(function( $, undefined ) {
+
+// jQuery 1.4+
+if ( $.cleanData ) {
+	var _cleanData = $.cleanData;
+	$.cleanData = function( elems ) {
+		for ( var i = 0, elem; (elem = elems[i]) != null; i++ ) {
+			$( elem ).triggerHandler( "remove" );
+		}
+		_cleanData( elems );
+	};
+} else {
+	var _remove = $.fn.remove;
+	$.fn.remove = function( selector, keepData ) {
+		return this.each(function() {
+			if ( !keepData ) {
+				if ( !selector || $.filter( selector, [ this ] ).length ) {
+					$( "*", this ).add( [ this ] ).each(function() {
+						$( this ).triggerHandler( "remove" );
+					});
+				}
+			}
+			return _remove.call( $(this), selector, keepData );
+		});
+	};
+}
+
+$.widget = function( name, base, prototype ) {
+	var namespace = name.split( "." )[ 0 ],
+		fullName;
+	name = name.split( "." )[ 1 ];
+	fullName = namespace + "-" + name;
+
+	if ( !prototype ) {
+		prototype = base;
+		base = $.Widget;
+	}
+
+	// create selector for plugin
+	$.expr[ ":" ][ fullName ] = function( elem ) {
+		return !!$.data( elem, name );
+	};
+
+	$[ namespace ] = $[ namespace ] || {};
+	$[ namespace ][ name ] = function( options, element ) {
+		// allow instantiation without initializing for simple inheritance
+		if ( arguments.length ) {
+			this._createWidget( options, element );
+		}
+	};
+
+	var basePrototype = new base();
+	// we need to make the options hash a property directly on the new instance
+	// otherwise we'll modify the options hash on the prototype that we're
+	// inheriting from
+//	$.each( basePrototype, function( key, val ) {
+//		if ( $.isPlainObject(val) ) {
+//			basePrototype[ key ] = $.extend( {}, val );
+//		}
+//	});
+	basePrototype.options = $.extend( true, {}, basePrototype.options );
+	$[ namespace ][ name ].prototype = $.extend( true, basePrototype, {
+		namespace: namespace,
+		widgetName: name,
+		widgetEventPrefix: $[ namespace ][ name ].prototype.widgetEventPrefix || name,
+		widgetBaseClass: fullName
+	}, prototype );
+
+	$.widget.bridge( name, $[ namespace ][ name ] );
+};
+
+$.widget.bridge = function( name, object ) {
+	$.fn[ name ] = function( options ) {
+		var isMethodCall = typeof options === "string",
+			args = Array.prototype.slice.call( arguments, 1 ),
+			returnValue = this;
+
+		// allow multiple hashes to be passed on init
+		options = !isMethodCall && args.length ?
+			$.extend.apply( null, [ true, options ].concat(args) ) :
+			options;
+
+		// prevent calls to internal methods
+		if ( isMethodCall && options.charAt( 0 ) === "_" ) {
+			return returnValue;
+		}
+
+		if ( isMethodCall ) {
+			this.each(function() {
+				var instance = $.data( this, name );
+				if ( !instance ) {
+					throw "cannot call methods on " + name + " prior to initialization; " +
+						"attempted to call method '" + options + "'";
+				}
+				if ( !$.isFunction( instance[options] ) ) {
+					throw "no such method '" + options + "' for " + name + " widget instance";
+				}
+				var methodValue = instance[ options ].apply( instance, args );
+				if ( methodValue !== instance && methodValue !== undefined ) {
+					returnValue = methodValue;
+					return false;
+				}
+			});
+		} else {
+			this.each(function() {
+				var instance = $.data( this, name );
+				if ( instance ) {
+					instance.option( options || {} )._init();
+				} else {
+					$.data( this, name, new object( options, this ) );
+				}
+			});
+		}
+
+		return returnValue;
+	};
+};
+
+$.Widget = function( options, element ) {
+	// allow instantiation without initializing for simple inheritance
+	if ( arguments.length ) {
+		this._createWidget( options, element );
+	}
+};
+
+$.Widget.prototype = {
+	widgetName: "widget",
+	widgetEventPrefix: "",
+	options: {
+		disabled: false
+	},
+	_createWidget: function( options, element ) {
+		// $.widget.bridge stores the plugin instance, but we do it anyway
+		// so that it's stored even before the _create function runs
+		$.data( element, this.widgetName, this );
+		this.element = $( element );
+		this.options = $.extend( true, {},
+			this.options,
+			this._getCreateOptions(),
+			options );
+
+		var self = this;
+		this.element.bind( "remove." + this.widgetName, function() {
+			self.destroy();
+		});
+
+		this._create();
+		this._trigger( "create" );
+		this._init();
+	},
+	_getCreateOptions: function() {
+		var options = {};
+		if ( $.metadata ) {
+			options = $.metadata.get( element )[ this.widgetName ];
+		}
+		return options;
+	},
+	_create: function() {},
+	_init: function() {},
+
+	destroy: function() {
+		this.element
+			.unbind( "." + this.widgetName )
+			.removeData( this.widgetName );
+		this.widget()
+			.unbind( "." + this.widgetName )
+			.removeAttr( "aria-disabled" )
+			.removeClass(
+				this.widgetBaseClass + "-disabled " +
+				"ui-state-disabled" );
+	},
+
+	widget: function() {
+		return this.element;
+	},
+
+	option: function( key, value ) {
+		var options = key;
+
+		if ( arguments.length === 0 ) {
+			// don't return a reference to the internal hash
+			return $.extend( {}, this.options );
+		}
+
+		if  (typeof key === "string" ) {
+			if ( value === undefined ) {
+				return this.options[ key ];
+			}
+			options = {};
+			options[ key ] = value;
+		}
+
+		this._setOptions( options );
+
+		return this;
+	},
+	_setOptions: function( options ) {
+		var self = this;
+		$.each( options, function( key, value ) {
+			self._setOption( key, value );
+		});
+
+		return this;
+	},
+	_setOption: function( key, value ) {
+		this.options[ key ] = value;
+
+		if ( key === "disabled" ) {
+			this.widget()
+				[ value ? "addClass" : "removeClass"](
+					this.widgetBaseClass + "-disabled" + " " +
+					"ui-state-disabled" )
+				.attr( "aria-disabled", value );
+		}
+
+		return this;
+	},
+
+	enable: function() {
+		return this._setOption( "disabled", false );
+	},
+	disable: function() {
+		return this._setOption( "disabled", true );
+	},
+
+	_trigger: function( type, event, data ) {
+		var callback = this.options[ type ];
+
+		event = $.Event( event );
+		event.type = ( type === this.widgetEventPrefix ?
+			type :
+			this.widgetEventPrefix + type ).toLowerCase();
+		data = data || {};
+
+		// copy original event properties over to the new event
+		// this would happen if we could call $.event.fix instead of $.Event
+		// but we don't have a way to force an event to be fixed multiple times
+		if ( event.originalEvent ) {
+			for ( var i = $.event.props.length, prop; i; ) {
+				prop = $.event.props[ --i ];
+				event[ prop ] = event.originalEvent[ prop ];
+			}
+		}
+
+		this.element.trigger( event, data );
+
+		return !( $.isFunction(callback) &&
+			callback.call( this.element[0], event, data ) === false ||
+			event.isDefaultPrevented() );
+	}
+};
+
+})( jQuery );
+/*
+* jQuery Mobile Framework : widget factory extentions for mobile
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+
+$.widget( "mobile.widget", {
+	_getCreateOptions: function() {
+		var elem = this.element,
+			options = {};
+		$.each( this.options, function( option ) {
+			var value = elem.data( option.replace( /[A-Z]/g, function( c ) {
+				return "-" + c.toLowerCase();
+			} ) );
+			if ( value !== undefined ) {
+				options[ option ] = value;
+			}
+		});
+		return options;
+	}
+});
+
+})( jQuery );
+/*
+* jQuery Mobile Framework : support tests
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+
+// test whether a CSS media type or query applies
+$.media = (function() {
+	// TODO: use window.matchMedia once at least one UA implements it
+	var cache = {},
+		$html = $( "html" ),
+		testDiv = $( "<div id='jquery-mediatest'>" ),
+		fakeBody = $( "<body>" ).append( testDiv );
+	
+	return function( query ) {
+		if ( !( query in cache ) ) {
+			var styleBlock = $( "<style type='text/css'>" +
+				"@media " + query + "{#jquery-mediatest{position:absolute;}}" +
+				"</style>" );
+			$html.prepend( fakeBody ).prepend( styleBlock );
+			cache[ query ] = testDiv.css( "position" ) === "absolute";
+			fakeBody.add( styleBlock ).remove();
+		}
+		return cache[ query ];
+	};
+})();
+
+var fakeBody = $( "<body>" ).prependTo( "html" ),
+	fbCSS = fakeBody[0].style,
+	vendors = ['webkit','moz','o'],
+	webos = window.palmGetResource || window.PalmServiceBridge, //only used to rule out scrollTop 
+	bb = window.blackberry; //only used to rule out box shadow, as it's filled opaque on BB
+
+//thx Modernizr
+function propExists( prop ){
+	var uc_prop = prop.charAt(0).toUpperCase() + prop.substr(1),
+		props   = (prop + ' ' + vendors.join(uc_prop + ' ') + uc_prop).split(' ');
+	for(var v in props){
+		if( fbCSS[ v ] !== undefined ){
+			return true;
+		}
+	}
+};
+
+//test for dynamic-updating base tag support (allows us to avoid href,src attr rewriting)
+function baseTagTest(){
+	var fauxBase = location.protocol + '//' + location.host + location.pathname + "ui-dir/",
+		base = $("<base>", {"href": fauxBase}).appendTo("head"),
+		link = $( "<a href='testurl'></a>" ).prependTo( fakeBody ),
+		rebase = link[0].href;
+	base.remove();
+	return rebase.indexOf(fauxBase) === 0;
+};
+
+$.extend( $.support, {
+	orientation: "orientation" in window,
+	touch: "ontouchend" in document,
+	cssTransitions: "WebKitTransitionEvent" in window,
+	pushState: !!history.pushState,
+	mediaquery: $.media('only all'),
+	cssPseudoElement: !!propExists('content'),
+	boxShadow: !!propExists('boxShadow') && !bb,
+	scrollTop: ("pageXOffset" in window || "scrollTop" in document.documentElement || "scrollTop" in fakeBody[0]) && !webos,
+	dynamicBaseTag: baseTagTest()
+});
+
+fakeBody.remove();
+
+//for ruling out shadows via css
+if( !$.support.boxShadow ){ $('html').addClass('ui-mobile-nosupport-boxshadow'); }
+
+})( jQuery );(function($, undefined ) {
+
+// add new event shortcuts
+$.each( "touchstart touchmove touchend orientationchange tap taphold swipe swipeleft swiperight scrollstart scrollstop".split( " " ), function( i, name ) {
+	$.fn[ name ] = function( fn ) {
+		return fn ? this.bind( name, fn ) : this.trigger( name );
+	};
+	$.attrFn[ name ] = true;
+});
+
+var supportTouch = $.support.touch,
+	scrollEvent = "touchmove scroll",
+	touchStartEvent = supportTouch ? "touchstart" : "mousedown",
+	touchStopEvent = supportTouch ? "touchend" : "mouseup",
+	touchMoveEvent = supportTouch ? "touchmove" : "mousemove";
+
+// also handles scrollstop
+$.event.special.scrollstart = {
+	enabled: true,
+	
+	setup: function() {
+		var thisObject = this,
+			$this = $( thisObject ),
+			scrolling,
+			timer;
+		
+		function trigger( event, state ) {
+			scrolling = state;
+			var originalType = event.type;
+			event.type = scrolling ? "scrollstart" : "scrollstop";
+			$.event.handle.call( thisObject, event );
+			event.type = originalType;
+		}
+		
+		// iPhone triggers scroll after a small delay; use touchmove instead
+		$this.bind( scrollEvent, function( event ) {
+			if ( !$.event.special.scrollstart.enabled ) {
+				return;
+			}
+			
+			if ( !scrolling ) {
+				trigger( event, true );
+			}
+			
+			clearTimeout( timer );
+			timer = setTimeout(function() {
+				trigger( event, false );
+			}, 50 );
+		});
+	}
+};
+
+// also handles taphold
+$.event.special.tap = {
+	setup: function() {
+		var thisObject = this,
+			$this = $( thisObject );
+		
+		$this
+			.bind( touchStartEvent, function( event ) {
+				if ( event.which && event.which !== 1 ) {
+					return;
+				}
+				
+				var moved = false,
+					touching = true,
+					origPos = [ event.pageX, event.pageY ],
+					originalType,
+					timer;
+				
+				function moveHandler() {
+					if ((Math.abs(origPos[0] - event.pageX) > 10) ||
+					    (Math.abs(origPos[1] - event.pageY) > 10)) {
+					    moved = true;
+					}
+				}
+				
+				timer = setTimeout(function() {
+					if ( touching && !moved ) {
+						originalType = event.type;
+						event.type = "taphold";
+						$.event.handle.call( thisObject, event );
+						event.type = originalType;
+					}
+				}, 750 );
+				
+				$this
+					.one( touchMoveEvent, moveHandler)
+					.one( touchStopEvent, function( event ) {
+						$this.unbind( touchMoveEvent, moveHandler );
+						clearTimeout( timer );
+						touching = false;
+						
+						if ( !moved ) {
+							originalType = event.type;
+							event.type = "tap";
+							$.event.handle.call( thisObject, event );
+							event.type = originalType;
+						}
+					});
+			});
+	}
+};
+
+// also handles swipeleft, swiperight
+$.event.special.swipe = {
+	setup: function() {
+		var thisObject = this,
+			$this = $( thisObject );
+		
+		$this
+			.bind( touchStartEvent, function( event ) {
+				var data = event.originalEvent.touches ?
+						event.originalEvent.touches[ 0 ] :
+						event,
+					start = {
+						time: (new Date).getTime(),
+						coords: [ data.pageX, data.pageY ],
+						origin: $( event.target )
+					},
+					stop;
+				
+				function moveHandler( event ) {
+					if ( !start ) {
+						return;
+					}
+					
+					var data = event.originalEvent.touches ?
+							event.originalEvent.touches[ 0 ] :
+							event;
+					stop = {
+							time: (new Date).getTime(),
+							coords: [ data.pageX, data.pageY ]
+					};
+					
+					// prevent scrolling
+					if ( Math.abs( start.coords[0] - stop.coords[0] ) > 10 ) {
+						event.preventDefault();
+					}
+				}
+				
+				$this
+					.bind( touchMoveEvent, moveHandler )
+					.one( touchStopEvent, function( event ) {
+						$this.unbind( touchMoveEvent, moveHandler );
+						if ( start && stop ) {
+							if ( stop.time - start.time < 1000 && 
+									Math.abs( start.coords[0] - stop.coords[0]) > 30 &&
+									Math.abs( start.coords[1] - stop.coords[1]) < 75 ) {
+								start.origin
+								.trigger( "swipe" )
+								.trigger( start.coords[0] > stop.coords[0] ? "swipeleft" : "swiperight" );
+							}
+						}
+						start = stop = undefined;
+					});
+			});
+	}
+};
+
+(function($){
+	// "Cowboy" Ben Alman
+	
+	var win = $(window),
+		special_event,
+		get_orientation,
+		last_orientation;
+	
+	$.event.special.orientationchange = special_event = {
+		setup: function(){
+			// If the event is supported natively, return false so that jQuery
+			// will bind to the event using DOM methods.
+			if ( $.support.orientation ) { return false; }
+			
+			// Get the current orientation to avoid initial double-triggering.
+			last_orientation = get_orientation();
+			
+			// Because the orientationchange event doesn't exist, simulate the
+			// event by testing window dimensions on resize.
+			win.bind( "resize", handler );
+		},
+		teardown: function(){
+			// If the event is not supported natively, return false so that
+			// jQuery will unbind the event using DOM methods.
+			if ( $.support.orientation ) { return false; }
+			
+			// Because the orientationchange event doesn't exist, unbind the
+			// resize event handler.
+			win.unbind( "resize", handler );
+		},
+		add: function( handleObj ) {
+			// Save a reference to the bound event handler.
+			var old_handler = handleObj.handler;
+			
+			handleObj.handler = function( event ) {
+				// Modify event object, adding the .orientation property.
+				event.orientation = get_orientation();
+				
+				// Call the originally-bound event handler and return its result.
+				return old_handler.apply( this, arguments );
+			};
+		}
+	};
+	
+	// If the event is not supported natively, this handler will be bound to
+	// the window resize event to simulate the orientationchange event.
+	function handler() {
+		// Get the current orientation.
+		var orientation = get_orientation();
+		
+		if ( orientation !== last_orientation ) {
+			// The orientation has changed, so trigger the orientationchange event.
+			last_orientation = orientation;
+			win.trigger( "orientationchange" );
+		}
+	};
+	
+	// Get the current page orientation. This method is exposed publicly, should it
+	// be needed, as jQuery.event.special.orientationchange.orientation()
+	special_event.orientation = get_orientation = function() {
+		var elem = document.documentElement;
+		return elem && elem.clientWidth / elem.clientHeight < 1.1 ? "portrait" : "landscape";
+	};
+	
+})(jQuery);
+
+$.each({
+	scrollstop: "scrollstart",
+	taphold: "tap",
+	swipeleft: "swipe",
+	swiperight: "swipe"
+}, function( event, sourceEvent ) {
+	$.event.special[ event ] = {
+		setup: function() {
+			$( this ).bind( sourceEvent, $.noop );
+		}
+	};
+});
+
+})( jQuery );
+/*!
+ * jQuery hashchange event - v1.3 - 7/21/2010
+ * http://benalman.com/projects/jquery-hashchange-plugin/
+ * 
+ * Copyright (c) 2010 "Cowboy" Ben Alman
+ * Dual licensed under the MIT and GPL licenses.
+ * http://benalman.com/about/license/
+ */
+
+// Script: jQuery hashchange event
+//
+// *Version: 1.3, Last updated: 7/21/2010*
+// 
+// Project Home - http://benalman.com/projects/jquery-hashchange-plugin/
+// GitHub       - http://github.com/cowboy/jquery-hashchange/
+// Source       - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.js
+// (Minified)   - http://github.com/cowboy/jquery-hashchange/raw/master/jquery.ba-hashchange.min.js (0.8kb gzipped)
+// 
+// About: License
+// 
+// Copyright (c) 2010 "Cowboy" Ben Alman,
+// Dual licensed under the MIT and GPL licenses.
+// http://benalman.com/about/license/
+// 
+// About: Examples
+// 
+// These working examples, complete with fully commented code, illustrate a few
+// ways in which this plugin can be used.
+// 
+// hashchange event - http://benalman.com/code/projects/jquery-hashchange/examples/hashchange/
+// document.domain - http://benalman.com/code/projects/jquery-hashchange/examples/document_domain/
+// 
+// About: Support and Testing
+// 
+// Information about what version or versions of jQuery this plugin has been
+// tested with, what browsers it has been tested in, and where the unit tests
+// reside (so you can test it yourself).
+// 
+// jQuery Versions - 1.2.6, 1.3.2, 1.4.1, 1.4.2
+// Browsers Tested - Internet Explorer 6-8, Firefox 2-4, Chrome 5-6, Safari 3.2-5,
+//                   Opera 9.6-10.60, iPhone 3.1, Android 1.6-2.2, BlackBerry 4.6-5.
+// Unit Tests      - http://benalman.com/code/projects/jquery-hashchange/unit/
+// 
+// About: Known issues
+// 
+// While this jQuery hashchange event implementation is quite stable and
+// robust, there are a few unfortunate browser bugs surrounding expected
+// hashchange event-based behaviors, independent of any JavaScript
+// window.onhashchange abstraction. See the following examples for more
+// information:
+// 
+// Chrome: Back Button - http://benalman.com/code/projects/jquery-hashchange/examples/bug-chrome-back-button/
+// Firefox: Remote XMLHttpRequest - http://benalman.com/code/projects/jquery-hashchange/examples/bug-firefox-remote-xhr/
+// WebKit: Back Button in an Iframe - http://benalman.com/code/projects/jquery-hashchange/examples/bug-webkit-hash-iframe/
+// Safari: Back Button from a different domain - http://benalman.com/code/projects/jquery-hashchange/examples/bug-safari-back-from-diff-domain/
+// 
+// Also note that should a browser natively support the window.onhashchange 
+// event, but not report that it does, the fallback polling loop will be used.
+// 
+// About: Release History
+// 
+// 1.3   - (7/21/2010) Reorganized IE6/7 Iframe code to make it more
+//         "removable" for mobile-only development. Added IE6/7 document.title
+//         support. Attempted to make Iframe as hidden as possible by using
+//         techniques from http://www.paciellogroup.com/blog/?p=604. Added 
+//         support for the "shortcut" format $(window).hashchange( fn ) and
+//         $(window).hashchange() like jQuery provides for built-in events.
+//         Renamed jQuery.hashchangeDelay to <jQuery.fn.hashchange.delay> and
+//         lowered its default value to 50. Added <jQuery.fn.hashchange.domain>
+//         and <jQuery.fn.hashchange.src> properties plus document-domain.html
+//         file to address access denied issues when setting document.domain in
+//         IE6/7.
+// 1.2   - (2/11/2010) Fixed a bug where coming back to a page using this plugin
+//         from a page on another domain would cause an error in Safari 4. Also,
+//         IE6/7 Iframe is now inserted after the body (this actually works),
+//         which prevents the page from scrolling when the event is first bound.
+//         Event can also now be bound before DOM ready, but it won't be usable
+//         before then in IE6/7.
+// 1.1   - (1/21/2010) Incorporated document.documentMode test to fix IE8 bug
+//         where browser version is incorrectly reported as 8.0, despite
+//         inclusion of the X-UA-Compatible IE=EmulateIE7 meta tag.
+// 1.0   - (1/9/2010) Initial Release. Broke out the jQuery BBQ event.special
+//         window.onhashchange functionality into a separate plugin for users
+//         who want just the basic event & back button support, without all the
+//         extra awesomeness that BBQ provides. This plugin will be included as
+//         part of jQuery BBQ, but also be available separately.
+
+(function($,window,undefined){
+  '$:nomunge'; // Used by YUI compressor.
+  
+  // Reused string.
+  var str_hashchange = 'hashchange',
+    
+    // Method / object references.
+    doc = document,
+    fake_onhashchange,
+    special = $.event.special,
+    
+    // Does the browser support window.onhashchange? Note that IE8 running in
+    // IE7 compatibility mode reports true for 'onhashchange' in window, even
+    // though the event isn't supported, so also test document.documentMode.
+    doc_mode = doc.documentMode,
+    supports_onhashchange = 'on' + str_hashchange in window && ( doc_mode === undefined || doc_mode > 7 );
+  
+  // Get location.hash (or what you'd expect location.hash to be) sans any
+  // leading #. Thanks for making this necessary, Firefox!
+  function get_fragment( url ) {
+    url = url || location.href;
+    return '#' + url.replace( /^[^#]*#?(.*)$/, '$1' );
+  };
+  
+  // Method: jQuery.fn.hashchange
+  // 
+  // Bind a handler to the window.onhashchange event or trigger all bound
+  // window.onhashchange event handlers. This behavior is consistent with
+  // jQuery's built-in event handlers.
+  // 
+  // Usage:
+  // 
+  // > jQuery(window).hashchange( [ handler ] );
+  // 
+  // Arguments:
+  // 
+  //  handler - (Function) Optional handler to be bound to the hashchange
+  //    event. This is a "shortcut" for the more verbose form:
+  //    jQuery(window).bind( 'hashchange', handler ). If handler is omitted,
+  //    all bound window.onhashchange event handlers will be triggered. This
+  //    is a shortcut for the more verbose
+  //    jQuery(window).trigger( 'hashchange' ). These forms are described in
+  //    the <hashchange event> section.
+  // 
+  // Returns:
+  // 
+  //  (jQuery) The initial jQuery collection of elements.
+  
+  // Allow the "shortcut" format $(elem).hashchange( fn ) for binding and
+  // $(elem).hashchange() for triggering, like jQuery does for built-in events.
+  $.fn[ str_hashchange ] = function( fn ) {
+    return fn ? this.bind( str_hashchange, fn ) : this.trigger( str_hashchange );
+  };
+  
+  // Property: jQuery.fn.hashchange.delay
+  // 
+  // The numeric interval (in milliseconds) at which the <hashchange event>
+  // polling loop executes. Defaults to 50.
+  
+  // Property: jQuery.fn.hashchange.domain
+  // 
+  // If you're setting document.domain in your JavaScript, and you want hash
+  // history to work in IE6/7, not only must this property be set, but you must
+  // also set document.domain BEFORE jQuery is loaded into the page. This
+  // property is only applicable if you are supporting IE6/7 (or IE8 operating
+  // in "IE7 compatibility" mode).
+  // 
+  // In addition, the <jQuery.fn.hashchange.src> property must be set to the
+  // path of the included "document-domain.html" file, which can be renamed or
+  // modified if necessary (note that the document.domain specified must be the
+  // same in both your main JavaScript as well as in this file).
+  // 
+  // Usage:
+  // 
+  // jQuery.fn.hashchange.domain = document.domain;
+  
+  // Property: jQuery.fn.hashchange.src
+  // 
+  // If, for some reason, you need to specify an Iframe src file (for example,
+  // when setting document.domain as in <jQuery.fn.hashchange.domain>), you can
+  // do so using this property. Note that when using this property, history
+  // won't be recorded in IE6/7 until the Iframe src file loads. This property
+  // is only applicable if you are supporting IE6/7 (or IE8 operating in "IE7
+  // compatibility" mode).
+  // 
+  // Usage:
+  // 
+  // jQuery.fn.hashchange.src = 'path/to/file.html';
+  
+  $.fn[ str_hashchange ].delay = 50;
+  /*
+  $.fn[ str_hashchange ].domain = null;
+  $.fn[ str_hashchange ].src = null;
+  */
+  
+  // Event: hashchange event
+  // 
+  // Fired when location.hash changes. In browsers that support it, the native
+  // HTML5 window.onhashchange event is used, otherwise a polling loop is
+  // initialized, running every <jQuery.fn.hashchange.delay> milliseconds to
+  // see if the hash has changed. In IE6/7 (and IE8 operating in "IE7
+  // compatibility" mode), a hidden Iframe is created to allow the back button
+  // and hash-based history to work.
+  // 
+  // Usage as described in <jQuery.fn.hashchange>:
+  // 
+  // > // Bind an event handler.
+  // > jQuery(window).hashchange( function(e) {
+  // >   var hash = location.hash;
+  // >   ...
+  // > });
+  // > 
+  // > // Manually trigger the event handler.
+  // > jQuery(window).hashchange();
+  // 
+  // A more verbose usage that allows for event namespacing:
+  // 
+  // > // Bind an event handler.
+  // > jQuery(window).bind( 'hashchange', function(e) {
+  // >   var hash = location.hash;
+  // >   ...
+  // > });
+  // > 
+  // > // Manually trigger the event handler.
+  // > jQuery(window).trigger( 'hashchange' );
+  // 
+  // Additional Notes:
+  // 
+  // * The polling loop and Iframe are not created until at least one handler
+  //   is actually bound to the 'hashchange' event.
+  // * If you need the bound handler(s) to execute immediately, in cases where
+  //   a location.hash exists on page load, via bookmark or page refresh for
+  //   example, use jQuery(window).hashchange() or the more verbose 
+  //   jQuery(window).trigger( 'hashchange' ).
+  // * The event can be bound before DOM ready, but since it won't be usable
+  //   before then in IE6/7 (due to the necessary Iframe), recommended usage is
+  //   to bind it inside a DOM ready handler.
+  
+  // Override existing $.event.special.hashchange methods (allowing this plugin
+  // to be defined after jQuery BBQ in BBQ's source code).
+  special[ str_hashchange ] = $.extend( special[ str_hashchange ], {
+    
+    // Called only when the first 'hashchange' event is bound to window.
+    setup: function() {
+      // If window.onhashchange is supported natively, there's nothing to do..
+      if ( supports_onhashchange ) { return false; }
+      
+      // Otherwise, we need to create our own. And we don't want to call this
+      // until the user binds to the event, just in case they never do, since it
+      // will create a polling loop and possibly even a hidden Iframe.
+      $( fake_onhashchange.start );
+    },
+    
+    // Called only when the last 'hashchange' event is unbound from window.
+    teardown: function() {
+      // If window.onhashchange is supported natively, there's nothing to do..
+      if ( supports_onhashchange ) { return false; }
+      
+      // Otherwise, we need to stop ours (if possible).
+      $( fake_onhashchange.stop );
+    }
+    
+  });
+  
+  // fake_onhashchange does all the work of triggering the window.onhashchange
+  // event for browsers that don't natively support it, including creating a
+  // polling loop to watch for hash changes and in IE 6/7 creating a hidden
+  // Iframe to enable back and forward.
+  fake_onhashchange = (function(){
+    var self = {},
+      timeout_id,
+      
+      // Remember the initial hash so it doesn't get triggered immediately.
+      last_hash = get_fragment(),
+      
+      fn_retval = function(val){ return val; },
+      history_set = fn_retval,
+      history_get = fn_retval;
+    
+    // Start the polling loop.
+    self.start = function() {
+      timeout_id || poll();
+    };
+    
+    // Stop the polling loop.
+    self.stop = function() {
+      timeout_id && clearTimeout( timeout_id );
+      timeout_id = undefined;
+    };
+    
+    // This polling loop checks every $.fn.hashchange.delay milliseconds to see
+    // if location.hash has changed, and triggers the 'hashchange' event on
+    // window when necessary.
+    function poll() {
+      var hash = get_fragment(),
+        history_hash = history_get( last_hash );
+      
+      if ( hash !== last_hash ) {
+        history_set( last_hash = hash, history_hash );
+        
+        $(window).trigger( str_hashchange );
+        
+      } else if ( history_hash !== last_hash ) {
+        location.href = location.href.replace( /#.*/, '' ) + history_hash;
+      }
+      
+      timeout_id = setTimeout( poll, $.fn[ str_hashchange ].delay );
+    };
+    
+    // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+    // vvvvvvvvvvvvvvvvvvv REMOVE IF NOT SUPPORTING IE6/7/8 vvvvvvvvvvvvvvvvvvv
+    // vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
+    $.browser.msie && !supports_onhashchange && (function(){
+      // Not only do IE6/7 need the "magical" Iframe treatment, but so does IE8
+      // when running in "IE7 compatibility" mode.
+      
+      var iframe,
+        iframe_src;
+      
+      // When the event is bound and polling starts in IE 6/7, create a hidden
+      // Iframe for history handling.
+      self.start = function(){
+        if ( !iframe ) {
+          iframe_src = $.fn[ str_hashchange ].src;
+          iframe_src = iframe_src && iframe_src + get_fragment();
+          
+          // Create hidden Iframe. Attempt to make Iframe as hidden as possible
+          // by using techniques from http://www.paciellogroup.com/blog/?p=604.
+          iframe = $('<iframe tabindex="-1" title="empty"/>').hide()
+            
+            // When Iframe has completely loaded, initialize the history and
+            // start polling.
+            .one( 'load', function(){
+              iframe_src || history_set( get_fragment() );
+              poll();
+            })
+            
+            // Load Iframe src if specified, otherwise nothing.
+            .attr( 'src', iframe_src || 'javascript:0' )
+            
+            // Append Iframe after the end of the body to prevent unnecessary
+            // initial page scrolling (yes, this works).
+            .insertAfter( 'body' )[0].contentWindow;
+          
+          // Whenever `document.title` changes, update the Iframe's title to
+          // prettify the back/next history menu entries. Since IE sometimes
+          // errors with "Unspecified error" the very first time this is set
+          // (yes, very useful) wrap this with a try/catch block.
+          doc.onpropertychange = function(){
+            try {
+              if ( event.propertyName === 'title' ) {
+                iframe.document.title = doc.title;
+              }
+            } catch(e) {}
+          };
+          
+        }
+      };
+      
+      // Override the "stop" method since an IE6/7 Iframe was created. Even
+      // if there are no longer any bound event handlers, the polling loop
+      // is still necessary for back/next to work at all!
+      self.stop = fn_retval;
+      
+      // Get history by looking at the hidden Iframe's location.hash.
+      history_get = function() {
+        return get_fragment( iframe.location.href );
+      };
+      
+      // Set a new history item by opening and then closing the Iframe
+      // document, *then* setting its location.hash. If document.domain has
+      // been set, update that as well.
+      history_set = function( hash, history_hash ) {
+        var iframe_doc = iframe.document,
+          domain = $.fn[ str_hashchange ].domain;
+        
+        if ( hash !== history_hash ) {
+          // Update Iframe with any initial `document.title` that might be set.
+          iframe_doc.title = doc.title;
+          
+          // Opening the Iframe's document after it has been closed is what
+          // actually adds a history entry.
+          iframe_doc.open();
+          
+          // Set document.domain for the Iframe document as well, if necessary.
+          domain && iframe_doc.write( '<script>document.domain="' + domain + '"</script>' );
+          
+          iframe_doc.close();
+          
+          // Update the Iframe's hash, for great justice.
+          iframe.location.hash = hash;
+        }
+      };
+      
+    })();
+    // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    // ^^^^^^^^^^^^^^^^^^^ REMOVE IF NOT SUPPORTING IE6/7/8 ^^^^^^^^^^^^^^^^^^^
+    // ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+    
+    return self;
+  })();
+  
+})(jQuery,this);
+/*
+* jQuery Mobile Framework : "page" plugin
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+
+$.widget( "mobile.page", $.mobile.widget, {
+	options: {
+		backBtnText: "Back",
+		addBackBtn: true,
+		degradeInputs: {
+			color: false,
+			date: false,
+			datetime: false,
+			"datetime-local": false,
+			email: false,
+			month: false,
+			number: false,
+			range: true,
+			search: true,
+			tel: false,
+			time: false,
+			url: false,
+			week: false
+		}
+	},
+	
+	_create: function() {
+		var $elem = this.element,
+			o = this.options;
+
+		if ( this._trigger( "beforeCreate" ) === false ) {
+			return;
+		}
+		
+		//some of the form elements currently rely on the presence of ui-page and ui-content
+		// classes so we'll handle page and content roles outside of the main role processing
+		// loop below.
+		$elem.find( "[data-role='page'], [data-role='content']" ).andSelf().each(function() {
+			$(this).addClass( "ui-" + $(this).data( "role" ) );
+		});
+		
+		$elem.find( "[data-role='nojs']" ).addClass( "ui-nojs" );
+
+		this._enchanceControls();
+		
+		// pre-find data els
+		var $dataEls = $elem.find( "[data-role]" ).andSelf().each(function() {
+			var $this = $( this ),
+				role = $this.data( "role" ),
+				theme = $this.data( "theme" );
+			
+			//apply theming and markup modifications to page,header,content,footer
+			if ( role === "header" || role === "footer" ) {
+				$this.addClass( "ui-bar-" + (theme || $this.parent('[data-role=page]').data( "theme" ) || "a") );
+				
+				// add ARIA role
+				$this.attr( "role", role === "header" ? "banner" : "contentinfo" );
+				
+				//right,left buttons
+				var $headeranchors = $this.children( "a" ),
+					leftbtn = $headeranchors.hasClass( "ui-btn-left" ),
+					rightbtn = $headeranchors.hasClass( "ui-btn-right" );
+				
+				if ( !leftbtn ) {
+					leftbtn = $headeranchors.eq( 0 ).not( ".ui-btn-right" ).addClass( "ui-btn-left" ).length;
+				}
+
+				if ( !rightbtn ) {
+					rightbtn = $headeranchors.eq( 1 ).addClass( "ui-btn-right" ).length;
+				}
+				
+				// auto-add back btn on pages beyond first view
+				if ( o.addBackBtn && role === "header" &&
+						($.mobile.urlStack.length > 1 || $(".ui-page").length > 1) &&
+						!leftbtn && !$this.data( "noBackBtn" ) ) {
+
+					$( "<a href='#' class='ui-btn-left' data-icon='arrow-l'>"+ o.backBtnText +"</a>" )
+						.click(function() {
+							history.back();
+							return false;
+						})
+						.prependTo( $this );
+				}
+				
+				//page title	
+				$this.children( "h1, h2, h3, h4, h5, h6" )
+					.addClass( "ui-title" )
+					//regardless of h element number in src, it becomes h1 for the enhanced page
+					.attr({ "tabindex": "0", "role": "heading", "aria-level": "1" });
+
+			} else if ( role === "content" ) {
+				if ( theme ) {
+					$this.addClass( "ui-body-" + theme );
+				}
+
+				// add ARIA role
+				$this.attr( "role", "main" );
+
+			} else if ( role === "page" ) {
+				$this.addClass( "ui-body-" + (theme || "c") );
+			}
+			
+			switch(role) {
+				case "header":
+				case "footer":
+				case "page":
+				case "content":
+					$this.addClass( "ui-" + role );
+					break;
+				case "collapsible":
+				case "fieldcontain":
+				case "navbar":
+				case "listview":
+				case "dialog":
+					$this[ role ]();
+					break;
+			}
+		});
+		
+		//links in bars, or those with data-role become buttons
+		$elem.find( "[data-role='button'], .ui-bar a, .ui-header a, .ui-footer a" )
+			.not( ".ui-btn" )
+			.buttonMarkup();
+
+		$elem	
+			.find("[data-role='controlgroup']")
+			.controlgroup();
+		
+		//links within content areas
+		$elem.find( "a:not(.ui-btn):not(.ui-link-inherit)" )
+			.addClass( "ui-link" );	
+		
+		//fix toolbars
+		$elem.fixHeaderFooter();
+	},
+	
+	_enchanceControls: function() {
+		var o = this.options;
+		// degrade inputs to avoid poorly implemented native functionality
+		this.element.find( "input" ).each(function() {
+			var type = this.getAttribute( "type" );
+			if ( o.degradeInputs[ type ] ) {
+				$( this ).replaceWith(
+					$( "<div>" ).html( $(this).clone() ).html()
+						.replace( /type="([a-zA-Z]+)"/, "data-type='$1'" ) );
+			}
+		});
+		
+		// enchance form controls
+		this.element
+			.find( "[type='radio'], [type='checkbox']" )
+			.checkboxradio();
+
+		this.element
+			.find( "button, [type='button'], [type='submit'], [type='reset'], [type='image']" )
+			.not( ".ui-nojs" )
+			.button();
+
+		this.element
+			.find( "input, textarea" )
+			.not( "[type='radio'], [type='checkbox'], button, [type='button'], [type='submit'], [type='reset'], [type='image']" )
+			.textinput();
+
+		this.element
+			.find( "input, select" )
+			.filter( "[data-role='slider'], [data-type='range']" )
+			.slider();
+
+		this.element
+			.find( "select:not([data-role='slider'])" )
+			.selectmenu();
+	}
+});
+
+})( jQuery );
+/*
+* jQuery Mobile Framework : "fixHeaderFooter" plugin - on-demand positioning for headers,footers
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+$.fn.fixHeaderFooter = function(options){
+	if( !$.support.scrollTop ){ return $(this); }
+	return $(this).each(function(){
+		if( $(this).data('fullscreen') ){ $(this).addClass('ui-page-fullscreen'); }
+		$(this).find('.ui-header[data-position="fixed"]').addClass('ui-header-fixed ui-fixed-inline fade'); //should be slidedown
+		$(this).find('.ui-footer[data-position="fixed"]').addClass('ui-footer-fixed ui-fixed-inline fade'); //should be slideup		
+	});
+};				
+
+//single controller for all showing,hiding,toggling		
+$.fixedToolbars = (function(){
+	if( !$.support.scrollTop ){ return; }
+	var currentstate = 'inline',
+		delayTimer,
+		ignoreTargets = 'a,input,textarea,select,button,label,.ui-header-fixed,.ui-footer-fixed',
+		toolbarSelector = '.ui-header-fixed:first, .ui-footer-fixed:not(.ui-footer-duplicate):last',
+		stickyFooter, //for storing quick references to duplicate footers
+		supportTouch = $.support.touch,
+		touchStartEvent = supportTouch ? "touchstart" : "mousedown",
+		touchStopEvent = supportTouch ? "touchend" : "mouseup",
+		stateBefore = null,
+		scrollTriggered = false;
+		
+	$(function() {
+		$(document)
+			.bind(touchStartEvent,function(event){
+				if( $(event.target).closest(ignoreTargets).length ){ return; }
+				stateBefore = currentstate;
+				$.fixedToolbars.hide(true);
+			})
+			.bind('scrollstart',function(event){
+				if( $(event.target).closest(ignoreTargets).length ){ return; } //because it could be a touchmove...
+				scrollTriggered = true;
+				if(stateBefore == null){ stateBefore = currentstate; }
+				$.fixedToolbars.hide(true);
+			})
+			.bind(touchStopEvent,function(event){
+				if( $(event.target).closest(ignoreTargets).length ){ return; }
+				if( !scrollTriggered ){
+					$.fixedToolbars.toggle(stateBefore);
+					stateBefore = null;
+				}
+			})
+			.bind('scrollstop',function(event){
+				if( $(event.target).closest(ignoreTargets).length ){ return; }
+				scrollTriggered = false;
+				$.fixedToolbars.toggle( stateBefore == 'overlay' ? 'inline' : 'overlay' );
+				stateBefore = null;
+			});
+		
+		//function to return another footer already in the dom with the same data-id
+		function findStickyFooter(el){
+			var thisFooter = el.find('[data-role="footer"]');
+			return $( '.ui-footer[data-id="'+ thisFooter.data('id') +'"]:not(.ui-footer-duplicate)' ).not(thisFooter);
+		}
+		
+		//before page is shown, check for duplicate footer
+		$('.ui-page').live('pagebeforeshow', function(event, ui){
+			stickyFooter = findStickyFooter( $(event.target) );
+			if( stickyFooter.length ){
+				//if the existing footer is the first of its kind, create a placeholder before stealing it 
+				if( stickyFooter.parents('.ui-page:eq(0)').find('.ui-footer[data-id="'+ stickyFooter.data('id') +'"]').length == 1 ){
+					stickyFooter.before( stickyFooter.clone().addClass('ui-footer-duplicate') );
+				}
+				$(event.target).find('[data-role="footer"]').addClass('ui-footer-duplicate');
+				stickyFooter.appendTo($.pageContainer).css('top',0);
+				setTop(stickyFooter);
+			}
+		});
+
+		//after page is shown, append footer to new page
+		$('.ui-page').live('pageshow', function(event, ui){
+			if( stickyFooter && stickyFooter.length ){
+				stickyFooter.appendTo(event.target).css('top',0);
+			}
+			$.fixedToolbars.show(true, this);
+		});
+		
+	});
+	
+	// element.getBoundingClientRect() is broken in iOS 3.2.1 on the iPad. The
+	// coordinates inside of the rect it returns don't have the page scroll position
+	// factored out of it like the other platforms do. To get around this,
+	// we'll just calculate the top offset the old fashioned way until core has
+	// a chance to figure out how to handle this situation.
+	//
+	// TODO: We'll need to get rid of getOffsetTop() once a fix gets folded into core.
+
+	function getOffsetTop(ele)
+	{
+		var top = 0;
+		if (ele)
+		{
+			var op = ele.offsetParent, body = document.body;
+			top = ele.offsetTop;
+			while (ele && ele != body)
+			{
+				top += ele.scrollTop || 0;
+				if (ele == op)
+				{
+					top += op.offsetTop;
+					op = ele.offsetParent;
+				}
+				ele = ele.parentNode;
+			}
+		}
+		return top;
+	}
+
+	function setTop(el){
+		var fromTop = $(window).scrollTop(),
+			thisTop = getOffsetTop(el[0]), // el.offset().top returns the wrong value on iPad iOS 3.2.1, call our workaround instead.
+			thisCSStop = el.css('top') == 'auto' ? 0 : parseFloat(el.css('top')),
+			screenHeight = window.innerHeight,
+			thisHeight = el.outerHeight(),
+			useRelative = el.parents('.ui-page:not(.ui-page-fullscreen)').length,
+			relval;
+		if( el.is('.ui-header-fixed') ){
+			relval = fromTop - thisTop + thisCSStop;
+			if( relval < thisTop){ relval = 0; }
+			return el.css('top', ( useRelative ) ? relval : fromTop);
+		}
+		else{
+			//relval = -1 * (thisTop - (fromTop + screenHeight) + thisCSStop + thisHeight);
+			//if( relval > thisTop ){ relval = 0; }
+			relval = fromTop + screenHeight - thisHeight - (thisTop - thisCSStop);
+			return el.css('top', ( useRelative ) ? relval : fromTop + screenHeight - thisHeight );
+		}
+	}
+
+	//exposed methods
+	return {
+		show: function(immediately, page){
+			currentstate = 'overlay';
+			var $ap = page ? $(page) : ($.mobile.activePage ? $.mobile.activePage : $(".ui-page-active"));
+			return $ap.children( toolbarSelector ).each(function(){
+				var el = $(this),
+					fromTop = $(window).scrollTop(),
+					thisTop = getOffsetTop(el[0]), // el.offset().top returns the wrong value on iPad iOS 3.2.1, call our workaround instead.
+					screenHeight = window.innerHeight,
+					thisHeight = el.outerHeight(),
+					alreadyVisible = (el.is('.ui-header-fixed') && fromTop <= thisTop + thisHeight) || (el.is('.ui-footer-fixed') && thisTop <= fromTop + screenHeight);	
+				
+				//add state class
+				el.addClass('ui-fixed-overlay').removeClass('ui-fixed-inline');	
+					
+				if( !alreadyVisible && !immediately ){
+					el.addClass('in').animationComplete(function(){
+						el.removeClass('in');
+					});
+				}
+				setTop(el);
+			});	
+		},
+		hide: function(immediately){
+			currentstate = 'inline';
+			var $ap = $.mobile.activePage ? $.mobile.activePage : $(".ui-page-active");
+			return $ap.children( toolbarSelector ).each(function(){
+				var el = $(this);
+
+				var thisCSStop = el.css('top'); thisCSStop = thisCSStop == 'auto' ? 0 : parseFloat(thisCSStop);
+				
+				//add state class
+				el.addClass('ui-fixed-inline').removeClass('ui-fixed-overlay');
+				
+				if (thisCSStop < 0 || (el.is('.ui-header-fixed') && thisCSStop != 0))
+				{
+					if(immediately){
+						el.css('top',0);
+					}
+					else{
+						if( el.css('top') !== 'auto' && parseFloat(el.css('top')) !== 0 ){
+							var classes = 'out reverse';
+							el.addClass(classes).animationComplete(function(){
+								el.removeClass(classes);
+								el.css('top',0);
+							});	
+						}
+					}
+				}
+			});
+		},
+		hideAfterDelay: function(){
+			delayTimer = setTimeout(function(){
+				$.fixedToolbars.hide();
+			}, 3000);
+		},
+		toggle: function(from){
+			if(from){ currentstate = from; }
+			return (currentstate == 'overlay') ? $.fixedToolbars.hide() : $.fixedToolbars.show();
+		}
+	};
+})();
+
+})(jQuery);/*
+* jQuery Mobile Framework : "checkboxradio" plugin
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/  
+(function($, undefined ) {
+$.widget( "mobile.checkboxradio", $.mobile.widget, {
+	options: {
+		theme: null
+	},
+	_create: function(){
+		var input = this.element,
+			label = $("label[for='" + input.attr( "id" ) + "']"),
+			inputtype = input.attr( "type" ),
+			checkedicon = "ui-icon-" + inputtype + "-on",
+			uncheckedicon = "ui-icon-" + inputtype + "-off";
+
+		if ( inputtype != "checkbox" && inputtype != "radio" ) { return; }
+						
+		label
+			.buttonMarkup({
+				theme: this.options.theme,
+				icon: this.element.parents( "[data-type='horizontal']" ).length ? undefined : uncheckedicon,
+				shadow: false
+			});
+		
+		// wrap the input + label in a div 
+		input
+			.add( label )
+			.wrapAll( "<div class='ui-" + inputtype +"'></div>" );
+		
+		label.bind({
+			mouseover: function() {
+				if( $(this).parent().is('.ui-disabled') ){ return false; }
+			},
+			
+			mousedown: function() {
+				if( $(this).parent().is('.ui-disabled') ){ return false; }
+				label.data( "state", input.attr( "checked" ) );
+			},
+			
+			click: function() {
+				setTimeout(function() {
+					if ( input.attr( "checked" ) === label.data( "state" ) ) {
+						input.trigger( "click" );
+					}
+				}, 1);
+			}
+		});
+		
+		input
+			.bind({
+
+				click: function() {
+					$( "input[name='" + input.attr( "name" ) + "'][type='" + inputtype + "']" ).checkboxradio( "refresh" );
+				},
+
+				focus: function() { 
+					label.addClass( "ui-focus" ); 
+				},
+
+				blur: function() {
+					label.removeClass( "ui-focus" );
+				}
+			});
+			
+		this.refresh();
+		
+	},
+	
+	refresh: function( ){
+		var input = this.element,
+			label = $("label[for='" + input.attr( "id" ) + "']"),
+			inputtype = input.attr( "type" ),
+			icon = label.find( ".ui-icon" ),
+			checkedicon = "ui-icon-" + inputtype + "-on",
+			uncheckedicon = "ui-icon-" + inputtype + "-off";
+		
+		if ( input[0].checked ) {
+			label.addClass( "ui-btn-active" );
+			icon.addClass( checkedicon );
+			icon.removeClass( uncheckedicon );
+
+		} else {
+			label.removeClass( "ui-btn-active" ); 
+			icon.removeClass( checkedicon );
+			icon.addClass( uncheckedicon );
+		}
+		
+		if( input.is( ":disabled" ) ){
+			this.disable();
+		}
+		else {
+			this.enable();
+		}
+	},
+	
+	disable: function(){
+		this.element.attr("disabled",true).parent().addClass("ui-disabled");
+	},
+	
+	enable: function(){
+		this.element.attr("disabled",false).parent().removeClass("ui-disabled");
+	}
+});
+})( jQuery );
+/*
+* jQuery Mobile Framework : "textinput" plugin for text inputs, textareas
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+$.widget( "mobile.textinput", $.mobile.widget, {
+	options: {
+		theme: null
+	},
+	_create: function(){
+		var input = this.element,
+			o = this.options,
+			theme = o.theme,
+			themeclass;
+			
+		if ( !theme ) {
+			var themedParent = this.element.closest("[class*='ui-bar-'],[class*='ui-body-']"); 
+				theme = themedParent.length ?
+					/ui-(bar|body)-([a-z])/.exec( themedParent.attr("class") )[2] :
+					"c";
+		}	
+		
+		themeclass = " ui-body-" + theme;
+		
+		$('label[for='+input.attr('id')+']').addClass('ui-input-text');
+		
+		input.addClass('ui-input-text ui-body-'+ o.theme);
+		
+		var focusedEl = input;
+		
+		//"search" input widget
+		if( input.is('[type="search"],[data-type="search"]') ){
+			focusedEl = input.wrap('<div class="ui-input-search ui-shadow-inset ui-btn-corner-all ui-btn-shadow ui-icon-search'+ themeclass +'"></div>').parent();
+			var clearbtn = $('<a href="#" class="ui-input-clear" title="clear text">clear text</a>')
+				.click(function(){
+					input.val('').focus();
+					input.trigger('change'); 
+					clearbtn.addClass('ui-input-clear-hidden');
+					return false;
+				})
+				.appendTo(focusedEl)
+				.buttonMarkup({icon: 'delete', iconpos: 'notext', corners:true, shadow:true});
+			
+			function toggleClear(){
+				if(input.val() == ''){
+					clearbtn.addClass('ui-input-clear-hidden');
+				}
+				else{
+					clearbtn.removeClass('ui-input-clear-hidden');
+				}
+			}
+			
+			toggleClear();
+			input.keyup(toggleClear);	
+		}
+		else{
+			input.addClass('ui-corner-all ui-shadow-inset' + themeclass);
+		}
+				
+		input
+			.focus(function(){
+				focusedEl.addClass('ui-focus');
+			})
+			.blur(function(){
+				focusedEl.removeClass('ui-focus');
+			});	
+			
+		//autogrow
+		if ( input.is('textarea') ) {
+			var extraLineHeight = 15,
+				keyupTimeoutBuffer = 100,
+				keyup = function() {
+					var scrollHeight = input[0].scrollHeight,
+						clientHeight = input[0].clientHeight;
+					if ( clientHeight < scrollHeight ) {
+						input.css({ height: (scrollHeight + extraLineHeight) });
+					}
+				},
+				keyupTimeout;
+			input.keyup(function() {
+				clearTimeout( keyupTimeout );
+				keyupTimeout = setTimeout( keyup, keyupTimeoutBuffer );
+			});
+		}
+	},
+	
+	disable: function(){
+		( this.element.attr("disabled",true).is('[type="search"],[data-type="search"]') ? this.element.parent() : this.element ).addClass("ui-disabled");
+	},
+	
+	enable: function(){
+		( this.element.attr("disabled", false).is('[type="search"],[data-type="search"]') ? this.element.parent() : this.element ).removeClass("ui-disabled");
+	}
+});
+})( jQuery );
+/*
+* jQuery Mobile Framework : "selectmenu" plugin
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/  
+(function($, undefined ) {
+$.widget( "mobile.selectmenu", $.mobile.widget, {
+	options: {
+		theme: null,
+		disabled: false, 
+		icon: 'arrow-d',
+		iconpos: 'right',
+		inline: null,
+		corners: true,
+		shadow: true,
+		iconshadow: true,
+		menuPageTheme: 'b',
+		overlayTheme: 'a'
+	},
+	_create: function(){
+	
+		var self = this,
+		
+			o = this.options,
+			
+			select = this.element
+						.attr( "tabindex", "-1" )
+						.wrap( "<div class='ui-select'>" ),		
+							
+			selectID = select.attr( "id" ),
+			
+			label = $( "label[for="+ selectID +"]" ).addClass( "ui-select" ),
+									
+			buttonId = selectID + "-button",
+			
+			menuId = selectID + "-menu",
+			
+			thisPage = select.closest( ".ui-page" ),
+				
+			button = $( "<a>", { 
+					"href": "#",
+					"role": "button",
+					"id": buttonId,
+					"aria-haspopup": "true",
+					"aria-owns": menuId 
+				})
+				.text( $( select[0].options.item(select[0].selectedIndex) ).text() )
+				.insertBefore( select )
+				.buttonMarkup({
+					theme: o.theme, 
+					icon: o.icon,
+					iconpos: o.iconpos,
+					inline: o.inline,
+					corners: o.corners,
+					shadow: o.shadow,
+					iconshadow: o.iconshadow
+				}),
+				
+			theme = /ui-btn-up-([a-z])/.exec( button.attr("class") )[1],
+				
+			menuPage = $( "<div data-role='dialog' data-theme='"+ o.menuPageTheme +"'>" +
+						"<div data-role='header'>" +
+							"<div class='ui-title'>" + label.text() + "</div>"+
+						"</div>"+
+						"<div data-role='content'></div>"+
+					"</div>" )
+					.appendTo( $.pageContainer )
+					.page(),	
+					
+			menuPageContent = menuPage.find( ".ui-content" ),	
+					
+			screen = $( "<div>", {"class": "ui-listbox-screen ui-overlay ui-screen-hidden fade"})
+						.appendTo( thisPage ),		
+								
+			listbox = $( "<div>", { "class": "ui-listbox ui-listbox-hidden ui-overlay-shadow ui-corner-all pop ui-body-" + o.overlayTheme } )
+					.insertAfter(screen),
+					
+			list = $( "<ul>", { 
+					"class": "ui-listbox-list", 
+					"id": menuId, 
+					"role": "listbox", 
+					"aria-labelledby": buttonId,
+					"data-theme": theme
+				})
+				.appendTo( listbox ),
+				
+			menuType;	
+			
+		//expose to other methods	
+		$.extend(self, {
+			select: select,
+			selectID: selectID,
+			label: label,
+			buttonId:buttonId,
+			menuId:menuId,
+			thisPage:thisPage,
+			button:button,
+			menuPage:menuPage,
+			menuPageContent:menuPageContent,
+			screen:screen,
+			listbox:listbox,
+			list:list,
+			menuType:menuType
+		});
+					
+		
+		//create list from select, update state
+		self.refresh();
+		
+		//disable if specified
+		if( this.options.disabled ){ this.disable(); }
+
+		//events on native select
+		select
+			.change(function(){ 
+				self.refresh();
+			})
+			.focus(function(){
+				$(this).blur();
+				button.focus();
+			});		
+		
+		//button events
+		button.click(function(event){
+			self.open();
+			return false;
+		});
+		
+		//events for list items
+		list.delegate("li",'click', function(){
+				//update select	
+				var newIndex = list.find( "li" ).index( this ),
+					prevIndex = select[0].selectedIndex;
+
+				select[0].selectedIndex = newIndex;
+				
+				//trigger change event
+				if(newIndex !== prevIndex){ 
+					select.trigger( "change" ); 
+				}
+				
+				self.refresh();
+				
+				//hide custom select
+				self.close();
+				return false;
+			});	
+	
+		//events on "screen" overlay
+		screen.click(function(){
+			self.close();
+			return false;
+		});	
+	},
+	
+	_buildList: function(){
+		var self = this;
+		
+		self.list.empty().filter('.ui-listview').listview('destroy');
+		
+		//populate menu with options from select element
+		self.select.find( "option" ).each(function( i ){
+				var anchor = $("<a>", { 
+							"role": "option", 
+							"href": "#"
+						})
+						.text( $(this).text() );
+			
+			$( "<li>", {"data-icon": "checkbox-on"})
+				.append( anchor )
+				.appendTo( self.list );
+		});
+		
+		//now populated, create listview
+		self.list.listview();		
+	},
+	
+	refresh: function( forceRebuild ){
+		var self = this,
+			select = this.element,
+			selected = select[0].selectedIndex;
+		
+		if( forceRebuild || select[0].options.length > self.list.find('li').length ){
+			self._buildList();
+		}	
+			
+		self.button.find( ".ui-btn-text" ).text( $(select[0].options.item(selected)).text() ); 
+		self.list
+			.find('li').removeClass( $.mobile.activeBtnClass ).attr('aria-selected', false)
+			.eq(selected).addClass( $.mobile.activeBtnClass ).find('a').attr('aria-selected', true);		
+	},
+	
+	open: function(){
+		if( this.options.disabled ){ return; }
+		
+		var self = this,
+			menuHeight = self.list.outerHeight(),
+			scrollTop = $(window).scrollTop(),
+			btnOffset = self.button.offset().top,
+			screenHeight = window.innerHeight;
+			
+		function focusMenuItem(){
+			self.list.find( ".ui-btn-active" ).focus();
+		}
+		
+		if( menuHeight > screenHeight - 80 || !$.support.scrollTop ){
+			
+			//for webos (set lastscroll using button offset)
+			if( scrollTop == 0 && btnOffset > screenHeight ){
+				self.thisPage.one('pagehide',function(){
+					$(this).data('lastScroll', btnOffset);
+				});	
+			}
+			
+			self.menuPage.one('pageshow',focusMenuItem);
+		
+			self.menuType = "page";		
+			self.menuPageContent.append( self.list );
+			$.mobile.changePage(self.menuPage, 'pop', false, false);
+		}
+		else {
+			self.menuType = "overlay";
+			
+			self.screen
+				.height( $(document).height() )
+				.removeClass('ui-screen-hidden');
+				
+			self.listbox
+				.append( self.list )
+				.removeClass( "ui-listbox-hidden" )
+				.css({
+					top: scrollTop + (screenHeight/2), 
+					"margin-top": -menuHeight/2,
+					left: window.innerWidth/2,
+					"margin-left": -1* self.listbox.outerWidth() / 2
+				})
+				.addClass("in");
+				
+			focusMenuItem();	
+		}
+	},
+	
+	close: function(){
+		if( this.options.disabled ){ return; }
+		var self = this;
+		
+		function focusButton(){
+			setTimeout(function(){
+				self.button.focus();
+			}, 40);
+			
+			self.listbox.removeAttr('style').append( self.list );
+		}
+		
+		if(self.menuType == "page"){			
+			$.mobile.changePage([self.menuPage,self.thisPage], 'pop', true, false);
+			self.menuPage.one("pagehide",function(){
+				focusButton();
+				//return false;
+			});
+		}
+		else{
+			self.screen.addClass( "ui-screen-hidden" );
+			self.listbox.addClass( "ui-listbox-hidden" ).removeAttr( "style" ).removeClass("in");
+			focusButton();
+		}
+		
+	},
+	
+	disable: function(){
+		this.element.attr("disabled",true);
+		this.button.addClass('ui-disabled').attr("aria-disabled", true);
+		return this._setOption( "disabled", true );
+	},
+	
+	enable: function(){
+		this.element.attr("disabled",false);
+		this.button.removeClass('ui-disabled').attr("aria-disabled", false);
+		return this._setOption( "disabled", false );
+	}
+});
+})( jQuery );
+	
+/*
+* jQuery Mobile Framework : plugin for making button-like links
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/ 
+(function($, undefined ) {
+
+$.fn.buttonMarkup = function( options ){
+	return this.each( function() {
+		var el = $( this ),
+		    o = $.extend( {}, $.fn.buttonMarkup.defaults, el.data(), options),
+
+			// Classes Defined
+			buttonClass,
+			innerClass = "ui-btn-inner",
+			iconClass;
+
+		if ( attachEvents ) {
+			attachEvents();
+		}
+
+		// if not, try to find closest theme container
+		if ( !o.theme ) {
+			var themedParent = el.closest("[class*='ui-bar-'],[class*='ui-body-']"); 
+			o.theme = themedParent.length ?
+				/ui-(bar|body)-([a-z])/.exec( themedParent.attr("class") )[2] :
+				"c";
+		}
+
+		buttonClass = "ui-btn ui-btn-up-" + o.theme;
+		
+		if ( o.inline ) {
+			buttonClass += " ui-btn-inline";
+		}
+		
+		if ( o.icon ) {
+			o.icon = "ui-icon-" + o.icon;
+			o.iconpos = o.iconpos || "left";
+
+			iconClass = "ui-icon " + o.icon;
+
+			if ( o.shadow ) {
+				iconClass += " ui-icon-shadow"
+			}
+		}
+
+		if ( o.iconpos ) {
+			buttonClass += " ui-btn-icon-" + o.iconpos;
+			
+			if ( o.iconpos == "notext" && !el.attr("title") ) {
+				el.attr( "title", el.text() );
+			}
+		}
+		
+		if ( o.corners ) { 
+			buttonClass += " ui-btn-corner-all";
+			innerClass += " ui-btn-corner-all";
+		}
+		
+		if ( o.shadow ) {
+			buttonClass += " ui-shadow";
+		}
+		
+		el
+			.attr( "data-theme", o.theme )
+			.addClass( buttonClass );
+
+		var wrap = ("<D class='" + innerClass + "'><D class='ui-btn-text'></D>" +
+			( o.icon ? "<span class='" + iconClass + "'></span>" : "" ) +
+			"</D>").replace(/D/g, o.wrapperEls);
+
+		el.wrapInner( wrap );
+	});		
+};
+
+$.fn.buttonMarkup.defaults = {
+	corners: true,
+	shadow: true,
+	iconshadow: true,
+	wrapperEls: "span"
+};
+
+var attachEvents = function() {
+	$(".ui-btn").live({
+		mousedown: function() {
+			var theme = $(this).attr( "data-theme" );
+			$(this).removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-down-" + theme );
+		},
+		mouseup: function() {
+			var theme = $(this).attr( "data-theme" );
+			$(this).removeClass( "ui-btn-down-" + theme ).addClass( "ui-btn-up-" + theme );
+		},
+		"mouseover focus": function() {
+			var theme = $(this).attr( "data-theme" );
+			$(this).removeClass( "ui-btn-up-" + theme ).addClass( "ui-btn-hover-" + theme );
+		},
+		"mouseout blur": function() {
+			var theme = $(this).attr( "data-theme" );
+			$(this).removeClass( "ui-btn-hover-" + theme ).addClass( "ui-btn-up-" + theme );
+		}
+	});
+
+	attachEvents = null;
+};
+
+})(jQuery);
+/*
+* jQuery Mobile Framework : "button" plugin - links that proxy to native input/buttons
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/ 
+(function($, undefined ) {
+$.widget( "mobile.button", $.mobile.widget, {
+	options: {
+		theme: null, 
+		icon: null,
+		iconpos: null,
+		inline: null,
+		corners: true,
+		shadow: true,
+		iconshadow: true
+	},
+	_create: function(){
+		var $el = this.element,
+			o = this.options,
+			type = $el.attr('type');
+			$el
+				.addClass('ui-btn-hidden')
+				.attr('tabindex','-1');
+		
+		//add ARIA role
+		$( "<a>", { 
+				"href": "#",
+				"role": "button",
+				"aria-label": $el.attr( "type" ) 
+			} )
+			.text( $el.text() || $el.val() )
+			.insertBefore( $el )
+			.click(function(){
+				if( type == "submit" ){
+					$(this).closest('form').submit();
+				}
+				else{
+					$el.click(); 
+				}
+
+				return false;
+			})
+			.buttonMarkup({
+				theme: o.theme, 
+				icon: o.icon,
+				iconpos: o.iconpos,
+				inline: o.inline,
+				corners: o.corners,
+				shadow: o.shadow,
+				iconshadow: o.iconshadow
+			});
+	}
+});
+})( jQuery );/*
+* jQuery Mobile Framework : "slider" plugin
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/  
+(function($, undefined ) {
+$.widget( "mobile.slider", $.mobile.widget, {
+	options: {
+		theme: null,
+		trackTheme: null
+	},
+	_create: function(){	
+		var control = this.element,
+		
+			parentTheme = control.parents('[class*=ui-bar-],[class*=ui-body-]').eq(0),	
+			
+			parentTheme = parentTheme.length ? parentTheme.attr('class').match(/ui-(bar|body)-([a-z])/)[2] : 'c',
+					
+			theme = this.options.theme ? this.options.theme : parentTheme,
+			
+			trackTheme = this.options.trackTheme ? this.options.trackTheme : parentTheme,
+			
+			cType = control[0].nodeName.toLowerCase(),
+			selectClass = (cType == 'select') ? 'ui-slider-switch' : '',
+			controlID = control.attr('id'),
+			labelID = controlID + '-label',
+			label = $('[for='+ controlID +']').attr('id',labelID),
+			val = (cType == 'input') ? parseFloat(control.val()) : control[0].selectedIndex,
+			min = (cType == 'input') ? parseFloat(control.attr('min')) : 0,
+			max = (cType == 'input') ? parseFloat(control.attr('max')) : control.find('option').length-1,
+			percent = ((parseFloat(val) - min) / (max - min)) * 100,
+			snappedPercent = percent,
+			slider = $('<div class="ui-slider '+ selectClass +' ui-btn-down-'+ trackTheme+' ui-btn-corner-all" role="application"></div>'),
+			handle = $('<a href="#" class="ui-slider-handle"></a>')
+				.appendTo(slider)
+				.buttonMarkup({corners: true, theme: theme, shadow: true})
+				.attr({
+					'role': 'slider',
+					'aria-valuemin': min,
+					'aria-valuemax': max,
+					'aria-valuenow': val,
+					'aria-valuetext': val,
+					'title': val,
+					'aria-labelledby': labelID
+				}),
+			dragging = false;
+			
+						
+		if(cType == 'select'){
+			slider.wrapInner('<div class="ui-slider-inneroffset"></div>');
+			var options = control.find('option');
+				
+			control.find('option').each(function(i){
+				var side = (i==0) ?'b':'a',
+					corners = (i==0) ? 'right' :'left',
+					theme = (i==0) ? ' ui-btn-down-' + trackTheme :' ui-btn-active';
+				$('<div class="ui-slider-labelbg ui-slider-labelbg-'+ side + theme +' ui-btn-corner-'+ corners+'"></div>').prependTo(slider);	
+				$('<span class="ui-slider-label ui-slider-label-'+ side + theme +' ui-btn-corner-'+ corners+'" role="img">'+$(this).text()+'</span>').prependTo(handle);
+			});
+			
+		}	
+		
+		function updateControl(val){
+			if(cType == 'input'){ 
+				control.val(val); 
+			}
+			else { 
+				control[0].selectedIndex = val;
+			}
+			control.trigger("change");
+		}
+			
+		function slideUpdate(event, val){
+			if (val){
+				percent = (parseFloat(val) - min) / (max - min) * 100;
+			} else {
+				var data = event.originalEvent.touches ? event.originalEvent.touches[ 0 ] : event,
+					// a slight tolerance helped get to the ends of the slider
+					tol = 8;
+				if( !dragging 
+						|| data.pageX < slider.offset().left - tol 
+						|| data.pageX > slider.offset().left + slider.width() + tol ){ 
+					return; 
+				}
+				percent = Math.round(((data.pageX - slider.offset().left) / slider.width() ) * 100);
+			}
+			
+			if( percent < 0 ) { percent = 0; }
+			if( percent > 100 ) { percent = 100; }
+			var newval = Math.round( (percent/100) * (max-min) ) + min;
+			
+			if( newval < min ) { newval = min; }
+			if( newval > max ) { newval = max; }
+			//flip the stack of the bg colors
+			if(percent > 60 && cType == 'select'){ 
+				
+			}
+			snappedPercent = Math.round( newval / (max-min) * 100 );
+			handle.css('left', percent + '%');
+			handle.attr({
+					'aria-valuenow': (cType == 'input') ? newval : control.find('option').eq(newval).attr('value'),
+					'aria-valuetext': (cType == 'input') ? newval : control.find('option').eq(newval).text(),
+					'title': newval
+				});
+			updateSwitchClass(newval);
+			updateControl(newval);
+		}
+		
+		function updateSwitchClass(val){
+			if(cType == 'input'){return;}
+			if(val == 0){ slider.addClass('ui-slider-switch-a').removeClass('ui-slider-switch-b'); }
+			else { slider.addClass('ui-slider-switch-b').removeClass('ui-slider-switch-a'); }
+		}
+		
+		updateSwitchClass(val);
+		
+		function updateSnap(){
+			if(cType == 'select'){
+				handle
+					.addClass('ui-slider-handle-snapping')
+					.css('left', snappedPercent + '%')
+					.animationComplete(function(){
+						handle.removeClass('ui-slider-handle-snapping');
+					});
+			}
+		}
+		
+		label.addClass('ui-slider');
+		
+		control
+			.addClass((cType == 'input') ? 'ui-slider-input' : 'ui-slider-switch')
+			.keyup(function(e){
+				slideUpdate(e, $(this).val() );
+			});
+			
+		$(document).bind($.support.touch ? "touchmove" : "mousemove", function(event){
+			if(dragging){
+				slideUpdate(event);
+				return false;
+			}
+		});
+					
+		slider
+			.bind($.support.touch ? "touchstart" : "mousedown", function(event){
+				dragging = true;
+				if((cType == 'select')){
+					val = control[0].selectedIndex;
+				}
+				slideUpdate(event);
+				return false;
+			});
+			
+		slider
+			.add(document)	
+			.bind($.support.touch ? "touchend" : "mouseup", function(event){
+				if(dragging){
+					dragging = false;
+					if(cType == 'select'){
+						if(val == control[0].selectedIndex){
+							val = val == 0 ? 1 : 0;
+							//tap occurred, but value didn't change. flip it!
+							slideUpdate(event,val);
+						}
+						updateSnap();
+					}
+					return false;
+				}
+			});
+			
+		slider.insertAfter(control);	
+		
+		handle
+			.css('left', percent + '%')
+			.bind('click', function(e){ return false; });	
+	}
+});
+})( jQuery );
+	
+/*
+* jQuery Mobile Framework : "collapsible" plugin
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/ 
+(function($, undefined ) {
+$.widget( "mobile.collapsible", $.mobile.widget, {
+	options: {
+		expandCueText: ' click to expand contents',
+		collapseCueText: ' click to collapse contents',
+		collapsed: false,
+		heading: '>:header,>legend',
+		theme: null,
+		iconTheme: 'd'
+	},
+	_create: function(){
+
+		var $el = this.element,
+			o = this.options,
+			collapsibleContain = $el.addClass('ui-collapsible-contain'),
+			collapsibleHeading = $el.find(o.heading).eq(0),
+			collapsibleContent = collapsibleContain.wrapInner('<div class="ui-collapsible-content"></div>').find('.ui-collapsible-content'),
+			collapsibleParent = $el.closest('[data-role="collapsible-set"]').addClass('ui-collapsible-set');				
+		
+		//replace collapsibleHeading if it's a legend	
+		if(collapsibleHeading.is('legend')){
+			collapsibleHeading = $('<div role="heading">'+ collapsibleHeading.html() +'</div>').insertBefore(collapsibleHeading);
+			collapsibleHeading.next().remove();
+		}	
+		
+		//drop heading in before content
+		collapsibleHeading.insertBefore(collapsibleContent);
+		
+		//modify markup & attributes
+		collapsibleHeading.addClass('ui-collapsible-heading')
+			.append('<span class="ui-collapsible-heading-status"></span>')
+			.wrapInner('<a href="#" class="ui-collapsible-heading-toggle"></a>')
+			.find('a:eq(0)')
+			.buttonMarkup({
+				shadow: !!!collapsibleParent.length,
+				corners:false,
+				iconPos: 'left',
+				icon: 'plus',
+				theme: o.theme
+			})
+			.find('.ui-icon')
+			.removeAttr('class')
+			.buttonMarkup({
+				shadow: true,
+				corners:true,
+				iconPos: 'notext',
+				icon: 'plus',
+				theme: o.iconTheme
+			});
+			
+			if( !collapsibleParent.length ){
+				collapsibleHeading
+					.find('a:eq(0)')	
+					.addClass('ui-corner-all')
+						.find('.ui-btn-inner')
+						.addClass('ui-corner-all');
+			}
+			else {
+				if( collapsibleContain.data('collapsible-last') ){
+					collapsibleHeading
+						.find('a:eq(0), .ui-btn-inner')	
+							.addClass('ui-corner-bottom');
+				}					
+			}
+			
+		
+		//events
+		collapsibleContain	
+			.bind('collapse', function(event){
+				if( !event.isDefaultPrevented() ){
+					event.preventDefault();
+					collapsibleHeading
+						.addClass('ui-collapsible-heading-collapsed')
+						.find('.ui-collapsible-heading-status').text(o.expandCueText);
+					
+					collapsibleHeading.find('.ui-icon').removeClass('ui-icon-minus').addClass('ui-icon-plus');	
+					collapsibleContent.addClass('ui-collapsible-content-collapsed').attr('aria-hidden',true);
+					
+					if( collapsibleContain.data('collapsible-last') ){
+						collapsibleHeading
+							.find('a:eq(0), .ui-btn-inner')
+							.addClass('ui-corner-bottom');
+					}
+				}						
+				
+			})
+			.bind('expand', function(event){
+				if( !event.isDefaultPrevented() ){
+					event.preventDefault();
+					collapsibleHeading
+						.removeClass('ui-collapsible-heading-collapsed')
+						.find('.ui-collapsible-heading-status').text(o.collapseCueText);
+					
+					collapsibleHeading.find('.ui-icon').removeClass('ui-icon-plus').addClass('ui-icon-minus');	
+					collapsibleContent.removeClass('ui-collapsible-content-collapsed').attr('aria-hidden',false);
+					
+					if( collapsibleContain.data('collapsible-last') ){
+						collapsibleHeading
+							.find('a:eq(0), .ui-btn-inner')
+							.removeClass('ui-corner-bottom');
+					}
+					
+				}
+			})
+			.trigger(o.collapsed ? 'collapse' : 'expand');
+			
+		
+		//close others in a set
+		if( collapsibleParent.length && !collapsibleParent.data("collapsiblebound") ){
+			collapsibleParent
+				.data("collapsiblebound", true)
+				.bind("expand", function( event ){
+					$(this).find( ".ui-collapsible-contain" )
+						.not( $(event.target).closest( ".ui-collapsible-contain" ) )
+						.not( "> .ui-collapsible-contain .ui-collapsible-contain" )
+						.trigger( "collapse" );
+				})
+			var set = collapsibleParent.find('[data-role=collapsible]')
+					
+			set.first()
+				.find('a:eq(0)')	
+				.addClass('ui-corner-top')
+					.find('.ui-btn-inner')
+					.addClass('ui-corner-top');
+					
+			set.last().data('collapsible-last', true)	
+		}
+					
+		collapsibleHeading.click(function(){ 
+			if( collapsibleHeading.is('.ui-collapsible-heading-collapsed') ){
+				collapsibleContain.trigger('expand'); 
+			}	
+			else {
+				collapsibleContain.trigger('collapse'); 
+			}
+			return false;
+		});
+			
+	}
+});
+})( jQuery );/*
+* jQuery Mobile Framework: "controlgroup" plugin - corner-rounding for groups of buttons, checks, radios, etc
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+$.fn.controlgroup = function(options){
+		
+	return $(this).each(function(){
+		var o = $.extend({
+			direction: $( this ).data( "type" ) || "vertical",
+			shadow: false
+		},options);
+		var groupheading = $(this).find('>legend'),
+			flCorners = o.direction == 'horizontal' ? ['ui-corner-left', 'ui-corner-right'] : ['ui-corner-top', 'ui-corner-bottom'],
+			type = $(this).find('input:eq(0)').attr('type');
+		
+		//replace legend with more stylable replacement div	
+		if( groupheading.length ){
+			$(this).wrapInner('<div class="ui-controlgroup-controls"></div>');	
+			$('<div role="heading" class="ui-controlgroup-label">'+ groupheading.html() +'</div>').insertBefore( $(this).children(0) );	
+			groupheading.remove();	
+		}
+
+		$(this).addClass('ui-corner-all ui-controlgroup ui-controlgroup-'+o.direction);
+		
+		function flipClasses(els){
+			els
+				.removeClass('ui-btn-corner-all ui-shadow')
+				.eq(0).addClass(flCorners[0])
+				.end()
+				.filter(':last').addClass(flCorners[1]).addClass('ui-controlgroup-last');
+		}
+		flipClasses($(this).find('.ui-btn'));
+		flipClasses($(this).find('.ui-btn-inner'));
+		if(o.shadow){
+			$(this).addClass('ui-shadow');
+		}
+	});	
+};
+})(jQuery);/*
+* jQuery Mobile Framework : "fieldcontain" plugin - simple class additions to make form row separators
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+$.fn.fieldcontain = function(options){
+	var o = $.extend({
+		theme: 'c'
+	},options);
+	return $(this).addClass('ui-field-contain ui-body ui-br');
+};
+})(jQuery);/*
+* jQuery Mobile Framework : "listview" plugin
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+
+$.widget( "mobile.listview", $.mobile.widget, {
+	options: {
+		theme: "c",
+		countTheme: "c",
+		headerTheme: "b",
+		dividerTheme: "b",
+		splitIcon: "arrow-r",
+		splitTheme: "b",
+		inset: false
+	},
+	
+	_create: function() {
+		var $list = this.element,
+			o = this.options;
+
+		// create listview markup 
+		$list
+			.addClass( "ui-listview" )
+			.attr( "role", "listbox" )
+		
+		if ( o.inset ) {
+			$list.addClass( "ui-listview-inset ui-corner-all ui-shadow" );
+		}	
+
+		$list.delegate( ".ui-li", "focusin", function() {
+			$( this ).attr( "tabindex", "0" );
+		});
+
+		this._itemApply( $list, $list );
+		
+		this.refresh( true );
+	
+		//keyboard events for menu items
+		$list.keydown(function( e ) {
+			var target = $( e.target ),
+				li = target.closest( "li" );
+
+			// switch logic based on which key was pressed
+			switch ( e.keyCode ) {
+				// up or left arrow keys
+				case 38:
+					var prev = li.prev();
+
+					// if there's a previous option, focus it
+					if ( prev.length ) {
+						target
+							.blur()
+							.attr( "tabindex", "-1" );
+
+						prev.find( "a" ).first().focus();
+					}	
+
+					return false;
+				break;
+
+				// down or right arrow keys
+				case 40:
+					var next = li.next();
+				
+					// if there's a next option, focus it
+					if ( next.length ) {
+						target
+							.blur()
+							.attr( "tabindex", "-1" );
+						
+						next.find( "a" ).first().focus();
+					}	
+
+					return false;
+				break;
+
+				case 39:
+					var a = li.find( "a.ui-li-link-alt" );
+
+					if ( a.length ) {
+						target.blur();
+						a.first().focus();
+					}
+
+					return false;
+				break;
+
+				case 37:
+					var a = li.find( "a.ui-link-inherit" );
+
+					if ( a.length ) {
+						target.blur();
+						a.first().focus();
+					}
+
+					return false;
+				break;
+
+				// if enter or space is pressed, trigger click
+				case 13:
+				case 32:
+					 target.trigger( "click" );
+
+					 return false;
+				break;	
+			}
+		});	
+
+		// tapping the whole LI triggers click on the first link
+		$list.delegate( "li", "click", function(event) {
+			if ( !$( event.target ).closest( "a" ).length ) {
+				$( this ).find( "a" ).first().trigger( "click" );
+				return false;
+			}
+		});
+	},
+
+	_itemApply: function( $list, item ) {
+		// TODO class has to be defined in markup
+		item.find( ".ui-li-count" )
+			.addClass( "ui-btn-up-" + ($list.data( "counttheme" ) || this.options.countTheme) + " ui-btn-corner-all" );
+
+		item.find( "h1, h2, h3, h4, h5, h6" ).addClass( "ui-li-heading" );
+
+		item.find( "p, dl" ).addClass( "ui-li-desc" );
+
+		item.find( "img" ).addClass( "ui-li-thumb" ).each(function() {
+			$( this ).closest( "li" )
+				.addClass( $(this).is( ".ui-li-icon" ) ? "ui-li-has-icon" : "ui-li-has-thumb" );
+		});
+
+		var aside = item.find( ".ui-li-aside" );
+
+		if ( aside.length ) {
+            aside.each(function(i, el) {
+			    $(el).prependTo( $(el).parent() ); //shift aside to front for css float
+            });
+		}
+
+		if ( $.support.cssPseudoElement || !$.nodeName( item[0], "ol" ) ) {
+			return;
+		}
+	},
+	
+	refresh: function( create ) {
+		this._createSubPages();
+		
+		var o = this.options,
+			$list = this.element,
+			self = this,
+			dividertheme = $list.data( "dividertheme" ) || o.dividerTheme,
+			li = $list.children( "li" ),
+			counter = $.support.cssPseudoElement || !$.nodeName( $list[0], "ol" ) ? 0 : 1;
+
+		if ( counter ) {
+			$list.find( ".ui-li-dec" ).remove();
+		}
+
+		li.attr({ "role": "option", "tabindex": "-1" });
+
+		li.first().attr( "tabindex", "0" );
+
+		li.each(function( pos ) {
+			var item = $( this ),
+				itemClass = "ui-li";
+
+			// If we're creating the element, we update it regardless
+			if ( !create && item.hasClass( "ui-li" ) ) {
+				return;
+			}
+
+			var a = item.find( "a" );
+				
+			if ( a.length ) {	
+				item
+					.buttonMarkup({
+						wrapperEls: "div",
+						shadow: false,
+						corners: false,
+						iconpos: "right",
+						icon: a.length > 1 ? false : item.data("icon") || "arrow-r",
+						theme: o.theme
+					});
+
+				a.first().addClass( "ui-link-inherit" );
+
+				if ( a.length > 1 ) {
+					itemClass += " ui-li-has-alt";
+
+					var last = a.last(),
+						splittheme = $list.data( "splittheme" ) || last.data( "theme" ) || o.splitTheme;
+					
+					last
+						.attr( "title", last.text() )
+						.addClass( "ui-li-link-alt" )
+						.empty()
+						.buttonMarkup({
+							shadow: false,
+							corners: false,
+							theme: o.theme,
+							icon: false,
+							iconpos: false
+						})
+						.find( ".ui-btn-inner" )
+							.append( $( "<span>" ).buttonMarkup({
+								shadow: true,
+								corners: true,
+								theme: splittheme,
+								iconpos: "notext",
+								icon: $list.data( "spliticon" ) || last.data( "icon" ) ||  o.splitIcon
+							} ) );
+				}
+
+			} else if ( item.data( "role" ) === "list-divider" ) {
+				itemClass += " ui-li-divider ui-btn ui-bar-" + dividertheme;
+				item.attr( "role", "heading" );
+
+				//reset counter when a divider heading is encountered
+				if ( counter ) {
+					counter = 1;
+				}
+
+			} else {
+				itemClass += " ui-li-static ui-btn-up-" + o.theme;
+			}
+				
+			if ( pos === 0 ) {
+				if ( o.inset ) {
+					itemClass += " ui-corner-top";
+
+					item
+						.add( item.find( ".ui-btn-inner" ) )
+						.find( ".ui-li-link-alt" )
+							.addClass( "ui-corner-tr" )
+						.end()
+						.find( ".ui-li-thumb" )
+							.addClass( "ui-corner-tl" );
+				}
+
+			} else if ( pos === li.length - 1 ) {
+
+				if ( o.inset ) {
+					itemClass += " ui-corner-bottom";
+
+					item
+						.add( item.find( ".ui-btn-inner" ) )
+						.find( ".ui-li-link-alt" )
+							.addClass( "ui-corner-br" )
+						.end()
+						.find( ".ui-li-thumb" )
+							.addClass( "ui-corner-bl" );
+				}
+			}
+
+			if ( counter && itemClass.indexOf( "ui-li-divider" ) < 0 ) {
+				item
+					.find( ".ui-link-inherit" ).first()
+					.addClass( "ui-li-jsnumbering" )
+					.prepend( "<span class='ui-li-dec'>" + (counter++) + ". </span>" );
+			}
+
+			item.addClass( itemClass );
+
+			if ( !create ) {
+				self._itemApply( $list, item );
+			}
+		});
+	},
+	
+	_createSubPages: function() {
+		var parentList = this.element,
+			parentPage = parentList.closest( ".ui-page" ),
+			parentId = parentPage.attr( "id" ),
+			o = this.options,
+			persistentFooterID = parentPage.find( "[data-role='footer']" ).data( "id" );
+
+		$( parentList.find( "ul, ol" ).toArray().reverse() ).each(function( i ) {
+			var list = $( this ),
+				parent = list.parent(),
+				title = parent.contents()[ 0 ].nodeValue.split("\n")[0],
+				id = parentId + "&" + $.mobile.subPageUrlKey + "=" + $.mobile.idStringEscape(title + " " + i),
+				theme = list.data( "theme" ) || o.theme,
+				countTheme = list.data( "counttheme" ) || parentList.data( "counttheme" ) || o.countTheme,
+				newPage = list.wrap( "<div data-role='page'><div data-role='content'></div></div>" )
+							.parent()
+								.before( "<div data-role='header' data-theme='" + o.headerTheme + "'><div class='ui-title'>" + title + "</div></div>" )
+								.after( persistentFooterID ? $( "<div>", { "data-role": "footer", "data-id": persistentFooterID, "class": "ui-footer-duplicate" } ) : "" )
+								.parent()
+									.attr({
+										id: id,
+										"data-theme": theme,
+										"data-count-theme": countTheme
+									})
+									.appendTo( $.pageContainer );
+				
+				
+				
+				newPage.page();		
+			
+			parent.html( "<a href='#" + id + "'>" + title + "</a>" );
+		}).listview();
+	}
+});
+
+})( jQuery );
+/*
+* jQuery Mobile Framework : "listview" filter extension
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+
+$.mobile.listview.prototype.options.filter = false;
+
+$( "[data-role='listview']" ).live( "listviewcreate", function() {
+	var list = $( this ),
+		listview = list.data( "listview" );
+	if ( !listview.options.filter ) {
+		return;
+	}
+
+	var wrapper = $( "<form>", { "class": "ui-listview-filter ui-bar-c", "role": "search" } ),
+		
+		search = $( "<input>", {
+				placeholder: "Filter results...",
+				"data-type": "search"
+			})
+			.bind( "keyup change", function() {
+				var val = this.value.toLowerCase();;
+				list.children().show();
+				if ( val ) {
+					list.children().filter(function() {
+						return $( this ).text().toLowerCase().indexOf( val ) === -1;
+					}).hide();
+				}
+				
+				//listview._numberItems();
+			})
+			.appendTo( wrapper )
+			.textinput();
+	
+	wrapper.insertBefore( list );
+});
+
+})( jQuery );
+/*
+* jQuery Mobile Framework : "dialog" plugin.
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+$.widget( "mobile.dialog", $.mobile.widget, {
+	options: {},
+	_create: function(){	
+		var self = this,
+			$el = self.element,
+			$prevPage = $.mobile.activePage,
+			$closeBtn = $('<a href="#" data-icon="delete" data-iconpos="notext">Close</a>');
+	
+		$el.delegate("a, submit", "click submit", function(e){
+			if( e.type == "click" && ( $(e.target).closest('[data-back]') || $(e.target).closest($closeBtn) ) ){
+				self.close();
+				return false;
+			}
+			//otherwise, assume we're headed somewhere new. set activepage to dialog so the transition will work
+			$.mobile.activePage = this.element;
+		});
+	
+		this.element
+			.bind("pageshow",function(){
+				return false;
+			})
+			//add ARIA role
+			.attr("role","dialog")
+			.addClass('ui-page ui-dialog ui-body-a')
+			.find('[data-role=header]')
+			.addClass('ui-corner-top ui-overlay-shadow')
+				.prepend( $closeBtn )
+			.end()
+			.find('.ui-content:not([class*="ui-body-"])')
+				.addClass('ui-body-c')
+			.end()	
+			.find('.ui-content,[data-role=footer]')
+				.last()
+				.addClass('ui-corner-bottom ui-overlay-shadow');
+		
+		$(window).bind('hashchange',function(){
+			if( $el.is('.ui-page-active') ){
+				self.close();
+				$el.bind('pagehide',function(){
+					$.mobile.updateHash( $prevPage.attr('id'), true);
+				});
+			}
+		});		
+
+	},
+	
+	close: function(){
+		$.mobile.changePage([this.element, $.mobile.activePage], undefined, true, true );
+	}
+});
+})( jQuery );/*
+* jQuery Mobile Framework : "navbar" plugin
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/
+(function($, undefined ) {
+$.widget( "mobile.navbar", $.mobile.widget, {
+	options: {
+		iconpos: 'top',
+		grid: null
+	},
+	_create: function(){
+		var $navbar = this.element,
+			$navbtns = $navbar.find("a"),
+			iconpos = $navbtns.filter('[data-icon]').length ? this.options.iconpos : undefined;
+		
+		$navbar
+			.addClass('ui-navbar')
+			.attr("role","navigation")
+			.find("ul")
+				.grid({grid: this.options.grid });		
+		
+		if( !iconpos ){ 
+			$navbar.addClass("ui-navbar-noicons");
+		}
+		
+		$navbtns
+			.buttonMarkup({
+				corners:	false, 
+				shadow:		false, 
+				iconpos:	iconpos
+			});
+		
+		$navbar.delegate("a", "click",function(event){
+			$navbtns.removeClass("ui-btn-active");
+		});	
+	}
+});
+})( jQuery );/*
+* jQuery Mobile Framework : plugin for creating CSS grids
+* Copyright (c) jQuery Project
+* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses.
+* Note: Code is in draft form and is subject to change 
+*/ 
+(function($, undefined ) {
+$.fn.grid = function(options){
+	return $(this).each(function(){
+		var o = $.extend({
+			grid: null
+		},options);
+	
+			
+		var $kids = $(this).children(),
+			gridCols = {a: 2, b:3, c:4, d:5},
+			grid = o.grid,
+			iterator;
+			
+			if( !grid ){
+				if( $kids.length <= 5 ){
+					for(var letter in gridCols){
+						if(gridCols[letter] == $kids.length){ grid = letter; }
+					}
+				}
+				else{
+					grid = 'a';
+				}
+			}
+			iterator = gridCols[grid];
+			
+		$(this).addClass('ui-grid-' + grid);
+	
+		$kids.filter(':nth-child(' + iterator + 'n+1)').addClass('ui-block-a');
+		$kids.filter(':nth-child(' + iterator + 'n+2)').addClass('ui-block-b');
+			
+		if(iterator > 2){	
+			$kids.filter(':nth-child(3n+3)').addClass('ui-block-c');
+		}	
+		if(iterator> 3){	
+			$kids.filter(':nth-child(4n+4)').addClass('ui-block-d');
+		}	
+		if(iterator > 4){	
+			$kids.filter(':nth-child(5n+5)').addClass('ui-block-e');
+		}
+				
+	});	
+};
+})(jQuery);
+
+/*!
+ * jQuery Mobile v@VERSION
+ * http://jquerymobile.com/
+ *
+ * Copyright 2010, jQuery Project
+ * Dual licensed under the MIT or GPL Version 2 licenses.
+ * http://jquery.org/license
+ */
+
+(function( $, window, undefined ) {
+	
+	//jQuery.mobile configurable options
+	$.extend( $.mobile, {
+		
+		//define the url parameter used for referencing widget-generated sub-pages. 
+		//Translates to to example.html&ui-page=subpageIdentifier
+		//hash segment before &ui-page= is used to make Ajax request
+		subPageUrlKey: 'ui-page',
+		
+		//anchor links with a data-rel, or pages with a data-role, that match these selectors will be untrackable in history 
+		//(no change in URL, not bookmarkable)
+		nonHistorySelectors: 'dialog',
+		
+		//class assigned to page currently in view, and during transitions
+		activePageClass: 'ui-page-active',
+		
+		//class used for "active" button state, from CSS framework
+		activeBtnClass: 'ui-btn-active',
+		
+		//automatically handle link clicks through Ajax, when possible
+		ajaxLinksEnabled: true,
+		
+		//automatically handle form submissions through Ajax, when possible
+		ajaxFormsEnabled: true,
+		
+		//available CSS transitions
+		transitions: ['slide', 'slideup', 'slidedown', 'pop', 'flip', 'fade'],
+		
+		//set default transition - 'none' for no transitions
+		defaultTransition: 'slide',
+		
+		//show loading message during Ajax requests
+		//if false, message will not appear, but loading classes will still be toggled on html el
+		loadingMessage: "loading",
+		
+		//configure meta viewport tag's content attr:
+		metaViewportContent: "width=device-width, minimum-scale=1, maximum-scale=1",
+		
+		//support conditions that must be met in order to proceed
+		gradeA: function(){
+			return $.support.mediaquery;
+		}
+	});
+	
+	//trigger mobileinit event - useful hook for configuring $.mobile settings before they're used
+	$( window.document ).trigger('mobileinit');
+	
+	//if device support condition(s) aren't met, leave things as they are -> a basic, usable experience,
+	//otherwise, proceed with the enhancements
+	if ( !$.mobile.gradeA() ) {
+		return;
+	}	
+
+	//define vars for interal use
+	var $window = $(window),
+		$html = $('html'),
+		$head = $('head'),
+		
+		//to be populated at DOM ready
+		$body,
+		
+		//loading div which appears during Ajax requests
+		//will not appear if $.mobile.loadingMessage is false
+		$loader = $.mobile.loadingMessage ? 
+			$('<div class="ui-loader ui-body-a ui-corner-all">'+
+						'<span class="ui-icon ui-icon-loading spin"></span>'+
+						'<h1>'+ $.mobile.loadingMessage +'</h1>'+
+					'</div>')
+			: undefined,
+			
+		//define meta viewport tag, if content is defined	
+		$metaViewport = $.mobile.metaViewportContent ? $("<meta>", { name: "viewport", content: $.mobile.metaViewportContent}).prependTo( $head ) : undefined,
+		
+		//define baseUrl for use in relative url management
+		baseUrl = getPathDir( location.protocol + '//' + location.host + location.pathname ),
+		
+		//define base element, for use in routing asset urls that are referenced in Ajax-requested markup
+		$base = $.support.dynamicBaseTag ? $("<base>", { href: baseUrl }).prependTo( $head ) : undefined,
+		
+		//will be defined as first page element in DOM
+		$startPage,
+		
+		//will be defined as $startPage.parent(), which is usually the body element
+		//will receive ui-mobile-viewport class
+		$pageContainer,
+		
+		//will be defined when a link is clicked and given an active class
+		$activeClickedLink = null,
+		
+		//array of pages that are visited during a single page load
+		//length will grow as pages are visited, and shrink as "back" link/button is clicked
+		//each item has a url (string matches ID), and transition (saved for reuse when "back" link/button is clicked)
+		urlStack = [ {
+			url: location.hash.replace( /^#/, "" ),
+			transition: undefined
+		} ],
+		
+		//define first selector to receive focus when a page is shown
+		focusable = "[tabindex],a,button:visible,select:visible,input",
+		
+		//contains role for next page, if defined on clicked link via data-rel
+		nextPageRole = null,
+		
+		//enable/disable hashchange event listener
+		//toggled internally when location.hash is updated to match the url of a successful page load
+		hashListener = true,
+		
+		//media-query-like width breakpoints, which are translated to classes on the html element 
+		resolutionBreakpoints = [320,480,768,1024];
+	
+	//add mobile, initial load "rendering" classes to docEl
+	$html.addClass('ui-mobile ui-mobile-rendering');	
+
+	// TODO: don't expose (temporary during code reorg)
+	$.mobile.urlStack = urlStack;
+	
+	//consistent string escaping for urls and IDs
+	function idStringEscape(str){
+		return str.replace(/[^a-zA-Z0-9]/g, '-');
+	}
+	
+	$.mobile.idStringEscape = idStringEscape;
+	
+	// hide address bar
+	function silentScroll( ypos ) {
+		// prevent scrollstart and scrollstop events
+		$.event.special.scrollstart.enabled = false;
+		setTimeout(function() {
+			window.scrollTo( 0, ypos || 0 );
+		},20);	
+		setTimeout(function() {
+			$.event.special.scrollstart.enabled = true;
+		}, 150 );
+	}
+	
+	function getPathDir( path ){
+		var newPath = path.replace(/#/,'').split('/');
+		newPath.pop();
+		return newPath.join('/') + (newPath.length ? '/' : '');
+	}
+	
+	function getBaseURL( nonHashPath ){
+		return getPathDir( nonHashPath || location.hash );
+	}
+	
+	var setBaseURL = !$.support.dynamicBaseTag ? $.noop : function( nonHashPath ){
+		//set base url for new page assets
+		$base.attr('href', baseUrl + getBaseURL( nonHashPath ));
+	}
+	
+	var resetBaseURL = !$.support.dynamicBaseTag ? $.noop : function(){
+		$base.attr('href', baseUrl);
+	}
+	
+	//set base href to pathname
+    resetBaseURL(); 
+	
+	//for form submission
+	$('form').live('submit', function(event){
+		if( !$.mobile.ajaxFormsEnabled ){ return; }
+		
+		var type = $(this).attr("method"),
+			url = $(this).attr( "action" ).replace( location.protocol + "//" + location.host, "");	
+		
+		//external submits use regular HTTP
+		if( /^(:?\w+:)/.test( url ) ){
+			return;
+		}	
+		
+		//if it's a relative href, prefix href with base url
+		if( url.indexOf('/') && url.indexOf('#') !== 0 ){
+			url = getBaseURL() + url;
+		}
+    changePage({
+				url: url,
+				type: type,
+				data: $(this).serialize()
+			},
+			undefined,
+			undefined,
+			true
+		);
+		// event.preventDefault();
+    return false;
+  });	
+	
+	//click routing - direct to HTTP or Ajax, accordingly
+	$( "a" ).live( "click", function(event) {
+		var $this = $(this),
+			//get href, remove same-domain protocol and host
+			href = $this.attr( "href" ).replace( location.protocol + "//" + location.host, ""),
+			//if target attr is specified, it's external, and we mimic _blank... for now
+			target = $this.is( "[target]" ),
+			//if it still starts with a protocol, it's external, or could be :mailto, etc
+			external = target || /^(:?\w+:)/.test( href ) || $this.is( "[rel=external]" ),
+			target = $this.is( "[target]" );
+
+		if( href === '#' ){
+			//for links created purely for interaction - ignore
+			return false;
+		}
+		
+		$activeClickedLink = $this.closest( ".ui-btn" ).addClass( $.mobile.activeBtnClass );
+		
+		if( external || !$.mobile.ajaxLinksEnabled ){
+			//remove active link class if external
+			removeActiveLinkClass(true);
+			
+			//deliberately redirect, in case click was triggered
+			if( target ){
+				window.open(href);
+			}
+			else{
+				location.href = href;
+			}
+		}
+		else {	
+			//use ajax
+			var transition = $this.data( "transition" ),
+				back = $this.data( "back" ),
+				changeHashOnSuccess = !$this.is( "[data-rel="+ $.mobile.nonHistorySelectors +"]" );
+				
+			nextPageRole = $this.attr( "data-rel" );	
+	
+			//if it's a relative href, prefix href with base url
+			if( href.indexOf('/') && href.indexOf('#') !== 0 ){
+				href = getBaseURL() + href;
+			}
+			
+			href.replace(/^#/,'');
+			
+			changePage(href, transition, back, changeHashOnSuccess);			
+		}
+		event.preventDefault();
+	});
+	
+	// turn on/off page loading message.
+	function pageLoading( done ) {
+		if ( done ) {
+			$html.removeClass( "ui-loading" );
+		} else {
+		
+			if( $.mobile.loadingMessage ){
+				$loader.appendTo($pageContainer).css({top: $(window).scrollTop() + 75});
+			}	
+			$html.addClass( "ui-loading" );
+		}
+	};
+	
+	//for directing focus to the page title, or otherwise first focusable element
+	function reFocus(page){
+		var pageTitle = page.find( ".ui-title:eq(0)" );
+		if( pageTitle.length ){
+			pageTitle.focus();
+		}
+		else{
+			page.find( focusable ).eq(0).focus();
+		}
+	}
+	
+	//function for setting role of next page
+	function setPageRole( newPage ) {
+		if ( nextPageRole ) {
+			newPage.attr( "data-role", nextPageRole );
+			nextPageRole = undefined;
+		}
+	}
+	
+	//update hash, with or without triggering hashchange event
+	$.mobile.updateHash = function(url, disableListening){
+		if(disableListening) { hashListener = false; }
+		location.hash = url;
+	}
+
+	//wrap page and transfer data-attrs if it has an ID
+	function wrapNewPage( newPage ){
+		var copyAttrs = ['data-role', 'data-theme', 'data-fullscreen'], //TODO: more page-level attrs?
+			wrapper = newPage.wrap( "<div>" ).parent();
+			
+		$.each(copyAttrs,function(i){
+			if( newPage.attr( copyAttrs[ i ] ) ){
+				wrapper.attr( copyAttrs[ i ], newPage.attr( copyAttrs[ i ] ) );
+				newPage.removeAttr( copyAttrs[ i ] );
+			}
+		});
+		return wrapper;
+	}
+	
+	//remove active classes after page transition or error
+	function removeActiveLinkClass(forceRemoval){
+		if( !!$activeClickedLink && (!$activeClickedLink.closest( '.ui-page-active' ).length || forceRemoval )){
+			$activeClickedLink.removeClass( $.mobile.activeBtnClass );
+		}
+		$activeClickedLink = null;
+	}
+
+
+	//for getting or creating a new page 
+	function changePage( to, transition, back, changeHash){
+
+		//from is always the currently viewed page
+		var toIsArray = $.type(to) === "array",
+			from = toIsArray ? to[0] : $.mobile.activePage,
+			to = toIsArray ? to[1] : to,
+			url = fileUrl = $.type(to) === "string" ? to.replace( /^#/, "" ) : null,
+			data = undefined,
+			type = 'get',
+			isFormRequest = false,
+			duplicateCachedPage = null,
+			back = (back !== undefined) ? back : ( urlStack.length > 1 && urlStack[ urlStack.length - 2 ].url === url ),
+			transition = (transition !== undefined) ? transition : $.mobile.defaultTransition;
+		
+		if( $.type(to) === "object" && to.url ){
+			url = to.url,
+			data = to.data,
+			type = to.type,
+			isFormRequest = true;
+			//make get requests bookmarkable
+			if( data && type == 'get' ){
+				url += "?" + data;
+				data = undefined;
+			}
+		}
+			
+		//reset base to pathname for new request
+		resetBaseURL();
+			
+		// if the new href is the same as the previous one
+		if ( back ) {
+			transition = urlStack.pop().transition;
+		} else {
+			urlStack.push({ url: url, transition: transition });
+		}
+		
+		//function for transitioning between two existing pages
+		function transitionPages() {
+				
+			//kill the keyboard
+			$( window.document.activeElement ).blur();
+			
+			//get current scroll distance
+			var currScroll = $window.scrollTop();
+			
+			//set as data for returning to that spot
+			from.data('lastScroll', currScroll);
+			
+			//trigger before show/hide events
+			from.data("page")._trigger("beforehide", {nextPage: to});
+			to.data("page")._trigger("beforeshow", {prevPage: from});
+			
+			function loadComplete(){
+				pageLoading( true );
+				//trigger show/hide events, allow preventing focus change through return false		
+				if( from.data("page")._trigger("hide", null, {nextPage: to}) !== false && to.data("page")._trigger("show", null, {prevPage: from}) !== false ){
+					$.mobile.activePage = to;
+				}
+				reFocus( to );
+				if( changeHash && url ){
+					$.mobile.updateHash(url, true);
+				}
+				removeActiveLinkClass();
+				
+				//if there's a duplicateCachedPage, remove it from the DOM now that it's hidden
+				if( duplicateCachedPage != null ){
+					duplicateCachedPage.remove();
+				}
+				
+				//jump to top or prev scroll, if set
+				silentScroll( to.data( 'lastScroll' ) );
+			}
+			
+			if(transition && (transition !== 'none')){	
+				$pageContainer.addClass('ui-mobile-viewport-transitioning');
+				// animate in / out
+				from.addClass( transition + " out " + ( back ? "reverse" : "" ) );
+				to.addClass( $.mobile.activePageClass + " " + transition +
+					" in " + ( back ? "reverse" : "" ) );
+				
+				// callback - remove classes, etc
+				to.animationComplete(function() {
+					from.add( to ).removeClass(" out in reverse " + $.mobile.transitions.join(' ') );
+					from.removeClass( $.mobile.activePageClass );
+					loadComplete();
+					$pageContainer.removeClass('ui-mobile-viewport-transitioning');
+				});
+			}
+			else{
+				from.removeClass( $.mobile.activePageClass );
+				to.addClass( $.mobile.activePageClass );
+				loadComplete();
+			}
+		};
+		
+		//shared page enhancements
+		function enhancePage(){
+			setPageRole( to );
+			to.page();
+		}
+		
+		//get the actual file in a jq-mobile nested url
+		function getFileURL( url ){
+			return url.match( '&' + $.mobile.subPageUrlKey ) ? url.split( '&' + $.mobile.subPageUrlKey )[0] : url;
+		}
+
+		//if url is a string
+		if( url ){
+			to = $( "[id='" + url + "']" ),
+			fileUrl = getFileURL(url);
+		}
+		else{ //find base url of element, if avail
+			var toID = to.attr('id'),
+				toIDfileurl = getFileURL(toID);
+				
+			if(toID != toIDfileurl){
+				fileUrl = toIDfileurl;
+			}	
+		}
+		
+		// find the "to" page, either locally existing in the dom or by creating it through ajax
+		if ( to.length && !isFormRequest ) {
+			if( fileUrl ){
+				setBaseURL(fileUrl);
+			}	
+			enhancePage();
+			transitionPages();
+		} else { 
+		
+			//if to exists in DOM, save a reference to it in duplicateCachedPage for removal after page change
+			if( to.length ){
+				duplicateCachedPage = to;
+			}
+			
+			pageLoading();
+
+			$.ajax({
+				url: fileUrl,
+				type: type,
+				data: data,
+				success: function( html ) {
+					setBaseURL(fileUrl);
+					var all = $("<div></div>");
+					//workaround to allow scripts to execute when included in page divs
+					all.get(0).innerHTML = html;
+					to = all.find('[data-role="page"]');
+					
+					//rewrite src and href attrs to use a base url
+					if( !$.support.dynamicBaseTag ){
+						var baseUrl = getBaseURL(fileUrl);
+						to.find('[src],link[href]').each(function(){
+							var thisAttr = $(this).is('[href]') ? 'href' : 'src',
+								thisUrl = $(this).attr(thisAttr);
+							
+							//if full path exists and is same, chop it - helps IE out
+							thisUrl.replace( location.protocol + '//' + location.host + location.pathname, '' );
+								
+							if( !/^(\w+:|#|\/)/.test(thisUrl) ){
+								$(this).attr(thisAttr, baseUrl + thisUrl);
+							}
+						});
+					}
+					
+					//preserve ID on a retrieved page
+					if ( to.attr('id') ) {
+						to = wrapNewPage( to );
+					}
+
+					to
+						.attr( "id", fileUrl )
+						.appendTo( $pageContainer );
+						
+					enhancePage();
+					transitionPages();
+				},
+				error: function() {
+					pageLoading( true );
+					removeActiveLinkClass(true);
+					$("<div class='ui-loader ui-overlay-shadow ui-body-e ui-corner-all'><h1>Error Loading Page</h1></div>")
+						.css({ "display": "block", "opacity": 0.96, "top": $(window).scrollTop() + 100 })
+						.appendTo( $pageContainer )
+						.delay( 800 )
+						.fadeOut( 400, function(){
+							$(this).remove();
+						});
+				}
+			});
+		}
+
+	};
+
+	
+	$(function() {
+
+		$body = $( "body" );
+		pageLoading();
+		
+		// needs to be bound at domready (for IE6)
+		// find or load content, make it active
+		$window.bind( "hashchange", function(e, triggered) {
+			if( !hashListener ){ 
+				hashListener = true;
+				return; 
+			} 
+			
+			if( $(".ui-page-active").is("[data-role=" + $.mobile.nonHistorySelectors + "]") ){
+				return;
+			}
+			
+			var to = location.hash,
+				transition = triggered ? false : undefined;
+				
+			// either we've backed up to the root page url
+			// or it's the first page load with no hash present
+			//there's a hash and it wasn't manually triggered
+			// > probably a new page, "back" will be figured out by changePage
+			if ( to ){
+				changePage( to, transition);
+			}
+			//there's no hash, the active page is not the start page, and it's not manually triggered hashchange
+			// > probably backed out to the first page visited
+			else if( $.mobile.activePage.length && $startPage[0] !== $.mobile.activePage[0] && !triggered ) {
+				changePage( $startPage, transition, true );
+			}
+			else{
+				$startPage.trigger("pagebeforeshow", {prevPage: $('')});
+				$startPage.addClass( $.mobile.activePageClass );
+				pageLoading( true );
+				
+				if( $startPage.trigger("pageshow", {prevPage: $('')}) !== false ){
+					reFocus($startPage);
+				}
+			}
+
+		});
+	});	
+	
+	//add orientation class on flip/resize.
+	$window.bind( "orientationchange.htmlclass", function( event ) {
+		$html.removeClass( "portrait landscape" ).addClass( event.orientation );
+	});
+	
+	//add breakpoint classes for faux media-q support
+	function detectResolutionBreakpoints(){
+		var currWidth = $window.width(),
+			minPrefix = "min-width-",
+			maxPrefix = "max-width-",
+			minBreakpoints = [],
+			maxBreakpoints = [],
+			unit = "px",
+			breakpointClasses;
+			
+		$html.removeClass( minPrefix + resolutionBreakpoints.join(unit + " " + minPrefix) + unit + " " + 
+			maxPrefix + resolutionBreakpoints.join( unit + " " + maxPrefix) + unit );
+					
+		$.each(resolutionBreakpoints,function( i ){
+			if( currWidth >= resolutionBreakpoints[ i ] ){
+				minBreakpoints.push( minPrefix + resolutionBreakpoints[ i ] + unit );
+			}
+			if( currWidth <= resolutionBreakpoints[ i ] ){
+				maxBreakpoints.push( maxPrefix + resolutionBreakpoints[ i ] + unit );
+			}
+		});
+		
+		if( minBreakpoints.length ){ breakpointClasses = minBreakpoints.join(" "); }
+		if( maxBreakpoints.length ){ breakpointClasses += " " +  maxBreakpoints.join(" "); }
+		
+		$html.addClass( breakpointClasses );	
+	};
+	
+	//add breakpoints now and on oc/resize events
+	$window.bind( "orientationchange resize", detectResolutionBreakpoints);
+	detectResolutionBreakpoints();
+	
+	//common breakpoints, overrideable, changeable
+	$.mobile.addResolutionBreakpoints = function( newbps ){
+		if( $.type( newbps ) === "array" ){
+			resolutionBreakpoints = resolutionBreakpoints.concat( newbps );
+		}
+		else {
+			resolutionBreakpoints.push( newbps );
+		}
+		detectResolutionBreakpoints();
+	} 
+	
+	//animation complete callback
+	//TODO - update support test and create special event for transitions
+	//check out transitionEnd (opera per Paul's request)
+	$.fn.animationComplete = function(callback){
+		if($.support.cssTransitions){
+			return $(this).one('webkitAnimationEnd', callback);
+		}
+		else{
+			callback();
+		}
+	};	
+	
+	//TODO - add to jQuery.mobile, not $
+	$.extend($.mobile, {
+		pageLoading: pageLoading,
+		changePage: changePage,
+		silentScroll: silentScroll
+	});
+
+	//dom-ready
+	$(function(){
+		var $pages = $("[data-role='page']");
+		//set up active page
+		$startPage = $.mobile.activePage = $pages.first();
+		
+		//set page container
+		$pageContainer = $startPage.parent().addClass('ui-mobile-viewport');
+		
+		$.extend({
+			pageContainer: $pageContainer
+		});
+		
+		//initialize all pages present
+		$pages.page();
+		
+		//trigger a new hashchange, hash or not
+		$window.trigger( "hashchange", [ true ] );
+		
+		//update orientation 
+		$window.trigger( "orientationchange.htmlclass" );
+		
+		//remove rendering class
+		$html.removeClass('ui-mobile-rendering');
+	});
+	
+	$window.load(silentScroll);	
+	
+})( jQuery, this );
\ No newline at end of file

From efd9537e33868732b0715ef361fa2c575f02cd50 Mon Sep 17 00:00:00 2001
From: zhitomirskiyi <ilya@joindiaspora.com>
Date: Mon, 22 Nov 2010 15:45:38 -0800
Subject: [PATCH 8/8] using ruby 1.8.7

---
 chef/cookbooks/centos/recipes/bootstrap.rb | 2 +-
 chef/cookbooks/centos/recipes/main.rb      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/chef/cookbooks/centos/recipes/bootstrap.rb b/chef/cookbooks/centos/recipes/bootstrap.rb
index aa70e84cd..9c4914279 100644
--- a/chef/cookbooks/centos/recipes/bootstrap.rb
+++ b/chef/cookbooks/centos/recipes/bootstrap.rb
@@ -28,4 +28,4 @@ def harden_ruby(ruby_string)
 
 end
 
-harden_ruby("ree")
+harden_ruby("ruby-1.8.7-p302")
diff --git a/chef/cookbooks/centos/recipes/main.rb b/chef/cookbooks/centos/recipes/main.rb
index 46188b0b5..10ba973ab 100644
--- a/chef/cookbooks/centos/recipes/main.rb
+++ b/chef/cookbooks/centos/recipes/main.rb
@@ -12,7 +12,7 @@ def harden_ruby(ruby_string)
 
 end
 
-harden_ruby("ree")
+harden_ruby("ruby-1.8.7-p302")
 
 include_recipe "centos::image_magick"
 include_recipe "centos::mongo_db"