ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7@163.com
Commit 37366b2e440b870be4e9c6e58e24e4825e650c97 2 parents 02a5a5a8 762ec18b

Merge branch 'web_develop' into develop 

Conflicts:
	partials/default/default_item.html
Inline Side-by-side
Showing 4 changed files with 12 additions and 16 deletions
... ... @@ -5,19 +5,12 @@
<input id="input-search-search" type="text" value="{{searchText}}" autocomplete="off" class="ac_input"><span class="searchbutton" id="search-button-search"></span>
</div>
</div>
{{#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}}
{{^ Items}}
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>未搜索到相关结果！</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}}
<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
{{# Items}}
{{> channel/item}}
... ...
... ... @@ -9,7 +9,7 @@
<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;Result</strong></p> -->
<p style="margin: 0 auto;text-align: center;font-size:20px;"><strong>{{.}}&nbsp;{{# resultMulti}}Results{{/ resultMulti}}{{^ resultMulti}}Result{{/ resultMulti}}</strong></p>
{{/ resultCount}}
<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
{{# Items}}
... ...
... ... @@ -64,7 +64,8 @@
<img src="\{{cover}}" alt="\{{title}}"/>
</span>
<span class="menu-text">\{{title}}</span>
<span class="menu-text menu-detail" style="margin-top:15px;">\{{subtitle}}</span>
/*去掉style @modify liuyue*/
<span class="menu-text menu-detail">\{{subtitle}}</span>
</div>
\{{/ video}}
</script>
... ...
... ... @@ -18,7 +18,9 @@
<a class="item-title" href="{{link}}" target="_blank" _title="{{.}}" _len="{{titleLength}}" onclick="YOHODCLICK('home','web','content')" style="text-align:left;" >{{.}}</a>
{{/ title}}
{{# subtitle}}
<a class="item-subtitle item-title" href="{{link}}" target="_blank" _title="{{.}}" _len="{{subtitleLength}}" style="margin-top:5px;text-align:left;" onclick="YOHODCLICK('home','web','content')">{{.}}</a>
<!-- <a class="item-subtitle item-title" href="{{link}}" target="_blank" _title="{{.}}" _len="{{subtitleLength}}" style="margin-top:10px;text-align:left;" onclick="YOHODCLICK('home','web','content')">{{.}}</a> -->
<!-- 去掉style @modify liuyue -->
<a class="item-subtitle item-title" href="{{link}}" target="_blank" _title="{{.}}" _len="{{subtitleLength}}" onclick="YOHODCLICK('home','web','content')">{{.}}</a>
{{/ subtitle}}
<a class="item-detail" href="{{link}}" target="_blank" _title="{{content}}" _len="{{contentLength}}" style="text-align:left;" onclick="YOHODCLICK('home','web','content')">{{content}}</a>
</div>
... ...