From 8c7dbc5a4a6f843ce62d9798e0e2e63bf230c2b7 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 22 Feb 2016 14:11:36 +0100 Subject: [PATCH] add support theme --- MANIFEST.in | 1 + prosopopee/prosopopee.py | 11 ++++++++++- .../themes}/material/static/LICENSE | 0 .../themes}/material/static/README.md | 0 .../material/static/css/baguetteBox.min.css | 0 .../themes}/material/static/css/fonts.css | 0 .../themes}/material/static/css/materialize.css | 0 .../material/static/css/panorama_viewer.css | 0 .../themes}/material/static/css/styles.css | 3 ++- .../themes}/material/static/fonts/LICENSE.txt | 0 .../static/fonts/Material-Design-Icons.eot | Bin .../static/fonts/Material-Design-Icons.svg | 0 .../static/fonts/Material-Design-Icons.ttf | Bin .../static/fonts/Material-Design-Icons.woff | Bin .../static/fonts/Material-Design-Icons.woff2 | Bin .../themes}/material/static/fonts/Roboto-Bold.eot | Bin .../themes}/material/static/fonts/Roboto-Bold.ttf | Bin .../material/static/fonts/Roboto-Bold.woff | Bin .../material/static/fonts/Roboto-Bold.woff2 | Bin .../material/static/fonts/Roboto-Light.eot | Bin .../material/static/fonts/Roboto-Light.ttf | Bin .../material/static/fonts/Roboto-Light.woff | Bin .../material/static/fonts/Roboto-Light.woff2 | Bin .../material/static/fonts/Roboto-Medium.eot | Bin .../material/static/fonts/Roboto-Medium.ttf | Bin .../material/static/fonts/Roboto-Medium.woff | Bin .../material/static/fonts/Roboto-Medium.woff2 | Bin .../material/static/fonts/Roboto-Regular.eot | Bin .../material/static/fonts/Roboto-Regular.ttf | Bin .../material/static/fonts/Roboto-Regular.woff | Bin .../material/static/fonts/Roboto-Regular.woff2 | Bin .../themes}/material/static/fonts/Roboto-Thin.eot | Bin .../themes}/material/static/fonts/Roboto-Thin.ttf | Bin .../material/static/fonts/Roboto-Thin.woff | Bin .../material/static/fonts/Roboto-Thin.woff2 | Bin .../static/fonts/crimsontext-bold-webfont.eot | Bin .../static/fonts/crimsontext-bold-webfont.svg | 0 .../static/fonts/crimsontext-bold-webfont.ttf | Bin .../static/fonts/crimsontext-bold-webfont.woff | Bin .../static/fonts/crimsontext-bold-webfont.woff2 | Bin .../fonts/crimsontext-bolditalic-webfont.eot | Bin .../fonts/crimsontext-bolditalic-webfont.svg | 0 .../fonts/crimsontext-bolditalic-webfont.ttf | Bin .../fonts/crimsontext-bolditalic-webfont.woff | Bin .../fonts/crimsontext-bolditalic-webfont.woff2 | Bin .../static/fonts/crimsontext-italic-webfont.eot | Bin .../static/fonts/crimsontext-italic-webfont.svg | 0 .../static/fonts/crimsontext-italic-webfont.ttf | Bin .../static/fonts/crimsontext-italic-webfont.woff | Bin .../static/fonts/crimsontext-italic-webfont.woff2 | Bin .../static/fonts/crimsontext-regular-webfont.eot | Bin .../static/fonts/crimsontext-regular-webfont.svg | 0 .../static/fonts/crimsontext-regular-webfont.ttf | Bin .../static/fonts/crimsontext-regular-webfont.woff | Bin .../fonts/crimsontext-regular-webfont.woff2 | Bin .../static/fonts/crimsontext-semibold-webfont.eot | Bin .../static/fonts/crimsontext-semibold-webfont.svg | 0 .../static/fonts/crimsontext-semibold-webfont.ttf | Bin .../fonts/crimsontext-semibold-webfont.woff | Bin .../fonts/crimsontext-semibold-webfont.woff2 | Bin .../fonts/crimsontext-semibolditalic-webfont.eot | Bin .../fonts/crimsontext-semibolditalic-webfont.svg | 0 .../fonts/crimsontext-semibolditalic-webfont.ttf | Bin .../fonts/crimsontext-semibolditalic-webfont.woff | Bin .../crimsontext-semibolditalic-webfont.woff2 | Bin .../static/fonts/montserrat-regular-webfont.eot | Bin .../static/fonts/montserrat-regular-webfont.svg | 0 .../static/fonts/montserrat-regular-webfont.ttf | Bin .../static/fonts/montserrat-regular-webfont.woff | Bin .../static/fonts/montserrat-regular-webfont.woff2 | Bin .../static/fonts/montserrat-semibold-webfont.eot | Bin .../static/fonts/montserrat-semibold-webfont.svg | 0 .../static/fonts/montserrat-semibold-webfont.ttf | Bin .../static/fonts/montserrat-semibold-webfont.woff | Bin .../fonts/montserrat-semibold-webfont.woff2 | Bin .../themes}/material/static/img/logo.svg | 0 .../themes}/material/static/js/baguetteBox.min.js | 0 .../material/static/js/jquery-2.1.4.min.js | 0 .../static/js/jquery.panorama_viewer.min.js | 0 .../themes}/material/static/js/materialize.min.js | 0 .../themes}/material/templates/.prosopopee_cache | 0 .../themes}/material/templates/1-small.png | Bin .../themes}/material/templates/1.png | Bin .../themes}/material/templates/2-small.png | Bin .../themes}/material/templates/2.png | Bin .../themes}/material/templates/base.html | 0 .../themes}/material/templates/example.html | 0 .../themes}/material/templates/footer.html | 0 .../themes}/material/templates/gallery-index.html | 0 .../themes}/material/templates/index.html | 0 .../themes}/material/templates/menu.html | 0 .../themes}/material/templates/page-example.html | 0 .../themes}/material/templates/page.html | 0 .../templates/sections/bordered-picture.html | 14 ++++++++++++++ .../material/templates/sections/full-picture.html | 3 ++- .../themes}/material/templates/sections/html.html | 0 .../material/templates/sections/panorama.html | 0 .../material/templates/sections/paragraph.html | 0 .../templates/sections/pictures-group.html | 7 ++++++- .../themes}/material/templates/sections/text.html | 0 setup.py | 2 +- .../templates/sections/bordered-picture.html | 7 ------- 102 files changed, 36 insertions(+), 12 deletions(-) rename {themes => prosopopee/themes}/material/static/LICENSE (100%) rename {themes => prosopopee/themes}/material/static/README.md (100%) rename {themes => prosopopee/themes}/material/static/css/baguetteBox.min.css (100%) rename {themes => prosopopee/themes}/material/static/css/fonts.css (100%) rename {themes => prosopopee/themes}/material/static/css/materialize.css (100%) rename {themes => prosopopee/themes}/material/static/css/panorama_viewer.css (100%) rename {themes => prosopopee/themes}/material/static/css/styles.css (88%) rename {themes => prosopopee/themes}/material/static/fonts/LICENSE.txt (100%) rename {themes => prosopopee/themes}/material/static/fonts/Material-Design-Icons.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/Material-Design-Icons.svg (100%) rename {themes => prosopopee/themes}/material/static/fonts/Material-Design-Icons.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/Material-Design-Icons.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/Material-Design-Icons.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Bold.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Bold.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Bold.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Bold.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Light.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Light.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Light.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Light.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Medium.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Medium.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Medium.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Medium.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Regular.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Regular.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Regular.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Regular.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Thin.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Thin.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Thin.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/Roboto-Thin.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-bold-webfont.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-bold-webfont.svg (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-bold-webfont.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-bold-webfont.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-bold-webfont.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-bolditalic-webfont.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-bolditalic-webfont.svg (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-bolditalic-webfont.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-bolditalic-webfont.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-bolditalic-webfont.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-italic-webfont.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-italic-webfont.svg (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-italic-webfont.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-italic-webfont.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-italic-webfont.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-regular-webfont.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-regular-webfont.svg (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-regular-webfont.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-regular-webfont.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-regular-webfont.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-semibold-webfont.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-semibold-webfont.svg (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-semibold-webfont.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-semibold-webfont.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-semibold-webfont.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-semibolditalic-webfont.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-semibolditalic-webfont.svg (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-semibolditalic-webfont.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-semibolditalic-webfont.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/crimsontext-semibolditalic-webfont.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/montserrat-regular-webfont.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/montserrat-regular-webfont.svg (100%) rename {themes => prosopopee/themes}/material/static/fonts/montserrat-regular-webfont.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/montserrat-regular-webfont.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/montserrat-regular-webfont.woff2 (100%) rename {themes => prosopopee/themes}/material/static/fonts/montserrat-semibold-webfont.eot (100%) rename {themes => prosopopee/themes}/material/static/fonts/montserrat-semibold-webfont.svg (100%) rename {themes => prosopopee/themes}/material/static/fonts/montserrat-semibold-webfont.ttf (100%) rename {themes => prosopopee/themes}/material/static/fonts/montserrat-semibold-webfont.woff (100%) rename {themes => prosopopee/themes}/material/static/fonts/montserrat-semibold-webfont.woff2 (100%) rename {themes => prosopopee/themes}/material/static/img/logo.svg (100%) rename {themes => prosopopee/themes}/material/static/js/baguetteBox.min.js (100%) rename {themes => prosopopee/themes}/material/static/js/jquery-2.1.4.min.js (100%) rename {themes => prosopopee/themes}/material/static/js/jquery.panorama_viewer.min.js (100%) rename {themes => prosopopee/themes}/material/static/js/materialize.min.js (100%) rename {themes => prosopopee/themes}/material/templates/.prosopopee_cache (100%) rename {themes => prosopopee/themes}/material/templates/1-small.png (100%) rename {themes => prosopopee/themes}/material/templates/1.png (100%) rename {themes => prosopopee/themes}/material/templates/2-small.png (100%) rename {themes => prosopopee/themes}/material/templates/2.png (100%) rename {themes => prosopopee/themes}/material/templates/base.html (100%) rename {themes => prosopopee/themes}/material/templates/example.html (100%) rename {themes => prosopopee/themes}/material/templates/footer.html (100%) rename {themes => prosopopee/themes}/material/templates/gallery-index.html (100%) rename {themes => prosopopee/themes}/material/templates/index.html (100%) rename {themes => prosopopee/themes}/material/templates/menu.html (100%) rename {themes => prosopopee/themes}/material/templates/page-example.html (100%) rename {themes => prosopopee/themes}/material/templates/page.html (100%) create mode 100644 prosopopee/themes/material/templates/sections/bordered-picture.html rename {themes => prosopopee/themes}/material/templates/sections/full-picture.html (69%) rename {themes => prosopopee/themes}/material/templates/sections/html.html (100%) rename {themes => prosopopee/themes}/material/templates/sections/panorama.html (100%) rename {themes => prosopopee/themes}/material/templates/sections/paragraph.html (100%) rename {themes => prosopopee/themes}/material/templates/sections/pictures-group.html (67%) rename {themes => prosopopee/themes}/material/templates/sections/text.html (100%) delete mode 100644 themes/material/templates/sections/bordered-picture.html diff --git a/MANIFEST.in b/MANIFEST.in index 747ba0e..3adf836 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,4 @@ recursive-include templates * recursive-include static * +recursive-include themes * include requirements.txt diff --git a/prosopopee/prosopopee.py b/prosopopee/prosopopee.py index 4dc876b..4021661 100644 --- a/prosopopee/prosopopee.py +++ b/prosopopee/prosopopee.py @@ -118,7 +118,16 @@ def main(): # XXX recursively merge directories if os.path.exists(os.path.join(os.getcwd(), "build", "static")): shutil.rmtree(os.path.join(os.getcwd(), "build", "static")) - if os.path.exists(os.path.join(os.getcwd(), "static")): + if settings.get("theme"): + if os.path.exists(os.path.join(os.getcwd(), "templates")): + shutil.rmtree(os.path.join(os.getcwd(), "templates")) + shutil.copytree(os.path.join(os.path.split(os.path.realpath(__file__))[0], "themes", settings.get("theme"), "static"), os.path.join(os.getcwd(), "build", "static")) + shutil.copytree(os.path.join(os.path.split(os.path.realpath(__file__))[0], "themes", settings.get("theme"), "templates"), os.path.join(os.getcwd(), "templates")) + templates = Environment(loader=FileSystemLoader([os.path.realpath(os.path.join(os.getcwd(), "templates")), os.path.join(os.path.split(os.path.realpath(__file__))[0], "templates")])) + index_template = templates.get_template("index.html") + gallery_index_template = templates.get_template("gallery-index.html") + page_template = templates.get_template("page.html") + elif os.path.exists(os.path.join(os.getcwd(), "static")): shutil.copytree(os.path.join(os.getcwd(), "static"), os.path.join(os.getcwd(), "build", "static")) else: shutil.copytree(os.path.join(os.path.split(os.path.realpath(__file__))[0], "static"), os.path.join(os.getcwd(), "build", "static")) diff --git a/themes/material/static/LICENSE b/prosopopee/themes/material/static/LICENSE similarity index 100% rename from themes/material/static/LICENSE rename to prosopopee/themes/material/static/LICENSE diff --git a/themes/material/static/README.md b/prosopopee/themes/material/static/README.md similarity index 100% rename from themes/material/static/README.md rename to prosopopee/themes/material/static/README.md diff --git a/themes/material/static/css/baguetteBox.min.css b/prosopopee/themes/material/static/css/baguetteBox.min.css similarity index 100% rename from themes/material/static/css/baguetteBox.min.css rename to prosopopee/themes/material/static/css/baguetteBox.min.css diff --git a/themes/material/static/css/fonts.css b/prosopopee/themes/material/static/css/fonts.css similarity index 100% rename from themes/material/static/css/fonts.css rename to prosopopee/themes/material/static/css/fonts.css diff --git a/themes/material/static/css/materialize.css b/prosopopee/themes/material/static/css/materialize.css similarity index 100% rename from themes/material/static/css/materialize.css rename to prosopopee/themes/material/static/css/materialize.css diff --git a/themes/material/static/css/panorama_viewer.css b/prosopopee/themes/material/static/css/panorama_viewer.css similarity index 100% rename from themes/material/static/css/panorama_viewer.css rename to prosopopee/themes/material/static/css/panorama_viewer.css diff --git a/themes/material/static/css/styles.css b/prosopopee/themes/material/static/css/styles.css similarity index 88% rename from themes/material/static/css/styles.css rename to prosopopee/themes/material/static/css/styles.css index cace9b7..1920adf 100644 --- a/themes/material/static/css/styles.css +++ b/prosopopee/themes/material/static/css/styles.css @@ -9,9 +9,10 @@ main { } .parallax-container { - height: 500px; + height: 800px; min-height: 250px; margin-bottom: 20px; + background-color: rgba(0, 0, 0, .4); } .parallax-container h1 { diff --git a/themes/material/static/fonts/LICENSE.txt b/prosopopee/themes/material/static/fonts/LICENSE.txt similarity index 100% rename from themes/material/static/fonts/LICENSE.txt rename to prosopopee/themes/material/static/fonts/LICENSE.txt diff --git a/themes/material/static/fonts/Material-Design-Icons.eot b/prosopopee/themes/material/static/fonts/Material-Design-Icons.eot similarity index 100% rename from themes/material/static/fonts/Material-Design-Icons.eot rename to prosopopee/themes/material/static/fonts/Material-Design-Icons.eot diff --git a/themes/material/static/fonts/Material-Design-Icons.svg b/prosopopee/themes/material/static/fonts/Material-Design-Icons.svg similarity index 100% rename from themes/material/static/fonts/Material-Design-Icons.svg rename to prosopopee/themes/material/static/fonts/Material-Design-Icons.svg diff --git a/themes/material/static/fonts/Material-Design-Icons.ttf b/prosopopee/themes/material/static/fonts/Material-Design-Icons.ttf similarity index 100% rename from themes/material/static/fonts/Material-Design-Icons.ttf rename to prosopopee/themes/material/static/fonts/Material-Design-Icons.ttf diff --git a/themes/material/static/fonts/Material-Design-Icons.woff b/prosopopee/themes/material/static/fonts/Material-Design-Icons.woff similarity index 100% rename from themes/material/static/fonts/Material-Design-Icons.woff rename to prosopopee/themes/material/static/fonts/Material-Design-Icons.woff diff --git a/themes/material/static/fonts/Material-Design-Icons.woff2 b/prosopopee/themes/material/static/fonts/Material-Design-Icons.woff2 similarity index 100% rename from themes/material/static/fonts/Material-Design-Icons.woff2 rename to prosopopee/themes/material/static/fonts/Material-Design-Icons.woff2 diff --git a/themes/material/static/fonts/Roboto-Bold.eot b/prosopopee/themes/material/static/fonts/Roboto-Bold.eot similarity index 100% rename from themes/material/static/fonts/Roboto-Bold.eot rename to prosopopee/themes/material/static/fonts/Roboto-Bold.eot diff --git a/themes/material/static/fonts/Roboto-Bold.ttf b/prosopopee/themes/material/static/fonts/Roboto-Bold.ttf similarity index 100% rename from themes/material/static/fonts/Roboto-Bold.ttf rename to prosopopee/themes/material/static/fonts/Roboto-Bold.ttf diff --git a/themes/material/static/fonts/Roboto-Bold.woff b/prosopopee/themes/material/static/fonts/Roboto-Bold.woff similarity index 100% rename from themes/material/static/fonts/Roboto-Bold.woff rename to prosopopee/themes/material/static/fonts/Roboto-Bold.woff diff --git a/themes/material/static/fonts/Roboto-Bold.woff2 b/prosopopee/themes/material/static/fonts/Roboto-Bold.woff2 similarity index 100% rename from themes/material/static/fonts/Roboto-Bold.woff2 rename to prosopopee/themes/material/static/fonts/Roboto-Bold.woff2 diff --git a/themes/material/static/fonts/Roboto-Light.eot b/prosopopee/themes/material/static/fonts/Roboto-Light.eot similarity index 100% rename from themes/material/static/fonts/Roboto-Light.eot rename to prosopopee/themes/material/static/fonts/Roboto-Light.eot diff --git a/themes/material/static/fonts/Roboto-Light.ttf b/prosopopee/themes/material/static/fonts/Roboto-Light.ttf similarity index 100% rename from themes/material/static/fonts/Roboto-Light.ttf rename to prosopopee/themes/material/static/fonts/Roboto-Light.ttf diff --git a/themes/material/static/fonts/Roboto-Light.woff b/prosopopee/themes/material/static/fonts/Roboto-Light.woff similarity index 100% rename from themes/material/static/fonts/Roboto-Light.woff rename to prosopopee/themes/material/static/fonts/Roboto-Light.woff diff --git a/themes/material/static/fonts/Roboto-Light.woff2 b/prosopopee/themes/material/static/fonts/Roboto-Light.woff2 similarity index 100% rename from themes/material/static/fonts/Roboto-Light.woff2 rename to prosopopee/themes/material/static/fonts/Roboto-Light.woff2 diff --git a/themes/material/static/fonts/Roboto-Medium.eot b/prosopopee/themes/material/static/fonts/Roboto-Medium.eot similarity index 100% rename from themes/material/static/fonts/Roboto-Medium.eot rename to prosopopee/themes/material/static/fonts/Roboto-Medium.eot diff --git a/themes/material/static/fonts/Roboto-Medium.ttf b/prosopopee/themes/material/static/fonts/Roboto-Medium.ttf similarity index 100% rename from themes/material/static/fonts/Roboto-Medium.ttf rename to prosopopee/themes/material/static/fonts/Roboto-Medium.ttf diff --git a/themes/material/static/fonts/Roboto-Medium.woff b/prosopopee/themes/material/static/fonts/Roboto-Medium.woff similarity index 100% rename from themes/material/static/fonts/Roboto-Medium.woff rename to prosopopee/themes/material/static/fonts/Roboto-Medium.woff diff --git a/themes/material/static/fonts/Roboto-Medium.woff2 b/prosopopee/themes/material/static/fonts/Roboto-Medium.woff2 similarity index 100% rename from themes/material/static/fonts/Roboto-Medium.woff2 rename to prosopopee/themes/material/static/fonts/Roboto-Medium.woff2 diff --git a/themes/material/static/fonts/Roboto-Regular.eot b/prosopopee/themes/material/static/fonts/Roboto-Regular.eot similarity index 100% rename from themes/material/static/fonts/Roboto-Regular.eot rename to prosopopee/themes/material/static/fonts/Roboto-Regular.eot diff --git a/themes/material/static/fonts/Roboto-Regular.ttf b/prosopopee/themes/material/static/fonts/Roboto-Regular.ttf similarity index 100% rename from themes/material/static/fonts/Roboto-Regular.ttf rename to prosopopee/themes/material/static/fonts/Roboto-Regular.ttf diff --git a/themes/material/static/fonts/Roboto-Regular.woff b/prosopopee/themes/material/static/fonts/Roboto-Regular.woff similarity index 100% rename from themes/material/static/fonts/Roboto-Regular.woff rename to prosopopee/themes/material/static/fonts/Roboto-Regular.woff diff --git a/themes/material/static/fonts/Roboto-Regular.woff2 b/prosopopee/themes/material/static/fonts/Roboto-Regular.woff2 similarity index 100% rename from themes/material/static/fonts/Roboto-Regular.woff2 rename to prosopopee/themes/material/static/fonts/Roboto-Regular.woff2 diff --git a/themes/material/static/fonts/Roboto-Thin.eot b/prosopopee/themes/material/static/fonts/Roboto-Thin.eot similarity index 100% rename from themes/material/static/fonts/Roboto-Thin.eot rename to prosopopee/themes/material/static/fonts/Roboto-Thin.eot diff --git a/themes/material/static/fonts/Roboto-Thin.ttf b/prosopopee/themes/material/static/fonts/Roboto-Thin.ttf similarity index 100% rename from themes/material/static/fonts/Roboto-Thin.ttf rename to prosopopee/themes/material/static/fonts/Roboto-Thin.ttf diff --git a/themes/material/static/fonts/Roboto-Thin.woff b/prosopopee/themes/material/static/fonts/Roboto-Thin.woff similarity index 100% rename from themes/material/static/fonts/Roboto-Thin.woff rename to prosopopee/themes/material/static/fonts/Roboto-Thin.woff diff --git a/themes/material/static/fonts/Roboto-Thin.woff2 b/prosopopee/themes/material/static/fonts/Roboto-Thin.woff2 similarity index 100% rename from themes/material/static/fonts/Roboto-Thin.woff2 rename to prosopopee/themes/material/static/fonts/Roboto-Thin.woff2 diff --git a/themes/material/static/fonts/crimsontext-bold-webfont.eot b/prosopopee/themes/material/static/fonts/crimsontext-bold-webfont.eot similarity index 100% rename from themes/material/static/fonts/crimsontext-bold-webfont.eot rename to prosopopee/themes/material/static/fonts/crimsontext-bold-webfont.eot diff --git a/themes/material/static/fonts/crimsontext-bold-webfont.svg b/prosopopee/themes/material/static/fonts/crimsontext-bold-webfont.svg similarity index 100% rename from themes/material/static/fonts/crimsontext-bold-webfont.svg rename to prosopopee/themes/material/static/fonts/crimsontext-bold-webfont.svg diff --git a/themes/material/static/fonts/crimsontext-bold-webfont.ttf b/prosopopee/themes/material/static/fonts/crimsontext-bold-webfont.ttf similarity index 100% rename from themes/material/static/fonts/crimsontext-bold-webfont.ttf rename to prosopopee/themes/material/static/fonts/crimsontext-bold-webfont.ttf diff --git a/themes/material/static/fonts/crimsontext-bold-webfont.woff b/prosopopee/themes/material/static/fonts/crimsontext-bold-webfont.woff similarity index 100% rename from themes/material/static/fonts/crimsontext-bold-webfont.woff rename to prosopopee/themes/material/static/fonts/crimsontext-bold-webfont.woff diff --git a/themes/material/static/fonts/crimsontext-bold-webfont.woff2 b/prosopopee/themes/material/static/fonts/crimsontext-bold-webfont.woff2 similarity index 100% rename from themes/material/static/fonts/crimsontext-bold-webfont.woff2 rename to prosopopee/themes/material/static/fonts/crimsontext-bold-webfont.woff2 diff --git a/themes/material/static/fonts/crimsontext-bolditalic-webfont.eot b/prosopopee/themes/material/static/fonts/crimsontext-bolditalic-webfont.eot similarity index 100% rename from themes/material/static/fonts/crimsontext-bolditalic-webfont.eot rename to prosopopee/themes/material/static/fonts/crimsontext-bolditalic-webfont.eot diff --git a/themes/material/static/fonts/crimsontext-bolditalic-webfont.svg b/prosopopee/themes/material/static/fonts/crimsontext-bolditalic-webfont.svg similarity index 100% rename from themes/material/static/fonts/crimsontext-bolditalic-webfont.svg rename to prosopopee/themes/material/static/fonts/crimsontext-bolditalic-webfont.svg diff --git a/themes/material/static/fonts/crimsontext-bolditalic-webfont.ttf b/prosopopee/themes/material/static/fonts/crimsontext-bolditalic-webfont.ttf similarity index 100% rename from themes/material/static/fonts/crimsontext-bolditalic-webfont.ttf rename to prosopopee/themes/material/static/fonts/crimsontext-bolditalic-webfont.ttf diff --git a/themes/material/static/fonts/crimsontext-bolditalic-webfont.woff b/prosopopee/themes/material/static/fonts/crimsontext-bolditalic-webfont.woff similarity index 100% rename from themes/material/static/fonts/crimsontext-bolditalic-webfont.woff rename to prosopopee/themes/material/static/fonts/crimsontext-bolditalic-webfont.woff diff --git a/themes/material/static/fonts/crimsontext-bolditalic-webfont.woff2 b/prosopopee/themes/material/static/fonts/crimsontext-bolditalic-webfont.woff2 similarity index 100% rename from themes/material/static/fonts/crimsontext-bolditalic-webfont.woff2 rename to prosopopee/themes/material/static/fonts/crimsontext-bolditalic-webfont.woff2 diff --git a/themes/material/static/fonts/crimsontext-italic-webfont.eot b/prosopopee/themes/material/static/fonts/crimsontext-italic-webfont.eot similarity index 100% rename from themes/material/static/fonts/crimsontext-italic-webfont.eot rename to prosopopee/themes/material/static/fonts/crimsontext-italic-webfont.eot diff --git a/themes/material/static/fonts/crimsontext-italic-webfont.svg b/prosopopee/themes/material/static/fonts/crimsontext-italic-webfont.svg similarity index 100% rename from themes/material/static/fonts/crimsontext-italic-webfont.svg rename to prosopopee/themes/material/static/fonts/crimsontext-italic-webfont.svg diff --git a/themes/material/static/fonts/crimsontext-italic-webfont.ttf b/prosopopee/themes/material/static/fonts/crimsontext-italic-webfont.ttf similarity index 100% rename from themes/material/static/fonts/crimsontext-italic-webfont.ttf rename to prosopopee/themes/material/static/fonts/crimsontext-italic-webfont.ttf diff --git a/themes/material/static/fonts/crimsontext-italic-webfont.woff b/prosopopee/themes/material/static/fonts/crimsontext-italic-webfont.woff similarity index 100% rename from themes/material/static/fonts/crimsontext-italic-webfont.woff rename to prosopopee/themes/material/static/fonts/crimsontext-italic-webfont.woff diff --git a/themes/material/static/fonts/crimsontext-italic-webfont.woff2 b/prosopopee/themes/material/static/fonts/crimsontext-italic-webfont.woff2 similarity index 100% rename from themes/material/static/fonts/crimsontext-italic-webfont.woff2 rename to prosopopee/themes/material/static/fonts/crimsontext-italic-webfont.woff2 diff --git a/themes/material/static/fonts/crimsontext-regular-webfont.eot b/prosopopee/themes/material/static/fonts/crimsontext-regular-webfont.eot similarity index 100% rename from themes/material/static/fonts/crimsontext-regular-webfont.eot rename to prosopopee/themes/material/static/fonts/crimsontext-regular-webfont.eot diff --git a/themes/material/static/fonts/crimsontext-regular-webfont.svg b/prosopopee/themes/material/static/fonts/crimsontext-regular-webfont.svg similarity index 100% rename from themes/material/static/fonts/crimsontext-regular-webfont.svg rename to prosopopee/themes/material/static/fonts/crimsontext-regular-webfont.svg diff --git a/themes/material/static/fonts/crimsontext-regular-webfont.ttf b/prosopopee/themes/material/static/fonts/crimsontext-regular-webfont.ttf similarity index 100% rename from themes/material/static/fonts/crimsontext-regular-webfont.ttf rename to prosopopee/themes/material/static/fonts/crimsontext-regular-webfont.ttf diff --git a/themes/material/static/fonts/crimsontext-regular-webfont.woff b/prosopopee/themes/material/static/fonts/crimsontext-regular-webfont.woff similarity index 100% rename from themes/material/static/fonts/crimsontext-regular-webfont.woff rename to prosopopee/themes/material/static/fonts/crimsontext-regular-webfont.woff diff --git a/themes/material/static/fonts/crimsontext-regular-webfont.woff2 b/prosopopee/themes/material/static/fonts/crimsontext-regular-webfont.woff2 similarity index 100% rename from themes/material/static/fonts/crimsontext-regular-webfont.woff2 rename to prosopopee/themes/material/static/fonts/crimsontext-regular-webfont.woff2 diff --git a/themes/material/static/fonts/crimsontext-semibold-webfont.eot b/prosopopee/themes/material/static/fonts/crimsontext-semibold-webfont.eot similarity index 100% rename from themes/material/static/fonts/crimsontext-semibold-webfont.eot rename to prosopopee/themes/material/static/fonts/crimsontext-semibold-webfont.eot diff --git a/themes/material/static/fonts/crimsontext-semibold-webfont.svg b/prosopopee/themes/material/static/fonts/crimsontext-semibold-webfont.svg similarity index 100% rename from themes/material/static/fonts/crimsontext-semibold-webfont.svg rename to prosopopee/themes/material/static/fonts/crimsontext-semibold-webfont.svg diff --git a/themes/material/static/fonts/crimsontext-semibold-webfont.ttf b/prosopopee/themes/material/static/fonts/crimsontext-semibold-webfont.ttf similarity index 100% rename from themes/material/static/fonts/crimsontext-semibold-webfont.ttf rename to prosopopee/themes/material/static/fonts/crimsontext-semibold-webfont.ttf diff --git a/themes/material/static/fonts/crimsontext-semibold-webfont.woff b/prosopopee/themes/material/static/fonts/crimsontext-semibold-webfont.woff similarity index 100% rename from themes/material/static/fonts/crimsontext-semibold-webfont.woff rename to prosopopee/themes/material/static/fonts/crimsontext-semibold-webfont.woff diff --git a/themes/material/static/fonts/crimsontext-semibold-webfont.woff2 b/prosopopee/themes/material/static/fonts/crimsontext-semibold-webfont.woff2 similarity index 100% rename from themes/material/static/fonts/crimsontext-semibold-webfont.woff2 rename to prosopopee/themes/material/static/fonts/crimsontext-semibold-webfont.woff2 diff --git a/themes/material/static/fonts/crimsontext-semibolditalic-webfont.eot b/prosopopee/themes/material/static/fonts/crimsontext-semibolditalic-webfont.eot similarity index 100% rename from themes/material/static/fonts/crimsontext-semibolditalic-webfont.eot rename to prosopopee/themes/material/static/fonts/crimsontext-semibolditalic-webfont.eot diff --git a/themes/material/static/fonts/crimsontext-semibolditalic-webfont.svg b/prosopopee/themes/material/static/fonts/crimsontext-semibolditalic-webfont.svg similarity index 100% rename from themes/material/static/fonts/crimsontext-semibolditalic-webfont.svg rename to prosopopee/themes/material/static/fonts/crimsontext-semibolditalic-webfont.svg diff --git a/themes/material/static/fonts/crimsontext-semibolditalic-webfont.ttf b/prosopopee/themes/material/static/fonts/crimsontext-semibolditalic-webfont.ttf similarity index 100% rename from themes/material/static/fonts/crimsontext-semibolditalic-webfont.ttf rename to prosopopee/themes/material/static/fonts/crimsontext-semibolditalic-webfont.ttf diff --git a/themes/material/static/fonts/crimsontext-semibolditalic-webfont.woff b/prosopopee/themes/material/static/fonts/crimsontext-semibolditalic-webfont.woff similarity index 100% rename from themes/material/static/fonts/crimsontext-semibolditalic-webfont.woff rename to prosopopee/themes/material/static/fonts/crimsontext-semibolditalic-webfont.woff diff --git a/themes/material/static/fonts/crimsontext-semibolditalic-webfont.woff2 b/prosopopee/themes/material/static/fonts/crimsontext-semibolditalic-webfont.woff2 similarity index 100% rename from themes/material/static/fonts/crimsontext-semibolditalic-webfont.woff2 rename to prosopopee/themes/material/static/fonts/crimsontext-semibolditalic-webfont.woff2 diff --git a/themes/material/static/fonts/montserrat-regular-webfont.eot b/prosopopee/themes/material/static/fonts/montserrat-regular-webfont.eot similarity index 100% rename from themes/material/static/fonts/montserrat-regular-webfont.eot rename to prosopopee/themes/material/static/fonts/montserrat-regular-webfont.eot diff --git a/themes/material/static/fonts/montserrat-regular-webfont.svg b/prosopopee/themes/material/static/fonts/montserrat-regular-webfont.svg similarity index 100% rename from themes/material/static/fonts/montserrat-regular-webfont.svg rename to prosopopee/themes/material/static/fonts/montserrat-regular-webfont.svg diff --git a/themes/material/static/fonts/montserrat-regular-webfont.ttf b/prosopopee/themes/material/static/fonts/montserrat-regular-webfont.ttf similarity index 100% rename from themes/material/static/fonts/montserrat-regular-webfont.ttf rename to prosopopee/themes/material/static/fonts/montserrat-regular-webfont.ttf diff --git a/themes/material/static/fonts/montserrat-regular-webfont.woff b/prosopopee/themes/material/static/fonts/montserrat-regular-webfont.woff similarity index 100% rename from themes/material/static/fonts/montserrat-regular-webfont.woff rename to prosopopee/themes/material/static/fonts/montserrat-regular-webfont.woff diff --git a/themes/material/static/fonts/montserrat-regular-webfont.woff2 b/prosopopee/themes/material/static/fonts/montserrat-regular-webfont.woff2 similarity index 100% rename from themes/material/static/fonts/montserrat-regular-webfont.woff2 rename to prosopopee/themes/material/static/fonts/montserrat-regular-webfont.woff2 diff --git a/themes/material/static/fonts/montserrat-semibold-webfont.eot b/prosopopee/themes/material/static/fonts/montserrat-semibold-webfont.eot similarity index 100% rename from themes/material/static/fonts/montserrat-semibold-webfont.eot rename to prosopopee/themes/material/static/fonts/montserrat-semibold-webfont.eot diff --git a/themes/material/static/fonts/montserrat-semibold-webfont.svg b/prosopopee/themes/material/static/fonts/montserrat-semibold-webfont.svg similarity index 100% rename from themes/material/static/fonts/montserrat-semibold-webfont.svg rename to prosopopee/themes/material/static/fonts/montserrat-semibold-webfont.svg diff --git a/themes/material/static/fonts/montserrat-semibold-webfont.ttf b/prosopopee/themes/material/static/fonts/montserrat-semibold-webfont.ttf similarity index 100% rename from themes/material/static/fonts/montserrat-semibold-webfont.ttf rename to prosopopee/themes/material/static/fonts/montserrat-semibold-webfont.ttf diff --git a/themes/material/static/fonts/montserrat-semibold-webfont.woff b/prosopopee/themes/material/static/fonts/montserrat-semibold-webfont.woff similarity index 100% rename from themes/material/static/fonts/montserrat-semibold-webfont.woff rename to prosopopee/themes/material/static/fonts/montserrat-semibold-webfont.woff diff --git a/themes/material/static/fonts/montserrat-semibold-webfont.woff2 b/prosopopee/themes/material/static/fonts/montserrat-semibold-webfont.woff2 similarity index 100% rename from themes/material/static/fonts/montserrat-semibold-webfont.woff2 rename to prosopopee/themes/material/static/fonts/montserrat-semibold-webfont.woff2 diff --git a/themes/material/static/img/logo.svg b/prosopopee/themes/material/static/img/logo.svg similarity index 100% rename from themes/material/static/img/logo.svg rename to prosopopee/themes/material/static/img/logo.svg diff --git a/themes/material/static/js/baguetteBox.min.js b/prosopopee/themes/material/static/js/baguetteBox.min.js similarity index 100% rename from themes/material/static/js/baguetteBox.min.js rename to prosopopee/themes/material/static/js/baguetteBox.min.js diff --git a/themes/material/static/js/jquery-2.1.4.min.js b/prosopopee/themes/material/static/js/jquery-2.1.4.min.js similarity index 100% rename from themes/material/static/js/jquery-2.1.4.min.js rename to prosopopee/themes/material/static/js/jquery-2.1.4.min.js diff --git a/themes/material/static/js/jquery.panorama_viewer.min.js b/prosopopee/themes/material/static/js/jquery.panorama_viewer.min.js similarity index 100% rename from themes/material/static/js/jquery.panorama_viewer.min.js rename to prosopopee/themes/material/static/js/jquery.panorama_viewer.min.js diff --git a/themes/material/static/js/materialize.min.js b/prosopopee/themes/material/static/js/materialize.min.js similarity index 100% rename from themes/material/static/js/materialize.min.js rename to prosopopee/themes/material/static/js/materialize.min.js diff --git a/themes/material/templates/.prosopopee_cache b/prosopopee/themes/material/templates/.prosopopee_cache similarity index 100% rename from themes/material/templates/.prosopopee_cache rename to prosopopee/themes/material/templates/.prosopopee_cache diff --git a/themes/material/templates/1-small.png b/prosopopee/themes/material/templates/1-small.png similarity index 100% rename from themes/material/templates/1-small.png rename to prosopopee/themes/material/templates/1-small.png diff --git a/themes/material/templates/1.png b/prosopopee/themes/material/templates/1.png similarity index 100% rename from themes/material/templates/1.png rename to prosopopee/themes/material/templates/1.png diff --git a/themes/material/templates/2-small.png b/prosopopee/themes/material/templates/2-small.png similarity index 100% rename from themes/material/templates/2-small.png rename to prosopopee/themes/material/templates/2-small.png diff --git a/themes/material/templates/2.png b/prosopopee/themes/material/templates/2.png similarity index 100% rename from themes/material/templates/2.png rename to prosopopee/themes/material/templates/2.png diff --git a/themes/material/templates/base.html b/prosopopee/themes/material/templates/base.html similarity index 100% rename from themes/material/templates/base.html rename to prosopopee/themes/material/templates/base.html diff --git a/themes/material/templates/example.html b/prosopopee/themes/material/templates/example.html similarity index 100% rename from themes/material/templates/example.html rename to prosopopee/themes/material/templates/example.html diff --git a/themes/material/templates/footer.html b/prosopopee/themes/material/templates/footer.html similarity index 100% rename from themes/material/templates/footer.html rename to prosopopee/themes/material/templates/footer.html diff --git a/themes/material/templates/gallery-index.html b/prosopopee/themes/material/templates/gallery-index.html similarity index 100% rename from themes/material/templates/gallery-index.html rename to prosopopee/themes/material/templates/gallery-index.html diff --git a/themes/material/templates/index.html b/prosopopee/themes/material/templates/index.html similarity index 100% rename from themes/material/templates/index.html rename to prosopopee/themes/material/templates/index.html diff --git a/themes/material/templates/menu.html b/prosopopee/themes/material/templates/menu.html similarity index 100% rename from themes/material/templates/menu.html rename to prosopopee/themes/material/templates/menu.html diff --git a/themes/material/templates/page-example.html b/prosopopee/themes/material/templates/page-example.html similarity index 100% rename from themes/material/templates/page-example.html rename to prosopopee/themes/material/templates/page-example.html diff --git a/themes/material/templates/page.html b/prosopopee/themes/material/templates/page.html similarity index 100% rename from themes/material/templates/page.html rename to prosopopee/themes/material/templates/page.html diff --git a/prosopopee/themes/material/templates/sections/bordered-picture.html b/prosopopee/themes/material/templates/sections/bordered-picture.html new file mode 100644 index 0000000..a93c129 --- /dev/null +++ b/prosopopee/themes/material/templates/sections/bordered-picture.html @@ -0,0 +1,14 @@ +
+ {% set image = Image(section.image) %} + {{ image.copy()}} + + + +
+
+ {% set image = Image(section.image) %} + {{ image.copy()}} + + + +
diff --git a/themes/material/templates/sections/full-picture.html b/prosopopee/themes/material/templates/sections/full-picture.html similarity index 69% rename from themes/material/templates/sections/full-picture.html rename to prosopopee/themes/material/templates/sections/full-picture.html index f20537b..33fc8bf 100644 --- a/themes/material/templates/sections/full-picture.html +++ b/prosopopee/themes/material/templates/sections/full-picture.html @@ -1,7 +1,8 @@ {% set image = Image(section.image) %} {{ image.copy() }}
-
+
+
{% if section.text %}

{{ section.text.title }}

diff --git a/themes/material/templates/sections/html.html b/prosopopee/themes/material/templates/sections/html.html similarity index 100% rename from themes/material/templates/sections/html.html rename to prosopopee/themes/material/templates/sections/html.html diff --git a/themes/material/templates/sections/panorama.html b/prosopopee/themes/material/templates/sections/panorama.html similarity index 100% rename from themes/material/templates/sections/panorama.html rename to prosopopee/themes/material/templates/sections/panorama.html diff --git a/themes/material/templates/sections/paragraph.html b/prosopopee/themes/material/templates/sections/paragraph.html similarity index 100% rename from themes/material/templates/sections/paragraph.html rename to prosopopee/themes/material/templates/sections/paragraph.html diff --git a/themes/material/templates/sections/pictures-group.html b/prosopopee/themes/material/templates/sections/pictures-group.html similarity index 67% rename from themes/material/templates/sections/pictures-group.html rename to prosopopee/themes/material/templates/sections/pictures-group.html index 9049432..60a9fb0 100644 --- a/themes/material/templates/sections/pictures-group.html +++ b/prosopopee/themes/material/templates/sections/pictures-group.html @@ -7,11 +7,16 @@ {% set plop = 12 // loop.length %}
-
+
+
+ + + +
{% if not loop.last %} diff --git a/themes/material/templates/sections/text.html b/prosopopee/themes/material/templates/sections/text.html similarity index 100% rename from themes/material/templates/sections/text.html rename to prosopopee/themes/material/templates/sections/text.html diff --git a/setup.py b/setup.py index b439889..b30e664 100644 --- a/setup.py +++ b/setup.py @@ -30,6 +30,6 @@ setup(name='prosopopee', keywords='', include_package_data=True, package_data={ - 'prosopopee': ["static/%s/*" % x for x in os.listdir("./prosopopee/static/")] + ['templates/*.html', 'templates/sections/*'], + 'prosopopee': ["themes/*/*/*/*"] + ["static/%s/*" % x for x in os.listdir("./prosopopee/static/")] + ['templates/*.html', 'templates/sections/*'], }, ) diff --git a/themes/material/templates/sections/bordered-picture.html b/themes/material/templates/sections/bordered-picture.html deleted file mode 100644 index 0a46f31..0000000 --- a/themes/material/templates/sections/bordered-picture.html +++ /dev/null @@ -1,7 +0,0 @@ -
- {% set image = Image(section.image) %} - {{ image.copy()}} - - - -