Revert "move default theme in themes folder"

This reverts commit bf986ded7da83d4183a57c09e3c603abdaa94d62.

MANIFEST.in

@@ -1,2 +1,4 @@
+recursive-include templates *
+recursive-include static *
 recursive-include themes *
 include requirements.txt

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")):
-        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")]))
+    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"))
 
     for gallery in dirs:
         gallery_settings = yaml.safe_load(open(os.path.join(os.getcwd(), gallery, "settings.yaml"), "r"))

prosopopee/templates/gallery-index.html

@@ -28,7 +28,6 @@
   </div>
 
   <script type="text/javascript" src="../static/js/jquery-2.1.4.min.js" charset="utf-8"></script>
-  <script type="text/javascript" src="../static/js/materialize.min.js" charset="utf-8"></script>
   <script type="text/javascript" src="../static/js/baguetteBox.min.js" charset="utf-8"></script>
   <script type="text/javascript" src="../static/js/jquery.panorama_viewer.min.js" charset="utf-8"></script>
   <script type="text/javascript" charset="utf-8">
@@ -42,11 +41,6 @@
             overlay: true
           });
     });
-
-    $(document).ready(function(){
-    	$('.scrollspy').scrollSpy();
-    });
-
   </script>
   <footer>
       <p>Generated using <a href="https://github.com/psycojoker/prosopopee">Prosopopée</a> · content under <a href="https://creativecommons.org/licenses/by-sa/3.0/">CC-BY-SA</a> · atom logo by <a href="https://thenounproject.com/jjjon/">Jonathan Li</a> under <a href="https://creativecommons.org/licenses/by/3.0/">CC-BY</a></p>

prosopopee/templates/sections/paragraph.html

@@ -1,10 +1,8 @@
 <section class="paragraph">
   {% if section.title %}
-  <div id="{{ section.title }}" class="scrollspy">
     <h2>{{ section.title }}</h2>
   {% else %}
     <div class="separator"><div>
   {% endif %}
   <p>{{ section.text }}</p>
-  </div>
 </section>

setup.py

@@ -30,6 +30,6 @@ setup(name='prosopopee',
       keywords='',
       include_package_data=True,
       package_data={
-            'prosopopee': ['themes/*/*/*/*'] + ['themes/*/templates/*.html'] + ['themes/*/templates/section/*.html']
+            'prosopopee': ["themes/*/*/*/*"] + ["static/%s/*" % x for x in os.listdir("./prosopopee/static/")] + ['templates/*.html', 'templates/sections/*'],
         },
      )