p91207356
/
guoren
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

zy: activity show people name

This commit is contained in:
lovelyzhang 2017-01-14 16:23:53 +08:00
parent 790ac40def
commit dc6569c4dd
5 changed files with 1515 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/views/login/init.html.erb
View File

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

2
app/views/main/main.html.erb
View File

@ -176,7 +176,7 @@
success: function (data, textStatus, jqXHR) { success: function (data, textStatus, jqXHR) {
//console.log(data["total_num"]); //console.log(data["total_num"]);
var engage_people = 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("取消报名"); activity.text("取消报名");
micropost.find(".activity-detail").text(show_text); micropost.find(".activity-detail").text(show_text);
} }

13
app/views/micro_posts/show.html.erb
View File

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

6
app/views/users/changepasswd.html.erb
View File

@ -17,7 +17,7 @@
<div class="form-group"> <div class="form-group">
<div class="input-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="请输入邮箱验证码" placeholder="请输入邮箱验证码"
name="verify_code" name="verify_code"
type="number"> type="number">
@ -26,7 +26,7 @@
<div class="form-group"> <div class="form-group">
<div class="input-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="请输入新密码" placeholder="请输入新密码"
name="password" name="password"
type="password"> type="password">
@ -34,7 +34,7 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="input-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="请再次输入新密码" placeholder="请再次输入新密码"
name="password_confirm" name="password_confirm"
type="password"> type="password">

1602
logs.txt
View File

File diff suppressed because it is too large Load Diff