Merge branch 'develop' into szzh
This commit is contained in:
commit
ca97ecbdc4
|
|
@ -22,7 +22,7 @@
|
|||
<%= link_to "留言", get_homework_jours_homework_attach_index_path(:bid_id => @bid.id), {:remote => true}%>
|
||||
(<span id="jours_count" class="c_red f_12"><%= @jours_count %></span>)
|
||||
</li>
|
||||
<li >
|
||||
<li style="padding-top: 5px;">
|
||||
<%= link_to "作品打包下载", zipdown_assort_path(obj_class: @bid.class, obj_id: @bid), class: "tb_all" unless @bid.homeworks.empty? %>
|
||||
</li>
|
||||
</ul>
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@
|
|||
<% if is_my_homework %>
|
||||
<!-- 我的作品，显示为编辑和删除 -->
|
||||
<% if @bid.comment_status == 0 %>
|
||||
<li class="wmine">
|
||||
<li class="wmine" style="padding-top: 4px;">
|
||||
<%= link_to l(:button_edit), edit_homework_attach_path(homework) %>
|
||||
<% if homework.user == User.current || User.current.admin? %>
|
||||
<!-- 作业创建者显示删除作业 -->
|
||||
|
|
|
|||
|
|
@ -8,8 +8,12 @@
|
|||
<!-- 在这里添加赞和踩-->
|
||||
<span id="praise_tread" style="float: right"> <%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%> </span>
|
||||
<div class="lz-left">
|
||||
<div><%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %></div>
|
||||
<p class="clearfix"><%=link_to @memo.author.name, user_path(@memo.author) %></p>
|
||||
<div>
|
||||
<%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %>
|
||||
</div>
|
||||
<p class="clearfix">
|
||||
<%=link_to @memo.author.name, user_path(@memo.author) %>
|
||||
</p>
|
||||
</div>
|
||||
<div class="memo-section">
|
||||
<div class="contextual-borad">
|
||||
|
|
@ -55,7 +59,8 @@
|
|||
|
||||
<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"
|
||||
style="word-break: break-all;word-wrap: break-word;">
|
||||
<%= label_tag l(:field_subject) %>: <%=h @memo.subject %>
|
||||
<%= label_tag l(:field_subject) %>:
|
||||
<%=h @memo.subject %>
|
||||
</div>
|
||||
<div class="memo-content" id="memo-content_div">
|
||||
<%= textAreailizable(@memo,:content) %>
|
||||
|
|
@ -67,7 +72,9 @@
|
|||
</p>
|
||||
<div class="clearfix"></div>
|
||||
</div>
|
||||
<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author %></div>
|
||||
<div class="memo-timestamp">
|
||||
<%= authoring @memo.created_at, @memo.author %>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<br />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/* CSS Document */
|
||||
body{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; line-height:1.9; background:#fff; font-style:normal;}
|
||||
body{ font-size:12px !important; font-family:"微软雅黑","宋体" !important; background:#fff; font-style:normal;}
|
||||
div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span,textarea{ margin:0; padding:0;}
|
||||
div,img,tr,td,textarea{ border:0;}
|
||||
table,tr,td{border:0; cellspacing:0; cellpadding:0;}
|
||||
|
|
@ -15,7 +15,7 @@ a:hover{ text-decoration:underline;}
|
|||
/* TAB 切换效果 */
|
||||
.tb_{ background-color: #eaeaea; height:40px; }
|
||||
.tb_ ul{height:40px; }
|
||||
.tb_ li{float:left;height:35px;width: 90px;cursor:pointer; font-size:14px; padding-top:5px; text-align:center; }
|
||||
.tb_ li{float:left;height:30px;width: 90px;cursor:pointer; font-size:14px; padding-top:10px; text-align:center; }
|
||||
a.tb_all{ margin-left:235px; font-size:12px; display:block; height:23px; padding-top:4px; width:90px; color:#7a7a7a; border:1px solid #cbcbcb; background:#fff; text-align: center;}
|
||||
a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
|
||||
|
||||
|
|
@ -38,13 +38,13 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
|
|||
.pic_head a{ text-align:center; width:42px; overflow:hidden;text-overflow:ellipsis; white-space:nowrap;}
|
||||
.pic_head img{ border:1px solid #fff;}
|
||||
.pic_head img:hover{border:1px solid #15bccf;}
|
||||
.dis ul li.wname a{ width:260px; font-size:14px; color:#595959; padding:20px 0 0 15px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
|
||||
.dis ul li.wdown a{padding-top:22px; color:#3d7ec2; margin-right:35px;}
|
||||
.wscore{ padding-top:22px; color:#888888; width:96px;}
|
||||
.dis ul li.wname a{ width:260px; font-size:14px; color:#595959; padding:25px 0 0 15px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;}
|
||||
.dis ul li.wdown a{padding-top:25px; color:#3d7ec2; margin-right:35px;}
|
||||
.wscore{ padding-top:25px; color:#888888; width:96px;}
|
||||
.dis ul li.wping{margin-left:12px; }
|
||||
.dis ul li.wping a{ margin-top:18px; margin-bottom:3px; width:43px; height:23px; background:#15bccf; color:#fff; text-align:center; padding-top:3px;}
|
||||
.dis ul li.wping a:hover{ background-color:#03a1b3;}
|
||||
ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
|
||||
ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px;line-height: 1.9; }
|
||||
.wlist span{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;}
|
||||
.wlist a{ border:1px solid #15bccf; padding:0 5px; margin-left:3px;}
|
||||
.wlist a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
|
||||
|
|
@ -92,7 +92,7 @@ a:hover.ping_sub{ background:#14a8b9;}
|
|||
.recall_head img{ height:30px; width:30px;}
|
||||
.recall_head a:hover{border:1px solid #15bccf;}
|
||||
.recall_head img:hover{border:1px solid #15bccf;}
|
||||
.recall_con{ float:left;color:#777777;max-width: 530px;width: 90%; margin-left:10px; }
|
||||
.recall_con{ float:left;color:#777777;max-width: 530px;width: 80%; margin-left:10px; }
|
||||
.recall_con a{ color:#15bccf; }
|
||||
|
||||
.ping_list{ margin-top:15px;}
|
||||
|
|
|
|||
Loading…
Reference in New Issue