Merge branch 'gallery_orbit' into desktop_harry
This commit is contained in:
Harry Bomrah committed
commit
45da2971ef
9 files changed
+362
-40
No files matched your search
@@ -15,6 +15,9 @@ var galleryAPI = function(){
|
||||
}else if(typeof g.urlVars['theater']!= "undefined"){
|
||||
g.loadTheater(g.urlVars['theater']);
|
||||
g.loadArea = "theater";
|
||||
}else if(typeof g.urlVars['edit']!= "undefined"){
|
||||
g.editAlbum(g.urlVars['edit']);
|
||||
g.loadArea = "edit";
|
||||
}else{
|
||||
g.loadAlbums("all");
|
||||
g.loadArea = "albums";
|
||||
@@ -97,6 +100,14 @@ var galleryAPI = function(){
|
||||
|
||||
})
|
||||
}
|
||||
this.deleteAlbum = function(id){
|
||||
if(confirm("Delete this Album?")){
|
||||
$.post("delete_album",{aid:id},function(){
|
||||
window.location = "orbit_gallery";
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
this.loadAlbums = function(id){
|
||||
var headbtn = $('<a class="rgui bt-add rgbt" title="Add Album" href="albums" onclick="return false;"><span>Add Album</span></a>');
|
||||
headbtn.click(function(){g.makeNewAlbum();})
|
||||
@@ -106,7 +117,10 @@ var galleryAPI = function(){
|
||||
$addsign.find("a").click(function(){g.makeNewAlbum();})
|
||||
$.getJSON("get_albums",{cid:id},function(albums){
|
||||
$.each(albums,function(i,album){
|
||||
var $img = $("<div class='rgalbum'><a title='"+album.description+"' href='?album="+album._id+"'><img src='../../../assets/gallery/default.jpg' width='120px' height='90px'/></a><span class='albumname'>"+album.name+"</span></div>");
|
||||
if(album.cover == "default")
|
||||
var $img = $("<div class='rgalbum'><a title='"+album.description+"' href='?album="+album._id+"'><img src='../../../assets/gallery/default.jpg' width='120px' height='90px'/></a><span class='albumname'>"+album.name+"</span></div>");
|
||||
else
|
||||
var $img = $("<div class='rgalbum'><a title='"+album.description+"' href='?album="+album._id+"'><img src='"+album.cover_path+"' width='120px' height='90px'/></a><span class='albumname'>"+album.name+"</span></div>");
|
||||
g.albumArea.find("#imgholder").append($img);
|
||||
})
|
||||
g.albumArea.find("#imgholder").append($addsign);
|
||||
@@ -115,13 +129,20 @@ var galleryAPI = function(){
|
||||
this.loadImages = function(id){
|
||||
//<iframe id="upload_panel" width="100%" scrolling="no" height="300" frameborder="0" src="upload_panel.html?id=16">
|
||||
|
||||
var headarea = $('<a class="rgui bt-back rgbt" title="Back to Albums" href="orbit_gallery"><span>Back to Album</span></a>');
|
||||
headarea.append($('<a class="rgui bt-add rgbt" title="Add Images" href="images" onclick="return false;"><span>Add Images</span></a>'));
|
||||
var headarea = '<a class="rgui bt-back rgbt" title="Back to Albums" href="orbit_gallery"><span>Back to Album</span></a> ';
|
||||
headarea+='<a class="rgui bt-add rgbt" title="Add Images" href="images" onclick="return false;"><span>Add Images</span></a> ';
|
||||
headarea+='<a class="rgui bt-del rgbt" title="Delete Album" href="delete" onclick="return false;"><span>Delete this album</span></a> ';
|
||||
headarea+='<a class="rgui bt-edit rgbt" title="Edit Album" href="orbit_gallery?edit='+id+'" ><span>Edit</span></a>';
|
||||
headarea = $(headarea);
|
||||
var uploadpanel = $('<div id="upload_panel_holder" style="display:none; margin: 16px 0 50px 0;"><div class="rgfn"><a class="rgui bt-cls rgbt" title="Close" href="" onclick="return false;"><span id="album_name_span">Close Panel</span></a></div></div>');
|
||||
var frame = $('<iframe id="upload_panel" width="100%" scrolling="no" height="300" frameborder="0" src="upload_panel"></iframe>');
|
||||
headarea.find("a.bt-add").click(function(){
|
||||
g.albumArea.find(".rghead .rgfn").html(headarea);
|
||||
g.albumArea.find(".rghead .rgfn a.bt-add").click(function(){
|
||||
showUploadPanel();
|
||||
})
|
||||
g.albumArea.find(".rghead .rgfn a.bt-del").click(function(){
|
||||
g.deleteAlbum(id);
|
||||
})
|
||||
uploadpanel.find("a.bt-cls").click(function(){
|
||||
uploadpanel.hide("slide");
|
||||
frame.remove();
|
||||
@@ -136,7 +157,7 @@ var galleryAPI = function(){
|
||||
panelopen = true;
|
||||
}
|
||||
}
|
||||
g.albumArea.find(".rghead .rgfn").html(headarea);
|
||||
|
||||
g.albumArea.find(".rghead .rgfn").append(uploadpanel);
|
||||
g.albumArea.find("#imgholder").empty();
|
||||
var $addsign = $('<div class="rgalbum"><a id="global_add" class="rgui bt-addnew" href="add" onclick="return false;">Add Album</a></div>');
|
||||
@@ -153,13 +174,238 @@ var galleryAPI = function(){
|
||||
|
||||
}
|
||||
this.loadTheater = function(id){
|
||||
var head = $('<a href="" class="rgui bt-back rgbt" title="Back"><span id="album_name_span">Back to photos</span></a></div><div class="rgtitle">Gallery</div>');
|
||||
g.albumArea.find("#imgholder").load("theater?pic="+id,function(theater){
|
||||
var imageArray;
|
||||
var imagecount = 0;
|
||||
var picHeight = 0;
|
||||
var bindHandlers = function(){
|
||||
var $slidelist = $('.slidelist'),
|
||||
$rslide = $('.rslide'),
|
||||
$rslidenav = $('.rslidenav'),
|
||||
$img = $("#main_pic img"),
|
||||
wHeight = $(window).height();
|
||||
|
||||
$("#main_pic").height(picHeight);
|
||||
$img.height("100%");
|
||||
|
||||
$(".slidectrl a.togglelist").click(function(){
|
||||
var rslide_h = $rslide.outerHeight();
|
||||
if ( $slidelist.height() < 1 ){
|
||||
$slidelist.stop().animate({'height':rslide_h - 30}, 300);
|
||||
$slidelist.find("ul").show();
|
||||
} else {
|
||||
$slidelist.stop().animate({'height':'0px'}, 300);
|
||||
$slidelist.find("ul").hide();
|
||||
}
|
||||
})
|
||||
$(".slidectrl a.togglescreen").click(function(){
|
||||
toggleFullscreen();
|
||||
})
|
||||
$(".slidectrl a.browserfullscreen").click(function(){
|
||||
browserFullScreen();
|
||||
})
|
||||
$slidelist.find("a.list_element").click(function(){
|
||||
imagecount = parseInt($(this).parent().attr("for"));
|
||||
changeImage($(this));
|
||||
})
|
||||
$rslidenav.find("a.navN").click(function(){
|
||||
nextpic($(this));
|
||||
})
|
||||
$rslidenav.find("a.navP").click(function(){
|
||||
prevpic($(this));
|
||||
})
|
||||
$("a#nextpic").click(function(){
|
||||
nextpic($(this));
|
||||
})
|
||||
|
||||
$(document).keydown(function(e){
|
||||
if (e.keyCode == 37){
|
||||
prevpic($rslidenav.find("a.navP"));
|
||||
return false;
|
||||
}
|
||||
if(e.keyCode == 39){
|
||||
nextpic($rslidenav.find("a.navN"));
|
||||
return false;
|
||||
}
|
||||
if(e.keyCode == 27){
|
||||
toggleFullscreen();
|
||||
return false;
|
||||
}
|
||||
if(e.keyCode == 70 || e.keyCode == 102){
|
||||
if($rslide.hasClass("fullscreen"))
|
||||
browserFullScreen();
|
||||
}
|
||||
});
|
||||
var browserFullScreen = function(){
|
||||
var el = document.documentElement,
|
||||
rfs = el.requestFullScreen || el.webkitRequestFullScreen || el.mozRequestFullScreen;
|
||||
rfs.call(el);
|
||||
}
|
||||
var nextpic = function(dom){
|
||||
if(imagecount == imageArray.length - 1)
|
||||
imagecount = 0;
|
||||
else
|
||||
imagecount++;
|
||||
changeImage(dom);
|
||||
}
|
||||
var prevpic = function(dom){
|
||||
if(imagecount == 0)
|
||||
imagecount = imageArray.length - 1
|
||||
else
|
||||
imagecount--;
|
||||
changeImage(dom);
|
||||
}
|
||||
var toggleFullscreen = function(){
|
||||
if($rslide.hasClass("fullscreen")){
|
||||
$rslide.css("position","relative");
|
||||
$rslide.removeClass("fullscreen");
|
||||
$(".slidectrl a.browserfullscreen").hide();
|
||||
$img.css({"padding":""})
|
||||
$("#main_pic").height(picHeight);
|
||||
}else{
|
||||
$("#main_pic").height(wHeight);
|
||||
// $img.height("100%");
|
||||
$rslide.css("position","");
|
||||
$rslide.addClass("fullscreen");
|
||||
$img.css({"padding":($rslide.height()-$img.height())/2})
|
||||
$(".slidectrl a.browserfullscreen").show();
|
||||
}
|
||||
}
|
||||
var changeImage = function(dom){
|
||||
var pageurl = dom.attr('href');
|
||||
$img.fadeOut(200,function(){
|
||||
$img.attr({"src":dom.attr("data-content"),"height":picHeight+"px"});
|
||||
$img.fadeIn(200);
|
||||
if($rslide.hasClass("fullscreen")){
|
||||
$img.css({"padding":($rslide.height()-$img.height())/2})
|
||||
}
|
||||
$slidelist.stop().animate({'height':'0px'}, 300);
|
||||
$slidelist.find("ul").hide();
|
||||
if(pageurl!=window.location){
|
||||
window.history.pushState({path:pageurl},'',pageurl);
|
||||
}
|
||||
// $(".slideinfo b.info").text(imageArray[imagecount].title);
|
||||
$(".slideinfo span.info").text(imageArray[imagecount].description);
|
||||
updateNavigation();
|
||||
})
|
||||
}
|
||||
var updateNavigation = function(){
|
||||
var next, prev;
|
||||
if(imagecount == 0){
|
||||
next = 1;
|
||||
prev = imageArray.length - 1;
|
||||
}else if(imagecount == imageArray.length - 1){
|
||||
next = 0
|
||||
prev = imageArray.length - 2;
|
||||
}else{
|
||||
next = imagecount + 1;
|
||||
prev = imagecount - 1;
|
||||
}
|
||||
$("a.navN").attr({"href":"orbit_gallery?theater="+imageArray[next]._id,"data-content":imageArray[next].file.url});
|
||||
$("a.navP").attr({"href":"orbit_gallery?theater="+imageArray[prev]._id,"data-content":imageArray[prev].file.url});
|
||||
};
|
||||
updateNavigation();
|
||||
}
|
||||
|
||||
var preparestage = function(albumid){
|
||||
$.getJSON("get_images",{aid:albumid},function(images){
|
||||
imageArray = eval(images);
|
||||
$.each(images,function(i,image){
|
||||
if(image._id == id)
|
||||
imagecount = i;
|
||||
})
|
||||
bindHandlers();
|
||||
})
|
||||
}
|
||||
|
||||
var head = $('<a href="" class="rgui bt-back rgbt" title="Back"><span id="album_name_span">Back to photos</span></a></div>');
|
||||
var head1 = $('<a class="rgui bt-edit rgbt" title="Edit Album" href="" ><span>Edit</span></a>');
|
||||
g.albumArea.find("#imgholder").load("theater?pic="+id,function(theater,response,xhr){
|
||||
if(xhr.status == 404){
|
||||
$(this).text("Pic not found.");
|
||||
return false;
|
||||
}
|
||||
var albumid = $(theater).find("#main_pic").attr("data-content");
|
||||
head.attr("href","orbit_gallery?album="+albumid);
|
||||
head1.attr("href","orbit_gallery?edit="+albumid);
|
||||
g.albumArea.find(".rghead .rgfn").html(head);
|
||||
g.albumArea.find(".rghead .rgfn").append(head1);
|
||||
picHeight = $(window).height() - ($("#orbit-bar").outerHeight() + $("#gallery_panel").outerHeight() + $("#orbit_gallery .rghead").outerHeight());
|
||||
preparestage(albumid);
|
||||
})
|
||||
}
|
||||
|
||||
this.editAlbum = function(id){
|
||||
var bindHandlers = function(){
|
||||
$("#description_loader .edit_fn .bt-cover").click(function(){
|
||||
$(".bt-cover").removeClass("setcover");
|
||||
$(this).addClass("setcover");
|
||||
$.post("set_cover",{"imageid":$(this).attr("href"),"aid":id},function(){})
|
||||
})
|
||||
$("#description_loader .edit_fn .bt-dels").click(function(){
|
||||
$(this).toggleClass("setdelete");
|
||||
if($("#description_loader .edit_fn .setdelete").length > 0){
|
||||
g.albumArea.find(".rghead .rgfn .bt-delete").show();
|
||||
}else{
|
||||
g.albumArea.find(".rghead .rgfn .bt-delete").hide();
|
||||
}
|
||||
})
|
||||
g.albumArea.find(".rghead .rgfn .bt-save").click(function(){
|
||||
var dataArray = Array();
|
||||
$("#description_loader .txtchange").each(function(){
|
||||
dataArray.push({"id":$(this).attr("for"),"text": $(this).val()});
|
||||
})
|
||||
albumnm = $(".albumname_edit #album_name_text").val();
|
||||
$.post("update_album",{data:dataArray,"aid":id,"name":albumnm},function(){
|
||||
|
||||
})
|
||||
})
|
||||
var tempval;
|
||||
$(".txtchange").focus(function(){
|
||||
tempval = $(this).val();
|
||||
}).keyup(function(){
|
||||
if($(this).val() != tempval)
|
||||
g.albumArea.find(".rghead .rgfn .bt-save").show();
|
||||
})
|
||||
g.albumArea.find(".rghead .rgfn .bt-delete").click(function(){
|
||||
var images_to_delete = new Array();
|
||||
var delete_cover = false;
|
||||
var doms_to_delete = new Array();
|
||||
var thiscover = $("#description_loader .edit_fn .setcover").attr("href");
|
||||
$("#description_loader .edit_fn .bt-dels").each(function(){
|
||||
if($(this).hasClass("setdelete")){
|
||||
images_to_delete.push($(this).attr("href"));
|
||||
doms_to_delete.push($(this).parent().parent());
|
||||
if(thiscover == $(this).attr("href"))
|
||||
delete_cover = true;
|
||||
}
|
||||
})
|
||||
if(confirm("Deleting "+images_to_delete.length+" image(s)?")){
|
||||
$.post("delete_images",{"images":images_to_delete,"delete_cover":delete_cover,"aid":id},function(response){
|
||||
if(response.success){
|
||||
for(dom in doms_to_delete){
|
||||
doms_to_delete[dom].hide("slide",function(){$(this).remove();})
|
||||
}
|
||||
}
|
||||
g.albumArea.find(".rghead .rgfn .bt-delete").hide();
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
var head = '<a href="orbit_gallery?album='+id+'" class="rgui bt-back rgbt" title="Back"><span id="album_name_span">Back to photos</span></a></div>';
|
||||
head+='<a class="rgui bt-del bt-delete rgbt" onclick="return false;" style="display:none;" title="Delete Selected" href=""><span>Delete Selected</span></a>';
|
||||
head+='<a class="rgui bt-save rgbt" onclick="return false;" style="display:none;" title="Save" href=""><span>Save</span>';
|
||||
g.albumArea.find(".rghead .rgfn").html(head);
|
||||
rcom.bindDomToHead($(".rghead"));
|
||||
g.albumArea.find("#imgholder").load("edit_album?aid="+id,function(data,response,xhr){
|
||||
if(xhr.status == 404){
|
||||
$(this).text("Album not found.");
|
||||
return false;
|
||||
}
|
||||
bindHandlers();
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -55,7 +55,7 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
|
||||
padding: 0 8px;
|
||||
}
|
||||
.rgbody {
|
||||
padding: 20px 0 0 20px;
|
||||
/*padding: 20px 0 0 20px;*/
|
||||
}
|
||||
.rgfn { float: right; padding: 4px 8px 0 0; }
|
||||
.rgalbum, .rgphoto { float: left; margin: 0 16px 24px 0; }
|
||||
@@ -185,7 +185,7 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
}
|
||||
.comp img{ display: block; width: 100%; 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%; }
|
||||
.rslidenav {
|
||||
position: absolute;
|
||||
@@ -241,6 +241,7 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
|
||||
.slidectrl a.togglelist { background-position: 0 -30px; }
|
||||
.slidectrl a.toinline { background-position: -30px 0; }
|
||||
.slidectrl a.sharebt { background-position: -30px -30px; }
|
||||
.slidectrl a.browserfullscreen {background-position: -30px -30px; display:none;}
|
||||
.slidectrl a.slidestop { background-position: 0 -60px; }
|
||||
.slideinfo {
|
||||
height: 30px;
|
||||
@@ -433,12 +434,12 @@ body.fullscreen, .fullscreen #container, .fullscreen #container2, .fullscreen #m
|
||||
.bt-languages:active { background-position: -477px -72px; }
|
||||
|
||||
.inputui {
|
||||
background: transparent 0 0 url(../../images/gallery/inputui.png) no-repeat;
|
||||
background: transparent 0 0 url(../../../assets/gallery/inputui.png) no-repeat;
|
||||
padding: 0 0 0 4px;
|
||||
margin: 0 0 8px 0;
|
||||
}
|
||||
.inputui span {
|
||||
background: transparent 0 0 url(../../images/gallery/inputui.png) no-repeat;
|
||||
background: transparent 0 0 url(../../../assets/gallery/inputui.png) no-repeat;
|
||||
padding: 0 4px 0 0;
|
||||
display: block;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user