Page MenuHomeGRNET
Files F905006

No OneTemporary
Actions

File Metadata

Created
Fri, Aug 29, 7:09 PM

View Options

diff --git a/app/views/clients/restore.html.erb b/app/views/clients/restore.html.erb
index d2a23f5..11b5e13 100644
--- a/app/views/clients/restore.html.erb
+++ b/app/views/clients/restore.html.erb
@@ -1,65 +1,65 @@
<div class="row">
<div class="col-xs-4">
<% if @client.is_backed_up? %>
<div class="panel panel-default">
<div class="panel-heading">
<h3>Restore files for "<%= @client.name %>"</h3>
</div>
<br />
<%= bootstrap_form_tag(url: run_restore_client_path(@client), remote: true,
layout: :horizontal, label_col: 'col-xs-4', control_col: 'col-xs-7',
html: { id: 'basic-form' } ) do |f| %>
<div class="form-group">
<label class="col-xs-4 control-label"></label>
<div class="col-xs-7">
<p class="form-control-static">
Restore to most recent backup by leaving date and time blank
</p>
</div>
</div>
<%= f.text_field :restore_date %>
<%= f.time_select :restore_time, ignore_date: true, minute_step: 30, prompt: true %>
<%= f.select(:fileset,
options_from_collection_for_select(@client.file_sets, :id, :file_set)) %>
- <%= f.text_field :restore_location, placeholder: '/tmp/bacula_restore' %>
+ <%= f.text_field :restore_location, placeholder: '/tmp/default_restore' %>
<div class="row">
<div class="col-xs-5 col-xs-offset-6 text-right">
<%= f.submit 'Select Specific Files', id: 'select-files', class: 'btn btn-primary' %>
</div>
</div>
<br />
<div class="row">
<div class="col-xs-3 col-xs-offset-8">
<%= f.submit 'Restore All Files', class: 'btn btn-warning text-right',
data: { confirm: "This will restore all your files" }
%>
</div>
</div>
<% end %>
</br>
</div>
<% else %>
<div class="alert alert-warning">
<p>Can not issue a restore for this client. It does not have any successful backups</p>
</div>
<% end %>
<%= link_to 'Back to client', client_path(@client), class: 'btn btn-danger', role: 'button' %>
</div>
<%= render partial: 'file_selector' %>
</div>
<script type="text/javascript">
<% min_date, max_date = @client.backup_enabled_datetime_range %>
var minDate = '<%= min_date %>';
var maxDate = '<%= max_date %>';
$('#restore_date').datepicker({
dateFormat: 'yy-mm-dd',
minDate: minDate,
maxDate: maxDate
});
</script>
diff --git a/app/views/clients/show.html.erb b/app/views/clients/show.html.erb
index 0d132e5..5820291 100644
--- a/app/views/clients/show.html.erb
+++ b/app/views/clients/show.html.erb
@@ -1,25 +1,25 @@
<%= render partial: 'header' %>
<div class="row">
<div class="col-xs-4">
<h3>Client Details</h3>
</div>
<div class="col-xs-6">
- <h3>Bacula Jobs</h3>
+ <h3>Backup Jobs</h3>
</div>
</div>
<div class="row">
<%= render partial: 'client_details' %>
<div class="col-xs-8">
<div class="row">
<%= render partial: 'jobs' %>
</div>
</div>
</div>
<br/>
<%= link_to 'Back to clients', clients_path %>
<%= render partial: 'jobs/modals' %>
diff --git a/app/views/filesets/_form.html.erb b/app/views/filesets/_form.html.erb
index 8d0a7df..b909bd2 100644
--- a/app/views/filesets/_form.html.erb
+++ b/app/views/filesets/_form.html.erb
@@ -1,19 +1,19 @@
<%= bootstrap_form_for(@fileset, url: url, method: method, layout: :horizontal,
label_col: 'col-xs-3', control_col: 'col-xs-8') do |f| %>
<div>
<%= f.text_field :name %>
<% @fileset.include_directions['file'].each do |file| %>
<%= text_with_errors_and_plus(@fileset, :fileset, :include_files, 'Files', '/', file) %>
<% end %>
- <%= text_with_errors_and_plus(@fileset, :fileset, :exclude_directions, 'Exclude', '/bacula') %>
+ <%= text_with_errors_and_plus(@fileset, :fileset, :exclude_directions, 'Exclude', '/a_restore_location') %>
<%= (hidden_field_tag :job_id, @job_id) if @job_id%>
</div>
<div class="form-group">
<div class="col-xs-offset-3 col-xs-8">
<%= f.submit class: 'btn btn-success' %>
</div>
</div>
<% end %>
diff --git a/app/views/hosts/_header.html.erb b/app/views/hosts/_header.html.erb
index d2e68d6..bb6532e 100644
--- a/app/views/hosts/_header.html.erb
+++ b/app/views/hosts/_header.html.erb
@@ -1,31 +1,31 @@
<div class="row right">
<% if @host.can_be_disabled? %>
<%= link_to 'Disable client', disable_host_path(@host), method: :post,
data: { confirm: 'This will disable the client. Are you sure?' },
class: "btn btn-warning", role: "button" %>
<% end %>
<%= link_to 'Remove client', host_path(@host), method: :delete,
- data: { confirm: 'This will remove the client from Bacula. Are you sure?' },
+ data: { confirm: 'This will remove your client from the Backup service. Are you sure?' },
class: "btn btn-danger", role: "button" %>
</div>
<h2>Configuration for <%= @host.name %>
<small><%= host_status_label(@host) %></small>
</h2>
<br/>
<ul class="nav nav-tabs" role='tablist'>
<li role="presentation" class="active">
<a aria-controls='details' role='tab' data-toggle='tab' href="#details">Client Details</a>
</li>
<li role="presentation">
<a aria-controls='jobs' role='tab' data-toggle='tab' href="#jobs">Jobs</a>
</li>
<li role="presentation">
<a aria-controls='fd-config'role='tab' data-toggle='tab' href="#fd-config">FD Config</a>
</li>
</ul>
<br/>
diff --git a/app/views/hosts/_host_details.html.erb b/app/views/hosts/_host_details.html.erb
index 08e46f9..2f1b33d 100644
--- a/app/views/hosts/_host_details.html.erb
+++ b/app/views/hosts/_host_details.html.erb
@@ -1,73 +1,73 @@
<div class="col-xs-4">
<div class="table-responsive">
<table class="table table-striped table-bordered table-condensed">
<tr>
<td><b>Name</b></td>
<td><%= @host.name %></td>
</tr>
<tr>
<td><b>FQDN</b></td>
<td><%= @host.fqdn %></td>
</tr>
<tr>
<td><b>FDPort</b></td>
<td><%= @host.port %></td>
</tr>
<tr>
<td><b>Token</b></td>
<td>********</td>
</tr>
<tr>
<td><b>File Retention</b></td>
<td><%= @host.file_retention %> days</td>
</tr>
<tr>
<td><b>Job Retention</b></td>
<td><%= @host.job_retention %> days</td>
</tr>
<tr>
<td><b>Verified</b></td>
<td>
<% if @host.verified? %>
<span class="label label-success">yes</span>
<% else %>
<span class="label label-danger">no</span>
<% end %>
</td>
</tr>
<tr>
<td><b>Created</b></td>
<td><%= I18n.l(@host.created_at, format: :long) %></td>
</tr>
</table>
</div>
<div class='row'>
<div class='col-xs-2'>
<%= link_to 'Edit', edit_host_path(@host), class: "btn btn-primary", role: "button" %>
</div>
<% if @host.needs_dispatch? %>
<div class='col-xs-4 pull-right text-right'>
<%= link_to 'Deploy Changes', submit_config_host_path(@host), method: :post,
class: 'btn btn-success', role: 'button' %>
</div>
<% end %>
<% if @host.needs_revoke? %>
<div class='col-xs-4 pull-right text-right'>
- <%= link_to 'Remove From Bacula', revoke_host_path(@host), method: :delete,
+ <%= link_to 'Remove From Backup service', revoke_host_path(@host), method: :delete,
class: 'btn btn-danger', role: 'button' %>
</div>
<% end %>
</div>
<br />
<div class='row'>
<% if @host.client %>
<div class='col-xs-12 text-right'>
<%= link_to "Back to <b>#{@host.name}</b> client".html_safe, client_path(@host.client) %>
</div>
<% end %>
</div>
</div>
diff --git a/app/views/user_mailer/notify_for_invitation.text.erb b/app/views/user_mailer/notify_for_invitation.text.erb
index 65690b9..4543ed7 100644
--- a/app/views/user_mailer/notify_for_invitation.text.erb
+++ b/app/views/user_mailer/notify_for_invitation.text.erb
@@ -1,8 +1,8 @@
-You are invited to manage <%= @invitation.host.fqdn %> 's Bacula policy
+You are invited to manage <%= @invitation.host.fqdn %> 's Backups policy.
To accept the invitation please follow the following link
<%= accept_invitation_url(@invitation.accept_hash) %>
---------
Archiving

Event Timeline