ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit 1aecce6a52edd5b7b070cda19dbf7b6d834d4933 2 parents 9bce184a e0165077

Merge branch 'web_develop' into develop

Inline Side-by-side
Showing 11 changed files with 62 additions and 27 deletions
... ... @@ -5,12 +5,19 @@
<input id="input-search-search" type="text" value="{{searchText}}" autocomplete="off" class="ac_input"><span class="searchbutton" id="search-button-search"></span>
</div>
</div>
{{^ Items}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>Sorry,Nothing Found!</strong></p>
{{/ Items}}
{{# resultCount}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>{{.}}&nbsp;{{# resultMulti}}Results{{/ resultMulti}}{{^ resultMulti}}Result{{/ resultMulti}}</strong></p>
{{/ resultCount}}
{{#if Items}}
{{# resultCount}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>{{.}}&nbsp;{{# resultMulti}}Results{{/ resultMulti}}{{^ resultMulti}}Result{{/ resultMulti}}</strong></p>
{{/ resultCount}}
{{else}}
{{#if fanti}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>Sorry,Nothing Found!</strong></p>
{{else}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>为搜索到相关结果！</strong></p>
{{/if}}
{{/if}}
<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
{{# Items}}
{{> channel/item}}
... ...
... ... @@ -4,7 +4,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Yoho!Girls | No Fashion, No Life!</title>
<link rel="stylesheet" type="text/css" href="http://localhost:8000/dist/yohogirls-frontend-web/0.0.1/girls.css" />
{> common/environment_css}}
</head>
<body>
<div class="email-subscription-container">
... ... @@ -21,5 +21,4 @@
<a class="check" href="">Check my e-mail</a>
</div>
</div>
<script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
</html>
\ No newline at end of file
... ...
... ... @@ -5,10 +5,10 @@
{{# tvs}}
<span class="tv">
{{# link}}
<a class="tv-a" href="{{link}}" target="_blank"></a>
<a class="tv-a" href="{{.}}" target="_blank"></a>
{{/ link}}
{{^ link}}
<span class="tv-a" href="{{link}}" target="_blank"></span>
<span class="tv-a" target="_blank"></span>
{{/ link}}
<img class="tv-img" src="{{img}}" alt="{{alt}}">
</span>
... ...
... ... @@ -5,10 +5,10 @@
{{# tvs}}
<span class="tv">
{{# link}}
<a class="tv-a" href="{{link}}" target="_blank"></a>
<a class="tv-a" href="{{.}}" target="_blank"></a>
{{/ link}}
{{^ link}}
<span class="tv-a" href="{{link}}" target="_blank"></span>
<span class="tv-a" target="_blank"></span>
{{/ link}}
<img class="tv-img" src="{{img}}" alt="{{alt}}">
</span>
... ...
... ... @@ -5,10 +5,10 @@
{{# tvs}}
<span class="tv">
{{# link}}
<a class="tv-a" href="{{link}}" target="_blank"></a>
<a class="tv-a" href="{{.}}" target="_blank"></a>
{{/ link}}
{{^ link}}
<span class="tv-a" href="{{link}}" target="_blank"></span>
<span class="tv-a" target="_blank"></span>
{{/ link}}
<img class="tv-img" src="{{img}}" alt="''">
</span>
... ...
... ... @@ -5,10 +5,10 @@
{{# tvs}}
<span class="tv">
{{# link}}
<a class="tv-a" href="{{link}}" target="_blank"></a>
<a class="tv-a" href="{{.}}" target="_blank"></a>
{{/ link}}
{{^ link}}
<span class="tv-a" href="{{link}}" target="_blank"></span>
<span class="tv-a" target="_blank"></span>
{{/ link}}
<img class="tv-img" src="{{img}}" alt="''">
</span>
... ...
... ... @@ -5,10 +5,10 @@
{{# tvs}}
<span class="tv">
{{# link}}
<a class="tv-a" href="{{link}}" target="_blank"></a>
<a class="tv-a" href="{{.}}" target="_blank"></a>
{{/ link}}
{{^ link}}
<span class="tv-a" href="{{link}}" target="_blank"></span>
<span class="tv-a" target="_blank"></span>
{{/ link}}
<img class="tv-img" src="{{img}}" alt="''">
</span>
... ...
... ... @@ -5,10 +5,10 @@
{{# tvs}}
<span class="tv">
{{# link}}
<a class="tv-a" href="{{link}}" target="_blank"></a>
<a class="tv-a" href="{{.}}" target="_blank"></a>
{{/ link}}
{{^ link}}
<span class="tv-a" href="{{link}}" target="_blank"></span>
<span class="tv-a" target="_blank"></span>
{{/ link}}
<img class="tv-img" src="{{img}}" alt="''">
</span>
... ...
... ... @@ -13,7 +13,7 @@
</object>
<video id="side-video-ipad" style="display:none;" controls="controls" preload="auto" poster="\{{cover}}"><source src="\{{video}}" type="video/mp4"></video>
</div>
<a href="\{{link}};">
<a href="\{{link}}">
<h3>\{{title}}</h3>
<p>\{{subtitle}}</p>
</a>
... ...
... ... @@ -16,7 +16,21 @@
<link rel="dns-prefetch" href="//img01.yohoboys.com" />
<link rel="dns-prefetch" href="//img02.yohoboys.com" />
<link rel="dns-prefetch" href="//video.yohoboys.com" />
<link rel="stylesheet" type="text/css" href="http://cmsres.test.yoho.cn/res/new/girls/css/girls.css" />
{{# isDetail}}
<meta property="fb:app_id" content="{{app_id}}"/>
<meta property="og:site_name" content="{{site_name}}"/>
<meta property="og:title" content="{{title}}"/>
<meta property="og:type" content="{{type}}"/>
<meta property="og:url" content="{{url}}"/>
<meta property="og:image" content="{{image}}"/>
<meta property="og:image:type" content="{{image_type}}"/>
<meta property="og:image:width" content="{{image_width}}"/>
<meta property="og:image:height" content="{{image_height}}"/>
<meta property="og:description" content="{{description}}"/>
{{/ isDetail}}
{{> common/environment_css}}
</head>
<body>
<!--开头的集团导航-->
... ... @@ -74,7 +88,7 @@
<div class="submenu submenu-sport">
<!--<span class="arrow"></span>-->
<div class="submenu-loading"></div>
<div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div>
<div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div>
</div>
</span>
</div>
... ...
... ... @@ -11,9 +11,24 @@
<meta name="author" content="yohogirls.com" />
<meta name="google-site-verification" content="6IS8pD7H0L0FBqjE6XZIx-x02Pa2fmG0P2ZEb3xNiVY" />
<meta property="wb:webmaster" content="5ffc4cd75e724a17" />
<link rel="dns-prefetch" href="//img01.yohoboys.com" />
<link rel="dns-prefetch" href="//img02.yohoboys.com" />
<link rel="dns-prefetch" href="//video.yohoboys.com" />
<link rel="dns-prefetch" href="//img01.yohogirls.com" />
<link rel="dns-prefetch" href="//img02.yohogirls.com" />
<link rel="dns-prefetch" href="//video.yohogirls.com" />
{{# isDetail}}
<meta property="fb:app_id" content="{{app_id}}"/>
<meta property="og:site_name" content="{{site_name}}"/>
<meta property="og:title" content="{{title}}"/>
<meta property="og:type" content="{{type}}"/>
<meta property="og:url" content="{{url}}"/>
<meta property="og:image" content="{{image}}"/>
<meta property="og:image:type" content="{{image_type}}"/>
<meta property="og:image:width" content="{{image_width}}"/>
<meta property="og:image:height" content="{{image_height}}"/>
<meta property="og:description" content="{{description}}"/>
{{/ isDetail}}
{{> common/environment_css}}
</head>
<body>
... ... @@ -72,7 +87,7 @@
<div class="submenu submenu-sport">
<div class="submenu-loading"></div>
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div>
<div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div>
</div>
</span>
</div>
... ...