Moves form templates up one level; Renamed Vagrantfile* templates Vagrantfile; puphpet#1227

Author: jtreminio

src/Puphpet/Extension/ApacheBundle/Controller/FrontController.php

@@ -10,14 +10,14 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionApacheBundle:form:Apache.html.twig', [
+        return $this->render('PuphpetExtensionApacheBundle::form.html.twig', [
             'apache' => $data,
         ]);
     }
 
     public function vhostAction()
     {
-        return $this->render('PuphpetExtensionApacheBundle:form/sections:vhost.html.twig', [
+        return $this->render('PuphpetExtensionApacheBundle:sections:vhost.html.twig', [
             'vhost'             => $this->getData()['empty_vhost'],
             'available_engines' => $this->getData()['available_engines'],
         ]);

src/Puphpet/Extension/ApacheBundle/Resources/views/form/Apache.html.twig renamed to src/Puphpet/Extension/ApacheBundle/Resources/views/form.html.twig

@@ -54,7 +54,7 @@
                 </div>
 
                 {% for vhost in apache.vhosts %}
-                    {% include 'PuphpetExtensionApacheBundle:form/sections:vhost.html.twig' with {'vhost': vhost, 'available_engines': apache.available_engines} %}
+                    {% include 'PuphpetExtensionApacheBundle:sections:vhost.html.twig' with {'vhost': vhost, 'available_engines': apache.available_engines} %}
                 {% endfor %}
 
                 <div class="row">

src/Puphpet/Extension/ApacheBundle/Resources/views/form/sections/vhost.html.twig renamed to src/Puphpet/Extension/ApacheBundle/Resources/views/sections/vhost.html.twig

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionBeanstalkdBundle:form:Beanstalkd.html.twig', [
+        return $this->render('PuphpetExtensionBeanstalkdBundle::form.html.twig', [
             'beanstalkd' => $data,
         ]);
     }

src/Puphpet/Extension/BeanstalkdBundle/Controller/FrontController.php

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionDrushBundle:form:Drush.html.twig', [
+        return $this->render('PuphpetExtensionDrushBundle::form.html.twig', [
             'drush' => $data,
         ]);
     }

src/Puphpet/Extension/BeanstalkdBundle/Resources/views/form/Beanstalkd.html.twig renamed to src/Puphpet/Extension/BeanstalkdBundle/Resources/views/form.html.twig

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionElasticSearchBundle:form:ElasticSearch.html.twig', [
+        return $this->render('PuphpetExtensionElasticSearchBundle::form.html.twig', [
             'elastic_search' => $data,
         ]);
     }

src/Puphpet/Extension/DrushBundle/Controller/FrontController.php

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionFirewallBundle:form:Firewall.html.twig', [
+        return $this->render('PuphpetExtensionFirewallBundle::form.html.twig', [
             'firewall' => $data,
             'extra'    => $extra,
         ]);
@@ -21,7 +21,7 @@ public function ruleAction()
         $config = $this->get('puphpet.extension.firewall.configure');
         $data   = $config->getData();
 
-        return $this->render('PuphpetExtensionFirewallBundle:form/sections:Rule.html.twig', [
+        return $this->render('PuphpetExtensionFirewallBundle:sections:Rule.html.twig', [
             'rule' => $data['empty_rule'],
         ]);
     }

src/Puphpet/Extension/DrushBundle/Resources/views/form/Drush.html.twig renamed to src/Puphpet/Extension/DrushBundle/Resources/views/form.html.twig

@@ -22,7 +22,7 @@
                 <input type="hidden" id="firewall-install" name="firewall[install]" value="1" />
 
                 {% for rule in firewall.rules %}
-                    {% include 'PuphpetExtensionFirewallBundle:form/sections:Rule.html.twig' with {'rule': rule} %}
+                    {% include 'PuphpetExtensionFirewallBundle:sections:Rule.html.twig' with {'rule': rule} %}
                 {% endfor %}
 
                 <div class="row">

src/Puphpet/Extension/ElasticSearchBundle/Controller/FrontController.php

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionHhvmBundle:form:Hhvm.html.twig', [
+        return $this->render('PuphpetExtensionHhvmBundle::form.html.twig', [
             'hhvm' => $data,
         ]);
     }

src/Puphpet/Extension/ElasticSearchBundle/Resources/views/form/ElasticSearch.html.twig renamed to src/Puphpet/Extension/ElasticSearchBundle/Resources/views/form.html.twig

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionMailCatcherBundle:form:MailCatcher.html.twig', [
+        return $this->render('PuphpetExtensionMailCatcherBundle::form.html.twig', [
             'mailcatcher' => $data,
         ]);
     }

src/Puphpet/Extension/FirewallBundle/Controller/FrontController.php

@@ -10,14 +10,14 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionMariaDbBundle:form:MariaDb.html.twig', [
+        return $this->render('PuphpetExtensionMariaDbBundle::form.html.twig', [
             'mariadb' => $data,
         ]);
     }
 
     public function addDatabaseAction()
     {
-        return $this->render('PuphpetExtensionMariaDbBundle:form/sections:NewUserAndDatabase.html.twig', [
+        return $this->render('PuphpetExtensionMariaDbBundle:sections:NewUserAndDatabase.html.twig', [
             'available_privileges' => $this->getData()['available_privileges'],
             'database'             => $this->getData()['empty_database'],
         ]);

src/Puphpet/Extension/FirewallBundle/Resources/views/form/Firewall.html.twig renamed to src/Puphpet/Extension/FirewallBundle/Resources/views/form.html.twig

@@ -99,7 +99,7 @@
                 </div>
 
                 {% for database in mariadb.databases %}
-                    {% include 'PuphpetExtensionMariaDbBundle:form/sections:NewUserAndDatabase.html.twig'
+                    {% include 'PuphpetExtensionMariaDbBundle:sections:NewUserAndDatabase.html.twig'
                         with {'available_privileges': mariadb.available_privileges, 'database': database} %}
                 {% endfor %}
 

src/Puphpet/Extension/FirewallBundle/Resources/views/form/sections/Rule.html.twig renamed to src/Puphpet/Extension/FirewallBundle/Resources/views/sections/Rule.html.twig

@@ -10,14 +10,14 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionMongoDbBundle:form:MongoDb.html.twig', [
+        return $this->render('PuphpetExtensionMongoDbBundle::form.html.twig', [
             'mongodb' => $data,
         ]);
     }
 
     public function addDatabaseAction()
     {
-        return $this->render('PuphpetExtensionMongoDbBundle:form/sections:NewUserAndDatabase.html.twig', [
+        return $this->render('PuphpetExtensionMongoDbBundle:sections:NewUserAndDatabase.html.twig', [
             'database' => $this->getData()['empty_database'],
         ]);
     }

src/Puphpet/Extension/HhvmBundle/Controller/FrontController.php

@@ -38,7 +38,7 @@
                 </div>
 
                 {% for database in mongodb.databases %}
-                    {% include 'PuphpetExtensionMongoDbBundle:form/sections:NewUserAndDatabase.html.twig'
+                    {% include 'PuphpetExtensionMongoDbBundle:sections:NewUserAndDatabase.html.twig'
                         with {'database': database} %}
                 {% endfor %}
 

src/Puphpet/Extension/HhvmBundle/Resources/views/form/Hhvm.html.twig renamed to src/Puphpet/Extension/HhvmBundle/Resources/views/form.html.twig

@@ -10,14 +10,14 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionMysqlBundle:form:Mysql.html.twig', [
+        return $this->render('PuphpetExtensionMysqlBundle::form.html.twig', [
             'mysql' => $data,
         ]);
     }
 
     public function addDatabaseAction()
     {
-        return $this->render('PuphpetExtensionMysqlBundle:form/sections:NewUserAndDatabase.html.twig', [
+        return $this->render('PuphpetExtensionMysqlBundle:sections:NewUserAndDatabase.html.twig', [
             'available_privileges' => $this->getData()['available_privileges'],
             'database'             => $this->getData()['empty_database'],
         ]);

src/Puphpet/Extension/MailCatcherBundle/Controller/FrontController.php

@@ -86,7 +86,7 @@
                 </div>
 
                 {% for database in mysql.databases %}
-                    {% include 'PuphpetExtensionMysqlBundle:form/sections:NewUserAndDatabase.html.twig'
+                    {% include 'PuphpetExtensionMysqlBundle:sections:NewUserAndDatabase.html.twig'
                         with {'available_privileges': mysql.available_privileges, 'database': database} %}
                 {% endfor %}
 

src/Puphpet/Extension/MailCatcherBundle/Resources/views/form/MailCatcher.html.twig renamed to src/Puphpet/Extension/MailCatcherBundle/Resources/views/form.html.twig

@@ -10,14 +10,14 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionNginxBundle:form:Nginx.html.twig', [
+        return $this->render('PuphpetExtensionNginxBundle::form.html.twig', [
             'nginx' => $data,
         ]);
     }
 
     public function vhostAction()
     {
-        return $this->render('PuphpetExtensionNginxBundle:form/sections:vhost.html.twig', [
+        return $this->render('PuphpetExtensionNginxBundle:sections:vhost.html.twig', [
             'vhost'             => $this->getData()['empty_vhost'],
             'available_engines' => $this->getData()['available_engines'],
         ]);

src/Puphpet/Extension/MariaDbBundle/Controller/FrontController.php

@@ -54,7 +54,7 @@
                 </div>
 
                 {% for vhost in nginx.vhosts %}
-                    {% include 'PuphpetExtensionNginxBundle:form/sections:vhost.html.twig' with {'vhost': vhost, 'available_engines': nginx.available_engines} %}
+                    {% include 'PuphpetExtensionNginxBundle:sections:vhost.html.twig' with {'vhost': vhost, 'available_engines': nginx.available_engines} %}
                 {% endfor %}
 
                 <div class="row">

src/Puphpet/Extension/MariaDbBundle/Resources/views/form/MariaDb.html.twig renamed to src/Puphpet/Extension/MariaDbBundle/Resources/views/form.html.twig

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionNodeJsBundle:form:NodeJs.html.twig', [
+        return $this->render('PuphpetExtensionNodeJsBundle::form.html.twig', [
             'nodejs' => $data,
             'extra'  => $extra,
         ]);

src/Puphpet/Extension/MariaDbBundle/Resources/views/form/sections/NewUserAndDatabase.html.twig renamed to src/Puphpet/Extension/MariaDbBundle/Resources/views/sections/NewUserAndDatabase.html.twig

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionPhpBundle:form:Php.html.twig', [
+        return $this->render('PuphpetExtensionPhpBundle::form.html.twig', [
             'php'   => $data,
             'extra' => $extra,
         ]);

src/Puphpet/Extension/MongoDbBundle/Controller/FrontController.php

@@ -10,14 +10,14 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionPostgresqlBundle:form:Postgresql.html.twig', [
+        return $this->render('PuphpetExtensionPostgresqlBundle::form.html.twig', [
             'postgresql' => $data,
         ]);
     }
 
     public function addDatabaseAction()
     {
-        return $this->render('PuphpetExtensionPostgresqlBundle:form/sections:NewUserAndDatabase.html.twig', [
+        return $this->render('PuphpetExtensionPostgresqlBundle:sections:NewUserAndDatabase.html.twig', [
             'available_privileges' => $this->getData()['available_privileges'],
             'database'             => $this->getData()['empty_database'],
         ]);

src/Puphpet/Extension/MongoDbBundle/Resources/views/form/MongoDb.html.twig renamed to src/Puphpet/Extension/MongoDbBundle/Resources/views/form.html.twig

@@ -82,7 +82,7 @@
                 </div>
 
                 {% for database in postgresql.databases %}
-                    {% include 'PuphpetExtensionPostgresqlBundle:form/sections:NewUserAndDatabase.html.twig'
+                    {% include 'PuphpetExtensionPostgresqlBundle:sections:NewUserAndDatabase.html.twig'
                         with {'available_privileges': postgresql.available_privileges, 'database': database} %}
                 {% endfor %}
 

src/Puphpet/Extension/MongoDbBundle/Resources/views/form/sections/NewUserAndDatabase.html.twig renamed to src/Puphpet/Extension/MongoDbBundle/Resources/views/sections/NewUserAndDatabase.html.twig

@@ -10,15 +10,15 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionPythonBundle:form:Python.html.twig', [
+        return $this->render('PuphpetExtensionPythonBundle::form.html.twig', [
             'python' => $data,
             'extra'  => $extra,
         ]);
     }
 
     public function addVersionAction()
     {
-        return $this->render('PuphpetExtensionPythonBundle:form/sections:Version.html.twig', [
+        return $this->render('PuphpetExtensionPythonBundle:sections:Version.html.twig', [
             'selected_version'   => $this->getData()['empty_version'],
             'available_versions' => $this->getData()['available_versions'],
         ]);

src/Puphpet/Extension/MysqlBundle/Controller/FrontController.php

@@ -50,7 +50,7 @@
                 </div>
 
                 {% for selected_version in python.versions %}
-                    {% include 'PuphpetExtensionPythonBundle:form/sections:Version.html.twig'
+                    {% include 'PuphpetExtensionPythonBundle:sections:Version.html.twig'
                         with {'available_versions': python.available_versions, 'selected_version': selected_version} %}
                 {% endfor %}
 

src/Puphpet/Extension/MysqlBundle/Resources/views/form/Mysql.html.twig renamed to src/Puphpet/Extension/MysqlBundle/Resources/views/form.html.twig

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionRabbitMQBundle:form:RabbitMQ.html.twig', [
+        return $this->render('PuphpetExtensionRabbitMQBundle::form.html.twig', [
             'rabbitmq' => $data,
         ]);
     }

src/Puphpet/Extension/MysqlBundle/Resources/views/form/sections/NewUserAndDatabase.html.twig renamed to src/Puphpet/Extension/MysqlBundle/Resources/views/sections/NewUserAndDatabase.html.twig

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionRedisBundle:form:Redis.html.twig', [
+        return $this->render('PuphpetExtensionRedisBundle::form.html.twig', [
             'redis' => $data,
         ]);
     }

src/Puphpet/Extension/NginxBundle/Controller/FrontController.php

@@ -10,15 +10,15 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionRubyBundle:form:Ruby.html.twig', [
+        return $this->render('PuphpetExtensionRubyBundle::form.html.twig', [
             'ruby'   => $data,
             'extra' => $extra,
         ]);
     }
 
     public function addVersionAction()
     {
-        return $this->render('PuphpetExtensionRubyBundle:form/sections:Version.html.twig', [
+        return $this->render('PuphpetExtensionRubyBundle:sections:Version.html.twig', [
             'selected_version'   => $this->getData()['empty_version'],
             'available_versions' => $this->getData()['available_versions'],
         ]);

src/Puphpet/Extension/NginxBundle/Resources/views/form/Nginx.html.twig renamed to src/Puphpet/Extension/NginxBundle/Resources/views/form.html.twig

@@ -24,7 +24,7 @@
                 </div>
 
                 {% for selected_version in ruby.versions %}
-                    {% include 'PuphpetExtensionRubyBundle:form/sections:Version.html.twig'
+                    {% include 'PuphpetExtensionRubyBundle:sections:Version.html.twig'
                         with {'available_versions': ruby.available_versions, 'selected_version': selected_version} %}
                 {% endfor %}
 

src/Puphpet/Extension/NginxBundle/Resources/views/form/sections/vhost.html.twig renamed to src/Puphpet/Extension/NginxBundle/Resources/views/sections/vhost.html.twig

@@ -10,7 +10,7 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionServerBundle:form:Server.html.twig', [
+        return $this->render('PuphpetExtensionServerBundle::form.html.twig', [
             'server' => $data,
             'extra'  => $extra,
         ]);

src/Puphpet/Extension/NodeJsBundle/Controller/FrontController.php

@@ -10,14 +10,14 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionSqliteBundle:form:Sqlite.html.twig', [
+        return $this->render('PuphpetExtensionSqliteBundle::form.html.twig', [
             'sqlite' => $data,
         ]);
     }
 
     public function addDatabaseAction()
     {
-        return $this->render('PuphpetExtensionSqliteBundle:form/sections:OwnerAndDatabase.html.twig', [
+        return $this->render('PuphpetExtensionSqliteBundle:sections:OwnerAndDatabase.html.twig', [
             'database' => $this->getData()['empty_database'],
         ]);
     }

src/Puphpet/Extension/NodeJsBundle/Resources/views/form/NodeJs.html.twig renamed to src/Puphpet/Extension/NodeJsBundle/Resources/views/form.html.twig

@@ -54,7 +54,7 @@
                 </div>
 
                 {% for database in sqlite.databases %}
-                    {% include 'PuphpetExtensionSqliteBundle:form/sections:OwnerAndDatabase.html.twig'
+                    {% include 'PuphpetExtensionSqliteBundle:sections:OwnerAndDatabase.html.twig'
                         with {'available_privileges': sqlite.available_privileges, 'database': database} %}
                 {% endfor %}
 

src/Puphpet/Extension/PhpBundle/Controller/FrontController.php

@@ -10,14 +10,14 @@ class FrontController extends Controller implements Extension\ControllerInterfac
 {
     public function indexAction(array $data, $extra = '')
     {
-        return $this->render('PuphpetExtensionVagrantfileAwsBundle:form:VagrantfileAws.html.twig', [
+        return $this->render('PuphpetExtensionVagrantfileAwsBundle::form.html.twig', [
             'data' => $data,
         ]);
     }
 
     public function syncedFolderAction()
     {
-        return $this->render('PuphpetExtensionVagrantfileAwsBundle:form/sections:SyncedFolder.html.twig', [
+        return $this->render('PuphpetExtensionVagrantfileAwsBundle:sections:SyncedFolder.html.twig', [
             'synced_folder' => $this->getData()['empty_synced_folder'],
         ]);
     }

src/Puphpet/Extension/PhpBundle/Resources/views/form/Php.html.twig renamed to src/Puphpet/Extension/PhpBundle/Resources/views/form.html.twig

@@ -7,7 +7,7 @@
 <div class="row">
     <div class="col-xs-12">
         <div class="panel panel-default">
-            {% include 'PuphpetExtensionVagrantfileAwsBundle:form/sections:Instructions.html.twig' %}
+            {% include 'PuphpetExtensionVagrantfileAwsBundle:sections:Instructions.html.twig' %}
 
             <div class="panel-heading">
                 <h3 class="panel-title">AWS EC2 Instance Details</h3>
@@ -148,7 +148,7 @@
             </div>
 
             {% for synced_folder in data.vm.synced_folder %}
-                {% include 'PuphpetExtensionVagrantfileAwsBundle:form/sections:SyncedFolder.html.twig' with {'synced_folder': synced_folder} %}
+                {% include 'PuphpetExtensionVagrantfileAwsBundle:sections:SyncedFolder.html.twig' with {'synced_folder': synced_folder} %}
             {% endfor %}
 
             <div class="row">