Fix some issues related to directory hierarchies

config.toml

@@ -1,6 +1,6 @@
 [website]
 website_name = "Test Website Name!"
-built_pages = ["test_page.toml"]
+built_pages = ["test_page/about.toml", "test_page/other.toml"]
 use_default_css = true
 javascript = []
 css = []
@@ -10,13 +10,12 @@ css = []
 #google_site_verification = ""
 
 [navbar]
-items = ["home", "games"]
+items = ["about", "other"]
 
-    [navbar.item.home]
+    [navbar.item.about]
-    title = "Home"
+    title = "About"
-    link = "home"
+    link = "/"
-    image_url = "img/teascade.png"
 
-    [navbar.item.games]
+    [navbar.item.other]
-    title = "Games"
+    title = "Other"
-    link = "/games"
+    link = "/other"

content.md

@@ -1,2 +0,0 @@
-# Test Header!
-Some test content!

src/config_toml.rs

@@ -2,9 +2,13 @@ use toml;
 
 use std::path::PathBuf;
 use std::fs::File;
-use std::io::{Error, ErrorKind, Read};
+use std::io::{Error as IOError, ErrorKind, Read};
+use std::error::Error as STDError;
 use std::collections::HashMap;
 
+use logger::LogLevel;
+use error::Error;
+
 #[derive(Deserialize, Clone, Debug)]
 pub struct GlobalConfigToml {
     pub website: WebsiteConfig,
@@ -48,12 +52,12 @@ impl GlobalConfigToml {
             Err(err) => {
                 if let Some((line, col)) = err.line_col() {
                     Err(Error::new(
-                        ErrorKind::Other,
+                        LogLevel::SEVERE,
                         format!("Erronous config.toml at {}:{}", line, col),
                     ))
                 } else {
                     Err(Error::new(
-                        ErrorKind::Other,
+                        LogLevel::SEVERE,
                         format!("Failed to parse config.toml correctly. Check variable names!"),
                     ))
                 }
@@ -74,7 +78,19 @@ impl PageConfigToml {
             None => "",
         };
 
-        let mut file = File::open(path.as_path())?;
+        let mut file = match File::open(path.as_path()) {
+            Ok(file) => file,
+            Err(err) => {
+                return Err(Error::new(
+                    LogLevel::SEVERE,
+                    format!(
+                        "Failed to open page config: {}, Reason: {}",
+                        path.to_str().unwrap(),
+                        err.description().to_owned()
+                    ),
+                ))
+            }
+        };
         let mut contents = String::new();
         file.read_to_string(&mut contents)?;
         match toml::from_str(&contents) {
@@ -82,12 +98,12 @@ impl PageConfigToml {
             Err(err) => {
                 if let Some((line, col)) = err.line_col() {
                     Err(Error::new(
-                        ErrorKind::Other,
+                        LogLevel::SEVERE,
                         format!("Erronous toml: {} at {}:{}", path_str, line, col),
                     ))
                 } else {
                     Err(Error::new(
-                        ErrorKind::Other,
+                        LogLevel::SEVERE,
                         format!(
                             "Failed to parse toml correctly: {}. Check variable names!",
                             path_str

src/renderer.rs

@@ -10,7 +10,7 @@ use logger::LogLevel;
 
 pub fn render_markdown_content(config: &SinglePageConfigs) -> Result<String, Error> {
     if let Some(parent) = config.page_config_path.parent() {
-        let path = parent.with_file_name(&config.page_config.page.content_path);
+        let path = parent.join(&config.page_config.page.content_path);
         match File::open(&path) {
             Ok(mut file) => {
                 let mut content = String::new();

src/templates/page-template.html

@@ -25,7 +25,7 @@
     <meta name="twitter:title" content="{{page_title}}">
     <meta name="twitter:description" content="{{page_description}}">
     <meta name="twitter:image" content="{{favicon}}"> {{if use_default_css}}
-    <link rel="stylesheet" href="css/default.css"> {{endif}} {{css_links}}{{javascript_links}}
+    <link rel="stylesheet" href="/css/default.css"> {{endif}} {{css_links}}{{javascript_links}}
 
     <link rel="shortcut icon" href="{{favicon}}"></link>
 

test_page.toml

@@ -1,8 +0,0 @@
-[page]
-html_path = "test.html"
-title = "Test Page"
-description = "This is a test page."
-content_path = "content.md"
-#favicon = "optional_favicon.png"
-#javascript = ["Additional JavaScript"]
-#css = ["Additional CSS"]

test_page/about.md

@@ -0,0 +1,2 @@
+# About!
+This is the test about for this page!

test_page/about.toml

@@ -0,0 +1,8 @@
+[page]
+html_path = "index.html"
+title = "About"
+description = "This is the test About page"
+content_path = "about.md"
+favicon = "/favicon.png"
+#javascript = ["Additional JavaScript"]
+#css = ["Additional CSS"]

test_page/other.md

@@ -0,0 +1,2 @@
+# OTher
+This page is not like the others

test_page/other.toml

@@ -0,0 +1,8 @@
+[page]
+html_path = "other/index.html"
+title = "Other!"
+description = "This is the .. other page"
+content_path = "other.md"
+#favicon = "optional_favicon.png"
+#javascript = ["Additional JavaScript"]
+#css = ["Additional CSS"]