Page MenuHomeGRNET
Files F1325720

No OneTemporary
Actions

File Metadata

Created
Mon, Dec 8, 4:06 PM

View Options

diff --git a/app/views/schedules/_form.html.erb b/app/views/schedules/_form.html.erb
index 1b00f39..4c3700b 100644
--- a/app/views/schedules/_form.html.erb
+++ b/app/views/schedules/_form.html.erb
@@ -1,49 +1,51 @@
-<%= bootstrap_form_for(@schedule, url: url, method: method, layout: :horizontal,
- label_col: 'col-xs-3', control_col: 'col-xs-8') do |f| %>
- <%= f.text_field :name, required: true %>
+<div class="panel-body">
+ <%= bootstrap_form_for(@schedule, url: url, method: method, layout: :horizontal,
+ label_col: 'col-xs-3', control_col: 'col-xs-8') do |f| %>
+ <%= f.text_field :name, required: true %>
- <hr />
- <% if ['schedule_runs.day','schedule_runs.month','scheduled_runs.time'] - @schedule.errors.keys %>
- <div id="error_explanation" class="has-error">
- <ul>
- <% @schedule.errors.full_messages.each do |message| %>
- <li><span class="help-block"><%= message %></span></li>
- <% end %>
- </ul>
- </div>
- <% end %>
-
- <%= f.fields_for :schedule_runs, @schedule.schedule_runs do |r| %>
- <div class="schedule_run_form">
- <%= r.select :level, options_for_select(ScheduleRun.options_for_select, r.object.level) %>
- <%= r.text_field :month, placeholder: '[month | month-range]' %>
- <p class="col-xs-10 col-xs-offset-1 help-block text-right">eg: jan-mar, feb, monthly</p>
- <%= r.text_field :day, placeholder: '[week | week-range] day | day-range',
- required: true %>
- <p class="col-xs-10 col-xs-offset-1 help-block text-right">
-eg: first sun, second-fifth mon, mon-sat
- </p>
- <%= r.text_field :time, placeholder: 'HH:MM', class: 'timepicker', required: true %>
- <hr />
- </div>
- <% end %>
-
- <div class="col-xs-1 col-xs-offset-10">
- <%= link_to '#', class: 'schedule_run_form_remove', style: 'display:none;' do %>
- <span class="glyphicon glyphicon-remove text-danger"></span>
+ <hr />
+ <% if ['schedule_runs.day','schedule_runs.month','scheduled_runs.time'] - @schedule.errors.keys %>
+ <div id="error_explanation" class="has-error">
+ <ul>
+ <% @schedule.errors.full_messages.each do |message| %>
+ <li><span class="help-block"><%= message %></span></li>
+ <% end %>
+ </ul>
+ </div>
<% end %>
- </div>
- <div class="col-xs-1 col-xs-offset-10">
- <%= link_to '#', class: 'schedule_run_form_plus' do %>
- <span class="glyphicon glyphicon-plus text-success"></span>
+
+ <%= f.fields_for :schedule_runs, @schedule.schedule_runs do |r| %>
+ <div class="schedule_run_form">
+ <%= r.select :level, options_for_select(ScheduleRun.options_for_select, r.object.level) %>
+ <%= r.text_field :month, placeholder: '[month | month-range]' %>
+ <p class="col-xs-10 col-xs-offset-1 help-block text-right">eg: jan-mar, feb, monthly</p>
+ <%= r.text_field :day, placeholder: '[week | week-range] day | day-range',
+ required: true %>
+ <p class="col-xs-10 col-xs-offset-1 help-block text-right">
+ eg: first sun, second-fifth mon, mon-sat
+ </p>
+ <%= r.text_field :time, placeholder: 'HH:MM', class: 'timepicker', required: true %>
+ <hr />
+ </div>
<% end %>
- </div>
- <%= (hidden_field_tag :job_id, @job_id) if @job_id %>
+ <div class="col-xs-1 col-xs-offset-10">
+ <%= link_to '#', class: 'schedule_run_form_remove', style: 'display:none;' do %>
+ <span class="glyphicon glyphicon-remove text-danger"></span>
+ <% end %>
+ </div>
+ <div class="col-xs-1 col-xs-offset-10">
+ <%= link_to '#', class: 'schedule_run_form_plus' do %>
+ <span class="glyphicon glyphicon-plus text-success"></span>
+ <% end %>
+ </div>
- <div class="form-group">
- <div class="col-xs-offset-3 col-xs-8">
- <%= f.submit class: 'btn btn-success' %>
+ <%= (hidden_field_tag :job_id, @job_id) if @job_id %>
+
+ <div class="form-group">
+ <div class="col-xs-offset-3 col-xs-8">
+ <%= f.submit class: 'btn btn-success' %>
+ </div>
</div>
- </div>
-<% end %>
+ <% end %>
+</div>
diff --git a/app/views/schedules/_level_explanation.html.erb b/app/views/schedules/_level_explanation.html.erb
new file mode 100644
index 0000000..0bf6082
--- /dev/null
+++ b/app/views/schedules/_level_explanation.html.erb
@@ -0,0 +1,31 @@
+<div class="col-xs-5">
+ <div class="row">
+ <div class="col-xs-12">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4>Level Explanation</h4>
+ </div>
+
+ <br />
+
+ <div class="panel-body">
+ <h4>Full</h4>
+ <p> When the Level is set to Full all files in the FileSet whether or not they have changed will be backed up.</p>
+ <h4>Differential</h4>
+ <p>When the Level is set to Differential all files specified in the FileSet that have changed since the last successful Full backup of the same Job will be backed up.</p>
+ <p>If there is no successful previous Full backup, a Differential backup is upgraded to a Full backup.</p>
+ <h4>Incremental</h4>
+ <p>When the Level is set to Incremental all files specified in the FileSet that have changed since the last successful backup of the the same Job using the same FileSet and Client, will be backed up.<p>
+ <p>If there is no successful previous Full backup, an Incremental backup is upgraded to a Full backup.</p>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <div class="row">
+ <div class="col-xs-12">
+ <%= link_to 'Back to job',
+ @job_id.present? ? edit_host_job_path(@host, @job_id) : new_host_job_path(@host) %>
+ </div>
+ </div>
+</div>
diff --git a/app/views/schedules/edit.html.erb b/app/views/schedules/edit.html.erb
index b46f26b..10e892e 100644
--- a/app/views/schedules/edit.html.erb
+++ b/app/views/schedules/edit.html.erb
@@ -1,17 +1,13 @@
-<h1>Edit Schedule: <%= @schedule.name %></h1>
-
<div class="col-xs-5">
<div class="panel panel-default">
<div class="panel-heading">
<h4>Edit Schedule</h4>
</div>
- <br />
-
<%= render partial: 'form',
- locals: { url: host_schedule_path(@host, @schedule.id, job_id: @job_id), method: :patch } %>
+ locals: { url: host_schedule_path(@host, @schedule.id, job_id: @job_id),
+ method: :patch } %>
</div>
</div>
-<%= link_to 'Back to job',
- @job_id.present? ? edit_host_job_path(@host, @job_id) : new_host_job_path(@host) %>
+<%= render partial: 'level_explanation' %>
diff --git a/app/views/schedules/new.html.erb b/app/views/schedules/new.html.erb
index 15112b5..afc8039 100644
--- a/app/views/schedules/new.html.erb
+++ b/app/views/schedules/new.html.erb
@@ -1,8 +1,11 @@
-<h1>New Schedule</h1>
+<div class="col-xs-5">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h4>New Schedule</h4>
+ </div>
-<div class="container graybox">
- <%= render partial: 'form', locals: { url: host_schedules_path(@host), method: :post } %>
+ <%= render partial: 'form', locals: { url: host_schedules_path(@host), method: :post } %>
+ </div>
</div>
-<%= link_to 'Back to job',
- @job_id.present? ? edit_host_job_path(@host, @job_id) : new_host_job_path(@host) %>
+<%= render partial: 'level_explanation' %>

Event Timeline