Merge pull request #809 from dunglas/branding

dunglas · web-flow · commit 411465292f3e · 2016-10-19T15:06:21.000+02:00
Add the API Platform logo to the doc's header
diff --git a/src/Bridge/Symfony/Bundle/Resources/public/logo-header.svg b/src/Bridge/Symfony/Bundle/Resources/public/logo-header.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Calque_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 1200 322.6" style="enable-background:new 0 0 1200 322.6;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#85CCD3;}
+	.st1{fill:#1B939E;}
+	.st2{stroke:#000000;stroke-width:1.7498;stroke-miterlimit:10;}
+	.st3{stroke:#000000;stroke-width:1.5918;stroke-miterlimit:10;}
+	.st4{stroke:#000000;stroke-width:1.2967;stroke-miterlimit:10;}
+	.st5{fill:#FFFFFF;}
+	.st6{fill:none;stroke:#000000;stroke-width:3.3286;stroke-miterlimit:10;}
+	.st7{fill:#3CAAB5;stroke:#000000;stroke-width:2.4579;stroke-miterlimit:10;}
+	.st8{fill:#FFFFFF;stroke:#000000;stroke-width:2.2191;stroke-miterlimit:10;}
+	.st9{fill:#9D9D9C;}
+	.st10{stroke:#000000;stroke-width:2.4031;stroke-miterlimit:10;}
+	.st11{stroke:#000000;stroke-width:2.1861;stroke-miterlimit:10;}
+	.st12{stroke:#000000;stroke-width:1.7808;stroke-miterlimit:10;}
+	.st13{fill:none;stroke:#000000;stroke-width:4.5713;stroke-miterlimit:10;}
+	.st14{fill:#3CAAB5;stroke:#000000;stroke-width:3.3756;stroke-miterlimit:10;}
+	.st15{fill:#FFFFFF;stroke:#000000;stroke-width:3.0476;stroke-miterlimit:10;}
+	.st16{fill:#B2B2B2;}
+	.st17{fill:#706F6F;}
+</style>
+<path class="st0" d="M420.5,121.1l15.8,12.9c4.6,3.9,7.1,7,7.5,12.9v45.8c0,5.8-4.6,10.4-10.4,10.4c-5.9,0-10.6-4.6-10.6-10.4v-10.3
+	l-21-19.5v29.8c0,5.8-4.7,10.4-10.5,10.4c-5.8,0-10.6-4.6-10.6-10.4V147c0.5-5.9,3.3-9.1,7.7-12.9l15.5-12.9
+	C410,116.3,414.5,116,420.5,121.1z M422.8,161.5v-22h-21v22H422.8z"/>
+<path class="st0" d="M475.4,181.8V192c0,5.9-4.4,10.8-10.3,10.8c-5.8,0-10.6-4.8-10.6-10.8c0-18.7,0-37.5,0-56.2
+	c0-9.8,8.1-17.9,17.9-17.9c5.7,0,10.3,0,16.1,0c4.8,0,9,1.7,12.5,5l11.6,11.6c7.6,7.3,6.3,25.2-1.1,32.3l-10.5,10
+	c-3.5,3.5-7.6,5.1-12.5,5.1H475.4z M495.7,160.7V139l-20.1-0.2v21.9H495.7z"/>
+<path class="st0" d="M617.2,181.8V192c0,5.9-4.4,10.8-10.3,10.8c-5.8,0-10.6-4.8-10.6-10.8c0-18.7,0-37.5,0-56.2
+	c0-9.8,8.1-17.9,17.9-17.9c5.7,0,10.3,0,16.1,0c4.8,0,9,1.7,12.5,5l11.6,11.6c7.6,7.3,6.3,25.2-1.1,32.3l-10.5,10
+	c-3.5,3.5-7.6,5.1-12.5,5.1H617.2z M637.5,160.7V139l-20.1-0.2v21.9H637.5z"/>
+<path class="st0" d="M666,184.6c0-18.7,0-37.5,0-56.5c0-5.7,5-10.4,10.6-10.4c6,0,10.8,4.7,10.8,10.4v53.7c10.6,0,7.6-0.2,18.1-0.2
+	c13.9,0,13.9,21.3,0,21.3c-9.6,0-15.2,0-21.2,0C674.4,202.9,666,194.7,666,184.6z"/>
+<path class="st0" d="M761.9,121.1l15.8,12.9c4.6,3.9,7.1,7,7.5,12.9v45.8c0,5.8-4.6,10.4-10.4,10.4c-5.9,0-10.6-4.6-10.6-10.4v-10.3
+	l-21-19.5v29.8c0,5.8-4.7,10.4-10.5,10.4c-5.8,0-10.6-4.6-10.6-10.4V147c0.5-5.9,3.3-9.1,7.7-12.9l15.5-12.9
+	C751.4,116.3,755.9,116,761.9,121.1z M764.2,161.5v-22h-21v22H764.2z"/>
+<path class="st0" d="M835.9,117.7c13.7,0,13.7,21,0,21c-10.5,0,1.5,0-9.1,0c0,17.8,0,36,0,53.6c0,14.3-21.2,14.3-21.2,0
+	c0-17.5,0-35.8,0-53.6c-10.5,0,1.5,0-9.1,0c-13.8,0-13.8-21,0-21C809.7,117.7,822.7,117.7,835.9,117.7z"/>
+<path class="st0" d="M873.6,138.9c0,3.9,0,10.4,0,14c8,0,11,0,19,0c5.7,0,10.5,4.7,10.5,10.5c0,5.7-4.8,10.6-10.8,10.6
+	c-7.7,0-10.8,0-18.7,0c0,7.1,0,11.4,0,18.5c0,13.8-21.2,13.8-21.2,0c0-19,0-38.1,0-57c0-9.9,8-17.9,17.8-17.9c11.7,0,15.4,0,27,0
+	c5.9,0,10.6,4.7,10.6,10.4c0,5.8-5,10.8-10.6,10.8H873.6z"/>
+<path class="st0" d="M932,118.1h24.2c9.6,0,17.9,7.9,17.9,17.9v48.6c0,8.7-8.3,17.9-17.3,17.9h-25.3c-9,0-17.9-9.2-17.9-17.9V136
+	C913.6,125.5,922.3,118.1,932,118.1z M952.9,139.3h-18.1v42.3h18.1V139.3z"/>
+<path class="st0" d="M1034,168.1c7.5,4.6,10.2,10.4,10.2,18v6.2c0,5.8-4.7,10.5-10.3,10.5c-5.9,0-10.4-5-10.4-10.5v-5.9l-20.7-25.2
+	c0,13.1,0,18,0,31.1c0,5.8-4.6,10.5-10.4,10.5c-5.9,0-10.6-4.7-10.6-10.5c0-21.2,0-42.6,0-63.7c0-5.9,4.7-10.6,10.6-10.6
+	c7.9,0,15.7,0,23.6,0c5,0,9.1,1.8,12.7,5.2l10.3,9.9c3.6,3.6,5.7,7.9,5.7,13.1c0,1.6,0,3.1,0,4.7
+	C1044.6,159.1,1040.7,164.7,1034,168.1z M1002.7,139v20.3h20.7c0-6.8,0-13.5,0-20.3H1002.7z"/>
+<path class="st0" d="M1088.6,121.2l9.2,9.8l9.2-9.8c5.1-5.3,12.3-5.3,17.1,0l12.3,12.8c3.7,4.2,6.9,6.9,7.5,12.8v46.1
+	c0,13.7-21.3,13.7-21.3,0c0-17.8,0-35.8,0-53.6h-14.2c0,17.8,0,35.8,0,53.6c0,14-21.2,14-21.2,0c0-17.8,0-35.8,0-53.6h-13.9
+	c0,17.8,0,35.8,0,53.6c0,13.7-21.3,13.7-21.3,0v-46.1c0.2-5.9,3.6-8.6,7.5-12.8l12.3-12.8C1076.6,115.9,1083.9,115.9,1088.6,121.2z"
+	/>
+<g>
+	<path class="st0" d="M525.2,153.8c0-13.8,21.2-13.8,21.2-0.1c0,21.5,0,17.6,0,39.1c0,13.8-21.2,13.7-21.2,0
+		C525.2,171.1,525.2,175.2,525.2,153.8z"/>
+	<g>
+		<polygon class="st0" points="546,139.5 546,117.8 525.9,117.6 525.9,139.5 		"/>
+	</g>
+</g>
+<g>
+	<circle class="st0" cx="182.2" cy="161.3" r="136.7"/>
+	<g>
+		<ellipse class="st1" cx="218.6" cy="198" rx="16.7" ry="4.5"/>
+		<ellipse class="st1" cx="246" cy="221.4" rx="16.7" ry="4.5"/>
+		<ellipse class="st1" cx="277.7" cy="209.4" rx="16.7" ry="4.5"/>
+		<ellipse class="st1" cx="254.1" cy="196.9" rx="16.7" ry="4.5"/>
+		<path class="st2" d="M241,211.4c2.8,0,6.3,3.4,6.3,7.5s-3.1,4-7.8,4c-4.7,0-10,0-10-4C233.8,216.1,236.6,211.4,241,211.4z"/>
+		<path class="st3" d="M248.3,188.1c2.5,0,5.6,3.2,5.6,6.9s-2.8,3.7-7,3.7s-8.9,0-8.9-3.7C241.9,192.4,244.4,188.1,248.3,188.1z"/>
+		<path class="st2" d="M273,200c2.8,0,6.3,3.4,6.3,7.5s-3.1,4-7.8,4c-4.7,0-10,0-10-4C265.8,204.7,268.7,200,273,200z"/>
+		<path class="st4" d="M211.6,190.4c2.1,0,4.6,2.5,4.6,5.6s-2.3,3-5.8,3c-3.5,0-7.4,1.2-7.4-1.8
+			C206.3,195.1,208.4,190.4,211.6,190.4z"/>
+		<ellipse class="st1" cx="145.5" cy="197" rx="16.7" ry="4.5"/>
+		<path class="st4" d="M152.5,189.5c-2.1,0-4.6,2.5-4.6,5.6s2.3,3,5.8,3s7.4,1.2,7.4-1.8C157.8,194.2,155.7,189.5,152.5,189.5z"/>
+		<polyline class="st6" points="202.4,149.3 238.3,129.3 238.9,194.5 245.6,195.8 		"/>
+		<polyline class="st6" points="202.4,149.3 253.6,141.8 262.6,209.7 		"/>
+		<polyline class="st6" points="200.8,158.8 215.7,162.4 204.8,194.9 211.1,194.7 		"/>
+		<polyline class="st6" points="202.4,149.3 231.8,157 230.4,219.4 236.6,220.2 		"/>
+		<ellipse class="st1" cx="118.3" cy="221.4" rx="16.7" ry="4.5"/>
+		<ellipse class="st1" cx="86.6" cy="209.4" rx="16.7" ry="4.5"/>
+		<ellipse class="st1" cx="110.1" cy="196" rx="16.7" ry="4.5"/>
+		<path class="st2" d="M123.4,211.4c-2.8,0-6.3,3.4-6.3,7.5s3.1,4,7.8,4s10,0,10-4C130.6,216.1,127.7,211.4,123.4,211.4z"/>
+		<path class="st2" d="M114.4,186.8c-2.8,0-6.3,3.4-6.3,7.5s3.1,4,7.8,4c4.7,0,10,0,10-4C121.5,191.5,118.7,186.8,114.4,186.8z"/>
+		<path class="st2" d="M91.3,200c-2.8,0-6.3,3.4-6.3,7.5s3.1,4,7.8,4c4.7,0,10,0,10-4C98.5,204.7,95.7,200,91.3,200z"/>
+		<polyline class="st6" points="161.9,149.3 126.1,129.3 125.4,194.5 118.8,195.8 		"/>
+		<polyline class="st6" points="161.9,149.3 110.7,141.8 101.7,209.7 		"/>
+		<polyline class="st6" points="163.5,158.8 148.6,162.4 159.5,194.9 154,197.3 		"/>
+		<polyline class="st6" points="161.9,149.3 132.6,157 133.9,219.4 127.7,220.2 		"/>
+		<path class="st7" d="M202.8,124.5c0,0,14.2,0.8,14.2,14.6c0,13.8-10.3,25.3-29.8,27.8c-18.7,2.4-36.5-6.8-36.5-28.9
+			s20.5-18.4,20.5-18.4"/>
+		<ellipse class="st8" cx="201.7" cy="122" rx="16.6" ry="17.2"/>
+		<circle cx="203.3" cy="122.9" r="7.6"/>
+		<circle class="st5" cx="201.5" cy="121.5" r="2"/>
+		<ellipse class="st8" cx="170.5" cy="118.4" rx="21" ry="21.7"/>
+		<circle cx="172.2" cy="119.6" r="9.6"/>
+		
+			<ellipse transform="matrix(0.9984 -5.733701e-02 5.733701e-02 0.9984 -6.4604 10.3496)" class="st5" cx="177.1" cy="117.8" rx="2.5" ry="2.5"/>
+	</g>
+</g>
+</svg>
diff --git a/src/Bridge/Symfony/Bundle/Resources/public/swagger-ui/css/typography.css b/src/Bridge/Symfony/Bundle/Resources/public/swagger-ui/css/typography.css
@@ -3,12 +3,12 @@
   font-family: 'Droid Sans';
   font-style: normal;
   font-weight: 400;
-  src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf'), format('truetype');
+  src: local('Droid Sans'), local('DroidSans'), url('../fonts/DroidSans.ttf') format('truetype');
 }
 /* Google Font's Droid Sans Bold */
 @font-face {
   font-family: 'Droid Sans';
   font-style: normal;
   font-weight: 700;
-  src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf'), format('truetype');
+  src: local('Droid Sans Bold'), local('DroidSans-Bold'), url('../fonts/DroidSans-Bold.ttf') format('truetype');
 }
diff --git a/src/Bridge/Symfony/Bundle/Resources/public/swagger-ui/lang/ja.js b/src/Bridge/Symfony/Bundle/Resources/public/swagger-ui/lang/ja.js
@@ -26,22 +26,25 @@ window.SwaggerTranslator.learn({
     "Show/Hide":"表示/非表示",
     "List Operations":"操作一覧",
     "Expand Operations":"操作の展開",
-    "Raw":"Raw",
+    "Raw":"未加工",
     "can't parse JSON.  Raw result":"JSONへ解釈できません.  未加工の結果",
+    "Example Value":"値の例",
     "Model Schema":"モデルスキーマ",
     "Model":"モデル",
+    "Click to set as parameter value":"パラメータ値と設定するにはクリック",
     "apply":"実行",
     "Username":"ユーザ名",
     "Password":"パスワード",
     "Terms of service":"サービス利用規約",
     "Created by":"Created by",
-    "See more at":"See more at",
+    "See more at":"詳細を見る",
     "Contact the developer":"開発者に連絡",
     "api version":"APIバージョン",
     "Response Content Type":"レスポンス コンテンツタイプ",
+    "Parameter content type:":"パラメータコンテンツタイプ:",
     "fetching resource":"リソースの取得",
     "fetching resource list":"リソース一覧の取得",
-    "Explore":"Explore",
+    "Explore":"調査",
     "Show Swagger Petstore Example Apis":"SwaggerペットストアAPIの表示",
     "Can't read from server.  It may not have the appropriate access-control-origin settings.":"サーバから読み込めません.  適切なaccess-control-origin設定を持っていない可能性があります.",
     "Please specify the protocol for":"プロトコルを指定してください",
diff --git a/src/Bridge/Symfony/Bundle/Resources/public/swagger-ui/lang/zh-cn.js b/src/Bridge/Symfony/Bundle/Resources/public/swagger-ui/lang/zh-cn.js
@@ -28,6 +28,8 @@ window.SwaggerTranslator.learn({
     "Expand Operations":"展开操作",
     "Raw":"原始",
     "can't parse JSON.  Raw result":"无法解析JSON. 原始结果",
+    "Example Value":"示例",
+    "Click to set as parameter value":"点击设置参数",
     "Model Schema":"模型架构",
     "Model":"模型",
     "apply":"应用",
@@ -39,6 +41,7 @@ window.SwaggerTranslator.learn({
     "Contact the developer":"联系开发者",
     "api version":"api版本",
     "Response Content Type":"响应Content Type",
+    "Parameter content type:":"参数类型:",
     "fetching resource":"正在获取资源",
     "fetching resource list":"正在获取资源列表",
     "Explore":"浏览",
diff --git a/src/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui.min.js b/src/Bridge/Symfony/Bundle/Resources/public/swagger-ui/swagger-ui.min.js
diff --git a/src/Bridge/Symfony/Bundle/Resources/views/SwaggerUi/index.html.twig b/src/Bridge/Symfony/Bundle/Resources/views/SwaggerUi/index.html.twig
@@ -39,14 +39,6 @@
                         hljs.highlightBlock(e)
                     });
 
-                    // Temporary fix for https://github.com/swagger-api/swagger-ui/issues/2381
-                    $('input.parameter').each(function (i, e) {
-                        var $e = $(e);
-                        if ('undefined' === $e.val()) {
-                            $e.val('');
-                        }
-                    });
-
                     {% if operationId is not null %}
                         {% set domId = shortName ~ '_' ~ operationId %}
                         {% set id = app.request.attributes.get('id') %}
@@ -90,9 +82,9 @@
 </head>
 
 <body class="swagger-section">
-<div id="header">
+<div id="header" style="background-color: #253032; height: 35px">
     <div class="swagger-ui-wrap">
-        <a id="logo" href="https://api-platform.com">API Platform</a>
+        <a id="logo" href="https://api-platform.com"><img height="48" src="{{ asset('bundles/apiplatform/logo-header.svg') }}" alt="API Platform" style="position: relative; right: 10px"></a>
     </div>
 </div>
 
