developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallery update

This commit is contained in:
devin 2012-08-07 14:33:30 +08:00 committed by chris
parent 0dd1c6eb51
commit 4beedb1aa4
2 changed files with 48 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,13 +119,13 @@ var galleryAPI = function(){
this.loadImages = function(id){ this.loadImages = function(id){
//<iframe id="upload_panel" width="100%" scrolling="no" height="300" frameborder="0" src="upload_panel.html?id=16"> //<iframe id="upload_panel" width="100%" scrolling="no" height="300" frameborder="0" src="upload_panel.html?id=16">
var headarea = '<a class="bt-back btn btn-primary pull-right" title="<%= I18n.t("gallery.back_to_albums") %>" href="orbit_gallery"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.back_to_albums") %></a> '; var headarea = '<a class="bt-back btn btn-primary pull-right" title="<%= I18n.t("gallery.back_to_albums") %>" href="orbit_gallery"><i class="icon-arrow-left icon-white"></i><%= I18n.t("gallery.back_to_albums") %></a> ';
headarea+='<a class="bt-add btn btn-primary pull-right" title="<%= I18n.t("gallery.add_images") %>" href="images" onclick="return false;"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.add_images") %></a> '; headarea+='<a class="bt-add btn btn-primary pull-right" title="<%= I18n.t("gallery.add_images") %>" href="images" onclick="return false;"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.add_images") %></a> ';
headarea+='<a class="bt-del btn btn-primary pull-right" title="<%= I18n.t("gallery.del_album") %>" href="delete" onclick="return false;"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.del_album") %></a> '; headarea+='<a class="bt-del btn btn-primary pull-right" title="<%= I18n.t("gallery.del_album") %>" href="delete" onclick="return false;"><i class="icon-trash icon-white"></i><%= I18n.t("gallery.del_album") %></a> ';
headarea+='<a class="bt-edit btn btn-primary pull-right" title="<%= I18n.t("gallery.edit") %>" href="orbit_gallery?edit='+id+'" ><i class="icon-plus icon-white"></i><%= I18n.t("gallery.edit") %></a>'; headarea+='<a class="bt-edit btn btn-primary pull-right" title="<%= I18n.t("gallery.edit") %>" href="orbit_gallery?edit='+id+'" ><i class="icon-pencil icon-white"></i><%= I18n.t("gallery.edit") %></a>';
headarea = $(headarea); headarea = $(headarea);
var uploadpanel = $('<div id="upload_panel_holder" style="display:none; margin: 16px 0 50px 0;"><div class="rgfn"><a class="bt-cls btn btn-primary pull-right" title="Close" href="" onclick="return false;"><i class="icon-plus 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="300" frameborder="0" src="upload_panel"></iframe>'); var frame = $('<iframe id="upload_panel" width="100%" scrolling="no" height="200" frameborder="0" src="upload_panel"></iframe>');
g.albumArea.find(".rghead .rgfn").html(headarea); g.albumArea.find(".rghead .rgfn").html(headarea);
g.albumArea.find(".rghead .rgfn a.bt-add").click(function(){ g.albumArea.find(".rghead .rgfn a.bt-add").click(function(){
showUploadPanel(); showUploadPanel();
@ -311,8 +311,8 @@ var galleryAPI = function(){
}) })
} }
var head = $('<a href="" class="bt-back btn btn-primary pull-right" title="<%= I18n.t("gallery.back_to_photos") %>"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.back_to_photos") %></a></div>'); var head = $('<a href="" class="bt-back btn btn-primary pull-right" title="<%= I18n.t("gallery.back_to_photos") %>"><i class="icon-arrow-left icon-white"></i><%= I18n.t("gallery.back_to_photos") %></a></div>');
var head1 = $('<a class="bt-edit btn btn-primary pull-right" title="<%= I18n.t("gallery.edit") %>" href="" ><i class="icon-plus icon-white"></i><%= I18n.t("gallery.edit") %></a>'); var head1 = $('<a class="bt-edit btn btn-primary pull-right" title="<%= I18n.t("gallery.edit") %>" href="" ><i class="icon-pencil icon-white"></i><%= I18n.t("gallery.edit") %></a>');
g.albumArea.find("#imgholder").load("theater?pic="+id,function(theater,response,xhr){ g.albumArea.find("#imgholder").load("theater?pic="+id,function(theater,response,xhr){
if(xhr.status == 404){ if(xhr.status == 404){
$(this).text("<%= I18n.t('gallery.pic_not_found') %>."); $(this).text("<%= I18n.t('gallery.pic_not_found') %>.");
@ -389,9 +389,9 @@ var galleryAPI = function(){
} }
$("#filter").remove(); $("#filter").remove();
g.albumArea.css("margin-top",""); g.albumArea.css("margin-top","");
var head ='<a href="orbit_gallery?album='+id+'" class="bt-back btn btn-primary pull-right" title="<%= I18n.t("gallery.back_to_photos") %>"><i class="icon-plus icon-white"></i><%= I18n.t("gallery.back_to_photos") %></a></div>'; var head ='<a href="orbit_gallery?album='+id+'" class="bt-back btn btn-primary pull-right" title="<%= I18n.t("gallery.back_to_photos") %>"><i class="icon-arrow-left icon-white"></i><%= I18n.t("gallery.back_to_photos") %></a></div>';
head+='<a class="bt-del bt-delete btn btn-primary pull-right" onclick="return false;" style="display:none;" title="<%= I18n.t("gallery.delete_selected") %>" href=""><i class="icon-plus icon-white"></i><%= I18n.t("gallery.delete_selected") %></a>'; head+='<a class="bt-del bt-delete btn btn-primary pull-right" onclick="return false;" style="display:none;" title="<%= I18n.t("gallery.delete_selected") %>" href=""><i class="icon-trash icon-white"></i><%= I18n.t("gallery.delete_selected") %></a>';
head+='<a class="bt-save btn btn-primary pull-right" onclick="return false;" style="display:none;" title="Save" href=""><i class="icon-plus icon-white"></i>Save</a>'; head+='<a class="bt-save btn btn-primary pull-right" onclick="return false;" style="display:none;" title="Save" href=""><i class="icon-ok icon-white"></i>Save</a>';
g.albumArea.find(".rghead .rgfn").html(head); g.albumArea.find(".rghead .rgfn").html(head);
g.albumArea.find("#imgholder").load("edit_album?aid="+id,function(data,response,xhr){ g.albumArea.find("#imgholder").load("edit_album?aid="+id,function(data,response,xhr){
if(xhr.status == 404){ if(xhr.status == 404){

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

@ -11,7 +11,11 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
*/ */
.rg, .rgp { } .rg, .rgp {
transition: all 0.3s ease;
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
}
.rg input, .rgp input, .rg textarea, .rgp textarea { .rg input, .rgp input, .rg textarea, .rgp textarea {
resize: none; resize: none;
border: none; border: none;
@ -52,9 +56,9 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
padding: 0 8px; padding: 0 8px;
} }
.rgbody { .rgbody {
/*padding: 20px 0 0 20px;*/
} }
.rgfn { float: right; padding: 4px 8px 0 0; } .rgfn { overflow: hidden; padding: 4px 10px; }
.rgalbum, .rgphoto { float: left; margin: 0 16px 24px 0; } .rgalbum, .rgphoto { float: left; margin: 0 16px 24px 0; }
.rgalbum { width: 134px; height: 169px; text-align: center; position: relative; margin-bottom: 12px; } .rgalbum { width: 134px; height: 169px; text-align: center; position: relative; margin-bottom: 12px; }
.rgalbum img { .rgalbum img {
@ -164,6 +168,10 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
clear: both; clear: both;
z-index: 99; z-index: 99;
min-height: 250px; min-height: 250px;
transition: all 0.3s ease;
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
} }
.rslide.fullscreen { position: fixed; } .rslide.fullscreen { position: fixed; }
.rslideinside { .rslideinside {
@ -181,6 +189,10 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
height: auto; height: auto;
overflow: hidden; overflow: hidden;
position: relative; position: relative;
transition: all 0.3s ease;
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
} }
.comp img{ display: block; width: auto; height: auto; margin: 0 auto; cursor: pointer; min-height: 250px; } .comp img{ display: block; width: auto; height: auto; margin: 0 auto; cursor: pointer; min-height: 250px; }
.comp .full{ width: auto; height: auto; max-width: 100%; max-height: 100%; } .comp .full{ width: auto; height: auto; max-width: 100%; max-height: 100%; }
@ -462,7 +474,29 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
.w380 { width: 380px; } .w380 { width: 380px; }
/* upload panel */
#upload_panel_holder {
display: none;
margin: 16px 0 0 0;
clear: both;
float: right;
width: 100%;
}
#upload_panel {
background-color: #ddd;
}
/* orbit style implementation */
#orbit_gallery {
margin-bottom: 30px;
}
#orbit_gallery .nav-tabs, #orbit_gallery .tab-pane { #orbit_gallery .nav-tabs, #orbit_gallery .tab-pane {
margin-left: 8px; margin-left: 8px;
margin-right: 8px; margin-right: 8px;
} }
#orbit_gallery .btn { margin: 0; }
#orbit_gallery .rgfn .btn {
margin-left: 8px;
}
#orbit_gallery .rgfn i { margin-right: 4px; }
#orbit_gallery .form-actions { background-color: whiteSmoke; }