Cwikius-Spring/spring-security
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-security.git synced 2025-06-28 14:52:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove 'not found in _includes' hacks

Browse Source 
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.
This commit is contained in:
Phillip Webb 2013-11-14 09:54:55 -08:00 committed by Rob Winch
parent b2d37a048f
commit b8773f1166
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
_config.yml
View File

@ -25,9 +25,14 @@ github_repo_url: http://github.com/spring-projects/spring-security
# Project forum URL # Project forum URL
forum: http://forum.spring.io/forum/spring-projects/security 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 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 ### The following properties are constant for most projects
main_site_url: http://spring.io main_site_url: http://spring.io

2
_includes/project_sidebar.html
View File

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

8
_includes/widget_templates.html
View File

@ -62,11 +62,11 @@
</script> </script>
{% if site.custom_pom_template %}
{% capture maven_pom_template %} {% capture maven_pom_template %}
{% include pom.xml %} {% include pom.xml %}
{% endcapture %} {% endcapture %}
{% else %}
{%if maven_pom_template contains 'not found in _includes directory' %}
{% capture maven_pom_template %} {% capture maven_pom_template %}
<dependencies> <dependencies>
<dependency> <dependency>
@ -99,11 +99,11 @@
{% endhighlight %} {% endhighlight %}
</script> </script>
{% if site.custom_gradle_template %}
{% capture gradle_template %} {% capture gradle_template %}
{% include build.gradle %} {% include build.gradle %}
{% endcapture %} {% endcapture %}
{% else %}
{%if gradle_template contains 'not found in _includes directory' %}
{% capture gradle_template %} {% capture gradle_template %}
dependencies { dependencies {
compile '{@= groupId @}:{@= artifactId @}:{@= version @}' compile '{@= groupId @}:{@= artifactId @}:{@= version @}'