ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7
Commit 7c3eb6271c6dfd13ca884ecfe1ba5879f2f6fc05 2 parents ee1d995d 1151d882

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

Conflicts:
	partials/common/script.html
	partials/layout/footer_jian.html
	partials/layout/header_jian.html
Inline Side-by-side
Showing 17 changed files with 130 additions and 46 deletions
... ... @@ -5,4 +5,6 @@
<div class="comments-box feedback"></div>
</div>
</div>
{{> common/comment}}
{{> common/third_login}}
{{> layout/footer}}
\ No newline at end of file
... ...
... ... @@ -7,6 +7,9 @@
{{# content}}
{{> detail/detail_video}}
{{> detail/detail_slide}}
{{# coverEffect}}
<div>{{{html}}}</div>
{{/ coverEffect}}
{{> detail/detail_img}}
{{> detail/detail_text}}
{{/ content}}
... ...
... ... @@ -24,7 +24,7 @@
</div>
{{/ writerInfo}}
<div class="editor-comment-content clearfix" style="" cid="38">
<div class="editor-comment-content clearfix" style="display:none" cid="{{cid}}">
<div class="usermsg">
<span class="about-username">{{username}} </span>
<span class="about-user">
... ... @@ -44,6 +44,8 @@
</div>
{{> channel/pager}}
{{> common/comment}}
{{> common/third_login}}
{{> layout/footer}}
... ...
... ... @@ -24,15 +24,23 @@
<div class="channel-index-pager">\{{> html}}</div>
</div>
\{{/ page}}
</script>
<script id="comment-textarea-tpl" type="x-tmpl-mustache">
<div class="comment-textarea">
<div class="anonymous-info clearfix">
<input class="name-input" type="text" placeholder="Name">
<input class="email-input" type="text" placeholder="E-mail">
</div>
<textarea placeholder="说点什么..." cid="4288"></textarea>
{{^ fan}}
<textarea placeholder="说点什么..." cid="4288"></textarea>
{{/ fan}}
{{# fan}}
<textarea placeholder="說點什麼..." cid="4288"></textarea>
{{/ fan}}
<div class="login-status clearfix">
<div class="userimg">
<img src="http://res.yohoboys.comboysweb/assets/images/detail/user-img.png" alt="">
<img src="http://localhost:8000/assets/images/detail/user-img.png" alt="">
<i></i>
</div>
<div class="userinfo" style="display: none;">
... ...
... ... @@ -42,3 +42,13 @@
{{# magazine}}
{{> script/magazine}}
{{/ magazine}}
{{# feedback}}
{{> script/feedback}}
{{/ feedback}}
{{# writer}}
{{> script/writer}}
{{/ writer}}
... ...
... ... @@ -2,6 +2,21 @@
<div class="share" data-link="{{url}}" cover-url="{{cover}}">
<h4>分享：</h4>
<ul>
{{#if ../fan}}
<li class="yohoo-share-button-facebook"><a href="javascript:;"></a></li>
<li class="yohoo-share-button-tweet"><a href="javascript:;"></a></li>
<li class="yohoo-share-button-sina"><a href="javascript:;"></a></li>
<li class="yohoo-share-button-wx"><a href="javascript:;"></a>
<div class="wx-qrcode-dialog">
<div class="wx-popup-hd">
<span>分享到微信朋友圈</span>
</div>
<div class="wx-popup-bd"></div>
<div class="wx-popup-ft">打開微信，點擊底部的“發現”，使用<br>“掃一掃”即可將網頁分享至朋友圈。</div>
</div>
</li>
<li class="yohoo-share-button-qq"><a href="javascript:;"></a></li>
{{^}}
<li class="yohoo-share-button-sina"><a href="javascript:;"></a></li>
<li class="yohoo-share-button-wx">
<a href="javascript:;"></a>
... ... @@ -9,12 +24,13 @@
<div class="wx-popup-hd">
<span>分享到微信朋友圈</span>
</div>
<div class="wx-popup-bd">
</div>
<div class="wx-popup-ft">打开微信，点击底部的“发现”，使用<br>“扫一扫”即可将网页分享至朋友圈。</div>
<div class="wx-popup-bd"></div>
<div class="wx-popup-ft">打开微信，点击底部的“发现”，使用<br>“扫一扫”即可将网页分享至朋友圈。</div>
</div>
</li>
<li class="yohoo-share-button-qq"><a href="javascript:;"></a></li>
{{/if}}
</ul>
</div>
{{/ share}}
\ No newline at end of file
{{/ share}}
... ...
<script id="third-login-tpl" type="x-tmpl-mustache">
<div class="third-login-box clearfix">
<span>第三方评论</span>
{{^ fan}}
<span>第三方评论</span>
{{/ fan}}
{{# fan}}
<span>第三方評論</span>
{{/ fan}}
<a class="qq" ref="/passport/partner/index/oauth/qq" href="javascript:;"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/thirdbtn-qq.png" alt="" /></a>
<a class="yoho" href="javascript:;"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/thirdbtn-yoho.png" alt="" /></a>
<a class="sina" ref="/passport/partner/index/oauth/sina" href="javascript:;"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/about/thirdbtn-sina.png" alt="" /></a>
... ...
<script id="bottom-related-posts" type="x-tmpl-mustache">
\{{# relatedPost}}
<div class="related-posts">
<h2>新品播报</h2>
<ul class="postslist clearfix">
{{> detail/related_post}}
</ul>
<a href="javascript:;" class="load-more"></a>
</div>
\{{/ relatedPost}}
\{{# relatedPost}}
<div class="related-posts">
{{#if fan}}
<h2>Related Posts</h2>
{{^}}
<h2>新品播报</h2>
{{/if}}
<ul class="postslist clearfix">
{{> detail/related_post}}
</ul>
<a href="javascript:;" class="load-more"></a>
</div>
\{{/ relatedPost}}
</script>
\ No newline at end of file
... ...
<div class="focus-us clearfix">
<h4>关注我们</h4>
{{^ fan}}
<h4>关注我们</h4>
{{/ fan}}
{{# fan}}
<h4>follow us</h4>
{{/ fan}}
<ul class="focuslist clearfix">
<li class="show"><a href="http://app.yohoshow.com" target="_blank"></a></li>
<li class="weibo"><a href="http://weibo.com/yohomedia" target="_blank"></a></li>
... ... @@ -12,6 +19,13 @@
</ul>
<div class="textbox clearfix">
<input type="text" placeholder="me@email.com">
<a href="javascript:;">订阅</a>
{{^ fan}}
<a href="javascript:;">订阅</a>
{{/ fan}}
{{# fan}}
<a href="javascript:;">訂閱</a>
{{/ fan}}
</div>
</div>
\ No newline at end of file
... ...
<script id="side-related-posts" type="x-tmpl-mustache">
\{{# relatedPost}}
<div class="side-related-posts">
<h2>热播</h2>
{{#if fan}}
<h2>熱播</h2>
{{^}}
<h2>热播</h2>
{{/if}}
<ul class="postslist">
{{> detail/related_post}}
</ul>
... ...
... ... @@ -38,7 +38,6 @@
</div>
{{> common/menu}}
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
{{> common/script}}
</body>
</html>
\ No newline at end of file
... ...
... ... @@ -40,11 +40,7 @@
{{> common/menu}}
{{> common/menu_withleft}}
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/js/util/seajs_test.js"></script>
<script type="text/javascript" src="http://cmsres.test.yoho.cn/res/new/girls/index.js"></script>
<script type="text/javascript">
seajs.use("index");
</script>
<script type="text/javascript" src="http://localhost:8000/js/util/seajs_test.js"></script>
{{> common/script}}
</body>
... ...
... ... @@ -100,13 +100,12 @@
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sport sports-choosen">
<span class="menu-link-channel menu-link-sports sports-choosen">
<a class="text">sports</a>
<a class="hover-text">運動</a>
<a class="menu" href="/sports/index.html"></a>
<div class="submenu submenu-sport">
<div class="submenu submenu-sports">
<!--<span class="arrow"></span>-->
<div class="content-item-menu">
<span class="link" href="http://newboys.test.yoho.cn/news/index-1295-0-0.html" target="_blank"></span>
... ...
... ... @@ -32,13 +32,15 @@
<a class="hover-text">时尚</a>
<a class="menu" href="/fashion/index.html"></a>
<div class="submenu submenu-fashion" style="display:block;">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="/fashion/index.html">More ></a></div>
<div class='more-content'><a class='more-content' href="{{fashionUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-beauty">
<div class="menu-item menu-item-sports">
<span class="menu-link-channel menu-link-beauty beauty-choosen">
<a class="text">beauty</a>
... ... @@ -50,18 +52,18 @@
</div>
</span>
</div>
<div class="menu-item menu-item-sports">
<span class="menu-link-channel menu-link-sport sports-choosen">
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sport sport-choosen">
<a class="text">sports</a>
<a class="hover-text">运动</a>
<a class="menu" href="/sports/index.html"></a>
<div class="submenu submenu-sport">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div>
<div class='more-content'><a class='more-content' href="/sport/index.html">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-lifestyle lifestyle-choosen">
<a class="text">lifestyle</a>
<a class="hover-text">生活</a>
... ... @@ -72,7 +74,7 @@
</div>
</span>
</div>
<div class="menu-item menu-item-video">
<div class="menu-item menu-item-map">
<span class="menu-link-channel menu-link-video video-choosen">
<a class="text">video</a>
<a class="hover-text">视频</a>
... ... @@ -93,7 +95,7 @@
<span class="menu-link-channel menu-link-magazine">
<a class="text" style="text-align:left;">magazine</a>
<a class="hover-text">杂志</a>
<a class="menu" href="/channel/magazine/index.html"></a>
<a class="menu" href="/magazine/index.html"></a>
</span>
</div>
<span class="right iconfont search-area">
... ... @@ -160,7 +162,7 @@
</div>
<div class="menu-item menu-item-beauty">
<div class="menu-item menu-item-sports">
<span class="menu-link-channel menu-link-beauty beauty-choosen">
<a class="text">beauty</a>
... ... @@ -168,16 +170,16 @@
<a class="menu" href="/beauty/index.html"></a>
<div class="submenu submenu-beauty">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="/beauty/index.html">More ></a></div>
<div class='more-content'><a class='more-content' href="{{beautyUrl}}">More ></a></div>
</div>
</span>
</div>
<div class="menu-item menu-item-lifestyle">
<span class="menu-link-channel menu-link-sport sport-choosen">
<span class="menu-link-channel menu-link-sports sports-choosen">
<a class="text">sports</a>
<a class="hover-text">运动</a>
<a class="menu" href="/sports/index.html"></a>
<div class="submenu submenu-sport">
<div class="submenu submenu-sports">
<!--<span class="arrow"></span>-->
<div class='more-content'><a class='more-content' href="/sports/index.html">More ></a></div>
</div>
... ...
... ... @@ -5,10 +5,19 @@
<li class="column-slide02"><img style="margin:11px 0 0 70px;" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/magazine/app-column02.png" alt=" "></li>
<li class="column-slide03"><img src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/magazine/app-column03.png" alt="扫一扫下载YOHO!潮流志"><span>iPhone | Android</span></li>
<li>
<h6>YOHO!GIRL</h6>
<p>线上周刊，一周一会，
免费喂饱你的潮流胃！</p>
<strong>扫一扫即刻下载</strong>
{{^ fan}}
<h6>YOHO!GIRL</h6>
<p>线上周刊，一周一会，
免费喂饱你的潮流胃！</p>
<strong>扫一扫即刻下载</strong>
{{/ fan}}
{{# fan}}
<h6>YOHO!GIRL</h6>
<p>線上週刊，一周一會，
免費餵飽你的潮流胃！</p>
<strong>掃一掃即刻下載</strong>
{{/ fan}}
</li>
</ul>
</div>
... ...
... ... @@ -2,7 +2,12 @@
<div class="newest-mags clearfix">
<div class="mags-info">
<h2></h2>
<p class="mags-text">《YOHO!潮流志》是新力传媒着重打造的媒体，也是目前最成熟的媒体之一。他是第一本内地编辑的属于年轻人的潮流时尚杂志，读者受众定位为16—30岁年轻人群，内容包括潮流服饰、原创品牌、明星娱乐、艺术设计、动漫影音等，将年轻人关注的方方面面一网打尽。</p>
{{#if ../fan}}
<p class="mags-text">《YOHO!潮流誌》是新力傳媒著重打造的媒體，也是目前最成熟的媒體之壹。他是第壹本內地編輯的屬於年輕人的潮流時尚雜誌，讀者受眾定位為16—30歲年輕人群，內容包括潮流服飾、原創品牌、明星娛樂、藝術設計、動漫影音等，將年輕人關註的方方面面壹網打盡。</p>
{{^}}
<p class="mags-text">《YOHO!潮流志》是新力传媒着重打造的媒体，也是目前最成熟的媒体之一。他是第一本内地编辑的属于年轻人的潮流时尚杂志，读者受众定位为16—30岁年轻人群，内容包括潮流服饰、原创品牌、明星娱乐、艺术设计、动漫影音等，将年轻人关注的方方面面一网打尽。</p>
{{/if}}
<div class="date-price">
<p><span>{{date}} </span> | {{title}}</p>
<p class="price">RMB15</p>
... ...
<script type="text/javascript" charset="utf-8">
//编辑页面JS
seajs.use(['js/channel/writer', 'js/public'], function(writer) {
if (writer) {
writer.init();
}
});
</script>
\ No newline at end of file
... ...