MDL-13766, fix javascript error and improve css.

diff --git a/repository/boxnet/boxlibphp5.php b/repository/boxnet/boxlibphp5.php
index d5f962af79a943459a4e57c8b295a480d12ebaff..f4c24d1135320b9b5f57175b598beeb4ccaeb2ce 100755 (executable)
--- a/repository/boxnet/boxlibphp5.php
+++ b/repository/boxnet/boxlibphp5.php
@@ -159,6 +159,11 @@ class boxclient {
                     @$ret_array['file_keyword'][$i] = $a['attributes']['KEYWORD'];
                     @$ret_array['file_size'][$i] = display_size($a['attributes']['SIZE']);
                     @$ret_array['file_date'][$i] = userdate($a['attributes']['UPDATED']);
+                    if (preg_match('#^(?:http://)?([^/]+)#i', $a['attributes']['THUMBNAIL'])) {
+                        @$ret_array['thumbnail'][$i] =  $a['attributes']['THUMBNAIL'];
+                    } else {
+                        @$ret_array['thumbnail'][$i] =  'http://www.box.net'.$a['attributes']['THUMBNAIL'];
+                    }
                     $entry_count++;
                 }
                 break;

diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index be37864164fb4ac4fceb1a2df3ef3309022eb101..ff20cb5ac8d47fcc074e030e6a74fb8f71b5e4dd 100755 (executable)
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -101,6 +101,7 @@ class repository_boxnet extends repository{
             $fileids   = $tree['file_id'];
             $filesizes = $tree['file_size'];
             $filedates = $tree['file_date'];
+            $fileicon  = $tree['thumbnail'];
             foreach ($filenames as $n=>$v){
                 // do search
                 if(!empty($search)) {
@@ -118,7 +119,7 @@ class repository_boxnet extends repository{
                             'date'=>$filedates[$n],
                             'source'=>'http://box.net/api/1.0/download/'
                                 .$this->options['auth_token'].'/'.$fileids[$n],
-                            'thumbnail'=>$CFG->pixpath.'/f/'.mimeinfo('icon', $v));
+                            'thumbnail'=>$fileicon[$n]);
                 }
             }
 

diff --git a/repository/lib.php b/repository/lib.php
index de7b461285ad3be4c7a3391f529f1a795b31d936..a71b0841436b410ce5f1ea8c4c7db2a06f9f34be 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -566,7 +566,6 @@ p.upload a:hover {background: grey;color:white}
 .file_date{color:blue}
 .file_size{color:gray}
 .grid{width:80px; float:left;text-align:center;}
-.grid img{display:block}
 .grid div{width: 80px; height: 36px; overflow: hidden}
 .repo-opt{font-size: 10px;}
 </style>
@@ -688,7 +687,7 @@ function _client(){
         repo_list.on('contentReady', function(e){
             for(var i=0; i<_client.repos.length; i++) {
                 var repo = _client.repos[i];
-                li = document.createElement('li');
+                var li = document.createElement('li');
                 li.id = 'repo-$suffix-'+repo.id;
                 var icon = document.createElement('img');
                 icon.src = repo.icon;
@@ -809,8 +808,11 @@ _client.viewthumb = function(){
     for(k in list){
         var el = document.createElement('div');
         el.className='grid';
+        var frame = document.createElement('DIV');
+        frame.style.textAlign='center';
         var img = document.createElement('img');
         img.src = list[k].thumbnail;
+        frame.appendChild(img);
         var input = document.createElement('input');
         input.type='radio';
         input.title = list[k].title;
@@ -828,13 +830,12 @@ _client.viewthumb = function(){
         }
         var title = document.createElement('div');
         title.innerHTML = list[k].title;
-        el.appendChild(img);
+        el.appendChild(frame);
         el.appendChild(input);
         el.appendChild(title);
         panel.get('element').appendChild(el);
     }
     _client.viewmode = 1;
-    return str;
 }
 _client.buildtree = function(node, level){
     var info = {label:node.title, title:"$strdate"+node.date+' '+'$strsize'+node.size}; 
@@ -1002,7 +1003,7 @@ _client.callback = {
         } catch(e) {
             alert('$strinvalidjson - '+o.responseText);
         };
-        if(ret.e){
+        if(ret && ret.e){
             panel.get('element').innerHTML = ret.e;
             return;
         }
@@ -1067,7 +1068,7 @@ _client.dlfile = {
         } catch(e) {
             alert('$strinvalidjson - '+o.responseText);
         }
-        if(ret.e){
+        if(ret && ret.e){
             panel.get('element').innerHTML = ret.e;
             return;
         }