fix js bug when changing layout in page editing + improve nav tag

Gemfile

@@ -13,7 +13,7 @@ gem 'mongoid_acts_as_tree', '0.1.5'
 gem 'mongo_session_store', '2.0.0.pre'
 gem 'warden'
 gem 'devise', '1.1.rc1'
-gem 'haml', '3.0.1'
+gem 'haml', '3.0.13'
 gem 'rmagick', '2.12.2'
 gem 'aws'
 gem 'mimetype-fu', :require => 'mimetype_fu'

app/controllers/admin/page_parts_controller.rb

@@ -3,9 +3,12 @@ module Admin
 
     layout nil
 
+    respond_to :json
+
     def index
       parts = current_site.layouts.find(params[:layout_id]).parts
-      render :json => { :parts => parts }
+
+      respond_with parts.collect(&:attributes)
     end
 
   end

app/controllers/admin/pages_controller.rb

@@ -3,7 +3,7 @@ module Admin
 
     sections 'contents'
 
-    respond_to :json, :only => [:update, :sort]
+    respond_to :json, :only => [:update, :sort, :get_path]
 
     def index
       @pages = current_site.pages.roots

app/models/site.rb

@@ -34,9 +34,6 @@ class Site
   named_scope :match_domain, lambda { |domain| { :where => { :domains => domain } } }
   named_scope :match_domain_with_exclusion_of, lambda { |domain, site| { :where => { :domains => domain, :_id.ne => site.id } } }
     
-  ## behaviours ##
-  liquid_methods :name, :meta_keywords, :meta_description
-  
   ## methods ##
 
   def accounts

db/seeds.rb

@@ -5,5 +5,5 @@ site.memberships.build :account => account, :admin => true
 site.save!
 
 puts "Your first website has been created !"
-puts "Admin url: http://test.example.com/admin"
+puts "Admin url: http://test.example.com:3000/admin"
 puts "Crendetials: admin@example.com / locomotive"

lib/locomotive/liquid/drops/site.rb

@@ -0,0 +1,15 @@
+module Locomotive  
+  module Liquid    
+    module Drops    
+      class Site < Base
+        
+        liquid_attributes << :name << :meta_keywords << :meta_description
+        
+        def index
+          @index ||= @source.pages.index.first
+        end
+        
+      end
+    end
+  end
+end

lib/locomotive/render.rb

@@ -28,8 +28,6 @@ module Locomotive
           path = [path, File.join(dirname, 'content_type_template').gsub(/^\//, '')]
         end
         
-        # TODO: path is not correctly built + find content instance in order to render a 404 page if not found
-        
         if page = current_site.pages.any_in(:fullpath => [*path]).first
           if not page.published? and current_admin.nil?
             page = nil

public/javascripts/admin/page_parts.js

@@ -65,7 +65,7 @@ $(document).ready(function() {
       }
     });
 
-		// go to the first one if we hid the selected wrapper
+    // go to the first one if we hide the selected wrapper
     var selectedNav = $('#page-parts .nav a.on');
     if (selectedNav.size() == 1) {
       var index = parseInt(selectedNav.attr('class').match(/part-(.+)/)[1]) + 1;
@@ -80,7 +80,7 @@ $(document).ready(function() {
       return ;
 
     var url = $('#page_layout_id').attr('data_url').replace('_id_to_replace_', $('#page_layout_id').val());
-		$.get(url, '', function(data) { refreshParts(data.parts); }, 'json');
+    $.get(url, '', function(data) { refreshParts(data); }, 'json');
   }
 
   $('#page_layout_id').change(loadPartsFromLayout);