Changeset - 68f5f1fa2cd1
[Not reviewed]
www/conservancy/static/activities/index.html
Show inline comments
...
 
@@ -8,29 +8,12 @@
 

	
 
{% endblock %}
 

	
 
{% block outercontent %}
 
<div class="content-with-donate-sidebar">
 
    <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
            <h2>What We Do</h2>
 
            {% include 'submenus/what_we_do_partial.html' %}
 
            <h2>Vizio Lawsuit</h2>
 
            <ul>
 
            <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
 
            <li class="VizioPressRelease"><a href="/copyleft-compliance/vizio.html">Press Release</a></li>
 
            <li class="VizioComplaint"><a href="/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf">Complaint</a></li>
 
            <li class="VizioQandA"><a href="/press/qanda.html">Q&amp;A</a></li>
 
            </ul>
 
            <h2>Resources for Journalists on Vizio</h2>
 
            <ul>
 
            <li class="VizioPressKit"><a href="/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf">Press Kit</a></li>
 
            <li class="VizioPhotoAssets"><a href="/docs/software-freedom-conservancy-v-vizio-photo-assets.zip">Photo Assets</a></li>
 
            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
 
            </ul>
 
         </div>
 
         <div id="mainContent">
 
           {% block content %}
 
           <h1>What We Do</h1>
 
           <p>Software Freedom Conservancy is a nonprofit organization
 
           centered around ethical technology. Our mission is to ensure the
 
           right to repair, improve and reinstall software. We promote and
...
 
@@ -64,12 +47,27 @@
 
           myth of &ldquo;pure meritocracy&rdquo; so popular in FOSS circles
 
           willfully ignores the systemic biases in our societies and
 
           cultures.  We are thus the proud home of
 
           the <a href="https://outreachy.org/">Outreachy initiative</a> that
 
           offers paid internships in FOSS for contributors who have faced
 
           systemic bias in their efforts to join the FOSS community.<p>
 

	
 

	
 
           {% endblock %}
 
               </div>
 
         </div>
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
            <h2>What We Do</h2>
 
            {% include 'submenus/what_we_do_partial.html' %}
 
            <h2>Vizio Lawsuit</h2>
 
            <ul>
 
            <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
 
            <li class="VizioPressRelease"><a href="/copyleft-compliance/vizio.html">Press Release</a></li>
 
            <li class="VizioComplaint"><a href="/docs/software-freedom-conservancy-v-vizio-complaint-2021-10-19.pdf">Complaint</a></li>
 
            <li class="VizioQandA"><a href="/press/qanda.html">Q&amp;A</a></li>
 
            </ul>
 
            <h2>Resources for Journalists on Vizio</h2>
 
            <ul>
 
            <li class="VizioPressKit"><a href="/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf">Press Kit</a></li>
 
            <li class="VizioPhotoAssets"><a href="/docs/software-freedom-conservancy-v-vizio-photo-assets.zip">Photo Assets</a></li>
 
            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
 
            </ul>
 
         </div>
 
    </div>
 
           {% endblock %}
 
{% endblock %}
www/conservancy/static/css/conservancy.css
Show inline comments
...
 
@@ -133,33 +133,21 @@ text-decoration: none; color: #557733;
 
.donate-sidebar {
 
  background: var(--light-green) no-repeat;
 
  position: sticky;
 
  bottom: 0;
 
  width: auto;
 
  padding: 0.5rem 1rem;
 
  margin: 2rem -0.5rem 0;
 
  margin: 0 -1rem;
 
  border-radius: 8px 8px 0 0;
 
  border: 1px solid #90d468;
 
}
 

	
 
.donate-sidebar:hover {
 
  background: #a0d870;
 
}
 

	
 
@media screen and (min-width: 30em) {
 
  .donate-sidebar {
 
    margin: 2rem -1rem 0;
 
  }
 
}
 

	
 
@media screen and (max-width: 52em) { 
 
  #sidebar { 
 
      display: none; 
 
  } 
 
} 
 

	
 
p.footnote {
 
    font-size: 85%;
 
}
 

	
 
h1 { margin-top: .75em; margin-bottom: .5em; }
 
h2 { margin-top: .75em; margin-bottom: .5em; }
...
 
@@ -337,30 +325,31 @@ body > header {
 
  line-height: 1.3;
 
  border-radius: 16px;
 
}
 

	
 
#container #mainContent {
 
    max-width: 50em;
 
    margin: 0;
 
    margin: 0 0 2rem;
 
    padding: 0;
 
    background: #ffffff;
 
    flex: 1 1 auto;
 
}
 

	
 
#container #sidebar {
 
  background-color: #e6eae1;
 
  padding: 1px 0.5rem 0.25rem;
 
  margin-bottom: 1rem;
 
  padding: 1px 0.5rem 2rem;
 
  margin: 1rem -1rem 0;
 
}
 

	
 
@media screen and (min-width: 30em) {
 
  #container {
 
    display: flex;
 
  }
 
  #container #sidebar {
 
  flex: 1 0 15em;
 
    margin-right: 1rem;
 
    flex: 1 0 15em;
 
    margin: 1rem 0rem 1rem 2rem;
 
  }
 
}
 

	
 
#container #sidebar li {
 
    text-align: center;
 
    list-style: none;
...
 
@@ -434,12 +423,19 @@ body > header {
 
.column h2 a:hover { text-decoration: underline; }
 

	
 
#conservancyfooter {
 
  border-top: 1px solid #ccc;
 
  text-align: center;
 
  overflow: auto;
 
  margin: 0;
 
}
 

	
 
@media screen and (min-width: 30em) {
 
  #conservancyfooter {
 
    margin: 0;
 
  }
 
}
 

	
 
.continued {
 
  display: block;
 
  font-size: .9em;
 
  font-weight: bold;
www/conservancy/templates/base_about.html
Show inline comments
 
{% extends "base_conservancy.html" %}
 
{% block category %}WhoWeAre{% endblock %}
 
{% block outercontent %}
 
    <div id="container">
 
         <div id="mainContent">{% block content %}{% endblock %}</div>
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
            <h2>Who We Are</h2>
 
            {% include 'submenus/who_we_are_partial.html' %}
 
         </div>
 
               <div id="mainContent">{% block content %}{% endblock %}
 
               </div>
 
   </div>
 
{% endblock %}
www/conservancy/templates/base_blog.html
Show inline comments
...
 
@@ -5,12 +5,13 @@
 
{% block head %}
 
<link rel="alternate" type="application/rss+xml" title="RSS" href="/feeds/blog/" />
 
{% endblock %}
 

	
 
{% block outercontent %}
 
 <div id="container">
 
     <div id="mainContent">{% block content %}{% endblock %}</div>
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
{% if all_year_list %}
 

	
 
<h2><a href="/blog/">See all blog posts&hellip;</a></h2>
 
<!-- <p><a href="/blog/query/">Query...</a></p> -->
 

	
...
 
@@ -33,10 +34,8 @@
 
{% for author in all_authors %}
 
<li><a href="/blog/?author={{ author.username }}">{{ author.formal_name }}</a>
 
(<a href="/feeds/blog/?author={{ author.username }}">rss</a>)</li>
 
{% endfor %}
 
</ul>
 
         </div>
 
               <div id="mainContent">{% block content %}{% endblock %}
 
               </div>
 
   </div>
 
{% endblock %}
www/conservancy/templates/base_compliance.html
Show inline comments
...
 
@@ -8,12 +8,13 @@
 

	
 
{% endblock %}
 

	
 
{% block outercontent %}
 
<div class="content-with-donate-sidebar">
 
    <div id="container">
 
         <div id="mainContent">{% block content %}{% endblock %}</div>
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
            <h2>What We Do</h2>
 
            {% include 'submenus/what_we_do_partial.html' %}
 
            <h2>Vizio Lawsuit</h2>
 
            <ul>
 
            <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
...
 
@@ -34,14 +35,12 @@
 
            <li class="CopyleftPrinciples"><a href="/copyleft-compliance/principles.html">Principles of Community-Oriented GPL Enforcement</a></li>
 
            <li class="LiberateFirmware"><a href="/copyleft-compliance/firmware-liberation.html">Liberate IoT Firmware via GPL Enforcement</a></li>
 
            <li class="PastLawsuits"><a href="/copyleft-compliance/past-lawsuits.html">Previous Copyleft Litigation</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 class="donate-sidebar">
 
  <details>
 
    <summary>Support Now!</summary>
 

	
 
    <h3>Support Copyleft Enforcement Now!</h3>
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -106,13 +106,13 @@
 

	
 
{% endcomment %}
 

	
 
{% if sitefundgoal and sitefundgoal.fundraiser_so_far_amount and datetime_now < sitefundgoal_endtime %}
 
{% with this_match_goal=sitefundgoal.fundraiser_goal_amount this_match_so_far=sitefundgoal.fundraiser_so_far_amount %}
 
{% with this_match_remaining=this_match_goal|subtract:this_match_so_far sitefundgoal_timeleft=sitefundgoal_endtime|subtract:datetime_now %}
 
    <div class="fundraiser-top-text ph2 ph3-ns pt2 pb3">
 
    <div class="fundraiser-top-text ph3 pt2 pb3">
 
      <div class="mw8 center ph2 ph4-ns">
 
      <div class="mt2 mb3 tc">
 
        {% if this_match_remaining <= 0 %}
 
          Thanks to {{ sitegoal.fundraiser_donation_count|intcomma }} Sustainers we earned our full match!
 
          Help us go further to stand up for software freedom &mdash; <a href="/sustainer">sign up now</a>!
 
        {% else %}
...
 
@@ -154,17 +154,17 @@
 
</div>
 
</div>
 
{% endwith %}
 
{% endwith %}
 
{% endif %}
 

	
 
    <div class="mw8 center ph2 ph3-ns">
 
    <div class="mw8 center ph2 ph3">
 
      {% block outercontent %}<div id="mainContent"> {% block content %}{% endblock %}</div>{% endblock %}
 
    </div>
 

	
 
    <div id="conservancyfooter" class="mt4 pt3 ph3 bg-light-gray">
 
    <div id="conservancyfooter" class="mt4-ns pt3 ph3 bg-light-gray">
 
      <p>Connect with Conservancy on
 
        <a href="https://mastodon.technology/@conservancy">Mastodon</a>,
 
        <a href="https://twitter.com/conservancy">Twitter</a>,
 
        <a href="https://www.facebook.com/SoftwareFreedomConservancy/">Facebook</a>,
 
        and <a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">YouTube</a>.</p>
 

	
www/conservancy/templates/base_learn.html
Show inline comments
 
{% extends "base_conservancy.html" %}
 
{% block category %}Learn{% endblock %}
 
{% block outercontent %}
 
    <div id="container">
 
         <div id="mainContent">{% block content %}{% endblock %}</div>
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
            <h2>Learn</h2>
 
            {% include 'submenus/learn_partial.html' %}
 
            <h2>Resources for Journalists</h2>
 
            <ul>
 
            <li class="News"><a href="/news/">News</a></li>
 
            <li class="PressKit"><a href="/press/">Press Kit</a></li>
 
            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
 
            </ul>
 
   </div>
 
               <div id="mainContent">{% block content %}{% endblock %}
 
               </div>
 
</div>
 
{% endblock %}
www/conservancy/templates/base_press.html
Show inline comments
...
 
@@ -8,27 +8,25 @@
 

	
 
{% endblock %}
 

	
 
{% block outercontent %}
 
<div class="content-with-donate-sidebar">
 
    <div id="container">
 
         <div id="mainContent">{% block content %}{% endblock %}</div>
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
            <h2>What We Do</h2>
 
            {% include 'submenus/what_we_do_partial.html' %}
 
            <h2>Resources for Journalists</h2>
 
            <ul>
 
            <li class="News"><a href="/news/">News</a></li>
 
            <li class="PressKit"><a href="/press/">Vizio Press Kit</a></li>
 
            <li class="IssuesInTheNews"><a href="/press/inthenews.html">Our Issues In The News</a></li>
 
            <li class="VizioPress"><a href="/press/vizio-coverage.html">Our Vizio Lawsuit In The News</a></li>
 
            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
 
            </ul>
 
         </div>
 
               <div id="mainContent">{% block content %}{% endblock %}
 
               </div>
 

	
 
    </div>
 
<div class="donate-sidebar">
 
  <details>
 
    <summary>Support Now!</summary>
 

	
 
    <h3>Support Copyleft Enforcement Now!</h3>
www/conservancy/templates/base_projects.html
Show inline comments
 
{% extends "base_conservancy.html" %}
 
{% block outercontent %}
 
    <div id="container">
 
         <div id="mainContent">{% block content %}{% endblock %}</div>
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
            <h2>What We Do</h2>
 
            {% include 'submenus/what_we_do_partial.html' %}
 
            <h2>{% block category %}Projects{% endblock %} &amp; Services</h2>
 
            <ul>
 
            <li class="Current"><a href="/projects/current/">Current Member Projects</a></li>
 
            <li class="Applying"><a href="/projects/apply/">Applying</a></li>
 
            <li class="Services"><a href="/projects/services/">Member Project Services</a></li>
 
            <li class="Policies"><a href="/projects/policies/">Member Project Policies</a></li>
 
            </ul>
 
         </div>
 
               <div id="mainContent">{% block content %}{% endblock %}
 
               </div>
 
   </div>
 
{% endblock %}
www/conservancy/templates/base_vizio.html
Show inline comments
...
 
@@ -8,12 +8,13 @@
 

	
 
{% endblock %}
 

	
 
{% block outercontent %}
 
<div class="content-with-donate-sidebar">
 
    <div id="container">
 
         <div id="mainContent">{% block content %}{% endblock %}</div>
 
         <div id="sidebar" class="VizioTopBar {% block submenuselection %}{% endblock %}">
 
            <h2>What We Do</h2>
 
            {% include 'submenus/what_we_do_partial.html' %}
 
            <h2>Vizio Lawsuit</h2>
 
            <ul>
 
            <li class="VizioMain"><a href="/copyleft-compliance/vizio.html">About the Lawsuit</a></li>
...
 
@@ -27,14 +28,12 @@
 
            <li class="VizioPressKit"><a href="/docs/software-freedom-conservancy-v-vizio-announce-press-kit.pdf">Press Kit</a></li>
 
            <li class="VizioPhotoAssets"><a href="/docs/software-freedom-conservancy-v-vizio-photo-assets.zip">Photo Assets</a></li>
 
            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
 
            </ul>
 
            <h2><ul><li class="ComplianceMain"><a href="/copyleft-compliance/index.html">More About Copyleft Compliance</a></li></ul></h2>
 
         </div>
 
               <div id="mainContent">{% block content %}{% endblock %}
 
               </div>
 
    </div>
 
    <div class="donate-sidebar">
 
  <details>
 
    <summary>Support Now!</summary>
 

	
 
    <h3>Support Copyleft Enforcement Now!</h3>
www/conservancy/templates/frontpage.html
Show inline comments
...
 
@@ -40,13 +40,13 @@ strategies that defend FOSS (such as copyleft). <a href="/about" class="orange">
 
    <h2 class="f4 ttu">Vizio Lawsuit</h2>
 
    <p>Software Freedom Conservancy files right-to-repair lawsuit against California TV manufacturer Vizio Inc. for alleged GPL violations</p>
 
    <a href="/copyleft-compliance/vizio.html" class="f5 dib pa2 ttu b btn-orange">More information</a>
 
  </section>
 
</div>
 

	
 
<div class="mt3 mh2-ns flex-ns">
 
<div class="mt3 mh2-ns mb4 flex-ns">
 
  <div class="w-70-ns mh2">
 
<section class="mh0 pa3 bg-light-blue ba b--gray">
 
  <h2 class="f4 ma0 ttu"><a href="/news/2021/oct/28/2021-DMCA-final-exemptions-win/">Software Freedom Conservancy's DMCA Exemption Requests Granted</a></h2>
 
<p>Software Freedom Conservancy is proud to announce that its efforts to stand up for the rights of FOSS developers have been successful and that it has been granted almost all of the exemptions that it requested in the Librarian of Congress' recent rule making, according to the final rule <a href="https://public-inspection.federalregister.gov/2021-23311.pdf">Exemption to Prohibition on Circumvention of Copyright Protection Systems for Access Control Technologies</a>, which was published today.  </p>
 
 </section>
 

	
www/conservancy/templates/news/pressrelease_list.html
Show inline comments
 
{% extends "base_news.html" %}
 
{% block subtitle %}News - {% endblock %}
 

	
 
{% block outercontent %}
 
    <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
         <h2>News Index by Year</h2>
 
         <ul>
 
         {% for year in date_list reversed %}<li class="{{ year|date:"Y" }}"><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
 
         </ul>
 
         <h2>Resources for Journalists</h2>
 
         <ul>
 
            <li class="News"><a href="/news/">News</a></li>
 
            <li class="PressKit"><a href="/press/">Press Kit</a></li>
 
            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
 
         </ul>
 

	
 
         </div>
 
         <div id="mainContent">
 
           <div class="breadcrumbs">
 
             <p><a href="/">Home</a> / <a href="/news/">News</a></p>
 
           </div>
 
         <h1><a href="/feeds/news/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> Conservancy News</h1>
 

	
...
 
@@ -36,10 +23,21 @@
 
<p>
 
{% if news.has_next %}<a class="next_page_button" href="?page={{ news.next_page_number }}">Next page (older) &raquo;</a>{% endif %}
 
{% if news.has_previous %}<a href="?page={{ news.previous_page_number }}">&laquo; Previous page (newer)</a>{% endif %}
 
</p>
 
{% if news.paginator.num_pages > 1 %}<p class="pagination_list"> {% for pagenum in news.paginator.page_range %}{% ifequal pagenum news.number %}[{{ pagenum }}]{% else %}<a href="?page={{ pagenum }}">{{ pagenum }}</a>{% endifequal %} {% endfor %}</p>{% endif %}
 
         </div>
 
 </div>
 
<div class="clear"></div>
 

	
 
         <div id="sidebar" class="{% block submenuselection %}{% endblock %}">
 
         <h2>News Index by Year</h2>
 
         <ul>
 
         {% for year in date_list reversed %}<li class="{{ year|date:"Y" }}"><a href="{{ year|date:"Y" }}/">{{ year|date:"Y" }}</a></li>{% endfor %}
 
         </ul>
 
         <h2>Resources for Journalists</h2>
 
         <ul>
 
            <li class="News"><a href="/news/">News</a></li>
 
            <li class="PressKit"><a href="/press/">Press Kit</a></li>
 
            <li class="Glossary"><a href="/copyleft-compliance/glossary.html">Glossary</a></li>
 
         </ul>
 
         </div>
 
 </div>
 
{% endblock %}
0 comments (0 inline, 0 general)