jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 

Conflicts:
	app/views/users/_user_syllabus_list.html.erb
	db/schema.rb
This commit is contained in:
cxt 2016-07-01 11:15:03 +08:00
parent 2c1e0f534c 10f52f110f
commit a50e15b2ab
3 changed files with 28 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/views/users/_user_syllabus_list.html.erb
View File

@ -26,7 +26,6 @@
<span class="<%=index == 0 ? 'icons_sy_open' : 'icons_sy_close' %> fl mr5"></span>
<h3 class="syllabus_courses_title fl"><%=syllabus.title %></h3>
</div>
<%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr',:target => '_blank', :title => '查看课程' %>
<p class="fl sy_p_grey">更新时间：<%=format_date syllabus.updated_at %>
<span class="mr10"></span>创建老师：<%=syllabus.user.show_name %>
<span class="mr10"></span>班级：<%=courses.count %>
@ -66,6 +65,9 @@
<% end %>
</ul>
</div><!--syllabus_class_box end-->
<%=link_to '', syllabus_path(syllabus.id), :class => 'icons_sy_setting fr', :title => '管理课程' %>
<% end %>
<div>
<ul class="wlist" id="pages" >
@ -89,23 +91,22 @@
var tmpHeight = $(".syllabus_box").height() + diffHeight;
$(".syllabus_box").css("height", tmpHeight);
}
$(".sy_courses_open").toggle(function(){
//$(this).hide();
$(this).parent().next().hide();
$(this).children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
$(".syllabus_courses_list").toggle(function(){
$(this).next().hide();
$(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
//$(this).parent().next().show();
},function(){
$(this).parent().next().show();
$(this).children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
$(this).next().show();
$(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
});
$(".sy_courses_close").toggle(function(){
//$(this).hide();
$(this).parent().next().show();
$(this).children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
$(this).next().show();
$(this).children(":first-child").children(":first-child").addClass("icons_sy_open").removeClass("icons_sy_close");
//$(this).parent().next().show();
},function(){
$(this).parent().next().hide();
$(this).children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
$(this).next().hide();
$(this).children(":first-child").children(":first-child").addClass("icons_sy_close").removeClass("icons_sy_open");
});
});
</script>

28
db/schema.rb
View File

@ -1126,20 +1126,20 @@ ActiveRecord::Schema.define(:version => 20160630112733) do
end
create_table "mess", :id => false, :force => true do |t|
t.string "课程名"
t.integer "课程ID", :default => 0, :null => false
t.string "教师姓", :default => "", :null => false
t.string "教师名", :limit => 30, :default => "", :null => false
t.string "主贴名", :default => "", :null => false
t.integer "主贴或回帖ID", :default => 0, :null => false
t.integer "回帖对应主贴ID"
t.integer "帖子点赞数"
t.integer "主贴回复数", :default => 0, :null => false
t.text "主贴或回帖内容"
t.datetime "发帖时间", :null => false
t.integer "发帖或回帖用户ID", :default => 0, :null => false
t.string "发帖或回帖用户姓", :default => "", :null => false
t.string "发帖或回帖用户名", :limit => 30, :default => "", :null => false
t.string "课程名"
t.integer "课程ID", :default => 0, :null => false
t.string "教师姓", :default => "", :null => false
t.string "教师名", :limit => 30, :default => "", :null => false
t.string "主贴名", :default => "", :null => false
t.integer "主贴或回帖ID", :default => 0, :null => false
t.integer "回帖对应主贴ID"
t.integer "帖子点赞数"
t.integer "主贴回复数", :default => 0, :null => false
t.text "主贴或回帖内容"
t.datetime "发帖时间", :null => false
t.integer "发帖或回帖用户ID", :default => 0, :null => false
t.string "发帖或回帖用户姓", :default => "", :null => false
t.string "发帖或回帖用户名", :limit => 30, :default => "", :null => false
end
create_table "message_alls", :force => true do |t|

3
public/stylesheets/syllabus.css
View File

@ -101,7 +101,8 @@ a.syllabusbox_a_blue{
.icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;}
.icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -53px no-repeat; width:20px; height:23px; display:block; cursor:pointer; }
.icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -53px no-repeat; width:20px; height:23px; display:block; }
.icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; }
.syllabus_courses_box {position:relative;}
.icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; position:absolute; right:10px; top:10px; }
.icons_sy_setting:hover{background: url(../images/syllabus/icons_syllabus.png) -25px -33px no-repeat; }
.icons_sy_cir{background: url(../images/syllabus/icons_syllabus.png) 0px -82px no-repeat; width:15px; height:15px; display:block; position:absolute; left:-8px; top:25px;}
.icons_sy_arrow{background: url(../images/syllabus/icons_syllabus.png) -31px -81px no-repeat; width:20px; height:20px; display:block; }