using tabbed pane for the 3 different info parts on about, removed debugs, cleaned up ignore files to remove the new files for the about info

This commit is contained in:
2023-01-03 12:08:57 +11:00
parent 0684f4725a
commit fd4f9905e1
5 changed files with 32 additions and 25 deletions

View File

@@ -18,5 +18,6 @@ db-container
.dockerignore .dockerignore
Dockerfile Dockerfile
internal/git-log.txt internal/git-log.txt
internal/build-date.txt
internal/TODO internal/TODO
internal/BUGs internal/BUGs

5
.gitignore vendored
View File

@@ -3,8 +3,11 @@ photos/
storage/ storage/
images_to_process/ images_to_process/
DB_BACKUP/ DB_BACKUP/
internal/git-log.txt
internal/upstream internal/upstream
internal/git-log.txt
internal/build-date.txt
internal/TODO
internal/BUGs
static/ static/
.pa_metadata/ .pa_metadata/
.python/ .python/

4
TODO
View File

@@ -1,4 +1,4 @@
## GENERAL ### GENERAL
* after move, instead of back to home page, go to an ammended view of the thumbs to keep moving * after move, instead of back to home page, go to an ammended view of the thumbs to keep moving
* ignore face should ignore ALL matching faces (re: Declan) * ignore face should ignore ALL matching faces (re: Declan)
@@ -77,7 +77,7 @@
* real first-run, 'no or empty settings' -- need to think this through * real first-run, 'no or empty settings' -- need to think this through
## DB ### DB
* Dir can have date in the DB, so we can do Oldest/Newest dirs in Folder view * Dir can have date in the DB, so we can do Oldest/Newest dirs in Folder view
### BACKEND ### BACKEND

View File

@@ -178,7 +178,6 @@ def about():
with open( 'internal/BUGs', 'r' ) as fp: with open( 'internal/BUGs', 'r' ) as fp:
can_add=False can_add=False
for l in fp: for l in fp:
print(l)
if not l.startswith( 'BUG' ): if not l.startswith( 'BUG' ):
if can_add: if can_add:
b['str']=b['str']+'<br>'+l b['str']=b['str']+'<br>'+l

View File

@@ -10,27 +10,31 @@
{{build_info}} {{build_info}}
</div> </div>
</div> </div>
<h5><b> <nav>
Recent commits: <div class="nav nav-tabs" id="nav-tab" role="tablist">
</b></h5> <button class="nav-link active" id="nav-commits-tab" data-bs-toggle="tab" data-bs-target="#nav-commits" type="button" role="tab" aria-controls="nav-commits" aria-selected="true">Commits</button>
{% for c in commits %} <button class="nav-link" id="nav-bugs-tab" data-bs-toggle="tab" data-bs-target="#nav-bugs" type="button" role="tab" aria-controls="nav-bugs" aria-selected="false">Known Bugs</button>
<dl class="row"> <button class="nav-link" id="nav-todo-tab" data-bs-toggle="tab" data-bs-target="#nav-todo" type="button" role="tab" aria-controls="nav-todo" aria-selected="false">TODO</button>
<div class="dt col-3 bg-light">{{c.date}}</div> </div>
<div class="dd col-9 bg-light">{{c.str}}</div> </nav>
</dl> <div class="tab-content" id="nav-tabContent">
{% endfor %} <div class="tab-pane fade show active" id="nav-commits" role="tabpanel" aria-labelledby="nav-commits-tab">
<h5><b> {% for c in commits %}
Known Bugs: <dl class="row">
</b></h5> <div class="dt col-3 bg-light">{{c.date}}</div>
{% for b in bugs %} <div class="dd col-9 bg-light">{{c.str}}</div>
<dl class="row bg-light">{{b.str|safe}}</dl> </dl>
{% endfor %} {% endfor %}
<h5><b> </div>
TODO: <div class="tab-pane fade" id="nav-bugs" role="tabpanel" aria-labelledby="nav-bugs-tab">
</b></h5> {% for b in bugs %}
<pre> <dl class="row bg-light">{{b.str|safe}}</dl>
{{todo}} {% endfor %}
</pre> </div>
<div class="tab-pane fade" id="nav-todo" role="tabpanel" aria-labelledby="nav-todo-tab">
<pre>{{todo}}</pre>
</div>
</div>
</div class="container"> </div class="container">
{% endblock main_content %} {% endblock main_content %}