show license details

oscad/__init__.py

@@ -126,6 +126,7 @@ def main(global_config, **settings):
     config.add_route('about', 'about')
     config.add_route('help', 'help')
     config.add_route('components', 'components')
+    config.add_route('license', 'license/{license}')
     config.add_route('change_language', 'language/{lang}')
     config.add_route('translation_template', 'translations/oscad.pot')
     config.add_route('translation_file', 'translations/{lang}')

oscad/templates/oscad/baserequest.jinja2

@@ -7,6 +7,13 @@
 </a>
 {%- endmacro -%}
 
+{%- macro license_link(id) -%}
+<a href="{{ request.route_path('license', license=id) }}"
+  title="{{ license_details[id].name }}">
+{{ id }}
+</a>
+{%- endmacro -%}
+
 {%- block content -%}
 <div class="row">
   <div class="col-md-offset-1 col-md-10">

oscad/templates/oscad/license.jinja2

@@ -0,0 +1,13 @@
+{%- extends 'base.jinja2' -%}
+
+{%- block content -%}
+
+<h1>License: {{ name }}</h1>
+
+<p>
+<pre>
+{{ text }}
+</pre>
+</p>
+
+{%- endblock -%}

oscad/templates/oscad/matrix.jinja2

@@ -48,7 +48,7 @@
                     <input type="radio" name="license" value="{{ license }}"
                          {%- if license == default_license
                          %} checked="checked" {%- endif %} />
-                    {{ license }}
+                         {{ license_link(license) }}
                   </label>
                 </li>
                 {%- endfor -%}
@@ -64,8 +64,8 @@
                   <label>
                     <input type="radio" name="license" value="{{ license }}"
                            disabled="disabled" />
-                    {{ license }}
                   </label>
+                  {{ license_link(license) }}
                 </li>
                 {%- endfor -%}
               </ul>

oscad/templates/oscad/request.jinja2

@@ -83,7 +83,7 @@
                          {%- if license == default_license
                          %} checked="checked" {%- endif %}
                   />
-                  {{ license }}
+                  {{ license_link(license) }}
                 </label>
               </li>
               {%- endfor -%}
@@ -99,7 +99,7 @@
               <li class="radio">
                 <label>
                   <input type="radio" name="license" disabled="disabled" />
-                  {{ license }}
+                  {{ license_link(license) }}
                 </label>
               </li>
               {%- endfor -%}

oscad/views.py

@@ -94,6 +94,7 @@ def index(request):
 def request(request):
     return {
         'licenses': data.valid_licenses,
+        'license_details': data.license_details,
         'default_license': DEFAULT_LICENSE,
         'planned_licenses': PLANNED_LICENSES,
     }
@@ -111,6 +112,20 @@ def about(request):
     }
 
 
+@view_config(route_name='license', renderer='templates/oscad/license.jinja2')
+def license(request):
+    slug = request.matchdict['license']
+    info = data.license_details[slug]
+    name = info['name']
+    text = info['text']
+
+    return {
+        'slug': slug,
+        'name': name,
+        'text': text,
+    }
+
+
 @view_config(route_name='components',
              renderer='templates/oscad/components.jinja2')
 def components(request):
@@ -201,6 +216,7 @@ def matrix_request(request):
     return {
         'table': data.license_matrix(),
         'licenses': data.valid_licenses,
+        'license_details': data.license_details,
         'default_license': DEFAULT_LICENSE,
         'planned_licenses': PLANNED_LICENSES,
     }

oscad_data/__init__.py

@@ -1,5 +1,6 @@
+from pkg_resources import resource_stream, resource_string
+
 import yaml
-from pkg_resources import resource_stream
 
 
 def load_data(name):
@@ -14,6 +15,7 @@ def load_file(fileobj):
 licensenames = load_data('licensenames')
 osuc = load_data('osuc')
 lsuc = load_data('lsuc')
+license_details = load_data('license_details')
 
 attrs = [
     ('recipients', 'recipient'),
@@ -33,6 +35,10 @@ def load_file(fileobj):
 
 valid_inputs['license'] = valid_licenses
 
+for id, details in license_details.items():
+    details['text'] = resource_string(
+        __name__, 'data/texts/{}.txt'.format(id)).decode('utf-8')
+
 
 # generate from sources
 def license_matrix():

oscad_data/data/license_details.yml

@@ -0,0 +1,51 @@
+AGPLv3.0:
+  name: "GNU Affero General Public License 3.0"
+  licensedb_id: AGPL-3.0
+ApLv2.0:
+  name: "Apache License 2.0"
+  licensedb_id: Apache-2.0
+BSDv2CL:
+  name: 'BSD 2-Clause "Simplified" or "FreeBSD" License'
+  licensedb_id: BSD-2-Clause
+BSDv3CL:
+  name: 'BSD 3-Clause "New" or "Revised" License'
+  licensedb_id: BSD-3-Clause
+CDDLv1.0:
+  name: "Common Development and Distribution License 1.0"
+  licensedb_id: CDDL-1.0
+EPLv1.0:
+  name: "Eclipse Public License 1.0"
+  licensedb_id: EPL-1.0
+EUPLv1.1:
+  name: "European Union Public License, Version 1.1"
+  licensedb_id: EUPL-1.1
+GPLv2.0:
+  name: "GNU General Public License version 2.0"
+  licensedb_id: GPL-2.0
+GPLv3.0:
+  name: "GNU General Public License version 3.0"
+  licensedb_id: GPL-3.0
+LGPLv2.1:
+  name: 'GNU Library or "Lesser" General Public License version 2.1'
+  licensedb_id: LGPL-2.1
+LGPLv3.0:
+  name: 'GNU Library or "Lesser" General Public License version 3.0'
+  licensedb_id: LGPL-3.0
+MIT:
+  name: "MIT license"
+  licensedb_id: MIT
+MPLv2.0:
+  name: "Mozilla Public License 2.0"
+  licensedb_id: MPL-2.0
+MS-PL:
+  name: "Microsoft Public License"
+  licensedb_id: MS-PL
+PGL:
+  name: "The PostgreSQL License"
+  licensedb_id: PostgreSQL
+PHPv3.0:
+  name: "PHP License 3.0"
+  licensedb_id: PHP-3.0
+ZLIB:
+  name: "zlib/libpng license"
+  licensedb_id: Zlib