diff --git a/h5p.classes.php b/h5p.classes.php index e308dc9..a10389d 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -3617,31 +3617,31 @@ class H5PContentValidator { ), (object) array( 'value' => 'CC BY', - 'label' => $this->h5pF->t('Attribution') + 'label' => $this->h5pF->t('Attribution 4.0') ), (object) array( 'value' => 'CC BY-SA', - 'label' => $this->h5pF->t('Attribution-ShareAlike') + 'label' => $this->h5pF->t('Attribution-ShareAlike 4.0') ), (object) array( 'value' => 'CC BY-ND', - 'label' => $this->h5pF->t('Attribution-NoDerivs') + 'label' => $this->h5pF->t('Attribution-NoDerivs 4.0') ), (object) array( 'value' => 'CC BY-NC', - 'label' => $this->h5pF->t('Attribution-NonCommercial') + 'label' => $this->h5pF->t('Attribution-NonCommercial 4.0') ), (object) array( 'value' => 'CC BY-NC-SA', - 'label' => $this->h5pF->t('Attribution-NonCommercial-ShareAlike') + 'label' => $this->h5pF->t('Attribution-NonCommercial-ShareAlike 4.0') ), (object) array( 'value' => 'CC BY-NC-ND', - 'label' => $this->h5pF->t('Attribution-NonCommercial-NoDerivs') + 'label' => $this->h5pF->t('Attribution-NonCommercial-NoDerivs 4.0') ), (object) array( 'value' => 'GNU GPL', - 'label' => $this->h5pF->t('General Public License') + 'label' => $this->h5pF->t('General Public License v3') ), (object) array( 'value' => 'PD', diff --git a/js/h5p.js b/js/h5p.js index df0d9e6..fa2e4c7 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -903,7 +903,12 @@ H5P.Dialog = function (name, title, content, $element) { self.close(); }) .end() - .end(); + .find('a') + .click(function (e) { + e.stopPropagation(); + }) + .end() + .end(); this.open = function () { setTimeout(function () { @@ -1293,15 +1298,15 @@ H5P.MediaCopyright = function (copyright, labels, order, extraFields) { */ H5P.copyrightLicenses = { 'U': 'Undisclosed', - 'CC BY': 'Attribution', - 'CC BY-SA': 'Attribution-ShareAlike', - 'CC BY-ND': 'Attribution-NoDerivs', - 'CC BY-NC': 'Attribution-NonCommercial', - 'CC BY-NC-SA': 'Attribution-NonCommercial-ShareAlike', - 'CC BY-NC-ND': 'Attribution-NonCommercial-NoDerivs', - 'GNU GPL': 'General Public License', + 'CC BY': 'Attribution 4.0', + 'CC BY-SA': 'Attribution-ShareAlike 4.0', + 'CC BY-ND': 'Attribution-NoDerivs 4.0', + 'CC BY-NC': 'Attribution-NonCommercial 4.0', + 'CC BY-NC-SA': 'Attribution-NonCommercial-ShareAlike 4.0', + 'CC BY-NC-ND': 'Attribution-NonCommercial-NoDerivs 4.0', + 'GNU GPL': 'General Public License v3', 'PD': 'Public Domain', - 'ODC PDDL': 'Public Domain Dedication and Licence', + 'ODC PDDL': 'Public Domain Dedication and Licence', 'CC PDM': 'Public Domain Mark', 'C': 'Copyright' };