[Pkg-owncloud-commits] [owncloud] 14/104: always show home breadcrumb in files view
David Prévot
taffit at moszumanska.debian.org
Sat Jan 18 13:33:36 UTC 2014
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository owncloud.
commit c88109a496c589902cce7625c63e85da560cca4c
Author: Bjoern Schiessle <schiessle at owncloud.com>
Date: Fri Dec 13 14:34:26 2013 +0100
always show home breadcrumb in files view
---
apps/files/templates/part.breadcrumb.php | 12 +++++-------
core/js/js.js | 8 ++++----
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 9db27eb..90d07d4 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,10 +1,8 @@
-<?php if(count($_["breadcrumb"])):?>
- <div class="crumb" data-dir=''>
- <a href="<?php print_unescaped($_['baseURL']); ?>">
- <img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
- </a>
- </div>
-<?php endif;?>
+<div class="crumb <?php if(!count($_["breadcrumb"])) p('last');?>" data-dir=''>
+ <a href="<?php print_unescaped($_['baseURL']); ?>">
+ <img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
+ </a>
+</div>
<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
$crumb = $_["breadcrumb"][$i];
$dir = \OCP\Util::encodePath($crumb["dir"]); ?>
diff --git a/core/js/js.js b/core/js/js.js
index 5442039..54b4d51 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -478,11 +478,11 @@ OC.Breadcrumb={
},
_show:function(container, dir, leafname, leaflink){
var self = this;
-
+
this._clear(container);
-
+
// show home + path in subdirectories
- if (dir && dir !== '/') {
+ if (dir) {
//add home
var link = OC.linkTo('files','index.php');
@@ -509,7 +509,7 @@ OC.Breadcrumb={
}
});
}
-
+
//add leafname
if (leafname && leaflink) {
this._push(container, leafname, leaflink);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list