hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

班级名称前增加课程名，一系列更改

Browse Source
cxt_course
Tim 9 years ago
parent b796ac3b53
commit 862bbd1a1f
13 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File

4
Gemfile
Unescape View File

@ -50,10 +50,10 @@ gem 'elasticsearch-model'
gem 'elasticsearch-rails'
#rails 3.2.22.2 bug
# gem "test-unit", "~>3.0"
gem "test-unit", "~>3.0"
### profile
# gem 'oneapm_rpm'
gem 'oneapm_rpm'
group :development do
gem 'grape-swagger'

8
app/views/courses/_recommendation.html.erb
Unescape View File

@ -4,9 +4,11 @@
<% exc_course.each_with_index do |e_course, i| %>
<li>
<span class="sy_sq_orange fl mr5 mt5"><%= i+1 %></span>
<%= link_to e_course.syllabus.title, syllabus_path(e_course.syllabus_id), :target => '_blank', :class => "sy_class_ltitle fl"%>
<span class="fl">&nbsp;<font class="fb c_grey">·</font>&nbsp;</span>
<%=link_to e_course.name, course_path(e_course.id), :class => "sy_class_ltitle fl mb10" %>
<div class="fl" style="width:185px;">
<%= link_to e_course.syllabus.title, syllabus_path(e_course.syllabus_id), :target => '_blank', :class => "sy_class_ltitle"%>
&nbsp;<font class="fb c_grey">·</font>&nbsp;
<%=link_to e_course.name, course_path(e_course.id), :class => "sy_class_ltitle mb10" %>
</div>
<div class="cl"></div>
<p class="sy_cgrey ml20">
<% homework_count = e_course.homework_commons.where("publish_time <= '#{Date.today}'").count %>

4
app/views/courses/new.html.erb
Unescape View File

@ -21,6 +21,8 @@
<span class="c_red" id="new_course_name_notice" style="display: none;">班级名称不能为空且至少有两个字符</span>
</li>
<div class="cl"></div>
<li class="ml125 mb5 fontGrey3"><span class="success-icon mr25">正确示例：计算机系2016秋季A班</span></li>
<li class="ml125 mb10 fontGrey3"><span class="error-icon">错误示例：软件工程 - 计算机系2016秋季A班</span></li>
<li class="ml45">
<label><span class="c_red">*</span>&nbsp;<%= l(:label_class_period)%>&nbsp;&nbsp;：</label>
<input type="text" name="class_period" id="new_class_period" class="hwork_input02" onkeyup="regex_course_class_period('new');" placeholder="例如：54" maxlength="6">
@ -73,7 +75,7 @@
<span class="c_grey">（选中后允许学生上传班级资源，否则不允许）</span>
<div class="cl"></div>
</li>
<li class=" ml90" >
<li class=" ml30" >
<a href="javascript:void(0)" class="blue_btn fl c_white" onclick="submit_new_course();" >提交</a>
<%= link_to "取消",user_activities_path(User.current.id),:class => "grey_btn fl c_white ml10"%>
<div class="cl"></div>

2
app/views/layouts/new_base_user.html.erb
Unescape View File

@ -163,6 +163,7 @@
<ul class="users_accordion mb10">
<li id="user_01" class="user_icons_course">
<%= link_to '班级',{:controller => "users", :action => "user_courselist", :id => @user.id}, :id => "user_course_list" %>
<font class="show-all-sub"><a href="#" class="linkGrey2">全部</a> </font>
<% courses = @user.favorite_courses.visible.where("is_delete =?", 0).select("courses.*,(SELECT MAX(updated_at) FROM `course_activities` WHERE course_activities.course_id = courses.id) AS a").order("a desc").limit(10) %>
<div class="<%= courses.empty? ? 'none' : ''%>" id="homepage_left_course_list">
<%=render :partial => 'layouts/homepage_left_course_list', :locals => {:courses => courses} %>
@ -190,6 +191,7 @@
<ul class="users_accordion mb10">
<li id="user_06" class="user_icons_project">
<%= link_to '项目',{:controller => "users", :action => "user_projectlist", :id => @user.id}, :id => 'user_project_list'%>
<font class="show-all-sub"><a href="#" class="linkGrey2">全部</a> </font>
<% projects = @user.favorite_projects.visible.select("projects.*, (SELECT MAX(updated_at) FROM `forge_activities` WHERE forge_activities.project_id = projects.id) AS a").order("a desc").limit(10)%>
<div class="<%= projects.empty? ? 'none' : ''%>" id="homepage_left_project_list">
<%=render :partial => 'layouts/homepage_left_project_list', :locals => {:projects => projects} %>

10
app/views/syllabuses/_syllabus_course_list.html.erb
Unescape View File

@ -20,15 +20,15 @@
<div class="fl">
<% if course.is_public == 0 && !User.current.member_of_course?(course) && !User.current.admin? %>
<h3 class="sy_classlist_title fl">
<%= link_to @syllabus.title, syllabus_path(@syllabus.id), :class => "sy_classlist_title fl", :style => 'color:#000', :target => '_blank' %>
<span class="fl">&nbsp;<font class="fb">·</font>&nbsp;</span>
<%= link_to @syllabus.title, syllabus_path(@syllabus.id), :style => 'color:#000', :target => '_blank' %>
&nbsp;<font class="fb">·</font>&nbsp;
<%=course.name %>（<%=current_time_and_term_short(course) %>）
</h3>
<% else %>
<h3 class="sy_classlist_title fl">
<%= link_to @syllabus.title, syllabus_path(@syllabus.id), :class => "sy_classlist_title fl", :style => 'color:#000', :target => '_blank' %>
<span class="fl">&nbsp;<font class="fb">·</font>&nbsp;</span>
<%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course), :class => "sy_classlist_title fl",
<%= link_to @syllabus.title, syllabus_path(@syllabus.id), :style => 'color:#000', :target => '_blank' %>
&nbsp;<font class="fb">·</font>&nbsp;
<%= link_to course.name+"("+current_time_and_term_short(course)+")", course_path(course.id,:host=>Setting.host_course),
:style => 'color:#000',:id => "show_course_#{course.id}", :target => '_blank', :title => (course.is_public? ? "公开班级：":"私有班级：")+course.name+"（"+current_time_and_term(course)+"）"%>
</h3>
<% end %>

2
app/views/syllabuses/new.html.erb
Unescape View File

@ -11,7 +11,7 @@
</li>
<div class="cl"></div>
<li class="ml125 fontGrey3"><span class="success-icon mr25">正确示例：软件工程</span><span class="error-icon">错误示例：2016软件工程</span></li>
<li class="ml125 mt10 mb10 fontGrey2">课程是针对一个具体的学科方向开展的教学内容与进程安排<br/>本质上，一门课程就是一个教学计划</li>
<li class="ml125 mt10 mb10 fontGrey2">课程是针对一个具体的学科方向开展的教学内容与进程安排。<br/>本质上，一门课程就是一个教学计划。</li>
<li class="ml45">
<label><span class="c_white">*</span>&nbsp;<%= l(:label_tags_course_eng_name)%>&nbsp;&nbsp;：</label>
<input type="text" name="eng_name" id="new_syllabus_eng_name" placeholder="例如：Software Engineering" class="name_input" maxlength="100">

10
app/views/users/_homework_repository_list.html.erb
Unescape View File

@ -16,14 +16,12 @@
<span class="<%=homework.course.is_public? ? 'hw_icon_open' : 'hw_icon_private'%> fl mt3"></span>
<div class="cl"></div>
<div class="sy_cgrey">
<span class="fl">
<span class="fl">来源：</span>
<p class="fl syllabus_course_name">
<%=link_to homework.course.syllabus.title, syllabus_path(homework.course.syllabus_id), :class => 'hw_cgrey fl', :target => '_blank' %>
<span class="fl"> • </span>
<%=link_to homework.course.name.to_s + "（#{current_time_and_term_short(homework.course)}）", course_path(homework.course), :class => 'hw_cgrey fl mr15', :target => '_blank' %>
<p class="fl hw_list_classname mr15">
<%=link_to homework.course.syllabus.title, syllabus_path(homework.course.syllabus_id), :class => 'hw_cgrey', :target => '_blank' %>
<span> • </span>
<%=link_to homework.course.name.to_s + "（#{current_time_and_term_short(homework.course)}）", course_path(homework.course), :class => 'hw_cgrey', :target => '_blank' %>
</p>
</span>
<% if type == "2" %>
<span class="mr15 fl">
<span class="fl">贡献者：</span>

8
app/views/users/_manage_homework_list.html.erb
Unescape View File

@ -13,9 +13,11 @@
<div class="cl"></div>
<p class="sy_cgrey clear">
<span class="fl">来源：</span>
<%=link_to homework.course.syllabus.title, syllabus_path(homework.course.syllabus_id), :class => 'hw_cgrey fl', :target => '_blank' %>
<span class="fl"> • </span>
<%= link_to homework.course.name, course_path(homework.course), :target => '_blank', :class => 'hw_cgrey hw_classname fl mr15' %>
<span class="hw_classname mr15 fl">
<%=link_to homework.course.syllabus.title, syllabus_path(homework.course.syllabus_id), :class => 'hw_cgrey', :target => '_blank' %>
<span> • </span>
<%= link_to homework.course.name, course_path(homework.course), :target => '_blank', :class => 'hw_cgrey' %>
</span>
<span class="mr15 fl">类别：<%=homework.homework_type_ch %></span>
<span class="fl">作品：</span>
<span class="sy_corange hw_w20 fl "><%=homework.student_works.has_committed.count %></span>

8
app/views/users/_receive_homework_list.html.erb
Unescape View File

@ -13,9 +13,11 @@
<div class="cl"></div>
<p class="sy_cgrey clear">
<span class=" fl">来源：</span>
<%=link_to homework.course.syllabus.title, syllabus_path(homework.course.syllabus_id), :class => 'hw_cgrey fl', :target => '_blank' %>
<span class="fl"> • </span>
<%= link_to homework.course.name, course_path(homework.course), :target => '_blank', :class => 'hw_cgrey hw_classname fl mr15' %>
<span class="hw_classname fl mr15">
<%=link_to homework.course.syllabus.title, syllabus_path(homework.course.syllabus_id), :class => 'hw_cgrey', :target => '_blank' %>
<span> • </span>
<%= link_to homework.course.name, course_path(homework.course), :target => '_blank', :class => 'hw_cgrey' %>
</span>
<span class="mr15 fl">类别：<%=homework.homework_type_ch %></span>
<% my_work = cur_user_works_for_homework(homework) %>
<span class="fl">状态：</span><span class="<%= my_work ? '' : 'hw_cir_nomal hw_cir_lorange' %> fl mr15"><%= my_work ? '已提交' : '未提交' %></span>

2
app/views/users/manage_or_receive_homeworks.html.erb
Unescape View File

@ -3,7 +3,7 @@
window.location.href = url;
}
</script>
<div class="hw_content" >
<div class="hw_content mb10" >
<ul id="hw_tab_nav">
<li id="hw_tab_nav_1" onclick="HoverLi('<%= my_homeworks_user_path(@user) %>');">
<a href="javascript:void(0);" class="hw_tab_type">我的作业</a>

2
app/views/users/my_homeworks.html.erb
Unescape View File

@ -9,7 +9,7 @@
window.location.href = url;
}
</script>
<div class="hw_content" >
<div class="hw_content mb10" >
<ul id="hw_tab_nav">
<li id="hw_tab_nav_1" class="hw_tab_hover" onclick="HoverLi('<%= my_homeworks_user_path(@user) %>');">
<a href="javascript:void(0);" class="hw_tab_type">我的作业</a>

4
public/stylesheets/css/structure.css
Unescape View File

@ -596,6 +596,9 @@ a.user_leftinfo_img { display:block; width:80px; height:80px; margin:15px auto;}
.user_sub_menu li a:hover,.user_sub_menu li a:target { color:#3b94d6; background:#fff url(/images/user/user_navmore_icons.png) 0px 0px no-repeat;}
.user_sub_menu li a:hover,.user_sub_menu li a:target{}
.user_sub_menu li:last-child a { }
.user_sub_menu li p {padding:0 25px; border:1px solid #e5e5e5; border-bottom:none; background:#f8f8f8;}
.user_sub_menu li p:hover {background:#fff;}
.user_sub_menu li p:hover a {background:#fff;}
.users_accordion li > .user_sub_menu {
display: none;
}
@ -634,6 +637,7 @@ a.user_navmorebox .user_icons_closeclass{
height:10px;
background:url(/images/user/icons_user_leftnav.png) -25px -347px no-repeat;
}
.show-all-sub {position:absolute; top:18px; right:15px;}
/* 个人主页左侧导航更多功能 */
.user_navmore_box {position:absolute; width:15px; height:15px; right:13px; top:17px; cursor:pointer;}
.user_navmore_box ul li:hover ul {display:block; }

2
public/stylesheets/syllabus.css
Unescape View File

@ -563,7 +563,7 @@ a:hover.sy_btn_orange{
font-weight:normal;
}
.sy_sq_orange{ display: block;width: 15px; height: 15px; background:#f79981; color: #fff; text-align:center; line-height: 15px;}
a.sy_class_ltitle{display: block; font-size: 14px; width: 185px; color:#888; }
a.sy_class_ltitle{font-size: 14px; color:#888; }
a:hover.sy_class_ltitle{ color:#333;}
.sy_cir_grey{
font-size:11px;

Write Preview
Loading…
Cancel
Save