Merge branch 'gh-pages' into functional-descriptions

README.md

@@ -49,6 +49,7 @@ Licenses sit in the `/_licenses` folder. Each license has YAML front matter desc
 
 #### Optional fields
 
+* `featured` - Whether the license should be featured on the main page (defaults to false)
 * `note` - Additional information about the licenses
 * `using` - A list of notable projects using the license in the form of `project_name: "url"`
 * `redirect_from` - Relative path(s) to redirect to the license from, to prevent breaking old URLs
@@ -84,7 +85,7 @@ The license properties (rules) are stored as a bulleted list within the licenses
 #### Conditions
 
 * `include-copyright` - Include a copy of the license and copyright notice with the code.
-* `document-changes` - Indicate significant changes made to the code.
+* `document-changes` - Indicate changes made to the code.
 * `disclose-source` - Source code must be made available when distributing the software.
 * `network-use-disclose` - Users who interact with the software via network are given the right to receive a copy of the corresponding source code.
 * `same-license` - Modifications must be released under the same license when distributing the software. In some cases a similar or related license may be used.

_config.yml

@@ -41,7 +41,6 @@ gems:
   - jekyll-coffeescript
 
 sass:
-    sass_dir: _sass
     style: :compressed
 
 twitter:

_data/meta.yml

@@ -31,6 +31,10 @@
 
 # Optional fields
 
+- name: featured
+  description: Whether the license should be featured on the main page (defaults to false)
+  required: false
+
 - name: note
   description: Additional information about the licenses
   required: false

_data/rules.yml

@@ -2,7 +2,7 @@ conditions:
 - description: Include a copy of the license and copyright notice with the code.
   label: License and Copyright Notice
   tag: include-copyright
-- description: Indicate significant changes made to the code.
+- description: Indicate changes made to the code.
   label: State Changes
   tag: document-changes
 - description: Source code must be made available when distributing the software.

_includes/sidebar.html

@@ -1,23 +1,7 @@
 <div class="sidebar">
 
   <a href="#" data-clipboard-target="#license-text" data-proofer-ignore="true" class="js-clipboard-button button">Copy license text to clipboard</a>
-  
-  <div class="license-description">
-    <h3>Description</h3>
-    <p>
-      {{ page.description }}
-    </p>
-  </div>
-  
-  {% if page.nickname %}
-  <div class="license-nickname">
-    <h3>Nickname</h3>
-    <p>
-      {{ page.nickname }}
-    </p>
-  </div>
-  {% endif %}
-  
+    
   <div class="how-to-apply">
     <h3>How to apply this license</h3>
     <p>
@@ -38,27 +22,6 @@
   </div>
   {% endif %}
 
-  <div class="license-rules license-rules-sidebar">
-
-  {% assign types = "permissions|conditions|limitations" | split: "|" %}
-  {% for type in types %}
-    <h3>{{ type | capitalize }}</h3>
-    <ul class="license-{{ type }}">
-      {% assign rules = site.data.rules[type] | sort: "label" %}
-      {% for rule_obj in rules %}
-        {% assign req = rule_obj.tag %}
-        {% if page[type] contains req %}
-          <li class="{{ req }}">
-            <span class="license-sprite"></span>
-            {{ rule_obj.label }}
-          </li>
-        {% endif %}
-      {% endfor %}
-    </ul>
-  {% endfor %}
-
-  </div>
-
   {% if page.using %}
   <div class="projects-with-license">
     <h3>Who's using this license?</h3>

_layouts/license.html

@@ -1,8 +1,52 @@
 {% include header.html %}
 
       <div class="clearfix">
+      
         <div class="license-body">
-          <pre id="license-text">{{ content | replace:"<", "&lt;" | replace:">", "&gt;" }}</pre>
+        
+            {% if page.nickname %}
+            <p class="license-nickname">
+                {{ page.nickname }}
+            </p>
+            {% endif %}
+
+            <p>
+                {{ page.description }}
+            </p>
+            
+            <div class="license-page-details">
+            
+              <table class="license-rules">
+                <tr>
+                {% assign types = "permissions|conditions|limitations" | split: "|" %}
+                {% for type in types %}
+                  <th class="label">{{ type | capitalize }}</th>
+                {% endfor %}
+                </tr>
+                <tr>
+                  {% for type in types %}
+                    <td>
+                      <ul class="license-{{ type }}">
+                        {% assign rules = site.data.rules[type] | sort: "label" %}
+                        {% for rule_obj in rules %}
+                          {% assign req = rule_obj.tag %}
+                          {% if page[type] contains req %}
+                            <li class="{{ req }}">
+                              <span class="license-sprite"></span>
+                              {{ rule_obj.label }}
+                            </li>
+                          {% endif %}
+                        {% endfor %}
+                      </ul>
+                    </td>
+                  {% endfor %}
+                </tr>
+              </table>
+              
+            </div>
+
+            <pre id="license-text">{{ content | replace:"<", "&lt;" | replace:">", "&gt;" }}</pre>
+          
         </div> <!-- /license-body -->
 
 {% include sidebar.html %}

_licenses/afl-3.0.txt

@@ -8,6 +8,7 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 
 conditions:
   - include-copyright
+  - document-changes
 
 permissions:
   - commercial-use

_licenses/apache-2.0.txt

@@ -2,6 +2,7 @@
 title: Apache License 2.0
 redirect_from: /licenses/apache/
 source: http://www.apache.org/licenses/LICENSE-2.0.html
+featured: true
 
 description: A permissive license whose main conditions require preservation of copyright and license notices. Contributors provide an express grant of patent rights to users. Licensed works, modifications, and larger works may be distributed under different terms and without source code.
 

_licenses/gpl-3.0.txt

@@ -3,6 +3,7 @@ title: GNU General Public License v3.0
 nickname: GNU GPLv3
 redirect_from: /licenses/gpl-v3/
 source: http://www.gnu.org/licenses/gpl-3.0.txt
+featured: true
 
 description: Permissions of this strong copyleft license are conditioned on making available complete source code of licensed works and modifications, which include larger works using a licensed work, under the same license when distributed. Copyright and license notices must be preserved. Contributors provide an express grant of patent rights to users.
 

_licenses/lgpl-2.1.txt

@@ -13,6 +13,7 @@ note: The Free Software Foundation recommends taking the additional step of addi
 conditions:
   - include-copyright
   - disclose-source
+  - document-changes
   - same-license
 
 permissions:

_licenses/lgpl-3.0.txt

@@ -13,6 +13,7 @@ note: The Free Software Foundation recommends taking the additional step of addi
 conditions:
   - include-copyright
   - disclose-source
+  - document-changes
   - same-license
 
 

_licenses/mit.txt

@@ -1,6 +1,7 @@
 ---
 title: MIT License
 source: https://opensource.org/licenses/MIT
+featured: true
 
 description: A short and simple permissive license with conditions only requiring preservation of copyright and license notices. Licensed works, modifications, and larger works may be distributed under different terms and without source code.
 

_licenses/mpl-2.0.txt

@@ -7,6 +7,13 @@ description: Permissions of this weak copyleft license are conditioned on making
 
 how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file.
 
+note: The Mozilla Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license (Exhibit A).
+
+using:
+  - Servo: https://github.com/servo/servo/blob/master/LICENSE
+  - TimelineJS3: https://github.com/NUKnightLab/TimelineJS3/blob/master/LICENSE
+  - LibreOffice: https://cgit.freedesktop.org/libreoffice/core/tree/COPYING.MPL
+
 conditions:
   - disclose-source
   - include-copyright

_licenses/osl-3.0.txt

@@ -16,6 +16,7 @@ using:
 conditions:
   - include-copyright
   - disclose-source
+  - document-changes
   - network-use-disclose
   - same-license
 

_sass/jquery.qtip.scss

@@ -1 +0,0 @@
-../assets/vendor/qtip2/jquery.qtip.css

_sass/normalize.scss

@@ -1 +0,0 @@
-../assets/vendor/normalize-css/normalize.css

assets/css/application.scss

@@ -1,8 +1,8 @@
 ---
 ---
 
-@import "normalize";
-@import "jquery.qtip";
+@import "/assets/vendor/normalize-css/normalize.css";
+@import "/assets/vendor/qtip2/jquery.qtip.min.css";
 
 body {
   background: #fafafa;
@@ -80,7 +80,7 @@ strong {
 }
 
 .home h2 {
-  color: #149ad4;
+  color: #687072;
   font-size: 27px;
   line-height: 70px;
   margin-bottom: 45px;
@@ -163,6 +163,12 @@ strong {
   padding-left: 20px;
 }
 
+.license-page-details {
+  -webkit-box-sizing: border-box;
+  -moz-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
 .license-overview-name {
   font-size: 28px;
   margin-top: 5px;
@@ -265,6 +271,10 @@ strong {
   padding: 20px;
 }
 
+.license-nickname {
+  margin-top: 0;
+}
+
 .sidebar {
   float: right;
   width: 220px;