Changeset - c15ed233cfed
[Not reviewed]
0 4 0
Bradley Kuhn (bkuhn) - 9 years ago 2015-03-05 15:43:41
bkuhn@ebb.org
Begin work to highlight sidebar menu correctly.

The sidebar menu, and its related top menu item should match setups used
with other sidebar based pages on the site.
4 files changed with 6 insertions and 3 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/conservancy.css
Show inline comments
...
 
@@ -135,33 +135,34 @@ h3 { margin-top: .6em; margin-bottom: .4em; }
 
    margin: 5px; 
 
    border: 1px solid #CCC;
 
    background: #fff url(/img/nav-bg.png) bottom repeat-x;
 
}
 
#container #sidebar li:hover a { background: #577632; color: #fff; }
 

	
 
#container #sidebar.Directors ul li.Directors,
 
#container #sidebar.Eval ul li.Eval,
 
#container #sidebar.Contact ul li.Contact,
 
#container #sidebar.Officers ul li.Officers,
 
#container #sidebar.Staff ul li.Staff,
 
#container #sidebar.Outside ul li.Outside,
 
#container #sidebar.Filings ul li.Filings,
 
#container #sidebar.License ul li.License,
 
#container #sidebar.Current ul li.Current,
 
#container #sidebar.Services ul li.Services,
 
#container #sidebar.Applying ul li.Applying
 
#container #sidebar.Applying ul li.Applying,
 
#container #sidebar.Applying ul li.AboutCompliance
 
{
 
    color: #000033;
 
    font-weight: bold;
 
    background: #fff url(/img/nav-bg-up.png) top repeat-x;
 
}
 
#container #sidebar h2 {
 
    text-align: center;
 
    font-size: 150%;
 
    margin: 1.5em 0 0.8em 0;
 
}
 
#container #sidebar hr {
 
    width: 75%;
 
    float: center;
 
    clear: all;
 
}
 

	
...
 
@@ -249,32 +250,33 @@ div.download-formats { margin-top: 2em; margin-bottom: 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-overview #navbar ul li.overview a,
 
body.conservancy-Members #navbar ul li.Members 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-linux-compliance #navbar ul li.linux-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: #fff url(/img/nav-bg-up.png) top repeat-x;
 
}
 
body.conservancy-supporter #navbar ul li.supporter a
 
{ 
 
    color: #000033;
 
    font-weight: bold;
 
    background: url(/img/nav-bg-campaign-up.png) bottom repeat-x;
 
}
 

	
 
#supporters ul {
www/conservancy/static/linux-compliance/about.html
Show inline comments
 
{% extends "base_compliance.html" %}
 
{% block subtitle %}GPL Compliance Project For Linux Developers - {% endblock %}
 
{% block submenuselection %}About{% endblock %}
 
{% block submenuselection %}AboutCompliance{% endblock %}
 
{% block content %}
 
<h1>GPL Compliance Project for Linux Developers</h1>
 

	
 
<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.</p>
 

	
 
<p>Historically, Conservancy was well-known for its ongoing license
 
compliance efforts on behalf of its BusyBox member project.  In May
 
2012, <a href="https://sfconservancy.org/news/2012/may/29/compliance/">Conservancy
 
announced a coordinated compliance effort</a> on behalf of its BusyBox and
 
Samba projects, and also launched this unique project, called the <cite>GPL
 
Compliance Project for Linux Developers</cite>, which handles compliance and
 
enforcement activities on behalf of more than a dozen Linux copyright
www/conservancy/templates/base_compliance.html
Show inline comments
...
 
@@ -30,23 +30,23 @@ of $<span id="fundraiser-goal">50,000</span> match met.<br/>
 
<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>
 

	
 
<p>Or, <a href="/supporter/#annual"><strong>become a Conservancy
 
      Supporter</strong></a>.</p>
 
</td></tr></table>
 
</div>
 
<div style="align:left;width:80%;">
 
    <div id="container">
 
         <div id="sidebar" class="{% block submenuselection %}other{% endblock %}">
 
            <h2>Conservancy's GPL {% block category %}Compliance{% endblock %} Work</h2>
 
            <ul>
 
            <li class="About"><a href="/linux-compliance/about.html">About GPL Compliance Project for Linux Developers</a></li>
 
            <li class="AboutCompliance"><a href="/linux-compliance/about.html">About GPL Compliance Project for Linux Developers</a></li>
 
            </ul>
 
         </div>
 
               <div id="mainContent">{% block content %}{% endblock %}
 
               </div>
 
</div></div>
 
{% endblock %}
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -14,32 +14,33 @@
 

	
 
  <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="overview"><a href="/overview/">Overview</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/">Member Projects &amp; Services</a></li>
 
          <li class="About"><a href="/about/">About</a></li>
 
	  <li class="sponsors"><a href="/sponsors/">Sponsors</a></li>
 
	  <li class="donate"><a href="/donate/">Donate</a></li>
 
          <li class="npoacct"><a href="/npoacct/">NPOAcct</a></li>
 
          <li class="linux-compliance"><a href="/linux-compliance/">GPL</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/3.0/us"><img alt="Creative Commons License" style="border-width:0" src="/img/cc-by-sa_88x31.png" /></a> 
 
      <br />This page is licensed under a
0 comments (0 inline, 0 general)