jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

关注BUG修改，修改密码BUG修改

This commit is contained in:
yuanke 2016-11-22 08:52:19 +08:00
parent 6cb711d66b
commit f1ad70bb33
3 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/my/account.html.erb
View File

@ -214,7 +214,8 @@
<li>确认密码&nbsp;:&nbsp;</li> <li>确认密码&nbsp;:&nbsp;</li>
</ul> </ul>
<ul class="setting_right "> <ul class="setting_right ">
<li><input id="password" name="password" class="w210" type="password" required="true" nh_required="1"></li> <input style="display:none;">
<li><input id="password" name="password" autocomplete="off" class="w210" type="password" required="true" nh_required="1"></li>
<li><input id="new_password" name="new_password" class="w210" type="password" required="true" nh_required="1"><span class="c_red ml5">请输入8-12个字符</span></li> <li><input id="new_password" name="new_password" class="w210" type="password" required="true" nh_required="1"><span class="c_red ml5">请输入8-12个字符</span></li>
<li><input id="new_password_confirmation" name="new_password_confirmation" class="w210" type="password" required="true" nh_required="1"></li> <li><input id="new_password_confirmation" name="new_password_confirmation" class="w210" type="password" required="true" nh_required="1"></li>
<li class="ml2"> <li class="ml2">

14
app/views/users/_user_fans_item.html.erb
View File

@ -1,5 +1,5 @@
<% unless list.nil?%> <% unless list.nil?%>
<% for item in list %> <% for item in list %>
<div class="courses_list line" id="fans_item_<%=item.id%>"> <div class="courses_list line" id="fans_item_<%=item.id%>">
<div class="courses_list_pic fl"> <div class="courses_list_pic fl">
<a href="<%= user_path(item) %>"> <a href="<%= user_path(item) %>">
@ -51,15 +51,5 @@
<% end %> <% end %>
<div class="cl"></div> <div class="cl"></div>
</div> </div>
<% end %> <% end %>
<div style="text-align:center;">
<div class="pages" style="width:auto; display:inline-block;">
<ul id="homework_pository_ref_pages">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => true, :flag => true, :is_new => true%>
</ul>
<div class="cl"></div>
</div>
</div>
<% else %>
<p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
<% end %> <% end %>

13
app/views/users/user_fanslist.html.erb
View File

@ -7,7 +7,7 @@
} }
</script> </script>
<div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;"> <div class="courses_box" id="RSide" style="margin-left:0; margin-bottom:0; width:728px;">
<div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>"> <div class="courses_top mb10" id="<%= (@action == 'fans' || @action == 'visitor' ) ? 'nh_fans_list' : 'nh_wacth_list' %>">
<% if @action == 'fans' %> <% if @action == 'fans' %>
<h2 class="courses_h2 fl">粉丝</h2> <h2 class="courses_h2 fl">粉丝</h2>
@ -26,11 +26,20 @@
<%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %> <%= render :partial => 'users/user_fans_item', :locals => {:list => @list,:target=>@user,:action_name=>@action,:page=>params[:page]} %>
<%# end %> <%# end %>
</div> </div>
<p id="nodata" class="nodata" style="display:<%= @list.count > 0 ? 'none' : 'block' %>;"><%= l(:label_no_data) %></p>
<div style="text-align:center;">
<div class="pages" style="width:auto; display:inline-block;">
<ul id="homework_pository_ref_pages">
<%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true, :is_new => true%>
</ul>
<div class="cl"></div>
</div>
</div>
<!--<ul class="wlist" style=" border:none;">--> <!--<ul class="wlist" style=" border:none;">-->
<!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>--> <!--<%#= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>-->
<!--</ul>--> <!--</ul>-->
<!--<div class="cl"></div>--> <!--<div class="cl"></div>-->
</div> </div>
<!--</div>--> <!--</div>-->