1.当用户真实姓名为空时作业列表界面显示为昵称
2.修改分页控件样式 3.作业用户图像增加链接，修改鼠标悬浮样式 4.增加当前选中页显示样式
This commit is contained in:
parent
58d32bcf2b
commit
9b64027ed6
|
|
@ -20,9 +20,10 @@
|
|||
<ul>
|
||||
<li class="pic_head">
|
||||
<a href="#" target="_blank">
|
||||
<%= image_tag(url_to_avatar(homework.user), :width => "40", :height => "40")%>
|
||||
<%= link_to image_tag(url_to_avatar(homework.user), :width => "40", :height => "40"), user_path(homework.user) %>
|
||||
<span>
|
||||
<% user_name = is_teacher ? (homework.user.lastname + homework.user.firstname) : homework.user.login %>
|
||||
<% user_realname = homework.user.lastname.to_s + homework.user.firstname.to_s %>
|
||||
<% user_name = is_teacher ? (user_realname.empty? ? homework.user.login : user_realname) : homework.user.login %>
|
||||
<%= link_to user_name, user_path(homework.user), :title => user_name %>
|
||||
</span>
|
||||
</a>
|
||||
|
|
@ -62,4 +63,4 @@
|
|||
<% end %>
|
||||
<% else %>
|
||||
<% end %>
|
||||
<ul class="wlist"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => remote%></ul>
|
||||
<ul class="wlist"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => remote, :flag => true%></ul>
|
||||
|
|
@ -224,13 +224,14 @@ module Redmine
|
|||
#per_page_links = options.delete(:per_page_links)
|
||||
per_page_links = options[:per_page_links]
|
||||
remote = options[:remote] ? options[:remote] : false
|
||||
flag = options[:flag] ? options[:flag] : false
|
||||
per_page_links = false if count.nil?
|
||||
page_param = paginator.page_param
|
||||
|
||||
html = ''
|
||||
if paginator.previous_page
|
||||
# \xc2\xab(utf-8) = «
|
||||
if remote
|
||||
if flag
|
||||
text = l(:label_previous)
|
||||
else
|
||||
text = "\xc2\xab " + l(:label_previous)
|
||||
|
|
@ -239,7 +240,7 @@ module Redmine
|
|||
end
|
||||
unless paginator.previous_page
|
||||
if paginator.next_page
|
||||
if remote
|
||||
if flag
|
||||
text = l(:label_previous)
|
||||
else
|
||||
text = "\xc2\xab " + l(:label_previous)
|
||||
|
|
@ -251,11 +252,15 @@ module Redmine
|
|||
previous = nil
|
||||
paginator.linked_pages.each do |page|
|
||||
if previous && previous != page - 1
|
||||
html << '<li>' << content_tag('span', '...', :class => 'spacer') << '</li>' + ' '
|
||||
if flag
|
||||
html << '<li>' << content_tag('a', '...') << '</li>' + ' '
|
||||
else
|
||||
html << '<li>' << content_tag('span', '...', :class => 'spacer') << '</li>' + ' '
|
||||
end
|
||||
end
|
||||
if page == paginator.page
|
||||
if remote
|
||||
html << '<li>' << content_tag('span', page.to_s, :class => 'select') << '</li>'
|
||||
if flag
|
||||
html << '<li class = "wlist_select">' << page.to_s << '</li>'
|
||||
else
|
||||
html << '<li>' << content_tag('span', page.to_s, :class => 'current-page') << '</li>'
|
||||
end
|
||||
|
|
@ -267,7 +272,7 @@ module Redmine
|
|||
end
|
||||
|
||||
if paginator.next_page
|
||||
if remote
|
||||
if flag
|
||||
text = l(:label_next)
|
||||
else
|
||||
text = l(:label_next) + " \xc2\xbb"
|
||||
|
|
@ -277,7 +282,7 @@ module Redmine
|
|||
|
||||
unless paginator.next_page
|
||||
if paginator.previous_page
|
||||
if remote
|
||||
if flag
|
||||
text = l(:label_next)
|
||||
else
|
||||
text = l(:label_next) + " \xc2\xbb"
|
||||
|
|
|
|||
|
|
@ -37,8 +37,8 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
|
|||
.dis ul{ height:75px; border-bottom:1px dashed #64bdd9;}
|
||||
.dis ul li{ float:left;}
|
||||
.dis ul li a{ display:block; color:#15bccf; }
|
||||
.pic_head{ width:40px; padding:8px 15px 0 8px;}
|
||||
.pic_head a{ text-align:center; width:40px; overflow:hidden;}
|
||||
.pic_head{ width:42px; padding:8px 15px 0 8px;}
|
||||
.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;}
|
||||
|
|
@ -48,8 +48,10 @@ a:hover.tb_all{ background:#eaeaea; text-decoration:none;}
|
|||
.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; }
|
||||
.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;}
|
||||
.wlist_select { background-color:#64bdd9; color:#fff; padding:0 5px; margin-left:3px; border:1px solid #64bdd9;}
|
||||
.code_list{ float:right; font-size:12px; color:#484848; padding:5px 3px; border-bottom:2px solid #15bccf; width:687px; }
|
||||
.code_list a{ color:#787878;}
|
||||
.fr{ float:right;}
|
||||
|
|
@ -59,7 +61,7 @@ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
|
|||
.dis ul li.wmine a{ color:#3d7ec2; text-align:center; width:50px; font-weight: bold;}
|
||||
|
||||
.msg_box{ width:693px; height:170px; border-bottom:1px dashed #CCC; padding-top:20px;}
|
||||
.msg_box h4{ margin-left:15px;}
|
||||
.msg_box h4{ margin-left:15px;border-style: none;}
|
||||
.msg_box textarea{width:660px;height:90px;padding:2px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 15px; color:#666; font-size:12px;}
|
||||
.msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; color:#fff; margin-right:10px; text-align:center; margin-top:5px; }
|
||||
.msg_box a:hover{ background-color:#03a1b3; text-decoration:none;}
|
||||
|
|
|
|||
Loading…
Reference in New Issue