Merge pull request #210 from brandeis-wmd/master

added text without parenthetical expressions

classes/framework.php

@@ -349,6 +349,7 @@ class framework implements \H5PFrameworkInterface {
                 'Public Domain' => 'pd',
                 'Public Domain Dedication and Licence' => 'pddl',
                 'Public Domain Mark' => 'pdm',
+                'Public Domain Mark (PDM)' => 'pdm',
                 'Copyright' => 'copyrightstring',
                 'Unable to create directory.' => 'unabletocreatedir',
                 'Unable to get field type.' => 'unabletogetfieldtype',
@@ -428,14 +429,20 @@ class framework implements \H5PFrameworkInterface {
                 'CC0 1.0 Universal' => 'licenseCC010U',
                 'License Version' => 'licenseversion',
                 'Creative Commons' => 'creativecommons',
+                'Attribution' => 'ccattribution',
                 'Attribution (CC BY)' => 'ccattribution',
+                'Attribution-ShareAlike' => 'ccattributionsa',
                 'Attribution-ShareAlike (CC BY-SA)' => 'ccattributionsa',
+                'Attribution-NoDerivs' => 'ccattributionnd',
                 'Attribution-NoDerivs (CC BY-ND)' => 'ccattributionnd',
+                'Attribution-NonCommercial' => 'ccattributionnc',
                 'Attribution-NonCommercial (CC BY-NC)' => 'ccattributionnc',
+                'Attribution-NonCommercial-ShareAlike' => 'ccattributionncsa',
                 'Attribution-NonCommercial-ShareAlike (CC BY-NC-SA)' => 'ccattributionncsa',
+                'Attribution-NonCommercial-NoDerivs' => 'ccattributionncnd',
                 'Attribution-NonCommercial-NoDerivs (CC BY-NC-ND)' => 'ccattributionncnd',
+                'Public Domain Dedication' => 'ccpdd',
                 'Public Domain Dedication (CC0)' => 'ccpdd',
-                'Public Domain Mark (PDM)' => 'ccpdm',
                 'Years (from)' => 'yearsfrom',
                 'Years (to)' => 'yearsto',
                 "Author's name" => 'authorname',