diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index a58ee03..04896d5 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -36,4 +36,21 @@ //= require js/nprogress.js //= require flash.js //= require js/knob/jquery.knob.min.js -//= require js/dropzone/dropzone.js \ No newline at end of file +//= require js/dropzone/dropzone.js + +// Datatables + +//= require js/datatables/jquery.dataTables.min.js +//= require js/datatables/dataTables.bootstrap.js +//= require js/datatables/dataTables.buttons.min.js +//= require js/datatables/buttons.bootstrap.min.js +//= require js/datatables/jszip.min.js +//= require js/datatables/pdfmake.min.js +//= require js/datatables/vfs_fonts.js +//= require js/datatables/buttons.html5.min.js +//= require js/datatables/buttons.print.min.js +//= require js/datatables/dataTables.fixedHeader.min.js +//= require js/datatables/dataTables.keyTable.min.js +//= require js/datatables/dataTables.responsive.min.js +//= require js/datatables/responsive.bootstrap.min.js +//= require js/datatables/dataTables.scroller.min.js \ No newline at end of file diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 5909cd8..d63a66e 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -29,3 +29,11 @@ @import "css/ion.rangeSlider.skinFlat"; @import "css/colorpicker/bootstrap-colorpicker.min"; @import "pace"; + +//DataTable + +@import "js/datatables/jquery.dataTables.min"; +@import "js/datatables/buttons.bootstrap.min"; +@import "js/datatables/responsive.bootstrap.min"; +@import "js/datatables/scroller.bootstrap.min"; +@import "js/datatables/fixedHeader.bootstrap.min"; \ No newline at end of file diff --git a/app/controllers/volume_controller.rb b/app/controllers/volume_controller.rb index dd2e994..15f77f3 100644 --- a/app/controllers/volume_controller.rb +++ b/app/controllers/volume_controller.rb @@ -1,9 +1,11 @@ class VolumeController < ApplicationController def info + + file_directory('/home/ubuntu') + @volumes = Array.new volume = Hash.new i = 0 - if get_info.blank? flash[:danger] = "Check Server" else @@ -33,4 +35,29 @@ class VolumeController < ApplicationController uploader.store!(file_name) redirect_to '/volume/info' end + + + def file_directory(dir) + @current_dir = dir + dir_list = `ls #{@current_dir} -l` + parsing_list = dir_list.split("\n") + + + @files = Array.new + file = Hash.new + i = 0 + @total_list = parsing_list[0] + for t in 1..(parsing_list.length-1) + puts "@@@@@@@@@@@" + parsing_list[t] + parsing_file = parsing_list[t].split(" ") + file["auth"] = parsing_file[0] + file["size"] = parsing_file[4] + file["date"] = parsing_file[5] + " " + parsing_file[6] + " "+ parsing_file[7] + file["name"] = parsing_file[8] + @files[i] = file + file = Hash.new + i+=1 + end + puts @files + end end diff --git a/app/views/volume/info.html.erb b/app/views/volume/info.html.erb index 3d0cd73..d7b0370 100644 --- a/app/views/volume/info.html.erb +++ b/app/views/volume/info.html.erb @@ -4,9 +4,8 @@
-

Volume Info

+

Volume Info

-
-
- - <%end%> -
+ + + \ No newline at end of file