From 85ed196cf49d691adbc46d68bb6bee14240ed023 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Thu, 14 Nov 2013 09:54:55 -0800 Subject: [PATCH 1/3] 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 bc1bafcadb..e72a8e7c20 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 14a24de56b..cddaca6259 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' %}
{% include badges.html %}
-{%endunless%}
{{ related_resources | markdownify }}
diff --git a/_includes/widget_templates.html b/_includes/widget_templates.html index c0253e754c..4e609c6fff 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 92c5b852c1dfdd0cfdf988722212a1ddc63fdb18 Mon Sep 17 00:00:00 2001 From: Brian Clozel Date: Tue, 15 Apr 2014 14:54:48 +0200 Subject: [PATCH 2/3] Add missing ZeroClipbpard SWF file Flash support for ZeroClipboard is not working in project pages since the SWF file is missing. There was a typo in the .gitignore file that ignored "*.sw?" files. --- .gitignore | 2 +- js/ZeroClipboard.swf | Bin 0 -> 1635 bytes 2 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 js/ZeroClipboard.swf diff --git a/.gitignore b/.gitignore index fb768ab709..017acc50aa 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,6 @@ *~ _site .idea -*.sw? +*.sw[op] .project sample-pages diff --git a/js/ZeroClipboard.swf b/js/ZeroClipboard.swf new file mode 100644 index 0000000000000000000000000000000000000000..880e64ee7614e224660c6616b4bbb1ee5fab8ec9 GIT binary patch literal 1635 zcmV-p2AugrS5prD2><|i+I>}9Z`;@rK0}c_ByHJ}?I?+JQ#Rf>o5+@IXOp$p(Z-Ri zjT772`m$RD392LV(Bg(7Rg&_hFAWOxAN0NGOaDNhi~fKD1)ZSidmk2k>@TQ0hg5vo zE=owlnQtyU^UY8?B=SEA8Tlh2SAf*>R|z4%9{(#4vK(0U(pJ4uJnXt&xP;b|=}r{& zmdfRWgM-h(sVY9a1 zkDg3V52{+`Y0+LkaFddjS>`V9axV(YbF*_;$TF8~Kj^Zk%6dK5F_|b=KAZ_VzWMfm z?eiJiWnpKzd=@BjA}4Zrb;a`Ayx4I0Vew&c#`g_=pL=%e=il+vC;M&BS+V zCud|4ufAYjaqe-cIA57tNRJ`VEz_(m65>-tN4}GKfEHz z_4|MSZfzMS{x{{yPu=Wy+dRl#cw9CuVL4&XWk>3E zFK{BRw);`!dzy(+JNz&*x}r4Zm~Zt&ZSM0xOSOKKLUrVoCfaUK>+*=zS;T0_BT*oW z_vg&BYW*Pe1A%Tkzv4<5A;;3ry24y%&!e8dZ8DeZp^zKC#f^2JSv*+tY+nw1KQi1? z+vqXDPQ-&S8wLF^;#S@7GRM0;SfjHQTG?JG&sQps%I&`6Mvga>w%m^#H=MZ8{!-fh z)J3qK-cwF%KE7&>$AeoJgVsDe3Ns^TpQnM>{!fwX=jXPRj7<1hWa7dOh8iAWPhD-B zn|(af5xiEgfD=itU(4V7*aUN3{~&GINXI1@%Od}0L~DBi>vbG6)Z2W|@fwcn8VTp$ zIabseO4R4v+3Q4_6|jRXJQ|Lo*I^p7tXju$Ev2@;R(qL4GdbnDgNMTAjg98+_UbR1 z->z=y19f+20M?t|ZEC5y`_0Ip(?ev(V{U$Rpd@tJ%;ZDjN!Ux9nQsdhHZ!44P$G+| z%eWJ+x}A_RjQevMrs0TtE-r!`iABTLl5O!{_PN-Il*(^$NAT4guCX3#JIJBKL%N@W zDs!Wk{D_)S;No2iJB}>?9=&g< zDkD@GrAm$}d8&+2Wt_qUg-a9)6fRS^O5qyKT&Hk@!c7Xd^divQXZi!sXMn;ig))T- zg*giI6c#8vr0_X~M-(1Y_=3VBg(V7KQdp+&gyz4Z@RUN0=IRtysrGYH#4?@bEdQ0Zqhvqdx8G_y1O@y825`e`9$qzuudG)5LeK@e2+V|?A`Jt{WP!*dK$KA+Y7Pj^1JTBS=;I&)F^tMUhOwfiXX47&2q}_o z`~Yz!UL&oE(iL_IV-xg6V9?5mB-U{Aiw{QcOzHa12`>pCi>`;8k=Dm89G^A^N! zv=^4gKlNo5}D1^E12w0geG*f|H4sc!7VmEvzrxwO`LWIx`8cbR`2 zi(z~?w!dJDD3{omD3{rjDPk(`e`Bh-aYFRA+E#92+K0CMzAf8TR-IRs{0}E5nyM)u zp5yLF_)v&NUi0)~{)jnM({70UPQDZ)b%ZqJ>#!bvMrX{}UR&nm52 hrB$!AH2nOW+(@nt#n7>F@%Mf4Z~ZAE{{=lE$MA>_KQRCR literal 0 HcmV?d00001 From 7e6493ef7bcc247a866189ae772f7a1549348203 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 13 May 2014 16:22:19 +0100 Subject: [PATCH 3/3] 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 753c1c555e..cb2ea49578 100644 --- a/_includes/billboard.html +++ b/_includes/billboard.html @@ -17,10 +17,12 @@ +{% if site.forum %}
+{% endif %}