refactored content

7 files changed, 120 insertions, 139 deletions

diff --git a/README.md b/README.md
index 9228069..df1d54c 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Once you have done this, you may use the `exampleSite` folder as an example for
 theme = "simple-resume"
 ```
 
-Then you will need to replicate the data used in the `exampleSite/data/content.toml` file to fill in the fields for your resume.
+Then you will need to replicate the data used in the `exampleSite/data/content.yaml` file to fill in the fields for your resume.
 
 ## Print your Resume
 
diff --git a/exampleSite/data/content.toml b/exampleSite/data/content.toml
deleted file mode 100644
index 0533edb..0000000
--- a/exampleSite/data/content.toml
+++ /dev/null
@@ -1,76 +0,0 @@
-name = "George Carlin"
-email = "me@georgecarlin.com"
-phone = "2125121957"
-website = "GeorgeCarlin.com"
-github = "GeorgeCarlin"
-objective = "Always do what's next"
-
-[[schools]]
-name = "Salesian High School"
-location = "Goshen, NY"
-startdate = "Jan 1954"
-enddate = "June 1956"
-degrees = ["Diploma"]
-
-[[schools]]
-name = "Bishop Dubois High School"
-location = "Harlem"
-startdate = "Jan 1953"
-enddate = "Dec 1953"
-
-[[schools]]
-name = "Cardinal Hayes High School (Expelled)"
-location = "The Bronx"
-startdate = "Sept 1951"
-enddate = "Dec 1952"
-
-[[experiences]]
-position = "Stand-up Comedian"
-company = "Usually HBO"
-location = "Everywhere"
-startdate = "Jun 1959"
-enddate = "Jun 2008"
-points = [
-  "Started in a comedy duo with Jack Burns, a fellow DJ from Texas",
-  "Arrested with Lenny Bruce when he told the police that he did not believe in government issues IDs",
-  "In the 70s I blew up in popularity with the *Seven Dirty Words* routine"
-]
-
-[[experiences]]
-position = "Film Actor"
-company = "Movie People"
-location = "Los Angeles, CA"
-startdate = "Sep 1987"
-enddate = "Jan 2006"
-points = [
-  "Started in a supporting role in *Outrageous Future*, a hit comedy",
-  "Became the time-traveling mentor, Rufus in *Bill & Ted's Bodus Journey*",
-  "Final movie was a voice acting position in *Cars* as the character Fillmore, the green 1960 VW Bus"
-]
-
-[[experiences]]
-position = "Radar Technician"
-company = "United State Air Force"
-location = "Bossier City, LA"
-startdate = "Aug 1956"
-enddate = "Jul 1957"
-points = [
-  "Trained and practiced as a radar techinician at Barksdale Air Force Base",
-  "Moonlighted as a disc jockey at local radio station, KJOE",
-  "Labeled as an 'unproductive airman' by his superiors and was given a general discharge",
-  "Court-martialed three times, and also received many nonjudicial punishments and reprimands"
-]
-
-
-[[info]]
-name = "Some Quotes"
-points = [
-  "Some people see things that are and ask, Why? Some people dream of things that never were and ask, Why not? Some people have to go to work and don't have time for all that.",
-  "Don't tech your children to read... teach them to *question* what they read, teach them to question everything.",
-  "Trying to be happy by accumulating possessions is like trying to satisfy hunger by taping sanwiches all over your body",
-  "Have you ever noticed that anybody driving slower than you is an idiot and anyone going faster is a maniac?",
-  "Think off-center",
-  "It's all bullshit, and it's bad for ya",
-  "Not only do I not know what's going on, I wouldn't know what to do about it if I did.",
-  "Seven dirty words"
-]
diff --git a/exampleSite/data/content.yaml b/exampleSite/data/content.yaml
new file mode 100644
index 0000000..9feeb63
--- /dev/null
+++ b/exampleSite/data/content.yaml
@@ -0,0 +1,82 @@
+name: George Carlin
+email: me@georgecarlin.com
+phone: '2125121957'
+website: GeorgeCarlin.com
+github: GeorgeCarlin
+
+sections:
+  - heading: Objective
+    body: Always do what's next
+
+  - heading: Eduction
+    subsections:
+      - heading:
+          label: Salesian High School - Goshen, NY
+          startdate: Jan 1954
+          enddate: June 1956
+        degrees:
+          - Diploma
+      - heading:
+          label: Bishop Dubois High School - Harlem
+          startdate: Jan 1953
+          enddate: Dec 1953
+      - heading:
+          label: Cardinal Hayes High School (Expelled) - The Bronx
+          startdate: Sept 1951
+          enddate: Dec 1952
+  - heading: Experiences
+    subsections:
+      - heading:
+          label: Stand-up Comedian at Usually HBO - Everywhere
+          startdate: Jun 1959
+          enddate: Jun 2008
+        points:
+          - 'Started in a comedy duo with Jack Burns, a fellow DJ from Texas'
+          - >-
+            Arrested with Lenny Bruce when he told the police that he did not
+            believe in government issues IDs
+          - In the 70s I blew up in popularity with the *Seven Dirty Words* routine
+      - heading:
+          label: Film Actor at Movie People - Los Angeles, CA
+          startdate: Sep 1987
+          enddate: Jan 2006
+        points:
+          - 'Started in a supporting role in *Outrageous Future*, a hit comedy'
+          - "Became the time-traveling mentor, Rufus in *Bill & Ted's Bodus Journey*"
+          - >-
+            Final movie was a voice acting position in *Cars* as the character
+            Fillmore, the green 1960 VW Bus
+      - heading:
+          label: Radar Technician at United State Air Force - Bossier City, LA
+          startdate: Aug 1956
+          enddate: Jul 1957
+        points:
+          - Trained and practiced as a radar techinician at Barksdale Air Force Base
+          - 'Moonlighted as a disc jockey at local radio station, KJOE'
+          - >-
+            Labeled as an 'unproductive airman' by his superiors and was given a
+            general discharge
+          - >-
+            Court-martialed three times, and also received many nonjudicial
+            punishments and reprimands
+  - heading: Some Quotes
+    points:
+      - >-
+        Some people see things that are and ask, Why? Some people dream of
+        things that never were and ask, Why not? Some people have to go to work
+        and don't have time for all that.
+      - >-
+        Don't tech your children to read... teach them to *question* what they
+        read, teach them to question everything.
+      - >-
+        Trying to be happy by accumulating possessions is like trying to satisfy
+        hunger by taping sanwiches all over your body
+      - >-
+        Have you ever noticed that anybody driving slower than you is an idiot
+        and anyone going faster is a maniac?
+      - Think off-center
+      - "It's all bullshit, and it's bad for ya"
+      - >-
+        Not only do I not know what's going on, I wouldn't know what to do about
+        it if I did.
+      - Seven dirty words
diff --git a/layouts/index.html b/layouts/index.html
index b851493..728cb68 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -4,30 +4,7 @@
       <div class="box">
         <div class="wrap">
           {{ partial "header.html" . }}
-          {{ with .objective }}
-            <div>
-              <h2>Objective</h2>
-              <p>
-                {{ . }}
-              </p>
-            </div>
-          {{ end }}
-          {{ with .schools }}
-            {{ partial "schools.html" . }}
-          {{ end }}
-          {{ with .experiences }}
-            {{ partial "experiences.html" . }}
-          {{ end }}
-          {{ range .info }}
-            <section>
-              <h2>{{ .name }}</h2>
-              <ul>
-                {{ range .points }}
-                  <li>{{ . | markdownify }}</li>
-                {{ end }}
-              </ul>
-            </section>
-          {{ end }}
+          {{ range .sections }} {{ partial "section.html" . }} {{ end }}
         </div>
       </div>
     {{ end }}
diff --git a/layouts/partials/experiences.html b/layouts/partials/experiences.html
deleted file mode 100644
index 950c5b3..0000000
--- a/layouts/partials/experiences.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<section>
-  <h2>Experience</h2>
-  {{ range . }}
-    <div>
-      <div class="heading-line">
-        <h3>{{ .position }} at {{ .company }} - {{ .location }}</h3>
-        <h3>
-          {{ .startdate }} -
-          {{ if .enddate }}{{ .enddate }}{{ else }}Current{{ end }}
-        </h3>
-      </div>
-      <ul>
-        {{ range .points }}
-          <li>{{ . | markdownify }}</li>
-        {{ end }}
-      </ul>
-    </div>
-  {{ end }}
-</section>
diff --git a/layouts/partials/schools.html b/layouts/partials/schools.html
deleted file mode 100644
index 390d022..0000000
--- a/layouts/partials/schools.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<section>
-  <h2>Education</h2>
-  {{ range . }}
-    <div class="school">
-      <div class="heading-line">
-        <h3>{{ .name }} - {{ .location }}</h3>
-        <h3>
-          {{ .startdate }} -
-          {{ if .enddate }}{{ .enddate }}{{ else }}Current{{ end }}
-        </h3>
-      </div>
-      {{ range .degrees }}
-        <p>
-          <em>{{ . }}</em>
-        </p>
-      {{ end }}
-    </div>
-  {{ end }}
-</section>
diff --git a/layouts/partials/section.html b/layouts/partials/section.html
new file mode 100644
index 0000000..6dcf406
--- /dev/null
+++ b/layouts/partials/section.html
@@ -0,0 +1,36 @@
+<section>
+  <h2>{{ .heading }}</h2>
+  {{ with .body }}<p>{{ . }}</p>{{ end }}
+  {{ with .points }}
+    <ul>
+      {{ range . }}
+        <li>{{ . | markdownify }}</li>
+      {{ end }}
+    </ul>
+  {{ end }}
+  {{ range .subsections }}
+    <div>
+      {{ with .heading }}
+        <div class="heading-line">
+          <h3>{{ .label }}</h3>
+          <h3>
+            {{ .startdate }} -
+            {{ if .enddate }}{{ .enddate }}{{ else }}Current{{ end }}
+          </h3>
+        </div>
+      {{ end }}
+      {{ range .degrees }}
+        <p>
+          <em>{{ . }}</em>
+        </p>
+      {{ end }}
+      {{ with .points }}
+        <ul>
+          {{ range . }}
+            <li>{{ . | markdownify }}</li>
+          {{ end }}
+        </ul>
+      {{ end }}
+    </div>
+  {{ end }}
+</section>