Merge branch 'master' of https://github.com/imyelo/nga-webapp

NGA-webapp · Mar 5, 2014 · 8ab7760 · 8ab7760
2 parents c556fcd + 55b516d
commit 8ab7760
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/js/modules/views/topic/Topic.js b/js/modules/views/topic/Topic.js
@@ -199,6 +199,8 @@ define(function (require, exports, module) {
       console.log(this.collection);
       this.collection.each(this._addOne, this);
       this.$subject.text(sliceSubject(this.collection.cache.subject));
+      this.$el.find('header > div > a > sup').text(this.collection.cache.page);
+      this.$el.find('header > div > a > sub').text(this.collection.cache.pageCount);
       // 图片加载后修正滚动条高度
       this.$ul.find('img').preloadSrc(function () {
         self.scroll.refresh();

diff --git a/js/templates/topic/topic.tpl b/js/templates/topic/topic.tpl
@@ -6,7 +6,7 @@
     </a>
   </h1>
   <div>
-    <a class="icon action-skip"><span class="glyphicon glyphicon-plane"></span></a>
+    <a class="action-skip"><sup>1</sup>/<sub>1</sub></a>
   </div>
 </header>
 <article id="topic-article" class="iscroll">