Changeset - 37d67fb1da4a
[Not reviewed]
0 2 4
Ben Sturmfels (bsturmfels) - 13 months ago 2021-10-19 13:47:58
ben@sturm.com.au
Break submenus out into separately included files for reuse in sidebars.
6 files changed with 35 insertions and 39 deletions:
0 comments (0 inline, 0 general)
www/conservancy/templates/base_about.html
Show inline comments
 
{% extends "base_conservancy.html" %}
 
{% block outercontent %}
 
    <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
 
            <h2>{% block category %}About{% endblock %}</h2>
 
            <ul>
 
            <li class="Overview"><a href="/about/index.html">Overview</a></li>
 
            <li class="Contact"><a href="/about/contact">Contact</a></li>
 
            <li class="Directors"><a href="/about/board/">Directors</a></li>
 
            <li class="Staff"><a href="/about/staff/">Staff</a></li>
 
            <li class="Eval"><a href="/about/eval-committee/">Evaluation Committee</a></li>
 
            <li class="Outside"><a href="/about/outside/">Outside Counsel, et alia</a></li>
 
            <li class="Filings"><a href="/about/filings/">Filings</a></li>
 
            <li class="License"><a href="/about/license/">License &amp; Sources</a></li>
 
            </ul>
 
            {% include 'submenus/who_we_are_partial.html' %}
 
         </div>
 
               <div id="mainContent">{% block content %}{% endblock %}
 
               </div>
 
   </div>
 
{% endblock %}
 
g
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -26,131 +26,106 @@
 
    <script type="text/javascript" src="/js/conservancy.js"></script>
 
    {% block head %}{% endblock %}
 
  </head>
 

	
 
  <body class="conservancy-{% block category %}other{% endblock %}">
 
    <header>
 
      <div class="flex-ns center mw8">
 
        <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="/vizio/" class="f5 mh1 mv1 ph2 pv1 ttu b btn-white">Vizio</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="/vizio/">Vizio</a></li>
 
              <li><a href="#fixme">FAQs</a></li>
 
            </ul>
 
            {% include 'submenus/what_we_do_partial.html' %}
 
          </li>
 
          <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>
 
            {% include 'submenus/who_we_are_partial.html' %}
 
          </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="/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>
 
            {% include 'submenus/learn_partial.html' %}
 
          </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>
 
            {% include 'submenus/news_partial.html' %}
 
          </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 %}
www/conservancy/templates/submenus/learn_partial.html
Show inline comments
 
new file 100644
 
<ul>
 
  <li><a href="/copyleft-compliance/glossary.html">Glossary of Terms</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>
www/conservancy/templates/submenus/news_partial.html
Show inline comments
 
new file 100644
 
<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>
www/conservancy/templates/submenus/what_we_do_partial.html
Show inline comments
 
new file 100644
 
<ul>
 
  <li><a href="/projects/">Member Projects</a></li>
 
  <li><a href="/copyleft-compliance/">Copyleft Compliance</a></li>
 
  <li><a href="/vizio/">Vizio</a></li>
 
  <li><a href="#fixme">FAQs</a></li>
 
</ul>
www/conservancy/templates/submenus/who_we_are_partial.html
Show inline comments
 
new file 100644
 
<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>
0 comments (0 inline, 0 general)