From 170c12bcdd08601bb2fa4a6c86e69856b1e5313a Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Wed, 18 Apr 2012 16:24:17 +0800
Subject: [PATCH] fix js

---
 .../ad_banners/_modal_ad_banner_form.html.erb      | 14 ++++++--------
 app/views/admin/ad_banners/index.html.erb          |  2 +-
 app/views/admin/ad_banners/new_created_node.js.erb |  1 +
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
index 36ebc4a3..235e7e15 100644
--- a/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
+++ b/app/views/admin/ad_banners/_modal_ad_banner_form.html.erb
@@ -36,17 +36,15 @@
 	<% end %>
 </div>
 <script type="text/javascript" charset="utf-8">
-if(window.location.pathname == "/admin/ad_banners/new"){
-	$('#new-a-banner').modal({show: true});
-}
-
 $('#new_ad_banner_tab_but').on('shown', function (e) {
-	$('#new-a-banner').modal({show: true});
-})
-
+			$('#new-a-banner').modal({show: true});
+});
 
+<% if params[:action] == "new"  -%>
+		 $('#new-a-banner').modal({show: true});
+<% end -%>
 $('#new-a-banner').on('hidden', function (e) {
 	$(".nav.nav-tabs  a[id!='new_ad_banner_tab_but']:last").tab('show');
-})
+});
 </script>
 
diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb
index 4b7dfef2..8307885a 100644
--- a/app/views/admin/ad_banners/index.html.erb
+++ b/app/views/admin/ad_banners/index.html.erb
@@ -12,7 +12,7 @@
 		<% @ad_banners.each do |ab| %>
 			<%= content_tag :li,link_to(ab.title,"##{ab.title}",:data=>{:toggle=>"tab"}),:class => (ab ==  @active ? 'active' : nil ) %>
 		<% end -%>
-		<%= content_tag :li,link_to('New',"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
+		<%= content_tag :li,link_to(t("admin.ad.new_banner"),"#new-a-banner",:data=>{:toggle=>"tab"}),:id=>'new_ad_banner_tab_but',:class => (@active.nil? ? 'active' : nil ) %>
 		
 	</ul>
 	
diff --git a/app/views/admin/ad_banners/new_created_node.js.erb b/app/views/admin/ad_banners/new_created_node.js.erb
index 140be0b4..86970e6a 100644
--- a/app/views/admin/ad_banners/new_created_node.js.erb
+++ b/app/views/admin/ad_banners/new_created_node.js.erb
@@ -2,6 +2,7 @@ $('<%= escape_javascript(content_tag(:li,link_to(@ad_banner.title,"##{@ad_banner
 $('<%= escape_javascript(render(:partial => "ad_banner_tab",:locals => {:ad_banner_tab => @ad_banner})) %>').insertBefore($("#new-a-banner"));
 
 $('.modal').modal('hide');
+$('#new-a-banner').unbind();
 $('#post-body-content').find(".nav.nav-tabs").children('li.active').removeClass("active");
 $('#post-body-content').find(".nav.nav-tabs").children('li[id!="new_ad_banner_tab_but"]').last().addClass("active");