Skip to content

Commit

Permalink
Fix(VMs Show): Render modal in appropriate spot
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrisma
chrisma committed Apr 5, 2019
1 parent 248f162 commit 2be7e8c
Showing 1 changed file with 42 additions and 39 deletions.
81 changes: 42 additions & 39 deletions app/views/vms/show.html.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,48 +148,51 @@ end %>
</div>

<% if @vm.config.present? && current_user.admin? %>
<%# Modal for Puppet Script display %>
<div class="modal fade" id="puppetscript" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="puppet-scriptTite">Puppet Scripts</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="card">
<div class="card-header">
Generated Node Script
<small>
<%= link_to "File in '#{AppSetting.instance.git_repository_name}' GitHub repository",
AppSetting.instance.github_base_file_url + Puppetscript.node_file_name(@vm.name) %>
</small>
<%# Render content in location defined in app/views/layouts/application.html.erb %>
<% content_for :modals do %>
<%# Modal for Puppet Script display %>
<div class="modal fade" id="puppetscript" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title" id="puppet-scriptTite">Puppet Scripts</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<div class="card">
<div class="card-header">
Generated Node Script
<small>
<%= link_to "File in '#{AppSetting.instance.git_repository_name}' GitHub repository",
AppSetting.instance.github_base_file_url + Puppetscript.node_file_name(@vm.name) %>
</small>
</div>
<div class="card-body">
<pre class="mb-0"><%= @vm.config.node_script %></pre>
</div>
<div class="card-body">
<pre class="mb-0"><%= @vm.config.node_script %></pre>
</div>
</div><%# card %>
<div class="card mt-4">
<div class="card-header">
Generated Name Script
<small>
<%= link_to "File in '#{AppSetting.instance.git_repository_name}' GitHub repository",
AppSetting.instance.github_base_file_url + Puppetscript.class_file_name(@vm.name) %>
</small>
</div><%# card-header %>
<div class="card-body">
<pre class="mb-0"><%= Puppetscript.name_script @vm.name %></pre>
</div>
</div><%# card %>
</div>
<div class="modal-footer">
<%= link_to "Push to git", push_to_git_request_path(request), method: :post, class: "btn btn-primary" %>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div><%# card %>
<div class="card mt-4">
<div class="card-header">
Generated Name Script
<small>
<%= link_to "File in '#{AppSetting.instance.git_repository_name}' GitHub repository",
AppSetting.instance.github_base_file_url + Puppetscript.class_file_name(@vm.name) %>
</small>
</div><%# card-header %>
<div class="card-body">
<pre class="mb-0"><%= Puppetscript.name_script @vm.name %></pre>
</div>
</div><%# card %>
</div>
<div class="modal-footer">
<%= link_to "Push to git", push_to_git_request_path(request), method: :post, class: "btn btn-primary" %>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
</div>
</div>
</div>
</div>
</div>
<% end %><%# content_for :modals %>
<% end %>

0 comments on commit 2be7e8c

Please sign in to comment.