mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb 

always show 'Deleted Files' breadcrumb
This commit is contained in:
Frank Karlitschek 2013-12-17 00:25:06 -08:00
parent 4ae148cebd 3e17fbe30d
commit 753525c57f
3 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
apps/files/templates/part.breadcrumb.php
View File

@ -1,10 +1,8 @@
<?php if(count($_["breadcrumb"])):?> <div class="crumb <?php if(!count($_["breadcrumb"])) p('last');?>" data-dir=''>
<div class="crumb" data-dir=''> <a href="<?php print_unescaped($_['baseURL']); ?>">
<a href="<?php print_unescaped($_['baseURL']); ?>"> <img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" /> </a>
</a> </div>
</div>
<?php endif;?>
<?php for($i=0; $i<count($_["breadcrumb"]); $i++): <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
$crumb = $_["breadcrumb"][$i]; $crumb = $_["breadcrumb"][$i];
$dir = \OCP\Util::encodePath($crumb["dir"]); ?> $dir = \OCP\Util::encodePath($crumb["dir"]); ?>

8
apps/files_trashbin/templates/part.breadcrumb.php
View File

@ -3,11 +3,11 @@
<img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" /> <img src="<?php print_unescaped(OCP\image_path('core', 'places/home.svg'));?>" class="svg" />
</a> </a>
</div> </div>
<?php if(count($_["breadcrumb"])):?> <div class="crumb svg"
<div class="crumb svg" data-dir='/'>
data-dir='/'>
<a href="<?php p($_['baseURL']); ?>"><?php p($l->t("Deleted Files")); ?></a> <a href="<?php p($_['baseURL']); ?>"><?php p($l->t("Deleted Files")); ?></a>
</div> </div>
<?php if(count($_["breadcrumb"])):?>
<?php endif;?> <?php endif;?>
<?php for($i=0; $i<count($_["breadcrumb"]); $i++): <?php for($i=0; $i<count($_["breadcrumb"]); $i++):
$crumb = $_["breadcrumb"][$i]; $crumb = $_["breadcrumb"][$i];

8
core/js/js.js
View File

@ -478,11 +478,11 @@ OC.Breadcrumb={
}, },
_show:function(container, dir, leafname, leaflink){ _show:function(container, dir, leafname, leaflink){
var self = this; var self = this;
this._clear(container); this._clear(container);
// show home + path in subdirectories // show home + path in subdirectories
if (dir && dir !== '/') { if (dir) {
//add home //add home
var link = OC.linkTo('files','index.php'); var link = OC.linkTo('files','index.php');
@ -509,7 +509,7 @@ OC.Breadcrumb={
} }
}); });
} }
//add leafname //add leafname
if (leafname && leaflink) { if (leafname && leaflink) {
this._push(container, leafname, leaflink); this._push(container, leafname, leaflink);