From 85ed196cf49d691adbc46d68bb6bee14240ed023 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 14 Nov 2013 09:54:55 -0800 Subject: [PATCH 1/2] Remove 'not found in _includes' hacks Remove the use if "unless contains 'not found in _includes directory'" hacks that were previously used to detect when _includes were missing. This change is required as the hack no longer works with the latest Jekyll release (and therefore also with GitHub). Additional 'custom_pom_template' and 'custom_gradle_template' flags must now be set in _config.yml if you want to include a custom pom.xml or build.gradle file. --- _config.yml | 4 ++++ _includes/project_sidebar.html | 2 -- _includes/widget_templates.html | 8 ++++---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/_config.yml b/_config.yml index bc1bafca..e72a8e7c 100644 --- a/_config.yml +++ b/_config.yml @@ -25,6 +25,10 @@ github_repo_url: http://github.com/spring-projects/spring-framework # Project forum URL forum: http://forum.spring.io/forum/spring-projects/container +# If you want to include a custom pom.xml or gradle template set these value to true and add _include files +custom_pom_template: false +custom_gradle_template: false + ### The following properties are constant for most projects diff --git a/_includes/project_sidebar.html b/_includes/project_sidebar.html index 14a24de5..cddaca62 100644 --- a/_includes/project_sidebar.html +++ b/_includes/project_sidebar.html @@ -1,11 +1,9 @@ {% include documentation.html %} -{%unless badges contains 'not found in _includes directory' %}
-{%endunless%}
{{ related_resources | markdownify }}
diff --git a/_includes/widget_templates.html b/_includes/widget_templates.html index c0253e75..4e609c6f 100644 --- a/_includes/widget_templates.html +++ b/_includes/widget_templates.html @@ -62,11 +62,11 @@ +{% if site.custom_pom_template %} {% capture maven_pom_template %} {% include pom.xml %} {% endcapture %} - -{%if maven_pom_template contains 'not found in _includes directory' %} +{% else %} {% capture maven_pom_template %} @@ -99,11 +99,11 @@ {% endhighlight %} +{% if site.custom_gradle_template %} {% capture gradle_template %} {% include build.gradle %} {% endcapture %} - -{%if gradle_template contains 'not found in _includes directory' %} +{% else %} {% capture gradle_template %} dependencies { compile '{@= groupId @}:{@= artifactId @}:{@= version @}' From 7e6493ef7bcc247a866189ae772f7a1549348203 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 13 May 2014 16:22:19 +0100 Subject: [PATCH 2/2] Make the link to a project's forum optional Omit the link to the forum if the project's metadata does not provide a forum url --- _includes/billboard.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_includes/billboard.html b/_includes/billboard.html index 753c1c55..cb2ea495 100644 --- a/_includes/billboard.html +++ b/_includes/billboard.html @@ -17,10 +17,12 @@ +{% if site.forum %}
+{% endif %}