From 36c7c277b2b9e508976b91129de05d6659986471 Mon Sep 17 00:00:00 2001
From: Doug Le Tough <doug.letough@free.fr>
Date: Sat, 2 Dec 2017 20:50:42 +0100
Subject: [PATCH] "Is there something new ?"

---
 tetawebapp/static/styles/tetawebapp.css |  6 +++
 tetawebapp/templates/ajax.html          | 50 ++++++++++++++-----------
 tetawebapp/templates/index.html         |  2 +-
 tetawebapp/templates/inputs.html        |  6 ++-
 tetawebapp/tetawebapp.py                |  6 +--
 5 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/tetawebapp/static/styles/tetawebapp.css b/tetawebapp/static/styles/tetawebapp.css
index fca02ad..2f57c9b 100644
--- a/tetawebapp/static/styles/tetawebapp.css
+++ b/tetawebapp/static/styles/tetawebapp.css
@@ -155,6 +155,12 @@ main > article > ol {
   text-justify: distribute;
 }
 
+main > hr {
+  border-color: var(--mid-bg);
+  border-style: solid;
+  border-width: 1px;
+}
+
 main > article > img {
   display:inline-block;
   border-color: var(--mid-bg);
diff --git a/tetawebapp/templates/ajax.html b/tetawebapp/templates/ajax.html
index 8bb03be..99d9fc1 100644
--- a/tetawebapp/templates/ajax.html
+++ b/tetawebapp/templates/ajax.html
@@ -1,14 +1,35 @@
 {% extends "index.html" %}
 {% block title %}Ajax{% endblock %}
       {% block main %}
-      <article class='left'>
-        <h3>Get HTML response from AJAX</h3>
-        <p>Click the refresh button to get the HTML response.</p>
-        <p>The response may randomly be a voluntary error so you should try it more than once.</p>
-        Refresh: <input type='button' class='refresh' value=' ' onclick='javascript:get_html_from_ajax(document.getElementById("html_container"), "/get_html_from_ajax");'>
-      </article>
-      <article class='right' id='html_container'>
-      </article>
+      <section class='inline'>
+        <article class='left'>
+          <h3>Get HTML response from AJAX</h3>
+          <p>Click the refresh button to get the HTML response.</p>
+          <p>The response may randomly be a voluntary error so you should try it more than once.</p>
+          Refresh: <input type='button' class='refresh' value=' '
+                          onclick='javascript:get_html_from_ajax(document.getElementById("html_container"), "/get_html_from_ajax");'>
+        </article>
+        <article class='right'>
+          <h3>Upload files with AJAX</h3>
+          <p>Select files to upload</p>
+          <p>The response may randomly be a voluntary error so you should try it more than once.</p>
+          Upload files: 
+          <div class='file_upload'>
+            <!--
+              Input file is a tricky hack (see tetawebapp.css and tetawebapp.js)
+            -->
+            <input type='button' id='upload_icon_1' class='upload' title='Upload' value=' '/>
+            <input type='file' id='upload_input_1' multiple
+                   title='Upload'
+                   onchange='javascript:upload_file_from_ajax(this, "/upload", "TETA_ERR");'
+                   onmouseover='javascript:lit(document.getElementById("upload_icon_1"));'
+                   onmouseout='javascript:unlit(document.getElementById("upload_icon_1"));'/>
+          </div>
+        </article>
+      </section>
+      <hr/>
+      <article class='right' id='html_container'></article>
+      <hr/>
       <section class='inline'>
         <article class='left'>
           <h3>Set value via AJAX</h3>
@@ -25,17 +46,4 @@
           <input type='button' value="Try me" onclick='javascript:get_value_from_ajax(document.getElementById("value_receiver"), "/get_value_from_ajax", "TETA_ERR");'>
         </article>
       </section>
-      <article class='left'>
-        <h3>Upload files with AJAX</h3>
-        <p>Select files to upload</p>
-        <p>The response may randomly be a voluntary error so you should try it more than once.</p>
-        Upload files: 
-        <div class='file_upload'>
-          <!--
-            Input file is a tricky hack (see tetawebapp.css and tetawebapp.js)
-          -->
-          <input type='button' id='upload_icon_1' class='upload' title='Upload' value=' '/>
-          <input type='file' id='upload_input_1' multiple title='Upload' value='' onchange='javascript:upload_file_from_ajax(this, "/upload", "TETA_ERR");' onmouseover='javascript:lit(document.getElementById("upload_icon_1"));' onmouseout='javascript:unlit(document.getElementById("upload_icon_1"));'/>
-        </div>
-      </article>
       {% endblock %}
diff --git a/tetawebapp/templates/index.html b/tetawebapp/templates/index.html
index b0ab984..ece493a 100644
--- a/tetawebapp/templates/index.html
+++ b/tetawebapp/templates/index.html
@@ -8,7 +8,7 @@
   <link rel="stylesheet" type="text/css" href="/static/styles/fonts.css" />
   <link rel="stylesheet" type="text/css" href="/static/styles/tetawebapp.css" />
   <link rel="icon" type="image/png" href="/static/images/favicon.png" />
-  <script type="text/javascript" src="/static/scripts/tetawebapp.js"></script>
+  <script src="/static/scripts/tetawebapp.js"></script>
 </head>
 {% block bodyheader %}
 <body>
diff --git a/tetawebapp/templates/inputs.html b/tetawebapp/templates/inputs.html
index cb9a8c8..66cedb1 100644
--- a/tetawebapp/templates/inputs.html
+++ b/tetawebapp/templates/inputs.html
@@ -33,7 +33,11 @@
         -->
         <div class='file_upload'>
           <input type='button' id='upload_icon_1' class='upload' title='Upload' value=' '/>
-          <input type='file' id='upload_input_1' name='files' multiple title='Upload' value='' onchange='javascript:upload_file_from_ajax(this, "/upload", "TETA_ERR");' onmouseover='javascript:lit(document.getElementById("upload_icon_1"));' onmouseout='javascript:unlit(document.getElementById("upload_icon_1"));'/>
+          <input type='file' id='upload_input_1' name='files' multiple
+                 title='Upload'
+                 onchange='javascript:upload_file_from_ajax(this, "/upload", "TETA_ERR");'
+                 onmouseover='javascript:lit(document.getElementById("upload_icon_1"));'
+                 onmouseout='javascript:unlit(document.getElementById("upload_icon_1"));'/>
         </div>
         <br/>
         <pre>
diff --git a/tetawebapp/tetawebapp.py b/tetawebapp/tetawebapp.py
index 4b24874..460e4a1 100755
--- a/tetawebapp/tetawebapp.py
+++ b/tetawebapp/tetawebapp.py
@@ -253,8 +253,8 @@ def set_value_from_ajax(value):
 @app.route("/upload", methods=['POST'])
 @check_session
 def upload():
-  """ Accept a value from an AJAX request
-      It may return an error code for testing purpose """
+  """ Save a file from AJAX request
+      Files are saved in UPLOADED_FILES_DEST (see config.local.py) """
   err_code = 'TETA_ERR'
   RND = int(random.random()*10)
   if RND % 2:
@@ -267,7 +267,7 @@ def upload():
   print "Uploaded files:"
   for f in uploaded_files:
     print '  [+] %s [%s]' % (f.filename, f.content_type)
-    # Befor saving you should:
+    # Before saving you should:
     # - Secure the filename
     # - Check file size
     # - Check content type