zaihui
/
educoder
0
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

This commit is contained in:
cxt 2017-09-30 21:02:51 +08:00
parent 7861ed7499 1cdecbb312
commit 8e250f6774
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/shixuns/_add_collaborators.html.erb
View File

@ -18,7 +18,7 @@
<label for="all_student_select" class="ml10">
<span class="span1 edu-txt-w120 task-hide font-bd">姓名</span>
<span class="span3 edu-txt-w120 task-hide font-bd">用户ID</span>
<span class="span2 edu-txt-w90 task-hide font-bd">职位</span>
<span class="span2 edu-txt-w80 task-hide font-bd">职位</span>
<span class="span3 edu-txt-w160 task-hide font-bd">单位</span>
</label>
</p>

2
app/views/shixuns/_add_collaborators_list.html.erb
View File

@ -8,7 +8,7 @@
<label for="choose_course_teacher_<%= user.id %>" style="top:0px">
<a href="<%= user_path(user) %>" target="_blank" class="task-hide color-grey3 fl span1 edu-txt-w120"><%= user.show_real_name %></a>
<span class="task-hide fl color-grey edu-txt-w120 span2"><%= user.login %></span>
<span class="task-hide fl color-grey edu-txt-w100 span2"><%= user.identity %></span>
<span class="task-hide fl color-grey edu-txt-w90 span2"><%= user.identity %></span>
<span class="span3 color-grey fl edu-txt-w160 task-hide"><%= user.user_extensions.school ? user.user_extensions.school.name : "" %></span>
</label>
</li>

1
public/stylesheets/css/edu-common.css
View File

@ -242,6 +242,7 @@ a.edu-txt-w130,.edu-txt-w130{ width:130px; display: inline-block;text-align: cen
a.edu-txt-w120,.edu-txt-w120{ width:120px; display: inline-block;text-align: center}
a.edu-txt-w100,.edu-txt-w100{ width:100px; display: inline-block;text-align: center}
a.edu-txt-w90,.edu-txt-w90{ width:90px; display: inline-block;text-align: center}
a.edu-txt-w80,.edu-txt-w80{ width:80px; display: inline-block;text-align: center}
.edu-txt-w50{ width:50px;}
.edu-w245{ width: 245px; }
.overellipsis{overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}