Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge upstream change w/ my change to donate page

Browse source
This commit is contained in:
Bradley M. Kuhn 2014-07-30 13:10:51 -04:00
commit 328a972416
2 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
www/conservancy/static/about/eval-committee/index.html
View file

@ -113,13 +113,14 @@ platform.</p>
<p>Martin Michlmayr has been involved in various free and open source
software projects for well over 15 years. He acted as the leader of the
Debian project for two years and currently serves on the board of the Open
Source Initiative (OSI). Martin works for HP as an Open Source Community
Expert. In this role, he facilitates open source activities both
Debian project for two years, served on the board of the Open Source
Initiative (OSI) for six years and currently serves on the board of
Software Freedom Conservancy. Martin works for HP as an Open Source
Community Expert. In this role, he facilitates open source activities both
internally within HP as well as externally within the broader open source
community. Martin holds Master degrees in Philosophy, Psychology and
Software Engineering, and earned a PhD from the University of
Cambridge.</p>
community. Martin earned a PhD from the University of Cambridge and he
received an O'Reilly Open Source Award in 2013 for his contributions to the
open source community.</p>
<h2>Evan Prodromou</h2>

19
www/conservancy/templates/frontpage.html
View file

@ -87,26 +87,19 @@
{% endif %}
<p><span class="continued"><a href="/news/">Conservancy News Archive&hellip;</a></span></p>
{% if blog.0.is_recent %}
<div class="shaded">
<h2><a href="/feeds/blog/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> <a href="/blog/">Conservancy Blog</a></h2>
<div class="shaded">
<h3><a href="{{ blog.0.get_absolute_url }}">{{ blog.0.headline|safe }}</a></h3>
<p class="date">Posted by {{ blog.0.author.formal_name }}
on {{ blog.0.pub_date|date:"F j, Y" }}</p>
<p class="date">Posted by {{ blog.0.author.formal_name }} on {{ blog.0.pub_date|date:"F j, Y" }}</p>
{{ blog.0.summary|safe }}
<p><span class="continued"><a href="{{ blog.0.get_absolute_url }}">Read More
from {{ blog.0.author.casual_name }} on this&hellip;</a></span></p>
</div>
{% endif %}
<p><span class="continued"><a href="{{ blog.0.get_absolute_url }}">Read More from {{ blog.0.author.casual_name }} on this&hellip;</a></span></p>
{% if blog.1.is_recent %}
<div class="shaded">
<hr/>
<h3><a href="{{ blog.1.get_absolute_url }}">{{ blog.1.headline|safe }}</a></h3>
<p class="date">Posted by {{ blog.1.author.formal_name }}
on {{ blog.1.pub_date|date:"F j, Y" }}</p>
<p class="date">Posted by {{ blog.1.author.formal_name }} on {{ blog.1.pub_date|date:"F j, Y" }}</p>
{{ blog.1.summary|safe }}
<p><span class="continued"><a href="{{ blog.0.get_absolute_url }}">Read More
from {{ blog.1.author.casual_name }} on this&hellip;</a></span></p>
<p><span class="continued"><a href="{{ blog.0.get_absolute_url }}">Read More from {{ blog.1.author.casual_name }} on this&hellip;</a></span></p>
{% endif %}
</div>
{% endif %}
<p><span class="continued"><a href="/blog/">Conservancy Blog Archive&hellip;</a></span></p>