From d3eea4639350bc09a142087b333bb824af9c69fb Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 22 Feb 2016 16:32:44 +0100 Subject: [PATCH] Revert "move default theme in themes folder" This reverts commit bf986ded7da83d4183a57c09e3c603abdaa94d62. --- MANIFEST.in | 2 ++ prosopopee/prosopopee.py | 29 ++++++++++-------- .../static/css/baguetteBox.min.css | 0 .../exposure => }/static/css/fonts.css | 0 .../static/css/panorama_viewer.css | 0 .../exposure => }/static/css/style-page.css | 0 .../exposure => }/static/css/style.css | 0 .../static/fonts/crimsontext-bold-webfont.eot | Bin .../static/fonts/crimsontext-bold-webfont.svg | 0 .../static/fonts/crimsontext-bold-webfont.ttf | Bin .../fonts/crimsontext-bold-webfont.woff | Bin .../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 .../crimsontext-bolditalic-webfont.woff2 | Bin .../fonts/crimsontext-italic-webfont.eot | Bin .../fonts/crimsontext-italic-webfont.svg | 0 .../fonts/crimsontext-italic-webfont.ttf | Bin .../fonts/crimsontext-italic-webfont.woff | Bin .../fonts/crimsontext-italic-webfont.woff2 | Bin .../fonts/crimsontext-regular-webfont.eot | Bin .../fonts/crimsontext-regular-webfont.svg | 0 .../fonts/crimsontext-regular-webfont.ttf | Bin .../fonts/crimsontext-regular-webfont.woff | Bin .../fonts/crimsontext-regular-webfont.woff2 | Bin .../fonts/crimsontext-semibold-webfont.eot | Bin .../fonts/crimsontext-semibold-webfont.svg | 0 .../fonts/crimsontext-semibold-webfont.ttf | Bin .../fonts/crimsontext-semibold-webfont.woff | Bin .../fonts/crimsontext-semibold-webfont.woff2 | Bin .../crimsontext-semibolditalic-webfont.eot | Bin .../crimsontext-semibolditalic-webfont.svg | 0 .../crimsontext-semibolditalic-webfont.ttf | Bin .../crimsontext-semibolditalic-webfont.woff | Bin .../crimsontext-semibolditalic-webfont.woff2 | Bin .../fonts/montserrat-regular-webfont.eot | Bin .../fonts/montserrat-regular-webfont.svg | 0 .../fonts/montserrat-regular-webfont.ttf | Bin .../fonts/montserrat-regular-webfont.woff | Bin .../fonts/montserrat-regular-webfont.woff2 | Bin .../fonts/montserrat-semibold-webfont.eot | Bin .../fonts/montserrat-semibold-webfont.svg | 0 .../fonts/montserrat-semibold-webfont.ttf | Bin .../fonts/montserrat-semibold-webfont.woff | Bin .../fonts/montserrat-semibold-webfont.woff2 | Bin .../{themes/exposure => }/static/img/logo.svg | 0 .../static/js/baguetteBox.min.js | 0 .../static/js/jquery-2.1.4.min.js | 0 .../static/js/jquery.panorama_viewer.min.js | 0 .../exposure => }/templates/1-small.png | Bin .../{themes/exposure => }/templates/1.png | Bin .../exposure => }/templates/2-small.png | Bin .../{themes/exposure => }/templates/2.png | Bin .../{themes/exposure => }/templates/base.html | 0 .../exposure => }/templates/example.html | 0 .../templates/gallery-index.html | 6 ---- .../exposure => }/templates/index.html | 0 .../{themes/exposure => }/templates/menu.html | 0 .../exposure => }/templates/page-example.html | 0 .../{themes/exposure => }/templates/page.html | 0 .../templates/sections/bordered-picture.html | 0 .../templates/sections/full-picture.html | 0 .../templates/sections/html.html | 0 .../templates/sections/panorama.html | 0 .../templates/sections/paragraph.html | 2 -- .../templates/sections/pictures-group.html | 0 .../templates/sections/text.html | 0 setup.py | 2 +- 70 files changed, 19 insertions(+), 22 deletions(-) rename prosopopee/{themes/exposure => }/static/css/baguetteBox.min.css (100%) rename prosopopee/{themes/exposure => }/static/css/fonts.css (100%) rename prosopopee/{themes/exposure => }/static/css/panorama_viewer.css (100%) rename prosopopee/{themes/exposure => }/static/css/style-page.css (100%) rename prosopopee/{themes/exposure => }/static/css/style.css (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-bold-webfont.eot (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-bold-webfont.svg (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-bold-webfont.ttf (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-bold-webfont.woff (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-bold-webfont.woff2 (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-bolditalic-webfont.eot (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-bolditalic-webfont.svg (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-bolditalic-webfont.ttf (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-bolditalic-webfont.woff (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-bolditalic-webfont.woff2 (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-italic-webfont.eot (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-italic-webfont.svg (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-italic-webfont.ttf (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-italic-webfont.woff (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-italic-webfont.woff2 (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-regular-webfont.eot (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-regular-webfont.svg (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-regular-webfont.ttf (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-regular-webfont.woff (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-regular-webfont.woff2 (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-semibold-webfont.eot (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-semibold-webfont.svg (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-semibold-webfont.ttf (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-semibold-webfont.woff (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-semibold-webfont.woff2 (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-semibolditalic-webfont.eot (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-semibolditalic-webfont.svg (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-semibolditalic-webfont.ttf (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-semibolditalic-webfont.woff (100%) rename prosopopee/{themes/exposure => }/static/fonts/crimsontext-semibolditalic-webfont.woff2 (100%) rename prosopopee/{themes/exposure => }/static/fonts/montserrat-regular-webfont.eot (100%) rename prosopopee/{themes/exposure => }/static/fonts/montserrat-regular-webfont.svg (100%) rename prosopopee/{themes/exposure => }/static/fonts/montserrat-regular-webfont.ttf (100%) rename prosopopee/{themes/exposure => }/static/fonts/montserrat-regular-webfont.woff (100%) rename prosopopee/{themes/exposure => }/static/fonts/montserrat-regular-webfont.woff2 (100%) rename prosopopee/{themes/exposure => }/static/fonts/montserrat-semibold-webfont.eot (100%) rename prosopopee/{themes/exposure => }/static/fonts/montserrat-semibold-webfont.svg (100%) rename prosopopee/{themes/exposure => }/static/fonts/montserrat-semibold-webfont.ttf (100%) rename prosopopee/{themes/exposure => }/static/fonts/montserrat-semibold-webfont.woff (100%) rename prosopopee/{themes/exposure => }/static/fonts/montserrat-semibold-webfont.woff2 (100%) rename prosopopee/{themes/exposure => }/static/img/logo.svg (100%) rename prosopopee/{themes/exposure => }/static/js/baguetteBox.min.js (100%) rename prosopopee/{themes/exposure => }/static/js/jquery-2.1.4.min.js (100%) rename prosopopee/{themes/exposure => }/static/js/jquery.panorama_viewer.min.js (100%) rename prosopopee/{themes/exposure => }/templates/1-small.png (100%) rename prosopopee/{themes/exposure => }/templates/1.png (100%) rename prosopopee/{themes/exposure => }/templates/2-small.png (100%) rename prosopopee/{themes/exposure => }/templates/2.png (100%) rename prosopopee/{themes/exposure => }/templates/base.html (100%) rename prosopopee/{themes/exposure => }/templates/example.html (100%) rename prosopopee/{themes/exposure => }/templates/gallery-index.html (92%) rename prosopopee/{themes/exposure => }/templates/index.html (100%) rename prosopopee/{themes/exposure => }/templates/menu.html (100%) rename prosopopee/{themes/exposure => }/templates/page-example.html (100%) rename prosopopee/{themes/exposure => }/templates/page.html (100%) rename prosopopee/{themes/exposure => }/templates/sections/bordered-picture.html (100%) rename prosopopee/{themes/exposure => }/templates/sections/full-picture.html (100%) rename prosopopee/{themes/exposure => }/templates/sections/html.html (100%) rename prosopopee/{themes/exposure => }/templates/sections/panorama.html (100%) rename prosopopee/{themes/exposure => }/templates/sections/paragraph.html (75%) rename prosopopee/{themes/exposure => }/templates/sections/pictures-group.html (100%) rename prosopopee/{themes/exposure => }/templates/sections/text.html (100%) diff --git a/MANIFEST.in b/MANIFEST.in index 5a926f8..3adf836 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +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 6d849ca..4021661 100644 --- a/prosopopee/prosopopee.py +++ b/prosopopee/prosopopee.py @@ -10,6 +10,11 @@ from jinja2 import Environment, FileSystemLoader from .cache import CACHE from .utils import error +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") + SETTINGS = { "show_date": True, "gm": { @@ -113,21 +118,19 @@ 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 settings.get("theme") is None: - gallery_theme = "exposure" - else: - gallery_theme = settings.get("theme") - - 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], "themes", gallery_theme, "static"), os.path.join(os.getcwd(), "build", "static")) - - templates = Environment(loader=FileSystemLoader([os.path.realpath(os.path.join(os.getcwd(), "templates")), os.path.join(os.path.split(os.path.realpath(__file__))[0], "themes", gallery_theme, "templates")])) - index_template = templates.get_template("index.html") - gallery_index_template = templates.get_template("gallery-index.html") - page_template = templates.get_template("page.html") + shutil.copytree(os.path.join(os.path.split(os.path.realpath(__file__))[0], "static"), os.path.join(os.getcwd(), "build", "static")) for gallery in dirs: gallery_settings = yaml.safe_load(open(os.path.join(os.getcwd(), gallery, "settings.yaml"), "r")) diff --git a/prosopopee/themes/exposure/static/css/baguetteBox.min.css b/prosopopee/static/css/baguetteBox.min.css similarity index 100% rename from prosopopee/themes/exposure/static/css/baguetteBox.min.css rename to prosopopee/static/css/baguetteBox.min.css diff --git a/prosopopee/themes/exposure/static/css/fonts.css b/prosopopee/static/css/fonts.css similarity index 100% rename from prosopopee/themes/exposure/static/css/fonts.css rename to prosopopee/static/css/fonts.css diff --git a/prosopopee/themes/exposure/static/css/panorama_viewer.css b/prosopopee/static/css/panorama_viewer.css similarity index 100% rename from prosopopee/themes/exposure/static/css/panorama_viewer.css rename to prosopopee/static/css/panorama_viewer.css diff --git a/prosopopee/themes/exposure/static/css/style-page.css b/prosopopee/static/css/style-page.css similarity index 100% rename from prosopopee/themes/exposure/static/css/style-page.css rename to prosopopee/static/css/style-page.css diff --git a/prosopopee/themes/exposure/static/css/style.css b/prosopopee/static/css/style.css similarity index 100% rename from prosopopee/themes/exposure/static/css/style.css rename to prosopopee/static/css/style.css diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-bold-webfont.eot b/prosopopee/static/fonts/crimsontext-bold-webfont.eot similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-bold-webfont.eot rename to prosopopee/static/fonts/crimsontext-bold-webfont.eot diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-bold-webfont.svg b/prosopopee/static/fonts/crimsontext-bold-webfont.svg similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-bold-webfont.svg rename to prosopopee/static/fonts/crimsontext-bold-webfont.svg diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-bold-webfont.ttf b/prosopopee/static/fonts/crimsontext-bold-webfont.ttf similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-bold-webfont.ttf rename to prosopopee/static/fonts/crimsontext-bold-webfont.ttf diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-bold-webfont.woff b/prosopopee/static/fonts/crimsontext-bold-webfont.woff similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-bold-webfont.woff rename to prosopopee/static/fonts/crimsontext-bold-webfont.woff diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-bold-webfont.woff2 b/prosopopee/static/fonts/crimsontext-bold-webfont.woff2 similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-bold-webfont.woff2 rename to prosopopee/static/fonts/crimsontext-bold-webfont.woff2 diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-bolditalic-webfont.eot b/prosopopee/static/fonts/crimsontext-bolditalic-webfont.eot similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-bolditalic-webfont.eot rename to prosopopee/static/fonts/crimsontext-bolditalic-webfont.eot diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-bolditalic-webfont.svg b/prosopopee/static/fonts/crimsontext-bolditalic-webfont.svg similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-bolditalic-webfont.svg rename to prosopopee/static/fonts/crimsontext-bolditalic-webfont.svg diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-bolditalic-webfont.ttf b/prosopopee/static/fonts/crimsontext-bolditalic-webfont.ttf similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-bolditalic-webfont.ttf rename to prosopopee/static/fonts/crimsontext-bolditalic-webfont.ttf diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-bolditalic-webfont.woff b/prosopopee/static/fonts/crimsontext-bolditalic-webfont.woff similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-bolditalic-webfont.woff rename to prosopopee/static/fonts/crimsontext-bolditalic-webfont.woff diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-bolditalic-webfont.woff2 b/prosopopee/static/fonts/crimsontext-bolditalic-webfont.woff2 similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-bolditalic-webfont.woff2 rename to prosopopee/static/fonts/crimsontext-bolditalic-webfont.woff2 diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-italic-webfont.eot b/prosopopee/static/fonts/crimsontext-italic-webfont.eot similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-italic-webfont.eot rename to prosopopee/static/fonts/crimsontext-italic-webfont.eot diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-italic-webfont.svg b/prosopopee/static/fonts/crimsontext-italic-webfont.svg similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-italic-webfont.svg rename to prosopopee/static/fonts/crimsontext-italic-webfont.svg diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-italic-webfont.ttf b/prosopopee/static/fonts/crimsontext-italic-webfont.ttf similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-italic-webfont.ttf rename to prosopopee/static/fonts/crimsontext-italic-webfont.ttf diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-italic-webfont.woff b/prosopopee/static/fonts/crimsontext-italic-webfont.woff similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-italic-webfont.woff rename to prosopopee/static/fonts/crimsontext-italic-webfont.woff diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-italic-webfont.woff2 b/prosopopee/static/fonts/crimsontext-italic-webfont.woff2 similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-italic-webfont.woff2 rename to prosopopee/static/fonts/crimsontext-italic-webfont.woff2 diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-regular-webfont.eot b/prosopopee/static/fonts/crimsontext-regular-webfont.eot similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-regular-webfont.eot rename to prosopopee/static/fonts/crimsontext-regular-webfont.eot diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-regular-webfont.svg b/prosopopee/static/fonts/crimsontext-regular-webfont.svg similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-regular-webfont.svg rename to prosopopee/static/fonts/crimsontext-regular-webfont.svg diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-regular-webfont.ttf b/prosopopee/static/fonts/crimsontext-regular-webfont.ttf similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-regular-webfont.ttf rename to prosopopee/static/fonts/crimsontext-regular-webfont.ttf diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-regular-webfont.woff b/prosopopee/static/fonts/crimsontext-regular-webfont.woff similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-regular-webfont.woff rename to prosopopee/static/fonts/crimsontext-regular-webfont.woff diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-regular-webfont.woff2 b/prosopopee/static/fonts/crimsontext-regular-webfont.woff2 similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-regular-webfont.woff2 rename to prosopopee/static/fonts/crimsontext-regular-webfont.woff2 diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-semibold-webfont.eot b/prosopopee/static/fonts/crimsontext-semibold-webfont.eot similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-semibold-webfont.eot rename to prosopopee/static/fonts/crimsontext-semibold-webfont.eot diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-semibold-webfont.svg b/prosopopee/static/fonts/crimsontext-semibold-webfont.svg similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-semibold-webfont.svg rename to prosopopee/static/fonts/crimsontext-semibold-webfont.svg diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-semibold-webfont.ttf b/prosopopee/static/fonts/crimsontext-semibold-webfont.ttf similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-semibold-webfont.ttf rename to prosopopee/static/fonts/crimsontext-semibold-webfont.ttf diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-semibold-webfont.woff b/prosopopee/static/fonts/crimsontext-semibold-webfont.woff similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-semibold-webfont.woff rename to prosopopee/static/fonts/crimsontext-semibold-webfont.woff diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-semibold-webfont.woff2 b/prosopopee/static/fonts/crimsontext-semibold-webfont.woff2 similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-semibold-webfont.woff2 rename to prosopopee/static/fonts/crimsontext-semibold-webfont.woff2 diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-semibolditalic-webfont.eot b/prosopopee/static/fonts/crimsontext-semibolditalic-webfont.eot similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-semibolditalic-webfont.eot rename to prosopopee/static/fonts/crimsontext-semibolditalic-webfont.eot diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-semibolditalic-webfont.svg b/prosopopee/static/fonts/crimsontext-semibolditalic-webfont.svg similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-semibolditalic-webfont.svg rename to prosopopee/static/fonts/crimsontext-semibolditalic-webfont.svg diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-semibolditalic-webfont.ttf b/prosopopee/static/fonts/crimsontext-semibolditalic-webfont.ttf similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-semibolditalic-webfont.ttf rename to prosopopee/static/fonts/crimsontext-semibolditalic-webfont.ttf diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-semibolditalic-webfont.woff b/prosopopee/static/fonts/crimsontext-semibolditalic-webfont.woff similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-semibolditalic-webfont.woff rename to prosopopee/static/fonts/crimsontext-semibolditalic-webfont.woff diff --git a/prosopopee/themes/exposure/static/fonts/crimsontext-semibolditalic-webfont.woff2 b/prosopopee/static/fonts/crimsontext-semibolditalic-webfont.woff2 similarity index 100% rename from prosopopee/themes/exposure/static/fonts/crimsontext-semibolditalic-webfont.woff2 rename to prosopopee/static/fonts/crimsontext-semibolditalic-webfont.woff2 diff --git a/prosopopee/themes/exposure/static/fonts/montserrat-regular-webfont.eot b/prosopopee/static/fonts/montserrat-regular-webfont.eot similarity index 100% rename from prosopopee/themes/exposure/static/fonts/montserrat-regular-webfont.eot rename to prosopopee/static/fonts/montserrat-regular-webfont.eot diff --git a/prosopopee/themes/exposure/static/fonts/montserrat-regular-webfont.svg b/prosopopee/static/fonts/montserrat-regular-webfont.svg similarity index 100% rename from prosopopee/themes/exposure/static/fonts/montserrat-regular-webfont.svg rename to prosopopee/static/fonts/montserrat-regular-webfont.svg diff --git a/prosopopee/themes/exposure/static/fonts/montserrat-regular-webfont.ttf b/prosopopee/static/fonts/montserrat-regular-webfont.ttf similarity index 100% rename from prosopopee/themes/exposure/static/fonts/montserrat-regular-webfont.ttf rename to prosopopee/static/fonts/montserrat-regular-webfont.ttf diff --git a/prosopopee/themes/exposure/static/fonts/montserrat-regular-webfont.woff b/prosopopee/static/fonts/montserrat-regular-webfont.woff similarity index 100% rename from prosopopee/themes/exposure/static/fonts/montserrat-regular-webfont.woff rename to prosopopee/static/fonts/montserrat-regular-webfont.woff diff --git a/prosopopee/themes/exposure/static/fonts/montserrat-regular-webfont.woff2 b/prosopopee/static/fonts/montserrat-regular-webfont.woff2 similarity index 100% rename from prosopopee/themes/exposure/static/fonts/montserrat-regular-webfont.woff2 rename to prosopopee/static/fonts/montserrat-regular-webfont.woff2 diff --git a/prosopopee/themes/exposure/static/fonts/montserrat-semibold-webfont.eot b/prosopopee/static/fonts/montserrat-semibold-webfont.eot similarity index 100% rename from prosopopee/themes/exposure/static/fonts/montserrat-semibold-webfont.eot rename to prosopopee/static/fonts/montserrat-semibold-webfont.eot diff --git a/prosopopee/themes/exposure/static/fonts/montserrat-semibold-webfont.svg b/prosopopee/static/fonts/montserrat-semibold-webfont.svg similarity index 100% rename from prosopopee/themes/exposure/static/fonts/montserrat-semibold-webfont.svg rename to prosopopee/static/fonts/montserrat-semibold-webfont.svg diff --git a/prosopopee/themes/exposure/static/fonts/montserrat-semibold-webfont.ttf b/prosopopee/static/fonts/montserrat-semibold-webfont.ttf similarity index 100% rename from prosopopee/themes/exposure/static/fonts/montserrat-semibold-webfont.ttf rename to prosopopee/static/fonts/montserrat-semibold-webfont.ttf diff --git a/prosopopee/themes/exposure/static/fonts/montserrat-semibold-webfont.woff b/prosopopee/static/fonts/montserrat-semibold-webfont.woff similarity index 100% rename from prosopopee/themes/exposure/static/fonts/montserrat-semibold-webfont.woff rename to prosopopee/static/fonts/montserrat-semibold-webfont.woff diff --git a/prosopopee/themes/exposure/static/fonts/montserrat-semibold-webfont.woff2 b/prosopopee/static/fonts/montserrat-semibold-webfont.woff2 similarity index 100% rename from prosopopee/themes/exposure/static/fonts/montserrat-semibold-webfont.woff2 rename to prosopopee/static/fonts/montserrat-semibold-webfont.woff2 diff --git a/prosopopee/themes/exposure/static/img/logo.svg b/prosopopee/static/img/logo.svg similarity index 100% rename from prosopopee/themes/exposure/static/img/logo.svg rename to prosopopee/static/img/logo.svg diff --git a/prosopopee/themes/exposure/static/js/baguetteBox.min.js b/prosopopee/static/js/baguetteBox.min.js similarity index 100% rename from prosopopee/themes/exposure/static/js/baguetteBox.min.js rename to prosopopee/static/js/baguetteBox.min.js diff --git a/prosopopee/themes/exposure/static/js/jquery-2.1.4.min.js b/prosopopee/static/js/jquery-2.1.4.min.js similarity index 100% rename from prosopopee/themes/exposure/static/js/jquery-2.1.4.min.js rename to prosopopee/static/js/jquery-2.1.4.min.js diff --git a/prosopopee/themes/exposure/static/js/jquery.panorama_viewer.min.js b/prosopopee/static/js/jquery.panorama_viewer.min.js similarity index 100% rename from prosopopee/themes/exposure/static/js/jquery.panorama_viewer.min.js rename to prosopopee/static/js/jquery.panorama_viewer.min.js diff --git a/prosopopee/themes/exposure/templates/1-small.png b/prosopopee/templates/1-small.png similarity index 100% rename from prosopopee/themes/exposure/templates/1-small.png rename to prosopopee/templates/1-small.png diff --git a/prosopopee/themes/exposure/templates/1.png b/prosopopee/templates/1.png similarity index 100% rename from prosopopee/themes/exposure/templates/1.png rename to prosopopee/templates/1.png diff --git a/prosopopee/themes/exposure/templates/2-small.png b/prosopopee/templates/2-small.png similarity index 100% rename from prosopopee/themes/exposure/templates/2-small.png rename to prosopopee/templates/2-small.png diff --git a/prosopopee/themes/exposure/templates/2.png b/prosopopee/templates/2.png similarity index 100% rename from prosopopee/themes/exposure/templates/2.png rename to prosopopee/templates/2.png diff --git a/prosopopee/themes/exposure/templates/base.html b/prosopopee/templates/base.html similarity index 100% rename from prosopopee/themes/exposure/templates/base.html rename to prosopopee/templates/base.html diff --git a/prosopopee/themes/exposure/templates/example.html b/prosopopee/templates/example.html similarity index 100% rename from prosopopee/themes/exposure/templates/example.html rename to prosopopee/templates/example.html diff --git a/prosopopee/themes/exposure/templates/gallery-index.html b/prosopopee/templates/gallery-index.html similarity index 92% rename from prosopopee/themes/exposure/templates/gallery-index.html rename to prosopopee/templates/gallery-index.html index 39a7e4f..1902c60 100644 --- a/prosopopee/themes/exposure/templates/gallery-index.html +++ b/prosopopee/templates/gallery-index.html @@ -28,7 +28,6 @@ -