ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

about page now extends base (so has navbar -oops), and DEV finds last file change time

Browse Source
This commit is contained in:
Damien De Paoli
2022-12-31 15:54:25 +11:00
parent b952fe82f6
commit 7d7f76ba33
2 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
main.py
View File

@@ -6,6 +6,8 @@ from flask_marshmallow import Marshmallow
from flask_bootstrap import Bootstrap
from wtforms import SubmitField, StringField, HiddenField, SelectField, IntegerField, TextAreaField, validators
from flask_wtf import FlaskForm
import glob
from datetime import datetime
import os
import re
import socket
@@ -158,9 +160,15 @@ def about():
else:
o['str']=o['str']+l
except FileNotFoundError:
most_recent=0
for file in glob.glob("./*"):
timestamp = os.path.getctime(file)
if timestamp < most_recent:
continue
most_recent = timestamp
o={}
o['date']="No known date"
o['str']='No commits to display (if this is DEV then last build is now)'
o['str']=f'No commits to display (if this is DEV then last change was {datetime.fromtimestamp(most_recent).replace(microsecond=0)})'
# add last commit (or fake commit if no file)
commits.append(o)

29
templates/about.html
View File

@@ -1,27 +1,5 @@
<!DOCTYPE html>
<html lang="en">
<head>
<title>About Photo Assistant</title>
<!-- Required meta tags -->
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<meta name="description" content="Photo Assistant">
<!-- Bootstrap CSS -->
<link rel="stylesheet" href="{{ url_for( 'internal', filename='upstream/bootstrap-5.0.2-dist/css/bootstrap.min.css' ) }}">
<link rel="stylesheet" href="{{ url_for( 'internal', filename='upstream/jquery.contextMenu.css' ) }}">
<!-- code to get bootstrap to work -->
<script src="{{ url_for( 'internal', filename='upstream/jquery-3.6.0.min.js')}}"></script>
<script src="{{ url_for( 'internal', filename='upstream/bootstrap-5.0.2-dist/js/bootstrap.min.js')}}"></script>
<script src="{{ url_for( 'internal', filename='upstream/jquery.contextMenu.min.js')}}"></script>
<script src="{{ url_for( 'internal', filename='upstream/jquery.ui.position.min.js')}}"></script>
<link rel="shortcut icon" href="{{ url_for('internal', filename='favicon.ico') }}">
</head>
<body>
{% extends "base.html" %}
{% block main_content %}
<div class="container">
<div class="row px-3 my-5 offset-lg-3 col-lg-6 col-sm-12" style="border: 3px solid #5bc0de; border-radius: 15px;">
@@ -44,5 +22,4 @@
</div class="row">
</div class="container">
</body>
</html>
{% endblock main_content %}