From f426e60136a28a2127c91b17ff8f8c20c0376c66 Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Sun, 3 Oct 2010 18:37:08 -0400 Subject: [PATCH] Mostly got a sidebar on the left working, for submenu. Modifications to the templates to take advantage of new submenu. Some content changes with "about" section, where I was implementing the changes. --- .../static/about/contact/index.html | 4 +- www/conservancy/static/about/index.html | 11 ++--- www/conservancy/static/conservancy.css | 34 +++++++++++----- www/conservancy/templates/base_about.html | 40 +++++++++++++++++++ .../templates/base_conservancy.html | 10 ++--- 5 files changed, 74 insertions(+), 25 deletions(-) create mode 100644 www/conservancy/templates/base_about.html diff --git a/www/conservancy/static/about/contact/index.html b/www/conservancy/static/about/contact/index.html index 8676f4e1..1efbb0cb 100644 --- a/www/conservancy/static/about/contact/index.html +++ b/www/conservancy/static/about/contact/index.html @@ -1,6 +1,6 @@ -{% extends "base_conservancy.html" %} +{% extends "base_about.html" %} {% block subtitle %}Contact - {% endblock %} -{% block category %}contact{% endblock %} +{% block submenuselection %}Contact{% endblock %} {% block content %}

Contact the Conservancy

diff --git a/www/conservancy/static/about/index.html b/www/conservancy/static/about/index.html index 359fde77..9e76fd0a 100644 --- a/www/conservancy/static/about/index.html +++ b/www/conservancy/static/about/index.html @@ -1,14 +1,12 @@ -{% comment %}THIS PAGE IS UNLINKED -{% extends "base_conservancy.html" %} +{% extends "base_about.html" %} {% block subtitle %}About - {% endblock %} {% block content %}

About

-

The Software Freedom Conservancy, Inc. is a not-for-profit organization -that promotes the use and development of free and open source software by -providing a range of pro-bono services to Free, Libre and Open Source -Software (FLOSS) projects.

+

The Software Freedom Conservancy, Inc. is a 501(c)(3) not-for-profit +organization incorporated in New York. Conservancy is managed by +its board of directors.

We hold, protect and manage copyrights and trademarks for FLOSS projects. Conservancy aims to act as long-term caretakers for our member @@ -48,4 +46,3 @@ inspection:

{% endblock %} -{% endcomment %} diff --git a/www/conservancy/static/conservancy.css b/www/conservancy/static/conservancy.css index 3b3c51da..546f9bee 100644 --- a/www/conservancy/static/conservancy.css +++ b/www/conservancy/static/conservancy.css @@ -11,7 +11,7 @@ p, h1, h2, h3, h4, h5, h6, #mainContent ul, #mainContent ol { body { font-family: "Lucida Grande",Verdana,Lucida,Helvetica,Arial,sans-serif; - font-size: 90%; + font-size: 95%; } a { text-decoration: none; color: #146624; } @@ -22,7 +22,7 @@ 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 h2 { border-bottom: 1px solid #aaa; } #mainContent ul, #mainContent ol { padding-left: 1.5em; } @@ -93,36 +93,51 @@ 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; } +#mainContent { + margin-left: 50px; + margin-right: 50px; +} + #container { width: 100%; + overflow: hidden; } #container #mainContent { background: #fffff; - margin-left: 200px; + margin-left: 210px; + margin-right: 50px; padding-bottom: 32767px; margin-bottom: -32767px; } #container #sidebar { width: 200px; float: left; - background-color: #e5e5e5; padding-bottom: 32767px; margin-bottom: -32767px; + background-color: #e5e5e5; } + #container #sidebar li { text-align: center; list-style: none; padding: 3px 10px 3px 10px; margin: 5px; border: 1px solid #CCC; + background: #fff url(/img/nav-bg.png) bottom repeat-x; } -#container #sidebar li#selected { + +#container #sidebar.Directors ul li.Directors, +#container #sidebar.Contact ul li.Contact, +#container #sidebar.Officers ul li.Officers, +#container #sidebar.Staff ul li.Staff +{ color: #000033; font-weight: bold; + background: #fff url(/img/nav-bg-up.png) top repeat-x; color: #000; } #container #sidebar h2 { text-align: center; - font-size: 140%; + font-size: 150%; margin: 1.5em 0 0.8em 0; } #container #sidebar hr { @@ -212,12 +227,13 @@ span.subsectionToc { padding-left: 4em; } span.subsubsectionToc { padding-left: 6em;} .js, .js p, .js p.bibitem, .js p.bibitem-p { background-color: #cde7e9; } - 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-About #navbar ul li.About 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; } +{ + font-weight: bold; + background: #fff url(/img/nav-bg-up.png) top repeat-x; color: #000; } diff --git a/www/conservancy/templates/base_about.html b/www/conservancy/templates/base_about.html new file mode 100644 index 00000000..c7e6edea --- /dev/null +++ b/www/conservancy/templates/base_about.html @@ -0,0 +1,40 @@ +{% +# Copyright 2005-2008, James Garrison +# Copyright 2010, Bradley M. Kuhn + +# This software's license gives you freedom; you can copy, convey, +# propagate, redistribute, modify and/or redistribute modified versions of +# this program under the terms of the GNU Affero General Public License +# (AGPL) as published by the Free Software Foundation (FSF), either +# version 3 of the License, or (at your option) any later version of the +# AGPL published by the FSF. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero +# General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program in a file in the toplevel directory called +# "AGPLv3". If not, see . + +# req.subprocess_env is not set when the PostReadRequestHandler runs, +# so we just bypass it altogether and set the relevant variable here. +# See deployment documentation for more info. + +{% extends "base_conservancy.html" %} +{% block outercontent %} +
+ +
{% block content %}{% endblock %} +
+
+{% endblock %} diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index 2ce15d6f..b62395b0 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -22,17 +22,13 @@
  • Overview
  • Member Projects
  • News
    • -
  • Directors
    • -
  • Officers
    • -
  • Contact
    • - +
  • About
    • + -
    - {% block outercontent %}
    {% block content %}{% endblock %}
    {% endblock %} -
    + {% block outercontent %}
    {% block content %}{% endblock %}
    {% endblock %}