Merge branch 'master' of mara.ddp.net:photoassistant

.gitignore

@@ -1,2 +1,3 @@
 __pycache__/
-photos/
+photos/
+images_to_process/

templates/photos.html

@@ -3,9 +3,19 @@
 			<h3 class="offset-lg-2">{{page_title}} -- {{view_path}}</h3>
 			<div class="row">
 				<table class="table table table-sm col-xl-12">
-				<thead><tr><th>Name</th></tr></thead><tbody>
-					{% for obj in objects %}
-						<tr><td>{{obj.name}}</td></td></tr>
+				<thead><tr class="thead-light"><th>Name</th><th>Size</th><th>Hash</th></tr></thead><tbody>
+					{% for item in image_list %}
+						<tr><td>
+						{% if obj.type=="Directory" %}
+							<i class="fas fa-folder"></i>
+						{% elif obj.type=="Image" %}
+							<i class="fas fa-file-image"></i>
+						{% elif obj.type=="Video" %}
+							<i class="fas fa-file-video"></i>
+						{% else %}
+							<i class="fas fa-question-circle"></i>
+						{% endif %}
+						&nbsp;{{obj.name}}</td></td><td>{{obj.size}}</td><td>{{obj.hash}}</tr>
 					{% endfor %}
 				</tbody></table>
 			</div class="row">

templates/settings.html

@@ -2,8 +2,8 @@
 		<div class="container">
 			<h3 class="offset-lg-2">{{page_title}}</h3>
 			<div class="row">
-				<table class="table table table-sm col-xl-12">
-				<thead><tr><th>Name</th><th>Value</th></tr></thead><tbody>
+				<table id="settings_tbl" class="table table-sm">
+				<thead><tr class="thead-light"><th>Name</th><th>Value</th></tr></thead><tbody>
 					{% for obj in objects %}
 						<tr><td><a href="{{url_for('setting', id=obj.id)}}">{{obj.name}}</a></td><td>{{obj.value}}</td></tr>
 					{% endfor %}