gnunet-svn
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[GNUnet-SVN] [taler-bank] branch master updated: various fixes


From: gnunet
Subject: [GNUnet-SVN] [taler-bank] branch master updated: various fixes
Date: Tue, 14 Mar 2017 16:56:15 +0100

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 5ad6c1b  various fixes
5ad6c1b is described below

commit 5ad6c1bbcdf9fe508271f8a7ef7e19cedffd7acb
Author: Florian Dold <address@hidden>
AuthorDate: Tue Mar 14 16:56:13 2017 +0100

    various fixes
---
 talerbank/app/templates/account_disabled.html | 20 +-------------------
 talerbank/app/templates/login.html            |  2 +-
 talerbank/app/templates/profile_page.html     |  7 +++----
 talerbank/app/templates/public_accounts.html  |  7 +++----
 talerbank/app/urls.py                         |  2 +-
 5 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/talerbank/app/templates/account_disabled.html 
b/talerbank/app/templates/account_disabled.html
index d2ebfb4..c84351c 100644
--- a/talerbank/app/templates/account_disabled.html
+++ b/talerbank/app/templates/account_disabled.html
@@ -1,21 +1,3 @@
-<!DOCTYPE html>
-<!-- 
-  This file is part of GNU TALER.
-  Copyright (C) 2014, 2015, 2016 INRIA
-
-  TALER is free software; you can redistribute it and/or modify it under the
-  terms of the GNU Lesser General Public License as published by the Free 
Software
-  Foundation; either version 2.1, or (at your option) any later version.
-
-  TALER is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-  A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more 
details.
-
-  You should have received a copy of the GNU Lesser General Public License 
along with
-  TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
-
-  @author Marcello Stanisci
--->
 {% extends "base.html" %}
 
 {% block headermsg %}
@@ -27,7 +9,7 @@
   <section id="main">
     <article>
       <h1>Account disabled</h1>
-      <p>{{ name }}, your account has been disabled, <a href="{% url 
'register' %}">register</a>
+      <p>{{ name }}, your account has been disabled, <a href="{% 
url("register") %}">register</a>
           a new one!</p>
     </article>
   </section>
diff --git a/talerbank/app/templates/login.html 
b/talerbank/app/templates/login.html
index 99dff60..c86d4f0 100644
--- a/talerbank/app/templates/login.html
+++ b/talerbank/app/templates/login.html
@@ -1,3 +1,4 @@
+{% extends "base.html" %}
 {#
   This file is part of GNU TALER.
   Copyright (C) 2014, 2015, 2016 INRIA
@@ -16,7 +17,6 @@
   @author Marcello Stanisci
   @author Florian Dold
 #}
-{% extends "base.html" %}
 
 {% block headermsg %}
   <h1 class="nav">Welcome to the {{ settings_value("TALER_CURRENCY") }} 
Bank!</h1>
diff --git a/talerbank/app/templates/profile_page.html 
b/talerbank/app/templates/profile_page.html
index f82c399..8cf3643 100644
--- a/talerbank/app/templates/profile_page.html
+++ b/talerbank/app/templates/profile_page.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html>
-<!--
+{% extends "base.html" %}
+{#
   This file is part of GNU TALER.
   Copyright (C) 2014, 2015, 2016 INRIA
 
@@ -15,8 +15,7 @@
   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 
   @author Marcello Stanisci
--->
-{% extends "base.html" %}
+#}
 
 {% block head %}
   <meta name="currency" value="{{ currency }}">
diff --git a/talerbank/app/templates/public_accounts.html 
b/talerbank/app/templates/public_accounts.html
index e236115..2f38489 100644
--- a/talerbank/app/templates/public_accounts.html
+++ b/talerbank/app/templates/public_accounts.html
@@ -1,5 +1,5 @@
-<!DOCTYPE html>
-<!-- 
+{% extends "base.html" %}
+{#
   This file is part of GNU TALER.
   Copyright (C) 2014, 2015, 2016 INRIA
 
@@ -15,8 +15,7 @@
   TALER; see the file COPYING.  If not, see <http://www.gnu.org/licenses/>
 
   @author Marcello Stanisci
--->
-{% extends "base.html" %}
+#}
 
 {% block headermsg %}
   <h1 class="nav">History of public accounts</h1>
diff --git a/talerbank/app/urls.py b/talerbank/app/urls.py
index 752dd6a..3ab6485 100644
--- a/talerbank/app/urls.py
+++ b/talerbank/app/urls.py
@@ -22,7 +22,7 @@ urlpatterns = [
     url(r'^', include('talerbank.urls')),
     url(r'^$', RedirectView.as_view(pattern_name="profile"), name="index"),
     url(r'^favicon\.ico$', views.ignore),
-    url(r'^javascript(.html)?/$', views.javascript_licensing, 
name="javascript"),
+    url(r'^javascript(?:.html)?/$', views.javascript_licensing, 
name="javascript"),
     url(r'^login/$', views.login_view, name="login"),
     url(r'^logout/$', views.logout_view, name="logout"),
     url(r'^accounts/register/$', views.register, name="register"),

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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]