summaryrefslogtreecommitdiff
path: root/app/views/backup_jobs
diff options
context:
space:
mode:
authorStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-06 11:07:04 +0100
committerStefan Wintermeyer <stefan.wintermeyer@amooma.de>2013-02-06 11:07:04 +0100
commit3edd6e58ea3f5d25068ea9d47f639ae89e5f2c0c (patch)
tree225aee0cc7a8d746dfa1e52ccb2fc8d633746197 /app/views/backup_jobs
parentb1f9f3b2c39d31d0621da36420318406f33a1f92 (diff)
Improved the backup.
Diffstat (limited to 'app/views/backup_jobs')
-rw-r--r--app/views/backup_jobs/_index_core.html.haml19
-rw-r--r--app/views/backup_jobs/show.html.haml2
2 files changed, 16 insertions, 5 deletions
diff --git a/app/views/backup_jobs/_index_core.html.haml b/app/views/backup_jobs/_index_core.html.haml
index 6babf3e..a1bf0d0 100644
--- a/app/views/backup_jobs/_index_core.html.haml
+++ b/app/views/backup_jobs/_index_core.html.haml
@@ -8,10 +8,21 @@
- 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}
+ %td
+ - if backup_job.finished_at.blank?
+ = time_ago_in_words(backup_job.finished_at)
+ - else
+ = 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= 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