Merge branch 'develop' of github.com:amooma/GS5 into develop

2 files changed, 21 insertions, 7 deletions

diff --git a/app/views/backup_jobs/_index_core.html.haml b/app/views/backup_jobs/_index_core.html.haml
index 6babf3e..a706424 100644
--- a/app/views/backup_jobs/_index_core.html.haml
+++ b/app/views/backup_jobs/_index_core.html.haml
@@ -3,15 +3,29 @@
     %th= t('backup_jobs.index.started_at')
     %th= t('backup_jobs.index.finished_at')
     %th= t('backup_jobs.index.state')
-    %th= t('backup_jobs.index.directory')
     %th= t('backup_jobs.index.size_of_the_backup')
+    %th{:colspan => '2'}
 
   
   - for backup_job in backup_jobs
-    %tr
-      %td= backup_job.started_at
-      %td= backup_job.finished_at
+    - if backup_job.state == 'queued'
+      - row_marker = 'warning'
+    - else
+      - if backup_job.state == 'failed'
+        - row_marker = 'error'
+      - else
+        - row_marker = ''
+    %tr{:class => row_marker}
+      - if backup_job.finished_at.blank?
+        %td{:colspan => '2'}
+          = time_ago_in_words(backup_job.started_at)
+      - else
+        %td
+          = l backup_job.started_at, :format => :short
+        %td
+          = l backup_job.finished_at, :format => :short 
       %td= backup_job.state
-      %td= backup_job.directory
-      %td= backup_job.size_of_the_backup
+      %td
+        - if !backup_job.size_of_the_backup.blank?
+          = number_to_human_size(backup_job.size_of_the_backup, :precision => 2)
       =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => backup_job}
\ No newline at end of file
diff --git a/app/views/backup_jobs/show.html.haml b/app/views/backup_jobs/show.html.haml
index 7f021bb..65091b8 100644
--- a/app/views/backup_jobs/show.html.haml
+++ b/app/views/backup_jobs/show.html.haml
@@ -14,6 +14,6 @@
   = @backup_job.directory
 %p
   %strong= t('backup_jobs.show.size_of_the_backup') + ":"
-  = @backup_job.size_of_the_backup
+  = number_to_human_size(@backup_job.size_of_the_backup, :precision => 2)
 
 = render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @backup_job }
\ No newline at end of file