Fix tab & message display

Author: ouzhenkun

www/app/messages/messageTile.html

@@ -1,4 +1,4 @@
-<div class="item item-text-wrap">
+<div class="item item-text-wrap message-item">
   <a class="item-author positive button-link"
      ui-sref="app.user({loginname: message.author.loginname})">
     <img class="avatar"
@@ -8,21 +8,26 @@
     <span class="item-note"
           am-time-ago="::message.reply.create_at"></span>
   </a>
-  <span ng-switch="message.type">
+  <span ng-switch="message.type" class="text-note">
     <span ng-switch-when="reply">
       回复了你的话题
-      <a href
-         ui-sref="app.topic({topicId: message.topic.id})">
-        {{::message.topic.title}}
-      </a>
+      <p>
+        <a href
+           class="button-link positive"
+           ui-sref="app.replies({topicId: message.topic.id})">
+          {{::message.topic.title}}
+        </a>
+      </p>
     </span>
     <span ng-switch-default>
       在回复中@了你
-      <a href
-         class="button-link positive"
-         ui-sref="app.replies({topicId: message.topic.id})">
-        {{::message.topic.title}}
-      </a>
+      <p>
+        <a href
+           class="button-link positive"
+           ui-sref="app.replies({topicId: message.topic.id})">
+          {{::message.topic.title}}
+        </a>
+      </p>
     </span>
   </span>
 </div>

www/app/messages/messages.html

@@ -42,5 +42,6 @@
 
   <!-- 标记为已读的按钮 -->
   <button class="button-float button button-stable icon icon-done-all"
+          ng-if="hasnot_read_messages.length"
           ng-click="markAsRead()"></button>
 </ion-view>

www/app/scss/_main.scss

@@ -78,6 +78,16 @@ textarea {
     padding-left: 28px;
   }
 }
+.message-item {
+  .avatar {
+    height: 22px;
+    width: 22px;
+  }
+  p {
+    padding-left: 28px;
+    margin-top: 5px;
+  }
+}
 .user-item-body {
   p {
     margin-top: 0;

www/app/topics/topics.html

@@ -25,7 +25,7 @@
     </ion-refresher>
 
     <!-- 主题列表，user页面也会用到 -->
-    <topics-list topics="topics"></topics-list>
+    <topics-list topics="topics" selected-tab='selectedTab'></topics-list>
 
     <!-- 滚动加载更多 -->
     <ion-infinite-scroll on-infinite="loadMore()"

www/app/topics/topicsList.directive.coffee

@@ -5,3 +5,4 @@ angular.module('ionic-nodeclub')
   templateUrl: 'app/topics/topicsList.html'
   scope:
     topics: '='
+    selectedTab: '='

www/app/topics/topicsList.html

@@ -11,9 +11,9 @@ <h2>{{topic.title}}</h2>
       <span class="label label-positive"
             ng-if="topic.top">置顶</span>
       <span class="label label-positive"
-            ng-if="selectedTab == 'all' && topic.good && !topic.top">精华</span>
+            ng-if="topic.good && !topic.top">精华</span>
       <span class="label label-default"
-            ng-if="selectedTab == 'all' && !topic.top && !topic.good">{{topic.tab | tabLabel}}</span>
+            ng-if="!topic.top && !topic.good">{{topic.tab | tabLabel}}</span>
       {{topic.author.loginname}}
       <span class="item-note"
             am-time-ago="topic.last_reply_at">