ued / yohogirls_mustache · Commits

Go to a project

Authored by happyhour7
Commit bb57994d82e67f5776b1835d262bb805f7f5ea6d 2 parents b8d750b6 6a73d861

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

Conflicts:
	partials/layout/footer.html
Inline Side-by-side
Showing 4 changed files with 16 additions and 17 deletions
1 -<li class="clearfix">  
2 - <div class="userimg">  
3 - <img src="\{{userimg}}" alt="">  
4 - <i class="\{{partnerType}}"></i>  
5 - </div>  
6 - <div class="userinfo">  
7 - <h6>{{username}}</h6>  
8 - <p class="comment-text">{{content}}</p>  
9 - {{# isSelf}}  
10 - <a class="delete-comment" href="javascript:;" pid="{{id}}"></a>  
11 - {{/ isSelf}}  
12 - </div>  
13 -</li>  
1 <script id="comment-tpl" type="x-tmpl-mustache"> 1 <script id="comment-tpl" type="x-tmpl-mustache">
2 <ul class="comments-list"> 2 <ul class="comments-list">
3 \{{# comment}} 3 \{{# comment}}
4 - {{> common/comment_list}} 4 + <li class="clearfix">
  5 + <div class="userimg">
  6 + <img src="\{{userimg}}" alt="">
  7 + <i class="\{{partnerType}}"></i>
  8 + </div>
  9 + <div class="userinfo">
  10 + <h6>\{{username}}</h6>
  11 + <p class="comment-text">\{{content}}</p>
  12 + \{{# isSelf}}
  13 + <a class="delete-comment" href="javascript:;" pid="{{id}}"></a>
  14 + \{{/ isSelf}}
  15 + </div>
  16 + </li>
5 \{{/ comment}} 17 \{{/ comment}}
6 </ul> 18 </ul>
7 \{{# more}} 19 \{{# more}}
8 <div class="view-more"><a href="javascript:;">View&nbsp;<span>\{{moreNum}}</span>&nbsp;more</a></div> 20 <div class="view-more"><a href="javascript:;">View&nbsp;<span>\{{moreNum}}</span>&nbsp;more</a></div>
9 \{{/ more}} 21 \{{/ more}}
10 \{{# page}} 22 \{{# page}}
11 - <div class="pager-content comment-pager-content">  
12 - <div class="channel-index-pager">\{{commentPage}}</div> 23 + <div class="comment-pager-content pager-content-default" style="display:none">
  24 + <div class="channel-index-pager">\{{> html}}</div>
13 </div> 25 </div>
14 \{{/ page}} 26 \{{/ page}}
15 <div class="comment-textarea"> 27 <div class="comment-textarea">
@@ -42,5 +42,4 @@ @@ -42,5 +42,4 @@
42 </body> 42 </body>
43 <script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script> 43 <script type="text/javascript" src="http://localhost:8000/js/util/seajs.js?nowrap"></script>
44 {{> common/script}} 44 {{> common/script}}
45 -  
46 </html> 45 </html>
1 <div class="mags-column"> 1 <div class="mags-column">
2 <h2>E&nbsp;-&nbsp;ZINE</h2> 2 <h2>E&nbsp;-&nbsp;ZINE</h2>
3 <div class="column-slide e-zine"> 3 <div class="column-slide e-zine">
  4 + <h4>YOHO!GIRL</h4>
4 <div class="slide-box"> 5 <div class="slide-box">
5 <img class="loading-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/loading.gif" alt=" "> 6 <img class="loading-img" src="http://localhost:8000/dist/yohogirls-frontend-web/assets/images/loading.gif" alt=" ">
6 </div> 7 </div>