[taler-www] branch stable updated: simplify structure

[gnunet]

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

dold pushed a commit to branch stable
in repository www.

The following commit(s) were added to refs/heads/stable by this push:
     new 9a6e7c5  simplify structure
9a6e7c5 is described below

commit 9a6e7c57484e16bdd3f4aa917e6489048fb242d0
Author: Florian Dold <florian@dold.me>
AuthorDate: Thu May 6 16:01:32 2021 +0200

    simplify structure
---
 inc                                     |  2 +-
 make_site.py                            | 25 +------------------------
 {news => template/news}/2014-11.html.j2 |  0
 {news => template/news}/2014-12.html.j2 |  0
 {news => template/news}/2015-02.html.j2 |  0
 {news => template/news}/2015-11.html.j2 |  0
 {news => template/news}/2015-12.html.j2 |  0
 {news => template/news}/2016-06.html.j2 |  0
 {news => template/news}/2016-08.html.j2 |  0
 {news => template/news}/2016-09.html.j2 |  0
 {news => template/news}/2016-10.html.j2 |  0
 {news => template/news}/2016-12.html.j2 |  0
 {news => template/news}/2017-01.html.j2 |  0
 {news => template/news}/2017-02.html.j2 |  0
 {news => template/news}/2017-03.html.j2 |  0
 {news => template/news}/2017-04.html.j2 |  0
 {news => template/news}/2017-08.html.j2 |  0
 {news => template/news}/2017-10.html.j2 |  0
 {news => template/news}/2018-04.html.j2 |  0
 {news => template/news}/2019-12.html.j2 |  0
 {news => template/news}/2020-03.html.j2 |  0
 {news => template/news}/2020-04.html.j2 |  0
 {news => template/news}/2020-07.html.j2 |  0
 {news => template/news}/2020-09.html.j2 |  0
 {news => template/news}/2020-10.html.j2 |  0
 {news => template/news}/2020-11.html.j2 |  0
 {news => template/news}/2020-12.html.j2 |  0
 {news => template/news}/2021-01.html.j2 |  0
 {news => template/news}/2021-02.html.j2 |  0
 {news => template/news}/2021-03.html.j2 |  0
 {news => template/news}/index.html.j2   |  0
 31 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/inc b/inc
index 1e9e766..d92f6d3 160000
--- a/inc
+++ b/inc
@@ -1 +1 @@
-Subproject commit 1e9e7661a47f73d0cd2d8889d4d6e5f8f7eca09d
+Subproject commit d92f6d37ed9fc605b517aafe614618369209a665
diff --git a/make_site.py b/make_site.py
index 3397844..95a114d 100755
--- a/make_site.py
+++ b/make_site.py
@@ -29,36 +29,13 @@ env = 
jinja2.Environment(loader=jinja2.FileSystemLoader(str(PurePath(__file__).p
                          autoescape=False)
 env.newstyle_gettext = True
 
-if len(sys.argv) >= 2 and sys.argv[1] == "-vv":
-    DEBUG=1
-elif len(sys.argv) >= 2 and sys.argv[1] == "-vvv":
-    DEBUG=2
-elif len(sys.argv) >= 2 and sys.argv[1] == "-vvvv":
-    DEBUG=3
-else:
-    DEBUG=0
-
 def main():
-    x = gen_site(DEBUG)
+    x = gen_site(0)
     conf = x.load_config("www.yml")
     x.gen_abstract(conf, "newsposts", "abstract", "page", 1000)
     x.gen_newspost_content(conf, "newsposts", "content", "page", "en")
     x.gen_rss("inc", conf, env)
-    if DEBUG:
-        print("generating html from jinja2 templates...")
     x.run("template", conf, env)
-    if DEBUG >= 2:
-        print(Path.cwd())
-        _ = Path("rendered")
-        for child in _.iterdir():
-            print(child)
-    if DEBUG >= 2:
-        print(Path.cwd())
-    if DEBUG:
-        print("generating html from jinja2 news templates...")
-    x.run("news", conf, env)
-    if DEBUG:
-        print("copying directories...")
     x.copy_trees("static")
     x.copy_trees("dist")
 
diff --git a/news/2014-11.html.j2 b/template/news/2014-11.html.j2
similarity index 100%
rename from news/2014-11.html.j2
rename to template/news/2014-11.html.j2
diff --git a/news/2014-12.html.j2 b/template/news/2014-12.html.j2
similarity index 100%
rename from news/2014-12.html.j2
rename to template/news/2014-12.html.j2
diff --git a/news/2015-02.html.j2 b/template/news/2015-02.html.j2
similarity index 100%
rename from news/2015-02.html.j2
rename to template/news/2015-02.html.j2
diff --git a/news/2015-11.html.j2 b/template/news/2015-11.html.j2
similarity index 100%
rename from news/2015-11.html.j2
rename to template/news/2015-11.html.j2
diff --git a/news/2015-12.html.j2 b/template/news/2015-12.html.j2
similarity index 100%
rename from news/2015-12.html.j2
rename to template/news/2015-12.html.j2
diff --git a/news/2016-06.html.j2 b/template/news/2016-06.html.j2
similarity index 100%
rename from news/2016-06.html.j2
rename to template/news/2016-06.html.j2
diff --git a/news/2016-08.html.j2 b/template/news/2016-08.html.j2
similarity index 100%
rename from news/2016-08.html.j2
rename to template/news/2016-08.html.j2
diff --git a/news/2016-09.html.j2 b/template/news/2016-09.html.j2
similarity index 100%
rename from news/2016-09.html.j2
rename to template/news/2016-09.html.j2
diff --git a/news/2016-10.html.j2 b/template/news/2016-10.html.j2
similarity index 100%
rename from news/2016-10.html.j2
rename to template/news/2016-10.html.j2
diff --git a/news/2016-12.html.j2 b/template/news/2016-12.html.j2
similarity index 100%
rename from news/2016-12.html.j2
rename to template/news/2016-12.html.j2
diff --git a/news/2017-01.html.j2 b/template/news/2017-01.html.j2
similarity index 100%
rename from news/2017-01.html.j2
rename to template/news/2017-01.html.j2
diff --git a/news/2017-02.html.j2 b/template/news/2017-02.html.j2
similarity index 100%
rename from news/2017-02.html.j2
rename to template/news/2017-02.html.j2
diff --git a/news/2017-03.html.j2 b/template/news/2017-03.html.j2
similarity index 100%
rename from news/2017-03.html.j2
rename to template/news/2017-03.html.j2
diff --git a/news/2017-04.html.j2 b/template/news/2017-04.html.j2
similarity index 100%
rename from news/2017-04.html.j2
rename to template/news/2017-04.html.j2
diff --git a/news/2017-08.html.j2 b/template/news/2017-08.html.j2
similarity index 100%
rename from news/2017-08.html.j2
rename to template/news/2017-08.html.j2
diff --git a/news/2017-10.html.j2 b/template/news/2017-10.html.j2
similarity index 100%
rename from news/2017-10.html.j2
rename to template/news/2017-10.html.j2
diff --git a/news/2018-04.html.j2 b/template/news/2018-04.html.j2
similarity index 100%
rename from news/2018-04.html.j2
rename to template/news/2018-04.html.j2
diff --git a/news/2019-12.html.j2 b/template/news/2019-12.html.j2
similarity index 100%
rename from news/2019-12.html.j2
rename to template/news/2019-12.html.j2
diff --git a/news/2020-03.html.j2 b/template/news/2020-03.html.j2
similarity index 100%
rename from news/2020-03.html.j2
rename to template/news/2020-03.html.j2
diff --git a/news/2020-04.html.j2 b/template/news/2020-04.html.j2
similarity index 100%
rename from news/2020-04.html.j2
rename to template/news/2020-04.html.j2
diff --git a/news/2020-07.html.j2 b/template/news/2020-07.html.j2
similarity index 100%
rename from news/2020-07.html.j2
rename to template/news/2020-07.html.j2
diff --git a/news/2020-09.html.j2 b/template/news/2020-09.html.j2
similarity index 100%
rename from news/2020-09.html.j2
rename to template/news/2020-09.html.j2
diff --git a/news/2020-10.html.j2 b/template/news/2020-10.html.j2
similarity index 100%
rename from news/2020-10.html.j2
rename to template/news/2020-10.html.j2
diff --git a/news/2020-11.html.j2 b/template/news/2020-11.html.j2
similarity index 100%
rename from news/2020-11.html.j2
rename to template/news/2020-11.html.j2
diff --git a/news/2020-12.html.j2 b/template/news/2020-12.html.j2
similarity index 100%
rename from news/2020-12.html.j2
rename to template/news/2020-12.html.j2
diff --git a/news/2021-01.html.j2 b/template/news/2021-01.html.j2
similarity index 100%
rename from news/2021-01.html.j2
rename to template/news/2021-01.html.j2
diff --git a/news/2021-02.html.j2 b/template/news/2021-02.html.j2
similarity index 100%
rename from news/2021-02.html.j2
rename to template/news/2021-02.html.j2
diff --git a/news/2021-03.html.j2 b/template/news/2021-03.html.j2
similarity index 100%
rename from news/2021-03.html.j2
rename to template/news/2021-03.html.j2
diff --git a/news/index.html.j2 b/template/news/index.html.j2
similarity index 100%
rename from news/index.html.j2
rename to template/news/index.html.j2

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.