From 8e728d010c6fc7e80e5b16bc6f527844f1df4193 Mon Sep 17 00:00:00 2001
From: "Bradley M. Kuhn" <bkuhn@ebb.org>
Date: Mon, 1 Dec 2014 13:01:06 -0500
Subject: [PATCH] Campaign is no longer "campaign", but npoacct.

Changes in preparation of launching supporter program; no longer
highlight this as the "campaign".
---
 www/conservancy/static/conservancy.css          | 6 +++---
 www/conservancy/static/npoacct/index.html       | 6 +++---
 www/conservancy/templates/base_conservancy.html | 5 +++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/www/conservancy/static/conservancy.css b/www/conservancy/static/conservancy.css
index d0fff2b5..96e91fef 100644
--- a/www/conservancy/static/conservancy.css
+++ b/www/conservancy/static/conservancy.css
@@ -68,7 +68,7 @@ h3 { margin-top: .6em; margin-bottom: .4em; }
 #navbar { margin-left: 104px; margin-top: 3px; float: left; display: inline; }
 #navbar ul { list-style: none; }
 #navbar-clear { clear: both; border-bottom: 1px solid #808080; }
-#navbar li.campaign a {
+#navbar li.supporter a {
   display: block;
   background: #fafafe;
   padding: .2em .8em;
@@ -89,7 +89,7 @@ h3 { margin-top: .6em; margin-bottom: .4em; }
   border-color: #ffffff;
 }
 #navbar li:hover a { background: #577632; color: #fff; }
-#navbar li.campaign:hover a { background: #577632; color: #CE1F1F; }
+#navbar li.supporter:hover a { background: #577632; color: #CE1F1F; }
 #navbar li { float: left; display: inline; margin-bottom: 3px; }
 
 #mainContent {
@@ -252,7 +252,7 @@ body.conservancy-sponsors #navbar ul li.sponsors a /* NO COMMA HERE! */
     font-weight: bold;
     background: #fff url(/img/nav-bg-up.png) top repeat-x;
 }
-body.conservancy-campaign #navbar ul li.campaign a
+body.conservancy-supporter #navbar ul li.supporter a
 { 
     color: #000033;
     font-weight: bold;
diff --git a/www/conservancy/static/npoacct/index.html b/www/conservancy/static/npoacct/index.html
index f18ae57e..8909e2db 100644
--- a/www/conservancy/static/npoacct/index.html
+++ b/www/conservancy/static/npoacct/index.html
@@ -1,6 +1,6 @@
 {% extends "base_conservancy.html" %}
-{% block subtitle %}Campaign - {% endblock %}
-{% block category %}campaign{% endblock %}
+{% block subtitle %}NPOAcct - {% endblock %}
+{% block category %}npoacct{% endblock %}
 
 {% block head %}
 <link href="/jquery-ui.css" rel="stylesheet" type="text/css"/>
@@ -263,7 +263,7 @@ Other donation methods:
 </div><!-- /.toggle.unit -->
 
 <!-- Flattr start -->
-<p><a href="https://flattr.com/thing/1296704/Campaign-to-develop-Free-and-Open-Source-Non-Profit-Accounting-Software" target="_blank"><img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border:0" /></a></p>
+<p><a href="https://flattr.com/thing/1296704/NPOAcct-to-develop-Free-and-Open-Source-Non-Profit-Accounting-Software" target="_blank"><img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr this" title="Flattr this" style="border:0" /></a></p>
 <!-- Flattr end -->
 </td></tr></table>
 </div>
diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index 08907a75..682d27a0 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -25,8 +25,9 @@
 	  <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>
-          <li class="campaign"><a href="/campaign/">Campaign</a></li>
+	  <li class="donate"><a href="/donate/">Donate</a></li>
+          <li class="npoacct"><a href="/npoacct/">NPOAcct</a></li>
+	  <!-- <li class="supporter"><a href="/supporter/">Become a Supporter!</a></li> -->
 	</ul>
       </div>
       <div id="navbar-clear"></div>