From 12f4407bdc4572f1515597c75ce7fc4da797b5e3 Mon Sep 17 00:00:00 2001 From: Ben Balter Date: Sat, 13 Jul 2013 15:42:46 -0400 Subject: [PATCH] Even dryer templates * consolidate breadcrumb logic * move h1 to header.html * remove #home div from index.html --- _includes/header.html | 22 +++++++---- _layouts/license.html | 8 ---- about.md | 3 +- index.html | 89 +++++++++++++++++++++---------------------- no-license.md | 3 +- 5 files changed, 60 insertions(+), 65 deletions(-) diff --git a/_includes/header.html b/_includes/header.html index 31c20b5..24431fc 100644 --- a/_includes/header.html +++ b/_includes/header.html @@ -27,10 +27,18 @@
-{% if page.layout == "default" and page.hide_breadcrumbs != true %} - -{% endif %} \ No newline at end of file + {% unless page.hide_breadcrumbs == true %} + + {% endunless %} + + {% if page.title %} +

{{ page.title }}

+ {% endif %} \ No newline at end of file diff --git a/_layouts/license.html b/_layouts/license.html index a5faed6..774bc70 100644 --- a/_layouts/license.html +++ b/_layouts/license.html @@ -1,13 +1,5 @@ {% include header.html %} - - -

{{ page.title }}

-
diff --git a/about.md b/about.md
index bdba212..0bb641a 100644
--- a/about.md
+++ b/about.md
@@ -2,10 +2,9 @@
 title: About
 layout: default
 permalink: /about/
+title: What’s this about?
 ---
 
-# What’s this about?
-
 We want to help developers choose a license for their source code.
 
 If you already know what you’re doing and have a license you prefer to use, that’s great! We’re not here to change your mind. But if you are bewildered by the large number of OSS license choices, maybe we can help.
diff --git a/index.html b/index.html
index 6d421ae..3120193 100644
--- a/index.html
+++ b/index.html
@@ -2,51 +2,48 @@
 layout: default
 class: home
 hide_breadcrumbs: true
+title: Choosing an OSS license doesn’t need to be scary
 ---
-
-

Choosing an OSS license doesn’t need to be scary.

-

- { - Which of the following best describes your situation? - } -

-
    -
  • - -

    I want it simple and permissive.

    -

    - The MIT License is a permissive license that is short and to the point. It lets people do anything they want with your code as long as they provide attribution back to you and don’t hold you liable. -

    -

    - jQuery and Rails use the MIT License. -

    -
  • -
  • - -

    I’m concerned about patents.

    -

    - The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users. -

    -

    - Apache, SVN, and NuGet use the Apache License. -

    -
  • -
  • - -

    I care about sharing improvements.

    -

    - The GPL (V2 or V3) is a copyleft license that requires others who modify your code to disclose their changes if they redistribute it in source or binary form. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations. -

    -

    - Linux and Git use the GPL. -

    -
  • -
-
-

What if none of these work for me or I want to retain all of my rights? More licenses are available.

-

What if I don't want to choose a license? You don't have to.

-
-
- - +

+ { + Which of the following best describes your situation? + } +

+
    +
  • + +

    I want it simple and permissive.

    +

    + The MIT License is a permissive license that is short and to the point. It lets people do anything they want with your code as long as they provide attribution back to you and don’t hold you liable. +

    +

    + jQuery and Rails use the MIT License. +

    +
  • +
  • + +

    I’m concerned about patents.

    +

    + The Apache License is a permissive license similar to the MIT License, but also provides an express grant of patent rights from contributors to users. +

    +

    + Apache, SVN, and NuGet use the Apache License. +

    +
  • +
  • + +

    I care about sharing improvements.

    +

    + The GPL (V2 or V3) is a copyleft license that requires others who modify your code to disclose their changes if they redistribute it in source or binary form. V3 is similar to V2, but adds a restriction restricting use in hardware that forbids software alterations. +

    +

    + Linux and Git use the GPL. +

    +
  • +
+
+

What if none of these work for me or I want to retain all of my rights? More licenses are available.

+ +

What if I don't want to choose a license? You don't have to.

+
\ No newline at end of file diff --git a/no-license.md b/no-license.md index 65ecdac..2ba8c44 100644 --- a/no-license.md +++ b/no-license.md @@ -1,10 +1,9 @@ --- layout: default permalink: no-license/ +title: No License --- -# No License - You're under no obligation to choose a license and it's your right not to include one with your code or project. But please note that opting out of open source licenses doesn't mean you're opting out of copyright law. You'll have to check with your own legal counsel regarding your particular project, but generally speaking, the absence of a license means that default copyright laws apply. This means that you retain all rights to your source code and that nobody else may reproduce, distribute, or create derivative works from your work. This might not be what you intend.