Merge branch 'master' into migration-2.1

Conflicts: app/autoload.php
jaytaph · Oct 24, 2012 · df91a3a · df91a3a
2 parents afef66c + a3fe61b
commit df91a3a
Show file tree

Hide file tree

Showing 10 changed files with 123 additions and 37 deletions.
diff --git a/app/Resources/views/base.html.twig b/app/Resources/views/base.html.twig
@@ -31,6 +31,7 @@
         </script>
     </head>
     <body class="yui3-skin-sam">
+        <a href="https://github.com/protalk/protalk"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://s3.amazonaws.com/github/ribbons/forkme_right_darkblue_121621.png" alt="Fork me on GitHub"></a>
         <div id="panel"></div>
         <div id="headerContainer" class="contentContainer">
             <header>
@@ -67,11 +68,6 @@
         <div class="contentContainer">
             {% block moreContent %}{% endblock %}
         </div>
-
-        <div class="contentContainer">
-           <p id="githubrow"><a href="https://github.com/protalk/protalk"><img id="githubicon" src="{{ asset('images/githubIcon.png') }}" alt="Github Icon"/>Fork us on github!</a></p>
-        </div>
-
 
         <div id="footerStrip">
           <div class="contentContainer">
@@ -80,6 +76,7 @@
                   <div id="followUs">
                   <p>FOLLOW US</p>
                   <nav>
+                      <a href="https://github.com/protalk/"><img src="{{ asset('images/githubIcon.png') }}" alt="Github Icon"/></a>
                       <a href="http://www.facebook.com/pages/ProTalk/216612481777731"><img src="{{ asset('images/facebookIcon.png') }}" alt="Facebook Icon"/></a>
                       <a href="http://twitter.com/pro_talk"><img src="{{ asset('images/twitterIcon.png') }}" alt="Twitter Icon"/></a>
                       <a href="mailto:info@protalk.me"><img src="{{ asset('images/mailIcon.png') }}" alt="Mail Icon"/></a>
@@ -101,4 +98,4 @@
 
     {% block javascripts %}{% endblock %}
     </body>
-</html>
+</html>
diff --git a/app/config/config.yml b/app/config/config.yml
@@ -115,6 +115,11 @@ services:
       tags:
         - { name: sonata.admin, manager_type: orm, group: protalk_media, label: Rating }
       arguments: [null, Protalk\MediaBundle\Entity\Rating, null]
+   protalk.media.admin.page:
+      class: Protalk\AdminBundle\Admin\PageAdmin
+      tags:
+        - { name: sonata.admin, manager_type: orm, group: protalk_media, label: Page }
+      arguments: [null, Protalk\PageBundle\Entity\Page, null]
 
 fos_user:
     db_driver: orm

diff --git a/src/Protalk/AdminBundle/Admin/PageAdmin.php b/src/Protalk/AdminBundle/Admin/PageAdmin.php
@@ -0,0 +1,47 @@
+<?php
+
+/**
+ * ProTalk
+ *
+ * Copyright (c) 2012, Steffan Harries <contact@steffanharries.me.uk>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Protalk\AdminBundle\Admin;
+
+use Sonata\AdminBundle\Admin\Admin;
+use Sonata\AdminBundle\Datagrid\ListMapper;
+use Sonata\AdminBundle\Datagrid\DatagridMapper;
+use Sonata\AdminBundle\Validator\ErrorElement;
+use Sonata\AdminBundle\Form\FormMapper;
+
+class PageAdmin extends Admin
+{
+    protected function configureFormFields(FormMapper $formMapper)
+    {
+        $formMapper->add('url')->add('pageTitle')->add('title')->add('content');
+    }
+
+    protected function configureDatagridFilters(DatagridMapper $datagridMapper)
+    {
+        $datagridMapper->add('pageTitle');
+    }
+
+    protected function configureListFields(ListMapper $listMapper)
+    {
+        $listMapper->addIdentifier('title')->add('url');
+    }
+
+    public function validate(ErrorElement $errorElement, $object)
+    {
+        $errorElement
+            ->with('pageTitle')
+            ->assertMaxLength(array('limit' => 100))
+            ->end()
+            ->with('url')
+            ->assertMaxLength(array('limit' => 100))
+            ->end();
+    }
+}
diff --git a/src/Protalk/AdminBundle/Admin/TagAdmin.php b/src/Protalk/AdminBundle/Admin/TagAdmin.php
@@ -21,21 +21,24 @@ class TagAdmin extends Admin
 {
     protected function configureFormFields(FormMapper $formMapper)
     {
-        $formMapper->add('name');
+        $formMapper->add('name')->add('slug');
     }
 
     protected function configureDatagridFilters(DatagridMapper $datagridMapper)
     {
-        $datagridMapper->add('name');
+        $datagridMapper->add('name')->add('slug');
     }
 
     protected function configureListFields(ListMapper $listMapper)
     {
-        $listMapper->addIdentifier('name');
+        $listMapper->addIdentifier('name')->add('slug');
     }
 
     public function validate(ErrorElement $errorElement, $object)
     {
-        $errorElement->with('name')->assertMaxLength(array('limit' => 50))->end();
+        $errorElement
+        ->with('name')
+        ->assertMaxLength(array('limit' => 50))
+        ->end();
     }
-}
+}
diff --git a/src/Protalk/MediaBundle/Controller/ContributionController.php b/src/Protalk/MediaBundle/Controller/ContributionController.php
@@ -17,6 +17,8 @@
 use Symfony\Component\HttpFoundation\Request;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template;
+use Swift_Message;
+use Swift_Mail;
 
 class ContributionController extends Controller
 {
@@ -38,6 +40,8 @@ public function newAction(Request $request)
                 $em->persist($contribution);
                 $em->flush();
 
+                $this->sendMail($contribution);
+
                 $this->get('session')->setFlash('contribution-notice', 'Thank you! Your contribution has been received.');
 
                 return $this->redirect($this->generateUrl('contribute_new'));
@@ -47,4 +51,14 @@ public function newAction(Request $request)
         return $this->render('ProtalkMediaBundle:Contribution:new.html.twig', array('form' => $form->createView()));
     }
 
+   private function sendMail($contribution)
+   {
+       $message = Swift_Message::newInstance()
+           ->setSubject('ProTalk - You have new contribution from: ' . $contribution->getEmail())
+           ->setFrom('no-reply@protalk.me')
+           ->setTo('info@protalk.me')
+           ->setBody($this->renderView('ProtalkMediaBundle:Contribution:email.txt.twig', array('contribution' => $contribution)))
+       ;
+       $this->get('mailer')->send($message);
+   }
 }
diff --git a/src/Protalk/MediaBundle/Entity/Tag.php b/src/Protalk/MediaBundle/Entity/Tag.php
@@ -136,12 +136,21 @@ public function setSlug($slug)
         $this->slug = $slug;
     }
 
+    /*
+     * Maps to getSlugFields()
+     *
+     * Exists because the backend makes a call to getSlug()
+     * when creating/updating tags.
+     */
+    public function getSlug() {
+        return $this->getSlugFields();
+    }
+
     /*
      * Get slug fields
      *
      * @return string
      */
-
     public function getSlugFields() {
         return $this->getName();
     }
@@ -151,11 +160,10 @@ public function getSlugFields() {
      */
     public function updateSlug()
     {
-
-        $slugger = new Slugger();
+        $slugger = new Slugger(' ', ',');
 
         $slug = $slugger->getSlug($this->getSlugFields());
 
         return $this->setSlug($slug);
     }
-}
+}
diff --git a/src/Protalk/MediaBundle/Resources/views/Contribution/email.txt.twig b/src/Protalk/MediaBundle/Resources/views/Contribution/email.txt.twig
@@ -0,0 +1,13 @@
+The new contribution details:
+
+Id: {{ contribution.id }}
+Category: {{ contribution.category }}
+Name: {{ contribution.name }}
+Email: {{ contribution.email }}
+HostUrl: {{ contribution.hostUrl }}
+HostName: {{ contribution.hostName }}
+Title: {{ contribution.title }}
+SlidesUrl: {{ contribution.slidesUrl }}
+Speaker: {{ contribution.speaker }}
+Description: {{ contribution.description }}
+Tags: {{ contribution.tags }}
diff --git a/src/Protalk/MediaBundle/Resources/views/Home/index.html.twig b/src/Protalk/MediaBundle/Resources/views/Home/index.html.twig
@@ -29,8 +29,17 @@
         </header>
         <p>{{ media.getTruncatedDescription() }}</p>
         <footer>
-            <p><img src="{{ asset('images/binoculars.png') }}" alt="Binoculars Image" /> <span class="metadata">{{ media.visits }} views | </span>
-               <span class="metadata">Rating: {% render "ProtalkMediaBundle:Rating:index" with {'rating' : media.rating } %}</span></p>
+            <p>
+                <img src="{{ asset('images/binoculars.png') }}" alt="Binoculars Image" />
+                <span class="metadata">
+                    {% if media.visits == 1 %}
+                        {{ media.visits }} view
+                    {% else  %}
+                        {{ media.visits }} views
+                    {% endif %}
+                | </span>
+               <span class="metadata">Rating: {% render "ProtalkMediaBundle:Rating:index" with {'rating' : media.rating } %}</span>
+           </p>
         </footer>
     </div>
 </article>
@@ -61,7 +70,16 @@
                         </header>
 
                         <footer>
-                            <p><img src="{{ asset('images/binoculars.png') }}" alt="Binoculars Image"/><span class="metadata"> {{ media.visits }} views</span></p>
+                            <p>
+                               <img src="{{ asset('images/binoculars.png') }}" alt="Binoculars Image"/>
+                               <span class="metadata"> 
+                                   {% if media.visits == 1 %}
+                                       {{ media.visits }} view
+                                   {% else %}
+                                       {{ media.visits }} views
+                                   {% endif %}
+                               </span>
+                            </p>
                         </footer>
                     </div>
                 </article>

diff --git a/web/css/main.css b/web/css/main.css
@@ -1008,23 +1008,4 @@ form ul {
     width:165px;
     left:0;
     margin-bottom:10px;
-}
-
-#githubrow {
-    padding-left: 20px;
-    float: left;
-}
-
-#githubrow a {
-    font-size: 1.3em;
-    color: #3a668b;
-}
-
-#githubrow a:hover {
-    font-size: 1.3em;
-    color: #0096ff;
-}
-
-img#githubicon {
-    float: left;
 }
diff --git a/web/images/githubIcon.png b/web/images/githubIcon.png