From 759a406d72d4a42475d3cb437da3c11528da653f Mon Sep 17 00:00:00 2001 From: devlinjd Date: Sun, 18 Oct 2015 02:01:08 -0400 Subject: [PATCH 1/4] Fix comment title. --- themes/modern/html.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/themes/modern/html.html b/themes/modern/html.html index 4383b66..f94d463 100644 --- a/themes/modern/html.html +++ b/themes/modern/html.html @@ -1,7 +1,7 @@ {# - modern/md.txt + modern/html.html An HTML resume template for FluentCV's "modern" theme. #} From 71919429aa79e268398f6b202023a05388779d86 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Mon, 26 Oct 2015 00:40:23 -0400 Subject: [PATCH 2/4] Fix HTML headers. --- themes/modern/doc.xml | 14 +++++++------- themes/modern/html.html | 11 +++++------ themes/modern/pdf.html | 11 +++++------ 3 files changed, 17 insertions(+), 19 deletions(-) diff --git a/themes/modern/doc.xml b/themes/modern/doc.xml index 232fd96..d755536 100644 --- a/themes/modern/doc.xml +++ b/themes/modern/doc.xml @@ -1,11 +1,11 @@ -{# - - modern/doc.xml - An XML-driven Microsoft Word resume template for FluentCV's "modern" theme. - Uses the MS Word 2003 XML format. - -#} + diff --git a/themes/modern/html.html b/themes/modern/html.html index f94d463..825be3c 100644 --- a/themes/modern/html.html +++ b/themes/modern/html.html @@ -1,10 +1,9 @@ -{# - - modern/html.html - An HTML resume template for FluentCV's "modern" theme. - -#} + diff --git a/themes/modern/pdf.html b/themes/modern/pdf.html index 307e9a6..2d17d2a 100644 --- a/themes/modern/pdf.html +++ b/themes/modern/pdf.html @@ -1,10 +1,9 @@ -{# - - modern/pdf.html - An HTML-driven PDF resume template for FluentCV's "modern" theme. - -#} + From e7c820c9c34378131100832f44cbd9be65236a67 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Mon, 26 Oct 2015 04:57:06 -0400 Subject: [PATCH 3/4] Reorganize themes. --- .gitignore | 1 + themes/hello-world/{ => templates}/doc.xml | 0 themes/hello-world/{ => templates}/html.css | 0 themes/hello-world/{ => templates}/html.html | 0 themes/hello-world/{ => templates}/md.txt | 0 themes/hello-world/{ => templates}/pdf.html | 0 themes/hello-world/{ => templates}/txt.txt | 0 themes/minimist/{ => templates}/doc.xml | 0 themes/minimist/{ => templates}/html.css | 0 themes/minimist/{ => templates}/html.html | 0 themes/minimist/{ => templates}/md.txt | 0 themes/minimist/{ => templates}/pdf.html | 0 themes/minimist/{ => templates}/txt.txt | 0 themes/modern/{ => templates}/doc.xml | 0 themes/modern/{ => templates}/html.css | 0 themes/modern/{ => templates}/html.html | 1 + themes/modern/{ => templates}/md.txt | 0 themes/modern/{ => templates}/pdf.html | 0 themes/modern/{ => templates}/txt.txt | 0 themes/modern/templates/yml.yml | 0 20 files changed, 2 insertions(+) rename themes/hello-world/{ => templates}/doc.xml (100%) rename themes/hello-world/{ => templates}/html.css (100%) rename themes/hello-world/{ => templates}/html.html (100%) rename themes/hello-world/{ => templates}/md.txt (100%) rename themes/hello-world/{ => templates}/pdf.html (100%) rename themes/hello-world/{ => templates}/txt.txt (100%) rename themes/minimist/{ => templates}/doc.xml (100%) rename themes/minimist/{ => templates}/html.css (100%) rename themes/minimist/{ => templates}/html.html (100%) rename themes/minimist/{ => templates}/md.txt (100%) rename themes/minimist/{ => templates}/pdf.html (100%) rename themes/minimist/{ => templates}/txt.txt (100%) rename themes/modern/{ => templates}/doc.xml (100%) rename themes/modern/{ => templates}/html.css (100%) rename themes/modern/{ => templates}/html.html (99%) rename themes/modern/{ => templates}/md.txt (100%) rename themes/modern/{ => templates}/pdf.html (100%) rename themes/modern/{ => templates}/txt.txt (100%) create mode 100644 themes/modern/templates/yml.yml diff --git a/.gitignore b/.gitignore index 7309ed1..684b5d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ # It is pitch black. You are likely to be eaten by a grue. +informatic-new/ diff --git a/themes/hello-world/doc.xml b/themes/hello-world/templates/doc.xml similarity index 100% rename from themes/hello-world/doc.xml rename to themes/hello-world/templates/doc.xml diff --git a/themes/hello-world/html.css b/themes/hello-world/templates/html.css similarity index 100% rename from themes/hello-world/html.css rename to themes/hello-world/templates/html.css diff --git a/themes/hello-world/html.html b/themes/hello-world/templates/html.html similarity index 100% rename from themes/hello-world/html.html rename to themes/hello-world/templates/html.html diff --git a/themes/hello-world/md.txt b/themes/hello-world/templates/md.txt similarity index 100% rename from themes/hello-world/md.txt rename to themes/hello-world/templates/md.txt diff --git a/themes/hello-world/pdf.html b/themes/hello-world/templates/pdf.html similarity index 100% rename from themes/hello-world/pdf.html rename to themes/hello-world/templates/pdf.html diff --git a/themes/hello-world/txt.txt b/themes/hello-world/templates/txt.txt similarity index 100% rename from themes/hello-world/txt.txt rename to themes/hello-world/templates/txt.txt diff --git a/themes/minimist/doc.xml b/themes/minimist/templates/doc.xml similarity index 100% rename from themes/minimist/doc.xml rename to themes/minimist/templates/doc.xml diff --git a/themes/minimist/html.css b/themes/minimist/templates/html.css similarity index 100% rename from themes/minimist/html.css rename to themes/minimist/templates/html.css diff --git a/themes/minimist/html.html b/themes/minimist/templates/html.html similarity index 100% rename from themes/minimist/html.html rename to themes/minimist/templates/html.html diff --git a/themes/minimist/md.txt b/themes/minimist/templates/md.txt similarity index 100% rename from themes/minimist/md.txt rename to themes/minimist/templates/md.txt diff --git a/themes/minimist/pdf.html b/themes/minimist/templates/pdf.html similarity index 100% rename from themes/minimist/pdf.html rename to themes/minimist/templates/pdf.html diff --git a/themes/minimist/txt.txt b/themes/minimist/templates/txt.txt similarity index 100% rename from themes/minimist/txt.txt rename to themes/minimist/templates/txt.txt diff --git a/themes/modern/doc.xml b/themes/modern/templates/doc.xml similarity index 100% rename from themes/modern/doc.xml rename to themes/modern/templates/doc.xml diff --git a/themes/modern/html.css b/themes/modern/templates/html.css similarity index 100% rename from themes/modern/html.css rename to themes/modern/templates/html.css diff --git a/themes/modern/html.html b/themes/modern/templates/html.html similarity index 99% rename from themes/modern/html.html rename to themes/modern/templates/html.html index 825be3c..85c09ed 100644 --- a/themes/modern/html.html +++ b/themes/modern/templates/html.html @@ -12,6 +12,7 @@ engine: Underscore {{ r.basics.name }} + {{ headFragment }} {% if( cssInfo.file ) { %} {% } else { %} diff --git a/themes/modern/md.txt b/themes/modern/templates/md.txt similarity index 100% rename from themes/modern/md.txt rename to themes/modern/templates/md.txt diff --git a/themes/modern/pdf.html b/themes/modern/templates/pdf.html similarity index 100% rename from themes/modern/pdf.html rename to themes/modern/templates/pdf.html diff --git a/themes/modern/txt.txt b/themes/modern/templates/txt.txt similarity index 100% rename from themes/modern/txt.txt rename to themes/modern/templates/txt.txt diff --git a/themes/modern/templates/yml.yml b/themes/modern/templates/yml.yml new file mode 100644 index 0000000..e69de29 From 485e4b6316a9fc5ac8ca58118cd3069365d59da6 Mon Sep 17 00:00:00 2001 From: devlinjd Date: Mon, 26 Oct 2015 04:57:15 -0400 Subject: [PATCH 4/4] Bump version. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 292b3a8..2d35b7b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "watermark", - "version": "0.2.0-alpha", + "version": "0.3.0-alpha", "description": "Themes and exemplars for FluentCV.", "private": true, "repository": {