Display feed(s) in footer if no SOCIAL links

For sites where there are no SOCIAL links defined the FEED_ALL_ATOM and/or the FEED_ALL_RSS links are not displayed.
Also update the functional tests output.
This commit is contained in:
Steve Schwarz 2013-02-23 16:43:48 -06:00 committed by Alexis Métaireau
commit 1bbfdf96a0
27 changed files with 209 additions and 27 deletions

View file

@ -54,7 +54,7 @@
</ul> </ul>
</div><!-- /.blogroll --> </div><!-- /.blogroll -->
{% endif %} {% endif %}
{% if SOCIAL %} {% if SOCIAL or FEED_ALL_ATOM or FEED_ALL_RSS %}
<div class="social"> <div class="social">
<h2>social</h2> <h2>social</h2>
<ul> <ul>

View file

@ -53,6 +53,13 @@
</article> </article>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -54,6 +54,13 @@
</dl> </dl>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -52,6 +52,13 @@
</article> </article>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -52,6 +52,13 @@
</article> </article>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -52,6 +52,13 @@
</article> </article>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -86,6 +86,13 @@ as well as <strong>inline markup</strong>.</p>
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -36,6 +36,13 @@
<li><a href="./category/yeah.html">yeah</a></li> <li><a href="./category/yeah.html">yeah</a></li>
</ul> </ul>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -56,6 +56,13 @@ YEAH !</p>
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -119,6 +119,13 @@
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -100,6 +100,13 @@
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -62,6 +62,13 @@
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -52,6 +52,13 @@
</article> </article>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -245,6 +245,13 @@ YEAH !</p>
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -60,6 +60,13 @@ YEAH !</p>
</article> </article>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -38,6 +38,13 @@ Anyone can see this page but it's not linked to anywhere!</p>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -38,6 +38,13 @@
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -54,6 +54,13 @@
</article> </article>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -54,6 +54,13 @@
</article> </article>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -134,6 +134,13 @@ YEAH !</p>
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -78,6 +78,13 @@
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -104,6 +104,13 @@ as well as <strong>inline markup</strong>.</p>
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -62,6 +62,13 @@
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -56,6 +56,13 @@ YEAH !</p>
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -56,6 +56,13 @@ YEAH !</p>
</ol><!-- /#posts-list --> </ol><!-- /#posts-list -->
</section><!-- /#content --> </section><!-- /#content -->
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -66,6 +66,13 @@
</article> </article>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">

View file

@ -54,6 +54,13 @@
</article> </article>
</section> </section>
<section id="extras" class="body"> <section id="extras" class="body">
<div class="social">
<h2>social</h2>
<ul>
<li><a href="/feeds/all.atom.xml" type="application/atom+xml" rel="alternate">atom feed</a></li>
</ul>
</div><!-- /.social -->
</section><!-- /#extras --> </section><!-- /#extras -->
<footer id="contentinfo" class="body"> <footer id="contentinfo" class="body">