From 2040478fb2a9474b8c18b80682f5fb93f05b1c59 Mon Sep 17 00:00:00 2001 From: dongsheng Date: Fri, 18 Jul 2008 09:22:46 +0000 Subject: [PATCH] MDL-15348, improve list view of picker, display file size and file updated date. --- repository/ajax.php | 22 ++++++++++++++++++---- repository/boxnet/repository.class.php | 10 ++++++---- repository/flickr/repository.class.php | 2 +- 3 files changed, 25 insertions(+), 9 deletions(-) diff --git a/repository/ajax.php b/repository/ajax.php index 7623296cff..da0b24f68f 100644 --- a/repository/ajax.php +++ b/repository/ajax.php @@ -1,3 +1,7 @@ + Ajax picker demo page @@ -8,8 +12,6 @@ picker. \*******************************************************/ -require_once('../config.php'); -require_once('lib.php'); $itempic = $CFG->pixpath.'/i/item.gif'; $meta = << @@ -50,6 +52,9 @@ color:white; img{margin:0;padding:0;border:0} #paging{margin:10px 5px; clear:both} #paging a{padding: 4px; border: 1px solid gray} +.file_name{color:green;} +.file_date{color:blue} +.file_size{color:gray} @@ -286,8 +291,17 @@ function viewlist(){ var panel = new YAHOO.util.Element('panel'); str += makepage(); for(k in obj){ - str += (''); - str += obj[k].title; + var re = new RegExp(); + re.compile("^[A-Za-z]+://[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\?\/.=]+$"); + str += (' '); + if(re.test(obj[k].source)) { + str += ''+obj[k].title+''; + } else { + str += ''+obj[k].title+''; + } + str += '
'; + str += ''+obj[k].date+'
'; + str += ''+obj[k].size+''; str += '
'; } panel.get('element').innerHTML = str; diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php index 31b00328b7..16617eb144 100755 --- a/repository/boxnet/repository.class.php +++ b/repository/boxnet/repository.class.php @@ -59,21 +59,23 @@ class repository_boxnet extends repository{ if(!empty($tree)) { $filenames = $tree['file_name']; $fileids = $tree['file_id']; + $filesizes = $tree['file_size']; + $filedates = $tree['file_date']; foreach ($filenames as $n=>$v){ // do search if(!empty($search)) { if(strstr($v, $search) !== false) { $list[] = array('title'=>$v, - 'size'=>0, - 'date'=>'', + 'size'=>$filesizes[$n], + 'date'=>$filedates[$n], 'source'=>'http://box.net/api/1.0/download/' .$this->options['auth_token'].'/'.$fileids[$n], 'thumbnail'=>$CFG->pixpath.'/f/text.gif'); } } else { $list[] = array('title'=>$v, - 'size'=>0, - 'date'=>'', + 'size'=>$filesizes[$n], + 'date'=>$filedates[$n], 'source'=>'http://box.net/api/1.0/download/' .$this->options['auth_token'].'/'.$fileids[$n], 'thumbnail'=>$CFG->pixpath.'/f/text.gif'); diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php index efa1854421..46290e49c9 100755 --- a/repository/flickr/repository.class.php +++ b/repository/flickr/repository.class.php @@ -106,7 +106,7 @@ EOD; $p['title'] = get_string('notitle', 'repository_flickr'); } $ret->list[] = - array('title'=>$p['title'],'source'=>$p['id'],'id'=>$p['id'],'thumbnail'=>$this->flickr->buildPhotoURL($p, 'Square')); + array('title'=>$p['title'],'source'=>$p['id'],'id'=>$p['id'],'thumbnail'=>$this->flickr->buildPhotoURL($p, 'Square'), 'date'=>'', 'size'=>'unknown'); } return $ret; } -- 2.39.5