diff options
5 files changed, 13 insertions, 67 deletions
diff --git a/talerdonations/donations/templates/base.html b/talerdonations/donations/templates/base.html deleted file mode 100644 index 86f81a9..0000000 --- a/talerdonations/donations/templates/base.html +++ /dev/null @@ -1,55 +0,0 @@ -<!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/> ---> - -<html data-taler-nojs="true"> -<head> - <title>Taler Donation Demo</title> - <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='web-common/pure.css') }}" /> - <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='web-common/demo.css') }}" /> - <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='web-common/taler-fallback.css') }}" id="taler-presence-stylesheet" /> - {% block styles %}{% endblock %} - {% block scripts %}{% endblock %} -</head> - -<body> - <div class="demobar"> - <h1><span class="tt adorn-brackets">Taler Demo</span></h1> - <h1><span class="it"><a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS') }}">Donations</a></span></h1> - <p>This is the donation page, you can make donations (with an imaginary currency for now) to free software projects.</p> - <ul> - <li><a href="{{ env('TALER_ENV_URL_INTRO', '#') }}">Introduction</a></li> - <li><a href="{{ env('TALER_ENV_URL_BANK', '#') }}">Bank</a></li> - <li><a href="{{ env('TALER_ENV_URL_MERCHANT_BLOG', '#') }}">Essay Shop</a></li> - <li><a href="{{ env('TALER_ENV_URL_MERCHANT_DONATIONS', '#') }}">Donations</a></li> - <li><a href="{{ env('TALER_ENV_URL_MERCHANT_SURVEY', '#') }}">Tipping/Survey</a></li> - <li><a href="{{ env('TALER_ENV_URL_BACKOFFICE', '#') }}">Back-office</a></li> - </ul> - <p>You can learn more about Taler on our main <a href="https://taler.net">website</a>.</p> - </div> - - <section id="main" class="content"> - {% block main %} - This is the main content of the page. - {% endblock %} - <hr /> - <div class="copyright"> - <p>Copyright © 2014—2017 INRIA</p> - <a href="/javascript" data-jslicense="1" class="jslicenseinfo">JavaScript license information</a> - </div> - </section> -</body> -</html> diff --git a/talerdonations/donations/templates/checkout.html b/talerdonations/donations/templates/checkout.html index 5c3e116..9d6ead1 100644 --- a/talerdonations/donations/templates/checkout.html +++ b/talerdonations/donations/templates/checkout.html @@ -1,6 +1,6 @@ -{% extends "templates/base.html" %} +{% extends "static/web-common/templates/base.html" %} -{% block main %} +{% block page_content %} <article> <h1>Select your payment method</h1> @@ -56,4 +56,4 @@ </article> -{% endblock main %} +{% endblock %} diff --git a/talerdonations/donations/templates/error.html b/talerdonations/donations/templates/error.html index 0d4bd02..80becdf 100644 --- a/talerdonations/donations/templates/error.html +++ b/talerdonations/donations/templates/error.html @@ -1,5 +1,6 @@ -{% extends "templates/base.html" %} -{% block main %} +{% extends "static/web-common/templates/base.html" %} + +{% block page_content %} <h1>An Error Occurred</h1> <p>{{ message }}</p> @@ -19,4 +20,4 @@ {{ stack }} </pre> {% endif %} -{% endblock main %} +{% endblock %} diff --git a/talerdonations/donations/templates/fulfillment.html b/talerdonations/donations/templates/fulfillment.html index f128693..4bfa284 100644 --- a/talerdonations/donations/templates/fulfillment.html +++ b/talerdonations/donations/templates/fulfillment.html @@ -1,9 +1,9 @@ -{% extends "templates/base.html" %} +{% extends "static/web-common/templates/base.html" %} -{% block main %} +{% block page_content %} <h1>Donation Receipt</h1> <p> Thank you, <strong>{{ donation_donor }}</strong>, for donating <strong>{{ donation_amount }}</strong> to <strong>{{ donation_receiver }}</strong>.</p> <p>Please keep the order identifier <strong>{{ order_id }}</strong> as a receipt for your donation. You can show other people that you donated by sharing <a href={{ request.url }}>this link</a> with them.</p> -{% endblock main %} +{% endblock %} diff --git a/talerdonations/donations/templates/provider-not-supported.html b/talerdonations/donations/templates/provider-not-supported.html index e10d66a..a6bd13b 100644 --- a/talerdonations/donations/templates/provider-not-supported.html +++ b/talerdonations/donations/templates/provider-not-supported.html @@ -1,5 +1,5 @@ -{% extends "templates/base.html" %} +{% extends "static/web-common/templates/base.html" %} -{% block main %} +{% block page_content %} Unfortunately the selected payment provider is not supported in this demo. -{% endblock main %} +{% endblock %} |