merged branch Tobion/doc-link (PR #4140)

fabpot · fabpot · commit 554e0738223e · 2012-05-11T06:51:34.000+02:00
Commits ------- 709be4b [WDT] added documentation link Discussion ---------- [WDT] added documentation link This adds a documentation link in the WDT for the appropriate branch according to the current symfony version. @weaverryan there is no documentation branch yet for the currently created 2.1 branch. Also it might be a nice feature to redirect the dev branch to master automatically on the website. I.e. `http://symfony.com/doc/2.1/index.html` -> `http://symfony.com/doc/master/index.html` @fabpot It might be a good idea to introduce a `Kernel::BRANCH` constant. So there would be no need to extract the branch from the symfony version in `ConfigDataCollector`. And bumping new versions/branches would be in one place. --------------------------------------------------------------------------- by vicb at 2012-04-27T14:17:07Z Maybe the documentation server should redirect to the right version according to `Kernel::VERSION` (i.e. using rewritting) ? --------------------------------------------------------------------------- by Tobion at 2012-04-27T14:31:49Z That would be best yes. --------------------------------------------------------------------------- by fabpot at 2012-05-10T06:03:45Z FYI, I've added some more constants about the Symfony version: 48099a8 (modeled after PHP constants) --------------------------------------------------------------------------- by fabpot at 2012-05-10T07:08:57Z I've just updated the website to accept any `HttpKernel::VERSION` string. Some redirection examples: * 2.0.12 -> current * 2.0 -> current * 2.0.12-DEV -> current * 2.1 -> master * 2.1.0-DEV -> master --------------------------------------------------------------------------- by Tobion at 2012-05-10T12:49:16Z :thumbsup: for updating the website. But I think you missed to return 404 for a non-existent main doc page. http://symfony.com/doc/2.4/book/controller.html -> 404 as expected http://symfony.com/doc/2.4/index.html -> does not return 404 (and all links there are dead) --------------------------------------------------------------------------- by travisbot at 2012-05-10T15:12:07Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1296057) (merged 04adf361 into a01dec0). --------------------------------------------------------------------------- by fabpot at 2012-05-10T17:21:06Z I've fixed the doc index for non-existing versions. Can you squash your commits before I merge? Thanks. --------------------------------------------------------------------------- by Tobion at 2012-05-10T22:49:18Z done --------------------------------------------------------------------------- by travisbot at 2012-05-10T22:52:13Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1300414) (merged 709be4b into fae4523).
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/config.html.twig
@@ -9,7 +9,12 @@
         </a>
     {% endset %}
     {% set text %}
-        Symfony <b>{{ collector.symfonyversion }}</b>
+        <div class="sf-toolbar-info-piece">
+            Symfony <b>{{ collector.symfonyversion }}</b>
+        </div>
+        <div class="sf-toolbar-info-piece">
+            <a href="http://symfony.com/doc/{{ collector.symfonyversion }}/index.html" rel="help">Documentation</a>
+        </div>
     {% endset %}
     {% include 'WebProfilerBundle:Profiler:toolbar_item.html.twig' with { 'link': false } %}
 
