Ad banner close complete,need validation

app/views/admin/ad_banners/_ad_image.html.erb

@@ -1,7 +1,8 @@
 <div id="basic_block" class="roles_block">
 	<%= image_tag ad_image.file %> 
-	Time to next: <%= ad_image.time_to_next %>
-	Intro: <%= ad_image.picture_intro %>
-	Out Link <%= link_to ad_image.out_link %>  
-	<%= render :partial => "ad_image_update", :locals => { :ad_image => ad_image } %>
+	<p>
+		Time to next: <%= ad_image.time_to_next %>
+		Intro: <%= ad_image.picture_intro %>
+		Out Link <%= link_to ad_image.out_link %>  by <%= ad_image.link_open %>
+	</p>
 </div>	

app/views/admin/ad_banners/_ad_image_form.html.erb

@@ -1,3 +1,5 @@
 Time: <%= f.text_field :time_to_next ,:class=> 'ad_time'%>
 Link:<%= f.text_field :out_link ,:class=> 'ad_out_link'%>
+Open Type <%= f.select :link_open ,AdImage::LINK_OPEN_TYPES %>
+
 <%= f.hidden_field :to_save %>

app/views/admin/ad_banners/_form.html.erb

@@ -22,8 +22,7 @@
 
 <p>
 	<%= f.label :unpost_date, t('admin.unpost_date') %>
-  <%= f.date_select :unpost_date, :order => [:year, :month, :day], :use_month_numbers => true %>
-
+  <%= f.date_select :unpost_date, :order => [:year, :month, :day], :use_month_numbers => true,:prompt => { :day => t('form.date_unlimited'), :month => t('form.date_unlimited'), :year => t('form.date_unlimited') } %>
 </p>
 <p>
 	<%= f.label :context, t('admin.context') %>

app/views/admin/ad_banners/index.html.erb

@@ -20,6 +20,7 @@
     <td><%= t('admin.unpost_date') %></td>
     <td><%= t('admin.context') %></td>
     <td><%= t('admin.direct_to_after_click') %></td>
+    <td><%= t('admin.now_display?') %></td>
   </tr>
 </thead>
 <% @ad_banners.each do |ad_banner| %>
@@ -27,10 +28,11 @@
     <td><%= ad_banner.title %></td>
     <td><%= ad_banner.picture_position %></td>
     <td><%= ad_banner.post_date %></td>
-    <td><%= ad_banner.unpost_date %></td>
+    <td><%= ad_banner.unpost_date.nil?? t('form.date_unlimited'): ad_banner.unpost_date %></td>
     <td><%= ad_banner.context %></td>
     <td><%= ad_banner.direct_to_after_click %></td>
-    <td class="action">
+    <td><%= ad_banner.display?  %></td> 
+   <td class="action">
 			<%= link_to t(:show), admin_ad_banner_path(ad_banner), :class => 'show' %>
       <%= link_to t(:edit), edit_admin_ad_banner_path(ad_banner), :class => 'edit'  %>
       <%= link_to t(:delete), admin_ad_banner_path(ad_banner), :confirm => t('sure?'), :method => :delete, :class => 'delete' %>