From 24747bbec39c6f72a4afd7c10326635f284ebc82 Mon Sep 17 00:00:00 2001
From: Slayr <sandra@145-137-39-10.wlan.hro.nl>
Date: Mon, 10 Feb 2020 12:03:52 +0100
Subject: [PATCH 1/4] change index

---
 templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/templates/index.html b/templates/index.html
index 55628bc..20d35a6 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -5,7 +5,7 @@
     <title>{{title}}</title>
 </head>
 <body>
-<h3>Results from query:<br/><code>{{query}}</code></h3>
+<h3>Resultsss from query:<br/><code>{{query}}</code></h3>
     <ul>
     {% for doc in documentslist %}
         <li><a href="./{{ doc['file'] }}">{{ doc['title'] }}</a>

From 1c5b9c4ac65fe70cb6633e8fa89e0aeb2775a3af Mon Sep 17 00:00:00 2001
From: "E.zn" <vo.ezn@pm.me>
Date: Mon, 24 Feb 2020 16:29:43 +0100
Subject: [PATCH 2/4] Missing backslash

---
 helper-upload_imgs_dir.sh | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/helper-upload_imgs_dir.sh b/helper-upload_imgs_dir.sh
index df57bdb..81b663e 100755
--- a/helper-upload_imgs_dir.sh
+++ b/helper-upload_imgs_dir.sh
@@ -11,7 +11,8 @@ python3 upload_imgs_dir.py \
 --language 'English' \
 --dir '/full/path/to/2020_bantayog/Folder name' \
 
-#--dry
+
+# --dry
 
 # Note:
 # * Add this values to you upload specific upload.
@@ -20,8 +21,3 @@ python3 upload_imgs_dir.py \
 # *  \ allow you to continue the command of a different line
 #
 # Get help:  python3 upload_imgs_dir.py --help
-
-
-
-
-

From e5bb20890ca205208da761f35910a75578d8888d Mon Sep 17 00:00:00 2001
From: Castro0o <andre@andrecastro>
Date: Wed, 4 Mar 2020 12:34:27 +0100
Subject: [PATCH 3/4] todos

---
 functions.py  | 2 +-
 query2html.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions.py b/functions.py
index ce6d4a2..e376e46 100644
--- a/functions.py
+++ b/functions.py
@@ -14,7 +14,7 @@ def pandoc(pwd, content, format_in, format_out):
 
     # tmp files
     mw_tmp_fn = os.path.join(pwd, '.mediawiki_content')
-    html_tmp_fn = os.path.join(pwd, '.html_content')  # TODO: join with pw
+    html_tmp_fn = os.path.join(pwd, '.html_content')
     for fn in [mw_tmp_fn, html_tmp_fn ]:
         if os.path.isfile(fn) is False:
             os.mknod(fn) # create them if not in dir
diff --git a/query2html.py b/query2html.py
index 457f5f5..d00dc70 100644
--- a/query2html.py
+++ b/query2html.py
@@ -25,6 +25,7 @@ p.add_argument("--order", "-o", metavar='',
                help='Order of sorting conditions. Should same amount as the --sort properties')
 p.add_argument('--limit', '-l', help='(optional) Limit the number of returned '
                                      'items')
+# TODO: GET limit to work.Perhaps with a site.raw_api method
 p.add_argument('--dry', '-d', action='store_true',
                help='dry-run: will only show the query but not run it')
 
@@ -118,7 +119,6 @@ for answer in site.ask(query):
         all_document_parts = ''  # Reset all_document_parts
 
         # add info to documentslist for index creation
-        # TODO: possibly needs to be a SortedDict
         documentslist.append({'file': htmlpage_fn,
                               'title': printout_dict.get('Title'),
                               'date': printout_dict.get('Date'),

From 9133512ec121a6e8f256ff5007bb647fb28f0838 Mon Sep 17 00:00:00 2001
From: Castro0o <andre@andrecastro>
Date: Wed, 25 Mar 2020 16:34:14 +0100
Subject: [PATCH 4/4] playing wiht Jinja

---
 query2html.py             |  5 +++++
 sandbox/jinja_tutorial.py | 15 +++++++++++++++
 templates/scatch.html     | 13 +++++++++++++
 3 files changed, 33 insertions(+)
 create mode 100644 sandbox/jinja_tutorial.py
 create mode 100644 templates/scatch.html

diff --git a/query2html.py b/query2html.py
index d00dc70..0d51119 100644
--- a/query2html.py
+++ b/query2html.py
@@ -96,6 +96,11 @@ for answer in site.ask(query):
     pagetext_html = pandoc(pwd=wd, content=pagetext, format_in='mediawiki', format_out='html')
     img_local = os.path.join(imgdir, img_info.get('filename'))
 
+    # Todo: Create list of all images from document
+    # TODO: join document_part + document
+    # TODO: look into the template structure of images : columns and rows
+
+
     # RENDER document part
     document_part_html = document_part_template.render(
         printout_dict=printout_dict,
diff --git a/sandbox/jinja_tutorial.py b/sandbox/jinja_tutorial.py
new file mode 100644
index 0000000..10eb21c
--- /dev/null
+++ b/sandbox/jinja_tutorial.py
@@ -0,0 +1,15 @@
+import os
+from jinja2 import Template
+
+wd = os.path.dirname(os.path.abspath(__file__))  # working directory
+
+# read template files
+with open(os.path.join(wd, '../templates/scatch.html')) as document_html:
+    template = Template(document_html.read())
+
+imgs_list = ['images/01.jpg', 'images/02.jpg', 'images/03.jpg']
+
+template_render = template.render(title=':) Hello Sandra',
+                                  imgs=imgs_list
+                                  )
+print(template_render)
\ No newline at end of file
diff --git a/templates/scatch.html b/templates/scatch.html
new file mode 100644
index 0000000..0ca2714
--- /dev/null
+++ b/templates/scatch.html
@@ -0,0 +1,13 @@
+<h1>{{ title|upper }}</h1>
+
+<div class="row">
+  <div class="column">
+
+    {% for img in imgs %}
+    <img src="{{img}}" style="width:100%">
+    {% endfor %}
+
+  </div>
+</div>
+
+{{imgs}}
\ No newline at end of file
