From 93da8520ed74de3534d0db72f2e87bbcb5c356e2 Mon Sep 17 00:00:00 2001
From: devin <devin@rulincom.com>
Date: Wed, 22 Aug 2012 16:46:37 +0800
Subject: [PATCH] gallery update

---
 .../app/assets/javascripts/galleryAPI.js.erb  |  2 +-
 .../app/assets/stylesheets/gallery.css        |  7 +++++
 .../orbit_galleries/add_album.html.erb        | 27 +++++++++++++------
 .../orbit_galleries/edit_album.html.erb       |  1 -
 4 files changed, 27 insertions(+), 10 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 0b1c9bb8..85614059 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
@@ -87,7 +87,7 @@ var galleryAPI = function(){
 	}
 	this.makeNewAlbum = function(){
 		$.get("add_album",function(html){
-			rcom.modalWindow({loadHtml:html,width:400,"closeBtn":false},function(dom){
+			rcom.modalWindow({loadHtml:html,width:400,height:320,"closeBtn":false},function(dom){
 				dom.find("#album_name_save_btn").click(function(){
 					var options ={
 						cid : dom.find("select#category_list").val(),
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 9c71fa01..045e1bc2 100755
--- a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
+++ b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css
@@ -537,4 +537,11 @@
 
 .o_gallery .rgbody, .o_album .rgbody {
 	padding: 10px 8px;
+}
+
+#categories .add-album .control-label {
+	text-align: left;
+	width: 100px;
+	padding-left: 12px;
+	padding-right: 12px;
 }
\ No newline at end of file
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/add_album.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/add_album.html.erb
index d20aa086..7af4f761 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/add_album.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/add_album.html.erb
@@ -1,20 +1,31 @@
 <div class="modal-window" id="categories">
   <div class="modal-header">
-    <h3><%= t("gallery.album_name") %></h3>
+    <h3><%= t("gallery.add_album") %></h3>
   </div>
-  <div class="modal-body">
-    <p>Category:
+  <div class="modal-body add-album">
     <select id="category_list">
         <option value=""><%= t("gallery.select_category") %></option>
       <% @categorylist.each do |category| %>
         <option value='<%= category.id %>' ><%= category.name %></option>
       <% end %>
     </select>
-  </p>
-  <p><%= t("gallery.album_name") %>[<%=t("gallery.english")%>]: <input type="text" id="name_en" /></p>
-  <p><%= t("gallery.album_name") %>[<%=t("gallery.chinese")%>]: <input type="text" id="name_zh_tw" /></p>
-  <p><%= t("gallery.album_desc") %>[<%=t("gallery.english")%>]: <input type="text" id="desc_en" /></p>
-  <p><%= t("gallery.album_desc") %>[<%=t("gallery.chinese")%>]: <input type="text" id="desc_zh_tw" /></p>
+    <ul class="nav nav-tabs">
+      <% @site_valid_locales.each_with_index do |locale, i| %>
+        <li <%= ( i == 0 ) ? " class='active'" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
+      <% end %>
+    </ul>
+    <div class="tab_content form-horizontal">
+      <% @site_valid_locales.each_with_index do |locale, i| %>
+      <% if i == 0 %>
+        <div class="<%= locale %> fade tab-pane in active">
+      <% else %>
+        <div class="<%= locale %> fade tab-pane" >
+      <% end %>
+        <p class="control-group"><label class="control-label"><%= t("gallery.album_name") %></label><input type="text" id="name_<%= locale %>" /></p>
+        <p class="control-group"><label class="control-label"><%= t("gallery.album_desc") %></label><input type="text" id="desc_<%= locale %>" /></p>
+      </div>
+    <% end %>
+    </div>
   </div>
   <div class="modal-footer">
     <a href="#" class="btn" data-dismiss="modal" id="album_name_close_btn" onclick="return false;"><%= t("gallery.close") %></a>
diff --git a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb
index 8d6cc4c5..3291942f 100644
--- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb
+++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb
@@ -4,7 +4,6 @@
 	<li class="text-blue"><%= t('gallery.edit') %></li>
 </ul>
 <ul class="nav nav-tabs">
-	<%# @site_valid_locales.each_with_index do |locale, i| %>
 	<% @site_valid_locales.each_with_index do |locale, i| %>
     <li <%= ( i == 0 ) ? " class='active'" : '' %>><a data-toggle="tab" href=".<%= locale %>"><%= I18nVariable.from_locale(locale) %></a></li>
 	<% end %>