From 47aa505e077e84bc9d69be1028c47132b3a8bbc6 2015-03-05 15:53:04 From: Bradley M. Kuhn Date: 2015-03-05 15:53:04 Subject: [PATCH] Overview: top level menu -> incorporated in about The overview is now incorporated into the About section of the website, primarily to make more space on the toplevel menubar. --- diff --git a/www/conservancy/static/about/index.html b/www/conservancy/static/about/index.html index 01c88b0921ef8a4d1e2476d499225aca7ba792aa..b3da227d7e45798695f85701bd2bd861d80ddd88 100644 --- a/www/conservancy/static/about/index.html +++ b/www/conservancy/static/about/index.html @@ -4,23 +4,65 @@

About Software Freedom Conservancy, Inc.

+

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, who appoint -its officers and hire -its staff. Conservancy also gets some -occasional help from outside legal counsel and -contractors.

+organization incorporated in New York. Software Freedom Conservancy helps +promote, improve, develop, and defend Free, Libre, and Open Source Software +(FLOSS) projects. Conservancy provides a non-profit home and infrastructure +for FLOSS projects. This allows FLOSS developers to focus on what they do +best — writing and improving FLOSS for the general public — while +Conservancy takes care of the projects' needs that do not relate directly to +software development and documentation.

+ +

FLOSS projects whose applications are + accepted become part of the Software Freedom Conservancy + (akin to a separate department of a large agency). Once joined, the + “member project” receives most of + the benefits of existing as a non-profit corporate entity without + engaging in the arduous work of forming a separate, new organization. + Conservancy aggregates the work of running a FLOSS non-profit + for its many members.

+ +

Conservancy provides many important services for its + member projects. Member projects can take directed donations, which + allows donors to earmark their donations for the benefit of a specific + FLOSS project. Conservancy provides fiscal oversight to ensure that + these funds are spent in a manner that advances the project and fits + with Conservancy's 501(c)(3) mission to promote, advance, and defend software freedom.

+ +

If the member project's leaders want, Conservancy can also hold other + assets and titles on behalf of the projects, such as copyrights, + trademarks, domain names, online hosting accounts, and title and ownership + of physical hardware. Also at discretion of the project's leaders, + Conservancy can assist in defending the rights represented in these + assets. For example, Conservancy is available to assist member projects + in enforcing the terms of the projects' FLOSS license.

+ +

Finally, developers of Conservancy's member projects, when operating in + their capacity as project leaders, could receive some protection from personal + liability for their work on the project.

+ +

For further reading on the benefits of Conservancy, a full and detailed list of Conservancy's + services for its member projects and a a + list of Conservancy's current member projects are available.

+ +

Conservancy and + its directors, officers, + and staff believe strongly in the principles + of software freedom, and believe that all users should have the right to + study, improve and share their software. Conservancy helps protect, + enable, coordinate, facilitate and defend the public's right to copy, + share, modify and redistribute FLOSS both non-commercially and + commercially. Finally, like most organizations devoted to FLOSS, + Conservancy opposes the notion of patents that cover software, and urges + contributors to its member projects not to apply for patents.

Conservancy strives to be as transparent as possible, and makes - its public filings available on its - website. Bradley M. Kuhn, Conservancy's President, blogs regularly about Conservancy's - activities.

- -

A general overview of Conservancy's - work can be found on this site, and detailed - information about the work that Conservancy does for its member - projects is also available.

+ its public filings available on its website. + Bradley M. Kuhn, Conservancy's President, blogs + regularly about Conservancy's activities. + Finally, detailed information about the work that + Conservancy does for its member projects is also available.

If you have general questions about Conservancy and its work, contact information is available. diff --git a/www/conservancy/static/conservancy.css b/www/conservancy/static/conservancy.css index 73aa674b6e08be9a655d118ae1103a313bdd2fee..6949781752ff704007ecaaedd407ada1c0a66953 100644 --- a/www/conservancy/static/conservancy.css +++ b/www/conservancy/static/conservancy.css @@ -140,6 +140,7 @@ h3 { margin-top: .6em; margin-bottom: .4em; } #container #sidebar.Directors ul li.Directors, #container #sidebar.Eval ul li.Eval, +#container #sidebar.Overview ul li.Overview, #container #sidebar.Contact ul li.Contact, #container #sidebar.Officers ul li.Officers, #container #sidebar.Staff ul li.Staff, @@ -258,7 +259,6 @@ 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-blog #navbar ul li.blog a, diff --git a/www/conservancy/static/overview/index.html b/www/conservancy/static/overview/index.html deleted file mode 100644 index 222139063977177f91ead90fe426f138507b76f6..0000000000000000000000000000000000000000 --- a/www/conservancy/static/overview/index.html +++ /dev/null @@ -1,59 +0,0 @@ -{% extends "base_conservancy.html" %} -{% block subtitle %}Overview - {% endblock %} -{% block category %}overview{% endblock %} -{% block content %} - -

Overview

- -

Software Freedom Conservancy is a not-for-profit organization that - helps promote, improve, develop, and defend Free, Libre, and Open Source - Software (FLOSS) projects. Conservancy provides a non-profit home and - infrastructure for FLOSS projects. This allows FLOSS developers to - focus on what they do best — writing and improving FLOSS for the - general public — while Conservancy takes care of the projects' needs that - do not relate directly to software development and documentation.

- -

FLOSS projects whose applications are - accepted become part of the Software Freedom Conservancy - (akin to a separate department of a large agency). Once joined, the - “member project” receives most of - the benefits of existing as a non-profit corporate entity without - engaging in the arduous work of forming a separate, new organization. - Conservancy aggregates the work of running a FLOSS non-profit - for its many members.

- -

Conservancy provides many important services for its - member projects. Member projects can take directed donations, which - allows donors to earmark their donations for the benefit of a specific - FLOSS project. Conservancy provides fiscal oversight to ensure that - these funds are spent in a manner that advances the project and fits - with Conservancy's 501(c)(3) mission to promote, advance, and defend software freedom.

- -

If the member project's leaders want, Conservancy can also hold other - assets and titles on behalf of the projects, such as copyrights, - trademarks, domain names, online hosting accounts, and title and ownership - of physical hardware. Also at discretion of the project's leaders, - Conservancy can assist in defending the rights represented in these - assets. For example, Conservancy is available to assist member projects - in enforcing the terms of the projects' FLOSS license.

- -

Finally, developers of Conservancy's member projects, when operating in - their capacity as project leaders, could receive some protection from personal - liability for their work on the project.

- -

For further reading on the benefits of Conservancy, a full and detailed list of Conservancy's - services for its member projects and a a - list of Conservancy's current member projects are available.

- -

Conservancy and - its directors, officers, - and staff believe strongly in the principles - of software freedom, and believe that all users should have the right to - study, improve and share their software. Conservancy helps protect, - enable, coordinate, facilitate and defend the public's right to copy, - share, modify and redistribute FLOSS both non-commercially and - commercially. Finally, like most organizations devoted to FLOSS, - Conservancy opposes the notion of patents that cover software, and urges - contributors to its member projects not to apply for patents.

- -{% endblock %} diff --git a/www/conservancy/templates/base_about.html b/www/conservancy/templates/base_about.html index 7525d887b80f596f14c3a591789240a0927e5765..e96eb75fe29d4e68fbaeef7653668d1637800cd8 100644 --- a/www/conservancy/templates/base_about.html +++ b/www/conservancy/templates/base_about.html @@ -4,6 +4,7 @@