From 3ec8bb7be67041bcd96f75a83a1e8a6aa1e3d2d4 Mon Sep 17 00:00:00 2001
From: Christophe Vilayphiou <chris.vilayphiou@gmail.com>
Date: Wed, 25 Apr 2012 15:10:28 +0800
Subject: [PATCH] Fix assets bug: when having a '.' in the name, the extension
 must be specified

---
 .gitignore                                                    | 3 +--
 app/views/admin/ad_images/_form.html.erb                      | 4 ++--
 .../panel/announcement/back_end/bulletins/_form.html.erb      | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 71494e30..b57fdb65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,8 +10,7 @@ uploads/**/*
 
 *.swp
 
-public/javascripts
-public/stylesheets
+public/assets
 config/application.rb
 
 .rvmrc
diff --git a/app/views/admin/ad_images/_form.html.erb b/app/views/admin/ad_images/_form.html.erb
index ea30634c..8fbefb33 100644
--- a/app/views/admin/ad_images/_form.html.erb
+++ b/app/views/admin/ad_images/_form.html.erb
@@ -3,10 +3,10 @@
 <% end %>
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "lib/datepicker"  %>
-	<%= javascript_include_tag "lib/date.format"  %>
+	<%= javascript_include_tag "lib/date.format.js"  %>
 	<%= javascript_include_tag "inc/modal-preview" %>
 	<%= javascript_include_tag "/static/jquery.cycle.all.latest.js" %>
-	<%= javascript_include_tag "inc/jquery.imagesloaded" %>
+	<%= javascript_include_tag "inc/jquery.imagesloaded.js" %>
 	
 <% end %>
 
diff --git a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
index b8aa5d2a..df86f221 100644
--- a/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
+++ b/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb
@@ -293,7 +293,7 @@
 
 <% content_for :page_specific_javascript do %>
 	<%= javascript_include_tag "bulletin_form" %>
-	<%= javascript_include_tag "inc/jquery.imagesloaded" %>
+	<%= javascript_include_tag "inc/jquery.imagesloaded.js" %>
 	<script>
 		$('#add_bulletin_link a.add').live('click', function(){
 			var new_id = $(this).prev().attr('value');