Change banner management

wolfwolker · May 26, 2012 · 1287a9c · 1287a9c
1 parent 8121131
commit 1287a9c
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 297 deletions.
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
@@ -36,3 +36,7 @@ parameters:
     solarium.host: 127.0.0.1
     solarium.port: 8983
     solarium.path: /solr
+
+    banner:
+        text: "Hello|[Edgar]"
+        url: "http://knpbundles.com"
diff --git a/app/config/parameters.yml.test b/app/config/parameters.yml.test
@@ -30,3 +30,7 @@ parameters:
     solarium.host: 127.0.0.1
     solarium.port: 8983
     solarium.path: /solr
+
+    banner:
+        text: "Hello|[World]"
+        url: "http://knpbundles.com"
diff --git a/src/Knp/Bundle/KnpBundlesBundle/Controller/MainController.php b/src/Knp/Bundle/KnpBundlesBundle/Controller/MainController.php
@@ -37,13 +37,13 @@ public function bannerAction()
     {
         $translator = $this->get('translator');
         $maxId = $translator->trans('menu.promo.nb');
-        $id = rand(0, $maxId - 1);
-        $url = $translator->trans('menu.promo.'.$id.'.url');
-        $text = $translator->trans('menu.promo.'.$id.'.text');
+
+        $banner = $this->container->getParameter('banner');
+        $text = $banner['text'];
+        $url = $banner['url'];
 
         return $this->render('KnpBundlesBundle:Main:banner.html.twig', array(
             'url' => $url,
-            'id' => $id,
             'text' => $text,
         ));
     }

diff --git a/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/messages.en.yml b/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/messages.en.yml
@@ -6,24 +6,6 @@ menu:
     evolution: "Evolution"
     addBundleManually: "Register a bundle"
 
-    promo:
-        nb: 5
-        0:
-            text: "Get a [training]| by KnpLabs' ninjas!"
-            url: "http://knplabs.com/training/symfony2"
-        1:
-            text: "Work with [ninja developers]| at KnpLabs!"
-            url: "http://knplabs.com/"
-        2:
-            text: "Get [coding assistance]|from a KnpLabs ninja!"
-            url: "http://knplabs.com/service/symfony-support"
-        3:
-            text: "[Join] the KnpLabs team!|In Nantes/France or remotely."
-            url: "http://knplabs.com/jobs"
-        4:
-            text: "Follow [KnpLabs on Twitter]!"
-            url: "http://twitter.com/knplabs"
-
 search:
     list:
         title: "Search"

diff --git a/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/messages.fr.yml b/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/messages.fr.yml
diff --git a/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/messages.pl.yml b/src/Knp/Bundle/KnpBundlesBundle/Resources/translations/messages.pl.yml
diff --git a/src/Knp/Bundle/KnpBundlesBundle/Resources/views/Main/banner.html.twig b/src/Knp/Bundle/KnpBundlesBundle/Resources/views/Main/banner.html.twig
@@ -1,4 +1,4 @@
-<div id="promo" onclick="_gaq.push(['_trackEvent', 'banner', '{{ id }}', '{{ app.request.locale }}']);">
+<div id="promo" onclick="_gaq.push(['_trackEvent', 'banner');">
     <a class="img" href="{{ url }}"><img src="{{ asset('bundles/knpbundles/images/edgar.png') }}" /></a>
     <div class="bulle">
         {{ text|replace({

diff --git a/src/Knp/Bundle/KnpBundlesBundle/Resources/views/layout.html.twig b/src/Knp/Bundle/KnpBundlesBundle/Resources/views/layout.html.twig
@@ -74,11 +74,11 @@
                     <dt><a href="http://knplabs.com">KnpLabs</a></dt>
                     <dd>
                         <ul>
-                            <li><a href="http://knplabs.com/training/symfony2">Symfony training (World)</a></li>
-                            <li><a href="http://knplabs.fr/formation/symfony2" hreflang="fr" lang="fr">Formation Symfony (France)</a></li>
-                            <li><a href="http://knplabs.co.uk/training/symfony2">Symfony training in London</a></li>
+                            <li><a href="http://knplabs.com/training/symfony2">Symfony training</a> (World)</li>
+                            <li><a href="http://knplabs.fr/formation/symfony2" hreflang="fr" lang="fr">Formation Symfony</a> (France)</li>
+                            <li><a href="http://knpuniversity.com/">Symfony tutorial</a> screencast</li>
 
-                            <li><a href="http://twitter.com/knplabs">Knp on Twitter</a></li>
+                            <li><a href="http://twitter.com/knplabs">KnpLabs on Twitter</a></li>
                             <li><a href="http://behat.org">Behat: BDD framework for PHP</a></li>
                         </ul>
                     </dd>