ued / yohogirls_mustache · Commits

Go to a project

Authored by lore-w
Commit 52513f5948c41f3a99f20625e5f8f3d64615c001 2 parents fd109d12 2556c1a2

Merge branch 'develop' of http://git.dev.yoho.cn/ued/yohogirls-mustache into develop

Inline Side-by-side
Showing 23 changed files with 41 additions and 20 deletions
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -4,6 +4,7 @@
{{# topItems}}
{{> channel/item}}
{{/ topItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -8,6 +8,7 @@
{{# bottomItems}}
{{> channel/item}}
{{/ bottomItems}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
... ... @@ -15,6 +15,7 @@
{{# topItems2}}
{{> channel/item}}
{{/ topItems2}}
{{> channel/followus}}
</div>
{{> channel/pager}}
{{> layout/footer }}
\ No newline at end of file
... ...
<div class="error-container">
<div class="error-img">
<img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/other/error.png" alt="404 page">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/other/error.png" alt="404 page">
</div>
<div class="error-btn clearfix">
<a class="back-btn" href="javascript:;" onclick="history.go(-1);">返回上一页</a>
... ...
... ... @@ -24,7 +24,7 @@
</div>
{{/ writerInfo}}
<div class="editor-comment-content clearfix" style="display:none" cid="{{cid}}">
<div class="editor-comment-content clearfix" style="display:none">
<div class="usermsg">
<span class="about-username">{{username}} </span>
<span class="about-user">
... ... @@ -34,7 +34,7 @@
<span class="user-right">© Project Copyright Info</span>
<span class="report">Report</span>
</div>
<div class="comment-area" style="display:block;">
<div class="comment-area" style="display:block;" cid="{{cid}}">
</div>
</div>
<div class="content {{# channel}}content-{{.}}{{/ channel}} clearfix">
... ...
<div class="content-item-without-border" style="margin-top:0;">
<div class="follow-us">
{{^ fan}}
{{^ fanti}}
<div class="title">关注我们</div>
{{/ fan}}
{{/ fanti}}
{{# fan}}
{{# fanti}}
<div class="title">Follow us</div>
{{/ fan}}
{{/ fanti}}
<ul class="icons-content">
<li><a href="http://app.yohoshow.com" target="_blank" class="icons show"></a></li>
<li><a href="http://weibo.com/yohomedia" target="_blank" class="icons sina"></a></li>
... ... @@ -19,7 +19,13 @@
</ul>
<div class="follow-us-input-content">
<input type="text" value="" class="followus-input" placeholder="me@email.com">
<button class="button followus-button">订阅</button>
{{^ fanti}}
<button class="button followus-button">订阅</button>
{{/ fanti}}
{{# fanti}}
<button class="button followus-button">訂閱</button>
{{/ fanti}}
</div>
</div>
</div>
\ No newline at end of file
... ...
... ... @@ -9,9 +9,9 @@
<div class="userinfo">
<h6>\{{nick}}</h6>
<p class="comment-text">\{{content}}</p>
\{{# isSelf}}
<a class="delete-comment" href="javascript:;" pid="{{id}}"></a>
\{{/ isSelf}}
\{{#if isSelf}}
<a class="delete-comment" href="javascript:;" pid="\{{id}}"></a>
\{{/if}}
</div>
</li>
\{{/ comment}}
... ... @@ -44,7 +44,7 @@
{{/ fan}}
<div class="login-status clearfix">
<div class="userimg">
<img src="http://localhost:8000/assets/images/detail/user-img.png" alt="">
<img src="http://cmsres.test.yoho.cn/res/new/girls/assets/images/detail/user-img.png" alt="">
<i></i>
</div>
<div class="userinfo" style="display: none;">
... ...
<object width="100%" classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" codebase="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab">
<param name="movie" value="http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util/VideoPlayerSmall.swf?url={{video}}&amp;language={{language}}&amp;title1=【Yoho!Boys】{{title}}{{subtitle}}&amp;shareurl={{link}}&amp;sharepic={{cover}}&amp;coverpic={{cover}}">
<param name="movie" value="http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util/VideoPlayerSmall.swf?url={{video}}&amp;language={{language}}&amp;title1=【Yoho!Boys】{{title}}{{subtitle}}&amp;shareurl={{link}}&amp;sharepic={{cover}}&amp;coverpic={{cover}}">
<param name="quality" value="high">
<param name="bgcolor" value="#ffffff">
<param value="true" name="allowFullScreen">
<param name="allowScriptAccess" value="always">
<param name="wmode" value="transparent">
<embed align="middle" width="100%" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/swf/util/VideoPlayerSmall.swf?url={{video}}&amp;language={{language}}&amp;title1=【Yoho!Boys】{{title}}{{subtitle}}&amp;shareurl={{link}}&amp;shareurl={{link}}&amp;sharepic={{cover}}&amp;coverpic={{cover}}" name="vMessage" wmode="transparent" quality="high" bgcolor="#ffffff" play="true" loop="false" allowscriptaccess="always" allowfullscreen="true" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" id="flash">
<embed align="middle" width="100%" src="http://cmsres.test.yoho.cn/res/new/girls/assets/swf/util/VideoPlayerSmall.swf?url={{video}}&amp;language={{language}}&amp;title1=【Yoho!Boys】{{title}}{{subtitle}}&amp;shareurl={{link}}&amp;shareurl={{link}}&amp;sharepic={{cover}}&amp;coverpic={{cover}}" name="vMessage" wmode="transparent" quality="high" bgcolor="#ffffff" play="true" loop="false" allowscriptaccess="always" allowfullscreen="true" type="application/x-shockwave-flash" pluginspage="http://www.macromedia.com/go/getflashplayer" id="flash">
</object>
<video id="video-ipad" style="display:none;" controls="controls" preload="auto" poster="{{cover}}"><source src="{{video}}" type="video/mp4"></video>
... ...
... ... @@ -3,6 +3,6 @@
<li class="wow"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
<li class="zzz"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
<li class="wtf"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
<li class="comments"><a class="clearfix" href="javascript:;"><strong></strong><span></span></a></li>
<li class="comments"><a class="clearfix" href="javascript:;"><strong></strong><span class="comment-num"></span></a></li>
</ul>
</div>
... ...
<div class="detail-title">
<h1>{{title}}</h1>
<h2>{{subtitle}}</h2>
<p class="detail-category"><a href="javascript:;">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;{{time}}</p>
<p class="detail-category"><a href="{{url}}">By&nbsp;{{author}}</a>&nbsp;|&nbsp;{{class}}&nbsp;|&nbsp;{{time}}</p>
</div>
\ No newline at end of file
... ...
{{^ fan}}
{{^ fanti}}
{{> layout/footer_jian}}
{{/ fan}}
{{# fan}}
{{/ fanti}}
{{# fanti}}
{{> layout/footer_fan}}
{{/ fan}}
\ No newline at end of file
{{/ fanti}}
\ No newline at end of file
... ...