From 928c642840fac93a8a2a15de979b8b5c8e8cb4a5 Mon Sep 17 00:00:00 2001
From: "Matthew K. Fu JuYuan" <matthewfu@gmail.com>
Date: Fri, 23 Mar 2012 11:18:29 +0800
Subject: [PATCH] change layout from old admin to new_admin. not complete code

---
 .../admin/ad_banners_controller.rb            |  2 +-
 app/views/admin/ad_banners/index.html.erb     | 50 ++++++++-----------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/app/controllers/admin/ad_banners_controller.rb b/app/controllers/admin/ad_banners_controller.rb
index 19d81057..614a75fa 100644
--- a/app/controllers/admin/ad_banners_controller.rb
+++ b/app/controllers/admin/ad_banners_controller.rb
@@ -1,5 +1,5 @@
 class Admin::AdBannersController < ApplicationController
-  layout "admin"
+  layout "new_admin"
   before_filter :authenticate_user!
   before_filter :is_admin?
 
diff --git a/app/views/admin/ad_banners/index.html.erb b/app/views/admin/ad_banners/index.html.erb
index e109830e..f16f01a9 100644
--- a/app/views/admin/ad_banners/index.html.erb
+++ b/app/views/admin/ad_banners/index.html.erb
@@ -1,47 +1,41 @@
-<% content_for :secondary do %>
-<div class="ad_banners_setup">
-	<h1><%= t('admin.setup_ad_banners') %></h1>
-	<ul class="list">
-		<li><%= link_to content_tag(:span, t('admin.new_ad_banner')), new_admin_ad_banner_path, :class => 'seclink1' %></li>
-	</ul>
-</div>
-<% end -%>
 
 <%= flash_messages %>
-<div class="main2">
-<h1><%= t('admin.list_ad_banners') %></h1>
 
-<table>
+<ul class="nav nav-pills filter">
+	<li class="accordion-group">
+		<form class="form-search">
+			<input class="input-medium search-query" type="text">
+			<button class="btn" type="submit">Search</button>
+		</form>
+	</li>
+</ul>
+
+
+<table class="table main-list" style="margin-top: 62px; ">
 <thead>
   <tr>
-    <td><%= t('admin.title') %></td>
-    <td><%= t('admin.picture_position') %></td>
-    <td><%= t('admin.post_date') %></td>
-    <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>
+    <th class="span1"></th>
+    <th class="span1-2"><%= t('admin.location') %></th>
+    <th class="span1"><%= t('admin.title') %> </th>
+    <th class="span7"><%= t('admin.title') %></th>
+    <th class="span1-2"><%= t('admin.start_date')%></th>
+    <th class="span1-2"><%= t('admin.end_date') %></th>
+    <th class="span1-2"><%= t('admin.style') %></th>
   </tr>
 </thead>
 <% @ad_banners.each do |ad_banner| %>
   <tr class="have">
-    <td><%= ad_banner.title %></td>
+    <td></td>
     <td><%= ad_banner.picture_position %></td>
+    <td><%= link_to ad_banner.title,edit_admin_ad_banner_path(ad_banner) %></td>
+		<td></td>
     <td><%= ad_banner.post_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><%= 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' %>
-    </td>
+    <td><%= ad_banner.ad_fx %></td>
   </tr>
   <tr></tr>
 <% end %>
 </table>
-</div>
 
 <div class="button_bar">
 	<%= link_to t('admin.new_ad_banner'), new_admin_ad_banner_path, :class => 'new' %>