mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

merged with stash

This commit is contained in:
Bartek Przybylski 2011-12-21 18:37:17 +01:00
parent 3c42867109
commit 25fa9bf8ec
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/gallery/css/styles.css
View File

@ -14,6 +14,8 @@ div#gallery_album_box {
display: inline-block; display: inline-block;
margin: 5pt; margin: 5pt;
vertical-align: top; vertical-align: top;
padding: 10px;
border: solid 1px black;
} }
.leftcontent div#gallery_album_box { .leftcontent div#gallery_album_box {
margin: 5px; margin: 5px;
@ -27,7 +29,14 @@ div#gallery_album_box h1 {
div#gallery_album_cover { div#gallery_album_cover {
width: 199px; width: 199px;
height: 199px; height: 199px;
border: solid 1px black; border: solid 1px #999;
padding: 0;
}
div#gallery_control_overlay {
width:199px;
height:199px;
position:relative;
} }
#gallery_images { #gallery_images {

18
apps/gallery/js/albums.js
View File

@ -57,14 +57,15 @@ Albums={
// displays gallery in linear representation // displays gallery in linear representation
// on given element, and apply default styles for gallery // on given element, and apply default styles for gallery
display: function(element) { display: function(element) {
var displayTemplate = '<div id="gallery_album_box" title="*NAME*"><a href="?view=*NAME*"><div id="gallery_album_cover"></div></a><h1>*NAME*</h1></div></div>'; var displayTemplate = '<div id="gallery_album_box" title="*NAME*"><a href="#?view=*NAME*"><div id="#gallery_control_overlay"><div id="gallery_album_cover" title="*NAME*"></div></div></a><h1>*NAME*</h1></div></div>';
for (var i in Albums.albums) { for (var i in Albums.albums) {
var a = Albums.albums[i]; var a = Albums.albums[i];
var local = $(displayTemplate.replace(/\*NAME\*/g, a.name)); var local = $(displayTemplate.replace(/\*NAME\*/g, a.name));
local.css('background-repeat', 'no-repeat'); $("#gallery_album_cover", local).css('background-repeat', 'no-repeat');
local.css('background-position', '0 0'); $("#gallery_album_cover", local).css('background-position', '0');
local.css('background-image','url("'+a.backgroundPath+'")'); $("#gallery_album_cover", local).css('background-image','url("ajax/getCovers.php?album_name='+a.name+'")');
local.mousemove(function(e) { $("#gallery_album_cover", local).mousemove(function(e) {
var albumMetadata = Albums.find(this.title); var albumMetadata = Albums.find(this.title);
if (albumMetadata == undefined) { if (albumMetadata == undefined) {
return; return;
@ -75,6 +76,13 @@ Albums={
}); });
$(element).append(local); $(element).append(local);
} }
},
rename: function(element, new_name) {
if (new_name) {
$(element).attr("title", new_name);
$("a", element).attr("href", "?view="+new_name);
$("h1", element).text(new_name);
}
} }
} }

3
apps/gallery/templates/view_album.php
View File

@ -15,7 +15,8 @@ OC_Util::addStyle( 'files_imageviewer', 'jquery.fancybox-1.3.4' );
</script> </script>
<div id="controls"> <div id="controls">
<a href="?"><input type="button" value="Back" /></a><br/> <a href="?"><input type="button" value="Back" /></a>
<br/>
</div> </div>
<div id="gallery_list" class="leftcontent"> <div id="gallery_list" class="leftcontent">