Add style to authorization page, clarify it, invert checkbox use.

300d6182 · iv · 8636f972 · 300d6182 · 300d6182 · 300d6182
Commit 300d6182 authored Feb 01, 2016 by iv
Hide whitespace changes
Inline Side-by-side

Showing with 64 additions and 23 deletions

flaskdav.py flaskdav.py +2 -1

static/style.css static/style.css +33 -0

templates/authorization_page.html templates/authorization_page.html +29 -22

No files found.
--- a/flaskdav.py
+++ b/flaskdav.py
@@ -178,6 +178,7 @@ class WebDAV(MethodView):
            data = render_template('get_collection.html', link_list=app.fs_handler.get_children(URI_BEGINNING_PATH['webdav'] + pathname))
        elif os.path.isfile(localpath):
            try:
+                #print(localpath + ': ' + mimetypes.guess_type(localpath))
                headers["Content-type"] = mimetypes.guess_type(localpath)[0]
                data_resource = app.fs_handler.get_data(URI_BEGINNING_PATH['webdav'] + pathname)
                if len(data_resource) > BUFFER_SIZE:
@@ -387,7 +388,7 @@ def authorize():
    if request.method == 'POST':
        response = make_response()
        debug(request.form.items())
-        if request.form.get('reset') == 'true':
+        if request.form.get('continue') != 'true':
            debug('old key was: ' + app.secret_key)
            generate_key()
            debug('new key is: ' + app.secret_key)

--- a/static/style.css
+++ b/static/style.css
+body {
+  font-family: 'Open Sans', Helvetica, Arial, sans-serif;
+  background: #BCC6CC;
+}
+
+.auth{
+  margin: auto;
+  padding: 2%;
+  width: 400px;
+  margin-top: 10%;
+  background: #FFFFFF;
+  border: solid;
+  border-radius: 20px;
+  border-color: #BCC6CC;
+  word-break: break-all;
+}
+
+h1, form {
+  text-align: center;
+  font-size: 100%;
+}
+
+p {
+  text-align: left;
+}
+
+.list {
+  font-size: small;
+}
+
+.hidden {
+  visibility: hidden;
+}
\ No newline at end of file
--- a/templates/authorization_page.html
+++ b/templates/authorization_page.html
-<div>Allow origin: {{ origin }} ? </div>
+<html>
+  <head>
+    <link href="/static/style.css" rel="stylesheet" type="text/css">
+  </head>
+  <body>
+    <div class="auth">
+      <h1>Allow applications from {{ origin }} to access the WebDAV (by setting a cookie)? </h1>

-<div>{% if back_url %}
-You will then be redirected to '{{ back_url }}'.
-{% else %}
-You will be redirected to the server's main page.
-{% endif %}</div>
+      <p>{% if back_url %}
+      You will then be redirected to '{{ back_url }}'.
+      {% endif %}</p>


-<div>
-{% if cookie_list %}
-List of cookies set for accepted origins until now:
-    <ul>
-        {% for cookie in cookie_list %}
-        <li> {{ cookie }} </li>
-        {% endfor %}
-    </ul>
-{% else %}
-No cookies are set.
-{% endif %}
-</div>
+      <div class="list">
+          {% if cookie_list %}
+          List of other authorized origins:
+              <ul>
+                  {% for cookie in cookie_list %}
+                  <li> {{ cookie }} </li>
+                  {% endfor %}
+              </ul>
+          {% else %}
+          No other origins are authorized to access the WebDAV server.
+          {% endif %}
+      </div>

-<form action="" method="post">
-    <input type="checkbox" name="reset" value="true"> Invalidate all previous cookies <br>
-    <button name="accept" value="ok">OK</button>
-</form>
+      <form action="" method="post">
+          <p class="cookie_reset {% if not cookie_list %}hidden{% endif %}"> <input type="checkbox" name="continue" value="true" checked> Continue allowing origins listed above </p>
+          <button name="accept" value="ok">Allow this app!</button>
+      </form>
+    </div>
+  </body>
+</html>
\ No newline at end of file