diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-12-17 00:25:06 -0800 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-12-17 00:25:06 -0800 |
| commit | 753525c57f2fb0fce6d03e29aae36e138221983a (patch) | |
| tree | 7c5ac5d2d6a86c265a94e3d2856953719b773961 | |
| parent | 4ae148cebdbbab6291a77b62a0ecba2c6b92ae13 (diff) | |
| parent | 3e17fbe30dbf2a0e99c7aca83d855fb8df46d11b (diff) | |
| download | nextcloud-server-753525c57f2fb0fce6d03e29aae36e138221983a.tar.gz nextcloud-server-753525c57f2fb0fce6d03e29aae36e138221983a.zip | |
Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb
always show 'Deleted Files' breadcrumb
| -rw-r--r-- | apps/files/templates/part.breadcrumb.php | 12 | ||||
| -rw-r--r-- | apps/files_trashbin/templates/part.breadcrumb.php | 8 | ||||
| -rw-r--r-- | core/js/js.js | 8 |
3 files changed, 13 insertions, 15 deletions
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php index 9db27eb9b29..90d07d4336c 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/apps/files_trashbin/templates/part.breadcrumb.php b/apps/files_trashbin/templates/part.breadcrumb.php index 4acc298adbe..fdf78c190d0 100644 --- a/apps/files_trashbin/templates/part.breadcrumb.php +++ b/apps/files_trashbin/templates/part.breadcrumb.php @@ -3,11 +3,11 @@ <img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" /> </a> </div> -<?php if(count($_["breadcrumb"])):?> - <div class="crumb svg" - data-dir='/'> +<div class="crumb svg" + data-dir='/'> <a href="<?php p($_['baseURL']); ?>"><?php p($l->t("Deleted Files")); ?></a> - </div> +</div> +<?php if(count($_["breadcrumb"])):?> <?php endif;?> <?php for($i=0; $i<count($_["breadcrumb"]); $i++): $crumb = $_["breadcrumb"][$i]; diff --git a/core/js/js.js b/core/js/js.js index 5442039c294..54b4d51a707 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); |