Changeset - 4977fac4e8cb
[Not reviewed]
0 3 1
Daniel Pono Takamori - 13 months ago 2021-10-19 13:47:58
pono@apache.org
start Q&A page

edit menu to remove About section and rearrange other items
4 files changed with 21 insertions and 18 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/press/index.html
Show inline comments
 
{% extends "base_press.html" %}
 
{% block subtitle %}Press - {% endblock %}
 
{% block submenuselection %}Press{% endblock %}
 
{% block content %}
 
<h1 id="PressInformation">Press Information</h1>
 

	
 
<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod 
 
  tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
 
  quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
 
  consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
 
  cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
 
  non proident, sunt in culpa qui officia deserunt mollit anim id est
 
  laborum."</p>
 

	
 
<h2 id="support">Donate to Support This Work</h2>
 

	
 
<p>Finally, Conservancy welcomes <a href="#donate-box"
 
  class="donate-now">donations</a> in support of our GPL Compliance Projects,
 
  and we encourage you to become a <a href="/sustainer/">an official
 
  Supporter of Software Freedom Conservancy</a>. </p>
 
</div>
 
{% endblock %}
www/conservancy/static/press/qanda.html
Show inline comments
 
new file 100644
 
{% extends "base_press.html" %}
 
{% block subtitle %}Press - {% endblock %}
 
{% block submenuselection %}Press{% endblock %}
 
{% block content %}
 
<h1 id="QandA">Q&A</h1>
 

	
 
<p>"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod 
 
  tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
 
  quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo
 
  consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse
 
  cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat
 
  non proident, sunt in culpa qui officia deserunt mollit anim id est
 
  laborum."</p>
 

	
 
{% endblock %}
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -33,130 +33,125 @@
 
        <div class="w-60-ns">
 
          <h1 id="conservancyheader" class="mt2 mt3-ns mb2 mb3-ns">
 
            <a href="/">
 
              <img src="{% static 'img/conservancy-header.svg' %}" alt="Software Freedom Conservancy" class="db center mh3-ns" />
 
            </a>
 
          </h1>
 
        </div>
 

	
 
        <div class="w-40-ns mt2 mt4-ns mb2 mb2-ns mh2 pt1 flex flex-wrap justify-center items-center">
 
          <span id="menu-icon" class="dn-ns ph2 pointer">
 
            <svg style="color: var(--orange); width: 30px; height: 30px;"><use href="{% static 'img/font_awesome.svg' %}#bars"></use></svg>
 
          </span>
 
          <a href="/donate/" class="f5 mh1 mv1 ph2 pv1 ttu b btn-orange">Donate</a>
 
          <a href="/sustainer/" class="f5 mh1 mv1 ph2 pv1 ttu b btn-orange">Join</a>
 
          <a href="#fixme" class="f5 mh1 mv1 ph2 pv1 ttu b btn-white">Special</a>
 
          <span id="search-icon" class="dib ph2 pointer">
 
            <svg style="color: var(--orange); width: 30px; height: 30px;"><use href="{% static 'img/font_awesome.svg' %}#search"></use></svg>
 
          </span>
 
        </div>
 
      </div>
 
    </header>
 

	
 
    <div id="navbar-outer" class="mt2 mt0-ns mb2">
 
      <div id="navbar" class="center mw8 nested-list-resetb dn db-ns">
 
        <ul class="f5 ttu flex flex-wrap justify-center">
 
          <!-- Remaining previous menu items
 
          <li class="Projects"><a href="/projects/">Projects</a></li>
 
          <li class="npoacct"><a href="/npoacct/">NPOAcct</a></li>
 
          -->
 

	
 
          <li class="search dn-ns">
 
            <form method="get" action="https://duckduckgo.com" class="ml2 flex mw6">
 
              <input id="search-query" type="text" name="q" placeholder="Search with DuckDuckGo" class="pa2 ba b--gray br0" style="x-border-right: none; flex: 1 1 auto; width: 1%;" />
 
              <input type="hidden" name="sites" value="sfconservancy.org" />
 
              <button type="submit" class="bg-orange bn white pa2 pointer btn-orange" style="margin-left: -1px;">
 
                <svg style="color: white; width: 20px; height: 20px;"><use href="{% static 'img/font_awesome.svg' %}#search"></use></svg></a>
 
              </button>
 
    </form>
 
          </li>
 
          <li class="home dn db-ns"><a href="/">Home</a></li>
 
          <li class="what"><a href="#fixme">What we do</a>
 
            <ul>
 
              <li><a href="/projects/">Member Projects</a></li>
 
              <li><a href="/copyleft-compliance/">Copyleft Compliance</a></li>
 
              <li><a href="#fixme">Special</a></li>
 
              <li><a href="#fixme">FAQs</a></li>
 
            </ul>
 
          </li>
 
          <li class="who"><a href="#fixme">Who we are</a>
 
          <li class="who"><a href="/about/">Who we are</a>
 
            <ul>
 
              <li><a href="/sponsors/">Sponsors</a></li>
 
              <li><a href="/sustainer/">Sustainers</a></li>
 
              <li><a href="/about/board/">Board of Directors</a></li>
 
              <li><a href="/about/staff/">Staff</a></li>
 
              <li><a href="/about/eval-committee/">Evaluation Committee</a></li>
 
              <li><a href="/about/outside/">Outside Counsel, et alia</a></li>
 
              <li><a href="#fixme">Transparency</a></li>
 
              <li><a href="/about/contact/">Contact</a></li>
 
            </ul>
 
          </li>
 
          <li class="learn"><a href="#fixme">Learn</a>
 
            <ul>
 
              <li><a href="/copyleft-compliance/glossary.html">Glossary of Terms</a></li>
 
              <li><a href="#fixme">Q&A</a></li>
 
              <li><a href="/press/qanda.html">Q&A</a></li>
 
              <li><a href="#fixme">Recommended Resources</a></li>
 
              <li><a href="#fixme">In The News</a></li>
 
              <li><a href="/about/filings/">Public Filings</a></li>
 
            </ul>
 
          </li>
 
          <li class="news"><a href="/news/">News</a>
 
            <ul>
 
              <li><a href="/news/">News Releases</a></li>
 
              <li><a href="/blog/">Blog</a></li>
 
              <li><a href="#fixme">In The News</a></li>
 
              <li><a href="/press/">Press</a></li>
 
            </ul>
 
          </li>
 
          <li class="about"><a href="/about/">About</a>
 
            <ul>
 
              <li><a href="#fixme">Who we are</a></li>
 
              <li><a href="#fixme">Transparency</a></li>
 
              <li><a href="/about/filings/">Public Filings</a></li>
 
              <li><a href="/about/contact/">Contact</a></li>
 
            </ul>
 
          </li>
 
        </ul>
 
      </div>
 
      <div id="navbar-clear"></div>
 

	
 
    </div>
 

	
 
{% comment %}
 
# FUNDRAISER VARIABLES AND CONSTANTS GUIDE
 

	
 
## From Local Context
 

	
 
* datetime_now: Current DateTime in UTC
 
* sitefundgoal: The current FundraisingGoal. Attributes:
 
  * fundraiser_goal_amount: The amount being matched
 
  * fundraiser_so_far_amount: The amount contributed so far
 
  * fundraiser_donation_count: The number of people who have contributed so far
 
  * fundraiser_donation_count_disclose_threshold: The number of new Sustainers that can be double-matched this fundraiser.
 
      (No, this name makes no sense. We're repurposing an existing model field for this new reason.)
 
* sitefundgoal_endtime: DateTime when sitefundgoal ends.
 

	
 
## Local convenience variables
 

	
 
* sitefundgoal_timeleft: TimeDelta for how much time remains in the current fundraiser
 
* this_match_goal: The amount being matched
 
* this_match_so_far: The amount contributed so far
 
* this_match_remaining: this_match_goal - this_match_so_far
 

	
 
{% 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">
 
      <p>
 
        {% 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 %}
 
          {% if sitefundgoal_timeleft.total_seconds <= 0 %}
 
            The
 
          {% elif sitefundgoal_timeleft.days == 0 %}
 
            Through today only, the
 
          {% elif sitefundgoal_timeleft.days == 1 %}
 
            Through tomorrow only, the
 
          {% elif sitefundgoal_timeleft.days < 14 %}
 
            For only {{ sitefundgoal_timeleft.days }} more days, the
 
          {% else %}
 
            Until January 15, the
www/conservancy/templates/frontpage.html
Show inline comments
...
 
@@ -35,89 +35,89 @@ repair, improve and reinstall software. We promote and defend these rights
 
through fostering free and open source software (FOSS) projects, driving
 
initiatives that actively make technology more inclusive, and advancing policy
 
strategies that defend FOSS (such as copyleft). <a href="#fixme" class="orange">Learn more.</a></p>
 
  </section>
 
  <section class="w-30-ns mh2 pa3 bg-light-blue ba b--gray">
 
    <h2 class="f4 ttu">Special message</h2>
 

	
 
    <p>Special message here special message here special message here special message here special message here.</p>
 
    <a href="#fixme" class="f5 dib pa2 ttu b btn-orange">More information</a>
 
  </section>
 
</div>
 

	
 
<div class="mt3 mh2-ns flex-ns">
 
  <div class="w-70-ns mh2">
 
  <section class="mh0 pa3 bg-light-blue ba b--gray">
 
    <h2 class="f4 ma0 ttu">Additional links / call-outs here, if needed</h2>
 
  </section>
 

	
 
    <section class="mv3 ph2">
 
<h2 class="f4 mt0 mb2 ttu"><!--<a href="/feeds/news/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a>--> <a href="/news/" class="dark-gray">News</a></h2>
 
{% for pressr in press_releases|slice:":5" %}
 
  {% if forloop.first or pressr.pub_date|date_within_past_days:365 %}
 
    {% if not forloop.first %}<hr class="clear">{% endif %}
 
    {% include "news/pressrelease_partial.html" with pressr=pressr show="dateline" only %}
 
  {% endif %}
 
{% endfor %}
 

	
 
<!-- <p><span class="continued"><a href="/news/">Conservancy News Archive&hellip;</a></span></p> -->
 
</section>
 

	
 
<section class="mt4 mb3 ph2">
 
<h2 class="f4 mb2 ttu"><!-- <a href="/feeds/blog/" class="feedlink"><img src="/img/feed-icon-14x14.png" alt="[RSS]"/></a> --> <a href="/blog/" class="dark-gray">Articles</a></h2>
 
{% for entry in blog|slice:":5" %}
 
  {% if forloop.first or entry.pub_date|date_within_past_days:180 %}
 
    {% if not forloop.first %}<hr class="clear">{% endif %}
 
    {% include "blog/entry_partial.html" with entry=entry show="dateline" only %}
 
  {% endif %}
 
{% endfor %}
 

	
 
<!-- <p><span class="continued"><a href="/blog/">Conservancy Blog Archive&hellip;</a></span></p> -->
 
</section>
 
</div>
 

	
 
<div class="w-30-ns mh2">
 
  <div class="ph3 pv2 ba b--gray">
 
    <h3 class="ttu">Term of the week</h3>
 
    <h4 class="f4 mt3 mb2 i navy">auditability</h4>
 
    <p>Ability to inspect the exact software running on a device. This includes version information, modifications and licensing information.</p>
 
    <p><a href="#fixme" class="orange ttu">Visit our glossary of terms</a></p>
 
    <p><a href="/copyleft-compliance/glossary.html" class="orange ttu">Visit our glossary of terms</a></p>
 
  </div>
 

	
 
  <div class="mh3 pt3">
 
    <h2 class="f6 ttu mb1">Subscribe to our email list</h2>
 
    <form method="post" action="#fixme" class="ml2" style="display: flex;">
 
      <input type="email" class="pa2 ba b--gray br0" style="x-border-right: none; flex: 1 1 auto; width: 1%;">
 
      <button type="submit" class="bg-orange bn white pa2 pointer btn-orange" style="margin-left: -1px;">
 
        <svg style="color: white; width: 20px; height: 20px;"><use href="{% static 'img/font_awesome.svg' %}#envelope"></use></svg></a>
 
        </button>
 
    </form>
 

	
 
    <h2 class="f6 ttu mt2 mb1">RSS feed</h2>
 
    <div class="ml2">
 
      <a href="/feeds/omnibus" class="mr2"><svg class="orange" style="width: 30px; height: 30px;"><use href="{% static 'img/font_awesome.svg#rss-square' %}"></use></svg></a>
 
    </div>
 

	
 
    <h2 class="f6 ttu mt2 mb1">Follow us</h2>
 
    <div class="ml2">
 
      {% include 'socials_partial.html' %}
 
    </div>
 

	
 
<!-- <h2>Support Conservancy</h2>
 
     <p>As a 501(c)(3) non-profit charity, Conservancy relies on
 
     charitable donations for its operations.
 
     Please join {{supporters_count|safe}} others and <a href="/sustainer/"><strong>become a Conservancy Sustainer
 
     today</strong></a> and/or <a href="/donate/">donate generously</a> to help our work!
 
     </p>
 

	
 
     <h2>Learn More about Conservancy</h2>
 
     <p>
 
     <span class="continued"><a href="/about/">An Overview of Conservancy&hellip;</a></span>
 
     <span class="continued"><a href="/members/current/">Conservancy's current member projects&hellip;</a></span>
 
     <span class="continued"><a href="/members/services/">Services Conservancy provides to its member projects&hellip;</a></span>
 
     <span class="continued"><a href="/copyleft-compliance/">Conservancy's unique work  defending and upholding  copyleft licenses (e.g., the GPL) &hellip;</a></span>
 
     <span class="continued"><a href="/npoacct/">Conservancy's Non-Profit Accounting Project &hellip;</a></span>
 
     </p> -->
 
</div>
 
</div>
 
</div>
 
{% endblock %}
0 comments (0 inline, 0 general)