Page MenuHomeGRNET
Files F886093

No OneTemporary
Actions

File Metadata

Created
Fri, Aug 8, 8:44 PM

View Options

diff --git a/app/views/jobs/_form.html.erb b/app/views/jobs/_form.html.erb
index dfaadf8..bdc9bd2 100644
--- a/app/views/jobs/_form.html.erb
+++ b/app/views/jobs/_form.html.erb
@@ -1,49 +1,53 @@
<%= bootstrap_form_for(@job, url: @job.new_record? ? host_jobs_path : host_job_path(@host, @job),
layout: :horizontal, label_col: 'col-xs-5', control_col: 'col-xs-5') do |f| %>
<%= f.text_field :name %>
<%= select_with_errors_and_button(
@job, :job_template, :fileset_id, 'Fileset',
options_from_collection_for_select(
@host.filesets, :id, :name, params[:fileset_id] || @job.fileset_id),
new_host_fileset_path(@host, job_id: @job.id))
%>
<% if !@job.restore? %>
<%= select_with_errors_and_button(
@job, :job_template, :schedule_id, 'Schedule',
options_from_collection_for_select(
@host.schedules, :id, :name, params[:schedule_id] || @job.schedule_id),
new_host_schedule_path(@host, job_id: @job.id))
%>
<% end %>
<div class="form-group">
<a id="toggle-advanced" class="col-xs-5 col-xs-offset-5" href="#">show advanced</a>
</div>
<div id="advanced" class="hidden">
<%= f.text_field :client_before_run_file,
label: tooltip_label('Client Run Before Job',
'A command that the backed up server will run right before the backup job starts') %>
<%= f.text_field :client_after_run_file,
label: tooltip_label('Client Run After Job',
'A command that the backed up server will run after the backup job has finished') %>
</div>
<div class="form-group">
- <div class="col-xs-offset-4 col-xs-8">
- <%= f.submit class: "btn btn-success" %>
+ <div class="col-xs-2 col-xs-offset-7">
+ <%= link_to 'Cancel', @job.persisted? ? host_job_path(@host, @job) : host_path(@job.host, anchor: :jobs),
+ class: 'btn btn-danger', role: 'button' %>
+ </div>
+ <div class="col-xs-2">
+ <%= f.submit 'Submit', class: "btn btn-success" %>
</div>
</div>
<% end %>
<script type='text/javascript'>
var hostId=<%= @host.id %>;
var jobIdParam={};
<% if @job.id %>
jobIdParam= { job_id: <%= @job.id %> };
<% end %>
</script>
diff --git a/app/views/jobs/edit.html.erb b/app/views/jobs/edit.html.erb
index 9ea285f..3786cc4 100644
--- a/app/views/jobs/edit.html.erb
+++ b/app/views/jobs/edit.html.erb
@@ -1,26 +1,24 @@
<h1>Edit Job Template <%= @job.name %></h1>
<div class="row">
<div class="col-xs-4">
<div class="panel panel-default">
<div class="panel-heading">
<h3> Job Attributes</h3>
</div>
<br />
<%= render 'form' %>
</div>
- <%= link_to 'Cancel', host_job_path(@host, @job), class: 'btn btn-danger right',
- role: 'button' %>
</div>
<div class="col-xs-4">
<div id="fileset">
<% fileset = @fileset || @job.fileset %>
<%= render partial: 'fileset', locals: { fileset: fileset } if fileset %>
</div>
<div id="schedule">
<% schedule = @schedule || @job.schedule %>
<%= render partial: 'schedule', locals: { schedule: schedule } if schedule %>
</div>
</div>
</div>
diff --git a/app/views/jobs/new.html.erb b/app/views/jobs/new.html.erb
index 0790b0a..01cabd2 100644
--- a/app/views/jobs/new.html.erb
+++ b/app/views/jobs/new.html.erb
@@ -1,29 +1,23 @@
<h1>New Job Template</h1>
<div class="row">
<div class="col-xs-4">
<div class="panel panel-default">
<div class="panel-heading">
<h3> Job Attributes</h3>
</div>
<br />
<%= render 'form' %>
</div>
</div>
<div class="col-xs-4">
<div id="fileset">
</div>
<div id="schedule">
<% schedule = @schedule || @job.schedule %>
<%= render partial: 'schedule', locals: { schedule: schedule } if schedule %>
</div>
</div>
</div>
-
-<div class="row">
- <div class="col-xs-1">
- <%= link_to 'Cancel', host_path(@job.host), class: 'btn btn-danger', role: 'button' %>
- </div>
-</div>

Event Timeline