Browse Source

Reorder feeds

Jordi Boggiano 12 years ago
parent
commit
28fee6bfc0

+ 2 - 1
src/Packagist/WebBundle/Resources/views/Web/viewPackage.html.twig

@@ -2,9 +2,10 @@
 
 {% block title %}{{ package.name }} - {{ parent() }}{% endblock %}
 
-{% block head_additions %}
+{% block head_feeds %}
     <link rel="alternate" type="application/rss+xml" title="New Releases - {{ package.name }}" href="{{ url('feed_package', {package: package.name, _format: 'rss'}) }}" />
     <link rel="alternate" type="application/rss+xml" title="New Releases - {{ package.vendor }}" href="{{ url('feed_vendor', {vendor: package.vendor, _format: 'rss'}) }}" />
+    {{ parent() }}
 {% endblock %}
 
 {% block scripts %}

+ 2 - 1
src/Packagist/WebBundle/Resources/views/Web/viewVendor.html.twig

@@ -1,7 +1,8 @@
 {% extends "PackagistWebBundle:Web:list.html.twig" %}
 
-{% block head_additions %}
+{% block head_feeds %}
     <link rel="alternate" type="application/rss+xml" title="New Releases - {{ vendor }}" href="{{ url('feed_vendor', {vendor: vendor, _format: 'rss'}) }}" />
+    {{ parent() }}
 {% endblock %}
 
 {% block content_title %}<h1>Packages from {{ vendor }}</h1>{% endblock %}

+ 2 - 0
src/Packagist/WebBundle/Resources/views/layout.html.twig

@@ -20,8 +20,10 @@
         <link rel="stylesheet" href="{{ asset('bundles/packagistweb/css/main.css?v=9') }}" />
         <link rel="stylesheet" href="{{ asset('css/humane/jackedup.css?v=2') }}" />
 
+        {% block head_feeds %}
         <link rel="alternate" type="application/rss+xml" title="Newly Submitted Packages - Packagist" href="{{ url('feed_packages', {_format: 'rss'}) }}" />
         <link rel="alternate" type="application/rss+xml" title="New Releases - Packagist" href="{{ url('feed_releases', {_format: 'rss'}) }}" />
+        {% endblock %}
 
         <link rel="search" type="application/opensearchdescription+xml" href="{{ asset('search.osd') }}" title="Packagist" />