Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename Members->Projects in menu navigation et al

Browse source 
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.
This commit is contained in:
Bradley M. Kuhn 2016-09-30 13:44:55 -04:00
parent be762220af
commit 811d2b70b4
10 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
www/conservancy/static/copyleft-compliance/about.html
View file

@ -10,7 +10,7 @@
Conservancy stands up for users' software freedom via its copyleft compliance work.</p>
<p>Conservancy engages in copyleft compliance work in two different ways: by acting directly
on behalf of <a href="/memebers">Conservancy's Member Projects</a> who request
on behalf of <a href="/projects/">Conservancy's Member Projects</a> who request
Free and Open Source License compliance efforts, and for
specific, targeted member projects for communities of developers.</p>
@ -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.</p>
<h2>Member Project Compliance Project</h2>
<h2>Compliance Project For Our Fiscally Sponsored Projects</h2>
<p>Historically, Conservancy was well-known for its ongoing license
compliance efforts on behalf of its BusyBox member project. Today, Conservancy

2
www/conservancy/static/css/conservancy.css
View file

@ -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,

4
www/conservancy/static/donate/index.html
View file

@ -103,10 +103,10 @@ contact <a href="mailto:accounting@sfconservancy.org">&lt;accounting@sfconservan
contact <a href="mailto:accounting@sfconservancy.org">&lt;accounting@sfconservancy.org&gt;</a>
for details.</p>
<h3>Donate to Our Member Projects</h3>
<h3>Donate to Our Projects</h3>
<p>Finally, Conservancy also maintains directed donation programs for
its <a href="/members/current/">member projects</a>. Donation links
its <a href="/projects/current/">member projects</a>. Donation links
for these directed donation programs are typically found on the
individual websites of our members.</p>

4
www/conservancy/static/members/apply/index.html
View file

@ -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 %}

6
www/conservancy/static/members/current/index.html
View file

@ -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 %}
<h1>Current Member Projects</h1>
<h1>Current Projects</h1>
<p>Conservancy is currently home to thirty-nine member projects.</p>

8
www/conservancy/static/members/index.html
View file

@ -1,14 +1,14 @@
{% extends "base_members.html" %}
{% extends "base_projects.html" %}
{% block subtitle %}Project Membership in {% endblock %}
{% block content %}
<h1>Conservancy Project Membership</h1>
<h1>Conservancy's Projects</h1>
<p>A major component of Conservancy's work to advance software freedom is
through its work to provide
non-profit <a href="/members/services/">infrastructure and services</a>
non-profit <a href="/projects/services/">infrastructure and services</a>
to
<a href="/members/current/">its member projects</a>. Conservancy's goal
<a href="/projects/current/">its member projects</a>. 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

2
www/conservancy/static/members/services/index.html
View file

@ -1,4 +1,4 @@
{% extends "base_members.html" %}
{% extends "base_projects.html" %}
{% block subtitle %}Member Project Services - {% endblock %}
{% block submenuselection %}Services{% endblock %}
{% block content %}

2
www/conservancy/templates/base_conservancy.html
View file

@ -31,7 +31,7 @@
<li class="About"><a href="/about/">About</a></li>
<li class="news"><a href="/news/">News</a></li>
<li class="blog"><a href="/blog/">Blog</a></li>
<li class="Members"><a href="/members/">Membership</a></li>
<li class="Projects"><a href="/projects/">Projects</a></li>
<li class="sponsors"><a href="/sponsors/">Sponsors</a></li>
<li class="compliance"><a href="/linux-compliance/">Copyleft Compliance</a></li>
<li class="npoacct"><a href="/npoacct/">NPOAcct</a></li>

15
www/conservancy/templates/base_members.html
View file

@ -1,15 +0,0 @@
{% extends "base_conservancy.html" %}
{% block outercontent %}
<div id="container">
<div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
<h2>{% block category %}Members{% endblock %} Projects &amp; Services</h2>
<ul>
<li class="Current"><a href="/members/current/">Current Member Projects</a></li>
<li class="Services"><a href="/members/services/">Member Project Services</a></li>
<li class="Applying"><a href="/members/apply/">Applying</a></li>
</ul>
</div>
<div id="mainContent">{% block content %}{% endblock %}
</div>
</div>
{% endblock %}

15
www/conservancy/templates/base_projects.html Normal file
View file

@ -0,0 +1,15 @@
{% extends "base_conservancy.html" %}
{% block outercontent %}
<div id="container">
<div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
<h2>{% block category %}Projects{% endblock %} &amp; Services</h2>
<ul>
<li class="Current"><a href="/projects/current/">Current Member Projects</a></li>
<li class="Services"><a href="/projects/services/">Member Project Services</a></li>
<li class="Applying"><a href="/projects/apply/">Applying</a></li>
</ul>
</div>
<div id="mainContent">{% block content %}{% endblock %}
</div>
</div>
{% endblock %}