Use correct path and change position of usage bar
This commit is contained in:
parent
4fdf706ba6
commit
a5b38a8419
@ -44,15 +44,6 @@
|
|||||||
<span>{{ $t("sidebar.settings") }}</span>
|
<span>{{ $t("sidebar.settings") }}</span>
|
||||||
</button>
|
</button>
|
||||||
|
|
||||||
<div
|
|
||||||
v-if="$router.currentRoute.path.includes('/files/')"
|
|
||||||
style="padding: 0.5em 1.3em 0 1.3em"
|
|
||||||
>
|
|
||||||
<progress-bar :val="req.diskUsedPercent" :size="large"></progress-bar>
|
|
||||||
<br />
|
|
||||||
{{ req.freeDiskSpace }} free of {{ req.totalDiskSpace }}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<button
|
<button
|
||||||
v-if="authMethod == 'json'"
|
v-if="authMethod == 'json'"
|
||||||
@click="logout"
|
@click="logout"
|
||||||
@ -89,6 +80,16 @@
|
|||||||
</router-link>
|
</router-link>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
|
<div
|
||||||
|
class="credits"
|
||||||
|
v-if="$router.currentRoute.path.includes('/files/')"
|
||||||
|
style="width: 90%; margin: 0em 2.5em 3em 2.5em"
|
||||||
|
>
|
||||||
|
<progress-bar :val="req.diskUsedPercent" :size="large"></progress-bar>
|
||||||
|
<br />
|
||||||
|
{{ req.freeDiskSpace }} free of {{ req.totalDiskSpace }}
|
||||||
|
</div>
|
||||||
|
|
||||||
<p class="credits">
|
<p class="credits">
|
||||||
<span>
|
<span>
|
||||||
<span v-if="disableExternal">File Browser</span>
|
<span v-if="disableExternal">File Browser</span>
|
||||||
|
|||||||
@ -12,10 +12,9 @@ import (
|
|||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"code.cloudfoundry.org/bytefmt"
|
"code.cloudfoundry.org/bytefmt"
|
||||||
"github.com/filebrowser/filebrowser/v2/disk"
|
|
||||||
|
|
||||||
"github.com/spf13/afero"
|
"github.com/spf13/afero"
|
||||||
|
|
||||||
|
"github.com/filebrowser/filebrowser/v2/disk"
|
||||||
"github.com/filebrowser/filebrowser/v2/errors"
|
"github.com/filebrowser/filebrowser/v2/errors"
|
||||||
"github.com/filebrowser/filebrowser/v2/files"
|
"github.com/filebrowser/filebrowser/v2/files"
|
||||||
"github.com/filebrowser/filebrowser/v2/fileutils"
|
"github.com/filebrowser/filebrowser/v2/fileutils"
|
||||||
@ -32,7 +31,7 @@ var resourceGetHandler = withUser(func(w http.ResponseWriter, r *http.Request, d
|
|||||||
Content: true,
|
Content: true,
|
||||||
})
|
})
|
||||||
|
|
||||||
usage := disk.GetDiskUsage(d.server.Root)
|
usage := disk.GetDiskUsage(filepath.Dir(d.user.FullPath(r.URL.Path)))
|
||||||
file.DiskUsedPercent = fmt.Sprintf("%.2f", usage.UsedPercent)
|
file.DiskUsedPercent = fmt.Sprintf("%.2f", usage.UsedPercent)
|
||||||
file.TotalDiskSpace = bytefmt.ByteSize(usage.Total)
|
file.TotalDiskSpace = bytefmt.ByteSize(usage.Total)
|
||||||
file.FreeDiskSpace = bytefmt.ByteSize(usage.Free)
|
file.FreeDiskSpace = bytefmt.ByteSize(usage.Free)
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user