summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorBartek Przybylski <bart.p.pl@gmail.com>2011-12-30 17:06:29 +0100
committerBartek Przybylski <bart.p.pl@gmail.com>2011-12-30 17:06:29 +0100
commit2ea20862fcef773d4262c78835b16fb5827ecfe2 (patch)
tree00d00e787ab9c7b5528bc188a278349fe236cfef /apps
parent349923c5b8aacf82b8032f55a56aff63e7a1072a (diff)
downloadnextcloud-server-2ea20862fcef773d4262c78835b16fb5827ecfe2.tar.gz
nextcloud-server-2ea20862fcef773d4262c78835b16fb5827ecfe2.zip
gallery fixes
Diffstat (limited to 'apps')
-rw-r--r--apps/gallery/css/styles.css7
-rw-r--r--apps/gallery/lib/scanner.php4
2 files changed, 10 insertions, 1 deletions
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) {