wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts

Browse source
This commit is contained in:
Thomas Tanghus 2011-12-30 21:09:42 +01:00
commit 830a34a10a
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/contacts/templates/index.php
View file

@ -1,5 +1,5 @@
<?php // Include Style and Script
OC_Util::addScript('contacts','interface');
//OC_Util::addScript('contacts','interface'); // this line caused entry duplication, cause contacts/index.php already inlcudes it
OC_Util::addScript('contacts','jquery.inview');
OC_Util::addStyle('contacts','styles');
OC_Util::addStyle('contacts','formtastic');

7
apps/gallery/css/styles.css
View file

@ -17,7 +17,14 @@ div#gallery_album_box {
padding: 10px;
border: solid 1px black;
position: relative;
overflow: hidden;
color: #999;
}
div#gallery_album_box:hover {
color: black;
}
.leftcontent div#gallery_album_box {
margin: 5px;
}

4
apps/gallery/lib/scanner.php
View file

@ -21,7 +21,9 @@ class OC_Gallery_Scanner {
public static function scanDir($path, &$albums) {
$current_album = array('name'=> $path, 'imagesCount' => 0, 'images' => array());
$current_album['name'] = str_replace('/', '.', str_replace(OC::$CONFIG_DATADIRECTORY, '', $current_album['name']));
$current_album['name'] = ($current_album['name']==='')?'main':$current_album['name'];
$current_album['name'] = ($current_album['name']==='') ?
'main' :
trim($current_album['name'],'.');
if ($dh = OC_Filesystem::opendir($path)) {
while (($filename = readdir($dh)) !== false) {