From 811d2b70b4fcd871f1ac3ab465605ba65bf0af0d Mon Sep 17 00:00:00 2001 From: "Bradley M. Kuhn" Date: Fri, 30 Sep 2016 13:44:55 -0400 Subject: [PATCH] Rename Members->Projects in menu navigation et al Due to confusion about "members" and "supporters", we want at least the menu navigation to not use the phrase "members" since some Supporters expect that to refer to a type of donor. While we will not be rebranding "member projects" fully at this time, we want to favor the term projects. A few additional changes, in particular moving files from members/ -> projects/ directory will be needed in next commit. --- .../static/copyleft-compliance/about.html | 4 ++-- www/conservancy/static/css/conservancy.css | 2 +- www/conservancy/static/donate/index.html | 4 ++-- www/conservancy/static/members/apply/index.html | 4 ++-- www/conservancy/static/members/current/index.html | 6 +++--- www/conservancy/static/members/index.html | 8 ++++---- .../static/members/services/index.html | 2 +- www/conservancy/templates/base_conservancy.html | 2 +- www/conservancy/templates/base_members.html | 15 --------------- www/conservancy/templates/base_projects.html | 15 +++++++++++++++ 10 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 www/conservancy/templates/base_members.html create mode 100644 www/conservancy/templates/base_projects.html diff --git a/www/conservancy/static/copyleft-compliance/about.html b/www/conservancy/static/copyleft-compliance/about.html index 1bfd4fe2..e76f0ac6 100644 --- a/www/conservancy/static/copyleft-compliance/about.html +++ b/www/conservancy/static/copyleft-compliance/about.html @@ -10,7 +10,7 @@ Conservancy stands up for users' software freedom via its copyleft compliance work.

Conservancy engages in copyleft compliance work in two different ways: by acting directly -on behalf of Conservancy's Member Projects who request +on behalf of Conservancy's Member Projects who request Free and Open Source License compliance efforts, and for specific, targeted member projects for communities of developers.

@@ -20,7 +20,7 @@ to give input and guidance on Conservancy's strategy in dealing with compliance issues. Thus, all Conservancy's compliance matter have full support of relevant copyright holders.

-

Member Project Compliance Project

+

Compliance Project For Our Fiscally Sponsored Projects

Historically, Conservancy was well-known for its ongoing license compliance efforts on behalf of its BusyBox member project. Today, Conservancy diff --git a/www/conservancy/static/css/conservancy.css b/www/conservancy/static/css/conservancy.css index 14313c57..be079553 100644 --- a/www/conservancy/static/css/conservancy.css +++ b/www/conservancy/static/css/conservancy.css @@ -337,7 +337,7 @@ 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-Members #navbar ul li.Members a, +body.conservancy-Projects #navbar ul li.Projects a, body.conservancy-news #navbar ul li.news a, body.conservancy-blog #navbar ul li.blog a, body.conservancy-About #navbar ul li.About a, diff --git a/www/conservancy/static/donate/index.html b/www/conservancy/static/donate/index.html index 1036e027..d1e912d3 100644 --- a/www/conservancy/static/donate/index.html +++ b/www/conservancy/static/donate/index.html @@ -103,10 +103,10 @@ contact <accounting@sfconservan contact <accounting@sfconservancy.org> for details.

-

Donate to Our Member Projects

+

Donate to Our Projects

Finally, Conservancy also maintains directed donation programs for -its member projects. Donation links +its member projects. Donation links for these directed donation programs are typically found on the individual websites of our members.

diff --git a/www/conservancy/static/members/apply/index.html b/www/conservancy/static/members/apply/index.html index 80655da7..db99c9c5 100644 --- a/www/conservancy/static/members/apply/index.html +++ b/www/conservancy/static/members/apply/index.html @@ -1,5 +1,5 @@ -{% extends "base_members.html" %} -{% block subtitle %}Member Project Services - {% endblock %} +{% extends "base_projects.html" %} +{% block subtitle %}Project Services - {% endblock %} {% block submenuselection %}Applying{% endblock %} {% block content %} diff --git a/www/conservancy/static/members/current/index.html b/www/conservancy/static/members/current/index.html index 5cc815e3..c0ff206d 100644 --- a/www/conservancy/static/members/current/index.html +++ b/www/conservancy/static/members/current/index.html @@ -1,9 +1,9 @@ -{% extends "base_members.html" %} -{% block subtitle %}Current Member Projects - {% endblock %} +{% extends "base_projects.html" %} +{% block subtitle %}Current Projects - {% endblock %} {% block submenuselection %}Current{% endblock %} {% block content %} -

Current Member Projects

+

Current Projects

Conservancy is currently home to thirty-nine member projects.

diff --git a/www/conservancy/static/members/index.html b/www/conservancy/static/members/index.html index 7e051d21..8d4f5830 100644 --- a/www/conservancy/static/members/index.html +++ b/www/conservancy/static/members/index.html @@ -1,14 +1,14 @@ -{% extends "base_members.html" %} +{% extends "base_projects.html" %} {% block subtitle %}Project Membership in {% endblock %} {% block content %} -

Conservancy Project Membership

+

Conservancy's Projects

A major component of Conservancy's work to advance software freedom is through its work to provide - non-profit infrastructure and services + non-profit infrastructure and services to - its member projects. Conservancy's goal + its member projects. Conservancy's goal is to handle all the parts of advocacy, leadership, organization and coordination other than actual development of the software and documentation. By handling all these details, Conservancy allows its diff --git a/www/conservancy/static/members/services/index.html b/www/conservancy/static/members/services/index.html index 4ef7240f..f2bca569 100644 --- a/www/conservancy/static/members/services/index.html +++ b/www/conservancy/static/members/services/index.html @@ -1,4 +1,4 @@ -{% extends "base_members.html" %} +{% extends "base_projects.html" %} {% block subtitle %}Member Project Services - {% endblock %} {% block submenuselection %}Services{% endblock %} {% block content %} diff --git a/www/conservancy/templates/base_conservancy.html b/www/conservancy/templates/base_conservancy.html index 5d0dbdfc..c42f7116 100644 --- a/www/conservancy/templates/base_conservancy.html +++ b/www/conservancy/templates/base_conservancy.html @@ -31,7 +31,7 @@

  • About
  • News
  • Blog
    • -
  • Membership
    • +
  • Projects
  • Sponsors
  • Copyleft Compliance
  • NPOAcct
    • diff --git a/www/conservancy/templates/base_members.html b/www/conservancy/templates/base_members.html deleted file mode 100644 index cfa4675f..00000000 --- a/www/conservancy/templates/base_members.html +++ /dev/null @@ -1,15 +0,0 @@ -{% extends "base_conservancy.html" %} -{% block outercontent %} -
    - -
    {% block content %}{% endblock %} -
    -
    -{% endblock %} diff --git a/www/conservancy/templates/base_projects.html b/www/conservancy/templates/base_projects.html new file mode 100644 index 00000000..9b39e614 --- /dev/null +++ b/www/conservancy/templates/base_projects.html @@ -0,0 +1,15 @@ +{% extends "base_conservancy.html" %} +{% block outercontent %} +
    + +
    {% block content %}{% endblock %} +
    +
    +{% endblock %}