zy: activity show people name

app/views/login/init.html.erb

@@ -23,9 +23,9 @@
         </div>
       </div>
       <a class="pull-right" href="/forgetpasswd">忘记密码？</a>
-      <div class="text-left">
-        <label class="checkbox"><input type="checkbox" name="remember"><span>记住我</span></label>
-      </div>
+      <!--<div class="text-left">-->
+        <!--<label class="checkbox"><input type="checkbox" name="remember"><span>记住我</span></label>-->
+      <!--</div>-->
       <input class="btn btn-lg btn-primary btn-block" type="submit" value="登陆">
   <% end %>
   <p>

app/views/main/main.html.erb

@@ -176,7 +176,7 @@
           success: function (data, textStatus, jqXHR) {
             //console.log(data["total_num"]);
             var engage_people = data["total_num"];
-            var show_text = "已有" + engage_people + "人参加该活动";
+            var show_text = "已有" + engage_people + "人参加该活动" + '\n' + data["total_names"] + "参加了活动";
             activity.text("取消报名");
             micropost.find(".activity-detail").text(show_text);
           }

app/views/micro_posts/show.html.erb

@@ -100,9 +100,9 @@
                     <div class="heading">
                       <i class="icon-mail-forward"> 评论 </i>
                     </div>
-                    <% micro_post["comments"].each do |comment| %>
-                        <div class="widget-content fluid-height">
-                          <ul>
+                    <div class="widget-content fluid-height">
+                      <ul>
+                        <% micro_post["comments"].each do |comment| %>
                             <li>
                               <div>
                                 <a class="user-name"><%= get_user_name_from_id(comment.user_id) %></a><em></em>
@@ -110,9 +110,10 @@
                               <div>
                                 <p><%= comment.content %></p>
                               </div>
-                          </ul>
-                        </div>
-                    <% end %>
+                            </li>
+                        <% end %>
+                      </ul>
+                    </div>
                   </div>
               <% else %>
                   <p class="text-center alert-info">暂无评论</p>

app/views/users/changepasswd.html.erb

@@ -17,7 +17,7 @@
 
       <div class="form-group">
         <div class="input-group">
-          <span class="input-group-addon"><i class="icon-envelope-alt"></i></span><input class="form-control"
+          <span class="input-group-addon"><i class="icon-lock"></i></span><input class="form-control"
                                                                                          placeholder="请输入邮箱验证码"
                                                                                          name="verify_code"
                                                                                          type="number">
@@ -26,7 +26,7 @@
 
       <div class="form-group">
         <div class="input-group">
-          <span class="input-group-addon"><i class="icon-lock"></i></span><input class="form-control"
+          <span class="input-group-addon"><i class="icon-ok"></i></span><input class="form-control"
                                                                                  placeholder="请输入新密码"
                                                                                  name="password"
                                                                                  type="password">
@@ -34,7 +34,7 @@
       </div>
       <div class="form-group">
         <div class="input-group">
-          <span class="input-group-addon"><i class="icon-lock"></i></span><input class="form-control"
+          <span class="input-group-addon"><i class="icon-ok"></i></span><input class="form-control"
                                                                                  placeholder="请再次输入新密码"
                                                                                  name="password_confirm"
                                                                                  type="password">