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

个人主页

This commit is contained in:
yutao 2015-07-16 11:37:03 +08:00
parent 87ab758ec5
commit 11ae8c82d4
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@
<label>不要发送对我自己提交的修改的通知<%= check_box_tag 'no_self_notified', 1, @user.pref[:no_self_notified],:style=>"height:14px;" %></label>
</li>
<li><input name="brief_introduction" class="w450" type="text" value="<%= (@user.user_extensions.nil?) ? '' : @user.user_extensions.brief_introduction %>"></li>
<li style="height:auto;"><textarea name="description" class="w450 h200"><%= (@user.user_extensions.nil?) ? '' : @user.user_extensions.description %></textarea></li>
<li style="height:auto;"><textarea name="description" class="w450 h200" style="resize:none;"><%= (@user.user_extensions.nil?) ? '' : @user.user_extensions.description %></textarea></li>
<li style="display:none;"><%= f.select :language, :Chinese => :zh, :English => :en %></li>
<li class="ml2">
<a href="javascript:$('#my_account_form_btn').click();" class="blue_btn fl">确认</a>

2
app/views/users/user_feedback4show.html.erb
View File

@ -9,7 +9,7 @@
<a href="<%= user_path(item.at_user) %>" title="<%= item.at_user.show_name %>" class="course_name fl c_blue02 ml5 mt5"><%= item.at_user.show_name %></a>
<% end %>
<span class="fl c_dark mt5">&nbsp;:&nbsp;</span>
<p class="massage_txt fl mt5"><%=item.notes.html_safe%></p>
<div class="massage_txt fl mt5"><%=item.notes.html_safe%></div>
<% if JournalsForMessage.create_by_user? User.current %>
<a href="javascript:void(0)" nhname='reply_btn' class="fl mt5 c_purple ml5">回复</a>
<% end %>

2
public/stylesheets/public_new.css
View File

@ -428,3 +428,5 @@ div.flash.warning, .conflict {
.floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;}
a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}
a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}
div.ke-statusbar{height:1px; border-top:none;}

2
public/stylesheets/users.css
View File

@ -27,7 +27,7 @@ a:hover.icon_face{background:url(../images/public_icon.png) -79px -671px no-repe
.message_list_box{ background:#f5f5f5; padding:10px;}
.users_pic{ width:27px; height:27px; border:1px solid #e3e3e3;}
.users_pic:hover{ border:1px solid #a5a5a5;}
.massage_txt{ max-width:360px; color: #666;}
.massage_txt{ max-width:360px; color: #666;word-break:break-all;}
.massage_time{ color:#8d8d8d; margin-top:5px;}
.message_list{ border-bottom:1px dashed #c9c9c9; padding-bottom:10px; margin-bottom:10px;}
.message_list_more{ text-align:center; width:720px;}