ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit 34cda7ebbecbe472db1ddba2819558a507f92a65 2 parents 98e165cb e0165077

Merge branch 'web_develop' into test

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