website Changeset - a18e221dc6ce · Conservancy Kallithea

Changeset - a18e221dc6ce

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Bradley Kuhn (bkuhn) - 11 years ago 2013-02-21 18:42:10
bkuhn@ebb.org

Move email subscribe box to the front page only.

It just looked wrong up there on top of the page. I know that's what I
suggested to Paul to do it, but 11 months later, when I finally accepted his
merge request, it just didn't make sense.

2 files changed with 7 insertions and 6 deletions:

www/conservancy/templates/base_conservancy.html

www/conservancy/templates/frontpage.html

0 comments (0 inline, 0 general)

www/conservancy/templates/base_conservancy.html

➞

Show inline comments

 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
   <head>
     <title>{% block title %}{% block subtitle %}{% endblock %}Software Freedom Conservancy{% endblock %}</title>
     <meta http-equiv="content-type" content="text/html; charset=utf-8" />
     <meta name="description" content="The Software Freedom Conservancy provides a non-profit home and services to Free, Libre and Open Source Software (FLOSS) projects." />
     <meta name="keywords" content="software, freedom, conservancy, open source, gnu, GNU, Open Source, Free and Open Source, Free and Open Source Software, FLOSS, FOSS, protect, protection, help, policy, linux, non-profit" />
     <link rel="stylesheet" type="text/css" media="screen, projection" href="/conservancy.css" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     {% block head %}{% endblock %}
   </head>
   <body class="conservancy-{% block category %}other{% endblock %}">
     <div id="conservancyheader">
       <h1><span id="logobutton"><a href="/">Software Freedom Conservancy</a></span></h1>
       <span id="subbox">
         <form method="post" action="http://lists.sfconservancy.org/mailman/subscribe/announce">
           Subscribe to our announcements mailing list<br/><input name="email" placeholder="joe@example.org"/><input type="submit" name="email-button" value="Subscribe"/>
         </form>
       </span>
     </div>
     <div id="navbar-outer">
       <div id="navbar">
 	<ul>
           <li class="overview"><a href="/overview/">Overview</a></li>
           <li class="news"><a href="/news/">News</a></li>
           <li class="blog"><a href="/blog/">Blog</a></li>
 	  <li class="Members"><a href="/members/">Member Projects &amp; Services</a></li>
           <li class="About"><a href="/about/">About</a></li>
 	  <li class="sponsors"><a href="/sponsors/">Sponsors</a></li>
 	  <li class="donate"><a href="/donate/">Support Conservancy!</a></li>
 	</ul>
       </div>
       <div id="navbar-clear"></div>
     </div>
       {% block outercontent %}<div id="mainContent">{% block content %}{% endblock %}</div>{% endblock %}
     <div id="conservancyfooter">
       <p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/sponsors/">Sponsors</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/omnibus/">RSS Feed</a></p>
       <p>Follow Conservancy
       on <a href="http://identi.ca/conservancy">identi.ca</a>
       and <a href="http://twitter.com/conservancy">twitter</a>.
       <a href="http://flattr.com/thing/922714/Donate-to-Software-Freedom-Conservancy" target="_blank">
       <img src="http://api.flattr.com/button/flattr-badge-large.png" alt="Flattr us!" title="Flattr us!" border="0" /></a></p>
       <p class="copyright_info">

www/conservancy/templates/frontpage.html

➞

Show inline comments

@@ ... / @@ -10,58 +10,64 @@ @@
 {% block content %}
 <div class="singleColumn">
 <h1>Software Freedom Conservancy</h1>
 <p>Software Freedom Conservancy is a not-for-profit organization that
   helps promote, improve, develop, and defend Free, Libre, and Open Source
   Software (FLOSS) projects.  Conservancy provides a non-profit home and
   infrastructure for FLOSS projects.  This allows FLOSS developers to
   focus on what they do best &mdash; writing and improving FLOSS for the
   general public &mdash; while Conservancy takes care of the projects' needs that
   do not relate directly to software development and documentation.</p>
 </div>
 <div class="columns">
 <div class="column column-small column-left">
 <p>
 <h2>Learn More about Conservancy</h2>
 <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>
 </p>
-<h2>Follow Conservancy RSS Feeds and Microblogs</h2>
+<h2>Follow Conservancy RSS Feeds, Microblogs, and mailing list</h2>
 <p>There is a <a href="/feeds/omnibus/">full site feed available</a>, as
   well as separate feeds for the <a href="/feeds/news/">news items</a> and
   <a href="/feeds/blog/">blog posts</a>.</p>
 <p>You can also follow Conservancy
  on <a href="http://identi.ca/conservancy">identi.ca</a>
  and <a href="http://twitter.com/conservancy">twitter</a>.</p>
 <p>
     <span id="subbox">
         <form method="post" action="http://lists.sfconservancy.org/mailman/subscribe/announce">
           You can also subscribe to Conservancy's low-traffic email announce list <br/><input name="email" placeholder="joe@example.org"/><input type="submit" name="email-button" value="Subscribe"/>
         </form>
       </span></p>
 <h2>Support Conservancy</h2>
 <p>As a 501(c)(3) non-profit organization, Conservancy relies on
   charitable donations for its operations.
   Please <a href="/donate/">donate generously</a> to help our work!
 </p>
 </div>
 <div class="column column-large">
 {% if press_releases.0 %}
 {% if press_releases.0.pub_date|date_within_past_days:60 %}
 <div class="shaded">
 <h2><a href="/feeds/news/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> <a href="/news/">Recent News</a></h2>
 <p class="date">{{ press_releases.0.pub_date|date:"F j, Y" }}</p>
 <h3><a href="{{ press_releases.0.get_absolute_url }}">{{ press_releases.0.headline|safe }}</a></h3>
 {{ press_releases.0.summary|safe }}
 {% if press_releases.0.body %}<p><span class="continued"><a href="{{ press_releases.0.get_absolute_url }}">Read More...</a></span></p>{% endif %}
 {% if press_releases.1 %}
 {% if press_releases.1.pub_date|date_within_past_days:30 %}
 <hr/>
 <p class="date">{{ press_releases.1.pub_date|date:"F j, Y" }}</p>
 <h3><a href="{{ press_releases.1.get_absolute_url }}">{{ press_releases.1.headline|safe }}</a></h3>
 {{ press_releases.1.summary|safe }}
 {% if press_releases.1.body %}<p><span class="continued"><a href="{{ press_releases.1.get_absolute_url }}">Read More...</a></span></p>{% endif %}

0 comments (0 inline, 0 general)