Fix redesign issues

src/Packagist/WebBundle/Resources/views/Web/explore.html.twig

@@ -4,50 +4,6 @@
 
 {% set showSearchDesc = 'none' %}
 
-{% macro list() %}
-<ul class="list-unstyled">
-    <li>
-        <a>vespakoen/menu <strong>2.0.4</strong></a>
-        Managing menu's the easy way.
-    </li>
-    <li>
-        <a>vnenkpet/nette-box <strong>1.2.2</strong></a>
-        This sandbox is a pre-packaged Nette Fra...
-    </li>
-    <li>
-        <a>pklink/hahns <strong>0.3.0</strong></a>
-        micro framework for PHP 5.4+
-    </li>
-    <li>
-        <a>vnenkpet/nette-box <strong>1.2.0</strong></a>
-        This sandbox is a pre-packaged Nette Fra...
-    </li>
-    <li>
-        <a>endroid/google-analytics-bundle <strong>1.0.2</strong></a>
-        Endroid Google Analytics for Symfony
-    </li>
-    <li>
-        <a>pklink/hahns <strong>0.2.3</strong></a>
-        micro framework for PHP 5.4+
-    </li>
-    <li>
-        <a>guimdev/bdd</a>
-        BdD is php class for easy use PDO with o...
-    </li>
-    <li>
-        <a>pklink/hahns</a>
-        micro framework for PHP 5.4+
-    </li>
-    <li>
-        <a>ginger/ginger <strong>v1.0.3</strong></a>
-    </li>
-    <li>
-        <a>asper/cakephp-enum-behavior <strong>1.0</strong></a>
-        Introduces an alternative way to support...
-    </li>
-</ul>
-{% endmacro %}
-
 {% block content %}
     {% block content_title %}<h2 class="title">Packages</h2>{% endblock %}
     {% block lists %}
@@ -55,34 +11,26 @@
         <section class="packages-short col-lg-6">
             <h3>New Releases <a href="{{ url('feed_releases', {_format: 'rss'}) }}">RSS</a></h3>
 
-            {{ _self.list() }}
-
             {{ macros.listPackagesShort(newlyReleased, true) }}
         </section>
 
         <section class="packages-short col-lg-6">
             <h3>New Packages <a href="{{ url('feed_packages', {_format: 'rss'}) }}">RSS</a></h3>
 
-            {{ _self.list() }}
-
             {{ macros.listPackagesShort(newlySubmitted) }}
         </section>
 
         <section class="packages-short col-lg-6">
             <h3>Popular Packages</h3>
 
-            {{ _self.list() }}
-
             {{ macros.listPackagesShort(popular, false, true) }}
         </section>
 
         <section class="packages-short col-lg-6">
             <h3>Random Packages</h3>
 
-            {{ _self.list() }}
-
             {{ macros.listPackagesShort(random) }}
         </section>
     </section>
     {% endblock %}
-{% endblock %}
+{% endblock %}

src/Packagist/WebBundle/Resources/views/Web/searchSection.html.twig

@@ -1,6 +1,6 @@
 <section class="wrapper wrapper-blue">
     <div class="container">
-        {% include "PackagistWebBundle:Web:searchForm.html.twig" %}
+        {{ render(controller('PackagistWebBundle:Web:searchForm', { req: app.request })) }}
 
         {%- if showSearchDesc == 'show' %}
         <div class="row">
@@ -11,4 +11,4 @@
         </div>
         {%- endif %}
     </div>
-</section>
+</section>

src/Packagist/WebBundle/Resources/views/macros.html.twig

@@ -43,11 +43,11 @@
     <ul class="list-unstyled">
         {% for package in packages %}
             <li>
-                <a href="{{ path('view_package', {'name' : package.name }) }}">{{ package.name }}{% if showVersion is defined %} <strong>{{ package.version }}</strong>{% endif %}</a>
+                <a href="{{ path('view_package', {'name' : package.name }) }}">{{ package.name }}{% if showVersion is defined and showVersion %}<strong>{{ package.version }}</strong>{% endif %}</a>
                 {{ package.description|truncate(60) }}
             </li>
         {% endfor %}
-        {% if showMoreUrl is defined %}
+        {% if showMoreUrl is defined and showMoreUrl %}
             <li><a href="{{ path('browse_popular') }}"><strong>See more...</strong></a></li>
         {% endif %}
     </ul>