Changeset - 811d2b70b4fc
[Not reviewed]
1 8 1
Bradley Kuhn (bkuhn) - 5 years ago 2016-09-30 17:46:51
bkuhn@ebb.org
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.
10 files changed with 31 insertions and 31 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/copyleft-compliance/about.html
Show inline comments
...
 
@@ -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
www/conservancy/static/css/conservancy.css
Show inline comments
...
 
@@ -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,
www/conservancy/static/donate/index.html
Show inline comments
...
 
@@ -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>
 

	
www/conservancy/static/members/apply/index.html
Show inline comments
 
{% 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 %}
 

	
www/conservancy/static/members/current/index.html
Show inline comments
 
{% 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>
 

	
www/conservancy/static/members/index.html
Show inline comments
 
{% 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
www/conservancy/static/members/services/index.html
Show inline comments
 
{% extends "base_members.html" %}
 
{% extends "base_projects.html" %}
 
{% block subtitle %}Member Project Services - {% endblock %}
 
{% block submenuselection %}Services{% endblock %}
 
{% block content %}
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -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>
www/conservancy/templates/base_members.html
Show inline comments
 
deleted file
www/conservancy/templates/base_projects.html
Show inline comments
 
new file 100644
 
{% 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 %}
0 comments (0 inline, 0 general)