Merge pull request #579 from Gluejar/add-licenses-roles

Add OSI licenses, marc relators, update Aldiko logo

core/cc.py

@@ -16,6 +16,7 @@ INFO_CC = (
 INFO_FREE = INFO_CC + (
     ('GFDL', 'gdfl', 'GNU Free Documentation License', 'http://www.gnu.org/licenses/fdl-1.3-standalone.html', 'GNU Free Documentation License'),
     ('LAL', 'lal', 'Licence Art Libre', 'http://artlibre.org/licence/lal/', 'Licence Art Libre'),
+    ('OSI', 'opensource', 'OSI Approved License', 'https://opensource.org/licenses', 'OSI Approved License'),
 )
 INFO_PD = (
     ('PD-US', 'pd-us', 'Public Domain, US', 'http://creativecommons.org/about/pdm', 'Public Domain, US'),
@@ -73,6 +74,8 @@ class CCLicense():
             return '/static/images/gfdl.png'
         elif license == 'LAL':
             return '/static/images/lal.png'
+        elif license == 'OSI':
+            return '/static/images/opensource.png'
         else:
             return ''
 
@@ -97,6 +100,8 @@ def description(license):
             return 'The purpose of this License is to make a manual, textbook, or other functional and useful document "free" in the sense of freedom: to assure everyone the effective freedom to copy and redistribute it, with or without modifying it, either commercially or noncommercially. Secondarily, this License preserves for the author and publisher a way to get credit for their work, while not being considered responsible for modifications made by others.'
         elif license == 'LAL':
             return 'Avec la Licence Art Libre, l\'autorisation est donnée de copier, de diffuser et de transformer librement les œuvres dans le respect des droits de l\'auteur.'
+        elif license == 'OSI':
+            return 'Open source licenses are licenses that comply with the Open Source Definition — in brief, they allow software to be freely used, modified, and shared. To be approved by the Open Source Initiative (also known as the OSI), a license must go through the Open Source Initiative\'s license review process.'
         else:
             return ''
 

frontend/forms.py

@@ -78,6 +78,8 @@ CREATOR_RELATIONS = (
     ('edt', 'Editor'),
     ('trl', 'Translator'),
     ('ill', 'Illustrator'),
+    ('dsr', 'Designer'),
+    ('aui', 'Author of Introduction'),
 )
 
 bisac_headings = BisacHeading.objects.all()

frontend/templates/download.html

@@ -237,11 +237,18 @@ $j(document).ready(function() {
                 <li>Download the <a href="{{ formats.epub }}">epub file</a>.</li>
                 <li>You will be given the option of opening the file in iBooks.</li>
                 </ul>
-                <p class="ebook_download logo"><img src="/static/images/marvin_logo.jpg" alt="iBooks Logo" />Marvin is a great way to read ebooks. </p>
+                <p class="ebook_download logo"><img src="/static/images/marvin_logo.jpg" alt="Marvin Logo" />Marvin is a great way to read ebooks. </p>
                 <ul>
                 <li><a href="https://itunes.apple.com/us/app/marvin-ebook-reader-for-epub/id667361209?ls=1&mt=8">Install Marvin</a> from the App Store.</li>
                 <li>Click the "Load to Marvin" button above.</li>
                 </ul>
+                <p class="ebook_download logo"><img src="/static/images/aldiko_logo.png" alt="Aldiko Logo" />So is Aldiko.</p>
+                
+                <ul>
+                <li><a href="http://www.aldiko.com/">Download the free Aldiko app.</a></li>
+                <li>Download the <a href="{{ formats.epub }}">epub file</a>.</li>
+                <li>When the download is complete, tap it in your notifications menu.  It will be added to Aldiko, ready to read next time you open the app.</li>
+                </ul>
                 
             {% else %}{% if formats.pdf %}
                 <p>
@@ -280,7 +287,7 @@ $j(document).ready(function() {
                 <p class="ebook_download logo"><img src="/static/images/aldiko_logo.png" alt="Aldiko Logo" />Aldiko</p>
                 
                 <ul>
-                <li><a href="http://www.aldiko.com/download.html">Download the free Aldiko app.</a></li>
+                <li><a href="http://www.aldiko.com/">Download the free Aldiko app.</a></li>
                 <li>Download the <a href="{{ formats.epub }}">epub file</a>.</li>
                 <li>When the download is complete, tap it in your notifications menu.  It will be added to Aldiko, ready to read next time you open the app.</li>
                 </ul>
@@ -291,7 +298,7 @@ $j(document).ready(function() {
                 <p class="ebook_download logo"><img src="/static/images/aldiko_logo.png" alt="Aldiko Logo" />Aldiko</p>
                 
                 <ul>
-                <li><a href="http://www.aldiko.com/download.html">Download the free Aldiko app.</a></li>
+                <li><a href="http://www.aldiko.com/">Download the free Aldiko app.</a></li>
                 <li>Download the <a href="{{ formats.pdf }}">pdf file</a>.</li>
                 <li>When the download is complete, tap it in your notifications menu.  It will be added to Aldiko, ready to read next time you open the app.</li>
                 </ul>

marc/models.py

@@ -27,6 +27,7 @@ marc_rels = {
     "cnd": "conductor",
     "com": "compiler",
     "ctb": "contributor",
+    "dsr": "designer",
     "dub": "dubious_author",
     "edt": "editor",
     "egr": "engineer",