From 1437d2dc144f569a9f0fac1370a09e0792efdf26 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 | 6 ++- .../app/assets/stylesheets/gallery.css | 42 +------------------ .../orbit_galleries/edit_album.html.erb | 8 ++-- .../orbit_galleries/upload_panel.html.erb | 6 +-- .../gallery/config/locales/en.yml | 4 +- .../gallery/config/locales/zh_tw.yml | 4 +- 6 files changed, 19 insertions(+), 51 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 4ae220f2..814f2129 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 @@ -222,7 +222,7 @@ var galleryAPI = function(){ }) }) var uploadpanel = $('
Close Panel
'); - var frame = $(''); + var frame = $(''); uploadpanel.find("a.bt-cls").click(function(){ uploadpanel.hide("slide"); frame.remove(); @@ -487,7 +487,9 @@ var galleryAPI = function(){ $.post("set_cover",{"imageid":$(this).attr("href"),"aid":id},function(){}) }) $(".description_loader .edit_fn .bt-dels").click(function(){ - $(this).toggleClass("setdelete"); + $(this) + .toggleClass("setdelete btn-danger active") + .find('span').toggleClass('icon-white'); if($(".description_loader .edit_fn .setdelete").length > 0){ g.albumArea.find(".rghead .rgfn .bt-delete").show(); }else{ 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 eb0aed1c..bb242c98 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; @@ -141,7 +140,7 @@ right: 0; bottom: 0; overflow: hidden; - background: #333; + background: #222; clear: both; /*z-index: 99;*/ min-height: 250px; @@ -354,23 +353,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; @@ -391,27 +373,7 @@ right: 6px; top: 6px; } -/* -.bt-close:hover { background-position: -436px 0; } -.bt-close:active { background-position: -514px 0; } -.bt-cls { background-position: 0 -790px; } -.bt-cls:hover { background-position: 0 -828px; } -.bt-cls:active { background-position: 0 -866px; } -.bt-dels { background-position: -318px 0; width: 32px; } -.bt-dels:hover { background-position: -396px 0; } -.bt-dels:active { background-position: -474px 0; } -.bt-dels.setdelete { background-position: -474px -38px; width: 32px; } -.bt-cover { background-position: -318px -38px; width: 32px; } -.bt-cover:hover { background-position: -358px -38px; } -.bt-cover:active { background-position: -398px -38px; } -.bt-cover.setcover { background-position: -438px -38px; } -.bt-chk { background-position: -318px -76px; width: 16px; height: 16px; margin-right: 4px; } -.bt-chk:hover { background-position: -342px -76px; } -.bt-chk.check { background-position: -366px -76px; } -.bt-languages { background-position: -398px -72px; width: 32px; position: relative; } -.bt-languages:hover { background-position: -438px -72px; } -.bt-languages:active { background-position: -477px -72px; } -*/ + .inputui { margin: 0 0 8px 0; 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 253f039d..8d6cc4c5 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/app/views/panel/gallery/back_end/orbit_galleries/upload_panel.html.erb b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/upload_panel.html.erb index e164a821..68730e8b 100755 --- a/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/upload_panel.html.erb +++ b/vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/upload_panel.html.erb @@ -1,9 +1,9 @@ - <%= csrf_meta_tag %> +<%= csrf_meta_tag %> <%= javascript_include_tag "jquery-latest" %> - -<%= stylesheet_link_tag "jquery.fileupload-ui" %> +<%= stylesheet_link_tag "jquery-ui" %> +<%= stylesheet_link_tag "jquery.fileupload-ui.css" %> diff --git a/vendor/built_in_modules/gallery/config/locales/en.yml b/vendor/built_in_modules/gallery/config/locales/en.yml index b086d17e..7e379dce 100644 --- a/vendor/built_in_modules/gallery/config/locales/en.yml +++ b/vendor/built_in_modules/gallery/config/locales/en.yml @@ -27,4 +27,6 @@ en: save: Save cate_auth: Category Authorization cancel: Cancel - search_tags: Search Tags \ No newline at end of file + search_tags: Search Tags + cover: Album Cover + set_cover: Set as Album Cover \ No newline at end of file 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 a630072d..c9c75d6b 100644 --- a/vendor/built_in_modules/gallery/config/locales/zh_tw.yml +++ b/vendor/built_in_modules/gallery/config/locales/zh_tw.yml @@ -27,4 +27,6 @@ zh_tw: save: 儲存 cate_auth: 類別權限 cancel: 取消 - search_tags: 搜尋標籤 \ No newline at end of file + search_tags: 搜尋標籤 + cover: 封面 + set_cover: 設為封面 \ No newline at end of file