Skip to content

Commit 9ac1171

Browse files
jtreminiojtreminio
committed
Fixes issue with modal not displaying
1 parent 9a1873b commit 9ac1171

File tree

8 files changed

+554
-570
lines changed

8 files changed

+554
-570
lines changed

‎src/Puphpet/MainBundle/Resources/views/vagrantfile-aws/form.html.twig

+60-62
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
</div>
77

88
<div class="form-group">
9-
<div class="clearfix"><label>Choose Deploy Target</label></div>
10-
119
<label class="col-xs-12 radio-tile">
1210
<input type="radio" name="vagrantfile[target]" value="aws" class="invisible"
1311
{% if providerChosen %}checked{% endif %} />
@@ -19,7 +17,7 @@
1917
<span class="footer">
2018
A new server will be spun up at Amazon.
2119
<a href="#" data-toggle="modal"
22-
data-vm-target="#vagrantfile-aws-modal">Click here for instructions</a>.
20+
data-target="#vagrantfile-aws-modal">Click here for instructions</a>.
2321
</span>
2422
</span>
2523
</label>
@@ -185,68 +183,68 @@
185183

186184
<a href="#" data-source-url="{{ path('puphpet.vagrantfile_aws.synced_folder') }}"
187185
class="add-block"><i class="fa fa-level-up fa-rotate-90"></i> Add another shared folder pair</a>
186+
</div>
188187

189-
<div class="modal fade" id="vagrantfile-aws-modal" tabindex="-1" role="dialog"
190-
aria-labelledby="vagrantfile-aws-modal-label" aria-hidden="true">
191-
<div class="modal-dialog">
192-
<div class="modal-content">
193-
<div class="modal-header">
194-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
195-
aria-hidden="true">&times;</span></button>
196-
<h4 class="modal-title" id="vagrantfile-aws-modal-label">
197-
Instructions for Amazon Deployment
198-
</h4>
199-
</div>
200-
<div class="modal-body">
201-
<h3>AWS EC2 Instance</h3>
202-
203-
<p>
204-
Use Amazon's famously reliable servers for your app!
205-
</p>
206-
207-
<h3>Installation Requirements</h3>
208-
209-
<p>Run the following commands from your host's terminal (not within the VM):</p>
210-
211-
<ul class="nav nav-pills">
212-
<li class="active"><a href="#aws-instructions-mac" data-toggle="pill">Mac</a></li>
213-
<li><a href="#aws-instructions-windows" data-toggle="pill">Windows</a></li>
214-
<li><a href="#aws-instructions-linux" data-toggle="pill">Linux</a></li>
215-
</ul>
216-
217-
<div class="tab-content">
218-
<div class="tab-pane active" id="aws-instructions-mac">
219-
<code class="col-xs-11 inline-instructions">
220-
$ vagrant plugin install vagrant-aws<br />
221-
$ vagrant box add dummy https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box
222-
</code>
223-
</div>
224-
<div class="tab-pane" id="aws-instructions-windows">
225-
<code class="col-xs-11 inline-instructions">
226-
$ vagrant plugin install vagrant-aws<br />
227-
$ vagrant box add dummy https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box
228-
</code>
229-
230-
<div class="clearfix"></div>
231-
232-
<p>
233-
You need rsync installed. Easiest way is to use Cygwin and install it through there.
234-
Alternatively, you can
235-
<a href="https://www.itefix.no/i2/content/cwrsync-free-edition" target="_blank">install rsync separately</a>
236-
and add it to your PATH.
237-
</p>
238-
</div>
239-
<div class="tab-pane" id="aws-instructions-linux">
240-
<code class="col-xs-11 inline-instructions">
241-
$ vagrant plugin install vagrant-aws<br />
242-
$ vagrant box add dummy https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box
243-
</code>
244-
</div>
188+
<div class="modal fade" id="vagrantfile-aws-modal" tabindex="-1" role="dialog"
189+
aria-labelledby="vagrantfile-aws-modal-label" aria-hidden="true">
190+
<div class="modal-dialog">
191+
<div class="modal-content">
192+
<div class="modal-header">
193+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
194+
aria-hidden="true">&times;</span></button>
195+
<h4 class="modal-title" id="vagrantfile-aws-modal-label">
196+
Instructions for Amazon Deployment
197+
</h4>
198+
</div>
199+
<div class="modal-body">
200+
<h3>AWS EC2 Instance</h3>
201+
202+
<p>
203+
Use Amazon's famously reliable servers for your app!
204+
</p>
205+
206+
<h3>Installation Requirements</h3>
207+
208+
<p>Run the following commands from your host's terminal (not within the VM):</p>
209+
210+
<ul class="nav nav-pills">
211+
<li class="active"><a href="#aws-instructions-mac" data-toggle="pill">Mac</a></li>
212+
<li><a href="#aws-instructions-windows" data-toggle="pill">Windows</a></li>
213+
<li><a href="#aws-instructions-linux" data-toggle="pill">Linux</a></li>
214+
</ul>
215+
216+
<div class="tab-content">
217+
<div class="tab-pane active" id="aws-instructions-mac">
218+
<code class="col-xs-11 inline-instructions">
219+
$ vagrant plugin install vagrant-aws<br />
220+
$ vagrant box add dummy https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box
221+
</code>
222+
</div>
223+
<div class="tab-pane" id="aws-instructions-windows">
224+
<code class="col-xs-11 inline-instructions">
225+
$ vagrant plugin install vagrant-aws<br />
226+
$ vagrant box add dummy https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box
227+
</code>
228+
229+
<div class="clearfix"></div>
230+
231+
<p>
232+
You need rsync installed. Easiest way is to use Cygwin and install it through there.
233+
Alternatively, you can
234+
<a href="https://www.itefix.no/i2/content/cwrsync-free-edition" target="_blank">install rsync separately</a>
235+
and add it to your PATH.
236+
</p>
237+
</div>
238+
<div class="tab-pane" id="aws-instructions-linux">
239+
<code class="col-xs-11 inline-instructions">
240+
$ vagrant plugin install vagrant-aws<br />
241+
$ vagrant box add dummy https://github.com/mitchellh/vagrant-aws/raw/master/dummy.box
242+
</code>
245243
</div>
246244
</div>
247-
<div class="modal-footer">
248-
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
249-
</div>
245+
</div>
246+
<div class="modal-footer">
247+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
250248
</div>
251249
</div>
252250
</div>

‎src/Puphpet/MainBundle/Resources/views/vagrantfile-digitalocean/form.html.twig

+83-85
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
</div>
77

88
<div class="form-group">
9-
<div class="clearfix"><label>Choose Deploy Target</label></div>
10-
119
<label class="col-xs-12 radio-tile">
1210
<input type="radio" name="vagrantfile[target]" value="digitalocean" class="invisible"
1311
{% if providerChosen %}checked{% endif %} />
@@ -19,7 +17,7 @@
1917
<span class="footer">
2018
A new server will be spun up at Digital Ocean.
2119
<a href="#" data-toggle="modal"
22-
data-vm-target="#vagrantfile-digitalocean-modal">Click here for instructions</a>.
20+
data-target="#vagrantfile-digitalocean-modal">Click here for instructions</a>.
2321
</span>
2422
</span>
2523
</label>
@@ -175,94 +173,94 @@
175173

176174
<a href="#" data-source-url="{{ path('puphpet.vagrantfile_digitalocean.synced_folder') }}"
177175
class="add-block"><i class="fa fa-level-up fa-rotate-90"></i> Add another shared folder pair</a>
176+
</div>
178177

179-
<div class="modal fade" id="vagrantfile-digitalocean-modal" tabindex="-1" role="dialog"
180-
aria-labelledby="vagrantfile-digitalocean-modal-label" aria-hidden="true">
181-
<div class="modal-dialog">
182-
<div class="modal-content">
183-
<div class="modal-header">
184-
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
185-
aria-hidden="true">&times;</span></button>
186-
<h4 class="modal-title" id="vagrantfile-digitalocean-modal-label">
187-
Instructions for Digital Ocean Deployment
188-
</h4>
189-
</div>
190-
<div class="modal-body">
191-
<h3>Digital Ocean Droplet</h3>
192-
193-
<p>
194-
Don't have a Digital Ocean account?
195-
<a href="https://www.digitalocean.com/?refcode=475274cc0939" target="_blank">Click here to create one</a>
196-
(affiliate link - help support this free service)!
197-
</p>
198-
199-
<p>
200-
Login to Digital Ocean and
201-
<a href="https://www.digitalocean.com/api_access" target="_blank">go to the API page</a>.
202-
You will need a Client ID and API Key.
203-
</p>
204-
205-
<h3>Installation Requirements</h3>
206-
207-
<p>Run the following commands from your host's terminal (not within the VM):</p>
208-
209-
<ul class="nav nav-pills">
210-
<li class="active"><a href="#digital_ocean-instructions-mac" data-toggle="pill">Mac</a></li>
211-
<li><a href="#digital_ocean-instructions-windows" data-toggle="pill">Windows</a></li>
212-
<li><a href="#digital_ocean-instructions-linux" data-toggle="pill">Linux</a></li>
213-
</ul>
214-
215-
<div class="tab-content">
216-
<div class="tab-pane active" id="digital_ocean-instructions-mac">
217-
<code class="col-xs-11 inline-instructions">
218-
$ vagrant plugin install vagrant-digitalocean<br />
219-
$ vagrant box add dummy https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box
220-
</code>
221-
</div>
222-
<div class="tab-pane" id="digital_ocean-instructions-windows">
223-
<code class="col-xs-11 inline-instructions">
224-
$ vagrant plugin install vagrant-digitalocean<br />
225-
$ vagrant box add dummy https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box
226-
</code>
227-
228-
<div class="clearfix"></div>
229-
230-
<p>
231-
You need rsync installed. Easiest way is to use Cygwin and install it through there.
232-
Alternatively, you can
233-
<a href="https://www.itefix.no/i2/content/cwrsync-free-edition" target="_blank">install rsync separately</a>
234-
and add it to your PATH.
235-
</p>
236-
</div>
237-
<div class="tab-pane" id="digital_ocean-instructions-linux">
238-
<code class="col-xs-11 inline-instructions">
239-
$ vagrant plugin install vagrant-digitalocean<br />
240-
$ vagrant box add dummy https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box
241-
</code>
242-
</div>
178+
<div class="modal fade" id="vagrantfile-digitalocean-modal" tabindex="-1" role="dialog"
179+
aria-labelledby="vagrantfile-digitalocean-modal-label" aria-hidden="true">
180+
<div class="modal-dialog">
181+
<div class="modal-content">
182+
<div class="modal-header">
183+
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span
184+
aria-hidden="true">&times;</span></button>
185+
<h4 class="modal-title" id="vagrantfile-digitalocean-modal-label">
186+
Instructions for Digital Ocean Deployment
187+
</h4>
188+
</div>
189+
<div class="modal-body">
190+
<h3>Digital Ocean Droplet</h3>
191+
192+
<p>
193+
Don't have a Digital Ocean account?
194+
<a href="https://www.digitalocean.com/?refcode=475274cc0939" target="_blank">Click here to create one</a>
195+
(affiliate link - help support this free service)!
196+
</p>
197+
198+
<p>
199+
Login to Digital Ocean and
200+
<a href="https://www.digitalocean.com/api_access" target="_blank">go to the API page</a>.
201+
You will need a Client ID and API Key.
202+
</p>
203+
204+
<h3>Installation Requirements</h3>
205+
206+
<p>Run the following commands from your host's terminal (not within the VM):</p>
207+
208+
<ul class="nav nav-pills">
209+
<li class="active"><a href="#digital_ocean-instructions-mac" data-toggle="pill">Mac</a></li>
210+
<li><a href="#digital_ocean-instructions-windows" data-toggle="pill">Windows</a></li>
211+
<li><a href="#digital_ocean-instructions-linux" data-toggle="pill">Linux</a></li>
212+
</ul>
213+
214+
<div class="tab-content">
215+
<div class="tab-pane active" id="digital_ocean-instructions-mac">
216+
<code class="col-xs-11 inline-instructions">
217+
$ vagrant plugin install vagrant-digitalocean<br />
218+
$ vagrant box add dummy https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box
219+
</code>
220+
</div>
221+
<div class="tab-pane" id="digital_ocean-instructions-windows">
222+
<code class="col-xs-11 inline-instructions">
223+
$ vagrant plugin install vagrant-digitalocean<br />
224+
$ vagrant box add dummy https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box
225+
</code>
226+
227+
<div class="clearfix"></div>
228+
229+
<p>
230+
You need rsync installed. Easiest way is to use Cygwin and install it through there.
231+
Alternatively, you can
232+
<a href="https://www.itefix.no/i2/content/cwrsync-free-edition" target="_blank">install rsync separately</a>
233+
and add it to your PATH.
234+
</p>
243235
</div>
236+
<div class="tab-pane" id="digital_ocean-instructions-linux">
237+
<code class="col-xs-11 inline-instructions">
238+
$ vagrant plugin install vagrant-digitalocean<br />
239+
$ vagrant box add dummy https://github.com/smdahlen/vagrant-digitalocean/raw/master/box/digital_ocean.box
240+
</code>
241+
</div>
242+
</div>
244243

245-
<h3>Accessing Your VM</h3>
244+
<h3>Accessing Your VM</h3>
246245

247-
<p>
248-
To access your VM after running <code>$ vagrant up</code>, type
249-
<code>$ vagrant ssh-config</code> to get the IP address assigned to the server you created,
250-
and add the IP address to your computer's hosts file. Type <code>$ vagrant ssh</code> to
251-
be immediately connected via SSH to your new server!
252-
</p>
246+
<p>
247+
To access your VM after running <code>$ vagrant up</code>, type
248+
<code>$ vagrant ssh-config</code> to get the IP address assigned to the server you created,
249+
and add the IP address to your computer's hosts file. Type <code>$ vagrant ssh</code> to
250+
be immediately connected via SSH to your new server!
251+
</p>
253252

254-
<h3 class="text-warning">If you choose CentOS</h3>
253+
<h3 class="text-warning">If you choose CentOS</h3>
255254

256-
<p>
257-
The CentOS images do not ship with <code>rsync</code> installed! The first time you run
258-
<code>$ vagrant up</code> IT WILL ERROR, but this is OK! Simply <code>$ vagrant ssh</code>
259-
and type <code>$ sudo yum install rsync</code>. Once it finished installing, run
260-
<code>$ vagrant provision</code>.
261-
</p>
262-
</div>
263-
<div class="modal-footer">
264-
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
265-
</div>
255+
<p>
256+
The CentOS images do not ship with <code>rsync</code> installed! The first time you run
257+
<code>$ vagrant up</code> IT WILL ERROR, but this is OK! Simply <code>$ vagrant ssh</code>
258+
and type <code>$ sudo yum install rsync</code>. Once it finished installing, run
259+
<code>$ vagrant provision</code>.
260+
</p>
261+
</div>
262+
<div class="modal-footer">
263+
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
266264
</div>
267265
</div>
268266
</div>

0 commit comments

Comments
 (0)