diff --git a/.gitignore b/.gitignore index 5c156b92..28ddecfc 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ #*# *.pyc www/djangocommonsettings.py +www/conservancy/static/source diff --git a/apache2/sites-available/sfconservancy.org b/apache2/sites-available/sfconservancy.org index 532d65ff..c7def9c7 100644 --- a/apache2/sites-available/sfconservancy.org +++ b/apache2/sites-available/sfconservancy.org @@ -30,6 +30,13 @@ NameVirtualHost 10.10.11.21:80 AllowOverride None + + Options Indexes FollowSymLinks -MultiViews + Order allow,deny + allow from all + AllowOverride None + + PythonPath "['/var/www'] + sys.path" SetEnv DJANGO_SETTINGS_MODULE conservancy.settings PythonDebug Off diff --git a/www/conservancy/static/about/license/index.html b/www/conservancy/static/about/license/index.html new file mode 100644 index 00000000..905af8a3 --- /dev/null +++ b/www/conservancy/static/about/license/index.html @@ -0,0 +1,30 @@ +{% extends "base_about.html" %} +{% block subtitle %}License and Sources - {% endblock %} +{% block submenuselection %}License{% endblock %} +{% block content %} +

License and Source For This Website

+ +

The software running this website is licensed under + the AGPLv3-or-later. + You can find a full copy of the sources hosted on + this site, but it may be more interesting to know that the site is + running on stock Debian lenny with Apache, Django, mod_python, and + sqlite installed, and that the main sources for the site's code itself + is hosted on + gitorious.

+ +

The documents on this website are + licensed as CC-By-SA-3.0 + Unported. In some cases, the documents are dual-licensed + (AGPLv3-or-later|CC-By-SA-3.0-Unported-or-later), to make it more + convenient to intermix the document with code.

+ +

Conservancy's Logo is also licensed + under CC-By-SA-3.0 + Unported. A high + quality PNG and an SVG + version are available. We would like to + thank Fabian A. Scherschel, who + designed the Conservancy logo.

+ +{% endblock %} diff --git a/www/conservancy/static/img/cc-by-sa_88x31.png b/www/conservancy/static/img/cc-by-sa_88x31.png new file mode 100644 index 00000000..f0a944e0 Binary files /dev/null and b/www/conservancy/static/img/cc-by-sa_88x31.png differ diff --git a/www/conservancy/static/img/conservancy-logo.svg b/www/conservancy/static/img/conservancy-logo.svg new file mode 100644 index 00000000..9c60b54b --- /dev/null +++ b/www/conservancy/static/img/conservancy-logo.svg @@ -0,0 +1,923 @@ + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0110 01 10111001 110 110010 1000010111 0111 1 0 11 01111011111000111010111101110101 1010 100110101011110110100110110011111 01101010011101101101111001100100110111011 1 10 10010001101011100000010101010100001010110 011001100011101010101111001100001100001110000111 101010010111000011001010111000101010111101001 100110011110001011010101111100001110101010011 10 11001100110000111110011010101101001011100110001101 01 011100110101010101010111010011100101011110001111 11010101110101000110101000111101011010011011100101 10110010110111011011111100001010111010011011001100110010 101 011101101111011010111110101101101010111001110010101 011 1000011011010111000101011110110001111011101101110010 010 10000101010101011010100000100101011011100101111010 1101101 0110110111000111011011100101011011000101111000010101 100101001101011001100111101 100101010110001110110010110110 011 00 1110100 011 10 10 0 0100 00010110 0 10111010011010101 10 1 1001111 01101001001011011101010101 1000110111011010 011101110101110001101 0 0111000110101110011 1011 100011010 10 100110011001101110 0 1101100 10 101001 1100111 101 1001 + diff --git a/www/conservancy/static/img/conservancy-logo_7000x6960.png b/www/conservancy/static/img/conservancy-logo_7000x6960.png new file mode 100644 index 00000000..688e73db Binary files /dev/null and b/www/conservancy/static/img/conservancy-logo_7000x6960.png differ diff --git a/www/conservancy/templates/base_about.html b/www/conservancy/templates/base_about.html index 21745fa3..d789c900 100644 --- a/www/conservancy/templates/base_about.html +++ b/www/conservancy/templates/base_about.html @@ -8,7 +8,8 @@
  • Directors
  • Officers
  • Staff
    • -
  • Filings
    • +
  • Filings
    • +
  • License & Sources
    • {% block content %}{% endblock %} diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index 9610157c..5945f53c 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -32,7 +32,11 @@ {% block outercontent %}
    {% block content %}{% endblock %}
    {% endblock %}

    Main Page | Contact | Privacy Policy | News Feed

    -

    This page is licensed under the Creative Commons Attribution-NonCommercial-NoDerivs 2.0 license.

    +

    + Creative Commons License +
    This page is licensed under a + Creative + Commons Attribution-ShareAlike 3.0 Unported License.