Skip to content

Keep navigation path visible on smaller screens #1414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TeaTinyTool wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Keep navigation path visible on smaller screens #1414

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 44 additions & 24 deletions tinyfilemanager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3745,32 +3745,30 @@ function fm_show_nav_path($path)
?>
<nav class="navbar navbar-expand-lg mb-4 main-nav <?php echo $isStickyNavBar ?> bg-body-tertiary" data-bs-theme="<?php echo FM_THEME; ?>">
<a class="navbar-brand"> <?php echo lng('AppTitle') ?> </a>
<?php
$path = fm_clean_path($path);
$root_url = "<a href='?p='><i class='fa fa-home' aria-hidden='true' title='" . FM_ROOT_PATH . "'></i></a>";
$sep = '<i class="bread-crumb"> / </i>';
if ($path != '') {
$exploded = explode('/', $path);
$count = count($exploded);
$array = array();
$parent = '';
for ($i = 0; $i < $count; $i++) {
$parent = trim($parent . '/' . $exploded[$i], '/');
$parent_enc = urlencode($parent);
$array[] = "<a href='?p={$parent_enc}'>" . fm_enc(fm_convert_win($exploded[$i])) . "</a>";
}
$root_url .= $sep . implode($sep, $array);
}
echo '<div class="navbar-path">' . $root_url . $editFile . '</div>';
?>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarSupportedContent">

<?php
$path = fm_clean_path($path);
$root_url = "<a href='?p='><i class='fa fa-home' aria-hidden='true' title='" . FM_ROOT_PATH . "'></i></a>";
$sep = '<i class="bread-crumb"> / </i>';
if ($path != '') {
$exploded = explode('/', $path);
$count = count($exploded);
$array = array();
$parent = '';
for ($i = 0; $i < $count; $i++) {
$parent = trim($parent . '/' . $exploded[$i], '/');
$parent_enc = urlencode($parent);
$array[] = "<a href='?p={$parent_enc}'>" . fm_enc(fm_convert_win($exploded[$i])) . "</a>";
}
$root_url .= $sep . implode($sep, $array);
}
echo '<div class="col-xs-6 col-sm-5">' . $root_url . $editFile . '</div>';
?>

<div class="col-xs-6 col-sm-7">
<ul class="navbar-nav justify-content-end" data-bs-theme="<?php echo FM_THEME; ?>">
<div class="navbar-path-mobile d-lg-none"><?php echo $root_url . $editFile; ?></div>
<ul class="navbar-nav justify-content-end" data-bs-theme="<?php echo FM_THEME; ?>">
<li class="nav-item mr-2">
<div class="input-group input-group-sm mr-1" style="margin-top:4px;">
<input type="text" class="form-control" placeholder="<?php echo lng('Search') ?>" aria-label="<?php echo lng('Search') ?>" aria-describedby="search-addon2" id="search-addon">
Expand Down Expand Up @@ -3814,8 +3812,7 @@ function fm_show_nav_path($path)
</li>
<?php endif; ?>
<?php endif; ?>
</ul>
</div>
</ul>
</div>
</nav>
<?php
Expand Down Expand Up @@ -4075,6 +4072,29 @@ function fm_show_header()
font-weight: bold;
}

.navbar-path {
flex: 1 1 0;
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}

.navbar-path-mobile {
width: 100%;
overflow-wrap: anywhere;
}

.main-nav .navbar-nav>.nav-item>.nav-link {
white-space: nowrap;
}

@media (min-width:992px) {
.main-nav .navbar-collapse {
flex: 0 0 auto;
}
}

.nav-item.avatar a {
cursor: pointer;
text-transform: capitalize;
Expand Down