Skip to content

Commit

Permalink
Merge pull request #1946 from OnlineDynamic/filemanager-20240801
Browse files Browse the repository at this point in the history 
add file/directory count to file manager tabs display
  • Loading branch information
@OnlineDynamic
OnlineDynamic committed Sep 3, 2024
2 parents 29b9a97 + 2220817 commit 221052d
Show file tree
Hide file tree
Showing 2 changed files with 137 additions and 11 deletions.
145 changes: 134 additions & 11 deletions www/filemanager.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,19 @@

<div id="divSeq">
<div class="backdrop">
<div class="tableHeaderRow">
<h2> Sequence Files (.fseq) </h2>
<div class="row justify-content-between fileDetailsHeader">
<div class="col-auto">
<h2>Sequence Files (.fseq)</h2>
</div>
<div class="col-auto fileCountDetails">
<div class="row">
<div class="col-auto fileCountlabelHeading">Items</div>
<div class="col-auto fileCountlabelValue"><span id="fileCount_Sequences"
class='badge text-bg-secondary'>0</span></div>
</div>
</div>
</div>

<div id="divSeqData" class="fileManagerDivData">
<table id="tblSequences" class="tablesorter">
<thead>
Expand Down Expand Up @@ -251,7 +261,20 @@ class="disableButtons singleSequencesButton multiSequencesButton"
<div id="divMusic">

<div class="backdrop">
<h2> Music Files (.mp3/.ogg/.m4a/.flac/.aac/.wav/.m4p) </h2>
<div class="row justify-content-between fileDetailsHeader">
<div class="col-auto">
<h2>Music Files (.mp3/.ogg/.m4a/.flac/.aac/.wav/.m4p)</h2>
</div>
<div class="col-auto fileCountDetails">
<div class="row">
<div class="col-auto fileCountlabelHeading">Items</div>
<div class="col-auto fileCountlabelValue"><span id="fileCount_Music"
class='badge text-bg-secondary'>0</span></div>
</div>
</div>

</div>

<div id="divMusicData" class="fileManagerDivData">
<table id="tblMusic" class="tablesorter">
<thead>
Expand Down Expand Up @@ -300,7 +323,20 @@ class="disableButtons singleMusicButton multiMusicButton" type="button"
<div id="divVideo">

<div class="backdrop">
<h2> Video Files (.mp4/.mkv/.avi/.mpg/.mov) </h2>
<div class="row justify-content-between fileDetailsHeader">
<div class="col-auto">
<h2>Video Files (.mp4/.mkv/.avi/.mpg/.mov)</h2>
</div>
<div class="col-auto fileCountDetails">
<div class="row">
<div class="col-auto fileCountlabelHeading">Items</div>
<div class="col-auto fileCountlabelValue"><span id="fileCount_Videos"
class='badge text-bg-secondary'>0</span></div>
</div>
</div>

</div>

<div id="divVideoData" class="fileManagerDivData">
<table id="tblVideos" class="tablesorter">
<thead>
Expand Down Expand Up @@ -345,7 +381,20 @@ class="disableButtons singleVideosButton multiVideosButton" type="button"
<div id="divImage">

<div class="backdrop">
<h2> Images </h2>
<div class="row justify-content-between fileDetailsHeader">
<div class="col-auto">
<h2>Images</h2>
</div>
<div class="col-auto fileCountDetails">
<div class="row">
<div class="col-auto fileCountlabelHeading">Items</div>
<div class="col-auto fileCountlabelValue"><span id="fileCount_Images"
class='badge text-bg-secondary'>0</span></div>
</div>
</div>

</div>

<div id="divImagesData" class="fileManagerDivData">
<table id="tblImages" class="tablesorter">
<thead>
Expand Down Expand Up @@ -386,7 +435,20 @@ class="disableButtons singleImagesButton multiImagesButton" type="button"
<div id="divEffects">

<div class="backdrop">
<h2> Effect Sequences (.eseq) </h2>
<div class="row justify-content-between fileDetailsHeader">
<div class="col-auto">
<h2>Effect Sequences (.eseq)</h2>
</div>
<div class="col-auto fileCountDetails">
<div class="row">
<div class="col-auto fileCountlabelHeading">Items</div>
<div class="col-auto fileCountlabelValue"><span id="fileCount_Effects"
class='badge text-bg-secondary'>0</span></div>
</div>
</div>

</div>

<div id="divEffectsData" class="fileManagerDivData">
<table id="tblEffects" class="tablesorter">
<thead>
Expand Down Expand Up @@ -426,7 +488,20 @@ class="disableButtons singleEffectsButton multiEffectsButton" type="button"
<div class="tab-pane fade" id="tab-scripts" role="tabpanel" aria-labelledby="tab-scripts-tab">
<div id="divScripts">
<div class="backdrop">
<legend> Scripts (.sh/.pl/.pm/.php/.py)</legend>
<div class="row justify-content-between fileDetailsHeader">
<div class="col-auto">
<h2>Scripts (.sh/.pl/.pm/.php/.py)</h2>
</div>
<div class="col-auto fileCountDetails">
<div class="row">
<div class="col-auto fileCountlabelHeading">Items</div>
<div class="col-auto fileCountlabelValue"><span id="fileCount_Scripts"
class='badge text-bg-secondary'>0</span></div>
</div>
</div>

</div>

<div id="divScriptsData" class="fileManagerDivData">
<table id="tblScripts" class="tablesorter">
<thead>
Expand Down Expand Up @@ -477,7 +552,19 @@ class="disableButtons singleScriptsButton multiScriptsButton" type="button"
<div class="tab-pane fade" id="tab-logs" role="tabpanel" aria-labelledby="tab-logs-tab">
<div id="divLogs">
<div class="backdrop">
<legend> Log Files </legend>
<div class="row justify-content-between fileDetailsHeader">
<div class="col-auto">
<h2>Log Files</h2>
</div>
<div class="col-auto fileCountDetails">
<div class="row">
<div class="col-auto fileCountlabelHeading">Items</div>
<div class="col-auto fileCountlabelValue"><span id="fileCount_Logs"
class='badge text-bg-secondary'>0</span></div>
</div>
</div>

</div>
<div id="divLogsData" class="fileManagerDivData">
<table id="tblLogs" class="tablesorter">
<thead>
Expand Down Expand Up @@ -517,7 +604,19 @@ class="disableButtons singleLogsButton multiLogsButton" type="button"
<div class="tab-pane fade" id="tab-uploads" role="tabpanel" aria-labelledby="tab-uploads-tab">
<div id="divUploads">
<div class="backdrop">
<legend> Uploaded Files </legend>
<div class="row justify-content-between fileDetailsHeader">
<div class="col-auto">
<h2>Uploaded Files</h2>
</div>
<div class="col-auto fileCountDetails">
<div class="row">
<div class="col-auto fileCountlabelHeading">Items</div>
<div class="col-auto fileCountlabelValue"><span id="fileCount_Uploads"
class='badge text-bg-secondary'>0</span></div>
</div>
</div>

</div>
<div id="divUploadsData" class="fileManagerDivData">
<table id="tblUploads" class="tablesorter">
<thead>
Expand Down Expand Up @@ -554,7 +653,19 @@ class="disableButtons singleUploadsButton multiUploadsButton" type="button"
<div class="tab-pane fade" id="tab-crashes" role="tabpanel" aria-labelledby="tab-crashes-tab">
<div id="divCrashes">
<div class="backdrop">
<legend> Crash Reports </legend>
<div class="row justify-content-between fileDetailsHeader">
<div class="col-auto">
<h2>Crash Reports</h2>
</div>
<div class="col-auto fileCountDetails">
<div class="row">
<div class="col-auto fileCountlabelHeading">Items</div>
<div class="col-auto fileCountlabelValue"><span id="fileCount_Crashes"
class='badge text-bg-secondary'>0</span></div>
</div>
</div>

</div>
<div id="divCrashesData" class="fileManagerDivData">
<table id="tblCrashes" class="tablesorter">
<thead>
Expand Down Expand Up @@ -589,7 +700,19 @@ class="disableButtons singleCrashesButton multiCrashesButton" type="button"
<div class="tab-pane fade" id="tab-backups" role="tabpanel" aria-labelledby="tab-backups-tab">
<div id="divBackups">
<div class="backdrop">
<legend> Backup Files </legend>
<div class="row justify-content-between fileDetailsHeader">
<div class="col-auto">
<h2>Backup Files</h2>
</div>
<div class="col-auto fileCountDetails">
<div class="row">
<div class="col-auto fileCountlabelHeading">Items</div>
<div class="col-auto fileCountlabelValue"><span id="fileCount_Backups"
class='badge text-bg-secondary'>0</span></div>
</div>
</div>

</div>
<div id="divBackupsData" class="fileManagerDivData">
<table id="tblBackups" class="tablesorter">
<thead>
Expand Down
3 changes: 3 additions & 0 deletions www/js/fpp-filemanager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ function GetFiles (dir) {
},
complete: function () {
SetupTableSorter('tbl' + dir);
$('#fileCount_' + dir)[0].innerText = $('#tbl' + dir + ' tbody tr').not(
'.unselectableRow'
).length;
}
});
}
Expand Down

0 comments on commit 221052d

Please sign in to comment.