Congress restrictions.

7 files changed, 14 insertions, 35 deletions

diff --git a/talerbank/app/middleware.py b/talerbank/app/middleware.py
index eb34b96..1d549a9 100644
--- a/talerbank/app/middleware.py
+++ b/talerbank/app/middleware.py
@@ -75,7 +75,6 @@ class ExceptionMiddleware:
         # after the exception gets managed.
         self.render = {
             reverse("profile", urlconf=urls): "profile",
-            reverse("register", urlconf=urls): "index", 
             reverse("public-accounts", urlconf=urls): "index",
         }
 
diff --git a/talerbank/app/templates/account_disabled.html b/talerbank/app/templates/account_disabled.html
deleted file mode 100644
index c84351c..0000000
--- a/talerbank/app/templates/account_disabled.html
+++ /dev/null
@@ -1,16 +0,0 @@
-{% extends "base.html" %}
-
-{% block headermsg %}
-  <h1 class="nav">Account disabled<h1>
-{% endblock headermsg %}
-{% block content %}
-  <aside class="sidebar" id="left">
-  </aside>
-  <section id="main">
-    <article>
-      <h1>Account disabled</h1>
-      <p>{{ name }}, your account has been disabled, <a href="{% url("register") %}">register</a>
-          a new one!</p>
-    </article>
-  </section>
-{% endblock content %}
diff --git a/talerbank/app/templates/base.html b/talerbank/app/templates/base.html
index 2015cf5..baffa91 100644
--- a/talerbank/app/templates/base.html
+++ b/talerbank/app/templates/base.html
@@ -31,8 +31,13 @@
     <div class="demobar">
       <h1><span class="tt adorn-brackets">Taler Demo</span></h1>
       <h1><span class="it"><a href="{{ url('index') }}">Bank</a></span></h1>
-      <p>This part of the demo shows how a bank that supports Taler directly would work.  In addition to
-      using your own bank account, you can also see the transaction history of some <a href="{{ url('public-accounts') }}">Public Accounts</a>.</p>
+
+      <p>This part of the demo shows how a bank that supports Taler directly would work.</p>
+
+      <p style="background-color: coral;">Please note that this running version of the bank
+      has been <emph>especially</emph> tailored for the 36C3, where only authorized personnel
+      can login and let customers recharge their wallet against euro.  </p>
+
       <p>Other parts of the demo:</p>
       <ul>
         <li><a href="{{ env('TALER_ENV_URL_INTRO', '#') }}">Introduction</a></li>
diff --git a/talerbank/app/templates/login.html b/talerbank/app/templates/login.html
index 49cef61..cb96d0d 100644
--- a/talerbank/app/templates/login.html
+++ b/talerbank/app/templates/login.html
@@ -50,11 +50,6 @@
         </form>
       </div>
       <p>
-      If you are a new customer, please <a href="{{ url('register') }}">register</a>.
-      Registration is fast and free, and it gives you a registration bonus
-      of 100 {{ settings_value("TALER_CURRENCY") }}!
-      </p>
-      <p>
       To view transactions of public accounts,
       please <a href="{{ url('public-accounts') }}">click here</a>.
       </p>
diff --git a/talerbank/app/templates/register.html b/talerbank/app/templates/register.html
index 12b94cb..b2b53ca 100644
--- a/talerbank/app/templates/register.html
+++ b/talerbank/app/templates/register.html
@@ -49,9 +49,9 @@
         <h1>Registration form</h1>
         <form class="pure-form" method="post" action="{{ url('register') }}">
           <input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token }}" />
-          <input type="text" name="username" placeholder="username" autofocus />
-          <input type="password" name="password" placeholder="password" />
-          <input type="submit" value="Ok" class="pure-button pure-button-primary" />
+          <input disabled="disabled" type="text" name="username" placeholder="username" autofocus />
+          <input disabled="disabled" type="password" name="password" placeholder="password" />
+          <input disabled="disabled" type="submit" value="Ok" class="pure-button pure-button-primary" />
         </form>
       </div>
     </article>
diff --git a/talerbank/app/urls.py b/talerbank/app/urls.py
index 28230ed..1102fe3 100644
--- a/talerbank/app/urls.py
+++ b/talerbank/app/urls.py
@@ -36,7 +36,6 @@ urlpatterns = [
         name="login"
     ),
     path("logout/", views.logout_view, name="logout"),
-    path("accounts/register", views.register, name="register"),
     path("profile", views.profile_page, name="profile"),
     path("history", views.serve_history, name="history"),
     path("history-range", views.serve_history_range, name="history-range"),
@@ -51,12 +50,6 @@ urlpatterns = [
         views.withdraw_headless,
         name="withdraw-headless"
     ),
-    path(
-        "api/withdraw-headless-uri",
-        views.withdraw_headless_uri,
-        name="withdraw-headless-uri"
-    ),
-    path("api/register", views.register_headless, name="register-headless"),
     path("start-withdrawal", views.start_withdrawal, name="start-withdrawal"),
     path(
         "show-withdrawal/<str:withdraw_id>",
diff --git a/talerbank/settings.py b/talerbank/settings.py
index d50808b..2b84ab1 100644
--- a/talerbank/settings.py
+++ b/talerbank/settings.py
@@ -199,8 +199,11 @@ TALER_MAX_DEBT_BANK = TC.value_string(
 TALER_DIGITS = TC.value_int("bank", "NDIGITS", default=2)
 # Order matters
 TALER_PREDEFINED_ACCOUNTS = [
-    'Bank', 'Exchange', 'Tor', 'GNUnet', 'Taler', 'FSF', 'Tutorial', 'Survey'
+    'Bank', 'Exchange', 'Tor', 'GNUnet',
+    'Taler', 'FSF', 'cashier1', 'cashier2',
+    'cashier3'
 ]
+
 TALER_EXPECTS_DONATIONS = ['Tor', 'GNUnet', 'Taler', 'FSF']
 TALER_SUGGESTED_EXCHANGE = TC.value_string("bank", "suggested_exchange")
 TALER_SUGGESTED_EXCHANGE_PAYTO = TC.value_string(