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 Christophe Vilayphiou
parent 6e6d441b26
commit b6f10951b8
5 changed files with 9 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -223,7 +223,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 frame = $('<iframe id="upload_panel" width="100%" scrolling="no" height="294" frameborder="0" src="upload_panel"></iframe>');
uploadpanel.find(".bt-cls").click(function(){
uploadpanel.find("a.bt-cls").click(function(){
uploadpanel.hide("slide");
frame.remove();
g.loadImages(id);

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

@ -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;

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 class="edit_fn">
<% 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 %>
<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 %>
<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-dels" onclick="return false;" title="Delete" href="<%= image.id %>"><span class="icon-trash"></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="<%= t("gallery.delete") %>" href="<%= image.id %>"><span class="icon-trash"></span></a>
</div>
</div>
<% end %>

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

@ -28,3 +28,5 @@ en:
cate_auth: Category Authorization
cancel: Cancel
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: 類別權限
cancel: 取消
search_tags: 搜尋標籤
cover: 封面
set_cover: 設為封面