Added 7.x-1.x changes.

cperg · Aug 18, 2014 · 89d4377 · 89d4377
1 parent d3cd7ac
commit 89d4377
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/h5p.classes.php b/h5p.classes.php
@@ -1692,7 +1692,7 @@ public static function libraryToString($library, $folderName = FALSE) {
    *  Returns FALSE only if string is not parsable in the normal library
    *  string formats "Lib.Name-x.y" or "Lib.Name x.y"
    */
-  public function libraryFromString($libraryString) {
+  public static function libraryFromString($libraryString) {
     $re = '/^([\w0-9\-\.]{1,255})[\-\ ]([0-9]{1,5})\.([0-9]{1,5})$/i';
     $matches = array();
     $res = preg_match($re, $libraryString, $matches);
@@ -2185,7 +2185,7 @@ public function validateLibrary(&$value, $semantics) {
     }
 
     if (!isset($this->libraries[$value->library])) {
-      $libspec = $this->h5pC->libraryFromString($value->library);
+      $libspec = H5PCore::libraryFromString($value->library);
       $library = $this->h5pC->loadLibrary($libspec['machineName'], $libspec['majorVersion'], $libspec['minorVersion']);
       $library['semantics'] = json_decode($library['semantics']);
       $this->libraries[$value->library] = $library;

diff --git a/styles/h5p.css b/styles/h5p.css
@@ -189,6 +189,7 @@ div.h5p-fullscreen {
   float: right;
   margin-right: 0;
   font-size: 2.0em;
+  line-height: 1;
   overflow: hidden;
   color: #999;
   text-decoration: none;
@@ -198,6 +199,9 @@ div.h5p-fullscreen {
   font-family: 'H5P';
   content: "\e88e";
 }
+.h5p-actions > li {
+  margin: 0;
+}
 .h5p-popup-dialog {
   position: absolute;
   top: 0;