Skip to content

Commit 1df3769

Browse files
jtreminiojtreminio
committed
Disables non-selected target on start
1 parent cd2d902 commit 1df3769

File tree

8 files changed

+149
-115
lines changed

8 files changed

+149
-115
lines changed

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

+20-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% set providerChosen = (data.target == 'aws') ? true : false %}
2+
{% set dis = providerChosen ? 'disabled' : '' %}
23

34
<div class="section-header hidden">
45
<h1>Amazon Server Details</h1>
@@ -30,6 +31,13 @@
3031
<div class="clearfix"></div>
3132

3233
<div class="hideable {% if not providerChosen %}hidden{% endif %}">
34+
<input type="hidden" id="vagrantfile-aws-vm-box" name="vagrantfile[vm][box]"
35+
value="aws" {{ dis }} />
36+
<input type="hidden" id="vagrantfile-aws-ssh-username" name="vagrantfile[ssh][username]"
37+
value="{{ data.ssh.username }}" {{ dis }} />
38+
<input type="hidden" id="vagrantfile-aws-vm-provider-aws-region" name="vagrantfile[vm][provider][aws][region]"
39+
value="{{ data.vm.provider.aws.region }}" {{ dis }} />
40+
3341
<div class="form-group">
3442
<div class="clearfix"><label>Region &amp; Distro</label></div>
3543

@@ -50,7 +58,7 @@
5058
data-update-vagrantfile-ssh-username="{{ image.ssh_username }}"
5159
data-update-vagrantfile-vm-provider-aws-region="{{ region }}"
5260
name="vagrantfile[vm][provider][aws][ami]"
53-
value="{{ image.ami }}"
61+
value="{{ image.ami }}" {{ dis }}
5462
{% if image.ami == data.vm.provider.aws.ami %}checked{% endif %} />
5563
<span class="content">
5664
<span class="header">
@@ -87,7 +95,7 @@
8795
<label for="vagrantfile-vm-provider-aws-instance_type">Instance Size</label>
8896
<select id="vagrantfile-vm-provider-aws-instance_type"
8997
name="vagrantfile[vm][provider][aws][instance_type]"
90-
class="form-control select-tag">
98+
class="form-control select-tag" {{ dis }}>
9199
{% for type, description in data.available_instance_types %}
92100
<option value="{{ type }}"
93101
{% if type == data.vm.provider.aws.instance_type %}selected{% endif %}>{{ type }} - {{ description }}</option>
@@ -106,7 +114,7 @@
106114
<input type="text" id="vagrantfile-vm-provider-aws-access_key_id"
107115
name="vagrantfile[vm][provider][aws][access_key_id]"
108116
class="form-control" placeholder="EC2 ACCESS KEY ID"
109-
value="{{ data.vm.provider.aws.access_key_id }}" />
117+
value="{{ data.vm.provider.aws.access_key_id }}" {{ dis }} />
110118
</div>
111119

112120
<div class="form-group col-xs-6">
@@ -118,7 +126,7 @@
118126
<input type="text" id="vagrantfile-vm-provider-aws-secret_access_key"
119127
name="vagrantfile[vm][provider][aws][secret_access_key]"
120128
class="form-control" placeholder="EC2 SECRET ACCESS KEY"
121-
value="{{ data.vm.provider.aws.secret_access_key }}" />
129+
value="{{ data.vm.provider.aws.secret_access_key }}" {{ dis }} />
122130
</div>
123131

124132
<div class="clearfix"></div>
@@ -132,7 +140,7 @@
132140
<input type="text" id="vagrantfile-vm-provider-aws-keypair_name"
133141
name="vagrantfile[vm][provider][aws][keypair_name]"
134142
class="form-control" placeholder="EC2 KEY PAIR NAME"
135-
value="{{ data.vm.provider.aws.keypair_name }}" />
143+
value="{{ data.vm.provider.aws.keypair_name }}" {{ dis }} />
136144
</div>
137145

138146
<div class="form-group col-xs-6">
@@ -148,7 +156,7 @@
148156
<input type="text" id="vagrantfile-ssh-private_key_path"
149157
name="vagrantfile[ssh][private_key_path]"
150158
class="form-control" placeholder="~/.ssh/id_rsa"
151-
value="{{ data.ssh.private_key_path }}" />
159+
value="{{ data.ssh.private_key_path }}" {{ dis }} />
152160
</div>
153161

154162
<div class="clearfix"></div>
@@ -161,7 +169,7 @@
161169
<label for="vagrantfile-vm-provider-aws-security_groups">EC2 Security Groups</label>
162170
<select id="vagrantfile-vm-provider-aws-security_groups"
163171
name="vagrantfile[vm][provider][aws][security_groups][]"
164-
multiple class="form-control select-tags-editable">
172+
multiple class="form-control select-tags-editable" {{ dis }}>
165173
{% for group in data.vm.provider.aws.security_groups %}
166174
<option value="{{ group }}" selected>{{ group }}</option>
167175
{% endfor %}
@@ -170,19 +178,15 @@
170178

171179
<div class="clearfix"></div>
172180

173-
{% for synced_folder in data.vm.synced_folder %}
174-
{% include 'PuphpetMainBundle:vagrantfile-aws/sections:synced-folder.html.twig' with {'synced_folder': synced_folder} %}
175-
{% endfor %}
181+
{% if providerChosen %}
182+
{% for synced_folder in data.vm.synced_folder %}
183+
{% include 'PuphpetMainBundle:vagrantfile-aws/sections:synced-folder.html.twig' with {'synced_folder': synced_folder} %}
184+
{% endfor %}
185+
{% endif %}
176186

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

180-
<input type="hidden" id="vagrantfile-aws-vm-box" name="vagrantfile[vm][box]" value="aws" />
181-
<input type="hidden" id="vagrantfile-aws-ssh-username" name="vagrantfile[ssh][username]"
182-
value="{{ data.ssh.username }}" />
183-
<input type="hidden" id="vagrantfile-aws-vm-provider-aws-region" name="vagrantfile[vm][provider][aws][region]"
184-
value="{{ data.vm.provider.aws.region }}" />
185-
186190
<div class="modal fade" id="vagrantfile-aws-modal" tabindex="-1" role="dialog"
187191
aria-labelledby="vagrantfile-aws-modal-label" aria-hidden="true">
188192
<div class="modal-dialog">

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

+17-13
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% set providerChosen = (data.target == 'digitalocean') ? true : false %}
2+
{% set dis = providerChosen ? 'disabled' : '' %}
23

34
<div class="section-header hidden">
45
<h1>Digital Ocean Server Details</h1>
@@ -30,6 +31,9 @@
3031
<div class="clearfix"></div>
3132

3233
<div class="hideable {% if not providerChosen %}hidden{% endif %}">
34+
<input type="hidden" id="vagrantfile-digitalocean-vm-box" name="vagrantfile[vm][box]"
35+
value="digital_ocean" {{ dis }} />
36+
3337
<div class="form-group">
3438
<div class="clearfix"><label>Distro</label></div>
3539

@@ -45,7 +49,7 @@
4549
<label class="col-xs-6 radio-tile">
4650
<input type="radio" class="invisible"
4751
name="vagrantfile[vm][provider][digital_ocean][image]"
48-
value="{{ image.image }}"
52+
value="{{ image.image }}" {{ dis }}
4953
{% if image.image == data.vm.provider.digital_ocean.image %}checked{% endif %} />
5054
<span class="content">
5155
<span class="header">
@@ -74,7 +78,7 @@
7478
<label for="vagrantfile-vm-provider-digital_ocean-size">Server Size</label>
7579
<select id="vagrantfile-vm-provider-digital_ocean-size"
7680
name="vagrantfile[vm][provider][digital_ocean][size]"
77-
class="form-control select-tag">
81+
class="form-control select-tag" {{ dis }}>
7882
{% for size, name in data.available_sizes %}
7983
<option value="{{ size }}"
8084
{% if size == data.vm.provider.digital_ocean.size %}selected{% endif %}>{{ name }}</option>
@@ -92,7 +96,7 @@
9296
<input type="text" id="vagrantfile-vm-hostname"
9397
name="vagrantfile[vm][hostname]"
9498
class="form-control"
95-
value="{{ data.vm.hostname }}" />
99+
value="{{ data.vm.hostname }}" {{ dis }} />
96100
</div>
97101

98102
<div class="form-group col-xs-6">
@@ -102,7 +106,7 @@
102106
<label for="vagrantfile-vm-provider-digital_ocean-region">Datacenter Location</label>
103107
<select id="vagrantfile-vm-provider-digital_ocean-region"
104108
name="vagrantfile[vm][provider][digital_ocean][region]"
105-
class="form-control select-tag">
109+
class="form-control select-tag" {{ dis }}>
106110
{% for key, region in data.available_regions %}
107111
<option value="{{ key }}"
108112
{% if key == data.vm.provider.digital_ocean.region %}selected{% endif %}>{{ region }}</option>
@@ -121,7 +125,7 @@
121125
<input type="text" id="vagrantfile-vm-provider-digital_ocean-token"
122126
name="vagrantfile[vm][provider][digital_ocean][token]"
123127
class="form-control" placeholder="DIGITAL OCEAN TOKEN"
124-
value="{{ data.vm.provider.digital_ocean.token }}" />
128+
value="{{ data.vm.provider.digital_ocean.token }}" {{ dis }} />
125129
</div>
126130

127131
<div class="form-group col-xs-6">
@@ -133,7 +137,7 @@
133137
<input type="text" id="vagrantfile-vm-provider-digital_ocean-ssh_key_name"
134138
name="vagrantfile[vm][provider][digital_ocean][ssh_key_name]"
135139
class="form-control" placeholder="Vagrant"
136-
value="{{ data.vm.provider.digital_ocean.ssh_key_name }}" />
140+
value="{{ data.vm.provider.digital_ocean.ssh_key_name }}" {{ dis }} />
137141
</div>
138142

139143
<div class="clearfix"></div>
@@ -148,7 +152,7 @@
148152
<input type="text" id="vagrantfile-ssh-private_key_path"
149153
name="vagrantfile[ssh][private_key_path]"
150154
class="form-control" placeholder="~/.ssh/id_rsa"
151-
value="{{ data.ssh.private_key_path }}" />
155+
value="{{ data.ssh.private_key_path }}" {{ dis }} />
152156
</div>
153157

154158
<div class="form-group col-xs-6">
@@ -159,20 +163,20 @@
159163
<input type="text" id="vagrantfile-ssh-username"
160164
name="vagrantfile[ssh][username]"
161165
class="form-control"
162-
value="{{ data.ssh.username }}" />
166+
value="{{ data.ssh.username }}" {{ dis }} />
163167
</div>
164168

165169
<div class="clearfix"></div>
166170

167-
{% for synced_folder in data.vm.synced_folder %}
168-
{% include 'PuphpetMainBundle:vagrantfile-digitalocean/sections:synced-folder.html.twig' with {'synced_folder': synced_folder} %}
169-
{% endfor %}
171+
{% if providerChosen %}
172+
{% for synced_folder in data.vm.synced_folder %}
173+
{% include 'PuphpetMainBundle:vagrantfile-digitalocean/sections:synced-folder.html.twig' with {'synced_folder': synced_folder} %}
174+
{% endfor %}
175+
{% endif %}
170176

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

174-
<input type="hidden" id="vagrantfile-digitalocean-vm-box" name="vagrantfile[vm][box]" value="digital_ocean" />
175-
176180
<div class="modal fade" id="vagrantfile-digitalocean-modal" tabindex="-1" role="dialog"
177181
aria-labelledby="vagrantfile-digitalocean-modal-label" aria-hidden="true">
178182
<div class="modal-dialog">

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

+18-15
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% set providerChosen = (data.target == 'gce') ? true : false %}
2+
{% set dis = providerChosen ? 'disabled' : '' %}
23

34
<div class="section-header hidden">
45
<h1>Google Server Details</h1>
@@ -30,6 +31,8 @@
3031
<div class="clearfix"></div>
3132

3233
<div class="hideable {% if not providerChosen %}hidden{% endif %}">
34+
<input type="hidden" id="vagrantfile-gce-vm-box" name="vagrantfile[vm][box]" value="gce" {{ dis }} />
35+
3336
<div class="form-group">
3437
<div class="clearfix"><label>Distro</label></div>
3538

@@ -45,7 +48,7 @@
4548
<label class="col-xs-6 radio-tile">
4649
<input type="radio" class="invisible"
4750
name="vagrantfile[vm][provider][gce][image]"
48-
value="{{ image.image }}"
51+
value="{{ image.image }}" {{ dis }}
4952
{% if image.image == data.vm.provider.gce.image %}checked{% endif %} />
5053
<span class="content">
5154
<span class="header">
@@ -74,7 +77,7 @@
7477
<input type="text" id="vagrantfile-vm-provider-gce-name"
7578
name="vagrantfile[vm][provider][gce][name]"
7679
class="form-control"
77-
value="{{ data.vm.provider.gce.name }}" />
80+
value="{{ data.vm.provider.gce.name }}" {{ dis }} />
7881
</div>
7982

8083
<div class="form-group col-xs-6">
@@ -86,7 +89,7 @@
8689
<label for="vagrantfile-vm-provider-gce-machine_type">Instance Size</label>
8790
<select id="vagrantfile-vm-provider-gce-machine_type"
8891
name="vagrantfile[vm][provider][gce][machine_type]"
89-
class="form-control select-tag">
92+
class="form-control select-tag" {{ dis }}>
9093
{% for type, description in data.available_machine_types %}
9194
<option value="{{ type }}"
9295
{% if type == data.vm.provider.gce.machine_type %}selected{% endif %}>{{ type }} ({{ description }})</option>
@@ -103,7 +106,7 @@
103106
<label for="vagrantfile-vm-provider-gce-zone">Instance Size</label>
104107
<select id="vagrantfile-vm-provider-gce-zone"
105108
name="vagrantfile[vm][provider][gce][zone]"
106-
class="form-control select-tag">
109+
class="form-control select-tag" {{ dis }}>
107110
{% for key, zone in data.available_zones %}
108111
<option value="{{ key }}"
109112
{% if key == data.vm.provider.gce.zone %}selected{% endif %}>{{ zone }}</option>
@@ -119,7 +122,7 @@
119122
<input type="text" id="vagrantfile-vm-provider-gce-client_email"
120123
name="vagrantfile[vm][provider][gce][client_email]"
121124
class="form-control" placeholder="GCE CLIENT EMAIL"
122-
value="{{ data.vm.provider.gce.client_email }}" />
125+
value="{{ data.vm.provider.gce.client_email }}" {{ dis }} />
123126
</div>
124127

125128
<div class="clearfix"></div>
@@ -132,7 +135,7 @@
132135
<input type="text" id="vagrantfile-vm-provider-gce-project_id"
133136
name="vagrantfile[vm][provider][gce][project_id]"
134137
class="form-control" placeholder="GCE PROJECT ID"
135-
value="{{ data.vm.provider.gce.project_id }}" />
138+
value="{{ data.vm.provider.gce.project_id }}" {{ dis }} />
136139
</div>
137140

138141
<div class="form-group col-xs-6">
@@ -143,7 +146,7 @@
143146
<input type="text" id="vagrantfile-vm-provider-gce-key_location"
144147
name="vagrantfile[vm][provider][gce][key_location]"
145148
class="form-control" placeholder="/PATH/TO/PRIVATE_KEY.P12"
146-
value="{{ data.vm.provider.gce.key_location }}" />
149+
value="{{ data.vm.provider.gce.key_location }}" {{ dis }} />
147150
</div>
148151

149152
<div class="clearfix"></div>
@@ -158,7 +161,7 @@
158161
<input type="text" id="vagrantfile-ssh-private_key_path"
159162
name="vagrantfile[ssh][private_key_path]"
160163
class="form-control" placeholder="~/.ssh/id_rsa"
161-
value="{{ data.ssh.private_key_path }}" />
164+
value="{{ data.ssh.private_key_path }}" {{ dis }} />
162165
</div>
163166

164167
<div class="form-group col-xs-6">
@@ -169,7 +172,7 @@
169172
<input type="text" id="vagrantfile-ssh-username"
170173
name="vagrantfile[ssh][username]"
171174
class="form-control"
172-
value="{{ data.ssh.username }}" />
175+
value="{{ data.ssh.username }}" {{ dis }} />
173176
</div>
174177

175178
<div class="clearfix"></div>
@@ -182,20 +185,20 @@
182185
<input type="text" id="vagrantfile-ssh-public_key_path"
183186
name="vagrantfile[ssh][public_key_path]"
184187
class="form-control" placeholder="~/.ssh/id_rsa.pub"
185-
value="{{ data.ssh.public_key_path }}" />
188+
value="{{ data.ssh.public_key_path }}" {{ dis }} />
186189
</div>
187190

188191
<div class="clearfix"></div>
189192

190-
{% for synced_folder in data.vm.synced_folder %}
191-
{% include 'PuphpetMainBundle:vagrantfile-gce/sections:synced-folder.html.twig' with {'synced_folder': synced_folder} %}
192-
{% endfor %}
193+
{% if providerChosen %}
194+
{% for synced_folder in data.vm.synced_folder %}
195+
{% include 'PuphpetMainBundle:vagrantfile-gce/sections:synced-folder.html.twig' with {'synced_folder': synced_folder} %}
196+
{% endfor %}
197+
{% endif %}
193198

194199
<a href="#" data-source-url="{{ path('puphpet.vagrantfile_gce.synced_folder') }}"
195200
class="add-block"><i class="fa fa-level-up fa-rotate-90"></i> Add another shared folder pair</a>
196201

197-
<input type="hidden" id="vagrantfile-gce-vm-box" name="vagrantfile[vm][box]" value="gce" />
198-
199202
<div class="modal fade" id="vagrantfile-gce-modal" tabindex="-1" role="dialog"
200203
aria-labelledby="vagrantfile-gce-modal-label" aria-hidden="true">
201204
<div class="modal-dialog">

0 commit comments

Comments
 (0)