Changeset - 811d2b70b4fc
[Not reviewed]
1 8 1
Bradley Kuhn (bkuhn) - 8 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
 
{% extends "base_compliance.html" %}
 
{% block subtitle %}Copyleft Compliance Projects - {% endblock %}
 
{% block submenuselection %}AboutCompliance{% endblock %}
 
{% block content %}
 
<h1>Conservancy's Copyleft Compliance Projects</h1>
 

	
 
<p>Free and open source software is
 
        everywhere and in everything; yet our software freedom is constantly
 
        eroded.  With the help of its volunteers, <a href="/members/current/">member projects</a>, and <a href="/about/staff/">staff</a>,
 
  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>
 

	
 
<p>Conservancy's Copyleft Compliance Projects are run in a collaborative manner with
 
the project developers.  All copyright holders involved have the opportunity
 
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
 
does semi-regular compliance work for its BusyBox, Evergreen, Git, Inkscape, Mercurial,
 
Samba, Sugar Labs and Wine member projects.  If you are a copyright holder
 
in any member project of Conservancy, please contact the project's leadership committtee,
 
via <a href="mailto:PROJECTNAME@sfconservancy.org">&lt;PROJECTNAME@sfconservancy.org&gt;</a>
 
for more information on getting involved in compliance efforts in that project.
 
</p>
 

	
 
<h2>GPL Compliance Project For Linux Developers</h2>
 

	
 
<p>In May
 
2012, <a href="/news/2012/may/29/compliance/">Conservancy
 
launched</a> the <cite>GPL
 
Compliance Project for Linux Developers</cite>, which handles compliance and
 
enforcement activities on behalf of more than a dozen Linux copyright
 
holders.</p>
 
 
 
<p>The GPL Compliance Project for Linux Developers is comprised of copyright
 
holders in the kernel, Linux, who have contributed to Linux under its
 
license, <a href="http://www.gnu.org/licenses/gpl-2.0.html">the
 
GPLv2</a>. These copyright holders have formally asked Conservancy to engage
 
in compliance efforts for their copyrights in the Linux kernel.  In addition,
www/conservancy/static/css/conservancy.css
Show inline comments
...
 
@@ -316,49 +316,49 @@ blockquote, div.quote /* div.quote is used by conservancy whitepaper */ {
 
.next_page_button { float: right; }
 
.pagination_list { text-align: center; }
 
.document_format { border: 1px solid #888; padding: .2em; background: #fff99d;}
 
.copyright_info { font-size: 90%; }
 
hr.footnote-separator { width: 80%; margin-left: auto; margin-right: auto; }
 

	
 
/* Resources pages */
 
div.download-formats { margin-top: 2em; margin-bottom: 2em; }
 
.download-formats p { display: inline; }
 
#mainContent .download-formats ul { display: inline; list-style: none;
 
                                    padding-left: 0; }
 
.download-formats ul li { display: inline; padding-left: 2em; }
 

	
 
/* Resources - book styles */
 
hr.chapter-separator { display: none; }
 
h2.likechapterHead { text-align: center; }
 
h2.chapterHead { text-align: center; }
 
#mainContent ul.author { list-style-type: none; padding-left: 0; }
 
#mainContent div.footnotes { font-style: normal; } /* remove italics */
 
span.sectionToc { padding-left: 2em; } /* indent TOC properly */
 
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,
 
body.conservancy-Compliance #navbar ul li.compliance a,
 
body.conservancy-donate #navbar ul li.donate a,
 
body.conservancy-npoacct #navbar ul li.npoacct a,
 
body.conservancy-sponsors #navbar ul li.sponsors a /* NO COMMA HERE! */
 
{
 
    color: #000033;
 
    font-weight: bold;
 
    background: #eaf1f1;
 
    background: -moz-linear-gradient(bottom, #fff, #eaf1f1);
 
    background: -webkit-linear-gradient(bottom, #fff, #eaf1f1);
 
    background: linear-gradient(to top, #fff, #eaf1f1);
 
    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eaf1f1', endColorstr='#ffffff', GradientType=0);
 
}
 
body.conservancy-supporter #navbar ul li.supporter a
 
{
 
    color: #000033;
 
    font-weight: bold;
 
    background: #ffd843;
 
    background: -moz-linear-gradient(bottom, #fff, #ffd533);
 
    background: -webkit-linear-gradient(bottom, #fff, #ffd533);
 
    background: linear-gradient(to top, #fff, #ffd533);
www/conservancy/static/donate/index.html
Show inline comments
...
 
@@ -82,37 +82,37 @@ USA
 
contact <a href="mailto:accounting@sfconservancy.org">&lt;accounting@sfconservancy.org&gt;</a>
 
    for wire transfer instructions, and include in your email the following
 
  information:</p>
 
<ul>
 
<li>The country of origin of your wire transfer.</li>
 
<li>The native currency of your donation.</li>
 
</ul>
 
<p>Note that Conservancy can accept donations by wire in USD, CAD, EUR, GBP
 
  natively.  (We keep them in the native currency and use it for expenses in
 
  those currencies, so we lose nothing in currency conversion).</p>
 

	
 
<p>Finally, note that while this method is called &ldquo;wire transfer&rdquo;
 
  in the USA, the method is usually compatible with most online banking forms
 
  that people use in Europe and elsewhere to send funds.  Please just contact us
 
  if you need to donate in native currency from your country and we'll
 
  discuss it!</p>
 

	
 
<br/>
 
<h3>Donate stock</h3>
 

	
 
<p>Conservancy can accept donation of stocks!   Please
 
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>
 

	
 
<h3>Donations Are Usually Tax-Deductible!</h3>
 

	
 
<p>Software Freedom Conservancy, Inc. is a 501(c)(3) organization
 
  incorporated in New York, and donations made to it are fully tax-deductible to the extent permitted by law.</p>
 

	
 
{% endblock %}
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 %}
 

	
 
<h1> Applying to Join Conservancy as a Member Project</h1>
 

	
 
<p>Conservancy's Evaluation Committee considers  applications monthly on a
 
  rolling basis.  Currently, Conservancy has dozens of projects in
 
  various stages of the application process.</p>
 

	
 
<p>The application process is somewhat informal.  New applicants should
 
  write an initial inquiry email
 
  to <a href="mailto:apply@sfconservancy.org">&lt;apply@sfconservancy.org&gt;</a>
 
  with a very brief description of their project and a URL to their
 
  project's website.  We'll send back initial questions (if any), and
 
  after those questions are answered, we'll send the full application
 
  materials.  Applications should be submitted in plain ASCII text via
 
  email.</p>
 

	
 
<p>Projects are reviewed by Conservancy's Evaluation Committee, which is
 
  chartered by Conservancy's <a href="/about/board/">Board of
 
  Directors</a>.</p>
 

	
 
<h1>Project Membership Application FAQs</h1>
 

	
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>
 

	
 
<h2><a href="http://argouml.tigris.org/">ArgoUML</a></h2>
 

	
 
<p>ArgoUML is the leading open source UML modeling tool and includes
 
support for all standard UML 1.4 diagrams. It runs on any Java platform
 
and is available in ten languages. See the feature list for more details.</p>
 

	
 
<h2><a href="http://bongo-project.org/">Bongo</a></h2>
 

	
 
<p>The Bongo Project is creating fun and simple mail, calendaring and
 
contacts software: on top of a standards-based server stack; we're
 
innovating fresh and interesting web user interfaces for managing
 
personal communications. Bongo is providing an entirely free software
 
solution which is less concerned with the corporate mail scenario and
 
much more focused on how people want to organize their lives.</p>
 

	
 
<h2><a href="http://www.boost.org/">Boost</a></h2>
 

	
 
<p>Boost provides free peer-reviewed portable C++ source libraries.</p>
 

	
 
<p>Boost emphasizes libraries that work well with the C++ Standard
 
  Library.  Boost libraries are intended to be widely useful, and usable
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
 
  member project developers to focus on what they do best: writing,
 
  improving and documenting FLOSS.</p>
 

	
 
<p>Project leaders who believe that their project might benefit from
 
  Conservancy's <a href="/members/services/">member project services</a>
 
  are encouraged to <a href="/members/apply/">apply for
 
  membership</a>.</p>
 
{% endblock %}
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 %}
 

	
 
<h1>Member Project Services</h1>
 

	
 
<p>Conservancy assists FLOSS project leaders by handling all matters other
 
  than software development and documentation, so the developers can focus
 
  on what they do best: improving the software for the public good.  The
 
  following are the services and options that are available to FLOSS
 
  projects that have joined Conservancy as a member project.</p>
 

	
 
<h2>Tax-Deductible, Earmarked Donations</h2>
 

	
 
<p>Member projects can receive earmarked donations through Conservancy.
 
   Since Conservancy is a 501(c)(3) charity incorporated in New York,
 
   donors can often deduct the donation on their USA taxes.  Additionally,
 
   the donors can indicate that their donation should be used to advance a
 
   specific member project, and those funds are kept in a separate account
 
   for the member project by Conservancy.  This structure prevents
 
   developers from having to commingle project funds with their own
 
   personal accounts or having to set up their own project specific
 
   account.</p>
 

	
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -10,49 +10,49 @@
 
    <title>{% block title %}{% block subtitle %}{% endblock %}Software Freedom Conservancy{% endblock %}</title>
 
    <meta http-equiv="content-type" content="text/html; charset=utf-8" />
 
    <meta name="description" content="The Software Freedom Conservancy provides a non-profit home and services to Free, Libre and Open Source Software (FLOSS) projects." />
 
    <meta name="keywords" content="software, freedom, conservancy, open source, gnu, GNU, Open Source, Free and Open Source, Free and Open Source Software, FLOSS, FOSS, protect, protection, help, policy, linux, non-profit" />
 
    <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
 
    <link rel="stylesheet" type="text/css" media="screen" href="/css/conservancy.css" />
 
    <link rel="stylesheet" href="/css/jquery-ui-1.8.22.custom.css" />
 
    <link rel="stylesheet" href="/css/jquery.ui.multiprogressbar.css" />
 
    <script type="text/javascript" src="/js/jquery-1.7.2.js"></script>
 
    <script type="text/javascript" src="/js/jquery-ui-1.8.22.custom.min.js"></script>
 
    <script type="text/javascript" src="/js/jquery.outerhtml.js"></script>
 
    <script type="text/javascript" src="/js/jquery.ui.multiprogressbar.js"></script>
 
    <script type="text/javascript" src="/js/supporter-page.js"></script>
 
    {% block head %}{% endblock %}
 
  </head>
 

	
 
  <body class="conservancy-{% block category %}other{% endblock %}">
 
    <h1 id="conservancyheader"><a id="logobutton" href="/">Software Freedom Conservancy</a></h1>
 
    <div id="navbar-outer">
 
      <div id="navbar">
 
	<ul>
 
          <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>
 
	  <li class="donate"><a href="/donate/">Donate</a></li>
 
          <li class="supporter"><a href="/supporter/">Become a Supporter!</a></li>
 
	</ul>
 
      </div>
 
      <div id="navbar-clear"></div>
 

	
 
    </div>
 
    <div class="fundraiser-top-text">
 
{% if sitefundgoal.fundraiser_so_far_amount < sitefundgoal.fundraiser_donation_count %}
 
   <em>Conservancy
 
   <a href="/supporter/">needs <span id="site-fundraiser-middle-goal">{{ sitefundgoal.fundraiser_donation_count|intcomma }}</span> Supporters</a> to continue its basic community services &amp;
 
   <span id="site-fundraiser-final-goal">{{ sitefundgoal.fundraiser_goal_amount|intcomma }}</span> to
 
   avoid hibernating its enforcement efforts in 2017.
 
{% else %}
 
      <em>Conservancy will continue our basic community services, thanks to our
 
        first <span id="site-fundraiser-middle-goal">{{ sitefundgoal.fundraiser_donation_count|intcomma }}</span> Supporters! We still need
 
        {{ sitefundgoal.fundraiser_goal_amount|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold|subtract:sitefundgoal.fundraiser_so_far_amount|intcomma }} more Supporters to avoid reducing licensing work &amp; hibernating our
 
        enforcement efforts in 2017.
 
{% endif %}
 
{% if sitefundgoal.fundraiser_donation_count_disclose_threshold < 632 %}
 
The <strong>next {{ 632|subtract:sitefundgoal.fundraiser_donation_count_disclose_threshold }} supporters
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)