From cbef7cd368aa1896fa5d13427ade0a1bdda35f69 Mon Sep 17 00:00:00 2001
From: devin <devin@rulincom.com>
Date: Tue, 21 Aug 2012 14:31:25 +0800
Subject: [PATCH] gallery update

---
 .../app/assets/javascripts/galleryAPI.js.erb  |  2 +-
 .../app/assets/stylesheets/gallery.css        | 20 ++++++++++++++++---
 .../back_end/orbit_galleries/index.html.erb   |  4 ++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb b/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
index 304f4500..b0365c96 100644
--- a/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
+++ b/vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb
@@ -162,7 +162,7 @@ var galleryAPI = function(){
 						var $img = $("<div class='rgalbum'><a title='"+album.description+"' href='?album="+album._id+"'><img src='"+album.cover_path+"' width='120px' height='90px'/></a><span class='albumname'>"+album.name+"</span><span class='tagnames'></span></div>");
 					var tag_string = "";
 					for(tag in album.tag_names){
-						tag_string+= '<span class="tag_item">' + album.tag_names[tag] + '</span>';
+						tag_string+= '<span class="label label-tags">' + album.tag_names[tag] + '</span>';
 					}
 					$img.find(".tagnames").html(tag_string);
 					g.albumArea.find("#imgholder").append($img);
diff --git a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
index a70662b0..88e106b9 100755
--- a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
+++ b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
@@ -495,10 +495,11 @@
 }
 .tag_search input[type=text] {
 	box-shadow: none;
-	width: 170px;
+	width: 92px;
 	height: 25px;
 	line-height: 25px;
 	padding: 3px 6px 3px 24px;
+	border: 0;
 	border-top: solid 1px #fff;
 }
 .tag_search input[type=text]:focus {
@@ -510,8 +511,14 @@
 	top: 50%;
 	margin-top: -7px;
 }
-#tag_panel .bt-save {
-
+#tag_panel .tag_save {
+	position: absolute;
+	right: 0;
+	bottom: 0;
+	height: 31px;
+	border-left: solid 1px #ccc;
+	background-color: #fff;
+	padding: 2px 4px 0 4px;
 }
 
 
@@ -539,3 +546,10 @@
 .o_album .rgbody {
 	margin: 10px 8px;
 }
+.o_gallery .tagnames {
+	display: inline-block;
+}
+.o_gallery .label-tags {
+	display: inline-block;
+	margin: 0 6px 6px 0;
+}
\ No newline at end of file
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 c98dd323..51b0a527 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
@@ -92,8 +92,8 @@
         </ul>
       </div>
     </div>
-    <a class="btn bt-save" style="position:absolute; bottom: 0;"><i class="icon-ok"></i><%= I18n.t("gallery.save") %></a>
-    <div class="tag_search"><div class="icon-search"></div><input type="text" value="<%= t('gallery.search_tags') %>" onblur="if(this.value=='')this.value='<%= t('gallery.search_tags') %>';" onfocus="if(this.value=='<%= t("gallery.search_tags") %>')this.value='';" id="tag_search_box"></div>
+    <div class="tag_search"><div class="icon-search"></div><input type="text" value="<%= t('gallery.search_tags') %>" onblur="if(this.value=='')this.value='<%= t('gallery.search_tags') %>';" onfocus="if(this.value=='<%= t("gallery.search_tags") %>')this.value='';" id="tag_search_box"><div class="tag_save"><a class="btn bt-save"><i class="icon-ok"></i><%= I18n.t("gallery.save") %></a></div></div>
+    
   </div>
   <% end %>
   <script type="text/javascript">