修改用户页面留言显示样式
This commit is contained in:
parent
6b3c3516cd
commit
c05dd4f900
|
@ -1,32 +1,7 @@
|
||||||
<style>
|
|
||||||
.avatar-3{
|
<% id = "journal_reply_ul_" + journal.id.to_s%>
|
||||||
width: 35px;
|
<ul class="messages-for_user-reply" id = <%= id %> >
|
||||||
height: 35px;
|
|
||||||
}
|
|
||||||
.inner-right{
|
|
||||||
float: left;
|
|
||||||
}
|
|
||||||
</style>
|
|
||||||
<ul>
|
|
||||||
<% fetch_user_leaveWord_reply(journal).each do |reply|%>
|
<% fetch_user_leaveWord_reply(journal).each do |reply|%>
|
||||||
<li style="display: block; padding-bottom: 4px;">
|
<%= render :partial => "words/journal_reply_items", :locals => {:reply => reply, :journal => journal, :m_reply_id => reply.id} %>
|
||||||
<div class="inner-right" style="float: left; height: 100%; ">
|
|
||||||
<%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
|
|
||||||
</div>
|
|
||||||
<div class="inner-right" style="float: left; width:86%; height: 100%; ">
|
|
||||||
<% id = reply.id %>
|
|
||||||
<span style="color: green;"><a href="/users/4245" style="color:green;"><%= reply.user.name %></a>: </span>
|
|
||||||
<%= reply.notes %>
|
|
||||||
<% if @user == User.current %>
|
|
||||||
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
|
||||||
<%= toggle_link l(:label_projects_feedback_respond), id, {:focus => 'project_respond'} %>
|
|
||||||
<% end %>
|
|
||||||
<p style="margin-top: 4px;"><span style="color: rgb(172, 174, 177)"><%= reply.created_on %></span></p>
|
|
||||||
</div>
|
|
||||||
<div id=<%= id %> style="display: none;">
|
|
||||||
<%= render :partial => "words/new_respond", :locals => {:journal => journal} %>
|
|
||||||
</div>
|
|
||||||
<div style="clear: both;"></div>
|
|
||||||
</li>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
<li style="display: block; padding-bottom: 4px;">
|
||||||
|
<span class="portrait">
|
||||||
|
<%= image_tag url_to_avatar(reply.user), :class => "avatar-3" %>
|
||||||
|
</span>
|
||||||
|
<span class="body">
|
||||||
|
<% id = reply.id %>
|
||||||
|
<span style="color: green;"><%= link_to reply.user.name, user_path(reply.user) %>: </span>
|
||||||
|
<span style="max-width: 80%; word-wrap: break-word;"> <%= reply.notes %></span>
|
||||||
|
<% ids = 'project_respond_form_'+ journal.id.to_s%>
|
||||||
|
|
||||||
|
<p style="margin-top: 4px;">
|
||||||
|
<span style="color: rgb(172, 174, 177)"><%= format_time reply.created_on %></span>
|
||||||
|
<span style="float: right;"><%= toggle_link l(:label_projects_feedback_respond), id, {:focus => 'project_respond'} %></span>
|
||||||
|
</p>
|
||||||
|
</span>
|
||||||
|
<div id=<%= id %> style="display: none;">
|
||||||
|
<%= render :partial => "words/new_respond", :locals => {:journal => journal, :m_reply_id => m_reply_id} %>
|
||||||
|
</div>
|
||||||
|
<div style="clear: both;"></div>
|
||||||
|
</li>
|
|
@ -1,5 +1,23 @@
|
||||||
<!-- fq -->
|
<!-- fq -->
|
||||||
<style>
|
<style>
|
||||||
|
ul.message-for-user {
|
||||||
|
list-style-type: none;
|
||||||
|
margin: 0px;
|
||||||
|
padding: 0px;
|
||||||
|
font-family: 微软雅黑,Verdana,sans-serif,宋体;
|
||||||
|
text-align: left;
|
||||||
|
font-size: 10pt;
|
||||||
|
width: 100%;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
ul.message-for-user li {
|
||||||
|
margin-left: 20px;
|
||||||
|
border-bottom: 1px dashed rgb(204, 204, 204);
|
||||||
|
margin-bottom: 10px;
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
|
||||||
.portrait{
|
.portrait{
|
||||||
float: left;
|
float: left;
|
||||||
width: 40px;
|
width: 40px;
|
||||||
|
@ -10,17 +28,18 @@
|
||||||
}
|
}
|
||||||
.body{
|
.body{
|
||||||
float: left;
|
float: left;
|
||||||
width: 405px;
|
width: 80%;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
font-size: 9pt;
|
font-size: 9pt;
|
||||||
margin: 0px 10px;
|
margin: 0px 10px;
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
display: block;
|
display: block;
|
||||||
|
margin-left: 20px;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<% if jour.size >0 %>
|
<% if jour.size >0 %>
|
||||||
<% remove_allowed = (User.current.id == jour.first.user_id) %>
|
<% remove_allowed = (User.current.id == jour.first.user_id) %>
|
||||||
<ul>
|
<ul class="message-for-user">
|
||||||
<% for journal in jour%>
|
<% for journal in jour%>
|
||||||
<li>
|
<li>
|
||||||
<span class="portrait"><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></span>
|
<span class="portrait"><%= image_tag(url_to_avatar(journal.user), :class => "avatar") %></span>
|
||||||
|
@ -40,10 +59,10 @@
|
||||||
</span>
|
</span>
|
||||||
<div style="clear: both;"></div>
|
<div style="clear: both;"></div>
|
||||||
<div id=<%= ids %> style="display: none; width: 80%; margin: auto;">
|
<div id=<%= ids %> style="display: none; width: 80%; margin: auto;">
|
||||||
<%= render :partial => 'words/new_respond', :locals => {:journal => journal} %>
|
<%= render :partial => 'words/new_respond', :locals => {:journal => journal, :m_reply_id => journal.id} %>
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<%= render :partial => "words/journal_reply", :locals => {:journal => journal} %>
|
<%= render :partial => "words/journal_reply", :locals => {:journal => journal } %>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
|
|
||||||
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
|
<%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
|
||||||
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => journal.user.id %>
|
<%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => journal.user.id %>
|
||||||
<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => 1 %>
|
<%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id %>
|
||||||
<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn", :style => "margin-top: 1px;"%>
|
<%= submit_tag l(:button_projects_feedback_respond), :name => nil , :class => "bid_btn", :style => "margin-top: 1px;"%>
|
||||||
|
|
||||||
<% end %>
|
<% end %>
|
|
@ -2676,3 +2676,5 @@ div.repos_explain{
|
||||||
#admin-index{
|
#admin-index{
|
||||||
margin-left: -220px;
|
margin-left: -220px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -2035,7 +2035,7 @@ div.avatar_user{
|
||||||
.teacher {
|
.teacher {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
word-spacing: 22px;
|
word-spacing: 22px;
|
||||||
width: 55px;
|
width: 60px;
|
||||||
text-justify:inter-ideograph;
|
text-justify:inter-ideograph;
|
||||||
text-align: justify;
|
text-align: justify;
|
||||||
}
|
}
|
||||||
|
@ -2048,4 +2048,15 @@ div.avatar_user{
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
-o-text-overflow: ellipsis;
|
-o-text-overflow: ellipsis;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.avatar-3{
|
||||||
|
width: 35px;
|
||||||
|
height: 35px;
|
||||||
|
}
|
||||||
|
.inner-right{
|
||||||
|
float: left;
|
||||||
|
}
|
||||||
|
.messages-for_user-reply{
|
||||||
|
margin-top: 10px;
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue