Page MenuHomeGRNET
Files F886108

No OneTemporary
Actions

File Metadata

Created
Fri, Aug 8, 8:44 PM

View Options

diff --git a/app/views/filesets/_form.html.erb b/app/views/filesets/_form.html.erb
index 6b9d95f..85680b7 100644
--- a/app/views/filesets/_form.html.erb
+++ b/app/views/filesets/_form.html.erb
@@ -1,22 +1,27 @@
<%= 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 %>
<hr />
<% @fileset.exclude_directions.each do |file| %>
<%= text_with_errors_and_plus(@fileset, :fileset, :exclude_directions, 'Exclude', '/an_exluded_dir', file) %>
<% end %>
<%= (hidden_field_tag :job_id, @job_id) if @job_id%>
</div>
<div class="form-group">
- <div class="col-xs-offset-3 col-xs-8">
+ <div class="col-xs-offset-3 col-xs-3">
<%= f.submit class: 'btn btn-success' %>
</div>
+ <div class="col-xs-3">
+ <%= link_to 'Cancel',
+ @job_id.present? ? edit_host_job_path(@host, @job_id) : new_host_job_path(@host),
+ role: 'button', class: 'btn btn-danger'%>
+ </div>
</div>
<% end %>
diff --git a/app/views/filesets/edit.html.erb b/app/views/filesets/edit.html.erb
index de7cc5a..c4025f7 100644
--- a/app/views/filesets/edit.html.erb
+++ b/app/views/filesets/edit.html.erb
@@ -1,22 +1,15 @@
<div class="row">
<div class="col-xs-5">
<div class="panel panel-default">
<div class="panel-heading">
<h3>Edit Fileset: <%= @fileset.name %></h3>
</div>
- <br />
-
- <%= render partial: 'form',
- locals: { url: host_fileset_path(@host, @fileset.id, job_id: @job_id), method: :patch } %>
+ <div class="panel-body">
+ <%= render partial: 'form',
+ locals: { url: host_fileset_path(@host, @fileset.id, job_id: @job_id),
+ method: :patch } %>
+ </div>
</div>
</div>
</div>
-
-<div class="row">
- <div class="col-xs-1 col-xs-offset-4 text-right">
- <%= link_to 'Cancel',
- @job_id.present? ? edit_host_job_path(@host, @job_id) : new_host_job_path(@host),
- role: 'button', class: 'btn btn-danger'%>
- </div>
-</div>
diff --git a/app/views/filesets/new.html.erb b/app/views/filesets/new.html.erb
index 73a04f1..fec38f5 100644
--- a/app/views/filesets/new.html.erb
+++ b/app/views/filesets/new.html.erb
@@ -1,9 +1,14 @@
-<h1>New Fileset</h1>
+<div class="row">
+ <div class="col-xs-5">
+ <div class="panel panel-default">
+ <div class="panel-heading">
+ <h3>New Fileset</h3>
+ </div>
-<div class="container graybox">
- <%= render partial: 'form',
- locals: { url: host_filesets_path(@host), method: :post } %>
+ <div class="panel-body">
+ <%= render partial: 'form',
+ locals: { url: host_filesets_path(@host), method: :post } %>
+ </div>
+ </div>
+ </div>
</div>
-
-<%= link_to 'Back to job',
- @job_id.present? ? edit_host_job_path(@host, @job_id) : new_host_job_path(@host) %>

Event Timeline