Changeset 1727

Timestamp:

12/01/09 14:33:34 (14 years ago)

Author:

amuller

Message:

Ticket #597 - Melhorias no módulos gerenciador de arquivos do expresso livre

Location:

sandbox/filemanager

Files:

• inc/class.uifilemanager.inc.php (modified) (2 diffs)
• js/common_functions.js (modified) (2 diffs)
• js/draw_api.js (modified) (2 diffs)
• templates/default/main.css (modified) (1 diff)

sandbox/filemanager/inc/class.uifilemanager.inc.php

@@ -577 +577 @@
                                 $tuple['icon'] = $this->mime_icon($files['mime_type']);
                                 $tuple['type'] = $files['type'];
-                                if ($files['created'] != ''){
-                                        $timestamp = $this->vfs_functions->dateString2timeStamp($files['created']);
-                                        if (time() - $timestamp > 86400) // Older than yesterday
-                                                $tuple['creatd']=date("Y-m-d",$timestamp);
-                                        else
-                                                $tuple['creatd']=date("H:i",$timestamp);
-                                }
-                                else
-                                        $tuple['creatd']='';
-                                if ($files['modified'] != ''){
-                                        $timestamp = $this->vfs_functions->dateString2timeStamp($files['modified']);
-                                        if (time() - $timestamp > 86400) // Older than yesterday
-                                                $tuple['modifd']=date("Y-m-d",$timestamp);
-                                        else
-                                                $tuple['modifd']=date("H:i",$timestamp);
-                                }
-                                else
-                                        $tuple['modifd']='';
-
+                                $tuple['creatd'] = $this->vfs_functions->dateString2timeStamp($files['created']);
+                                $tuple['modifd'] = $this->vfs_functions->dateString2timeStamp($files['modified']);
                                 $tuple['size'] = $files['size'];
                                 $tuple['mime'] = $files['mime_type'];
@@ -607 +590 @@
 
                         }
-
+                        // TODO Order files directly into SQL
                         foreach ($output as $key => $row) {
-                                $temp[$key]  = $row[$this->criteria];
+                                $temp[$key]  = strtoupper($row[$this->criteria]);
                         }
                         if ($this->otype == "1")

sandbox/filemanager/js/common_functions.js

@@ -352 +352 @@
                                 var pai = element.parentNode.parentNode;
                                 pai.parentNode.removeChild(pai);
+                                //Repaint stripes 
                         }
                 }
@@ -404 +405 @@
         }
         var check = function(type) { if (preferences[type] =='1') return 'checked'; else return '';};
-        form = '<input name="prefView" value="mime_type" type="checkbox" '+check('mime_type')+'>'+get_lang('type')+'<br>'+
-                '<input name="prefView" value="size" type="checkbox" '+check('size')+'>'+get_lang('size')+'<br>'+
-                '<input name="prefView" value="created" type="checkbox" '+check('created')+'>'+get_lang('created')+'<br>'+
-                '<input name="prefView" value="modified" type="checkbox" '+check('modified')+'>'+get_lang('modified')+'<br>'+
-                '<input name="prefView" value="owner" type="checkbox" '+check('owner')+'>'+get_lang('owner')+'<br>'+
-                '<input name="prefView" value="createdby_id" type="checkbox" '+check('createdby_id')+'>'+get_lang('created by')+'<br>'+
-                '<input name="prefView" value="modifiedby_id" type="checkbox" '+check('modifiedby_id')+'>'+get_lang('modified by')+'<br>'+
-                '<input name="prefView" value="application" type="checkbox" '+check('application')+'>'+get_lang('application')+'<br>'+
-                '<input name="prefView" value="comment" type="checkbox" '+check('comment')+'>'+get_lang('comment')+'<br>'+
-                '<input name="prefView" value="version" type="checkbox" '+check('version')+'>'+get_lang('version')+'<br>'+
+        var inputHTML = '<input name="prefView" type="checkbox" value="';
+        form = inputHTML+'mime_type" '+check('mime_type')+'>'+get_lang('type')+'<br>'+
+                inputHTML+'size" '+check('size')+'>'+get_lang('size')+'<br>'+
+                inputHTML+'created" '+check('created')+'>'+get_lang('created')+'<br>'+
+                inputHTML+'modified" '+check('modified')+'>'+get_lang('modified')+'<br>'+
+                inputHTML+'owner" '+check('owner')+'>'+get_lang('owner')+'<br>'+
+                inputHTML+'createdby_id" '+check('createdby_id')+'>'+get_lang('created by')+'<br>'+
+                inputHTML+'modifiedby_id" '+check('modifiedby_id')+'>'+get_lang('modified by')+'<br>'+
+                inputHTML+'application" '+check('application')+'>'+get_lang('application')+'<br>'+
+                inputHTML+'comment" '+check('comment')+'>'+get_lang('comment')+'<br>'+
+                inputHTML+'version" '+check('version')+'>'+get_lang('version')+'<br>'+
                 '<input value="'+get_lang('save')+'" onclick="EditColumns(\'save\')" type="button">&nbsp;'+
                 '<input value="'+get_lang('cancel')+'" onclick="EditColumns(\'close\')" type="button">';

sandbox/filemanager/js/draw_api.js

@@ -226 +226 @@
                 newpage += td_hd+sp_hd+'size\')" id="size">'+get_lang('size')+'</a>'+sp_tl;
         if (preferences.created =='1')
-                newpage += td_hd+sp_hd+'created\')" id="created">'+get_lang('created')+'</a>'+sp_tl;
+                newpage += td_hd+sp_hd+'creatd\')" id="creatd">'+get_lang('created')+'</a>'+sp_tl;
         if (preferences.modified =='1')
-                newpage += td_hd+sp_hd+'modified\')" id="modified">'+get_lang('modified')+'</a>'+sp_tl;
+                newpage += td_hd+sp_hd+'modifd\')" id="modifd">'+get_lang('modified')+'</a>'+sp_tl;
         if (preferences.owner =='1')
                 newpage += td_hd+sp_hd+'owner\')" id="owner">'+get_lang('owner')+'</a>'+sp_tl;
@@ -259 +259 @@
                 if (preferences.mime_type =='1') newpage += td_hd+files[i].mime+'</td>';
                 if (preferences.size =='1') newpage += td_hd+borkb(files[i].size)+'</td>';
-                if (preferences.created =='1') newpage += td_hd+files[i].creatd+'</td>';
-                if (preferences.modified =='1') newpage += td_hd+files[i].modifd+'</td>';
+                var now = new Date();
+                var dtString = "";
+                if (preferences.created =='1') {
+                        var created = new Date();
+                        created.setTime(files[i].creatd*1000);
+                        if (now.getTime() - created.getTime() < 86400000)
+                                dtString = created.getHours()+":"+created.getMinutes();
+                        else
+                                dtString = created.getDate()+"/"+created.getMonth()+"/"+created.getFullYear();
+                        newpage += td_hd+dtString+'</td>';
+                }
+                if (preferences.modified =='1'){
+                        var modified = new Date();
+                        modified.setTime(files[i].modifd*1000);
+                        if (files[i].modifd != "")
+                                if (now.getTime() - modified.getTime() < 86400000)
+                                        dtString = modified.getHours()+":"+modified.getMinutes();
+                                else
+                                        dtString = modified.getDate()+"/"+modified.getMonth()+"/"+modified.getFullYear();
+                        else
+                                dtString = "";
+                        newpage += td_hd+dtString+'</td>';
+                }
                 if (preferences.owner =='1') newpage += td_hd+files[i].owner+'</td>';
                 if (preferences.createdby_id =='1') newpage += td_hd+files[i].creatdby+'</td>';

sandbox/filemanager/templates/default/main.css

@@ -58 +58 @@
                 white-space:nowrap;
 }
+
 .toolButton{
         padding:0 3px;