www-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

www layout.css licenses/license-list.html


From: Therese Godefroy
Subject: www layout.css licenses/license-list.html
Date: Fri, 11 Apr 2014 16:19:11 +0000

CVSROOT:        /webcvs/www
Module name:    www
Changes by:     Therese Godefroy <th_g> 14/04/11 16:19:11

Modified files:
        .              : layout.css 
        licenses       : license-list.html 

Log message:
        New layout for license-list.html.

CVSWeb URLs:
http://web.cvs.savannah.gnu.org/viewcvs/www/layout.css?cvsroot=www&r1=1.169&r2=1.170
http://web.cvs.savannah.gnu.org/viewcvs/www/licenses/license-list.html?cvsroot=www&r1=1.396&r2=1.397

Patches:
Index: layout.css
===================================================================
RCS file: /webcvs/www/www/layout.css,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -b -r1.169 -r1.170
--- layout.css  10 Apr 2014 06:13:48 -0000      1.169
+++ layout.css  11 Apr 2014 16:19:10 -0000      1.170
@@ -42,7 +42,7 @@
 Backgrounds
    white    #inner, navbar li.active
    #f0f2f4  light bluish gray: #translations, .emph-box, #outdated,
-            .listing, #footer
+            .listing, #footer, .toc
    #e7e9eb  .button, .lyrics
    #d1d4d7  #edu-navbar, #fsf-links, #searcher
    #ddd     gray (looks purplish): #gpl-compat-matrix 
@@ -60,11 +60,12 @@
 Borders
    black, #111, #333, #666: tables
    #b9bcbf  bluish gray: #fsf-frame, #Action, .highlight-para, .announcement
-   #c9cccf  bluish gray: .button
+   #c9cccf  bluish gray: .button, .toc
    #d1d4d7  bluish gray: #translations, #outdated
    #3465a4  blue (slightly lighter than GNU banner): edu-cases ridges, .note
    #334683  #join-fsf
    #171d33  dark blue (from screenshot): shade behind .button.large
+   #6989b6  light blue: border for h3 (license-list.html)
 */
 
 /*** Luminosity contrast ratio and color difference ***
@@ -931,6 +932,45 @@
 span.anchor-reference-id a { color: #333 !important; text-shadow: none; }
 span.anchor-reference-id a:hover { color: #777 !important; }
 
+/* For license-list.html */
+#content div.toc {
+   max-width: 41em;
+   padding: 0 1em 1em 1em;
+   margin: 3em auto 1em auto;
+   background: #f0f2f4;
+   border: 1px solid #c9cccf;
+}
+#content div.toc h3 { text-align: center; }
+
+#content blockquote#legend p { text-align: center }
+
+#content h3.big-section {
+   display: inline-block;
+   font-size: 1.8em;
+   padding: .2em 0;
+   margin: .8em .3em .4em 0;
+   color: black;
+   border-top: .2em solid #6989b6;
+   border-bottom: .2em solid #6989b6;
+}
+#content h4.big-subsection {
+   display: inline-block;
+   font-size: 1.5em;
+   line-height: 1.3em;
+   margin: .4em .3em .4em 0;
+   color: black;
+}
+
+hr.separator {
+   display: block;
+   height: .3em;
+   margin-bottom: 1.2em;
+   color: #999;
+   background-color: #999;
+   border: none;
+}
+/* End license-list definitions */
+
 
 /*** MUSIC ***/
 

Index: licenses/license-list.html
===================================================================
RCS file: /webcvs/www/www/licenses/license-list.html,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -b -r1.396 -r1.397
--- licenses/license-list.html  4 Apr 2014 23:30:59 -0000       1.396
+++ licenses/license-list.html  11 Apr 2014 16:19:11 -0000      1.397
@@ -3,10 +3,80 @@
 <title>Various Licenses and Comments about Them
 - GNU Project - Free Software Foundation</title>
 <!--#include virtual="/licenses/po/license-list.translist" -->
+
+<style type="text/css" media="print,screen">
+<!--
+/* These statements are commented out in HTML to
+   make them untranslatable.  */
+/* Definitions for color-coded border */
+#content dl.green, #content dl.orange,
+ #content dl.red, #content dl.blue {
+   padding-left: 1em;
+   margin-left: 0;
+   margin-top: 2em;
+}
+
+#content dl.green { border-left: .4em solid green; }
+#content dl.orange { border-left: .4em dashed orange; }
+#content dl.red { border-left: .4em dotted red; }
+#content dl.blue { border-left: .4em double  blue; }
+
+/* Disable legend for CSS1-only browsers:
+   they don't support :before and :after */
+#content div#legend { display: none; }
+/* Enable legend for CSS2+ browsers. */
address@hidden print,screen {
+#content div#legend { display: block; }
+}
+#content div#legend {
+   float: right;
+   width: auto; max-width: 100%;
+   font-style: normal;
+   padding: 0 1em 1em 1em;
+   margin: 1.5em 0 1em 1em;
+   background: #f0f2f4;
+   border: 1px solid #c9cccf;
+}
+
+#content div#legend dl { margin: 1em 0 0 0; }
+#content div#legend dt { padding: 1em 0; margin: 0; }
+#content div#legend dd { margin: 0; }
+
+#legend blockquote { font-size: 1.3em; font-style: normal; text-align: center; 
font-weight: bold; }
+#legend dl.green dt:after, #legend dl.orange dt:after,
+#legend dl.red dt:after, #legend dl.blue dt:after { font-weight: normal; }
+-->
+</style>
+<!-- These statements are split between different <style> elements,
+     and their contents aren't commented out on purpose:
+     they should be translated, preferably as separate strings.  -->
+<style type="text/css" media="print,screen">
+#legend blockquote:before { content: "Code for the left border"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.green dt:after {
+   content: "Free licenses, compatible with the GNU GPL or FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.orange dt:after {
+   content: "Free licenses, incompatible with the GNU GPL and FDL";
+}
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.red dt:after { content: "Nonfree licenses"; }
+</style>
+<style type="text/css" media="print,screen">
+#legend dl.blue dt:after { content: "Licenses for works stating a viewpoint"; }
+</style>
+
 <!--#include virtual="/server/banner.html" -->
 <h2>Various Licenses and Comments about Them</h2>
 
-<h3><a id="TableOfContents">Table of Contents</a></h3>
+
+<div class="toc">
+
+<h3 id="TableOfContents">Table of Contents</h3>
 
 <ul>
 <li><a href="#Introduction">Introduction</a></li>
@@ -29,16 +99,22 @@
   </ul>
 </li>
 
-<li><a href="#OtherLicenses">
-    Licenses for Works of Practical Use Besides Software and Documentation</a>
-    <ul><li><a href="#Fonts">Licenses for Fonts</a></li></ul>
-    </li>
-<li><a href="#OpinionLicenses">
-    Licenses for Works stating a Viewpoint (e.g., Opinion or 
Testimony)</a></li>
+<li><a href="#OtherLicenses">Licenses for Other Works</a>
+  <ul>
+  <li><a href="#OtherLicenses">Licenses for Works of Practical Use
+      besides Software and Documentation</a></li>
+  <li><a href="#Fonts">Licenses for Fonts</a></li>
+  <li><a href="#OpinionLicenses">Licenses for Works stating a Viewpoint
+      (e.g., Opinion or Testimony)</a></li>
+  </ul>
+</li>
 </ul>
 
+</div> <!-- /class="toc" -->
 
-<h2><a id="Introduction">Introduction</a></h2>
+
+<h3  id="Introduction" class="big-section">
+    Introduction</h3>
 
 <p>We classify a license according to certain key criteria:</p>
 
@@ -98,14 +174,25 @@
 their licensing information.</p>
 
 
-<h2><a id="SoftwareLicenses">Software Licenses</a></h2>
+<div id="legend">
+<blockquote></blockquote>
+<dl class="green"><dt></dt><dd></dd></dl>
+<dl class="orange"><dt></dt><dd></dd></dl>
+<dl class="red"><dt></dt><dd></dd></dl>
+<dl class="blue"><dt></dt><dd></dd></dl>
+</div>
 
-<h3><a id="FreeLicenses"></a>
-    <a id="GPLCompatibleLicenses">
-    GPL-Compatible Free Software Licenses</a>
-    <span class="anchor-reference-id">
+<div>
+<h3 id="SoftwareLicenses" class="big-section">
+     Software Licenses</h3>
+</div>
+
+
+<h4 id="GPLCompatibleLicenses" class="big-subsection">
+    <span id="FreeLicenses"></span>
+    GPL-Compatible Free Software Licenses</h4>
+<span class="anchor-reference-id">
      (<a href="#GPLCompatibleLicenses">#GPLCompatibleLicenses</a>)</span>
-</h3>
 
 <p><strong>The following licenses qualify as <a
 href="/philosophy/free-sw.html">free software</a>
@@ -113,7 +200,8 @@
 GPL</a>.</strong></p>
 
 
-<dl>
+<dl class="green">
+
 <dt><a id="GNUGPL"></a>  <!-- both generic and version-specific anchors -->
     <a id="GNUGPLv3" href="/licenses/gpl.html">
     GNU General Public License (GPL) version 3</a>
@@ -904,23 +992,23 @@
 <p>This is a lax, permissive non-copyleft free software license
 which is compatible with the GNU GPL.</p></dd>
 
-</dl>
+</dl> <!-- end class "green" -->
 
+<hr class="separator" />
 
-<hr />
-<h3><a id="GPLIncompatibleLicenses">
-    GPL-Incompatible Free Software Licenses</a>
-    <span class="anchor-reference-id">
+
+<h4 id="GPLIncompatibleLicenses" class="big-subsection">
+    GPL-Incompatible Free Software Licenses</h4>
+<span class="anchor-reference-id">
      (<a href="#GPLIncompatibleLicenses">#GPLIncompatibleLicenses</a>)</span>
-</h3>
 
 <p><strong>The following licenses
 are <a href="/philosophy/free-sw.html">free software</a> licenses, but
 are <a href="/licenses/gpl-faq.html#WhatIsCompatible"><em>not
 compatible</em></a> with the <a href="#GNUGPL">GNU GPL</a>.</strong></p>
 
+<dl class="orange">
 
-<dl>
 <dt><a id="AGPLv1.0" href="http://directory.fsf.org/wiki/License:AGPLv1";>
     Affero General Public License version 1</a>
     <span class="anchor-reference-id">
@@ -1513,16 +1601,16 @@
 <p><a href="#Zope20">Version 2.0 of the Zope Public License</a> is
 GPL-compatible.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange -->
 
+<hr class="separator" />
 
-<hr />    <!-- first id is singular, leave for compatibility: -->
-<h3><a id="NonFreeSoftwareLicense"></a>
-    <a id="NonFreeSoftwareLicenses">
-    Nonfree Software Licenses</a>
-    <span class="anchor-reference-id">
+<span id="NonFreeSoftwareLicense"></span>
+<h4><a id="NonFreeSoftwareLicenses" class="big-subsection">
+    Nonfree Software Licenses</a></h4>
+<span class="anchor-reference-id">
      (<a href="#NonFreeSoftwareLicenses">#NonFreeSoftwareLicenses</a>)</span>
-</h3>
+
 
 <p><strong>The following licenses <em>do not qualify</em> as <a
 href="/philosophy/free-sw.html">free software</a>
@@ -1547,7 +1635,8 @@
 unless we think that for specific reasons it won't backfire.</p>
 
 
-<dl>
+<dl class="red">
+
 <dt><a id="NoLicense">No license</a>
     <span class="anchor-reference-id">
        (<a href="#NoLicense">#NoLicense</a>)</span></dt>
@@ -1969,22 +2058,27 @@
 <p>(The YaST software itself no longer uses this nonfree YaST license;
 happily, it is now free software, released under the GNU GPL.)</p></dd>
 
-</dl>
+</dl> <!-- end class="red" -->
 
-<h2><a id="DocumentationLicenses">Licenses For Documentation</a></h2>
+<div>
+<h3 id="DocumentationLicenses" class="big-section">
+    Licenses For Documentation</h3>
+</div>
 
-<h3><a id="FreeDocumentationLicenses">Free Documentation Licenses</a>
-    <span class="anchor-reference-id">
+
+<h4 id="FreeDocumentationLicenses" class="big-subsection">
+    Free Documentation Licenses</h4>
+<span class="anchor-reference-id">
      (<a href="#FreeDocumentationLicenses">#FreeDocumentationLicenses</a>)
     </span>
-</h3>
 
 <p><strong>The following licenses qualify as <a
 href="/philosophy/free-doc.html">free
 documentation</a> licenses.</strong></p>
 
 
-<dl>
+<dl class="green">
+
 <dt><a id="FDL" href="/licenses/fdl.html">
     GNU Free Documentation License</a>
     <span class="anchor-reference-id">(<a href="#FDL">#FDL</a>)</span></dt>
@@ -1996,6 +2090,19 @@
 (&ldquo;books&rdquo;).</p></dd>
 
 
+<dt><a id="FreeBSDDL"
+       href="http://directory.fsf.org/wiki?title=License:FreeBSD";>
+    FreeBSD Documentation License</a>
+    <span class="anchor-reference-id">
+       (<a href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
+<dd>
+<p>This is a permissive non-copyleft free documentation license that is
+compatible with the GNU FDL.</p></dd>
+
+</dl> <!-- end class="green" -->
+<dl class="orange">
+
+
 <dt><a id="ACDL"
        
href="http://fedoraproject.org/wiki/Licensing/Common_Documentation_License";>
     Apple's Common Documentation License, Version 1.0</a>
@@ -2008,16 +2115,6 @@
 Documentation License.</p></dd>
 
 
-<dt><a id="FreeBSDDL"
-       href="http://directory.fsf.org/wiki?title=License:FreeBSD";>
-    FreeBSD Documentation License</a>
-    <span class="anchor-reference-id">
-       (<a href="#FreeBSDDL">#FreeBSDDL</a>)</span></dt>
-<dd>
-<p>This is a permissive non-copyleft free documentation license that is
-compatible with the GNU FDL.</p></dd>
-
-
 <dt><a id="RealOPL"></a>  <!-- old id, leave for compatibility -->
     <a id="OpenPublicationL" href="http://opencontent.org/openpub/";>
     Open Publication License, Version 1.0</a>
@@ -2055,22 +2152,23 @@
 abbreviation &ldquo;OPL&rdquo; for either license.  It is worth spelling
 their names in full to make sure people understand what you say.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange" -->
 
+<hr class="separator" />
 
-<hr />
-<h3><a id="NonFreeDocumentationLicenses">
-    Nonfree Documentation Licenses</a>
-    <span class="anchor-reference-id">
+
+<h4 id="NonFreeDocumentationLicenses" class="big-subsection">
+    Nonfree Documentation Licenses</h4>
+<span class="anchor-reference-id">
     (<a href="#NonFreeDocumentationLicenses">#NonFreeDocumentationLicenses</a>)
     </span>
-</h3>
 
 <p><strong>The following licenses <em>do not qualify</em>
 as free documentation licenses:</strong></p>
 
 
-<dl>
+<dl class="red">
+
 <dt><a id="OCL"></a> <!-- brief id, leave for compatibility -->
     <a id="OpenContentL" href="http://opencontent.org/opl.shtml";>
     Open Content License, Version 1.0</a>
@@ -2087,16 +2185,19 @@
 spelling their names in full to make sure people understand what you
 say.</p></dd>
 
-</dl>
+</dl> <!-- end class="red" -->
 
-<h2><a id="OtherLicenses">
-    Licenses for Works of Practical Use Besides Software and Documentation</a>
-    <span class="anchor-reference-id">
+<div>
+<h3 id="OtherLicenses" class="big-section">Licenses for Other Works</h3>
+</div>
+
+<h4 class="big-subsection">Licenses for Works of Practical Use
+    besides Software and Documentation</h4>
+<span class="anchor-reference-id">
        (<a href="#OtherLicenses">#OtherLicenses</a>)</span>
-</h2>
 
+<dl class="green">
 
-<dl>
 <dt><a id="GPLOther" href="/licenses/gpl.html">
     GNU General Public License</a>
     <span class="anchor-reference-id">
@@ -2121,6 +2222,9 @@
 recommend the GNU FDL for dictionaries, encyclopedias, and any other
 works that provide information for practical use.</p></dd>
 
+</dl> <!-- end class="green" -->
+<dl  class="orange">
+
 
 <dt><a id="ccby" href="http://creativecommons.org/licenses/by/2.0/legalcode";>
     Creative Commons Attribution 2.0 license</a>
@@ -2191,19 +2295,20 @@
 copyrightable, so we don't recommend using it; however, there is no
 reason to avoid using data released this way.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange" -->
 
 
-<h3><a id="Fonts">Licenses for Fonts</a>
-    <span class="anchor-reference-id">(<a href="#Fonts">#Fonts</a>)</span>
-</h3>
+<h4 id="Fonts" class="big-subsection">
+    Licenses for Fonts</h4>
+<span class="anchor-reference-id">
+    (<a href="#Fonts">#Fonts</a>)</span>
 
 <p>The licenses below apply to an instantiation of a design in a computer
 file, not the artistic design.  As far as we know, an implementation of
 a design is always copyrightable.  The legal status of the artistic
 design is complex, and varies by jurisdiction.</p>
 
-<dl>
+<dl class="green">
 
 <dt><a id="GPLFonts" href="/licenses/gpl.html">
     GNU General Public License</a>
@@ -2219,6 +2324,8 @@
 href="http://www.fsf.org/blogs/licensing/20050425novalis";>explanatory
 essay about the GPL Font Exception</a>.</p></dd>
 
+</dl> <!-- end class="green" -->
+<dl  class="orange">
 
 <dt><a id="Arphic"
        href="http://ftp.gnu.org/gnu/non-gnu/chinese-fonts-truetype/LICENSE";>
@@ -2243,12 +2350,13 @@
 harmless.  Neither we nor SIL recommend the use of this license for
 anything other than fonts.</p></dd>
 
-</dl>
+</dl> <!-- end class="orange" -->
 
-<h2><a id="OpinionLicenses"> Licenses for Works stating a Viewpoint (e.g., 
Opinion or Testimony)</a>
-    <span class="anchor-reference-id">
+
+<h4 id="OpinionLicenses" class="big-subsection">
+    Licenses for Works stating a Viewpoint (e.g., Opinion or Testimony)</h4>
+<span class="anchor-reference-id">
        (<a href="#OpinionLicenses">#OpinionLicenses</a>)</span>
-</h2>
 
 <p>Works that express someone's opinion&mdash;memoirs, editorials, and
 so on&mdash;serve a fundamentally different purpose than works for
@@ -2265,7 +2373,8 @@
 two that we recommend:</p>
 
 
-<dl>
+<dl class="blue">
+
 <dt><a id="GNUVerbatim" href="/licenses/licenses.html#VerbatimCopying">
     GNU Verbatim Copying License</a>
     <span class="anchor-reference-id">
@@ -2290,11 +2399,12 @@
 Please <a href="#which-cc">be specific about which Creative
 Commons license is being used</a>.</p></dd>
 
-</dl>
+</dl> <!-- end class="blue" -->
+
+<hr class="separator" />
 
 
-<hr />
-<strong><a href="/licenses/licenses.html">More about licenses.</a></strong>
+<p class="back"><strong><a href="/licenses/licenses.html">More about 
licenses</a></strong></p>
 </div><!-- for id="content", starts in the include above -->
 <!--#include virtual="/server/footer.html" -->
 <div id="footer">
@@ -2334,7 +2444,7 @@
 
 <p></p><p class="unprintable">Updated:
 <!-- timestamp start -->
-$Date: 2014/04/04 23:30:59 $
+$Date: 2014/04/11 16:19:11 $
 <!-- timestamp end -->
 </p>
 </div>



reply via email to

[Prev in Thread] Current Thread [Next in Thread]