[GNUnet-SVN] [taler-bank] branch master updated: only use nojs-version

[gnunet]

This is an automated email from the git hooks/post-receive script.

dold pushed a commit to branch master
in repository bank.

The following commit(s) were added to refs/heads/master by this push:
     new 02a6594  only use nojs-version
02a6594 is described below

commit 02a6594f6dfc86a396ff775793968c27ecfec598
Author: Florian Dold <address@hidden>
AuthorDate: Wed Apr 26 03:32:16 2017 +0200

    only use nojs-version
---
 talerbank/app/static/web-common           |  2 +-
 talerbank/app/templates/profile_page.html | 22 +++-------------------
 talerbank/app/views.py                    | 10 +---------
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/talerbank/app/static/web-common b/talerbank/app/static/web-common
index d7e0135..6dd8ca1 160000
--- a/talerbank/app/static/web-common
+++ b/talerbank/app/static/web-common
@@ -1 +1 @@
-Subproject commit d7e013594d15388b1a7342a44a0e9c8d4ecca82d
+Subproject commit 6dd8ca1675817cc0ca65f0819489234eeafaa2ed
diff --git a/talerbank/app/templates/profile_page.html 
b/talerbank/app/templates/profile_page.html
index cc4b47d..2986b04 100644
--- a/talerbank/app/templates/profile_page.html
+++ b/talerbank/app/templates/profile_page.html
@@ -29,9 +29,6 @@
   {% endif %}
   <link rel="stylesheet" type="text/css" href="{{ 
static('disabled-button.css') }}">
   <script src="{{ static('chrome-store-link.js') }}" 
type="application/javascript"></script>
-  {% if use_js %}
-    <script src="{{ static('profile-page.js') }}" 
type="application/javascript"></script>
-  {% endif %}
 {% endblock head %}
 {% block headermsg %}
   <h1 class="nav">Welcome <em>{{ name }}</em>!</h1>
@@ -84,12 +81,8 @@
 
         <form id="reserve-form"
               class="pure-form"
-              {% if js == 'use_js' %}
-                action=""
-              {% else %}
-                action="{{ url('withdraw-nojs') }}"
-                method="post"
-              {% endif %}
+              action="{{ url('withdraw-nojs') }}"
+              method="post"
               name="tform">
           <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token 
}}">
           Amount to withdraw:
@@ -101,11 +94,7 @@
           </select>
           <input id="select-exchange"
                  class="taler-installed-show pure-button pure-button-primary"
-                 {% if use_js %}
-                   type="button"
-                 {% else %}
-                   type="submit"
-                 {% endif %}
+                 type="submit"
                  value="Select exchange provider"></input>
           <input class="taler-installed-hide pure-button pure-button-primary"
                  type="button"
@@ -114,11 +103,6 @@
         </form>
       </div>
       <p>
-      {% if use_js %}
-      You're using the JavaScript version of the bank.  You can <a href="{{ 
url('profile') }}?use_js=false">switch</a> to the JS-free version.
-      {% else %}
-      You're using the JavaScript-free version of the bank.  You can <a 
href="{{ url('profile') }}?use_js=true">switch</a> to the JS version.
-      {% endif %}
       </p>
     </article>
     <article>
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index 5959928..4c12ca2 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -92,13 +92,6 @@ def profile_page(request):
     user_account = BankAccount.objects.get(user=request.user)
     history = extract_history(user_account)
     reserve_pub = request.session.get("reserve_pub")
-    if "use_js" in request.GET:
-        print("use_js is in GET as '{}'".format(request.GET["use_js"]))
-        if request.GET["use_js"].lower() == "true":
-            request.session["use_js"] = True
-        else:
-            request.session["use_js"] = False
-    use_js = request.session.get("use_js", False)
 
     context = dict(
         name=user_account.user.username,
@@ -110,14 +103,13 @@ def profile_page(request):
         just_withdrawn=just_withdrawn,
         just_registered=just_registered,
         no_initial_bonus=no_initial_bonus,
-        use_js=use_js,
     )
     logger.info("Profile context: '%s'", json.dumps(context))
     if settings.TALER_SUGGESTED_EXCHANGE:
         context["suggested_exchange"] = settings.TALER_SUGGESTED_EXCHANGE
 
     response = render(request, "profile_page.html", context)
-    if just_withdrawn and not use_js:
+    if just_withdrawn:
        response["X-Taler-Operation"] = "confirm-reserve"
        response["X-Taler-Reserve-Pub"] = reserve_pub
        response.status_code = 202

-- 
To stop receiving notification emails like this one, please contact
address@hidden