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

Merge branch 'develop' into dev_newproject

This commit is contained in:
daiao 2016-10-12 16:29:14 +08:00
parent b925ee312e c693afdee8
commit 4093847017
30 changed files with 198 additions and 420 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/sub_document_comments_controller.rb
View File

@ -102,7 +102,7 @@ class SubDocumentCommentsController < ApplicationController
@subdomain = @document.sub_domain
@org_subfield = @subdomain.org_subfield
@organization = @org_subfield.organization
@act = OrgActivity.find(params[:id])
@act = OrgActivity.find(params[:act_id])
@comment = SubDocumentComment.new(:sub_domain_id => @document.sub_domain, :creator_id => User.current.id, :reply_id => params[:id])
@comment.content = params[:sub_content]
@document.children << @comment

6
app/models/course.rb
View File

@ -24,7 +24,7 @@ class Course < ActiveRecord::Base
end
end
attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name, :is_delete, :syllabus_id
attr_accessible :code, :extra, :name, :state, :tea_id, :time , :location, :state, :term, :password,:is_public,:description,:class_period, :open_student, :enterprise_name, :is_delete, :syllabus_id, :end_time, :end_term
#belongs_to :project, :class_name => 'Course', :foreign_key => :extra, primary_key: :identifier
belongs_to :teacher, :class_name => 'User', :foreign_key => :tea_id # 定义一个方法teacher，该方法通过tea_id来调用User表
belongs_to :school, :class_name => 'School', :foreign_key => :school_id #定义一个方法school，该方法通过school_id来调用School表
@ -96,7 +96,9 @@ class Course < ActiveRecord::Base
'class_period',
'open_student',
'is_delete',
'syllabus_id'
'syllabus_id',
'end_time',
'end_term'
acts_as_customizable

2
app/views/forums/_forum_list.html.erb
View File

@ -35,5 +35,5 @@
<% end %>
<% else %>
<%= render :partial => "layouts/no_content" %>
<%#= render :partial => "layouts/no_content" %>
<% end %>

3
app/views/layouts/_base_feedback.html.erb
View File

@ -158,6 +158,8 @@ function cookieget(n)
})
</script>
<% forum = Forum.where(:id => 1).first %>
<% unless forum.nil? %>
<div class="scrollsidebar" id="scrollsidebar" style="float: right">
<div class="side_content">
<div class="side_list">
@ -189,4 +191,5 @@ function cookieget(n)
<a href="#" class="closeSidebar"></a>
</div>
</div>
<% end %>
</body>

3
app/views/layouts/_base_footer_public.html.erb
View File

@ -4,7 +4,10 @@
<li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
<li class="fl"><a href="https://forge.trustie.net/projects/2/feedback" class="f_grey mw20" target="_blank"><%= l(:label_contact_us)%></a>|</li>
<li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_recruitment_information)%></a>|</li>
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
<% end %>
<li class="fl"><a href="javascript:void:(0);" class="f_grey mw20" target="_blank"><%= l(:label_forums)%></a>|</li>
<li class="fl"><a href="javascript:void:(0);" class="f_grey ml20" target="_blank"><%= l(:label_language)%></a>
<select class="languageBox">

3
app/views/layouts/_footer.html.erb
View File

@ -4,7 +4,8 @@
<li class="fl"><a href="<%= about_us_path %>" class="f_grey mw20" target="_blank"><%= l(:label_about_us)%></a>|</li>
<li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li>
<li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li>
<% if hidden_unproject_infos %>
<% memo = Memo.where(:id => 1168).first %>
<% if hidden_unproject_infos && !memo.nil? %>
<li class="fl"><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "f_grey mw20", :target=>"_blank" %>|</li>
<% end %>
<li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a></li>

3
app/views/layouts/_forbidden_new_feedback.html.erb
View File

@ -1,5 +1,7 @@
<%= javascript_include_tag "feedback" %>
<% forum = Forum.where(:id => 1).first %>
<% unless forum.nil? %>
<div class="scrollsidebar" id="scrollsidebar">
<div class="side_content">
<div class="side_list">
@ -49,3 +51,4 @@
</div>
</div>
</div>
<% end %>

3
app/views/layouts/_logined_header_show.html.erb
View File

@ -14,9 +14,12 @@
<li class="navHomepageMenu fl">
<a href ="javascript:void(0);" disabled="true" class="c_white f16 db p10">题库</a>
</li>
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="navHomepageMenu fl mr30">
<a href ="javascript:void(0);" disabled="true" class="c_white f16 db p10">帮助中心</a>
</li>
<% end %>
<% end %>
</ul>
</div>

4
app/views/layouts/_new_feedback.html.erb
View File

@ -1,5 +1,6 @@
<%= javascript_include_tag "feedback" %>
<% forum = Forum.where(:id => 1).first %>
<% unless forum.nil? %>
<div class="scrollsidebar pr" id="scrollsidebar">
<div class="side_content">
<div class="side_list">
@ -49,3 +50,4 @@
</div>
</div>
</div>
<% end %>

3
app/views/layouts/_org_custom_footer.html.erb
View File

@ -2,7 +2,10 @@
<ul>
<li ><a href="<%= about_us_path %>" target="_blank" class="" >关于我们<span>|</span></a></li>
<li ><a href="<%= agreement_path %>" target="_blank" class="" >服务协议<span>|</span></a></li>
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li ><a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="" >帮助中心<span>|</span></a></li>
<% end %>
<li ><a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="" > 贴吧交流</a></li>
<div class="cl"></div>
</ul>

3
app/views/layouts/_org_subdomain_footer.html.erb
View File

@ -3,7 +3,10 @@
<ul class="sn-footer-link">
<li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
<li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
<% end %>
<li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
</ul>
<div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>

3
app/views/layouts/_unlogin_header.html.erb
View File

@ -7,9 +7,12 @@
<!--<li class="navHomepageMenu fl mr40">-->
<!--<%#= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>-->
<!--</li>-->
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="navHomepageMenu fl mr40">
<a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="c_white f16 db p10" >帮助中心</a>
</li>
<% end %>
</ul>
</div>
<script>

3
app/views/layouts/base_org.html.erb
View File

@ -152,7 +152,10 @@
<ul class="footerAbout">
<li class="fl"><a href="<%= about_us_path %>" class=" f_grey mw20" target="_blank">关于我们</a>|</li>
<li class="fl"><a href="<%= agreement_path %>" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="fl"><a href="http://forge.trustie.net/forums/1/memos/1168" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
<% end %>
<li class="fl"><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="f_grey mw20" target="_blank">贴吧交流</a></li>
</ul>
</div>

4
app/views/layouts/base_org2.html.erb
View File

@ -172,8 +172,10 @@
<ul class="sn-footer-link">
<li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
<li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
<% end %>
</ul>
<div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>
<div class="sn-address">地 址：湖南省长沙市开福区东风路89号观园大厦23层<br />

3
app/views/layouts/base_org_newstyle.html.erb
View File

@ -406,7 +406,10 @@
<ul>
<li><a href="<%= about_us_path %>" target="_blank" class="fl">关于我们</a></li>
<li><a href="<%= agreement_path %>" target="_blank" class="fl"> 服务协议 </a></li>
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li><a href="http://forge.trustie.net/forums/1/memos/1168" target="_blank" class="fl">帮助中心</a></li>
<% end %>
<li><a href="<%= forums_path(:reorder_complex=>'desc')%>" target="_blank" class="fl"> 贴吧交流</a></li>
</ul>
<div class="cl"></div>

3
app/views/layouts/base_organization.html.erb
View File

@ -106,7 +106,10 @@
<ul class="footerAbout">
<li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">关于我们</a>|</li>
<li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">服务协议</a>|</li>
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="fl"><a href="javascript:void(0);" class="f_grey mw20" target="_blank">帮助中心</a>|</li>
<% end %>
<li class="fl"><a href="javascript:void(0);" class=" f_grey mw20" target="_blank">贴吧交流</a></li>
</ul>
</div>

3
app/views/organizations/_org2_footer.html.erb
View File

@ -3,7 +3,10 @@
<ul class="sn-footer-link">
<li class="sn-mr50"><a href="<%= about_us_path %>" class="sn-link-white sn-f18">关于我们</a></li>
<li class="sn-mr50"><a href="<%= agreement_path %>" class="sn-link-white sn-f18">服务协议</a></li>
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="sn-mr50"><a href="http://forge.trustie.net/forums/1/memos/1168" class="sn-link-white sn-f18">帮助中心</a></li>
<% end %>
<li><a href="<%= forums_path(:reorder_complex=>'desc')%>" class="sn-link-white sn-f18">在线报名</a></li>
</ul>
<div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>

4
app/views/repositories/show.html.erb
View File

@ -77,7 +77,11 @@
<%= render :partial => 'dir_list' %>
<% end %>
<% memo = Memo.where(:id => 1232).first %>
<% unless memo.nil? %>
<a href="<%= Setting.protocol + "://" %><%=Setting.host_name %>/forums/1/memos/1232" >如何提交代码</a>
<% end %>
<div class="fr">
<a style="color: #7f7f7f;">导出统计结果：</a>
<%= link_to "最近一周", {:controller => 'repositories', :action => 'export_rep_static', :format => 'xls', :rev => @rev, :cycle => "week" } %> <a style="color: #7f7f7f;">|</a>

2
app/views/sub_document_comments/_show_sub_document.html.erb
View File

@ -1,4 +1,4 @@
<div class="resources mt10" id="organization_document_<%= document.id %>">
<div class="resources mt10" id="organization_sub_document_comments_<%= document.id %>">
<div class="homepagePostBrief">
<div class="homepagePostPortrait">
<%= link_to image_tag(url_to_avatar(User.find(document.creator_id)), :width => 45, :heigth => 45), user_url_in_org(document.creator_id) %>

2
app/views/sub_document_comments/add_reply.js.erb
View File

@ -1,2 +1,2 @@
$("#organization_document_<%= @act.id %>").replaceWith("<%= escape_javascript(render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => @document,:flag => params[:flag], :act => @act, :organization => @organization}) %>");
$("#organization_sub_document_comments_<%= @document.id %>").replaceWith("<%= escape_javascript(render :partial => 'sub_document_comments/show_sub_document', :locals => {:document => @document,:flag => params[:flag], :act => @act, :organization => @organization}) %>");
sd_create_editor_from_data(<%= @act.id %>,"","100%", "<%=@act.class.to_s%>");

3
app/views/sub_domains/show.html.erb
View File

@ -129,7 +129,10 @@
<ul class="sn-footer-link">
<li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">关于我们</a></li>
<li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">服务协议</a></li>
<% memo = Memo.where(:id => 1168).first %>
<% unless memo.nil? %>
<li class="sn-mr50"><a href="javascript:void(0);" class="sn-link-white sn-f18">帮助中心</a></li>
<% end %>
<li><a href="javascript:void(0);" class="sn-link-white sn-f18">在线报名</a></li>
</ul>
<div class="sn-contact">联系人：魏小姐 | 电 话：0731-84761282 | 传 真：0731-84761268 | 邮 箱：office@gnssopenlab.org</div>

2
app/views/syllabuses/_syllabus_course_list.html.erb
View File

@ -62,7 +62,7 @@
<% if User.current.member_of_course?(course) %>
<%=link_to '进入班级', course_path(course), :class => 'btn_orange_big fr mt5', :target => '_blank' %>
<% else %>
<%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "btn_green_big fr mt5",:method => "post"%>
<%= link_to "加入班级",join_private_courses_courses_path,:remote => true,:class => "hw_btn_green fr mt5",:method => "post"%>
<% end %>
<div class="cl"></div>
</ul>

6
app/views/users/_user_resource_tip_list.html.erb
View File

@ -5,7 +5,7 @@
<li class="resource-list-time fr">
<%= link_to "上传时间", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "fl", :remote => true %>
<% if @order == "created_on" %>
<%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
<%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "created_on", :search => " "), :class => "#{@score == 'desc' ? 'st_down' : 'st_up'} mt16", :remote => true %>
<% end %>
</li>
<!--<li class="resource-list-quote fr">-->
@ -17,14 +17,14 @@
<li class="resource-list-download fr">
<%= link_to "下载数", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "fl", :remote => true %>
<% if @order == "downloads" %>
<%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
<%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "downloads"), :class => "#{@score == 'desc' ? 'st_down' : 'st_up'} mt16", :remote => true %>
<% end %>
</li>
<li class="resource-list-size fr">
<div style="margin: 0 auto; width: 40px">
<%= link_to "大小", resource_search_user_path(:type => @type, :status => @status, :sort => @score, :order => "filesize"), :class => "fl", :remote => true %>
<% if @order == "filesize" %>
<%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "filesize"), :class => "#{@score == 'desc' ? 'st_up' : 'st_down'} mt16", :remote => true %>
<%= link_to "", user_resource_user_path(:type => @type, :status => @status, :sort => @score, :order => "filesize"), :class => "#{@score == 'desc' ? 'st_down' : 'st_up'} mt16", :remote => true %>
<% end %>
</div>
</li>

69
public/stylesheets/css/common.css
View File

@ -530,7 +530,43 @@ a:hover.BlueCirBtn{ background:#3598db; color:#fff;}
a.BlueCirBtnMini{ display:block;width:40px; height:24px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}
a:hover.BlueCirBtnMini{ background:#3598db; color:#fff;}
/*20160725 项目申请按钮*/
/* 按钮*/
a.btn_orange_big{
display:inline-block;
border: 1px solid #ee4a1f;
color: #ee4a1f;
text-align: center;
font-size: 14px;
padding:0 10px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.btn_orange_big{
background: #ee4a1f;
color: #fff;
}
a.btn_green_big{
display:inline-block;
border: 1px solid #60b25e;
color: #60b25e;
text-align: center;
font-size: 14px;
padding:0 10px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.btn_green_big{
background: #60b25e;
color: #fff;
}
a.sy_btn_grey{
display:inline-block;
color: #333;
@ -561,6 +597,37 @@ a.sy_btn_blue{
border-radius:3px;
}
a:hover.sy_btn_blue{ background: #2788d0;}
a.sy_btn_green{
display:inline-block;
color: #fff;
background: #60b25e;
text-align: center;
font-size: 12px;
padding:0 15px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.sy_btn_green{ background: #51a74f;}
a.hw_btn_blue{
display: inline-block;
color: #3b94d6;
border:1px solid #3b94d6;
background:#fff;
text-align: center;
font-size: 12px;
padding:0 15px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
/* commonpic */
.pic_date{ display:block; background:url(/images/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; }
.pic_add{ display:block; background:url(/images/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; }

2
public/stylesheets/css/courses.css
View File

@ -8,8 +8,6 @@
.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;}
.RightBanner {font-size:16px; width:733px; color:#4b4b4b; padding:10px 0 0 15px; margin-bottom:10px; background:#fff; border:1px solid #dddddd;height:34px;}
select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;}
/*a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}*/
/*a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat; color:#3598db;}*/
a.FilesBtn{ background: url(../images/homepage_icon.png) 0px -373px no-repeat; width:38px; height:20px; display:block; padding-left:20px; color:#888888;}
a:hover.FilesBtn{background: url(../images/homepage_icon.png) -89px -372px no-repeat; color:#3598db;}
a.ProBtn{background: url(../images/homepage_icon.png) -86px -396px no-repeat; width:30px; height:20px; display:block; padding-left:20px; color:#888888;}

274
public/stylesheets/css/project.css
View File

@ -560,227 +560,6 @@ a:hover.upload_btn_grey{background:#8a8a8a;}
.publish-icon {background:url("/images/new_project/icons_issue.png") 0px -82px no-repeat; width:18px; height:18px; display:block;}
.publish-icon:hover {background:url("/images/new_project/icons_issue.png") -25px -82px no-repeat;}
/* 班级主页 */
.sy_class_infobox{
padding:15px;
background:#fff;
margin:0px auto ;
width:968px;
border:1px solid #e5e5e5;
position: relative;
}
.homepagePostSetting {
position:absolute;
width:20px;
height:20px;
right:10px;
top:10px;
}
.homepagePostSetting ul li:hover ul {
display:block;
}
.homepagePostSettiongText {
width:75px;
text-align: center;
line-height:2;
font-size:12px;
color:#616060;
background-color:#ffffff;
border:1px solid #eaeaea;
border-radius:3px;
position:absolute;
left:-60px;
top:20px;
padding:5px 0px;
display:none;
box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
}
a.postOptionLink {
color:#616060;
display:block;
width:55px;
padding:0px 10px;
}
a.postOptionLink:hover {
color:#fff;
background-color:#3b94d6;
}
.sy_class_logo{
width:110px;
height:110px;
}
.sy_class_id{
width:110px;
height:80px;
background:#fff;
border: 1px solid #f1f1f1;
text-align:center;
padding-top:30px;
}
.sy_class_id p{
font-size:16px;
color:#333;
}
.sy_class_title{
font-size: 18px;
font-weight: normal;
margin-bottom: 5px;
max-width:440px;
overflow:hidden;
white-space: nowrap;
text-overflow:ellipsis;
}
.sy_class_titbox{margin-bottom:5px; padding-top:10px; }
/*旧版课程大纲新建编辑*/
.sy_tab_con{width:740px; padding:20px; position:relative;}
.syllabuscon_title{
color:#000; text-align:center;
}
.syllabuscon_txt p{
font-size:14px;
line-height:1.9;
color:#000;
}
.syllabuscon_txt_title{
font-weight:bold;
margin:10px 0;
}
.syllabusbox_tishi{
font-size:14px;
width:733px;
color:#cb7c01;
padding:10px 0 0 15px;
margin-bottom:10px;
background:#fff7d1;
border:1px solid #fcd9b4;
height:34px;
}
a.syllabusbox_a_blue{
color:#3b94d6;
}
.syllabus_leftinfo p{
line-height:25px;
width:150px;
overflow:hidden;
white-space: nowrap;
text-overflow:ellipsis;
}
.syllabus_info_tishi{
font-size:16px;
width:400px;
margin:100px auto;
}
.syllabus_info_tishi a{
color:#3b94d6;
}
.homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px; }
.homepagePostSettiongText {width:75px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-48px; top:20px; padding:5px 0px; display:none;}
.homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat;}
a.AnnexBtn{ background: url(../images/homepage_icon.png) 0px -343px no-repeat !important; height:20px; display:block; padding-left:20px; color:#888888; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
a:hover.AnnexBtn{background: url(../images/homepage_icon.png) -90px -343px no-repeat !important; color:#3598db; -moz-transition :all 0s linear 0s; -webkit-transition :all 0s linear 0s; -o-transition:all 0s linear 0s; transition:all 0s linear 0s;}
a.BlueCirBtnMini{ display:block;width:40px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3b94d6; color:#3b94d6; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}
a:hover.BlueCirBtnMini{ background:#3b94d6; color:#fff;}
/* 按钮 复制课程大纲*/
a.btn_orange_big{
border: 1px solid #ee4a1f;
color: #ee4a1f;
text-align: center;
font-size: 14px;
padding:0 10px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.btn_orange_big{
background: #ee4a1f;
color: #fff;
}
a.btn_green_big{
border: 1px solid #60b25e;
color: #60b25e;
text-align: center;
font-size: 14px;
padding:0 10px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.btn_green_big{
background: #60b25e;
color: #fff;
}
a.sy_btn_green{
display: inline-block;
color: #fff;
background: #60b25e;
text-align: center;
font-size: 12px;
padding:0 15px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.sy_btn_green{ background: #51a74f;}
a.sy_btn_grey{
color: #333;
background: #e1e1e1;
text-align: center;
font-size: 12px;
padding:0 15px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.sy_btn_grey{ background: #c3c3c3;}
a.sy_btn_blue{
color: #fff;
background: #3b94d6;
text-align: center;
font-size: 12px;
padding:0 15px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.sy_btn_blue{ background: #2788d0;}
a.hw_btn_blue{
display: inline-block;
color: #3b94d6;
border:1px solid #3b94d6;
background:#fff;
text-align: center;
font-size: 12px;
padding:0 15px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.hw_btn_blue,a:active.hw_btn_blue{ background: #3b94d6; color:#fff;}
/* 缺陷列表 */
.issues_greycirbg_btn{ background-color:#dedede; padding:1px 5px;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; }
.issues_greycirbg_btn:hover{background-color:#cbcbcb;}
@ -805,8 +584,6 @@ input.issues_calendar_input{ padding-left:5px; color:#444; border-right:none;}
.issues_nav_hover{border-bottom:3px solid #3498db; font-weight:bold; }
.issues_nav_nomall {border-bottom:none; }
.issues_nav_tag{ background-color:#eaeaea; padding:2px 8px;-webkit-border-radius:15px;-moz-border-radius:15px;-o-border-radius:15px;border-radius:15px; font-size:12px;}
.undis {display:none;}
.dis {display:block;}
.issues_form_filter{ position: absolute; top:0; right: 0;}
.issues_form_filter select{ width:70px; height:30px; border:none; font-size:14px; border:none;border-right:none; color: #888; font-size: 12px; line-height: 30px; padding-right:10px;}
.issues_form_filter select.issues_filter_select_min{width:50px; }
@ -830,55 +607,6 @@ a:hover.issues_list_title{color:#3b94d6;}
.issues_list_txt li{ height: 50px; float: left; font-size: 12px; width: 70px; text-align: center; overflow:hidden; text-overflow:ellipsis; -o-text-overflow:ellipsis; white-space:nowrap;}
.issues_list_txt li.issues_list_min{ width: 52px;}
/* 搜索 与课程相同 */
.hw_search_box{ position:relative; }
.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;}
.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(/images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;}
.hw_search_box a:hover.hw_btn_search{background:url(/images/hw/icons_hw.png) -40px -57px no-repeat;}
.hw_files_icon{display:block; width:17px; height:14px; background:url(/images/hw/icons_hw.png) 0 -135px no-repeat;}
/* 编辑删除 与课程相同 */
.sy_icons_edit{ display: inline-block; padding:9px;background:url(/images/sy/sy_icons02.png) 0 1px no-repeat; }
.sy_icons_del{ padding:9px;background:url(/images/sy/sy_icons02.png) 0 -21px no-repeat;}
.sy_icons_edit:hover{ background:url(/images/sy/sy_icons02.png) -20px 1px no-repeat; }
.sy_icons_del:hover{ background:url(/images/sy/sy_icons02.png) -20px -21px no-repeat;}
/* 翻页 与课程相同*/
.pages a{
display:block;
border:1px solid #d1d1d1;
color:#888;
float:left;
width:30px;
text-align:center;
padding:3px 0;
line-height:1.9;
margin-right:5px;
}
.pages a:hover{
background-color:#3b94d6;
border:1px solid #3b94d6;
color:#fff;
}
a.pages-big{
width:50px;
}
.pages .active{
background-color:#3b94d6;
border:1px solid #3b94d6;
color:#fff;
}
.pages{
width:330px;
margin:20px auto 10px;
}
.sy_corange{ color: #ee4a1f;}
.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;}
.sy_cgrey{ color: #888;}
a.sy_cgrey{ color: #888;}
.sy_corange{ color: #ee4a1f;}
a.sy_corange{ color: #ee4a1f;}
a.sy_cblue{ color: #3b94d6;}
/* 新增粉色关注按钮*/
a.sy_btn_pink{
display: inline-block;
@ -1183,4 +911,4 @@ a:hover.btn_newpro_grey,a:active.btn_newpro_grey{ background: #eaeaea;}
.pro_newsetting_con p,.pro_newsetting_con { line-height: 30px;}
.w650{ width: 650px;}
.pro_new_prompt{ border:1px solid #f6d0b1; padding:10px; background: #fff9e9; color: #ee4a20; text-align: center;}
p.pro_new_grey{ line-height: 1.9; }
p.pro_new_grey{ line-height: 1.9; }

86
public/stylesheets/css/public.css
View File

@ -423,9 +423,6 @@ a.sortArrowActiveU {background:url(../images/post_image_list.png) -17px -20px no
.postDate {color:#888888; font-size:12px;}
.postStatics { margin-top:28px; color:#888888; float:right; text-align:center;}
.slice {width:1px; height:25px; background-color:#d1d1d1; float:right; margin-top:35px; margin-right:20px;}
.pageRoll {float:right; border-left:1px solid #dddddd; margin-top:15px;}
.pageCell {border:1px solid #dddddd; border-width:1px 1px 1px 0px; padding:5px 12px; float:left; border-spacing:0px;}
.pageCellActive {background-color:#3498db;}
.postCreateInput {width:963px; height:28px; border:1px solid #d9d9d9 !important; outline:none;}
.upImg {padding:1px 6px; border: 1px solid #dddddd; margin-top:53px;}
@ -550,7 +547,7 @@ a:hover.st_img { border:1px solid #1c9ec7; }
.searchContentDes {width:883px;}
.searchTag {font-size:12px; color:#ffffff; background-color:#7ec8e4; height:16px; min-height:16px; max-height:16px; float:left; line-height:16px; padding:0px 3px;}
.numRed {color:#FF6600;}
.pageRoll {float:right; border-left:1px solid #dddddd; margin-top:15px;}
.pageRoll {float:right; margin-top:15px;}
.pageCell {border:1px solid #dddddd; padding:5px 12px; float:left; margin-left:-1px; position:relative;}
.pageCell:hover {border:1px solid #3498db; z-index:10;}
.pageCellActive {background-color:#3498db; border:1px solid #3498db !important; position:relative; color:#ffffff;}
@ -1431,21 +1428,6 @@ a.syllabusbox_a_blue {
margin-bottom:100px;
color:#888;
}
a.sy_btn_green{
display:inline-block;
color: #fff;
background: #60b25e;
text-align: center;
font-size: 12px;
padding:0 15px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.sy_btn_green{ background: #51a74f;}
/*资源提示框*/
.resource_tip_box {position:absolute; padding:5px 10px; white-space:nowrap; background-color:#fff; right:-150px; top:20px; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}
@ -1461,3 +1443,69 @@ a:hover.sy_btn_green{ background: #51a74f;}
.flex-container {display:flex;}
.flex-cell {flex:1;}
.flex-cell:last-child {text-align:right;}
/*新课程、项目公用样式提取*/
.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;}
.sy_cgrey{ color: #888;}
a.sy_cgrey{ color: #888;}
.sy_corange{ color: #ee4a1f;}
a.sy_corange{ color: #ee4a1f;}
a.sy_cblue{ color: #3b94d6;}
/* 编辑删除 */
.sy_icons_edit{ display: inline-block; padding:9px;background:url(/images/sy/sy_icons02.png) 0 1px no-repeat; }
.sy_icons_del{ padding:9px;background:url(/images/sy/sy_icons02.png) 0 -21px no-repeat;}
.sy_icons_edit:hover{ background:url(/images/sy/sy_icons02.png) -20px 1px no-repeat; }
.sy_icons_del:hover{ background:url(/images/sy/sy_icons02.png) -20px -21px no-repeat;}
/*搜索*/
.hw_search_box{ position:relative; }
.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;}
.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(/images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px; cursor:pointer;}
.hw_search_box a:hover.hw_btn_search{background:url(/images/hw/icons_hw.png) -40px -57px no-repeat;}
.hw_files_icon{display:block; width:17px; height:14px; background:url(/images/hw/icons_hw.png) 0 -135px no-repeat;}
/*课程大纲新建编辑*/
.sy_tab_con{
width:720px; padding:20px 28px 0 32px; position:relative;
}
.syllabuscon_title{
color:#000; text-align:center;
}
.syllabuscon_txt p{
font-size:14px;
line-height:1.9;
color:#000;
}
.syllabuscon_txt_title{
font-weight:bold;
margin:10px 0;
}
.syllabusbox_tishi{
font-size:14px;
width:733px;
color:#cb7c01;
padding:10px 0 0 15px;
margin-bottom:10px;
background:#fff7d1;
border:1px solid #fcd9b4;
height:34px;
}
a.syllabusbox_a_blue{
color:#3b94d6;
}
.syllabus_leftinfo p{
line-height:25px;
width:150px;
overflow:hidden;
white-space: nowrap;
text-overflow:ellipsis;
}
.syllabus_info_tishi{
font-size:16px;
width:400px;
margin:100px auto;
}
.syllabus_info_tishi a{
color:#3b94d6;
}

2
public/stylesheets/css/structure.css
View File

@ -235,7 +235,7 @@ a.postReplyCancel:hover {color:#ffffff;}
.homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
.homepagePostSetting ul li:hover ul {display:block;}
.homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;}
.homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;z-index:999;}
.homepagePostSettiongText {width:85px; text-align:center; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;z-index:999; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
.homepagePostSettingIcon:hover {background:url(../images/homepage_icon.png) -93px -44px no-repeat; cursor: pointer;}
.whiteSettingIcon {background:url(/images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
.whiteSettingIcon:hover {background:url(/images/homepage_icon.png) -93px -44px no-repeat;}

70
public/stylesheets/sy_public.css
View File

@ -1,16 +1,11 @@
/* 字体颜色 */
.sy_cblack{ color: #333;}
.sy_cgrey{ color: #888;}
.sy_corange{ color: #ee4a1f;}
.sy_f14{ font-size: 14px;}
.sy_f16{ font-size: 16px;}
a:hover.sy_cgrey{ color:#ee4a1f;}
a.sy_corange{ color: #ee4a1f; }
a:hover.sy_corange{ text-decoration:underline;}
a.sy_cblue{ color: #3b94d6;}
a.sy_cblack{ color: #333;}
a:hover.sy_cblack{color: #3b94d6;}
a.sy_cgrey{ color: #888;}
a.sy_cmore{ font-size:12px; color:#888; font-weight:normal;}
a:hover.sy_cmore{color: #ee4a1f;}
/* 题库新增*/
@ -72,72 +67,7 @@ a:hover.hw_corange{ color: #e1412b;}
.hw_cir_lgreen{ background:#7ecfa2;}
.hw_w20{ width:20px; display:block; text-align:center;}
.hw_w30{ width:30px; display:block; text-align:center;}
/* 按钮*/
a.btn_orange_big{
display:inline-block;
border: 1px solid #ee4a1f;
color: #ee4a1f;
text-align: center;
font-size: 12px;
padding:0 10px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.btn_orange_big{
background: #ee4a1f;
color: #fff;
}
a.btn_green_big{
display:inline-block;
border: 1px solid #60b25e;
color: #60b25e;
text-align: center;
font-size: 14px;
padding:0 10px;
height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
-o-border-radius:3px;
border-radius:3px;
}
a:hover.btn_green_big{
background: #60b25e;
color: #fff;
}
/*a.sy_btn_grey{*/
/*color: #333;*/
/*background: #e1e1e1;*/
/*text-align: center;*/
/*font-size: 12px;*/
/*padding:0 15px;*/
/*height: 30px;*/
/*line-height: 30px;*/
/*-webkit-border-radius:3px;*/
/*-moz-border-radius:3px;*/
/*-o-border-radius:3px;*/
/*border-radius:3px;*/
/*}*/
/*a:hover.sy_btn_grey{ background: #c3c3c3;}*/
/*a.sy_btn_blue{*/
/*color: #fff;*/
/*background: #3b94d6;*/
/*text-align: center;*/
/*font-size: 12px;*/
/*padding:0 15px;*/
/*height: 30px;*/
/*line-height: 30px;*/
/*-webkit-border-radius:3px;*/
/*-moz-border-radius:3px;*/
/*-o-border-radius:3px;*/
/*border-radius:3px;*/
/*}*/
/*a:hover.sy_btn_blue{ background: #2788d0;}*/
/* 排序 */
.sy_category{
height: 50px;

42
public/stylesheets/syllabus.css
View File

@ -40,37 +40,6 @@ input.syllabus_input_min{
background: #fff;
border: 1px solid #dddddd;
}
.sy_tab_con{
width:720px; padding:20px 28px 0 32px; position:relative;
}
.syllabuscon_title{
color:#000; text-align:center;
}
.syllabuscon_txt p{
font-size:14px;
line-height:1.9;
color:#000;
}
.syllabuscon_txt_title{
font-weight:bold;
margin:10px 0;
}
.syllabus_leftinfo p{
line-height:25px;
width:150px;
overflow:hidden;
white-space: nowrap;
text-overflow:ellipsis;
}
.syllabus_info_tishi{
font-size:16px;
width:400px;
margin:100px auto;
}
.syllabus_info_tishi a{
color:#3b94d6;
}
/*课程大纲-课程列表*/
.icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;}
@ -605,11 +574,8 @@ a:hover.sy_class_ltitle{ color:#333;}
.hw_more_txt {width:75px; font-size:12px; color:#616060; background-color:#fff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-40px; top:15px; padding:5px 0px; display:none; box-shadow: 0px 0px 8px rgba(146, 153, 169, 0.5); z-index:1000;}
.hw_more_txt li a.hw_more_li {font-size:12px;color:#888; display:block; width:75px;height:24px;line-height:24px;text-align:center; }
.hw_more_txt li a.hw_more_li:hover {background-color:#f0f0f0;}
.hw_search_box{ position:relative; }
.hw_search_box input.hw_search-input{ width:293px; height:28px; border:none; border:1px solid #e7e7e7; background:#fff; padding-left:5px;}
.hw_search_box span.hw_btn_search{display:block; width:20px; height:20px; background:url(../images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:15px;}
/*.hw_search_box a:hover.hw_btn_search{background:url(../images/hw/icons_hw.png) -40px -57px no-repeat;}*/
.hw_files_icon{display:block; width:17px; height:14px; background:url(../images/hw/icons_hw.png) 0 -135px no-repeat;}
.hw_list_classname{ width:300px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
.syllabus_course_name{ width:450px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
.hw_list_teachername{ width:80px; overflow:hidden; display:block;overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
@ -624,7 +590,7 @@ a:hover.sy_class_ltitle{ color:#333;}
.hw_tab_top{ height: 50px; line-height: 50px; padding-left: 15px; border-bottom:1px solid #ddd; border-left:3px solid #3b94d6; }
/*20160918教师团队*/
.sy_new_tablebox{ padding:15px; padding-bottom:none;}
.sy_new_tablebox{ padding:15px; padding-bottom:0;}
.sy_new_table{ width:100%; background:#fff; border:1px solid #e5e5e5;}
.sy_new_table thead tr{ height:40px; line-height:40px;}
.sy_new_table thead tr th{ border-bottom:1px solid #e5e5e5;}
@ -634,7 +600,6 @@ a:hover.sy_class_ltitle{ color:#333;}
.sy_new_tchlist li{ height:30px; line-height:30px;}
.sy_new_search{-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3; background:#fff; padding-left:5px; color:#888; height:32px; width:370px;box-shadow: inset 0px 0px 3px #dcdcdc; }
.sy_new_tchbox{ background:#f5f5f5; padding:15px; margin:15px; margin-top:0px;}
.sy_new_orange{font-size: 12px;padding: 0 5px;border-radius: 3px;line-height: 14px;color: #ff4a1b;border: 1px solid #ff4a1b;}
.sy_new_namebox{ width:180px; overflow:hidden;}
.sy_new_name{ display:block;max-width:120px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
.sy_new_long_name{ display:block;width:180px; overflow:hidden;white-space: nowrap; text-overflow:ellipsis;}
@ -647,10 +612,6 @@ a:hover.sy_class_ltitle{ color:#333;}
.sy_class_r_more{ display: block;}
.sy_class_fenban{border: 1px solid #e7e7e7; background-color: #fff; padding:15px;}
.sy_fenban_input{ height: 28px; background-color: #fff; border: 1px solid #d1d1d1;-webkit-border-radius:3px;-moz-border-radius:3px;-o-border-radius:3px;border-radius:3px; border:1px solid #d3d3d3;padding-left:5px; color:#888; box-shadow: inset 0px 0px 5px #dcdcdc; }
.sy_icons_edit{ display: inline-block; padding:9px;background:url(../images/sy/sy_icons02.png) 0 1px no-repeat; }
.sy_icons_del{ padding:9px;background:url(../images/sy/sy_icons02.png) 0 -21px no-repeat;}
.sy_icons_edit:hover{ background:url(../images/sy/sy_icons02.png) -20px 1px no-repeat; }
.sy_icons_del:hover{ background:url(../images/sy/sy_icons02.png) -20px -21px no-repeat;}
.sy_icons_tips{padding:9px;background:url(../images/sy/sy_icons02.png) 0 -66px no-repeat;}
.sy_sortupbtn{display: inline-block; width:15px; height:18px;background:url(../images/sy/sy_icons02.png) 0 -39px no-repeat;}
.sy_sortdownbtn{display: inline-block; width:15px; height:18px;background:url(../images/sy/sy_icons02.png) -22px -39px no-repeat;}
@ -674,5 +635,4 @@ a:hover.sy_class_ltitle{ color:#333;}
.sy_tips_box:hover .sy_tips_box_inner{ display: block;}
.sy_tips_box_inner{ position: absolute;line-height: 2.0;padding: 5px 10px; white-space: nowrap; background-color: #fff; left:30px; top: -5px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);}
.sy_tips_box_inner span { display: block; border-width: 10px;position: absolute;top: 15px; left: -18px; border-style: dashed solid dashed dashed;border-color: transparent #fff transparent transparent;font-size: 0;line-height: 0;}
.hw_search_box a.hw_btn_search{display:block; width:20px; height:20px; background:url(../images/hw/icons_hw.png) 0 -57px no-repeat; position:absolute; right:5px; top:5px;}