Kouhei Sutou
null+****@clear*****
Mon Dec 30 17:26:17 JST 2013
Kouhei Sutou 2013-12-30 17:26:17 +0900 (Mon, 30 Dec 2013) New Revision: 7d1dd9a8dcd87b7c148697a618db09ed7562c72f https://github.com/droonga/droonga.org/commit/7d1dd9a8dcd87b7c148697a618db09ed7562c72f Message: Share common base HTML in English and Japanese Added files: _includes/navbar_content.en.html _includes/navbar_content.html _includes/navbar_content.ja.html Copied files: _layouts/base.html (from _layouts/default.html) Modified files: _layouts/default.html _layouts/default_ja.html Added: _includes/navbar_content.en.html (+25 -0) 100644 =================================================================== --- /dev/null +++ _includes/navbar_content.en.html 2013-12-30 17:26:17 +0900 (4abe438) @@ -0,0 +1,25 @@ +<div class="navbar-header"> + <button type="button" + class="navbar-toggle" + data-toggle="collapse" + data-target=".navbar-collapse"> + <span class="sr-only">Toggle navigation</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="navbar-brand" href="/">Droonga</a> +</div> +<div class="collapse navbar-collapse"> + <ul class="nav navbar-nav navbar-left"> + <li><a href="/news/">News</a></li> + <li><a href="/install/">Install</a></li> + <li><a href="/community/">Community</a></li> + <li><a href="/reference/">Reference manual</a></li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li> + <a href="https://github.com/droonga"><i class="fa fa-github"></i> GitHub</a> + </li> + </ul> +</div> Added: _includes/navbar_content.html (+6 -0) 100644 =================================================================== --- /dev/null +++ _includes/navbar_content.html 2013-12-30 17:26:17 +0900 (8f33146) @@ -0,0 +1,6 @@ +{% case page.lang %} +{% when "ja" %} + {% include navbar_content.ja.html %} +{% else %} + {% include navbar_content.en.html %} +{% endcase %} Added: _includes/navbar_content.ja.html (+25 -0) 100644 =================================================================== --- /dev/null +++ _includes/navbar_content.ja.html 2013-12-30 17:26:17 +0900 (ca0035a) @@ -0,0 +1,25 @@ +<div class="navbar-header"> + <button type="button" + class="navbar-toggle" + data-toggle="collapse" + data-target=".navbar-collapse"> + <span class="sr-only">ナビゲーションを切り替える</span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + <span class="icon-bar"></span> + </button> + <a class="navbar-brand" href="/ja/">Droonga</a> +</div> +<div class="collapse navbar-collapse"> + <ul class="nav navbar-nav navbar-left"> + <li><a href="/ja/news/">最新情報</a></li> + <li><a href="/ja/install/">インストール手順</a></li> + <li><a href="/ja/community/">コミュニティー</a></li> + <li><a href="/ja/reference/">リファレンスマニュアル</a></li> + </ul> + <ul class="nav navbar-nav navbar-right"> + <li> + <a href="https://github.com/droonga"><i class="fa fa-github"></i> GitHub</a> + </li> + </ul> +</div> Copied: _layouts/base.html (+1 -25) 68% =================================================================== --- _layouts/default.html 2013-12-30 16:30:55 +0900 (39a912f) +++ _layouts/base.html 2013-12-30 17:26:17 +0900 (e7e1280) @@ -37,31 +37,7 @@ <body> <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> <div class="container"> - <div class="navbar-header"> - <button type="button" - class="navbar-toggle" - data-toggle="collapse" - data-target=".navbar-collapse"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="/">Droonga</a> - </div> - <div class="collapse navbar-collapse"> - <ul class="nav navbar-nav navbar-left"> - <li><a href="/news/">News</a></li> - <li><a href="/install/">Install</a></li> - <li><a href="/community/">Community</a></li> - <li><a href="/reference/">Reference manual</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li> - <a href="https://github.com/droonga"><i class="fa fa-github"></i> GitHub</a> - </li> - </ul> - </div> + {% include navbar_content.html %> </div> </nav> Modified: _layouts/default.html (+5 -82) =================================================================== --- _layouts/default.html 2013-12-30 16:30:55 +0900 (39a912f) +++ _layouts/default.html 2013-12-30 17:26:17 +0900 (58311cf) @@ -1,82 +1,5 @@ -<!DOCTYPE html> -<html> - <head> - {% capture title %}{% if page.title %}{{ page.title }} | {{ site.title }}{% else %}{{ site.title }}{% endif %}{% endcapture %} - - {% if page.description %} - {% assign description = page.description %} - {% else %} - {% assign description = site.description %} - {% endif %} - - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>{{ title }}</title> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link href="/css/droonga.css" rel="stylesheet" media="screen"> - <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen"> - <link href="/css/font-awesome.min.css" rel="stylesheet" media="screen"> - <meta name="description" content="{{ description }}"> - - <meta property="fb:page_id" content="201193596592346" /><!-- groonga --> - <meta property="fb:admins" content="100000651961912,711540635,100002884179759,664204556" /><!-- daijiro.mori, darashi, piro.outsider.reflex, kouhei.sutou --> - <meta property="og:type" content="website" /> - <meta property="og:image" content="{{ site.url }}/images/icons/droonga-icon-full-size.png" /> - <meta property="og:site_name" content="Droonga" /> - <meta property="og:url" content="{{ site.url }}{{ page.url | remove:'index.html' }}" /> - <meta property="og:title" content="{{ title }}" /> - <meta property="og:description" content="{{ description }}" /> - - {% if page.use_social_widgets %} - <script src="http://platform.twitter.com/widgets.js" - type="text/javascript"></script> - <script type="text/javascript" src="http://apis.google.com/js/plusone.js"> - {lang: '{{ page.language }}'} - </script> - {% endif %} - </head> - <body> - <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> - <div class="container"> - <div class="navbar-header"> - <button type="button" - class="navbar-toggle" - data-toggle="collapse" - data-target=".navbar-collapse"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="/">Droonga</a> - </div> - <div class="collapse navbar-collapse"> - <ul class="nav navbar-nav navbar-left"> - <li><a href="/news/">News</a></li> - <li><a href="/install/">Install</a></li> - <li><a href="/community/">Community</a></li> - <li><a href="/reference/">Reference manual</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li> - <a href="https://github.com/droonga"><i class="fa fa-github"></i> GitHub</a> - </li> - </ul> - </div> - </div> - </nav> - - <div class="container"> - {{ content }} - </div> - - <footer> - <hr> - <div class="container"> - <p>© {{ site.copyright_year }} <a href="https://github.com/droonga">Droonga Project</a></p> - </div> - </footer> - - <script src="//code.jquery.com/jquery.js"></script> - <script src="/js/bootstrap.min.js"></script> - </body> -</html> +--- +layout: base +lang: ja +--- +{{ content }} Modified: _layouts/default_ja.html (+5 -56) =================================================================== --- _layouts/default_ja.html 2013-12-30 16:30:55 +0900 (9f70644) +++ _layouts/default_ja.html 2013-12-30 17:26:17 +0900 (58311cf) @@ -1,56 +1,5 @@ -<!DOCTYPE html> -<html> - <head> - <meta http-equiv="content-type" content="text/html; charset=utf-8" /> - <title>{% if page.title %}{{ page.title }} | {% endif %}{{ site.title }}</title> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <link href="/css/droonga.css" rel="stylesheet" media="screen"> - <link href="/css/bootstrap.min.css" rel="stylesheet" media="screen"> - <link href="/css/font-awesome.min.css" rel="stylesheet" media="screen"> - </head> - <body> - <nav class="navbar navbar-default navbar-fixed-top" role="navigation"> - <div class="container"> - <div class="navbar-header"> - <button type="button" - class="navbar-toggle" - data-toggle="collapse" - data-target=".navbar-collapse"> - <span class="sr-only">Toggle navigation</span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - <span class="icon-bar"></span> - </button> - <a class="navbar-brand" href="/ja/">Droonga</a> - </div> - <div class="collapse navbar-collapse"> - <ul class="nav navbar-nav navbar-left"> - <li><a href="/ja/news/">最新情報</a></li> - <li><a href="/ja/install/">インストール手順</a></li> - <li><a href="/ja/community/">コミュニティー</a></li> - <li><a href="/ja/reference/">リファレンスマニュアル</a></li> - </ul> - <ul class="nav navbar-nav navbar-right"> - <li> - <a href="https://github.com/droonga"><i class="fa fa-github"></i> GitHub</a> - </li> - </ul> - </div> - </div> - </nav> - - <div class="container"> - {{ content }} - </div> - - <footer> - <hr> - <div class="container"> - <p>© {{ site.copyright_year }} <a href="https://github.com/droonga">Droonga Project</a></p> - </div> - </footer> - - <script src="//code.jquery.com/jquery.js"></script> - <script src="/js/bootstrap.min.js"></script> - </body> -</html> +--- +layout: base +lang: ja +--- +{{ content }} -------------- next part -------------- HTML����������������������������...下載
