From abd1a9ecbc1ec87db2927a4236b99ec427e4a2f0 Mon Sep 17 00:00:00 2001
From: devin <devin@rulincom.com>
Date: Mon, 6 Aug 2012 14:02:55 +0800
Subject: [PATCH] gallery update

---
 app/views/layouts/_side_bar.html.erb           |  2 +-
 .../back_end/orbit_galleries/index.html.erb    | 18 +++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_side_bar.html.erb b/app/views/layouts/_side_bar.html.erb
index 2d15e037..f3bca19e 100644
--- a/app/views/layouts/_side_bar.html.erb
+++ b/app/views/layouts/_side_bar.html.erb
@@ -68,7 +68,7 @@
 <% end -%>
 
 <%= content_tag :li, :class => active_for_controllers('orbit_galleries','tags')  do -%>
-	<%= link_to content_tag(:i, nil, :class => 'icons-link') + t('admin.orbit_gallery'), panel_gallery_back_end_orbit_gallery_path %>
+	<%= link_to content_tag(:i, nil, :class => 'icons-picture') + t('admin.orbit_gallery'), panel_gallery_back_end_orbit_gallery_path %>
 
 	<%= content_tag :ul, :class => ("nav nav-list " + visible_for_controllers('orbit_gallery') ) do -%>
 		<%#= content_tag :li, link_to(t('admin.ad.all_banners'), admin_ad_banners_path), :class => active_for_action('ad_banners', 'index') %>
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb
index ff2ce70d..0c8e2dd3 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/index.html.erb
@@ -10,6 +10,11 @@
         <a href="#collapse-categories" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("gallery.category") %> <b class="web-symbol"></b></a>
       </div>
     </li>
+    <li class="accordion-group">
+      <div class="accordion-heading">
+        <a href="#collapse-tags" data-toggle="collapse" data-parent=".filters" class="accordion-toggle"><%= t("gallery.tag") %> <b class="web-symbol"></b></a>
+      </div>
+    </li>
   </ul>
   <div class="filters">
     <div class="accordion-body collapse" id="collapse-categories">
@@ -20,6 +25,14 @@
         <a href="panel/gallery/back_end/orbit_gallery" class="btn js_history"><i class="icons-brush-large"></i>清除</a>
       </div>
     </div>
+    <div class="accordion-body collapse" id="collapse-tags">
+      <div class="accordion-inner" data-toggle="buttons-checkbox">
+        <a href="#" class="btn js_history">album tags</a>
+      </div>
+      <div class="filter-clear">
+        <a href="panel/gallery/back_end/orbit_gallery" class="btn js_history"><i class="icons-brush-large"></i>清除</a>
+      </div>
+    </div>
   </div>
 </div>
 <table id="gallery_list" class="table main-list">
@@ -68,7 +81,10 @@
     </div>
   </div>
 </div>
-
+<div class="form-actions form-fixed pagination-right">
+  <a href="" class="btn btn-primary pull-right"><i class="icon-plus icon-white"></i>新增</a>
+  <div id="bulletin_pagination" class="paginationFixed"></div>
+</div>
 <script type="text/javascript">
 	var gallery = new galleryAPI();
 	gallery.initialize();