Merge pull request nelmio#44 from willdurand/fix-42

Dump all assets in order to correctly render the generated HTML page, ev...
asm89 · Jul 18, 2012 · 9e37388 · 9e37388
2 parents e715267 + 208d25f
commit 9e37388
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/Formatter/HtmlFormatter.php b/Formatter/HtmlFormatter.php
@@ -86,6 +86,7 @@ private function getGlobalVars()
             'sandboxTarget' => $this->sandboxTarget,
             'date'          => date(DATE_RFC822),
             'css'           => file_get_contents(__DIR__ . '/../Resources/public/css/screen.css'),
+            'js'            => file_get_contents(__DIR__ . '/../Resources/public/js/all.js'),
         );
     }
 }
diff --git a/Resources/public/css/screen.css b/Resources/public/css/screen.css
@@ -1,3 +1,5 @@
+@font-face{font-family:'Droid Sans';font-style:normal;font-weight:400;src:local('Droid Sans'),local('DroidSans'),url(http://themes.googleusercontent.com/static/fonts/droidsans/v3/s-BiyweUPV0v-yRb-cjciL3hpw3pgy2gAi-Ip7WPMi0.woff) format('woff')}@font-face{font-family:'Droid Sans';font-style:normal;font-weight:700;src:local('Droid Sans Bold'),local('DroidSans-Bold'),url(http://themes.googleusercontent.com/static/fonts/droidsans/v3/EFpQQyG9GqCrobXxL-KRMXbFhgvWbfSbdVg11QabG8w.woff) format('woff')}.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{padding:2px;border:1px solid #888}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee}
+
 html, body, div, span, applet, object, iframe,
 h1, h2, h3, h4, h5, h6, p, blockquote, pre,
 a, abbr, acronym, address, big, cite, code,

diff --git a/Resources/public/js/all.js b/Resources/public/js/all.js
diff --git a/Resources/views/layout.html.twig b/Resources/views/layout.html.twig
@@ -5,13 +5,12 @@
         <!-- Always force latest IE rendering engine (even in intranet) and Chrome Frame -->
         <meta content="IE=edge,chrome=1" http-equiv="X-UA-Compatible" />
         <title>{{ apiName }}</title>
-        <link href="http://fonts.googleapis.com/css?family=Droid+Sans:400,700" rel="stylesheet" type="text/css" />
-        <link href="http://google-code-prettify.googlecode.com/svn/trunk/src/prettify.css" rel="stylesheet" type="text/css"></script>
         <style type="text/css">
             {{ css|raw }}
         </style>
-        <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js" type="text/javascript"></script>
-        <script src="http://google-code-prettify.googlecode.com/svn/trunk/src/prettify.js" type="text/javascript"></script>
+        <script type="text/javascript">
+            {{ js|raw }}
+        </script>
     </head>
     <body>
         <div id="header">