Changeset - f1575ece1a6b
[Not reviewed]
Merge
3 12 7
Bradley Kuhn (bkuhn) - 8 years ago 2013-03-01 17:03:43
bkuhn@ebb.org
Merge in various HTML fixes from Martin Michlmayr <tbm@cyrius.com> on 2013-02-21.

This did not fast-forward merge because I'd made changes to those files since
Martin submitted his merge request. This merge brings in the changes
contributed in the following two commits from Martin:

commit 8b54927bb51833156a75354090c6ff7dd8794bc8
Author: Martin Michlmayr <tbm@cyrius.com>
Date: 2013-02-21 21:47:15 +0000

Remove stray character

commit 660c48a528baf4e09bb7cc3ccd30afd7bf46072d
Author: Martin Michlmayr <tbm@cyrius.com>
Date: 2013-02-21 21:46:40 +0000

Fix various HTML syntax errors
6 files changed with 10 insertions and 11 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/about/contact/index.html
Show inline comments
...
 
@@ -18,6 +18,7 @@ If you don't hear from us within a week, please try again.</p>
 
<p>Software Freedom Conservancy, Inc.<br />
 
137 MONTAGUE ST  STE 380<br/>
 
Brooklyn, NY 11201-3548
 
</p>
 

	
 
<h2>Internet Relay Chat</h2>
 

	
www/conservancy/static/about/filings/index.html
Show inline comments
...
 
@@ -10,7 +10,6 @@ as a non-profit in the State of New York, files an annual CHAR-500 with
 
New York State.  Below, Conservancy makes available these filings for
 
public inspection, in reverse chronological order:</p>
 

	
 
<p>
 
<ul>
 
<li>Fiscal Year 2012 (from 2012-03-01 through 2013-02-28)
 
<p>For FY 2012, Conservancy's due date for filing its Form 990, CHAR 500, and related paperwork is currently 2013-07-15.</p>
...
 
@@ -60,5 +59,5 @@ public inspection, in reverse chronological order:</p>
 
    incorporation documents, and as approved by New York on 7 April 2006.</a></li>
 
</ul>
 
</li>
 
</ul></p>
 
</ul>
 
{% endblock %}
www/conservancy/static/about/outside/index.html
Show inline comments
...
 
@@ -23,11 +23,11 @@ culture.</p>
 
pertaining to free licenses (GNU/GPL, Creative Commons) as well at Wikimania
 
2008, the annual international conference of the Wikimedia Foundation. Olivier
 
is also a masters instructor at the University of Paris I La Sorbonne and a
 
+member of the associations INTA and IAEL.</p>
 
member of the associations INTA and IAEL.</p>
 

	
 
<h2>Daniel B. Ravicher - Litigation Counsel</h2>
 

	
 
Daniel B. Ravicher is a Lecturer in Law at Benjamin N. Cardozo School of
 
<p>Daniel B. Ravicher is a Lecturer in Law at Benjamin N. Cardozo School of
 
Law.  He has published numerous legal articles and given dozens of
 
presentations regarding Free and Open Source Software legal issues and
 
served as lead counsel for free and open source software developers in the
...
 
@@ -60,7 +60,7 @@ of  <a href="http://pubpat.org">the Public Patent Foundation</a>.
 
  legal work with Conservancy, SFLC, and Question Copyright and serves
 
  as <a href="/about/officers#karen">an officer of both the Conservancy</a>
 
  and SFLC.  Before joining SFLC, Karen worked as an associate in the
 
  corporate departments of Gibson, Dunn & Crutcher LLP in New York and
 
  corporate departments of Gibson, Dunn &amp; Crutcher LLP in New York and
 
  Clifford Chance in New York and London. Karen received her law degree
 
  from Columbia Law School in 2000, where she was a James Kent Scholar and
 
  co-founder of the Columbia Science and Technology Law Review. Karen
www/conservancy/templates/blog/entry_detail.html
Show inline comments
...
 
@@ -7,7 +7,7 @@
 
<p class="date">{{ object.pub_date|date:"F j, Y" }} by {{ object.author.formal_name }}</p>
 
<h2>{{ object.headline|safe }}</h2>
 
{{ object.body|safe }}
 
<p><i>Posted by <strong>{{ object.author.formal_name }}</strong> on {{ object.pub_date|date:"F j, Y" }}.  Please email any comments on this entry to info@sfconservancy.org</a>.</i></p>
 
<p><i>Posted by <strong>{{ object.author.formal_name }}</strong> on {{ object.pub_date|date:"F j, Y" }}.  Please email any comments on this entry to <a href="mailto:info@sfconservancy.org">info@sfconservancy.org</a>.</i></p>
 

	
 
{% if object.tags.all %}<p class="blog-tags">Tags: {% for tag in object.tags.all %}<a href="{{ tag.get_absolute_url }}">{{ tag.label }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}</p>{% endif %}
 

	
www/conservancy/templates/frontpage.html
Show inline comments
...
 
@@ -25,8 +25,8 @@
 
<div class="columns">
 

	
 
<div class="column column-small column-left">
 
<p>
 
<h2>Learn More about Conservancy</h2>
 
<p>
 
<span class="continued"><a href="/overview/">An Overview of Conservancy&hellip;</a></span>
 
<span class="continued"><a href="/members/current/">Conservancy's current member projects&hellip;</a></span>
 
<span class="continued"><a href="/members/services/">Services that Conservancy provides to its member projects&hellip;</a></span>
...
 
@@ -85,8 +85,7 @@
 
</div>
 
{% endif %}
 
{% endif %}
 
<p><span class="continued"><a href="/news/">Conservancy News
 
      Archive&hellip;</a></p>
 
<p><span class="continued"><a href="/news/">Conservancy News Archive&hellip;</a></span></p>
 
{% if blog.0.is_recent %}
 
<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">
...
 
@@ -107,7 +106,7 @@
 
<p><a href="/blog/">Conservancy Blog Archive...</a></p>
 
</div>
 
{% else %}
 
<p><span class="continued"><a href="/blog/">Conservancy Blog Archive&hellip;</a></p>
 
<p><span class="continued"><a href="/blog/">Conservancy Blog Archive&hellip;</a></span></p>
 
</div>
 
{% endif %}
 
</div>
www/conservancy/templates/news/pressrelease_list.html
Show inline comments
...
 
@@ -4,7 +4,7 @@
 
{% block outercontent %}
 
    <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
 
         <h2>News Index by Year</h3>
 
         <h2>News Index by Year</h2>
 
         <ul>
 
         {% for year in date_list reversed %}<li class="{{ year|date:"Y" }}"><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
 
         </ul>
0 comments (0 inline, 0 general)