From 12780197e5df85b433ab54c03871a98523a0db88 2010-09-26 21:56:29
From: Bradley M. Kuhn <bkuhn@ebb.org>
Date: 2010-09-26 21:56:29
Subject: [PATCH] Adapted Django application stuff for Conservancy; and normalized to string
"conservancy" within code and templates.

---

diff --git a/www/conservancy/feeds.py b/www/conservancy/feeds.py
index 699a02516f5511947cc60bbeba070167e3e5cd6f..d71b02935d62bc7bc3039419597d516b1c7b8221 100644
--- a/www/conservancy/feeds.py
+++ b/www/conservancy/feeds.py
@@ -1,5 +1,5 @@
 from django.contrib.syndication.feeds import Feed
-from sflc.apps.news.models import PressRelease
+from conservancy.apps.news.models import PressRelease
 
 from django.shortcuts import render_to_response
 from django.conf import settings
diff --git a/www/conservancy/frontpage.py b/www/conservancy/frontpage.py
index a07215ec277b76d72709bc265439b3a5d807fbc3..269faf617a654e2c4f21c7ff8084a7d8bf0ffc2b 100644
--- a/www/conservancy/frontpage.py
+++ b/www/conservancy/frontpage.py
@@ -1,5 +1,5 @@
 from django.shortcuts import render_to_response
-from sflc.apps.news.models import PressRelease
+from conservancy.apps.news.models import PressRelease
 from datetime import datetime, timedelta
 
 def view(request):
diff --git a/www/conservancy/static/privacy-policy/index.html b/www/conservancy/static/privacy-policy/index.html
index 213def8a7520973ae76a7b254d484dc2f10ba48f..09ef50e3688d5f79da191b521bdefe1c1c1b36c7 100644
--- a/www/conservancy/static/privacy-policy/index.html
+++ b/www/conservancy/static/privacy-policy/index.html
@@ -4,16 +4,16 @@
 
 <h1>Privacy Policy</h1>
 
-<p>The Software Freedom Conservancy ("SFC") is committed to protecting
+<p>The Software Freedom Conservancy (&ldquo;Conservancy&rdquo;) is committed to protecting
 the privacy of our website visitors and our supporters. In this
-policy, "SFC" or "We" refers to the SFC Board of Directors,
+policy, &ldquo;Conservancy&rdquo; or &ldquo;We&rdquo; refers to the Conservancy Board of Directors,
 Management, staff, cooperating attorneys, interns, volunteers, and
-consultants. As to all of the information described below, SFC will
+consultants. As to all of the information described below, Conservancy will
 not give, sell, rent, or exchange the information with anyone else
 without your prior consent, except as compelled by law (see section on
 Compelled Disclosure below).</p>
 
-<h3>Information Collected</h3> <p>When you visit our site, SFC may
+<h3>Information Collected</h3> <p>When you visit our site, Conservancy may
 record the numerical Internet protocol address of the computer you are
 using, the browser software you use and your operating system, the
 date and time you access our site, and the Internet address of the
diff --git a/www/conservancy/static/sfc.css b/www/conservancy/static/sfc.css
index cb88cdecf918aa84931ba1d3a23da0a7032c5f8f..a52aea88aea00540cc06beff52d2f2bf1f5dc7ea 100644
--- a/www/conservancy/static/sfc.css
+++ b/www/conservancy/static/sfc.css
@@ -1,35 +1,190 @@
-@import "http://www.softwarefreedom.org/sflc.css";
+* { margin: 0; padding: 0; }
+img { border: 0; }
+body { margin: 0; padding: 0; }
+.clear { clear: both; }
+.hidden { display: none; }
 
-#sflcheader { background: #d4ff9d url(/img/headerbg.png) left top repeat-x; }
-
-#sflcheader h1 {
-  text-indent: 0;
-  margin: 0;
-  margin-left: 104px;
-  line-height: 72px;
+p, h1, h2, h3, h4, h5, h6, #mainContent ul, #mainContent ol {
+  margin-top: 1em;
+  margin-bottom: 1em;
 }
 
-#sflcheader h1 a {
-  color: #000;
+body {
+  font-family: "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif;
+  font-size: 90%;
 }
 
-#affiliate-sflc {
+a { text-decoration: none; color: #146624; }
+a:hover { text-decoration: underline; color: #665f14; }
+
+h1 { margin-top: .75em; margin-bottom: .5em; }
+h2 { margin-top: .75em; margin-bottom: .5em; }
+h3 { margin-top: .6em; margin-bottom: .4em; }
+
+#mainContent h1 { border-bottom: 1px solid #00334b; }
+h2 { border-bottom: 1px solid #aaa; }
+
+#mainContent { clear: both; margin-left: 79px; padding: 4px 25px; }
+#mainContent ul, #mainContent ol { padding-left: 1.5em; }
+
+#mainContent img { margin: 3px; }
+
+.internalNavigate { width: 19%; float: right; }
+#mainContent .internalNavigate ul { list-style-type: none; padding-left: 0; }
+.internalNavigate ul li { margin-top: .3em; margin-bottom: .3em; }
+
+.affiliate-link { float: right; }
+#affiliate-conservancy, #affiliate-mr {
   padding: 2px 10px;
   white-space: nowrap;
   font-size: x-small;
   text-align: right;
-  background: #cdeaec;
+}
+#affiliate-conservancy { background: #d4ff9d; }
+#affiliate-mr { background: #ddd; }
+
+/* Header */
+
+#logobutton {
+  display: block;
+  position: absolute; left: 17px; top: 10px; height: 51px; width: 525px;
+  background: url(/img/conservancy-logo-wide.png) left center no-repeat;
+}
+
+/* Navigation bar */
+#navbar-outer { background: #CDDBDC; }
+#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 a {
+  display: block;
+  background: #fafafe;
+  padding: .2em .8em;
+  margin-right: 3px;
+  border: 1px solid #808080;
+  font-size: .8em;
+  background: #fff url(/img/nav-bg.png) bottom repeat-x;
+}
+#navbar li:hover a { background: #fff99d; }
+#navbar li { float: left; display: inline; margin-bottom: 3px; }
+
+/* Highlight current location on navbar */
+body.conservancy-about #navbar ul li.about a,
+body.conservancy-news #navbar ul li.news a,
+body.conservancy-blog #navbar ul li.blog a,
+body.conservancy-podcast #navbar ul li.podcast a,
+body.conservancy-services #navbar ul li.services a,
+body.conservancy-resources #navbar ul li.resources a,
+body.conservancy-technology #navbar ul li.technology a,
+body.conservancy-contact #navbar ul li.contact a,
+body.conservancy-donate #navbar ul li.donate a /* NO COMMA HERE! */
+      { background: #fff url(/img/nav-bg-up.png) top repeat-x; color: #000; }
+
+/* Navbar Submenus (currently unused) */
+#navbar li ul { display: none; border: 1px solid #444; }
+#navbar li:hover ul { display: block; position: absolute; }
+#navbar li ul li { float: none; }
+#navbar li ul li a { border: 0px; margin: 0px; }
+
+.shaded { background: #ffeab7; padding: .1em .5em; margin-bottom: .5em; }
+
+.singleColumn { width: 79%; }
+
+.columns { margin: 0; }
+
+.column-small { width: 31%; }
+.column-large { width: 66%; }
+.column-left { float: left; }
+.column-right { float: right; }
+
+.column h2 { font-size: 1.25em; }
+.column h3 { font-size: 1.1em; }
+
+.column h2 a { text-decoration: none; color: #000000; }
+.column h2 a:hover { text-decoration: underline; }
+
+#conservancyfooter {
+  margin-top: 1em;
+  border-top: 1px solid #ccc;
+  text-align: center;
+  clear: both;
+}
+
+span.continued {
+  display: block;
+  font-size: .83em;
+  font-weight: bold;
+  margin-top: 1em;
+  margin-bottom: 1em;
+}
+
+p.date {
+  font-style: italic;
+  font-size: .83em;
+  margin-bottom: .3em;
+  margin-top: .3em;
+}
+
+a.feedlink /* RSS icon */ { display: block; float: right; font-size: 10pt; }
+
+blockquote, div.quote /* div.quote is used by conservancy whitepaper */ {
+  margin-left: 2em;
+  margin-right: 2em;
+  padding-left: 1em;
+  padding-right: 1em;
+  border: 1px solid #fff;
+  background: #eee;
+}
+
+.newsgraphic { float: right; }
+.newsgraphic img { border: 1px solid #000; }
+
+.secondary_info { font-size: 83%; }
+.next_page_button { float: right; }
+.document_format { border: 1px solid #888; padding: .2em; background: #fff99d;}
+.copyright_info { font-size: 90%; }
+hr.footnote-separator { width: 80%; margin-left: auto; margin-right: auto; }
+
+/* Resources pages */
+div.download-formats { margin-top: 2em; margin-bottom: 2em; }
+.download-formats p { display: inline; }
+#mainContent .download-formats ul { display: inline; list-style: none;
+                                    padding-left: 0; }
+.download-formats ul li { display: inline; padding-left: 2em; }
+
+/* Resources - book styles */
+hr.chapter-separator { display: none; }
+h2.likechapterHead { text-align: center; }
+h2.chapterHead { text-align: center; }
+#mainContent ul.author { list-style-type: none; padding-left: 0; }
+#mainContent div.footnotes { font-style: normal; } /* remove italics */
+span.sectionToc { padding-left: 2em; } /* indent TOC properly */
+span.subsectionToc { padding-left: 4em; }
+span.subsubsectionToc { padding-left: 6em;}
+.js, .js p, .js p.bibitem, .js p.bibitem-p { background-color: #cde7e9; }
+
+#conservancyheader { background: #d4ff9d url(/img/headerbg.png) left top repeat-x; }
+
+#conservancyheader h1 {
+  text-indent: 0;
+  margin: 0;
+  margin-left: 104px;
+  line-height: 72px;
+}
+
+#conservancyheader h1 a {
+  color: #000;
 }
 
 #logobutton {
   position: absolute; left: 17px; top: 10px; height: 51px; width: 70px;
 }
 
-body.sfc-overview #navbar ul li.overview a,
-body.sfc-members #navbar ul li.members a,
-body.sfc-news #navbar ul li.news a,
-body.sfc-directors #navbar ul li.directors a,
-body.sfc-officers #navbar ul li.officers a,
-body.sfc-contact #navbar ul li.contact a,
-body.sfc-donate #navbar ul li.donate a /* NO COMMA HERE! */
+body.conservancy-overview #navbar ul li.overview a,
+body.conservancy-members #navbar ul li.members a,
+body.conservancy-news #navbar ul li.news a,
+body.conservancy-directors #navbar ul li.directors a,
+body.conservancy-officers #navbar ul li.officers a,
+body.conservancy-contact #navbar ul li.contact a,
+body.conservancy-donate #navbar ul li.donate a /* NO COMMA HERE! */
   { background: #fff url(http://www.softwarefreedom.org/img/nav-bg-up.png) top repeat-x; color: #000; }
diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html
index 9929a25fd1873d4058142e1f8965d086612eae23..7c6b317d4f68ea41572917ee292b2e31666bafee 100644
--- a/www/conservancy/templates/base_conservancy.html
+++ b/www/conservancy/templates/base_conservancy.html
@@ -6,14 +6,14 @@
     <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, law, open source, gnu, GNU, Open Source, Free and Open Source, Free and Open Source Software, FOSS, protect, protection, help, policy, privacy, Eben, Eben Moglen, Lawrence, Lawrence Lessig, Moglen, Lessig, Dan, Daniel Ravicher, Diane, Diane M. Peters, Peters, Open Source Development Labs, OSDL, Free Software Foundation, FSF, Stanford Law School, Harvard Law School, Berkman Center, Berkman Center for Internet and Society, law services, law, Daniel J. Weitzner, W3C, World Wide Web Consortium, Center for Democracy and Technology, CDT, Public Patent Foundation, PPF, MIT, internet, internet public policy, public policy, Electronic Frontier Foundation, EFF, software patents, Linux Foundation, linux" />
-    <link rel="stylesheet" type="text/css" media="screen, projection" href="/sfc.css" />
+    <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="sfc-{% block category %}other{% endblock %}">
-    <div id="sflcheader">
+  <body class="conservancy-{% block category %}other{% endblock %}">
+    <div id="conservancyheader">
       <h1><a href="/">Software Freedom Conservancy</a></h1>
     </div>
     <div id="navbar-outer">
@@ -33,7 +33,7 @@
     <div id="mainContent">
       {% block outercontent %}<div class="singleColumn">{% block content %}{% endblock %}</div>{% endblock %}
     </div>
-    <div id="sflcfooter">
+    <div id="conservancyfooter">
       <p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/news/">News Feed</a></p>
       <p class="copyright_info">This page is licensed under the <a href="http://creativecommons.org/licenses/by-nc-nd/2.0/">Creative Commons Attribution-NonCommercial-NoDerivs 2.0 license</a>.</p>
     </div>
diff --git a/www/conservancy/templates/news/pressrelease_archive_day.html b/www/conservancy/templates/news/pressrelease_archive_day.html
index ed528c943923cc1285b4c30ed2cf21f0621080d8..a6af5bac73b76592be8c4ceb12661db59c4f5418 100644
--- a/www/conservancy/templates/news/pressrelease_archive_day.html
+++ b/www/conservancy/templates/news/pressrelease_archive_day.html
@@ -1,10 +1,10 @@
 {% extends "base_news.html" %}
 
-{% block title %}SFC News Index - {{ day|date:"F j, Y" }}{% endblock %}
+{% block title %}Conservancy News Index - {{ day|date:"F j, Y" }}{% endblock %}
 
 {% block content %}
 
-<h2>SFLC News Index - {{ day|date:"F j, Y" }}</h2>
+<h2>Conservancy News Index - {{ day|date:"F j, Y" }}</h2>
 
 <ul>
 
diff --git a/www/conservancy/templates/news/pressrelease_archive_month.html b/www/conservancy/templates/news/pressrelease_archive_month.html
index 02829df26286c3f9911056f2e961ecbc50b67a2a..14f19660bc747a95b266e6b3796b188f7b6dbc7f 100644
--- a/www/conservancy/templates/news/pressrelease_archive_month.html
+++ b/www/conservancy/templates/news/pressrelease_archive_month.html
@@ -4,7 +4,7 @@
 
 {% block content %}
 
-<h2>SFLC News Index - {{ month|date:"F Y" }}</h2>
+<h2>Conservancy News Index - {{ month|date:"F Y" }}</h2>
 
 <ul>
 
diff --git a/www/conservancy/templates/news/pressrelease_archive_year.html b/www/conservancy/templates/news/pressrelease_archive_year.html
index 8e3fb80c3c943cc70c1ea39882b7fd4e5dad49d5..5910ba92026dde4eabb4266acd170cf81c7d8e6c 100644
--- a/www/conservancy/templates/news/pressrelease_archive_year.html
+++ b/www/conservancy/templates/news/pressrelease_archive_year.html
@@ -1,10 +1,10 @@
 {% extends "base_news.html" %}
 
-{% block title %}SFC News Index - {{ year }}{% endblock %}
+{% block title %}Conservancy News Index - {{ year }}{% endblock %}
 
 {% block content %}
 
-<h2>SFLC News Index - {{ year }}</h2>
+<h2>Conservancy News Index - {{ year }}</h2>
 
 <ul>
 
diff --git a/www/conservancy/urls.py b/www/conservancy/urls.py
index 26827e9faccc429b6f5076c5a1beb7f2e33bacf8..65ceea23e40f6964623267b2ef84c9ae66e196e3 100644
--- a/www/conservancy/urls.py
+++ b/www/conservancy/urls.py
@@ -8,5 +8,5 @@ urlpatterns = patterns('',
     (r'^feeds/(?P<url>.*)/$', 'django.contrib.syndication.views.feed',
      {'feed_dict': feed_dict}),
     (r'^feeds/$', 'conservancy.feeds.view'),
-    (r'^news/', include('sflc.apps.news.urls')),
+    (r'^news/', include('conservancy.apps.news.urls')),
 )