upload to point refactor

rlbaltha · Apr 17, 2015 · 1c5cfce · 1c5cfce
1 parent 34eaf85
commit 1c5cfce
Show file tree

Hide file tree

Showing 25 changed files with 459 additions and 195 deletions.
diff --git a/app/AppKernel.php b/app/AppKernel.php
@@ -22,6 +22,7 @@ public function registerBundles()
             new JMS\SecurityExtraBundle\JMSSecurityExtraBundle(),
             new JMS\DiExtraBundle\JMSDiExtraBundle($this),
             new Vich\UploaderBundle\VichUploaderBundle(),
+            new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new AppBundle\AppBundle(),
         );
 

diff --git a/app/Resources/FOSUserBundle/views/layout.html.twig b/app/Resources/FOSUserBundle/views/layout.html.twig
@@ -25,8 +25,8 @@
 
 
 <body>
-<div class="col-xs-offset-2 col-xs-8" style="margin-top: 20px;">
-    <img src="http://vintageathens.mynmi.net/img/logowhite.png" class="img-responsive" alt="Responsive image">
+<div class="col-xs-offset-2 col-xs-8 col-sm-offset-2 col-sm-8" style="margin-top: 20px;">
+    <img src="http://vintageathens.mynmi.net/img/logowhite.png" class="img-responsive" alt="Vintage Logo Responsive image">
 </div>
 <div class="col-sm-4 col-xs-12 center">
     {% for type, messages in app.session.flashBag.all %}

diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -45,9 +45,8 @@
                     {% if is_granted('ROLE_ADMIN') %}
                         <li><a href="{{ path('location') }}">Locations</a></li>
                     {% endif %}
-                    <li><a href="{{ path('point') }}">Points</a></li>
-                    <li><a href="{{ path('mypoints') }}">My Points</a></li>
-                    <li><a title='Upload' href="{{ path('file_new') }}"><i class="glyphicon glyphicon-upload"></i> Upload</a></li>
+                    <li><a href="{{ path('file') }}">Points</a></li>
+                    <li><a href="{{ path('myuploads') }}">My Points</a></li>
                     <li>
                         <a href="{{ path('fos_user_security_logout') }}">
                             {{ 'layout.logout'|trans({}, 'FOSUserBundle') }}

diff --git a/app/config/config.yml b/app/config/config.yml
@@ -92,6 +92,14 @@ doctrine:
         auto_generate_proxy_classes: "%kernel.debug%"
         auto_mapping: true
 
+# Doctrine extensions
+stof_doctrine_extensions:
+    default_locale: en_US
+    orm:
+        default:
+            timestampable: true
+
+
 # Swiftmailer Configuration
 swiftmailer:
     transport: "%mailer_transport%"

diff --git a/app/config/config_dev.yml b/app/config/config_dev.yml
@@ -44,5 +44,7 @@ monolog:
 assetic:
     use_controller: true
 
-#swiftmailer:
-#    delivery_address: [email protected]
+swiftmailer:
+    transport: "%mailer_transport%"
+    username:  "%mailer_user%"
+    password:  "%mailer_password%"
diff --git a/composer.json b/composer.json
@@ -19,7 +19,7 @@
         "sensio/distribution-bundle": "~3.0,>=3.0.12",
         "sensio/framework-extra-bundle": "~3.0,>=3.0.2",
         "incenteev/composer-parameter-handler": "~2.0",
-        "stof/doctrine-extensions-bundle": "dev-master",
+        "stof/doctrine-extensions-bundle": "~1.1@dev",
         "friendsofsymfony/user-bundle": "~2.0@dev",
         "jms/serializer-bundle": "0.13.*@dev",
         "jms/security-extra-bundle": "dev-master",

diff --git a/composer.lock b/composer.lock