Finalize porting built-in web app to Flask.

4 files changed, 15 insertions, 14 deletions

diff --git a/libpathod/templates/help.html b/libpathod/templates/help.html
index 3ab48c95..f5ac6796 100644
--- a/libpathod/templates/help.html
+++ b/libpathod/templates/help.html
@@ -1,4 +1,4 @@
-{% extends frame.html %}
+{% extends "frame.html" %}
 {% block body %}  
 <!-- Text below generated with "markdown2 README.mkd" -->
 
@@ -251,4 +251,4 @@ ascii
 bytes
 </code></pre>
 
-{% end %}  
+{% endblock %}  
diff --git a/libpathod/templates/log.html b/libpathod/templates/log.html
index e8bf113a..22747e0e 100644
--- a/libpathod/templates/log.html
+++ b/libpathod/templates/log.html
@@ -1,4 +1,4 @@
-{% extends frame.html %}
+{% extends "frame.html" %}
 {% block body %}  
     <form style="float: right" method="POST" action="/log/clear">
         <button type="submit" class="btn">clear</button> 
@@ -10,17 +10,19 @@
         <thead>
             <tr>
                 <th>id</th>
-                <th>url</th>
+                <th>method</th>
+                <th>path</th>
             </tr>
         </thead>
         <tbody>
             {% for i in log %}
                 <tr>
                     <td>{{ i["id"] }}</td>
-                    <td><a href="/log/{{ i["id"] }}">{{ i["request"]["full_url"] }}</a></td>
+                    <td>{{ i["request"]["method"] }}</td>
+                    <td><a href="/log/{{ i["id"] }}">{{ i["request"]["path"] }}</a></td>
                 </tr>
-            {% end %}
+            {% endfor %}
         </tbody>
     </table>
-{% end %}  
+{% endblock %}  
 
diff --git a/libpathod/templates/onelog.html b/libpathod/templates/onelog.html
index 378bac32..a94f443a 100644
--- a/libpathod/templates/onelog.html
+++ b/libpathod/templates/onelog.html
@@ -1,4 +1,4 @@
-{% extends frame.html %}
+{% extends "frame.html" %}
 {% block body %}  
     <h2> Log entry {{ lid }} </h2>
     <hr>
@@ -6,5 +6,5 @@
 {{ alog }}
 </pre>
 
-{% end %}  
+{% endblock %}  
 
diff --git a/libpathod/templates/preview.html b/libpathod/templates/preview.html
index 63960ebe..4b5182d7 100644
--- a/libpathod/templates/preview.html
+++ b/libpathod/templates/preview.html
@@ -1,4 +1,4 @@
-{% extends frame.html %}
+{% extends "frame.html" %}
 {% block body %}  
 
 <h1>Preview</h1>
@@ -10,7 +10,6 @@
     <h2> Error </h2>
     <p style="color: #ff0000">{{ error }}</p>
 {% else %}
-
     <h2>Spec:</h2>
 
     <pre>{{ spec }}</pre>
@@ -19,6 +18,6 @@
 
     <pre>{{ output }}</pre>
 
-{% end %}  
-{% include previewform.html %}
-{% end %}  
+{% endif %}  
+{% include "previewform.html" %}
+{% endblock %}