From 020135cbc29a9af47afdcaf9f2a44b5c64c0d950 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 18 Jan 2016 10:13:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=8A=A8=E6=80=81=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=BC=98=E7=A7=80=E4=BD=9C=E5=93=81=E3=80=81=E5=85=B3?= =?UTF-8?q?=E8=81=94=E9=A1=B9=E7=9B=AE=E7=9A=84=E6=A0=B7=E5=BC=8F=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 16 ++- .../_org_course_homework.html.erb | 130 ++++++++++------- .../student_work/_student_work_list.html.erb | 2 +- app/views/users/_course_homework.html.erb | 107 +++++++++----- .../users/_user_homework_detail.html.erb | 131 +++++++++++------- db/schema.rb | 1 + public/stylesheets/courses.css | 5 +- public/stylesheets/new_user.css | 6 +- public/stylesheets/public.css | 6 + 9 files changed, 265 insertions(+), 139 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index be9c59992..ca55f3d8f 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -2787,13 +2787,6 @@ int main(int argc, char** argv){ ss.html_safe end - #代码提交数量 - def changesets_num project - g = Gitlab.client - project.gpid.nil? ? 0 : g.project(project.gpid).commit_count - # project.changesets.count - end - #课程动态的更新 def update_course_activity type, id course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", type.to_s, id).first @@ -2834,4 +2827,13 @@ int main(int argc, char** argv){ principal_activity.save end end + + #项目按更新时间排序 + def project_sort_update projects + unless projects.empty? + project_ids = '('+projects.map{|pro|pro.project_id}.join(',')+')' + sort_projects = ForgeActivity.find_by_sql("SELECT MAX(updated_at) AS updated_at,user_id, project_id FROM forge_activities WHERE project_id IN #{project_ids} GROUP BY project_id ORDER BY MAX(updated_at) DESC") + return sort_projects + end + end end diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb index 417e000c7..47465bf64 100644 --- a/app/views/organizations/_org_course_homework.html.erb +++ b/app/views/organizations/_org_course_homework.html.erb @@ -130,59 +130,86 @@ <% if activity.student_works.count != 0 %> <% sw = activity.student_works.reorder("created_at desc").first %>
- <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 + # <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
<% end %>
<% if activity.student_works.count != 0 %> - <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %> - <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> - <% unless student_work_scores.empty? %> - <% last_score = student_work_scores.first %> -
- <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 -
- <% end %> - <% end %> + <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %> + <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> + <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% unless student_work_scores.empty? %> + <% last_score = student_work_scores.first %> +
+

# <%=time_from_now last_score.created_at %> + <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行： +

+ <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %> + <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %> + <% student_works.each_with_index do |sw, i| %> +
+ <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %> + + + <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %> +

分数：<%=format("%.1f",score<0 ? 0 : score) %>分

+
+ <% if i == 4 %> + <% break %> + <% end %> + <% end %> + <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%> +
+
+ <% end %> + <% end %>
- <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %> -
- <% projects = activity.student_work_projects.where("is_leader = 1") %> -
- 已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %> -
-
- <% projects.each do |pro| %> - <% project = Project.find pro.project_id %> - - -
- <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> - <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> - <% end %> - <% time=project.updated_on %> - <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> -

<%=(User.find project.user_id).show_name %>(组长)

- -

<%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

-
- 项目名称：<%=project.name %>
- 创建者：<%=(User.find project.user_id).show_name %>(组长)
- 更新时间：<%=time_from_now time %> -
+ <% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %> + <% projects = activity.student_work_projects.where("is_leader = 1") %> + <% unless projects.empty? %> + <% sort_projects = project_sort_update projects %> +
+
+ # <%=time_from_now sort_projects.first.updated_at %><%= link_to User.find(sort_projects.first.user_id).show_name, user_activities_path(sort_projects.first.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新：
- <% end %> -
+
+ <% sort_projects.each_with_index do |pro, i| %> + <% project = Project.find pro.project_id %> + + +
+ <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> + <% else %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> + <% end %> + <% time=project.updated_on %> + <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> +

<%=(User.find project.user_id).show_name %>(组长)

+

<%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

+
+ 项目名称：<%=project.name %>
+ 创建者：<%=(User.find project.user_id).show_name %>(组长)
+ 更新时间：<%=time_from_now time %> +
+
+ <% if i == 9 && projects.count > 10 %> + 更多>> + <% end %> + <% if i > 9 && i == (projects.count - 1) %> + 收回<< + <% end %> + <% end %> +
+ <% end %> <% end %>
<% if is_teacher%> @@ -313,5 +340,14 @@
diff --git a/app/views/student_work/_student_work_list.html.erb b/app/views/student_work/_student_work_list.html.erb index 371334be1..df89f31eb 100644 --- a/app/views/student_work/_student_work_list.html.erb +++ b/app/views/student_work/_student_work_list.html.erb @@ -80,8 +80,8 @@ $("#about_hwork_<%= work.id%>").html("<%= escape_javascript(render :partial => 'show',:locals => {:work => work, :score =>student_work_score(work,User.current),:student_work_scores => work.student_works_scores.order("updated_at desc")}) %>"); <% end %> <% end %> + $('#score_<%= work.id%>').peSlider({range: 'min'}); <% end %> - $('#score_<%= work.id%>').peSlider({range: 'min'}); <% end %> }); \ No newline at end of file diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb index 81627f9d6..d89b44651 100644 --- a/app/views/users/_course_homework.html.erb +++ b/app/views/users/_course_homework.html.erb @@ -130,58 +130,86 @@ <% if activity.student_works.count != 0 %> <% sw = activity.student_works.reorder("created_at desc").first %>
- <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 + # <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
<% end %>
<% if activity.student_works.count != 0 %> <% sw_id = "("+activity.student_works.map{|sw| sw.id}.join(",")+")" %> - <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> + <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> <% unless student_work_scores.empty? %> <% last_score = student_work_scores.first %> -
- <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 +
+

# <%=time_from_now last_score.created_at %> + <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行： +

+ <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %> + <% student_works = activity.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %> + <% student_works.each_with_index do |sw, i| %> +
+ <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => activity.id), :alt => "学生头像" %> + + + <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %> +

分数：<%=format("%.1f",score<0 ? 0 : score) %>分

+
+ <% if i == 4 %> + <% break %> + <% end %> + <% end %> + <%= link_to "更多>>", student_work_index_path(:homework => activity.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%> +
<% end %> <% end %>
<% if activity.homework_type == 3 && activity.homework_detail_group.base_on_project == 1 %> -
<% projects = activity.student_work_projects.where("is_leader = 1") %> -
- 已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %> -
-
- <% projects.each do |pro| %> - <% project = Project.find pro.project_id %> - + -
- <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> - <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> +
+ <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像" %> + <% else %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+activity.id.to_s,:alt =>"项目头像") %> + <% end %> + <% time=project.updated_on %> + <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> +

<%=(User.find project.user_id).show_name %>(组长)

+

<%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

+
+ 项目名称：<%=project.name %>
+ 创建者：<%=(User.find project.user_id).show_name %>(组长)
+ 更新时间：<%=time_from_now time %> +
+
+ <% if i == 9 && projects.count > 10 %> + 更多>> + <% end %> + <% if i > 9 && i == (projects.count - 1) %> + 收回<< + <% end %> <% end %> - <% time=project.updated_on %> - <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> -

<%=(User.find project.user_id).show_name %>(组长)

-

<%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

-
- 项目名称：<%=project.name %>
- 创建者：<%=(User.find project.user_id).show_name %>(组长)
- 更新时间：<%=time_from_now time %> -
<% end %> -
<% end %>
<% if is_teacher%> @@ -313,5 +341,14 @@
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb index 8c4a8ac0d..b12f1c0af 100644 --- a/app/views/users/_user_homework_detail.html.erb +++ b/app/views/users/_user_homework_detail.html.erb @@ -132,59 +132,87 @@ <% if homework_common.student_works.count != 0 %> <% sw = homework_common.student_works.reorder("created_at desc").first %>
- <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品 + # <%=time_from_now sw.created_at %><%= link_to sw.user.show_name, user_activities_path(sw.user_id), :class => "newsBlue ml5 mr5"%>提交了作品
<% end %>
<% if homework_common.student_works.count != 0 %> - <% sw_id = "("+homework_common.student_works.map{|sw| sw.id}.join(",")+")" %> - <% student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> - <% unless student_work_scores.empty? %> + <% sw_id = "("+homework_common.student_works.map{|sw| sw.id}.join(",")+")" %> + <% student_work_scores = StudentWorksScore.find_by_sql("select max(created_at) as created_at, student_work_id, user_id from student_works_scores where student_work_id in #{sw_id} group by student_work_id order by max(created_at) desc") %> + <%# student_work_scores = StudentWorksScore.where("student_work_id in #{sw_id}").reorder("created_at desc") %> + <% unless student_work_scores.empty? %> <% last_score = student_work_scores.first %> -
- <%=time_from_now last_score.created_at %><%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品 -
- <% end %> - <% end %> -
- <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %> -
- <% projects = homework_common.student_work_projects.where("is_leader = 1") %> -
- 已关联项目：<%='各小组尚未将小组项目关联到本次作业。' if projects.empty? %> -
-
- <% projects.each do |pro| %> - <% project = Project.find pro.project_id %> - -
- <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> - <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %> - <% else %> - <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %> - <% end %> - <% time=project.updated_on %> - <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> -

<%=(User.find project.user_id).show_name %>(组长)

- -

<%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

-
- 项目名称：<%=project.name %>
- 创建者：<%=(User.find project.user_id).show_name %>(组长)
- 更新时间：<%=time_from_now time %> +
+

# <%=time_from_now last_score.created_at %> + <%= link_to last_score.user.show_name, user_activities_path(last_score.user_id), :class => "newsBlue ml5 mr5"%>评阅了作品，优秀排行： +

+ <% ids = '('+student_work_scores.map{|sw|sw.student_work_id}.join(',')+')' %> + <% student_works = homework_common.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").where("student_works.id in #{ids}").order("score desc") %> + <% student_works.each_with_index do |sw, i| %> +
+ <%= link_to image_tag(url_to_avatar(User.find sw.user_id), :width => "40", :height => "40"), student_work_index_path(:homework => homework_common.id), :alt => "学生头像" %> + + + <% score = sw.respond_to?("score") ? sw.score : (sw.final_score || 0) - sw.absence_penalty - sw.late_penalty %> +

分数：<%=format("%.1f",score<0 ? 0 : score) %>分

-
- <% end %> -
- <% end %> + <% if i == 4 %> + <% break %> + <% end %> + <% end %> + <%= link_to "更多>>", student_work_index_path(:homework => homework_common.id),:class=>'linkGrey2 fl ml50',:style=>'margin-top:60px;'%> +
+
+ <% end %> + <% end %> +
+ <% if homework_common.homework_type == 3 && homework_common.homework_detail_group.base_on_project == 1 %> + <% projects = homework_common.student_work_projects.where("is_leader = 1") %> + <% unless projects.empty? %> + <% sort_projects = project_sort_update projects %> +
+
+ # <%=time_from_now sort_projects.first.updated_at %><%= link_to User.find(sort_projects.first.user_id).show_name, user_activities_path(sort_projects.first.user_id), :class => "newsBlue ml5 mr5"%>更新了项目，最近更新： +
+
+ <% sort_projects.each_with_index do |pro, i| %> + <% project = Project.find pro.project_id %> + + +
+ <% if project.is_public || User.current.member_of?(project) || User.current.admin? %> + <%= link_to image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius"),project_path(project.id,:host=>Setting.host_name),:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像" %> + <% else %> + <%= image_tag(url_to_avatar(project),:width=>"40",:height => "40",:class => "borderRadius",:id=>"project_img_"+project.id.to_s+"_"+homework_common.id.to_s,:alt =>"项目头像") %> + <% end %> + <% time=project.updated_on %> + <% time=ForgeActivity.where("project_id=?",project.id).last.updated_at if ForgeActivity.where("project_id=?",project.id).last %> +

<%=(User.find project.user_id).show_name %>(组长)

+

<%=time_from_now time %>  <%= project.project_score.changeset_num %>提交

+
+ 项目名称：<%=project.name %>
+ 创建者：<%=(User.find project.user_id).show_name %>(组长)
+ 更新时间：<%=time_from_now time %> +
+
+ <% if i == 9 && projects.count > 10 %> + 更多>> + <% end %> + <% if i > 9 && i == (projects.count - 1) %> + 收回<< + <% end %> + <% end %> +
+ <% end %> + <% end %>
<% if is_teacher%> <% comment_status = homework_common.homework_detail_manual.comment_status%> @@ -315,5 +343,14 @@
\ No newline at end of file diff --git a/db/schema.rb b/db/schema.rb index 045455bb7..e0bd1d6f6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -1366,6 +1366,7 @@ ActiveRecord::Schema.define(:version => 20160114131753) do t.integer "changeset_num", :default => 0 t.integer "board_message_num", :default => 0 t.integer "board_num", :default => 0 + t.integer "act_num", :default => 0 t.integer "attach_num", :default => 0 end diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 16ef3c5df..841392cea 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -1221,7 +1221,7 @@ a:hover.blueCir{ background:#3598db; color:#fff;} .hworkPrName {width:110px; max-width:110px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; height:18px; line-height:18px; font-size:12px; color:#888888; text-align:center;} .mr150 {margin-right:150px;} .relatePInfo {text-align: left; position:absolute; background-color:#ffffff; padding:3px 8px; white-space:nowrap; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); z-index:999; color:#585858; cursor:pointer; display:none;} -.captainName {max-width:40px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} +.captainName {max-width:75px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;} /*上传资源弹窗*/ .resourceUploadPopup {width:400px; height:auto; border:3px solid #269ac9 !important; padding-left:16px; padding-bottom:16px; background-color:#ffffff; position:absolute; top:50%; left:50%; margin-left:-200px; z-index:1000;} @@ -1257,3 +1257,6 @@ div.disable_link {background-color: #c1c1c1 !important;} .fn {font-weight:normal} .boutiqueP {position:absolute; left:0px; top:0px;} + +.mh18 {max-height: 18px;} +.relatePWrap{max-height: 210px;overflow:hidden;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ac9b50d0f..8d935e70e 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -77,6 +77,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .ml36{ margin-left:36px; } .ml40{ margin-left:40px;} .ml45{ margin-left:45px;} +.ml50{ margin-left: 50px;} .ml55{ margin-left:55px;} .ml30{ margin-left:30px;} .ml60{ margin-left:60px;} @@ -95,6 +96,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .mr20{ margin-right:20px;} .mr30{ margin-right:30px !important;} .mr40{ margin-right:40px !important;} +.mr65 {margin-right: 65px;} .mw20{ margin: 0 20px;} .mt-20 {margin-top:-20px;} .mt-4 {margin-top: -4px;} @@ -121,6 +123,7 @@ a.linkGrey6:hover {color:#ffffff !important;} .w70{ width:70px;} .w80{ width:80px;} .w90{ width:90px;} +.w100 {width: 100px;} .w110{width:110px;} .w210{ width:210px;} .w150{ width:150px;} @@ -581,7 +584,7 @@ a.homepageImageNumber:hover {color:#269ac9;} .homepageLeftMenuCourses {font-size:13px; border-bottom:1px solid #dddddd;} .homepageLeftMenuCoursesLine {height:38px; line-height:38px; vertical-align:middle;} .homepageLeftMenuCoursesLine:hover {background-color:#269ac9;} -a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;} +a.coursesLineGrey {padding-left:25px; padding-right:25px; color:#808080; display:block;} a.coursesLineGrey:hover {color:#ffffff;} .homepageLeftMenuMore {height:18px;} .homepageLeftMenuMore:hover {background-color:#269ac9;} @@ -1416,3 +1419,4 @@ span.at a{color:#269ac9;text-decoration: none;} .orgDirection {width:392px; background-color:#f1f1f1; height:30px; vertical-align:middle; line-height:30px; color:#585858; padding-left:10px;} .orgSendSearch {border:1px solid #dddddd; outline:none; width:262px; height:22px; padding-left:10px; float:left;} +.relatePWrap{max-height: 210px;overflow:hidden;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 87097a052..234905c7a 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -71,6 +71,7 @@ h4{ font-size:14px; color:#3b3b3b;} .ml40{ margin-left:40px;} .ml45{ margin-left:45px;} .ml48{ margin-left:48px;} +.ml50{ margin-left: 50px;} .ml53{margin-left:53px;} .ml55{ margin-left:55px;} .ml58{margin-left:58px;} @@ -102,6 +103,7 @@ h4{ font-size:14px; color:#3b3b3b;} .mr50{margin-right: 50px;} .mr55{margin-right: 55px;} .mr60 {margin-right:60px;} +.mr65 {margin-right:65px;} .mr70{margin-right: 70px;} .mw15{margin:0 15px;} .mr90 {margin-right:90px;} @@ -113,6 +115,7 @@ h4{ font-size:14px; color:#3b3b3b;} .mt5{ margin-top:5px;} .mt8{ margin-top:8px;} .mt10{ margin-top:10px !important;} +.mt20{margin-top: 20px;} .mt30{ margin-top: 30px;} .mt40{ margin-top: 40px;} .mt12 { margin-top:12px !important;} @@ -168,6 +171,7 @@ h4{ font-size:14px; color:#3b3b3b;} .h150{ height:150px;} .p10 {padding-left:10px; padding-right:10px;} .mw400 {max-width: 400px;} +.mh18 {max-height: 18px;} /* Font & background Color */ a.b_grey{ background: #F5F5F5;} @@ -1004,3 +1008,5 @@ a:hover.userCancel{border:1px solid #888888; } .userCard em {display:block; border-width:8px; position:absolute; bottom:-17px; left:110px; border-style:solid dashed dashed dashed; border-color:#eaeaea transparent transparent transparent; font-size:0; line-height:0;} .userCardM {width:201px; height:20px; border:1px solid #dddddd; resize:none;} .resourceCopy {padding:0px; margin:0px; width:12px; height:12px; display:inline-block;} + +.relatePWrap{max-height: 210px;overflow:hidden;}