diff --git a/www/conservancy/feeds.py b/www/conservancy/feeds.py index 699a0251..d71b0293 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 a07215ec..269faf61 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 213def8a..09ef50e3 100644 --- a/www/conservancy/static/privacy-policy/index.html +++ b/www/conservancy/static/privacy-policy/index.html @@ -4,16 +4,16 @@

Privacy Policy

-

The Software Freedom Conservancy ("SFC") is committed to protecting +

The Software Freedom Conservancy (“Conservancy”) 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, “Conservancy” or “We” 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).

-

Information Collected

When you visit our site, SFC may +

Information Collected

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 cb88cdec..a52aea88 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; } +p, h1, h2, h3, h4, h5, h6, #mainContent ul, #mainContent ol { + margin-top: 1em; + margin-bottom: 1em; +} -#sflcheader h1 { +body { + font-family: "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif; + font-size: 90%; +} + +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; +} +#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; } -#sflcheader h1 a { +#conservancyheader h1 a { color: #000; } -#affiliate-sflc { - padding: 2px 10px; - white-space: nowrap; - font-size: x-small; - text-align: right; - background: #cdeaec; -} - #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 9929a25f..7c6b317d 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -6,14 +6,14 @@ {% block title %}{% block subtitle %}{% endblock %}Software Freedom Conservancy{% endblock %} - - + + {% block head %}{% endblock %} - -

+ +

Software Freedom Conservancy