]> git.mjollnir.org Git - moodle.git/commitdiff
projects / moodle.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 767172e)
MDL-15348, improve list view of picker, display file size and file updated date.
authordongsheng <dongsheng>
Fri, 18 Jul 2008 09:22:46 +0000 (09:22 +0000)
committerdongsheng <dongsheng>
Fri, 18 Jul 2008 09:22:46 +0000 (09:22 +0000)
repository/ajax.php patch | blob | history
repository/boxnet/repository.class.php patch | blob | history
repository/flickr/repository.class.php patch | blob | history

diff --git a/repository/ajax.php b/repository/ajax.php
index 7623296cff6fb283cec9b9494453e0c0173f5c89..da0b24f68f3c2758394e741d60dd462d8b27e406 100644 (file)
--- a/repository/ajax.php
+++ b/repository/ajax.php
@@ -1,3 +1,7 @@
+<?php
+require_once('../config.php');
+require_once('lib.php');
+?>
 <html>
 <head>
 <title> Ajax picker demo page </title>
@@ -8,8 +12,6 @@
   picker.
 
 \*******************************************************/
-require_once('../config.php');
-require_once('lib.php');
 $itempic = $CFG->pixpath.'/i/item.gif';
 $meta = <<<EOD
 <link rel="stylesheet" type="text/css" href="../lib/yui/reset-fonts-grids/reset-fonts-grids.css" />
@@ -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}
 </style>
 <script type="text/javascript" src="../lib/yui/yahoo/yahoo-min.js"></script>
 <script type="text/javascript" src="../lib/yui/event/event-min.js"></script>
@@ -286,8 +291,17 @@ function viewlist(){
     var panel = new YAHOO.util.Element('panel');
     str += makepage();
     for(k in obj){
-        str += ('<input type="radio" title="'+obj[k].title+'" name="selected-files" value="'+obj[k].source+'" onclick=\'rename("'+obj[k].title+'", "'+obj[k].source+'")\' />');
-        str += obj[k].title;
+        var re = new RegExp();
+        re.compile("^[A-Za-z]+://[A-Za-z0-9-_]+\\.[A-Za-z0-9-_%&\?\/.=]+$");
+        str += ('<input type="radio" title="'+obj[k].title+'" name="selected-files" value="'+obj[k].source+'" onclick=\'rename("'+obj[k].title+'", "'+obj[k].source+'")\' /> ');
+        if(re.test(obj[k].source)) {
+            str += '<a class="file_name" href="'+obj[k].source+'">'+obj[k].title+'</a>';
+        } else {
+            str += '<span class="file_name" >'+obj[k].title+'</span>';
+        }
+        str += '<br/>';
+        str += '<label>Date: </label><span class="file_date">'+obj[k].date+'</span><br/>';
+        str += '<label>Size: </label><span class="file_size">'+obj[k].size+'</span>';
         str += '<br/>';
     }
     panel.get('element').innerHTML = str;
diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 31b00328b7cb6fe307b90e67bb44645cdaf138ea..16617eb14419571172855b1813e9463256c44ef0 100755 (executable)
--- 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 efa18544219813304890e32a03e4c248c716227b..46290e49c9a701de25016f46b0adbefcb8f6ed81 100755 (executable)
--- 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;
     }
Unnamed repository; edit this file to name it for gitweb.