From 1451c3ac1d70e873a91fc45e07c2b837d2adde6d Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Tue, 27 Mar 2012 15:34:21 +0800
Subject: [PATCH] changing to new admin_layout

---
 app/views/admin/ad_banners/_ad_banner.html.erb     | 11 +++++++++++
 .../back_end/bulletin_links_controller-複製.rb     | 14 --------------
 2 files changed, 11 insertions(+), 14 deletions(-)
 create mode 100644 app/views/admin/ad_banners/_ad_banner.html.erb
 delete mode 100644 vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-複製.rb

diff --git a/app/views/admin/ad_banners/_ad_banner.html.erb b/app/views/admin/ad_banners/_ad_banner.html.erb
new file mode 100644
index 00000000..787a03ed
--- /dev/null
+++ b/app/views/admin/ad_banners/_ad_banner.html.erb
@@ -0,0 +1,11 @@
+<tr class="with_action">
+    <td class="span1"><input type="checkbox"></td>
+    <td class="span1-2"><%= location %></td>
+    <td class="span1">
+    <i class="icons-picture img-peview" rel="popover" data-content="&lt;img src=<%= ad_image.file  %> /&gt;" data-original-title=<%= ad_image.picture_intro %>></i>
+    </td>
+    <td class="span7"><%= link_to (ad_image.picture_intro || t("untitled")),'' %></td>
+    <td class="span1-2"><%= start_date %></td>
+    <td class="span1-2"><%= end_date.nil?? t('form.date_unlimited'): end_date %></td>
+    <td class="span1-2"><%= style %></td>
+</tr>
\ No newline at end of file
diff --git a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-複製.rb b/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-複製.rb
deleted file mode 100644
index 04a75fa6..00000000
--- a/vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_links_controller-複製.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-class Panel::Announcement::BackEnd::BulletinLinksController < ApplicationController
-  
-  layout 'new_admin'
-  
-  def index
-    @bulletin_links = BulletinLink.all
-	
-    respond_to do |format|
-      format.html # index.html.erb
-      # format.xml  { render :xml => @bulletins }
-      format.js
-    end
-	
-end