From 337d690c54ec93b07c8aea300498ed1038cefc11 Mon Sep 17 00:00:00 2001 From: devin Date: Mon, 6 Aug 2012 11:07:58 +0800 Subject: [PATCH] gallery update --- .../app/assets/stylesheets/gallery.css | 12 +-- .../orbit_galleries/edit_album.html.erb | 77 ++++++++++++++----- .../back_end/orbit_galleries/index.html.erb | 15 ---- .../gallery/config/locales/zh_tw.yml | 44 +++++------ 4 files changed, 87 insertions(+), 61 deletions(-) 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 ab13d90f..db766d6c 100755 --- a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css +++ b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css @@ -1,5 +1,3 @@ -@import url(http://fonts.googleapis.com/css?family=Mako); - /*html { background: #eee; } body { background: #fff; @@ -13,7 +11,7 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m */ -.rg, .rgp { font-family: mako, 'Sans Serif'; } +.rg, .rgp { } .rg input, .rgp input, .rg textarea, .rgp textarea { resize: none; border: none; @@ -23,7 +21,6 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m padding: 0; display: block; font-size: 13px; - font-family: mako, 'Sans Serif'; } .rgp textarea { overflow: auto; } .rg a, .rgp a { @@ -463,4 +460,9 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m .rgih98.focus { background-position: 0 -326px; } .rgih98.focus span { background-position: right -326px; } -.w380 { width: 380px; } \ No newline at end of file +.w380 { width: 380px; } + +#orbit_gallery .nav-tabs, #orbit_gallery .tab-pane { + margin-left: 8px; + margin-right: 8px; +} \ No newline at end of file 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 fa4c9a1e..a2acd706 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 @@ -1,24 +1,63 @@ -
- -
-
-
- <% @images.each do |image| %> -
- -
- - - +<%= +# for tab effect, please check +# /Users/ally/orbit/vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_form.html.erb +# from line 129 +%> + +
+
+
+ +
-
- Delete - <% if image.id.to_s == @cover %> - Set Cover - <% else %> - Set Cover +
+ <% @images.each do |image| %> +
+ +
+ + + +
+
+ Delete + <% if image.id.to_s == @cover %> + Set Cover + <% else %> + Set Cover + <% end %> +
+
+ <% end %> +
+
+
+
+ +
+
+
+ <% @images.each do |image| %> +
+ +
+ + + +
+
+ Delete + <% if image.id.to_s == @cover %> + Set Cover + <% else %> + Set Cover + <% end %> +
+
<% end %>
- <% end %>
\ 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 f728dd60..ff2ce70d 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 @@ -20,21 +20,6 @@ 清除
-
- - - - - - - - - -
- - - ThumbnailCategoryTitle
-
diff --git a/vendor/built_in_modules/gallery/config/locales/zh_tw.yml b/vendor/built_in_modules/gallery/config/locales/zh_tw.yml index 2b10604d..97e59418 100644 --- a/vendor/built_in_modules/gallery/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/gallery/config/locales/zh_tw.yml @@ -1,25 +1,25 @@ zh_tw: gallery: - album_name: Album Name - all: All - select_category: "--Select a category--" - manage_categories: Manage Categories - categories: Categories - new_category: New Category - save_changes: Save Changes - close: Close - delete: Delete - english: English - chinese: Chinese - album_desc: Album Desc - add_album: Add Album - back_to_photos: Back to Photos - back_to_albums: Back to Albums - add_images: Add Images - del_album: Delete Album - edit: Edit - delete_selected: Delete Selected - del_album?: "Delete this album?" - album_not_found: "Album not found" - pic_not_found: "Picture not found" + album_name: 相簿名稱 + all: 全部 + select_category: 選擇類別 + manage_categories: 類別管理 + categories: 類別 + new_category: 新類別 + save_changes: 儲存變更 + close: 關閉 + delete: 刪除 + english: 英文 + chinese: 中文 + album_desc: 相簿描述 + add_album: 新增相簿 + back_to_photos: 回到照片列表 + back_to_albums: 回到相簿列表 + add_images: 新增照片 + del_album: 刪除相簿 + edit: 編輯 + delete_selected: 刪除已選擇項目 + del_album?: "刪除這本相簿嗎?" + album_not_found: "相簿不存在" + pic_not_found: "照片不存在"