3 files changed, 4 insertions, 3 deletions
diff --git a/megapixels/app/settings/app_cfg.py b/megapixels/app/settings/app_cfg.py
index 0b1fb69d..40625958 100644
--- a/megapixels/app/settings/app_cfg.py
+++ b/megapixels/app/settings/app_cfg.py
@@ -163,7 +163,7 @@ S3_HTTP_METADATA_URL = join(S3_HTTP_URL, 'metadata')
 S3_SITE_PATH = "v1/site"
 S3_DATASETS_PATH = "v1" # datasets is already in the filename
 DIR_SITE_PUBLIC = "../site/public"
-DIR_SITE_CONTENT = "../site/content"
+DIR_SITE_CONTENT = "../site/content/pages"
 DIR_SITE_TEMPLATES = "../site/templates"
 DIR_SITE_USER_CONTENT = "../site/public/user_content"
 
diff --git a/megapixels/app/site/builder.py b/megapixels/app/site/builder.py
index fac49c24..188fbc25 100644
--- a/megapixels/app/site/builder.py
+++ b/megapixels/app/site/builder.py
@@ -73,7 +73,7 @@ def build_index(key, research_posts, datasets):
   """
   build the index of research (blog) posts
   """
-  metadata, sections = parser.read_metadata('../site/content/{}/index.md'.format(key))
+  metadata, sections = parser.read_metadata(os.path.join(cfg.DIR_SITE_CONTENT, key, 'index.md'))
   template = env.get_template("page.html")
   s3_path = s3.make_s3_path(cfg.S3_SITE_PATH, metadata['path'])
   content = parser.parse_markdown(sections, s3_path, skip_h1=False)
diff --git a/megapixels/app/site/parser.py b/megapixels/app/site/parser.py
index f739315a..d6705214 100644
--- a/megapixels/app/site/parser.py
+++ b/megapixels/app/site/parser.py
@@ -127,6 +127,7 @@ def parse_research_index(research_posts):
   """
   content = "<div class='research_index'>"
   for post in research_posts:
+    print(post)
     s3_path = s3.make_s3_path(cfg.S3_SITE_PATH, post['path'])
     if 'image' in post:
       post_image = s3_path + post['image']
@@ -240,7 +241,7 @@ def read_post_index(basedir):
   Generate an index of posts
   """
   posts = []
-  for fn in sorted(glob.glob('../site/content/{}/*/index.md'.format(basedir))):
+  for fn in sorted(glob.glob(os.path.join(cfg.DIR_SITE_CONTENT, basedir, '*/index.md'))):
     metadata, valid_sections = read_metadata(fn)
     if metadata is None or metadata['status'] == 'private' or metadata['status'] == 'draft':
       continue