saurabh
/
orbit-basic
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallery update 

especially upload panel
This commit is contained in:
devin 2012-08-22 01:15:50 +08:00 committed by Harry Bomrah
parent 4fe4dc35de
commit 1a4097d1c0
6 changed files with 19 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
vendor/built_in_modules/gallery/app/assets/javascripts/galleryAPI.js.erb vendored
View File

@ -222,7 +222,7 @@ var galleryAPI = function(){
}) })
}) })
var uploadpanel = $('<div id="upload_panel_holder"><div class="rgfn"><a class="bt-cls btn btn-primary pull-right" title="Close" href="" onclick="return false;"><i class="icon-remove icon-white"></i>Close Panel</a></div></div>'); var uploadpanel = $('<div id="upload_panel_holder"><div class="rgfn"><a class="bt-cls btn btn-primary pull-right" title="Close" href="" onclick="return false;"><i class="icon-remove icon-white"></i>Close Panel</a></div></div>');
var frame = $('<iframe id="upload_panel" width="100%" scrolling="no" height="200" frameborder="0" src="upload_panel"></iframe>'); var frame = $('<iframe id="upload_panel" width="100%" scrolling="no" height="294" frameborder="0" src="upload_panel"></iframe>');
uploadpanel.find("a.bt-cls").click(function(){ uploadpanel.find("a.bt-cls").click(function(){
uploadpanel.hide("slide"); uploadpanel.hide("slide");
frame.remove(); frame.remove();
@ -487,7 +487,9 @@ var galleryAPI = function(){
$.post("set_cover",{"imageid":$(this).attr("href"),"aid":id},function(){}) $.post("set_cover",{"imageid":$(this).attr("href"),"aid":id},function(){})
}) })
$(".description_loader .edit_fn .bt-dels").click(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){ if($(".description_loader .edit_fn .setdelete").length > 0){
g.albumArea.find(".rghead .rgfn .bt-delete").show(); g.albumArea.find(".rghead .rgfn .bt-delete").show();
}else{ }else{

42
vendor/built_in_modules/gallery/app/assets/stylesheets/gallery.css vendored
View File

@ -104,7 +104,6 @@
clear: both; clear: both;
overflow: hidden; overflow: hidden;
margin-bottom: 10px; margin-bottom: 10px;
border-bottom: solid 1px #fcfcfc;
} }
.albumname_edit label { .albumname_edit label {
width: 120px; width: 120px;
@ -141,7 +140,7 @@
right: 0; right: 0;
bottom: 0; bottom: 0;
overflow: hidden; overflow: hidden;
background: #333; background: #222;
clear: both; clear: both;
/*z-index: 99;*/ /*z-index: 99;*/
min-height: 250px; min-height: 250px;
@ -354,23 +353,6 @@
padding: 6px; padding: 6px;
} }
.rgphoto_edit .rgbtsg.active { display: inline-block; } .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-finish { display: block; float: right; clear: both; }
.bt-addnew { .bt-addnew {
margin: 0 auto; margin: 0 auto;
@ -391,27 +373,7 @@
right: 6px; right: 6px;
top: 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 { .inputui {
margin: 0 0 8px 0; margin: 0 0 8px 0;

8
vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/edit_album.html.erb vendored
View File

@ -32,12 +32,12 @@
</div> </div>
<div class="edit_fn"> <div class="edit_fn">
<% if image.id.to_s == @cover %> <% if image.id.to_s == @cover %>
<a class="btn btn-primary rgbtsg bt-cover setcover active" onclick="return false;" title="Cover" href="<%= image.id %>"><span class="icon-star icon-white"></span></a> <a class="btn btn-primary rgbtsg bt-cover setcover active" onclick="return false;" title="<%= t("gallery.cover") %>" href="<%= image.id %>"><span class="icon-star icon-white"></span></a>
<% else %> <% else %>
<a class="btn rgbtsg bt-cover" onclick="return false;" title="Set Cover" href="<%= image.id %>"><span class="icon-star-empty"></span></a> <a class="btn rgbtsg bt-cover" onclick="return false;" title="<%= t("gallery.set_cover") %>" href="<%= image.id %>"><span class="icon-star-empty"></span></a>
<% end %> <% end %>
<a class="btn rgbtsg bt-tag" onclick="return false;" title="Tags" href="<%= image.id %>"><span class="icon-tags"></span></a> <a class="btn rgbtsg bt-tag" onclick="return false;" title="<%= t("gallery.photo_tag") %>" href="<%= image.id %>"><span class="icon-tags"></span></a>
<a class="btn rgbtsg bt-dels" onclick="return false;" title="Delete" href="<%= image.id %>"><span class="icon-trash"></span></a> <a class="btn rgbtsg bt-dels" onclick="return false;" title="<%= t("gallery.delete") %>" href="<%= image.id %>"><span class="icon-trash"></span></a>
</div> </div>
</div> </div>
<% end %> <% end %>

6
vendor/built_in_modules/gallery/app/views/panel/gallery/back_end/orbit_galleries/upload_panel.html.erb vendored
View File

@ -1,9 +1,9 @@
<html> <html>
<head> <head>
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= javascript_include_tag "jquery-latest" %> <%= javascript_include_tag "jquery-latest" %>
<!--<%= stylesheet_link_tag "jquery-ui" %> --> <%= stylesheet_link_tag "jquery-ui" %>
<%= stylesheet_link_tag "jquery.fileupload-ui" %> <%= stylesheet_link_tag "jquery.fileupload-ui.css" %>
</head> </head>
<body> <body>

2
vendor/built_in_modules/gallery/config/locales/en.yml vendored
View File

@ -28,3 +28,5 @@ en:
cate_auth: Category Authorization cate_auth: Category Authorization
cancel: Cancel cancel: Cancel
search_tags: Search Tags search_tags: Search Tags
cover: Album Cover
set_cover: Set as Album Cover

2
vendor/built_in_modules/gallery/config/locales/zh_tw.yml vendored
View File

@ -28,3 +28,5 @@ zh_tw:
cate_auth: 類別權限 cate_auth: 類別權限
cancel: 取消 cancel: 取消
search_tags: 搜尋標籤 search_tags: 搜尋標籤
cover: 封面
set_cover: 設為封面