website Changeset - 506cd5ebdf7a · Conservancy Kallithea

Changeset - 506cd5ebdf7a

Parent rev.

Child rev.

[Not reviewed]

0 2 0

Bradley Kuhn (bkuhn) - 8 years ago 2015-12-01 03:19:46
bkuhn@ebb.org

Small changes in messaging of compliance work.

* Direct link to Principles from Compliance menu.

* Favor the phrase Copyleft Compliance over just Linux Compliance.

2 files changed with 4 insertions and 3 deletions:

www/conservancy/templates/base_compliance.html

www/conservancy/templates/base_conservancy.html

0 comments (0 inline, 0 general)

www/conservancy/templates/base_compliance.html

➞

Show inline comments

@@ ... / @@ -18,38 +18,39 @@ @@
 <p>
   To support our copyleft compliance work,
   please&hellip; </p>
 <p><span class="donate-box-highlight">Donate now via PayPal:</span>
 </p>
 <!-- PayPal start -->
 <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_top">
 <input type="hidden" name="cmd" value="_s-xclick">
 <input type="hidden" name="hosted_button_id" value="4ZKJN4F9BMFAS">
 <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" style="border:0" name="submit" alt="PayPal - The safer, easier way to pay online!">
 <img alt="" style="border:0" src="https://www.paypalobjects.com/en_US/i/scr/pixel.gif" width="1" height="1">
 </form>
 <!-- PayPal end -->
 <p>Or, <a href="/supporter/#annual"><span class="donate-box-highlight">become a Conservancy
       Supporter</span></a> (&mdash; a better option if you're donating more
       than $120, since you'll get a t-shirt!).</p>
 </td></tr></table>
 </div>
 <div class="content-with-donate-sidebar">
     <div id="container">
          <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
-            <h2>Our GPL {% block category %}Compliance{% endblock %} Work</h2>
+            <h2>Our Copyleft {% block category %}Compliance{% endblock %} Projects</h2>
             <ul>
             <li class="AboutCompliance"><a href="/linux-compliance/about.html">About</a></li>
             <li class="CopyleftPrinciples"><a href="/linux-compliance/principles.html">Principles of Community-Oriented GPL Enforcement</a></li>
             <li class="VMwareLawsuitAppeal"><a href="/linux-compliance/vmware-lawsuit-appeal.html">Stand Up For GPL!</a></li>
             <li><a href="/news/2015/mar/05/vmware-lawsuit/">VMware Lawsuit: Press Release</a></li>
             <li class="VMwareLawsuitFAQ"><a href="/linux-compliance/vmware-lawsuit-faq.html">
                 <abbr title="Frequently Asked Questions">FAQ</abbr> on VMware Lawsuit</a></li>
             <li class="AboutCompliance"><a href="/linux-compliance/about.html">About GPL Compliance Project for Linux Developers</a></li>
             <li class="CopyleftOrg"><a href="https://copyleft.org/">copyleft.org</a></li>
             </ul>
          </div>
                <div id="mainContent">{% block content %}{% endblock %}
                </div>
 </div></div>
 {% endblock %}

www/conservancy/templates/base_conservancy.html

➞

Show inline comments

@@ ... / @@ -11,49 +11,49 @@ @@
     <link rel="stylesheet" type="text/css" media="screen, projection" href="/conservancy.css" />
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <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="/supporter-page.js"></script>
     {% block head %}{% endblock %}
   </head>
   <body class="conservancy-{% block category %}other{% endblock %}">
     <div id="conservancyheader">
       <h1><span id="logobutton"><a href="/">Software Freedom Conservancy</a></span></h1>
     </div>
     <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="sponsors"><a href="/sponsors/">Sponsors</a></li>
-          <li class="compliance"><a href="/linux-compliance/">GPL Compliance</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>
       {% block outercontent %}<div id="mainContent">{% block content %}{% endblock %}</div>{% endblock %}
     <div id="conservancyfooter">
       <p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/sponsors/">Sponsors</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/omnibus/">RSS Feed</a></p>
       <p>Follow Conservancy
       on <a href="https://identi.ca/conservancy">identi.ca</a>
       and <a href="https://twitter.com/conservancy">twitter</a>.
       <a href="https://flattr.com/thing/922714/Donate-to-Software-Freedom-Conservancy" target="_blank">
       <img src="https://api.flattr.com/button/flattr-badge-large.png" alt="Flattr us!" title="Flattr us!" style="border:0" /></a></p>
       <p class="copyright_info">
       <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0"><img alt="Creative Commons License" style="border-width:0" src="/img/cc-by-sa_88x31.png" /></a>
       <br />This page, and all contents herein, unless a license is otherwise
       specified, are licensed under a
       <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0">Creative
       Commons Attribution-ShareAlike 4.0 International License</a>.</p>
     </div>
   </body>
 </html>

0 comments (0 inline, 0 general)