diff --git a/fonts/h5p-core-14.eot b/fonts/h5p-core-14.eot
new file mode 100644
index 0000000..9a90816
Binary files /dev/null and b/fonts/h5p-core-14.eot differ
diff --git a/fonts/h5p.svg b/fonts/h5p-core-14.svg
similarity index 78%
rename from fonts/h5p.svg
rename to fonts/h5p-core-14.svg
index 2087153..f66252d 100644
--- a/fonts/h5p.svg
+++ b/fonts/h5p-core-14.svg
@@ -3,7 +3,7 @@
\ No newline at end of file
diff --git a/fonts/h5p-core-14.ttf b/fonts/h5p-core-14.ttf
new file mode 100644
index 0000000..77aa1c7
Binary files /dev/null and b/fonts/h5p-core-14.ttf differ
diff --git a/fonts/h5p-core-14.woff b/fonts/h5p-core-14.woff
new file mode 100644
index 0000000..e11a5c7
Binary files /dev/null and b/fonts/h5p-core-14.woff differ
diff --git a/fonts/h5p.eot b/fonts/h5p.eot
deleted file mode 100644
index 2c68dc5..0000000
Binary files a/fonts/h5p.eot and /dev/null differ
diff --git a/fonts/h5p.ttf b/fonts/h5p.ttf
deleted file mode 100644
index 81d242f..0000000
Binary files a/fonts/h5p.ttf and /dev/null differ
diff --git a/h5p.classes.php b/h5p.classes.php
index 53d156d..5ede697 100644
--- a/h5p.classes.php
+++ b/h5p.classes.php
@@ -3076,7 +3076,7 @@ class H5PContentValidator {
* Validate given image data
*/
public function validateImage(&$image, $semantics) {
- $this->_validateFilelike($image, $semantics, array('width', 'height'));
+ $this->_validateFilelike($image, $semantics, array('width', 'height', 'originalImage'));
}
/**
@@ -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'
};
diff --git a/styles/h5p.css b/styles/h5p.css
index 4586952..93a9860 100644
--- a/styles/h5p.css
+++ b/styles/h5p.css
@@ -3,11 +3,11 @@
/* Custom H5P font to use for icons. */
@font-face {
font-family: 'h5p';
- src:url('../fonts/h5p.eot?ny');
- src:url('../fonts/h5p.eot?#iefix-ny') format('embedded-opentype'),
- url('data:application/font-woff;base64,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') format('woff'),
- url('../fonts/h5p.ttf?ny') format('truetype'),
- url('../fonts/h5p.svg?ny#h5p') format('svg');
+ src: url('../fonts/h5p-core-14.eot?inh2er');
+ src: url('../fonts/h5p-core-14.eot?inh2er#iefix') format('embedded-opentype'),
+ url('../fonts/h5p-core-14.ttf?inh2er') format('truetype'),
+ url('../fonts/h5p-core-14.woff?inh2er') format('woff'),
+ url('../fonts/h5p-core-14.svg?inh2er#h5p-core-14') format('svg');
font-weight: normal;
font-style: normal;
}