Merge branch 'backup' into develop

4 files changed, 128 insertions, 6 deletions

diff --git a/config/backup.rb b/config/backup.rb
index c3da9bc..4e5cbf2 100644
--- a/config/backup.rb
+++ b/config/backup.rb
@@ -29,10 +29,10 @@ Backup::Model.new(:gs5, 'GS5 backup') do
   ##
   # Faxes
   #
-  archive :faxes do |archive|
-    archive.add     '/opt/gemeinschaft/public/uploads/fax_document/'
-    archive.add     '/opt/gemeinschaft/public/uploads/fax_thumbnail/'
-  end
+  #archive :faxes do |archive|
+  #  archive.add     '/opt/gemeinschaft/public/uploads/fax_document/'
+  #  archive.add     '/opt/gemeinschaft/public/uploads/fax_thumbnail/'
+  #end
 
   ##
   # Voicemails
@@ -45,8 +45,8 @@ Backup::Model.new(:gs5, 'GS5 backup') do
   # Local (Copy) [Storage]
   #
   store_with Local do |local|
-    local.path       = "/var/backups/"
-    local.keep       = 5
+    local.path       = "/var/backups/GS5/"
+    local.keep       = 3
   end
 
   ##
diff --git a/config/locales/views/backup_jobs/de.yml b/config/locales/views/backup_jobs/de.yml
new file mode 100644
index 0000000..b81b532
--- /dev/null
+++ b/config/locales/views/backup_jobs/de.yml
@@ -0,0 +1,60 @@
+de:
+  backup_jobs:
+    name: 'Backup job'
+    controller:
+      successfuly_created: 'Backup job wurde angelegt.'
+      successfuly_updated: 'Backup job wurde aktualisiert.'
+      successfuly_destroyed: 'Backup job wurde gelöscht.'
+    index:
+      page_title: 'Übersicht von Backup job'
+      started_at: 'Started at'
+      finished_at: 'Finished at'
+      state: 'State'
+      directory: 'Directory'
+      size_of_the_backup: 'Size of the backup'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Backup job'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        show: 'Anzeigen'
+        create: 'Neu anlegen'
+        create_for: 'Backup job neu anlegen für %{resource}'
+    show:
+      page_title: 'Backup job bearbeiten'
+      started_at: 'Started at'
+      finished_at: 'Finished at'
+      state: 'State'
+      directory: 'Directory'
+      size_of_the_backup: 'Size of the backup'
+      actions:
+        confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
+        destroy: 'Löschen'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    new:
+      page_title: 'Backup job neu anlegen'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+    edit:
+      page_title: 'Backup job bearbeiten'
+      actions:
+        back_to_list: 'Zurück zur Übersicht'
+        edit: 'Bearbeiten'
+        view_all: 'Alle anzeigen'
+    form:
+      started_at:
+        label: 'Started at'
+        hint: ''
+      finished_at:
+        label: 'Finished at'
+        hint: ''
+      state:
+        label: 'State'
+        hint: ''
+      directory:
+        label: 'Directory'
+        hint: ''
+      size_of_the_backup:
+        label: 'Size of the backup'
+        hint: ''
+      submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/backup_jobs/en.yml b/config/locales/views/backup_jobs/en.yml
new file mode 100644
index 0000000..83f4388
--- /dev/null
+++ b/config/locales/views/backup_jobs/en.yml
@@ -0,0 +1,60 @@
+en:
+  backup_jobs:
+    name: 'Backup job'
+    controller:
+      successfuly_created: 'Successfully created Backup job.'
+      successfuly_updated: 'Successfully updated Backup job.'
+      successfuly_destroyed: 'Successfully destroyed Backup job.'
+    index:
+      page_title: 'Listing Backup job'
+      started_at: 'Started at'
+      finished_at: 'Finished at'
+      state: 'State'
+      directory: 'Directory'
+      size_of_the_backup: 'Size of the backup'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this Backup job?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        show: 'View'
+        create: 'New'
+        create_for: 'New Backup job for %{resource}'
+    show:
+      page_title: 'Show Backup job'
+      started_at: 'Started at'
+      finished_at: 'Finished at'
+      state: 'State'
+      directory: 'Directory'
+      size_of_the_backup: 'Size of the backup'
+      actions:
+        confirm_destroy: 'Are you sure you want to delete this element?'
+        destroy: 'Delete'
+        edit: 'Edit'
+        view_all: 'View All'
+    new:
+      page_title: 'New Backup job'
+      actions:
+        back_to_list: 'Back to Index'
+    edit:
+      page_title: 'Editing Backup job'
+      actions:
+        back_to_list: 'Back to Index'
+        edit: 'Edit'
+        view_all: 'View All'
+    form:
+      started_at:
+        label: 'Started at'
+        hint: ''
+      finished_at:
+        label: 'Finished at'
+        hint: ''
+      state:
+        label: 'State'
+        hint: ''
+      directory:
+        label: 'Directory'
+        hint: ''
+      size_of_the_backup:
+        label: 'Size of the backup'
+        hint: ''
+      submit: 'Submit'
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index fbb32f6..3c3928f 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,5 +1,7 @@
 Gemeinschaft42c::Application.routes.draw do
 
+  resources :backup_jobs, :except => [:edit, :update]
+
   scope :constraints => lambda{|req|%w(127.0.0.1).include? req.remote_addr} do
     get "trigger/voicemail"
     get "trigger/fax"