diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2011-12-30 21:09:42 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2011-12-30 21:09:42 +0100 |
| commit | 830a34a10a8f084b125106033b4e515555c49319 (patch) | |
| tree | 74708ff6dd8fa6cebe2aa575d314bc696c68fc07 /apps | |
| parent | 4793d25c577dcad3516853d05d62cf264fc54448 (diff) | |
| parent | 31663cfff5c32b90bf41c6af46f3042db8699fe2 (diff) | |
| download | nextcloud-server-830a34a10a8f084b125106033b4e515555c49319.tar.gz nextcloud-server-830a34a10a8f084b125106033b4e515555c49319.zip | |
Merge git://gitorious.org/owncloud/owncloud into tanghus_contacts
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/contacts/templates/index.php | 2 | ||||
| -rw-r--r-- | apps/gallery/css/styles.css | 7 | ||||
| -rw-r--r-- | apps/gallery/lib/scanner.php | 4 |
3 files changed, 11 insertions, 2 deletions
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php index 9e63b201987..90143f25fa6 100644 --- a/apps/contacts/templates/index.php +++ b/apps/contacts/templates/index.php @@ -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'); diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css index 09f9daeb6b1..53c3c0901d9 100644 --- a/apps/gallery/css/styles.css +++ b/apps/gallery/css/styles.css @@ -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; } diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php index ef210327966..59c34b8e69a 100644 --- a/apps/gallery/lib/scanner.php +++ b/apps/gallery/lib/scanner.php @@ -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) { |