From a3faa7c631b3dfa6dcf7acc90f67c8f606c2ae50 Mon Sep 17 00:00:00 2001 From: Tim Stallard Date: Fri, 4 Nov 2016 23:01:53 +0000 Subject: [PATCH 1/2] Moved libraries into dependencies folders to ensure GitHub correctly identifies them --- docpad.js | 10 +++++----- .../{ => dependencies}/class.phpmailer.php | 0 .../contactsubmit/{ => dependencies}/class.smtp.php | 0 src/files/contactsubmit/index.php | 4 ++-- src/files/{libs => dependencies}/Animate.css | 0 src/files/{libs => dependencies}/agate.css | 0 src/files/{libs => dependencies}/fa.css | 0 src/files/{libs => dependencies}/jquery.min.js | 0 .../{libs => dependencies}/jquery.smoothState.min.js | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename src/files/contactsubmit/{ => dependencies}/class.phpmailer.php (100%) rename src/files/contactsubmit/{ => dependencies}/class.smtp.php (100%) rename src/files/{libs => dependencies}/Animate.css (100%) rename src/files/{libs => dependencies}/agate.css (100%) rename src/files/{libs => dependencies}/fa.css (100%) rename src/files/{libs => dependencies}/jquery.min.js (100%) rename src/files/{libs => dependencies}/jquery.smoothState.min.js (100%) diff --git a/docpad.js b/docpad.js index a9165d2..38604d9 100644 --- a/docpad.js +++ b/docpad.js @@ -45,16 +45,16 @@ var docpadConfig = { events: { populateCollections: function(){ this.docpad.blocks["scripts"].add([ - "/libs/jquery.min.js", - "/libs/jquery.smoothState.min.js", + "/dependencies/jquery.min.js", + "/dependencies/jquery.smoothState.min.js", "/script.js" ], { defer: false }); this.docpad.blocks["styles"].add([ - "/libs/Animate.css", - "/libs/fa.css", - "/libs/agate.css", + "/dependencies/Animate.css", + "/dependencies/fa.css", + "/dependencies/agate.css", "/styles.css", "https://fonts.googleapis.com/css?family=Open+Sans" ]); diff --git a/src/files/contactsubmit/class.phpmailer.php b/src/files/contactsubmit/dependencies/class.phpmailer.php similarity index 100% rename from src/files/contactsubmit/class.phpmailer.php rename to src/files/contactsubmit/dependencies/class.phpmailer.php diff --git a/src/files/contactsubmit/class.smtp.php b/src/files/contactsubmit/dependencies/class.smtp.php similarity index 100% rename from src/files/contactsubmit/class.smtp.php rename to src/files/contactsubmit/dependencies/class.smtp.php diff --git a/src/files/contactsubmit/index.php b/src/files/contactsubmit/index.php index ca6ed71..2785bdf 100644 --- a/src/files/contactsubmit/index.php +++ b/src/files/contactsubmit/index.php @@ -1,7 +1,7 @@ Date: Fri, 4 Nov 2016 23:07:16 +0000 Subject: [PATCH 2/2] Changed dependencies to vendor, may fix GitHub issue? --- docpad.js | 10 +++++----- src/files/contactsubmit/index.php | 4 ++-- .../{dependencies => vendor}/class.phpmailer.php | 0 .../{dependencies => vendor}/class.smtp.php | 0 src/files/{dependencies => vendor}/Animate.css | 0 src/files/{dependencies => vendor}/agate.css | 0 src/files/{dependencies => vendor}/fa.css | 0 src/files/{dependencies => vendor}/jquery.min.js | 0 .../{dependencies => vendor}/jquery.smoothState.min.js | 0 9 files changed, 7 insertions(+), 7 deletions(-) rename src/files/contactsubmit/{dependencies => vendor}/class.phpmailer.php (100%) rename src/files/contactsubmit/{dependencies => vendor}/class.smtp.php (100%) rename src/files/{dependencies => vendor}/Animate.css (100%) rename src/files/{dependencies => vendor}/agate.css (100%) rename src/files/{dependencies => vendor}/fa.css (100%) rename src/files/{dependencies => vendor}/jquery.min.js (100%) rename src/files/{dependencies => vendor}/jquery.smoothState.min.js (100%) diff --git a/docpad.js b/docpad.js index 38604d9..479d0a8 100644 --- a/docpad.js +++ b/docpad.js @@ -45,16 +45,16 @@ var docpadConfig = { events: { populateCollections: function(){ this.docpad.blocks["scripts"].add([ - "/dependencies/jquery.min.js", - "/dependencies/jquery.smoothState.min.js", + "/vendor/jquery.min.js", + "/vendor/jquery.smoothState.min.js", "/script.js" ], { defer: false }); this.docpad.blocks["styles"].add([ - "/dependencies/Animate.css", - "/dependencies/fa.css", - "/dependencies/agate.css", + "/vendor/Animate.css", + "/vendor/fa.css", + "/vendor/agate.css", "/styles.css", "https://fonts.googleapis.com/css?family=Open+Sans" ]); diff --git a/src/files/contactsubmit/index.php b/src/files/contactsubmit/index.php index 2785bdf..55bc8e5 100644 --- a/src/files/contactsubmit/index.php +++ b/src/files/contactsubmit/index.php @@ -1,7 +1,7 @@