[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-backoffice] branch master updated: transitioning tow
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-backoffice] branch master updated: transitioning towards talerbackoffice |
|
Date: |
Fri, 05 Jan 2018 11:15:52 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository backoffice.
The following commit(s) were added to refs/heads/master by this push:
new 3743b44 transitioning towards talerbackoffice
3743b44 is described below
commit 3743b44655dc77e80b29465f98963a8b03579358
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Jan 5 11:15:17 2018 +0100
transitioning towards talerbackoffice
---
.gitmodules | 2 +-
Makefile.in | 10 +-
blog.conf => backoffice.conf | 0
frontend-blog.wsgi.in => backoffice.wsgi.in | 0
...nt-blog.in => taler-merchant-backoffice-blog.in | 0
...og.in => taler-merchant-backoffice-donations.in | 0
{talerblog => talerbackoffice}/__init__.py | 0
.../backoffice}/__init__.py | 0
.../backoffice}/articles/COPYING | 0
.../backoffice}/articles/scrap1_1.html | 0
.../backoffice}/articles/scrap1_10.html | 0
.../backoffice}/articles/scrap1_11.html | 0
.../backoffice}/articles/scrap1_12.html | 0
.../backoffice}/articles/scrap1_13.html | 0
.../backoffice}/articles/scrap1_14.html | 0
.../backoffice}/articles/scrap1_15.html | 0
.../backoffice}/articles/scrap1_16.html | 0
.../backoffice}/articles/scrap1_17.html | 0
.../backoffice}/articles/scrap1_18.html | 0
.../backoffice}/articles/scrap1_19.html | 0
.../backoffice}/articles/scrap1_2.html | 0
.../backoffice}/articles/scrap1_20.html | 0
.../backoffice}/articles/scrap1_21.html | 0
.../backoffice}/articles/scrap1_22.html | 0
.../backoffice}/articles/scrap1_23.html | 0
.../backoffice}/articles/scrap1_24.html | 0
.../backoffice}/articles/scrap1_25.html | 0
.../backoffice}/articles/scrap1_26.html | 0
.../backoffice}/articles/scrap1_27.html | 0
.../backoffice}/articles/scrap1_28.html | 0
.../backoffice}/articles/scrap1_29.html | 0
.../backoffice}/articles/scrap1_3.html | 0
.../backoffice}/articles/scrap1_30.html | 0
.../backoffice}/articles/scrap1_31.html | 0
.../backoffice}/articles/scrap1_32.html | 0
.../backoffice}/articles/scrap1_33.html | 0
.../backoffice}/articles/scrap1_34.html | 0
.../backoffice}/articles/scrap1_35.html | 0
.../backoffice}/articles/scrap1_36.html | 0
.../backoffice}/articles/scrap1_37.html | 0
.../backoffice}/articles/scrap1_38.html | 0
.../backoffice}/articles/scrap1_39.html | 0
.../backoffice}/articles/scrap1_4.html | 0
.../backoffice}/articles/scrap1_40.html | 0
.../backoffice}/articles/scrap1_41.html | 0
.../backoffice}/articles/scrap1_42.html | 0
.../backoffice}/articles/scrap1_43.html | 0
.../backoffice}/articles/scrap1_46.html | 0
.../backoffice}/articles/scrap1_47.html | 0
.../backoffice}/articles/scrap1_5.html | 0
.../backoffice}/articles/scrap1_6.html | 0
.../backoffice}/articles/scrap1_7.html | 0
.../backoffice}/articles/scrap1_8.html | 0
.../backoffice}/articles/scrap1_9.html | 0
.../backoffice}/articles/scrap1_U.0.html | 0
.../backoffice}/articles/scrap1_U.1.html | 0
.../backoffice/backoffice.py | 0
.../backoffice}/data/README | 0
.../backoffice}/data/arabic.jpg | Bin
.../backoffice}/data/belarusian.jpg | Bin
.../backoffice}/data/bulgarian.jpg | Bin
.../backoffice}/data/category.jpg | Bin
.../backoffice}/data/category.png | Bin
.../backoffice}/data/chinese-simplified.jpg | Bin
.../backoffice}/data/chinese-traditional.jpg | Bin
.../backoffice}/data/code.jpg | Bin
.../backoffice}/data/example.jpg | Bin
.../backoffice}/data/farsi.jpg | Bin
.../backoffice}/data/greek.jpg | Bin
.../backoffice}/data/japanese-kana.jpg | Bin
.../backoffice}/data/japanese-kanji.jpg | Bin
.../backoffice}/data/korean.jpg | Bin
.../backoffice}/data/russian.jpg | Bin
.../backoffice}/data/serbian-croatian.jpg | Bin
.../data/song-book-jutta-scrunch-crop.jpg | Bin
.../backoffice}/data/tamil.jpg | Bin
.../backoffice}/data/ukrainian.jpg | Bin
.../backoffice}/static/web-common | 0
.../backoffice}/templates/backoffice.html | 0
.../backoffice}/templates/base.html | 0
.../backoffice}/templates/javascript.html | 0
{talerblog => talerbackoffice}/helpers.py | 0
{talerblog => talerbackoffice}/talerconfig.py | 0
{talerblog => talerbackoffice}/tests.conf | 0
{talerblog => talerbackoffice}/tests.py | 0
talerblog/blog/content.py | 132 ---------------------
talerblog/blog/templates/article_frame.html | 8 --
talerblog/blog/templates/article_refunded.html | 6 -
talerblog/blog/templates/cc-payment.html | 5 -
talerblog/blog/templates/fallback.html | 28 -----
talerblog/blog/templates/index.html | 94 ---------------
talerblog/blog/templates/purchase.html | 41 -------
92 files changed, 6 insertions(+), 320 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index 8a8b04d..be36d86 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "talerblog/blog/static/web-common"]
- path = talerblog/blog/static/web-common
+ path = talerbackoffice/backoffice/static/web-common
url = git://taler.net/web-common
diff --git a/Makefile.in b/Makefile.in
index b80131d..b0562d1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -4,14 +4,14 @@ INSTALL_DATA = $(INSTALL) -m 644
prefix = @prefix@
srcdir = @srcdir@
-script_templates = taler-merchant-blog frontend-blog.wsgi
+script_templates = taler-merchant-backoffice
templates = Makefile $(script_templates)
edit = sed -e 's|@address@hidden|$(prefix)|g'
.PHONY: all
all: $(templates)
- cd talerblog/blog/static/web-common && make && cd -
+ cd talerbackoffice/backoffice/static/web-common && make && cd -
Makefile: Makefile.in
./config.status $@
@@ -24,7 +24,7 @@ $(script_templates): %: Makefile %.in
.PHONY: install-data
install-data: $(templates)
- @$(INSTALL_DATA) -Dt $(prefix)/share/taler/ frontend-blog.wsgi
+ @$(INSTALL_DATA) -Dt $(prefix)/share/taler/ backoffice.wsgi
# @test -n "$$(ls -A talerbank/app/static/web-common/)" || \
# (echo "please check out git submodules"; exit 1)
@@ -43,10 +43,10 @@ install: $(templates) install-data
@pip3 install . --install-option="address@hidden@"
@# force update when sources changed
@pip3 install . --install-option="address@hidden@" --upgrade --no-deps
- cd talerblog/blog/static/web-common && make install && cd -
+ cd talerbackoffice/backoffice/static/web-common && make install && cd -
# run testcases
.PHONY: check
check:
- @export address@hidden@/talerblog/tests.conf; \
+ @export address@hidden@/talerbackoffice/tests.conf; \
python3 setup.py test
diff --git a/blog.conf b/backoffice.conf
similarity index 100%
rename from blog.conf
rename to backoffice.conf
diff --git a/frontend-blog.wsgi.in b/backoffice.wsgi.in
similarity index 100%
rename from frontend-blog.wsgi.in
rename to backoffice.wsgi.in
diff --git a/taler-merchant-blog.in b/taler-merchant-backoffice-blog.in
similarity index 100%
copy from taler-merchant-blog.in
copy to taler-merchant-backoffice-blog.in
diff --git a/taler-merchant-blog.in b/taler-merchant-backoffice-donations.in
similarity index 100%
rename from taler-merchant-blog.in
rename to taler-merchant-backoffice-donations.in
diff --git a/talerblog/__init__.py b/talerbackoffice/__init__.py
similarity index 100%
rename from talerblog/__init__.py
rename to talerbackoffice/__init__.py
diff --git a/talerblog/blog/__init__.py b/talerbackoffice/backoffice/__init__.py
similarity index 100%
rename from talerblog/blog/__init__.py
rename to talerbackoffice/backoffice/__init__.py
diff --git a/talerblog/blog/articles/COPYING
b/talerbackoffice/backoffice/articles/COPYING
similarity index 100%
rename from talerblog/blog/articles/COPYING
rename to talerbackoffice/backoffice/articles/COPYING
diff --git a/talerblog/blog/articles/scrap1_1.html
b/talerbackoffice/backoffice/articles/scrap1_1.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_1.html
rename to talerbackoffice/backoffice/articles/scrap1_1.html
diff --git a/talerblog/blog/articles/scrap1_10.html
b/talerbackoffice/backoffice/articles/scrap1_10.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_10.html
rename to talerbackoffice/backoffice/articles/scrap1_10.html
diff --git a/talerblog/blog/articles/scrap1_11.html
b/talerbackoffice/backoffice/articles/scrap1_11.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_11.html
rename to talerbackoffice/backoffice/articles/scrap1_11.html
diff --git a/talerblog/blog/articles/scrap1_12.html
b/talerbackoffice/backoffice/articles/scrap1_12.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_12.html
rename to talerbackoffice/backoffice/articles/scrap1_12.html
diff --git a/talerblog/blog/articles/scrap1_13.html
b/talerbackoffice/backoffice/articles/scrap1_13.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_13.html
rename to talerbackoffice/backoffice/articles/scrap1_13.html
diff --git a/talerblog/blog/articles/scrap1_14.html
b/talerbackoffice/backoffice/articles/scrap1_14.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_14.html
rename to talerbackoffice/backoffice/articles/scrap1_14.html
diff --git a/talerblog/blog/articles/scrap1_15.html
b/talerbackoffice/backoffice/articles/scrap1_15.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_15.html
rename to talerbackoffice/backoffice/articles/scrap1_15.html
diff --git a/talerblog/blog/articles/scrap1_16.html
b/talerbackoffice/backoffice/articles/scrap1_16.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_16.html
rename to talerbackoffice/backoffice/articles/scrap1_16.html
diff --git a/talerblog/blog/articles/scrap1_17.html
b/talerbackoffice/backoffice/articles/scrap1_17.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_17.html
rename to talerbackoffice/backoffice/articles/scrap1_17.html
diff --git a/talerblog/blog/articles/scrap1_18.html
b/talerbackoffice/backoffice/articles/scrap1_18.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_18.html
rename to talerbackoffice/backoffice/articles/scrap1_18.html
diff --git a/talerblog/blog/articles/scrap1_19.html
b/talerbackoffice/backoffice/articles/scrap1_19.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_19.html
rename to talerbackoffice/backoffice/articles/scrap1_19.html
diff --git a/talerblog/blog/articles/scrap1_2.html
b/talerbackoffice/backoffice/articles/scrap1_2.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_2.html
rename to talerbackoffice/backoffice/articles/scrap1_2.html
diff --git a/talerblog/blog/articles/scrap1_20.html
b/talerbackoffice/backoffice/articles/scrap1_20.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_20.html
rename to talerbackoffice/backoffice/articles/scrap1_20.html
diff --git a/talerblog/blog/articles/scrap1_21.html
b/talerbackoffice/backoffice/articles/scrap1_21.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_21.html
rename to talerbackoffice/backoffice/articles/scrap1_21.html
diff --git a/talerblog/blog/articles/scrap1_22.html
b/talerbackoffice/backoffice/articles/scrap1_22.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_22.html
rename to talerbackoffice/backoffice/articles/scrap1_22.html
diff --git a/talerblog/blog/articles/scrap1_23.html
b/talerbackoffice/backoffice/articles/scrap1_23.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_23.html
rename to talerbackoffice/backoffice/articles/scrap1_23.html
diff --git a/talerblog/blog/articles/scrap1_24.html
b/talerbackoffice/backoffice/articles/scrap1_24.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_24.html
rename to talerbackoffice/backoffice/articles/scrap1_24.html
diff --git a/talerblog/blog/articles/scrap1_25.html
b/talerbackoffice/backoffice/articles/scrap1_25.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_25.html
rename to talerbackoffice/backoffice/articles/scrap1_25.html
diff --git a/talerblog/blog/articles/scrap1_26.html
b/talerbackoffice/backoffice/articles/scrap1_26.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_26.html
rename to talerbackoffice/backoffice/articles/scrap1_26.html
diff --git a/talerblog/blog/articles/scrap1_27.html
b/talerbackoffice/backoffice/articles/scrap1_27.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_27.html
rename to talerbackoffice/backoffice/articles/scrap1_27.html
diff --git a/talerblog/blog/articles/scrap1_28.html
b/talerbackoffice/backoffice/articles/scrap1_28.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_28.html
rename to talerbackoffice/backoffice/articles/scrap1_28.html
diff --git a/talerblog/blog/articles/scrap1_29.html
b/talerbackoffice/backoffice/articles/scrap1_29.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_29.html
rename to talerbackoffice/backoffice/articles/scrap1_29.html
diff --git a/talerblog/blog/articles/scrap1_3.html
b/talerbackoffice/backoffice/articles/scrap1_3.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_3.html
rename to talerbackoffice/backoffice/articles/scrap1_3.html
diff --git a/talerblog/blog/articles/scrap1_30.html
b/talerbackoffice/backoffice/articles/scrap1_30.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_30.html
rename to talerbackoffice/backoffice/articles/scrap1_30.html
diff --git a/talerblog/blog/articles/scrap1_31.html
b/talerbackoffice/backoffice/articles/scrap1_31.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_31.html
rename to talerbackoffice/backoffice/articles/scrap1_31.html
diff --git a/talerblog/blog/articles/scrap1_32.html
b/talerbackoffice/backoffice/articles/scrap1_32.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_32.html
rename to talerbackoffice/backoffice/articles/scrap1_32.html
diff --git a/talerblog/blog/articles/scrap1_33.html
b/talerbackoffice/backoffice/articles/scrap1_33.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_33.html
rename to talerbackoffice/backoffice/articles/scrap1_33.html
diff --git a/talerblog/blog/articles/scrap1_34.html
b/talerbackoffice/backoffice/articles/scrap1_34.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_34.html
rename to talerbackoffice/backoffice/articles/scrap1_34.html
diff --git a/talerblog/blog/articles/scrap1_35.html
b/talerbackoffice/backoffice/articles/scrap1_35.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_35.html
rename to talerbackoffice/backoffice/articles/scrap1_35.html
diff --git a/talerblog/blog/articles/scrap1_36.html
b/talerbackoffice/backoffice/articles/scrap1_36.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_36.html
rename to talerbackoffice/backoffice/articles/scrap1_36.html
diff --git a/talerblog/blog/articles/scrap1_37.html
b/talerbackoffice/backoffice/articles/scrap1_37.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_37.html
rename to talerbackoffice/backoffice/articles/scrap1_37.html
diff --git a/talerblog/blog/articles/scrap1_38.html
b/talerbackoffice/backoffice/articles/scrap1_38.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_38.html
rename to talerbackoffice/backoffice/articles/scrap1_38.html
diff --git a/talerblog/blog/articles/scrap1_39.html
b/talerbackoffice/backoffice/articles/scrap1_39.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_39.html
rename to talerbackoffice/backoffice/articles/scrap1_39.html
diff --git a/talerblog/blog/articles/scrap1_4.html
b/talerbackoffice/backoffice/articles/scrap1_4.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_4.html
rename to talerbackoffice/backoffice/articles/scrap1_4.html
diff --git a/talerblog/blog/articles/scrap1_40.html
b/talerbackoffice/backoffice/articles/scrap1_40.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_40.html
rename to talerbackoffice/backoffice/articles/scrap1_40.html
diff --git a/talerblog/blog/articles/scrap1_41.html
b/talerbackoffice/backoffice/articles/scrap1_41.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_41.html
rename to talerbackoffice/backoffice/articles/scrap1_41.html
diff --git a/talerblog/blog/articles/scrap1_42.html
b/talerbackoffice/backoffice/articles/scrap1_42.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_42.html
rename to talerbackoffice/backoffice/articles/scrap1_42.html
diff --git a/talerblog/blog/articles/scrap1_43.html
b/talerbackoffice/backoffice/articles/scrap1_43.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_43.html
rename to talerbackoffice/backoffice/articles/scrap1_43.html
diff --git a/talerblog/blog/articles/scrap1_46.html
b/talerbackoffice/backoffice/articles/scrap1_46.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_46.html
rename to talerbackoffice/backoffice/articles/scrap1_46.html
diff --git a/talerblog/blog/articles/scrap1_47.html
b/talerbackoffice/backoffice/articles/scrap1_47.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_47.html
rename to talerbackoffice/backoffice/articles/scrap1_47.html
diff --git a/talerblog/blog/articles/scrap1_5.html
b/talerbackoffice/backoffice/articles/scrap1_5.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_5.html
rename to talerbackoffice/backoffice/articles/scrap1_5.html
diff --git a/talerblog/blog/articles/scrap1_6.html
b/talerbackoffice/backoffice/articles/scrap1_6.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_6.html
rename to talerbackoffice/backoffice/articles/scrap1_6.html
diff --git a/talerblog/blog/articles/scrap1_7.html
b/talerbackoffice/backoffice/articles/scrap1_7.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_7.html
rename to talerbackoffice/backoffice/articles/scrap1_7.html
diff --git a/talerblog/blog/articles/scrap1_8.html
b/talerbackoffice/backoffice/articles/scrap1_8.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_8.html
rename to talerbackoffice/backoffice/articles/scrap1_8.html
diff --git a/talerblog/blog/articles/scrap1_9.html
b/talerbackoffice/backoffice/articles/scrap1_9.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_9.html
rename to talerbackoffice/backoffice/articles/scrap1_9.html
diff --git a/talerblog/blog/articles/scrap1_U.0.html
b/talerbackoffice/backoffice/articles/scrap1_U.0.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_U.0.html
rename to talerbackoffice/backoffice/articles/scrap1_U.0.html
diff --git a/talerblog/blog/articles/scrap1_U.1.html
b/talerbackoffice/backoffice/articles/scrap1_U.1.html
similarity index 100%
rename from talerblog/blog/articles/scrap1_U.1.html
rename to talerbackoffice/backoffice/articles/scrap1_U.1.html
diff --git a/talerblog/blog/blog.py b/talerbackoffice/backoffice/backoffice.py
similarity index 100%
rename from talerblog/blog/blog.py
rename to talerbackoffice/backoffice/backoffice.py
diff --git a/talerblog/blog/data/README b/talerbackoffice/backoffice/data/README
similarity index 100%
rename from talerblog/blog/data/README
rename to talerbackoffice/backoffice/data/README
diff --git a/talerblog/blog/data/arabic.jpg
b/talerbackoffice/backoffice/data/arabic.jpg
similarity index 100%
rename from talerblog/blog/data/arabic.jpg
rename to talerbackoffice/backoffice/data/arabic.jpg
diff --git a/talerblog/blog/data/belarusian.jpg
b/talerbackoffice/backoffice/data/belarusian.jpg
similarity index 100%
rename from talerblog/blog/data/belarusian.jpg
rename to talerbackoffice/backoffice/data/belarusian.jpg
diff --git a/talerblog/blog/data/bulgarian.jpg
b/talerbackoffice/backoffice/data/bulgarian.jpg
similarity index 100%
rename from talerblog/blog/data/bulgarian.jpg
rename to talerbackoffice/backoffice/data/bulgarian.jpg
diff --git a/talerblog/blog/data/category.jpg
b/talerbackoffice/backoffice/data/category.jpg
similarity index 100%
rename from talerblog/blog/data/category.jpg
rename to talerbackoffice/backoffice/data/category.jpg
diff --git a/talerblog/blog/data/category.png
b/talerbackoffice/backoffice/data/category.png
similarity index 100%
rename from talerblog/blog/data/category.png
rename to talerbackoffice/backoffice/data/category.png
diff --git a/talerblog/blog/data/chinese-simplified.jpg
b/talerbackoffice/backoffice/data/chinese-simplified.jpg
similarity index 100%
rename from talerblog/blog/data/chinese-simplified.jpg
rename to talerbackoffice/backoffice/data/chinese-simplified.jpg
diff --git a/talerblog/blog/data/chinese-traditional.jpg
b/talerbackoffice/backoffice/data/chinese-traditional.jpg
similarity index 100%
rename from talerblog/blog/data/chinese-traditional.jpg
rename to talerbackoffice/backoffice/data/chinese-traditional.jpg
diff --git a/talerblog/blog/data/code.jpg
b/talerbackoffice/backoffice/data/code.jpg
similarity index 100%
rename from talerblog/blog/data/code.jpg
rename to talerbackoffice/backoffice/data/code.jpg
diff --git a/talerblog/blog/data/example.jpg
b/talerbackoffice/backoffice/data/example.jpg
similarity index 100%
rename from talerblog/blog/data/example.jpg
rename to talerbackoffice/backoffice/data/example.jpg
diff --git a/talerblog/blog/data/farsi.jpg
b/talerbackoffice/backoffice/data/farsi.jpg
similarity index 100%
rename from talerblog/blog/data/farsi.jpg
rename to talerbackoffice/backoffice/data/farsi.jpg
diff --git a/talerblog/blog/data/greek.jpg
b/talerbackoffice/backoffice/data/greek.jpg
similarity index 100%
rename from talerblog/blog/data/greek.jpg
rename to talerbackoffice/backoffice/data/greek.jpg
diff --git a/talerblog/blog/data/japanese-kana.jpg
b/talerbackoffice/backoffice/data/japanese-kana.jpg
similarity index 100%
rename from talerblog/blog/data/japanese-kana.jpg
rename to talerbackoffice/backoffice/data/japanese-kana.jpg
diff --git a/talerblog/blog/data/japanese-kanji.jpg
b/talerbackoffice/backoffice/data/japanese-kanji.jpg
similarity index 100%
rename from talerblog/blog/data/japanese-kanji.jpg
rename to talerbackoffice/backoffice/data/japanese-kanji.jpg
diff --git a/talerblog/blog/data/korean.jpg
b/talerbackoffice/backoffice/data/korean.jpg
similarity index 100%
rename from talerblog/blog/data/korean.jpg
rename to talerbackoffice/backoffice/data/korean.jpg
diff --git a/talerblog/blog/data/russian.jpg
b/talerbackoffice/backoffice/data/russian.jpg
similarity index 100%
rename from talerblog/blog/data/russian.jpg
rename to talerbackoffice/backoffice/data/russian.jpg
diff --git a/talerblog/blog/data/serbian-croatian.jpg
b/talerbackoffice/backoffice/data/serbian-croatian.jpg
similarity index 100%
rename from talerblog/blog/data/serbian-croatian.jpg
rename to talerbackoffice/backoffice/data/serbian-croatian.jpg
diff --git a/talerblog/blog/data/song-book-jutta-scrunch-crop.jpg
b/talerbackoffice/backoffice/data/song-book-jutta-scrunch-crop.jpg
similarity index 100%
rename from talerblog/blog/data/song-book-jutta-scrunch-crop.jpg
rename to talerbackoffice/backoffice/data/song-book-jutta-scrunch-crop.jpg
diff --git a/talerblog/blog/data/tamil.jpg
b/talerbackoffice/backoffice/data/tamil.jpg
similarity index 100%
rename from talerblog/blog/data/tamil.jpg
rename to talerbackoffice/backoffice/data/tamil.jpg
diff --git a/talerblog/blog/data/ukrainian.jpg
b/talerbackoffice/backoffice/data/ukrainian.jpg
similarity index 100%
rename from talerblog/blog/data/ukrainian.jpg
rename to talerbackoffice/backoffice/data/ukrainian.jpg
diff --git a/talerblog/blog/static/web-common
b/talerbackoffice/backoffice/static/web-common
similarity index 100%
rename from talerblog/blog/static/web-common
rename to talerbackoffice/backoffice/static/web-common
diff --git a/talerblog/blog/templates/backoffice.html
b/talerbackoffice/backoffice/templates/backoffice.html
similarity index 100%
rename from talerblog/blog/templates/backoffice.html
rename to talerbackoffice/backoffice/templates/backoffice.html
diff --git a/talerblog/blog/templates/base.html
b/talerbackoffice/backoffice/templates/base.html
similarity index 100%
rename from talerblog/blog/templates/base.html
rename to talerbackoffice/backoffice/templates/base.html
diff --git a/talerblog/blog/templates/javascript.html
b/talerbackoffice/backoffice/templates/javascript.html
similarity index 100%
rename from talerblog/blog/templates/javascript.html
rename to talerbackoffice/backoffice/templates/javascript.html
diff --git a/talerblog/helpers.py b/talerbackoffice/helpers.py
similarity index 100%
rename from talerblog/helpers.py
rename to talerbackoffice/helpers.py
diff --git a/talerblog/talerconfig.py b/talerbackoffice/talerconfig.py
similarity index 100%
rename from talerblog/talerconfig.py
rename to talerbackoffice/talerconfig.py
diff --git a/talerblog/tests.conf b/talerbackoffice/tests.conf
similarity index 100%
rename from talerblog/tests.conf
rename to talerbackoffice/tests.conf
diff --git a/talerblog/tests.py b/talerbackoffice/tests.py
similarity index 100%
rename from talerblog/tests.py
rename to talerbackoffice/tests.py
diff --git a/talerblog/blog/content.py b/talerblog/blog/content.py
deleted file mode 100644
index 1ddbf46..0000000
--- a/talerblog/blog/content.py
+++ /dev/null
@@ -1,132 +0,0 @@
-# This file is part of GNU TALER.
-# Copyright (C) 2014-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
-# GNU TALER; see the file COPYING. If not, see <http://www.gnu.org/licenses/>
-#
-# @author Florian Dold
-
-"""
-Define content and associated metadata that is served on the blog.
-"""
-
-from collections import OrderedDict, namedtuple
-import logging
-import os
-import re
-from bs4 import BeautifulSoup
-from pkg_resources import resource_stream, resource_filename
-
-LOGGER = logging.getLogger(__name__)
-
-Article = namedtuple("Article", "slug title teaser main_file extra_files")
-
-ARTICLES = OrderedDict()
-
-
-def add_article(slug, title, teaser, main_file, extra_files):
- ARTICLES[slug] = Article(slug, title, teaser, main_file, extra_files)
-
-
-def get_image_file(image):
- filex = resource_filename("talerblog", os.path.join("blog/data/", image))
- return os.path.abspath(filex)
-
-
-def get_article_file(article):
- filex = resource_filename("talerblog", article.main_file)
- return os.path.basename(filex)
-
-
-def add_from_html(resource_name, teaser_paragraph=0, title=None):
- """
- Extract information from article html.
- """
- res = resource_stream("talerblog", resource_name)
- soup = BeautifulSoup(res, 'html.parser')
- res.close()
- if title is None:
- title_el = soup.find("h1", attrs={"class":["chapter", "unnumbered"]})
- if title_el is None:
- LOGGER.warning("Can't extract title from '%s'", resource_name)
- title = resource_name
- else:
- title = title_el.get_text().strip()
- slug = title.replace(" ", "_")
- paragraphs = soup.find_all("p")
-
- teaser = soup.find("p", attrs={"id":["teaser"]})
- if teaser is None:
- teaser = str(paragraphs[teaser_paragraph])
- re_proc = re.compile("^/essay/[^/]+/data/[^/]+$")
- imgs = soup.find_all("img")
- extra_files = []
- for img in imgs:
- # We require that any image whose access is regulated is src'd
- # as "<slug>/data/img.png". We also need to check if the <slug>
- # component actually matches the article's slug
- if re_proc.match(img['src']):
- if img['src'].split(os.sep)[2] == slug:
- LOGGER.info("extra file for %s is %s" % (slug,
os.path.basename(img['src'])))
- extra_files.append(os.path.basename(img['src']))
- else:
- LOGGER.warning("Image src and slug don't match: '%s' != '%s'" \
- % (img['src'].split(os.sep)[2], slug))
- add_article(slug, title, teaser, resource_name, extra_files)
-
-
-add_from_html("blog/articles/scrap1_U.0.html", 0)
-add_from_html("blog/articles/scrap1_U.1.html", 0)
-add_from_html("blog/articles/scrap1_1.html", 1)
-add_from_html("blog/articles/scrap1_2.html")
-add_from_html("blog/articles/scrap1_3.html")
-add_from_html("blog/articles/scrap1_4.html")
-add_from_html("blog/articles/scrap1_5.html")
-add_from_html("blog/articles/scrap1_6.html")
-add_from_html("blog/articles/scrap1_7.html")
-add_from_html("blog/articles/scrap1_8.html")
-add_from_html("blog/articles/scrap1_9.html")
-add_from_html("blog/articles/scrap1_10.html")
-add_from_html("blog/articles/scrap1_11.html")
-add_from_html("blog/articles/scrap1_12.html")
-add_from_html("blog/articles/scrap1_13.html", 1)
-add_from_html("blog/articles/scrap1_14.html")
-add_from_html("blog/articles/scrap1_15.html")
-add_from_html("blog/articles/scrap1_16.html")
-add_from_html("blog/articles/scrap1_17.html")
-add_from_html("blog/articles/scrap1_18.html")
-add_from_html("blog/articles/scrap1_19.html")
-add_from_html("blog/articles/scrap1_20.html", 1)
-add_from_html("blog/articles/scrap1_21.html")
-add_from_html("blog/articles/scrap1_22.html")
-add_from_html("blog/articles/scrap1_23.html")
-add_from_html("blog/articles/scrap1_24.html")
-add_from_html("blog/articles/scrap1_25.html", 1)
-add_from_html("blog/articles/scrap1_26.html", 1)
-add_from_html("blog/articles/scrap1_27.html")
-add_from_html("blog/articles/scrap1_28.html", 1)
-add_from_html("blog/articles/scrap1_29.html")
-add_from_html("blog/articles/scrap1_30.html", 1)
-add_from_html("blog/articles/scrap1_31.html", 1)
-add_from_html("blog/articles/scrap1_32.html")
-add_from_html("blog/articles/scrap1_33.html")
-add_from_html("blog/articles/scrap1_34.html")
-add_from_html("blog/articles/scrap1_35.html")
-add_from_html("blog/articles/scrap1_36.html")
-add_from_html("blog/articles/scrap1_37.html")
-add_from_html("blog/articles/scrap1_38.html")
-add_from_html("blog/articles/scrap1_39.html")
-add_from_html("blog/articles/scrap1_40.html")
-add_from_html("blog/articles/scrap1_41.html")
-add_from_html("blog/articles/scrap1_42.html")
-add_from_html("blog/articles/scrap1_43.html", 2)
-add_from_html("blog/articles/scrap1_46.html", 1)
-add_from_html("blog/articles/scrap1_47.html")
diff --git a/talerblog/blog/templates/article_frame.html
b/talerblog/blog/templates/article_frame.html
deleted file mode 100644
index 50d58e2..0000000
--- a/talerblog/blog/templates/article_frame.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% extends "templates/base.html" %}
-{% block main %}
-{% include "articles/" + article_file %}
- <form action="/refund" method="POST">
- <input type="text" name="article_name" value={{ article_name}} hidden>
- <input type="submit" value="Ask refund!">
- </form>
-{% endblock main %}
diff --git a/talerblog/blog/templates/article_refunded.html
b/talerblog/blog/templates/article_refunded.html
deleted file mode 100644
index d6e49d7..0000000
--- a/talerblog/blog/templates/article_refunded.html
+++ /dev/null
@@ -1,6 +0,0 @@
-{% extends "templates/base.html" %}
-{% block main %}
- <h1>Article refunded</h1>
- Unfortunately you can't view the article {{ article_name }}, since the
- payment for it was refunded.
-{% endblock main %}
diff --git a/talerblog/blog/templates/cc-payment.html
b/talerblog/blog/templates/cc-payment.html
deleted file mode 100644
index b23b751..0000000
--- a/talerblog/blog/templates/cc-payment.html
+++ /dev/null
@@ -1,5 +0,0 @@
-{% extends "templates/base.html" %}
-
-{% block main %}
-Credit card payment declined.
-{% endblock main %}
diff --git a/talerblog/blog/templates/fallback.html
b/talerblog/blog/templates/fallback.html
deleted file mode 100644
index 8dc426b..0000000
--- a/talerblog/blog/templates/fallback.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% extends "templates/base.html" %}
-{% block main %}
-
-<p class="taler-installed-show">
-Payment is being processed. If nothing happens, please <a href="{{
request.path }}">click here</a>.
-</p>
-
-<div id="ccfakeform" class="taler-installed-hide">
- <p>
- Oops, it looks like you don't have a Taler wallet installed. Why don't
you enter
- all your credit card details before reading the article? <em>You can also
- use GNU Taler to complete the purchase at any time.</em>
- </p>
-
- <form>
- First name<br> <input type="text"><br>
- Family name<br> <input type="text"><br>
- Age<br> <input type="text"><br>
- Nationality<br> <input type="text"><br>
- Gender<br> <input type="radio" name"gender">Male</input>
- CC number<br> <input type="text"><br>
- <input type="radio" name="gender">Female<br>
- </form>
- <form method="get" action="/cc-payment/{{ article_name }}">
- <input type="submit"></input>
- </form>
-</div>
-{% endblock main %}
diff --git a/talerblog/blog/templates/index.html
b/talerblog/blog/templates/index.html
deleted file mode 100644
index 5d767ee..0000000
--- a/talerblog/blog/templates/index.html
+++ /dev/null
@@ -1,94 +0,0 @@
-{% extends "templates/base.html" %}
-{% block main %}
- <h1>About</h1>
- <p>This "blog" simulates how a website selling articles using
- Taler should work.
- We illustrate the use of Taler using articles from
- Richard Stallman's book "Free Software, Free Society",
- which is also
- <a
href="http://shop.fsf.org/product/free-software-free-society-2/";>published by
the FSF</a>
- and available gratis at <a href="http://www.gnu.org/";>gnu.org</a>.
- </p>
-
- <h2 class="taler-installed-hide">Taler wallet required for payment</h2>
-
- <p class="taler-installed-hide">
- This site requires a Taler wallet to pay for articles.
- Please visit our <a href="/landing">landing page</a>
- to install a wallet (and to withdraw digital coins).
- </p>
- <h2>Back-office interface</h2>
- <p>
- If you are a merchant and want to track your deposits, try the
- <a href="/backoffice">back-office</a>!
- </p>
-
- <h2>Free Software, Free Society</h2>
-
- <p>This is the second edition of <cite>Free Software, Free Society:
Selected Essays of Richard M. Stallman.</cite><br>
-Free Software Foundation<br>
-51 Franklin Street, Fifth Floor<br>
-Boston, MA 02110-1335
-<br>
-Copyright © 2002, 2010 Free Software Foundation, Inc.
-</p><blockquote><p>Verbatim copying and distribution of this entire book are
permitted
-worldwide, without royalty, in any medium, provided this notice is
-preserved. Permission is granted to copy and distribute translations
-of this book from the original English into another language provided
-the translation has been approved by the Free Software Foundation and
-the copyright notice and this permission notice are preserved on all
-copies.
-</p></blockquote>
-<p>ISBN 978-0-9831592-0-9
-<br>
-<br>
-</p>
-<p>
-<em>Richard Stallman is the prophet of the free software movement.
-He understood the dangers of software patents years ago. Now that
-this has become a crucial issue in the world, buy this book and read
-what he said.</em><br> —<strong>Tim Berners-Lee,</strong> inventor of
the World
-Wide Web
-<br>
-<br>
-<em>Richard Stallman is the philosopher king of software. He
-single-handedly ignited what has become a world-wide movement to
-create software that is Free, with a capital F. He has toiled for
-years at a project that many once considered a fool’s errand, and now
-that is widely seen as “inevitable.”</em><br>
—<strong>Simon L.
-Garfinkel,</strong> computer science author and columnist
-<br>
-<br>
-<em>By his hugely successful efforts to establish the idea of “Free
-Software,” Stallman has made a massive contribution to the human
-condition. His contribution combines elements that have technical,
-social, political, and economic consequences.</em><br> —<strong>Gerald
Jay
-Sussman,</strong> Matsushita Professor of Electrical Engineering, MIT
-<br>
-<br>
-<em>RMS is the leading philosopher of software. You may dislike
-some of his attitudes, but you cannot avoid his ideas. This slim
-volume will make those ideas readily accessible to those who are
-confused by the buzzwords of rampant commercialism. This book needs
-to be widely circulated and widely read.</em><br> —<strong>Peter
Salus,</strong>
-computer science writer, book reviewer, and UNIX historian
-<br>
-<br>
-<em>Richard is the leading force of the free software movement.
-This book is very important to spread the key concepts of free
-software world-wide, so everyone can understand it. Free software
-gives people freedom to use their creativity.</em><br> —<strong>Masayuki
-Ida,</strong> professor, Graduate School of International Management, Aoyama
-Gakuin University
-</p>
- <h2>Chapters</h2>
- <!-- TODO: show this section ONLY if Taler wallet is present! -->
- <ul style="list-style-type:none">
- {% for article in articles %}
- <h3><a href="{{ url_for("article", name=article.slug)
}}">{{article.title}}</a></h3>
- {{ article.teaser|safe }}
- {% else %}
- <em>(No articles available)</em>
- {% endfor %}
- </ul>
-{% endblock main %}
diff --git a/talerblog/blog/templates/purchase.html
b/talerblog/blog/templates/purchase.html
deleted file mode 100644
index d1baf38..0000000
--- a/talerblog/blog/templates/purchase.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{% extends "templates/base.html" %}
-
-{% block main %}
-<meta name="hc" value="{{ hc }}">
-<meta name="pay_url" value="{{ pay_url|safe }}">
-<meta name="offering_url" value="{{ offering_url|safe }}">
-<meta name="contract_url" value="{{ contract_url|safe }}">
-<meta name="no_contract" value="{{ no_contract }}">
-<div id="ccfakeform" class="fade">
- <p>
- Oops, it looks like you don't have a Taler wallet installed. Why don't you
enter
- all your credit card details before reading the article? <em>You can also
- use GNU Taler to complete the purchase at any time.</em>
- </p>
-
- <form>
- First name<br> <input type="text"></input><br>
- Family name<br> <input type="text"></input><br>
- Age<br> <input type="text"></input><br>
- Nationality<br> <input type="text"></input><br>
- Gender<br> <input type="radio" name"gender">Male</input>
- CC number<br> <input type="text"></input><br>
- <input type="radio" name="gender">Female</input><br>
- </form>
- <form method="get" action="/cc-payment/{{ article_name }}">
- <input type="submit"></input>
- </form>
-</div>
-
-<div id="talerwait">
- <em>Processing payment with GNU Taler, please wait <span
id="action-indicator"></span></em>
-</div>
-{% endblock main %}
-
-{% block body_prelude %}
- <script src="{{ url('/static/body-prelude.js') }}"
type="application/javascript"></script>
-{% endblock body_prelude %}
-
-{% block scripts %}
- <script src="{{ url('/static/purchase.js') }}"
type="application/javascript"></script>
-{% endblock scripts %}
--
To stop receiving notification emails like this one, please contact
address@hidden
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-backoffice] branch master updated: transitioning towards talerbackoffice,
gnunet <=