Răsfoiți Sursa

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.
Phillip Webb 11 ani în urmă
părinte
comite
b8773f1166
3 a modificat fișierele cu 10 adăugiri și 7 ștergeri
  1. 6 1
      _config.yml
  2. 0 2
      _includes/project_sidebar.html
  3. 4 4
      _includes/widget_templates.html

+ 6 - 1
_config.yml

@@ -25,9 +25,14 @@ github_repo_url: http://github.com/spring-projects/spring-security
 # Project forum URL
 forum: http://forum.spring.io/forum/spring-projects/security
 
-# Custom properties
+## Custom properties
 guides_base_url: http://docs.spring.io/spring-security/site/docs/3.2.x/guides
 
+# 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
 
 main_site_url: http://spring.io

+ 0 - 2
_includes/project_sidebar.html

@@ -1,11 +1,9 @@
 {% include documentation.html %}
-{%unless badges contains 'not found in _includes directory' %}
 <div class="right-pane-widget--container no-top-border">
     <div class="project-sub-link--wrapper">
         {% include badges.html %}
     </div>
 </div>
-{%endunless%}
 <div class="right-pane-widget--container no-top-border project-sidebar-resource--wrapper">
     {{ related_resources | markdownify }}
 </div>

+ 4 - 4
_includes/widget_templates.html

@@ -62,11 +62,11 @@
 </script>
 
 
+{% 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 %}
 <dependencies>
     <dependency>
@@ -99,11 +99,11 @@
 {% endhighlight %}
 </script>
 
+{% 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 @}'