Changeset 70 for pro-bachkim-filespace/sourcecode/application

Timestamp:

Sep 9, 2014 4:14:10 PM (11 years ago)

Author:

dungnv

Message:

 

Location:

pro-bachkim-filespace/sourcecode/application

Files:

• modules/ajax/controllers/privatecontent.php (modified) (4 diffs)
• modules/filemanager/views/main.php (modified) (2 diffs)
• views/layout/contextmenu.php (modified) (2 diffs)
• views/layout/footer.php (modified) (3 diffs)

pro-bachkim-filespace/sourcecode/application/modules/ajax/controllers/privatecontent.php

@@ -85 +85 @@
                 $parentDir =  $this->input->post('fparentid',TRUE);
                 $name =  $this->input->post('fname',TRUE);
+                
                 $xmlData = $this->vservices->actionExecute('mkdir',array('name' => $name, 'parent_id' => $parentDir == 0 ? -1:$parentDir));
                 
@@ -90 +91 @@
                 $aryError = array('err' => $this->xml->status->_param['err'], 'errCode' => (int)$this->xml->status->_param['errCode']);
                 $aryData = array('id' => $this->xml->status->_param['id'], 'name' => $name, 'parentID' => $parentDir, 'ERROR' => $aryError);
+                
+                /* $aryError = array('err' => '', 'errCode' => 0);
+                $aryData =  array('id' => rand(100, 1000), 'name' => $name, 'parentID' => $parentDir, 'ERROR' => $aryError); */
                 echo json_encode($aryData);
         }
@@ -97 +101 @@
                 $xmlData = $this->vservices->actionExecute('deletemulti',array('delobj' => $delobj));
                 $this->xml->parse($xmlData);
+                $aryFolders = array();
+
+                if (isset($this->xml->tree->folder)) {
+                        if (is_array($this->xml->tree->folder)) {
+                                foreach ($this->xml->tree->folder as $key => $folder) {                                 
+                                        $aryFolders['DIRECTORIES'][] = $folder->_param['id'];
+                                }
+                        }
+                        else {
+                                $aryFolders['DIRECTORIES'][] = $this->xml->tree->folder->_param['id'];
+                        }
+                }
+                
+                if (isset($this->xml->tree->file)) {
+                        if (is_array($this->xml->tree->file)) {
+                                foreach ($this->xml->tree->file as $key => $file) {
+                                        $aryFolders['FILES'][] = $file->_param['id'];
+                                }
+                        }
+                        else {
+                                $aryFolders['FILES'][] = $this->xml->tree->folder->_param['id'];
+                        }
+                }
+                
                 $aryError = array('err' => $this->xml->tree->_param['err'], 'errCode' => (int)$this->xml->tree->_param['errCode']);
-                $aryData = array('ERROR' => $aryError);
+                $aryData = array('DIRECTORIES' => isset($aryFolders['DIRECTORIES']) ? $aryFolders['DIRECTORIES'] : array(), 'FILES' => isset($aryFolders['FILES'])? $aryFolders['FILES'] : array() ,'ERROR' => $aryError);
                 echo json_encode($aryData);
         }
@@ -104 +132 @@
         public function rename() {
                 $id =  $this->input->post('id',TRUE);
-                $newName =  $this->input->post('newname',TRUE);
-                $objectType =  $this->input->post('objtype',TRUE);
-
+                $data =  $this->input->post('data',TRUE);
+                
                 $aryData = array();
                 $aryData['RESULT'] = $this->objDirectory->rename($id, $newName, $objectType);;
                 $aryData['UPDATED'] = array('id' => $id, 'name' => $newName, 'type' => $objectType);
                 echo json_encode($aryData);
+        }
+
+        public function copy () {
+                $destination =  $this->input->post('destination',TRUE);
+                $data =  $this->input->post('data',TRUE);
+                
+                $aryData = array();
+                $aryData['RESULT'] = json_decode($data);
+                $aryError = array('err' => '', 'errCode' => 0);
+                $aryData['ERROR'] = $aryError;
+                echo json_encode($aryData);
+
         }
         

pro-bachkim-filespace/sourcecode/application/modules/filemanager/views/main.php

@@ -21 +21 @@
         <div class="row">
                 <div id="tools-bar" class="col-sm-12 col-xs-12 col-md-12 col-lg-12">
-                        <div class="btn-group">
+                        <div class="btn-group basic">
                                 <button id="btnNewFolder" class="btn btn-success" title="Tạo thư mục mới"><i class="icon-folder-close"></i></button>
                                 <button id="btnDel" class="btn btn-success" title="Xóa"><i class="icon-eraser"></i></button>
@@ -28 +28 @@
                                 <button id="btnPaste" class="btn btn-success" title="Dán"><i class="icon-paste"></i></button>
                         </div>
-                        <div class="btn-group">
-                                <button class="btn btn-danger" title="Chia sẻ"><i class="icon-share-alt"></i></button>
-                                <button class="btn btn-danger" title="Xem trước"><i class="icon-eye-open"></i></button>
+                        <div class="btn-group social">
+                                <button id="btnShare" class="btn btn-danger" title="Chia sẻ"><i class="icon-share-alt"></i></button>
+                                <button id="btnPreview" class="btn btn-danger" title="Xem trước"><i class="icon-eye-open"></i></button>
                         </div>
-                        <div class="btn-group">
-                                <button class="btn btn-warning" title="Tải xuống"><i class="icon-cloud-download"></i></button>
+                        <div class="btn-group creation">
+                                <button id="btnDownload" class="btn btn-warning" title="Tải xuống"><i class="icon-cloud-download"></i></button>
                                 <button id="btnUpload" class="btn btn-info" title="Tải lên"><i class="icon-cloud-upload"></i></button>
+                        </div>
+                        <div class="btn-group control">
+                                <button id="btnRefresh" class="btn btn-info" title="Tải lại"><i class="icon-refresh"></i></button>
                         </div>
                 </div>

pro-bachkim-filespace/sourcecode/application/views/layout/contextmenu.php

@@ -1 @@
-<ul id="treeMenu" class="contextMenu">
+<!-- <ul id="treeMenu" class="contextMenu">
         <li class="newfolder"><a href="#newfolder">Tạo thư mục mới</a></li>
         <li class="share separator"><a href="#share">Chia sẻ</a></li>
@@ -36 +36 @@
         <li class="delete"><a href="#delete">Xóa</a></li>
         <li class="rename separator"><a href="#rename">Đổi tên</a></li>
-</ul>
+</ul> -->

pro-bachkim-filespace/sourcecode/application/views/layout/footer.php

@@ -26 +26 @@
 
 <script src="assets/js/jquery/jquery-1.11.1.min.js"></script>
+<!-- <script src="assets/js/jquery/jquery.hotkeys-0.7.9.min.js"></script> -->
 <script src="assets/js/jquery/jquery-ui-1.10.4.min.js"></script>
+<script src="assets/js/jquery/jquery.ui.position.js"></script>
+<script src="assets/js/jquery/jquery.alsodrag.js"></script>
 <script src="assets/js/jquery/jquery.contextMenu.js"></script>
 <script src="assets/js/bootstrap/bootstrap.min.js"></script>
@@ -35 +38 @@
 <script src="assets/js/manager.js"></script>
         <script type="text/javascript">
-                var data = {"DIRECTORIES":[{"id":"1","name":"Dir1","parentID":0},{"id":"2","name":"E1","parentID":0},{"id":"4","name":"Th\u01b0 m\u1ee5c c\u1ee7a D\u0169ng","parentID":0},{"id":"3","name":"E1.1","parentID":"2"},{"id":"5","name":"D\u0169ng 1","parentID":"4"},{"id":"8","name":"D\u0169ng 2","parentID":"4"},{"id":"6","name":"Dir 3","parentID":"5"},{"id":"7","name":"Dir3.1","parentID":"6"}],"FILES":[{"id":"1","name":"File 1","parentID":"1","minetype":"text"},{"id":"2","name":"File in root 1","parentID":0,"minetype":"text"}],"ERROR":{"err":"","errCode":""}}
+                var data = {"DIRECTORIES":[{"id":"1","name":"Dir1","parentID":0},{"id":"2","name":"Dir2","parentID":0},{"id":"3","name":"Dir3","parentID":0},{"id":"4","name":"Dir1.1","parentID":"1"},{"id":"5","name":"Dir1.2","parentID":"1"},{"id":"15","name":"Dir1.3","parentID":"3"},{"id":"16","name":"Dir1.4","parentID":"15"},{"id":"17","name":"Dir1.5","parentID":"1"},{"id":"18","name":"Dir1.6","parentID":"1"},{"id":"19","name":"Dir1.7","parentID":"1"},{"id":"20","name":"Dir2.1","parentID":"2"}],"FILES":[{"id":"2","name":"File in root 1","parentID":0,"minetype":"text"}],"ERROR":{"err":"","errCode":0}}
                 if(jQuery){
                         var manager = $().violetFileManager({
@@ -45 +48 @@
                                 statusbar: 'status-bar',
                                 datasource: 'ajax'/* 'json' ,
-                                data: data*/
+                                data: data */
                         });
                 }