From b6f10951b8c06f139d7d37877eaf0e3738c0830e Mon Sep 17 00:00:00 2001 From: devin Date: Wed, 22 Aug 2012 01:15:50 +0800 Subject: [PATCH] gallery update especially upload panel --- .../app/assets/javascripts/galleryAPI.js.erb | 2 +- .../gallery/app/assets/stylesheets/gallery.css | 18 ------------------ .../orbit_galleries/edit_album.html.erb | 8 ++++---- .../gallery/config/locales/en.yml | 2 ++ .../gallery/config/locales/zh_tw.yml | 2 ++ 5 files changed, 9 insertions(+), 23 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 856140590..e4322e138 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 @@ -223,7 +223,7 @@ var galleryAPI = function(){ }) var uploadpanel = $('
'); var frame = $(''); - uploadpanel.find(".bt-cls").click(function(){ + uploadpanel.find("a.bt-cls").click(function(){ uploadpanel.hide("slide"); frame.remove(); g.loadImages(id); 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 9b41b9839..ae54bef5b 100755 --- a/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css +++ b/vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css @@ -104,7 +104,6 @@ clear: both; overflow: hidden; margin-bottom: 10px; - border-bottom: solid 1px #fcfcfc; } .albumname_edit label { width: 120px; @@ -358,23 +357,6 @@ padding: 6px; } .rgphoto_edit .rgbtsg.active { display: inline-block; } -/* -.bt-add { background-position: 0 -106px; } -.bt-add:hover { background-position: 0 -296px; } -.bt-add:active { background-position: 0 -486px; } -.bt-del { background-position: 0 -144px; } -.bt-del:hover { background-position: 0 -334px; } -.bt-del:active { background-position: 0 -524px; } -.bt-edit { background-position: 0 -182px; } -.bt-edit:hover { background-position: 0 -372px; } -.bt-edit:active { background-position: 0 -562px; } -.bt-back { background-position: 0 -676px; } -.bt-back:hover { background-position: 0 -714px; } -.bt-back:active { background-position: 0 -752px; } -.bt-save, .bt-finish { background-position: 0 -220px; } -.bt-save:hover, .bt-finish:hover { background-position: 0 -410px; } -.bt-save:active, .bt-finish:active { background-position: 0 -600px; } -*/ .bt-finish { display: block; float: right; clear: both; } .bt-addnew { margin: 0 auto; 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 253f039de..8d6cc4c5f 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 @@ -32,12 +32,12 @@
<% if image.id.to_s == @cover %> - + " href="<%= image.id %>"> <% else %> - + " href="<%= image.id %>"> <% end %> - - + " href="<%= image.id %>"> + " href="<%= image.id %>">
<% end %> diff --git a/vendor/built_in_modules/gallery/config/locales/en.yml b/vendor/built_in_modules/gallery/config/locales/en.yml index 7b44e035e..815f953b0 100644 --- a/vendor/built_in_modules/gallery/config/locales/en.yml +++ b/vendor/built_in_modules/gallery/config/locales/en.yml @@ -28,3 +28,5 @@ en: cate_auth: Category Authorization cancel: Cancel search_tags: Search Tags + cover: Album Cover + set_cover: Set as Album Cover 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 4c40621fb..f4a17b242 100644 --- a/vendor/built_in_modules/gallery/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/gallery/config/locales/zh_tw.yml @@ -28,3 +28,5 @@ zh_tw: cate_auth: 類別權限 cancel: 取消 search_tags: 搜尋標籤 + cover: 封面 + set_cover: 設為封面