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

Merge branch 'dev_bigdata' into dev_shixun_project 

Conflicts:
	app/controllers/account_controller.rb
	app/views/layouts/_footer.html.erb
	app/views/layouts/_logined_header.html.erb
	app/views/layouts/base_contest_community.html.erb
	app/views/layouts/base_contests.html.erb
	app/views/layouts/base_course_community.html.erb
	app/views/layouts/base_courses.html.erb
	app/views/layouts/base_project_community.html.erb
	app/views/layouts/base_syllabus.html.erb
	app/views/layouts/new_base.html.erb
	app/views/layouts/new_base_user.html.erb
	app/views/layouts/new_base_user_show.html.erb
	public/stylesheets/css/structure.css
This commit is contained in:
huang 2017-03-14 09:30:02 +08:00
parent 63881869f6 d3f76e7077
commit 6ec7769c0e
56 changed files with 868 additions and 601 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/controllers/account_controller.rb
View File

@ -42,7 +42,34 @@ class AccountController < ApplicationController
redirect_to user_path(User.current) redirect_to user_path(User.current)
end end
else else
render :layout => 'login' render :layout => 'login_bigdata'
end
else
authenticate_user
end
end
def user_join
if params[:type] == "activated"
@message = l(:notice_account_activated)
elsif params[:type] == "expired"
@message = l(:notice_account_expired)
end
if request.get?
@login = params[:login] || true
if User.current.logged?
# 判断用户基本资料是否完善，不完善讲强制完善基本资料，完善进入主页
user = UserExtensions.where(:user_id => User.current.id).first
if user.gender.nil? || user.school_id.nil? || User.current.lastname.nil?
redirect_to my_account_path(:tip => 1)
elsif user.identity == 3 && user.school_id.nil?
redirect_to my_account_path(:tip => 1)
else
redirect_to user_path(User.current)
end
else
render :layout => 'login_bigdata'
end end
else else
authenticate_user authenticate_user

66
app/controllers/welcome_controller.rb
View File

@ -26,70 +26,8 @@ class WelcomeController < ApplicationController
before_filter :entry_select, :only => [:index] before_filter :entry_select, :only => [:index]
def index def index
# 企业版定制: params[:project]为传过来的参数 @welcome = true
redirect_to signin_path render :layout => 'login_bigdata'
return
unless params[:organization].nil?
@organization = Organization.find params[:organization]
# @organization_projects = Project.joins(:project_status).joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").where("projects.organization_id = ?", @organization.id).order("score DESC").limit(10).all
@organization_projects = @organization.projects.visible.joins("LEFT JOIN project_scores ON projects.id = project_scores.project_id").order("project_scores.score DESC").limit(10).all
@part_projects = @organization_projects.count < 9 ? find_miracle_project( 9 - @organization_projects.count, 3,"score desc") : []
# @cur_projects = Project.find(params[:organization])
# @organization = @cur_projects.enterprise_name
# @organization_projects = (current_user.admin? || User.current.member_of?(@cur_projects)) ? Project.where("enterprise_name =? ", @organization) : Project.all_public.where("enterprise_name =? ", @organization)
# @e_count = @organization_projects.count
# @part_projects = []
# # 取十个
# @organization_projects.each do |obj|
# break if(@organization_projects[10] == obj)
# @part_projects << Project.visible.find_by_id("#{obj.id}") unless obj.id.nil?
# end
# # 不够十个的用最火项目替代
# @e_count < 9 ? @part_projects = find_miracle_project( 9 - @e_count, 3,"score desc") : @part_projects
# # 配置文件首页定制
@enterprise_page = FirstPage.find_by_page_type('enterprise')
if @enterprise_page.nil?
@enterprise_page = FirstPage.new
@enterprise_page.page_type = 'enterprise'
end
# 主页配置部分结束
end
# end 企业版定制结束
if @first_page.nil? || @first_page.sort_type.nil?
@projects = find_miracle_project(10, 3,"score desc")
else
case @first_page.sort_type
when 0
@my_projects = find_my_projects
@other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
@projects = find_miracle_project(10, 3,"created_on desc")
#@projects = @projects_all.order("created_on desc")
when 1
@my_projects = find_my_projects
@other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
@projects = find_miracle_project(10, 3,"score desc")
#@projects = @projects_all.order("grade desc")
when 2
@my_projects = find_my_projects
@other_projects = @my_projects.count < 9 ? find_miracle_project( 9 - @my_projects.count, 3,"score desc") : []
@projects = find_miracle_project(10, 3,"watchers_count desc")
#@projects = @projects_all.order("watchers_count desc")
#gcm
#when '3'
#@projects=desc_sort_course_by_avtivity(@project_activity_count_array,@project_all_array)
# @projects=handle_project @projects_all,@project_activity_count
# @s_type = 3
# @projects = @projects[@project_pages.offset, @project_pages.per_page]
else
@projects = @projects_all.order("score desc")
end
end
rescue Exception => e
render_404
end end
def robots def robots

20
app/helpers/application_helper.rb
View File

@ -1416,13 +1416,15 @@ module ApplicationHelper
if args.empty? if args.empty?
title = @html_title || [] title = @html_title || []
if @project if @project
title << @project.name title << (@project.name.nil? ? "让创新更美好" : @project.name)
elsif @welcome
title << "高校教育大数据服务平台"
elsif @course elsif @course
title << @course.name title << (@course.name.nil? ? "让创新更美好" : @course.name)
elsif @contest elsif @contest
title << @contest.name title << (@contest.name.nil? ? "让创新更美好" : @contest.name)
elsif @organization elsif @organization
title << @organization.name title << (@organization.name.nil? ? "让创新更美好" : @organization.name)
elsif @forum || params[:controller] == "forums" elsif @forum || params[:controller] == "forums"
title << "问吧" title << "问吧"
elsif @user elsif @user
@ -1448,11 +1450,11 @@ module ApplicationHelper
else else
title << (User.current.id == 2 ? "未登录" : User.current.try(:realname)) title << (User.current.id == 2 ? "未登录" : User.current.try(:realname))
end end
if first_page.nil? || first_page.web_title.nil? # if first_page.nil? || first_page.web_title.nil?
title << Setting.app_title unless Setting.app_title == title.last # title << Setting.app_title unless Setting.app_title == title.last
else # else
title << first_page.web_title unless first_page.web_title == title.last # title << first_page.web_title unless first_page.web_title == title.last
end # end
title.select {|t| !t.blank? }.join(' - ') title.select {|t| !t.blank? }.join(' - ')
else else
@html_title ||= [] @html_title ||= []

149
app/views/account/login.html.erb
View File

@ -1,5 +1,42 @@
<%= stylesheet_link_tag 'css/common'%> <div class="new_register">
<%= stylesheet_link_tag 'css/public'%> <div class="new_register_con ">
<div class="new_login_box " style="margin-top: 50px;">
<% if @message %>
<p class="f14 mb5" style=" color:#fff;"><i class="<%= params[:type] == "expired" ? 'icon-bolt mr5' : 'icon-ok mr5' %>"></i><%= h @message %></p>
<% end %>
<h2 class="new_login_h2">登录
<a href="<%= user_join_path %>" class="fr mt5" style="color:#fff;">立即注册</a><div class="cl"></div>
</h2>
<div class="new_login_form">
<%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
<%= back_url_hidden_field_tag %>
<ul>
<li class="new_loggin_users">
<%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
</li>
<li class="new_loggin_li new_login_lock">
<%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
<p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe %></p>
</li>
<li>
<% if Setting.autologin? %>
<label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
<% end %>
<a href="<%= lost_password_path %>" class="fr" style="color:#fff;">
<% if Setting.lost_password? %>忘记密码<% end %>
</a>
<div class="cl"></div>
</li>
<li>
<a href="javascript:void(0);" id="regist_btn" onclick="loginin();" class ="new_login_submit" id="login_btn" style="text-decoration:none">登录</a>
</li>
</ul>
<% end %>
</div>
</div>
<div class="cl"></div>
</div>
</div>
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function(){ $(document).ready(function(){
@ -83,10 +120,10 @@
function (data) { function (data) {
if (data.valid) { if (data.valid) {
$('#mail_req').html( '<span style="color: green">'+data.message+'</span>' ); $('#mail_req').html( '<span style="color: green">'+data.message+'</span>' );
$mail_correct = true; $mail_correct = true;
} else { } else {
$('#mail_req').html( '<span style="color: #c00202">'+data.message+'</span>' ); $('#mail_req').html( '<span style="color: #c00202">'+data.message+'</span>' );
$mail_correct = false; $mail_correct = false;
} }
$('#mail_req').css('display','block'); $('#mail_req').css('display','block');
}); });
@ -98,11 +135,11 @@
var password_min_length = <%= Setting.password_min_length.to_i %> var password_min_length = <%= Setting.password_min_length.to_i %>
if (pas1.length >= password_min_length) { if (pas1.length >= password_min_length) {
$('#passwd_req').html(''); $('#passwd_req').html('');
$passwd_correct = true; $passwd_correct = true;
} }
else { else {
$('#passwd_req').html( '<span style="color: #c00202">'+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'</span>'); $('#passwd_req').html( '<span style="color: #c00202">'+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'</span>');
$passwd_correct = false; $passwd_correct = false;
} }
$('#passwd_req').css('display','block'); $('#passwd_req').css('display','block');
@ -114,108 +151,14 @@
var pas2 = document.getElementById("user_password_confirmation").value; var pas2 = document.getElementById("user_password_confirmation").value;
if (pas1.length >= password_min_length && pas1 == pas2 ) { if (pas1.length >= password_min_length && pas1 == pas2 ) {
$('#confirm_req').html('<span style="color: green">'+'<%= l(:setting_password_success) %>'+'</span>'); $('#confirm_req').html('<span style="color: green">'+'<%= l(:setting_password_success) %>'+'</span>');
$passwd_comfirm_correct = true; $passwd_comfirm_correct = true;
} }
else { else {
$('#confirm_req').html('<span style="color: #c00202">'+'<%= l(:setting_password_error) %>'+'</span>'); $('#confirm_req').html('<span style="color: #c00202">'+'<%= l(:setting_password_error) %>'+'</span>');
$passwd_comfirm_correct = false; $passwd_comfirm_correct = false;
} }
$('#confirm_req').css('display','block'); $('#confirm_req').css('display','block');
}); });
}); });
</script> </script>
<div class="new_login" id = "loginInBox">
<div class="new_login_con">
<div class="new_login_txt fl">
<h3> 欢迎加入Trustie创新实践社区</h3>
<p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
</div>
<div class="new_login_box fr mr45 mt100">
<% if @message %>
<p class="f14 mb5" style=" color:#fff;"><i class="icon-ok mr5"></i><%= h @message %></p>
<% end %>
<h2 class="new_login_h2">登录
<a href="<%= register_url_without_domain %>" class="fr mt5">立即注册</a><div class="cl"></div>
</h2>
<div class="new_login_form">
<%= form_tag(signin_path,:id=>'main_login_form',:method=>'post') do %>
<%= back_url_hidden_field_tag %>
<ul>
<li class="new_loggin_users">
<%= text_field_tag 'username', params[:username], :tabindex => '1', :class=>'new_loggin_input',:placeholder=>'请输入邮箱地址或登录名', :onkeypress => "user_name_keypress(event);"%>
</li>
<li class="new_login_lock">
<%= password_field_tag 'password', nil, :tabindex => '2', :class => 'new_loggin_input' , :placeholder => '请输入登录密码', :onkeypress => "user_name_keypress(event);"%>
<p class="new_login_error"><%= flash.empty? || flash[:error].nil? ? "" : flash[:error].html_safe %></p>
</li>
<li>
<% if Setting.autologin? %>
<label><%= check_box_tag 'autologin', 1, true, :tabindex => 4, :class => "new_login_check" %><%= l(:label_stay_logged_in) %></label>
<% end %>
<a href="<%= lost_password_path %>" class="fr">
<% if Setting.lost_password? %>忘记密码<% end %>
</a>
<div class="cl"></div>
</li>
<li><button type="submit" class="new_login_submit"><a href="javascript:void(0);" id="login_btn" onclick="$('#main_login_form').submit();" style="text-decoration: none;">登录</a></button></li>
</ul>
<% end %>
</div>
</div>
<div class="cl"></div>
</div>
</div>
<%# 注册 %>
<div class="new_register" id = "signUpBox">
<div class="new_register_con">
<div class="new_login_txt fl new_register_left">
<h3> 欢迎加入Trustie创新实践社区</h3>
<p>在这里，您的创新意识和创新潜力将得到充分发挥！目前已有超过200所高校和科研机构在平台中开展在线协同开发、协同学习和协同研究。</p>
</div>
<div class="new_login_box fr mr45 mt50">
<h2 class="new_login_h2">注册<a href="<%= signin_url_without_domain %>" class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
<div class="new_login_form">
<%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
<%= error_messages_for 'user' %>
<ul>
<li class="new_register_li">
<%= f.text_field :mail, :size => 25, :class => 'new_register_input' , :placeholder => "请输入邮箱地址"%>
<p class="new_login_error" id="mail_req" style="display: none" >请输入正确的邮箱</p>
</li>
<li class="new_register_li">
<%= f.password_field :password, :size => 25, :placeholder => "请输入密码", :class => 'new_register_input' %>
<p class="new_login_error" id="passwd_req" style="display: none">请输入6-16位密码，区分大小写，不能使用空格！</p>
</li>
<li class="new_register_li">
<%= f.password_field :password_confirmation, :size => 25, :placeholder => "请再次输入密码", :class=> 'new_register_input' %>
<p class="new_login_error" id="confirm_req" style="display: none">两次密码不一致！</p>
</li>
<li class="new_register_li mb8">
<%= f.text_field :login, :size => 25, :placeholder => "请输入用户登录名", :class => 'new_register_input'%>
</li>
<li class="mb8">
<p class="new_login_error" id="login_req" style="display: none">只能使用英文字母和数字，必须以字母开头，长度不少于4个字符、不超过15个字符</p>
</li>
<li>
<label><input type="checkbox" checked id="read_and_confirm" onchange="changeRegisterBtn(this);" class=" new_login_check">我已阅读并接受<a href="<%= agreement_path %>" >Trustie服务协议条款</a></label>
</li>
<li>
<div class="new_login_submit" id="loginUpButton">
<a href="javascript:void(0);" id="regist_btn" onclick="register();" class ="db" style="text-decoration: none;">注册</a>
</div>
</ul>
<% end %>
</div>
</div>
<div class="cl"></div>
</div>
</div>

165
app/views/account/user_join.html.erb Normal file
View File

@ -0,0 +1,165 @@
<div class="new_register">
<div class="new_register_con ">
<div class="new_login_box ">
<h2 class="new_login_h2">注册<a href="<%= signin_path %>" class="fr mt5">已有账号 请登录</a><div class="cl"></div></h2>
<div class="new_login_form">
<%= form_for :user, :url => register_path,:method=>'post', :html => {:id=>'main_reg_form'} do |f| %>
<%= error_messages_for 'user' %>
<ul >
<li class="new_register_li">
<%= f.text_field :mail, :size => 25, :class => 'new_register_input' , :placeholder => "请输入邮箱地址"%>
<p class="new_login_error" id="mail_req" style="display: none">请输入正确的邮箱</p>
</li>
<li class="new_register_li">
<%= f.password_field :password, :placeholder => "请输入密码", :class => 'new_register_input' %>
<p class="new_login_error" id="passwd_req" style="display: none">请输入8-16位密码，区分大小写，不能使用空格！</p>
</li>
<li class="new_register_li">
<%= f.password_field :password_confirmation, :placeholder => "请再次输入密码", :class=> 'new_register_input' %>
<p class="new_login_error" id="confirm_req" style="display: none">两次密码不一致！</p>
</li>
<li class="new_register_li">
<%= f.text_field :login, :placeholder => "请输入用户登录名", :class => 'new_register_input'%>
<p class="new_login_error" id="login_req" style="display: none">只能使用英文字母和数字，必须以字母开头，长度不少于4个字符、不超过15个字符</p>
</li>
<li>
<label><input type="checkbox" checked id="read_and_confirm" onchange="changeRegisterBtn(this);" class=" new_login_check">我已阅读并接受<a href="<%= agreement_path %>" >Trustie服务协议条款</a></label>
</li>
<li>
<div id="loginUpButton">
<a href="javascript:void(0);" id="regist_btn" onclick="register();" class ="new_login_submit" style="text-decoration:none;">注册</a>
</div>
</li>
</ul>
<% end %>
</div>
</div>
<div class="cl"></div>
</div>
</div>
<script type="text/javascript">
$(document).ready(function(){
$(".homepageSearchIcon").click(function(){
var val=$('input:radio[name="search_type"]:checked').val();
if(val==null){
$("#navSearchAlert").css({display:"block"});
}
else {
$("#navSearchAlert").css({display:"none"});
}
});
});
$(document).ready(function(){
$(".navHomepageSearchBoxcontainer").mouseover(function(){
$(".navSearchTypeBox").css({display:"block"});
});
$(".navHomepageSearchBoxcontainer").mouseout(function(){
$(".navSearchTypeBox").css({display:"none"});
});
})
$(document).ready(function(){
if(<%= @login%>){
$("#signUpBox").css({display:"none"});
$("#loginInBox").css({display:"block"});
}else{
$("#signUpBox").css({display:"block"});
$("#loginInBox").css({display:"none"});
}
});
var $login_correct = false;
var $mail_correct = false;
var $passwd_correct = false;
var $passwd_comfirm_correct = false;
jQuery(document).ready(function () {
var $login = $('#user_login')
var $mail = $('#user_mail')
var $password = $('#user_password')
var $password_confirmation = $('#user_password_confirmation')
$login.blur(function (event) {
if ($(this).is('#user_login')) {
if (/^[a-zA-Z][a-zA-Z\d]{3,14}$/.test(this.value) == false){
$('#login_req').html('<span style="color: #2384cd">只能使用英文字母和数字，必须以字母开头</span>');
$('#login_req').show();
return ;
}
else{
$.get(
'<%=account_valid_ajax_path%>',
{ valid: "login",
value: this.value },
function (data) {
if (data.valid) {
$('#login_req').html('<span style="color: green">'+data.message+'</span>');
$login_correct = true;
} else {
$('#login_req').html( '<span style="color: #2384cd">'+data.message+'</span>');
$login_correct = false;
}
$('#login_req').css('display','block');
});
}
}
// ;
});
$mail.blur(function (event) {
if (/^[a-zA-Z0-9]+([._\\]*[a-z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+$/.test(this.value) == false){
$('#mail_req').html( '<span style="color: #2384cd">邮件格式不对</span>').show();
$mail_correct = false;
return ;
}
if ($(this).is('#user_mail')) {
$.get('<%=account_valid_ajax_path%>',
{ valid: "mail",
value: this.value },
function (data) {
if (data.valid) {
$('#mail_req').html( '<span style="color: green">'+data.message+'</span>' );
$mail_correct = true;
} else {
$('#mail_req').html( '<span style="color: #2384cd">'+data.message+'</span>' );
$mail_correct = false;
}
$('#mail_req').css('display','block');
});
}
;
});
$password.blur(function () {
var pas1 = document.getElementById("user_password").value;
var password_min_length = <%= Setting.password_min_length.to_i %>
if (pas1.length >= password_min_length) {
$('#passwd_req').html('');
$passwd_correct = true;
}
else {
$('#passwd_req').html( '<span style="color: #2384cd">'+'<%= l(:setting_password_min_length_limit, :count => Setting.password_min_length.to_i) %>'+'</span>');
$passwd_correct = false;
}
$('#passwd_req').css('display','block');
});
$password_confirmation.blur(function () {
var password_min_length = <%= Setting.password_min_length.to_i %>
var pas1 = document.getElementById("user_password").value;
var pas2 = document.getElementById("user_password_confirmation").value;
if (pas1.length >= password_min_length && pas1 == pas2 ) {
$('#confirm_req').html('<span style="color: green">'+'<%= l(:setting_password_success) %>'+'</span>');
$passwd_comfirm_correct = true;
}
else {
$('#confirm_req').html('<span style="color: #2384cd">'+'<%= l(:setting_password_error) %>'+'</span>');
$passwd_comfirm_correct = false;
}
$('#confirm_req').css('display','block');
});
});
</script>

10
app/views/layouts/_bigdata_footer.html.erb Normal file
View File

@ -0,0 +1,10 @@
<footer class="footer">
<div class="footer_con">
<ul class="clearfix footer_con-inner">
<li><a href="<%= agreement_path %>" class="fl" target="_blank">服务协议</a></li>
<li><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "fl", :target=>"_blank" %></li>
<li><a href="<%= forums_path %>" class="fl" target="_blank" style="border:none;"><%= l(:label_forums)%></a></li>
</ul>
<p class="footer_con-p">Copyright 2007~2016, All Rights Reserved湘ICP备09019772</p>
</div>
</footer>

45
app/views/layouts/_bigdata_header.html.erb Normal file
View File

@ -0,0 +1,45 @@
<div class="header_con">
<div class="fl clearfix new-logo">
<%= link_to image_tag("../images/bigdata/new-logo.png",width:"51px", height: "45px", alt:"高校教育大数据服务平台", class:"fl "), home_path %>
<p class="fl ml10 ">高校教育大数据服务平台</p>
</div>
<a href="<%= user_join_path %>" class="fr new-btn mt10">注册</a>
<a href="<%= signin_url %>" class="fr new-btn new-btn-green mr5 mt10">登录</a>
<div id="navHomepageSearch">
<% name = name%>
<%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
<input type="text" name="q" value="<%= name.nil? ? "" : name %>" id="navHomepageSearchInput" class="new-search fr mr10" placeholder="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
<input type="hidden" name="search_type" id="type" value="all"/>
<input type="text" style="display: none;"/>
<a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
<% end %>
</div>
<%= link_to "问吧", forums_path, :class =>"fr new-nav-a mr10", :target => "_blank" %>
</div>
<script>
//搜索相关
$("#navHomepageSearch").mouseover(function(){
$("#navHomepageSearchType").show();
}).mouseout(function(){
$("#navHomepageSearchType").hide();
});
function search(doc){
$(doc).parent().submit();
}
function search_in_header(obj){
var name = $.trim($('#navHomepageSearchInput').val());
if (name != "" && name.length != 0) {
obj.parent().submit();
}
}
function search_in_header_I(e,obj){
var name = $.trim($('#navHomepageSearchInput').val());
if (e.keyCode == '13' && name != "" && name.length != 0) {
obj.parent().submit();
}
}
</script>

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

@ -1,45 +1,34 @@
<div id="Footer" class="f12"> <footer class="inner-footer">
<div class="footerAboutContainer"> <div class="inner-footer_con">
<ul class="footerAbout"> <ul class="clearfix inner-footer-nav">
<li class="fl"><a href="<%= agreement_path %>" class="f_grey mw20" target="_blank">服务协议</a>|</li> <li><a href="<%= home_path %>" class="fl" target="_blank">网站首页</a></li>
<li class="fl" style="display: none"><span class="f_grey mw20" title="暂未开放"><%= l(:label_recruitment_information)%></span>|</li> <li><a href="<%= agreement_path %>" class="fl" target="_blank">服务协议</a></li>
<% memo = Memo.where(:id => 1168).first %> <li><%= link_to l(:label_surpport_group), "#{Setting.protocol}://#{Setting.host_name}/forums/1/memos/1168", :class => "fl", :target=>"_blank" %></li>
<% if hidden_unproject_infos && !memo.nil? %> <li><a href="<%= forums_path %>" class="fl" target="_blank">社区</a></li>
<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 %>" class="f_grey mw20" target="_blank" ><%= l(:label_forums)%></a>|</li>
<li class="fl"><%= link_to "合作伙伴", "#{Setting.protocol}://#{Setting.host_name}/cooperation", :class => "f_grey mw20", :target=>"_blank" %></li>
</ul> </ul>
</div> <div class="cl"></div>
<div class="fl" style="width:440px;">
<div class="cl"></div> <p class="footer_con-p">Email:edudsj@163.com</p>
<ul class="departments"> <p class="footer_con-p">Copyright 2007~2016, All Rights Reserved 湘ICP备09019772</p>
<!--li class="fl mr10">
<strong><%#= l(:label_hosted_organization)%></strong><a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=47" class=" ml10 f_grey" target="_blank"><%#= l(:label_hosted_by)%></a>
</li>
<li class="fl">
<a href="http://www.nudt.edu.cn/ArticleShow.asp?ID=41" class="mr45 f_grey" target="_blank"><%#= l(:label_sponsor)%></a>
</li-->
<!-- <li class="fl mr10">
<strong><%#= l(:label_partners)%></strong>
</li>
<li class="fl mr20">
<a href="http://www.sei.pku.edu.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_EECS)%><img src="/images/footer_logo/PekingUniversity.png" width="121" height="40" style="display: inline-block;" alt="北京大学" /></a>
</li>
<li class="fl mr20">
<a href="http://scse.buaa.edu.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_BHU)%><img src="/images/footer_logo/BeiHang_university.png" width="173" height="40" style="display: inline-block;" alt="北京航空航天大学" /></a>
</li>
<li class="fl mr20">
<a href="http://www.iscas.ac.cn/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_CAS)%><img src="/images/footer_logo/ISCAS_logo.png" width="91" height="40" style="display: inline-block;" alt="ISCAS" /></a>
</li>
<li class="fl mr20">
<a href="http://www.inforbus.com/" class="f_grey" target="_blank"><%#= l(:label_co_organizer_InforS)%><img src="/images/footer_logo/CVICSE.png" width="165" height="40" style="display: inline-block;" alt="中创软件" /></a>
</li>
<li class="fl"><a href="http://www.webxmf.com/" target="_blank"><img src="/images/footer_logo/bee_logo.png" width="167" height="40" style="display: inline-block;" alt="web小蜜蜂" /></a></li>
</ul>
<div class="cl"></div>-->
<div class="copyright">
<p ><%= l(:label_rights_reserved)%><span class="mr10"></span><a href="http://www.miibeian.gov.cn/" class=" f_grey" target="_blank"><%= l(:label_license)%></a></p>
</div> </div>
</ul> <div class="fr mt20" >
</div><!--Footer end--> <ul class="saoma-box fl mr30">
<li>
<img src="/images/inner/img-back-weixin.png" width="50" height="50" alt="高校教育大数据服务平台" class="img-show" >
</li>
</ul>
<ul class="saoma-box fl mr30">
<li>
<img src="/images/inner/img-back-qq.png" width="50" height="50" alt="高校教育大数据服务平台" class="img-show" >
<ul class="saoma-img-box">
<font></font>
<li><img src="/images/inner/saoma-qq.jpg" width="191" height="252" alt="高校教育大数据服务平台" class="img-saoma" ></li>
</ul>
</li>
</ul>
<%= link_to image_tag("/images/bigdata/new-logo.png",width:"50px", height: "50px", alt:"高校教育大数据服务平台", class:"fl"), home_path %>
<p class="inner-footer-p-big fr ml30">高校教育大数据服务平台</p>
</div>
<div class="cl"></div>
</div>
</footer>

169
app/views/layouts/_logined_header.html.erb
View File

@ -1,40 +1,69 @@
<div class="navHomepage"> <div class="header_con">
<div class="navHomepageLogo fl"> <div class="fl clearfix new-logo">
<%=link_to image_tag("../images/nav_logo.png",width:"51px", height: "45px",class: "mt3"), user_activities_path(User.current.id)%> <%= link_to image_tag("../images/bigdata/new-logo.png",width:"51px", height: "45px", alt:"高校教育大数据服务平台", class:"fl "), home_path %>
</div> </div>
<div class="fl"> <ul class="fr inner-nav-user" id="my_account_info">
<ul> <li>
<li class="navHomepageMenu fl"> <img src="/images/inner/male.jpg" width="45" height="45" class="inner-nav-user-img"alt="高校教育大数据服务平台"></a>
<%= link_to "首页", user_activities_path(User.current), :class => "c_white f16 db p10", :title => "回到个人首页" %> <font></font>
</li> <ul class="my_account_info" id="my_account_info_ul">
<% if !hidden_unproject_infos %> <font></font>
<li class="navHomepageMenu fl"> <ul class="mt5 mb5">
<%= link_to "资源库", user_resource_user_path(User.current, :type => 1), :class => "c_white f16 db p10", :target => "_blank" %> <li class="li_bottom_border hidden" style="max-width: 150px;"><span style="color: #888;">当前账号：<span style="font-weight: bold;color: #888;"><%= User.current.show_name %></span></span></li>
</li> <li><%= link_to "我 的 主 页", user_path(User.current), :class => "menuGreyNew" %></li>
<% end %> <li><%= link_to '我 的 课 程',{:controller => "users", :action => "user_courselist", :id => User.current}, :class => "menuGreyNew" %></li>
<li><%= link_to '我 的 项 目', {:controller => "users", :action => "user_projectlist", :id => @user}, :id => 'user_project_list', :class => "menuGreyNew" %></li>
<% if hidden_unproject_infos %> <li class="li_bottom_border"><%= link_to '我 的 竞 赛', {:controller => "users", :action => "user_contestlist", :id => @user}, :id => 'user_contest_list', :class => "menuGreyNew" %></li>
<li class="navHomepageMenu fl"> <li><%= link_to "修 改 资 料", my_account_path, :class => "menuGreyNew"%></li>
<%= link_to "课程", user_course_community_path(User.current), :class => "c_white f16 db p10", :target => "_blank" %> <li><%= link_to "退 出",logout_url_without_domain,:class => "menuGreyNew",:method => "post", :id => "logout_trustie" %></li>
</li> </ul>
<% end %> </ul>
<li class="navHomepageMenu fl">
<%= link_to "项目", user_project_community_path(User.current), :class => "c_white f16 db p10", :target => "_blank" %>
</li> </li>
<% if hidden_unproject_infos %> </ul>
<li class="navHomepageMenu fl">
<%= link_to "竞赛", user_contest_community_path(User.current), :class => "c_white f16 db p10", :target => "_blank" %>
</li>
<% end %>
<li class="navHomepageMenu fl mr20">
<%= link_to "问吧", forums_path, :class =>"c_white f16 db p10", :target => "_blank" %>
</li>
</ul>
<ul class="fr inner-nav-mes" id="user_messages">
<li>
<i class="icon-bell-alt " onclick="window.location.href='<%= user_path(User.current) %>'" style="cursor: pointer;"></i>
<% new_message_count = User.current.count_new_message.to_i %>
<% if new_message_count > 0 %>
<span class="inner-nav-cir"><%= new_message_count %></span>
<% end %>
<div class="shadowbox_news" id="user_messages_list">
<%= render :partial => 'layouts/message_loading' %>
</div>
</li>
</ul>
<div id="navHomepageSearch">
<% name = name%>
<%= form_tag({controller: :welcome, action: :search }, method: :get) do %>
<input type="text" name="q" value="<%= name.nil? ? "" : name %>" id="navHomepageSearchInput" class="new-search fl ml15 mr10" placeholder="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
<input type="hidden" name="search_type" id="type" value="all"/>
<input type="text" style="display: none;"/>
<!--<a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>-->
<% end %>
</div> </div>
<script> <!--<input type="text" placeholder="请输入关键词进行搜索" class="new-search fl ml15 mr10">-->
<ul class="fl innner-nav">
<li>
<%= link_to "课程", user_course_community_path(User.current), :class => "new-nav-a", :target => "_blank" %>
</li>
<li>
<%= link_to "项目", user_project_community_path(User.current), :class => "new-nav-a", :target => "_blank" %>
</li>
<li>
<%= link_to "竞赛", user_contest_community_path(User.current), :class => "new-nav-a", :target => "_blank" %>
</li>
<li>
<%= link_to "问吧", forums_path, :class =>"new-nav-a", :target => "_blank" %>
</li>
</ul>
</div>
<script type="text/javascript">
$(function(){ $(function(){
$("#navHomepageSearchInput").keypress(function(e){ $("#navHomepageSearchInput").keypress(function(e){
var name = $.trim($('#navHomepageSearchInput').val()); var name = $.trim($('#navHomepageSearchInput').val());
@ -52,61 +81,7 @@
obj.parent().submit(); obj.parent().submit();
} }
} }
</script>
<div class="fl" id="navHomepageSearch">
<!--<form class="navHomepageSearchBox">-->
<% name = name%>
<%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
<input type="text" name="q" value="<%= name.nil? ? "" : name %>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索" style="width: 300px" />
<input type="hidden" name="search_type" id="type" value="all"/>
<input type="text" style="display: none;"/>
<a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
<% end %>
</div>
<div class="navHomepageProfile" id="navHomepageProfile">
<ul>
<li class="homepageProfileMenuIcon" id="homepageProfileMenuIcon">
<%= link_to "<div class='mt7 ' id='user_avatar'>#{image_tag(url_to_avatar(User.current),:width =>"40",:height => "40",:class => "portraitRadius",:alt=>"头像",:style=>"display:block;", :id => "nh_user_logo")}</div>".html_safe,user_activities_path(User.current.id)%>
<ul class="topnav_login_list none" id="topnav_login_list">
<li>
<%= link_to "修改资料", my_account_path, :class => "menuGrey"%>
</li>
<% if hidden_unproject_infos %>
<li>
<%= link_to '我的课程',{:controller => "users", :action => "user_courselist", :id => User.current}, :class => "menuGrey" %>
</li>
<% end %>
<li>
<%= link_to '我的项目', {:controller => "users", :action => "user_projectlist", :id => User.current}, :class => "menuGrey" %>
</li>
<li>
<%= link_to "我的组织", user_organizations_user_path(:id => User.current), :class => "menuGrey"%>
</li>
<!--<li><a href="javascript:void(0);" class="menuGrey">账号设置</a> </li>-->
<li>
<%= link_to "退出",logout_url_without_domain,:class => "menuGrey",:method => "post", :id => "logout_trustie" %>
</li>
</ul>
</li>
</ul>
</div>
<div class="navHomepageNews" id="user_messages">
<%= link_to "", user_path(User.current), :class => "homepageNewsIcon", :target => "_Blank", :title => "您的所有消息" %>
<% new_message_count = User.current.count_new_message.to_i %>
<% if new_message_count > 0 %>
<div ><%= link_to new_message_count, user_path(User.current), :class => "newsActive", :target => "_Blank" %></div>
<% end %>
<%#= link_to User.current.count_new_message, user_message_path(User.current), :class => "homepageNewsIcon" %>
<div class="shadowbox_news undis" id="user_messages_list">
<%= render :partial => 'layouts/message_loading' %>
</div>
</div>
</div>
<script type="text/javascript">
var onUserMessages = false; var onUserMessages = false;
var onNotice = false; var onNotice = false;
//搜索相关 //搜索相关
@ -143,6 +118,28 @@
onUserMessages = false; onUserMessages = false;
}); });
var onUserAccount = false;
var onNoticeAccount = false;
$("#my_account_info").mouseenter(function(){
onNoticeAccount = true;
$("#my_account_info_ul").show();
var obj = $("#my_account_info_ul");
clearTimeout(obj.timer);
}).mouseleave(function(){
onNoticeAccount = false;
var obj = $("#my_account_info_ul");
setTimeout(function(){
if(!onNoticeAccount && !onUserAccount) {
obj.hide();
} }, 500);
});
$("#my_account_info_ul").mouseenter(function(event){
event.stopPropagation();
onUserAccount = true;
}).mouseleave(function(){
onUserAccount = false;
});
$("#navHomepageProfile").mouseenter(function(){ $("#navHomepageProfile").mouseenter(function(){
$("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover"); $("#homepageProfileMenuIcon").addClass("homepageProfileMenuIconhover");
$("#topnav_login_list").show(); $("#topnav_login_list").show();

2
app/views/layouts/_message_loading.html.erb
View File

@ -1,6 +1,6 @@
<font></font> <font></font>
<div style="margin: 5px auto;width:150px;"> <div style="margin: 5px auto;width:150px;">
<img class="mr5 fl mt2" src="/images/loading.gif"> <img class="mr5 fl mt2" src="/images/loading.gif">
<span class="fl">正在加载中，请稍后...</span> <span class="fl" style="color: #888">正在加载中，请稍后...</span>
<div class="cl"></div> <div class="cl"></div>
</div> </div>

6
app/views/layouts/_show_messages_list.html.erb
View File

@ -142,10 +142,8 @@
<% end %> <% end %>
<% elsif ma.class == AppliedMessage %> <% elsif ma.class == AppliedMessage %>
<% if ma.applied_type == "AppliedProject" %> <% if ma.applied_type == "AppliedProject" %>
<li><%=link_to "<span class='shadowbox_news_user'>#{applied_project_users(ma)}</span>".html_safe, user_path(applied_project_users(ma)), :target => '_blank' %> <li><%=link_to "<span class='shadowbox_news_user'>#{applied_project_users(ma)}</span>".html_safe + " #{applied_project_tip_header(ma)}以“#{applied_project_message_type(ma.role)}”身份加入#{Project.find(ma.project_id).name}" , user_path(applied_project_users(ma)), :target => '_blank' %>
<span><%= applied_project_tip_header(ma) %>以“<%= applied_project_message_type(ma.role) %>”身份加入<% project = Project.find(ma.project_id) %> </li>
<%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
</span>
<% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 0 %> <% elsif ma.applied_type == "ApplyAddSchools" && ma.status == 0 %>
<li> <li>
<% content = '<span class="shadowbox_news_user">'+User.where("id=?", ma.applied_user_id).first.show_name+' </span>提交了申请：添加新的单位：'+"“"+ma.name+"”" %> <% content = '<span class="shadowbox_news_user">'+User.where("id=?", ma.applied_user_id).first.show_name+' </span>提交了申请：添加新的单位：'+"“"+ma.name+"”" %>

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

@ -1,102 +1,26 @@
<div class="navHomepage"> <div class="header_con">
<div class="navHomepageLogo fl"> <div class="fl clearfix new-logo">
<%= link_to image_tag("../images/nav_logo.png",width:"51px", height: "45px",class: "mt3"), signin_path %> <%= link_to image_tag("/images/bigdata/new-logo.png",width:"45px", height: "45px", alt:"高校教育大数据服务平台", class:"fl "), home_path %>
</div> </div>
<div class="fl"> <div id="navHomepageSearch">
<ul>
<!--<li class="navHomepageMenu fl mr40">-->
<!--<%#= link_to "帮助中心", "https://#{Setting.host_name}/forums/1/memos/1168", :class =>"c_white f16 db p10" %>-->
<!--</li>-->
<% if hidden_unproject_infos %>
<% 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 %>
<% else %>
<li class="navHomepageMenu fl mr40">
<%= link_to "问吧", forums_path, :class =>"c_white f16 db p10", :target => "_blank" %>
</li>
<% end %>
</ul>
</div>
<script>
function search(doc){
//alert(1)
// val = $('input:radio[name="search_type"]:checked').val();
// alert(2)
// $("#search_type").val(val);
// alert(3)
$(doc).parent().submit();
}
<!--<%# type = type%>-->
// $(function (){
// if('<%#= type %>' != null && '<%#= type %>' == 'courses' ){
// $('input:radio[value="courses"]').attr('checked','checked');
// }
// if('<%#= type %>' != null && '<%#= type %>' == 'projects' ){
// $('input:radio[value="projects"]').attr('checked','checked');
// }
// if('<%#= type %>' != null && '<%#= type %>' == 'users' ){
// $('input:radio[value="users"]').attr('checked','checked');
// }
// });
function search_in_header(obj){
var name = $.trim($('#navHomepageSearchInput').val());
if (name != "" && name.length != 0) {
//$('#type').val($('input[type=radio]:checked').val());
obj.parent().submit();
}
}
function search_in_header_I(e,obj){
var name = $.trim($('#navHomepageSearchInput').val());
if (e.keyCode == '13' && name != "" && name.length != 0) {
//$('#type').val($('input[type=radio]:checked').val());
obj.parent().submit();
}
}
</script>
<div class="fl" id="navHomepageSearch" >
<!--<form class="navHomepageSearchBox">-->
<% name = name%> <% name = name%>
<%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox', method: :get) do %>
<%= form_tag({controller: :welcome, action: :search },:class=>'navHomepageSearchBox',:style=>'width:380px;', method: :get) do %> <input type="text" name="q" value="<%= name.nil? ? "" : name %>" id="navHomepageSearchInput" class="new-search fl ml10 mr10" placeholder="请输入关键词进行搜索" onkeypress="search_in_header_I(event,$(this));"/>
<input type="text" name="q" value="<%= name.nil? ? "" : name%>" id="navHomepageSearchInput" class="navHomepageSearchInput" placeholder="请输入关键词搜索公开的班级、项目、用户、资源以及帖子" onkeypress="search_in_header_I(event,$(this));"/>
<input type="hidden" name="search_type" id="type" value="all"/> <input type="hidden" name="search_type" id="type" value="all"/>
<input type="text" style="display: none;"/> <input type="text" style="display: none;"/>
<a href="javascript:void(0);" class="homepageSearchIcon" onclick="search_in_header($(this));"></a>
<% end %> <% end %>
<!--<div class="navSearchTypeBox" id="navHomepageSearchType">-->
<!--<div class="fl mr15 mt8">-->
<!--<input type="radio" value="courses" name="search_type" checked/>-->
<!--课程-->
<!--</div>-->
<!--<div class="fl mr15 mt8">-->
<!--<input type="radio" value="projects" name="search_type" />-->
<!--项目-->
<!--</div>-->
<!--<div class="fl mr15 mt8">-->
<!--<input type="radio" value="users" name="search_type" />-->
<!--用户-->
<!--</div>-->
<!--<div id="navSearchAlert" class="fr mr10">-->
<!--<span class="c_red">请选择搜索类型</span>-->
<!--</div>-->
<!--</div>-->
</div>
<div id="loginInButton" class="fr ml20">
<a href="<%= signin_url_without_domain %>" class="c_white db">登录</a>
</div>
<div id="loginSignButton" class="fr">
<a href="<%= register_url_without_domain %>" class="c_white db">注册</a>
</div> </div>
<!--<input type="text" placeholder="请输入关键词进行搜索" class="new-search fl ml15 mr10">-->
<ul class="fl innner-nav">
<li>
<%= link_to "问吧", forums_path, :class =>"new-nav-a", :target => "_blank" %>
</li>
</ul>
<a href="<%= user_join_path %>" class="fr new-btn mt10">注册</a>
<a href="<%= signin_path %>" class="fr new-btn new-btn-green mr5 mt10">登录</a>
</div> </div>
<script type="text/javascript"> <script>
//搜索相关 //搜索相关
$("#navHomepageSearch").mouseover(function(){ $("#navHomepageSearch").mouseover(function(){
$("#navHomepageSearchType").show(); $("#navHomepageSearchType").show();
@ -104,4 +28,21 @@
$("#navHomepageSearchType").hide(); $("#navHomepageSearchType").hide();
}); });
function search(doc){
$(doc).parent().submit();
}
function search_in_header(obj){
var name = $.trim($('#navHomepageSearchInput').val());
if (name != "" && name.length != 0) {
obj.parent().submit();
}
}
function search_in_header_I(e,obj){
var name = $.trim($('#navHomepageSearchInput').val());
if (e.keyCode == '13' && name != "" && name.length != 0) {
obj.parent().submit();
}
}
</script> </script>

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

@ -17,7 +17,7 @@
<%= call_hook :view_layouts_base_html_head %> <%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags --> <!-- page specific tags -->
<%= yield :header_tags -%> <%= yield :header_tags -%>
<%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%> <%= stylesheet_link_tag 'css/common','css/structure','css/public', 'css/font-awesome', :media => 'all'%>
<!-- MathJax的配置 --> <!-- MathJax的配置 -->
<script type="text/javascript" <script type="text/javascript"
src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
@ -34,7 +34,7 @@
<body class="<%=h body_css_classes %>" onload="prettyPrint();"> <body class="<%=h body_css_classes %>" onload="prettyPrint();">
<div class="cl"></div> <div class="cl"></div>
<div class="navContainer mb10"> <div class="header">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %> <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
<% else%> <% else%>

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

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= favicon %> <%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', :media => 'all' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus','css/moduel', 'css/user', 'css/font-awesome', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %> <%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify','contest'%> <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify','contest'%>
@ -30,7 +30,7 @@
</head> </head>
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer"> <div class="header">
<% is_current_user = User.current.logged? && User.current == @user%> <% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>

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

@ -12,7 +12,7 @@
<%= javascript_heads %> <%= javascript_heads %>
<%= heads_for_theme %> <%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %> <%= call_hook :view_layouts_base_html_head %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup','css/sy_public','css/syllabus', 'css/moduel','css/contest'%> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup','sy_public','syllabus', 'css/moduel','css/contest', 'css/font-awesome' %>
<%= javascript_include_tag "course","avatars","header","attachments",'prettify','contest' %> <%= javascript_include_tag "course","avatars","header","attachments",'prettify','contest' %>
<!-- page specific tags --> <!-- page specific tags -->
<%= yield :header_tags -%> <%= yield :header_tags -%>
@ -31,7 +31,7 @@
<!--add by huang--> <!--add by huang-->
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer mb10"> <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div> <div class="header"> <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div>
<div class="cl"></div> <div class="cl"></div>
<div id="Container"> <div id="Container">

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

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= favicon %> <%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus','css/moduel', 'css/user', :media => 'all' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','syllabus','css/moduel', 'css/user', 'css/font-awesome', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %> <%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%> <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
@ -30,7 +30,7 @@
</head> </head>
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer"> <div class="header">
<% is_current_user = User.current.logged? && User.current == @user%> <% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>

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

@ -19,7 +19,7 @@
<%= javascript_heads %> <%= javascript_heads %>
<%= heads_for_theme %> <%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %> <%= call_hook :view_layouts_base_html_head %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup','css/syllabus', 'css/moduel','css/contest','css/font-awesome'%> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public', 'css/structure','prettify', 'css/courses','css/popup','sy_public','syllabus', 'css/moduel', 'css/font-awesome','css/contest' %>
<%= javascript_include_tag "course","avatars","header","attachments",'prettify' %> <%= javascript_include_tag "course","avatars","header","attachments",'prettify' %>
<!-- page specific tags --> <!-- page specific tags -->
<%= yield :header_tags -%> <%= yield :header_tags -%>
@ -42,7 +42,7 @@
</head> </head>
<!--add by huang--> <!--add by huang-->
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer"> <div class="header">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>
<% else%> <% else%>

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

@ -15,7 +15,7 @@
<%= call_hook :view_layouts_base_html_head %> <%= call_hook :view_layouts_base_html_head %>
<%= yield :header_tags -%> <%= yield :header_tags -%>
<%= stylesheet_link_tag 'css/common','css/structure','css/public', :media => 'all'%> <%= stylesheet_link_tag 'css/common','css/structure','css/public', 'css/font-awesome', :media => 'all'%>
<!-- MathJax的配置 --> <!-- MathJax的配置 -->
<script type="text/javascript" <script type="text/javascript"
src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
@ -164,7 +164,7 @@
<body class="<%= h body_css_classes %>" onload="prettyPrint();"> <body class="<%= h body_css_classes %>" onload="prettyPrint();">
<div class="cl"></div> <div class="cl"></div>
<div class="navContainer"> <div class="header">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>
<% else%> <% else%>

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

@ -15,7 +15,7 @@
<%= call_hook :view_layouts_base_html_head %> <%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags --> <!-- page specific tags -->
<%= yield :header_tags -%> <%= yield :header_tags -%>
<%= stylesheet_link_tag 'css/common','css/structure','css/public', 'css/moduel', 'css/font-awesome', 'css/popup', :media => 'all'%> <%= stylesheet_link_tag 'css/common','css/structure','css/public', 'css/moduel', 'css/font-awesome', 'css/popup', 'css/font-awesome', :media => 'all'%>
<!-- MathJax的配置 --> <!-- MathJax的配置 -->
<script type="text/javascript" <script type="text/javascript"
src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML"> src="/javascripts/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML">
@ -25,7 +25,7 @@
<body class="<%=h body_css_classes %>" onload="prettyPrint();"> <body class="<%=h body_css_classes %>" onload="prettyPrint();">
<div class="cl"></div> <div class="cl"></div>
<div class="navContainer mb10"> <div class="header">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %> <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
<% else%> <% else%>

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

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= favicon %> <%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', :media => 'all' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application','prettify', 'nyan', 'css/font-awesome', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %> <%= javascript_heads %>
<%= heads_for_theme %> <%= heads_for_theme %>
@ -33,7 +33,7 @@
<body class="<%= h body_css_classes %>"> <body class="<%= h body_css_classes %>">
<div class="cl"></div> <div class="cl"></div>
<div class="navContainer mb10"> <div class="header">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>
<% else%> <% else%>

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

@ -11,7 +11,7 @@
<%= heads_for_theme %> <%= heads_for_theme %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', :media => 'all' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application','prettify', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= stylesheet_link_tag 'css/common','css/structure','css/public','css/forum','css/popup', 'css/font-awesome','css/moduel', :media => 'all'%> <%= stylesheet_link_tag 'css/common','css/structure','css/public','css/forum','css/popup', 'css/font-awesome','css/moduel', 'css/font-awesome', :media => 'all'%>
<%= call_hook :view_layouts_base_html_head %> <%= call_hook :view_layouts_base_html_head %>
<!-- page specific tags --> <!-- page specific tags -->
<%= yield :header_tags -%> <%= yield :header_tags -%>
@ -19,7 +19,7 @@
<!--add by huang--> <!--add by huang-->
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer mb10"> <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div> <div class="header"> <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div>
<div class="cl"></div> <div class="cl"></div>
<div id="Container"> <div id="Container">

2
app/views/layouts/base_project_community.html.erb
View File

@ -30,7 +30,7 @@
</head> </head>
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer"> <div class="header">
<% is_current_user = User.current.logged? && User.current == @user%> <% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>

2
app/views/layouts/base_projects.html.erb
View File

@ -17,7 +17,7 @@
<!--add by huang--> <!--add by huang-->
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer mb10"> <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div> <div class="header"> <%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %></div>
<div class="cl"></div> <div class="cl"></div>
<div id="Container"> <div id="Container">

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

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= favicon %> <%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','css/syllabus','css/sy_public','css/moduel',:media => 'all'%> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common','css/public','css/structure','css/courses','css/popup','prettify','syllabus','sy_public','css/moduel', 'css/font-awesome',:media => 'all'%>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %> <%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus','cookie'%> <%= javascript_include_tag "bootstrap","avatars","course",'attachments','prettify','syllabus','cookie'%>
@ -30,7 +30,7 @@
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<% is_current_user = User.current.logged?%> <% is_current_user = User.current.logged?%>
<div class="navContainer"> <div class="header">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>
<% else%> <% else%>

2
app/views/layouts/login.html.erb
View File

@ -16,7 +16,7 @@
<%= yield :header_tags -%> <%= yield :header_tags -%>
</head> </head>
<body style="background-color: #fff"> <body style="background-color: #fff">
<div class="navContainer"> <div class="header">
<% is_current_user = User.current.logged? && User.current == @user%> <% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>

24
app/views/layouts/login_bigdata.html.erb Normal file
View File

@ -0,0 +1,24 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta charset="utf-8" />
<title><%= h html_title %></title>
<meta name="description" content="<%= Redmine::Info.app_name %>" />
<meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %>
<%= favicon %>
<%= stylesheet_link_tag 'css/login', 'css/font-awesome' %>
<%#= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %>
<%= javascript_include_tag "bootstrap" %>
</head>
<body>
<header class="header">
<%= render :partial => User.current.logged? ? 'layouts/logined_header' : 'layouts/unlogin_header' %>
<%#= render :partial => 'layouts/bigdata_header' %>
</header>
<%= yield %>
<%= render :partial => 'layouts/footer' %>
</body>
<%= javascript_include_tag 'bigdata' %>
</html>

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

@ -13,7 +13,7 @@
<%= javascript_heads %> <%= javascript_heads %>
<%= heads_for_theme %> <%= heads_for_theme %>
<%= call_hook :view_layouts_base_html_head %> <%= call_hook :view_layouts_base_html_head %>
<%= stylesheet_link_tag 'css/common','css/structure', 'css/public', 'css/courses','prettify', 'css/org', 'css/syllabus'%> <%= stylesheet_link_tag 'css/common','css/structure', 'css/public', 'css/courses','prettify', 'css/org', 'syllabus', 'css/font-awesome' %>
<%= javascript_include_tag "course","header",'prettify','contest' %> <%= javascript_include_tag "course","header",'prettify','contest' %>
<!-- page specific tags --> <!-- page specific tags -->
<%= yield :header_tags -%> <%= yield :header_tags -%>
@ -33,7 +33,7 @@
<!--add by huang--> <!--add by huang-->
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer mb10"> <div class="header">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>
<% else%> <% else%>

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

@ -65,7 +65,7 @@
</script> </script>
</head> </head>
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer"> <div class="header">
<% is_current_user = User.current.logged? && User.current == @user %> <% is_current_user = User.current.logged? && User.current == @user %>
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header' %> <%= render :partial => 'layouts/logined_header' %>

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

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= favicon %> <%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus',:media => 'all' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','css/common', 'css/structure','css/public', 'prettify','css/project','css/courses','css/popup','css/syllabus', 'css/font-awesome',:media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %> <%= javascript_heads %>
<%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%> <%= javascript_include_tag "bootstrap","avatars","new_user",'attachments','prettify'%>
@ -87,7 +87,7 @@
</head> </head>
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="navContainer"> <div class="header">
<% is_current_user = User.current.logged? && User.current == @user%> <% is_current_user = User.current.logged? && User.current == @user%>
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header_show' %> <%= render :partial => 'layouts/logined_header_show' %>

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

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= favicon %> <%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify','css/project', :media => 'all' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan','prettify','css/project', 'css/font-awesome', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %> <%= javascript_heads %>
<%= javascript_include_tag "jquery.leanModal.min",'prettify' %> <%= javascript_include_tag "jquery.leanModal.min",'prettify' %>
@ -32,7 +32,7 @@
</head> </head>
<body> <body>
<div class="cl"></div> <div class="cl"></div>
<div class="navContainer mb10"> <div class="header">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %> <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
<% else%> <% else%>

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

@ -7,7 +7,7 @@
<meta name="keywords" content="issue,bug,tracker" /> <meta name="keywords" content="issue,bug,tracker" />
<%= csrf_meta_tag %> <%= csrf_meta_tag %>
<%= favicon %> <%= favicon %>
<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application', 'nyan','prettify', :media => 'all' %> <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2','application', 'nyan','prettify', 'css/font-awesome', :media => 'all' %>
<%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %>
<%= javascript_heads %> <%= javascript_heads %>
<%= javascript_include_tag "jquery.leanModal.min" ,'prettify','avatars'%> <%= javascript_include_tag "jquery.leanModal.min" ,'prettify','avatars'%>
@ -32,7 +32,7 @@
</head> </head>
<body onload="prettyPrint();"> <body onload="prettyPrint();">
<div class="cl"></div> <div class="cl"></div>
<div class="navContainer mb10"> <div class="header">
<% if User.current.logged? %> <% if User.current.logged? %>
<%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %> <%= render :partial => 'layouts/logined_header',:locals=>{:name=>@name,:type=>@type} %>
<% else%> <% else%>

259
app/views/welcome/index.html.erb
View File

@ -1,158 +1,109 @@
<% @nav_dispaly_forum_label = 1 %> <div class="inner-banner">
<%= stylesheet_link_tag 'welcome' %> <div class="inner-banner-con">
<%= javascript_include_tag 'welcome' %> <h2>最省心的高校教学实践助理平台</h2>
<script type="text/javascript" language="javascript"> <h3 class="mt10 inner-banner-con-h3"><span class="inner-c_blue">智擎校园</span> 为您在教学、竞赛、开发、创新的各个环节提供帮助</h3>
$(function() { <div class="inner-btnbox clearfix">
$("#main").find("a").attr("target", "_blank"); <a href="<%= user_join_path %>" class=" btn-blue fl">创 建 账 户</a>
setCss(); <span class="fl h3 ml10 mr10 mt10 " style="font-size: 16px;">or</span>
}); <a href="<%= User.current.logged? ? user_url(User.current) : signin_url %>" class=" btn-blue-line fl">创 建 社 区</a>
//设置div居中 </div>
function setCss() { <div class="innner-banner-bottom" style="margin-left:250px;">
var mainBar = $('#main-content-bar')[0]; <span class="inner-border"></span>
var topHeight = mainBar.offsetHeight; <h3 class="fl inner-banner-con-h3">
var welcomeLeft = $('#welcome_left')[0]; <%= link_to '课程社区', User.current.logged? ? user_course_community_path(User.current) : signin_url %>
var leftHeight = welcomeLeft.offsetHeight; </h3>
var searchbar = $('#search-bar')[0]; <span class="fl ml15 f12 fb" style="margin-top: 12px;">›</span>
var searchHeight = searchbar.offsetHeight; <div class="cl"></div>
welcomeLeft.style.marginTop = (topHeight - leftHeight) / 2 + "px"; <p>帮助老师和学生<br/>提供全面的课堂教学所需的协同、<br/>共享和评估手段</p>
searchbar.style.marginTop = (topHeight - searchHeight) / 2 + "px"; </div>
//alert((topHeight - leftHeight)/2 ); <div class="innner-banner-bottom">
} <span class="inner-border"></span>
<h3 class="fl inner-banner-con-h3">
// 给主页用户弹新页面 <%= link_to '项目社区', User.current.logged? ? user_project_community_path(User.current) : signin_url %>
$(document).ready(function($) { </h3>
$("#loggedas").find("a").attr("target", "_blank"); <span class="fl ml15 f12 fb" style="margin-top: 12px;">›</span>
//$("#content .tabs_new~ .pagination").find("a").removeAttr("target"); <div class="cl"></div>
}); <p>为老师、企业和学生<br/>提供在线协同开发和创新<br/>所需的一切支持</p>
</script> </div>
<div class="innner-banner-bottom">
<div class='top_bar'> <span class="inner-border"></span>
<%#= render partial: 'wei_xin' %> <h3 class="fl inner-banner-con-h3">
<div class="main-content-bar" id="main-content-bar"> <%= link_to '竞赛社区', User.current.logged? ? user_contest_community_path(User.current) : signin_url %>
<div style="float: left;padding-left:15px "> </h3>
<!-- <#%= image_tag(get_project_avatar(@first_page), size: "75x75") %> --> <span class="fl ml15 f12 fb" style="margin-top: 12px;">›</span>
<% if @organization.nil? %> <div class="cl"></div>
<% if get_avatar?(@first_page) %> <p>提供全新的创新大赛解决方案<br/>让竞赛过程的每一个细节都可以再现<br/>支持全生命期竞赛管理</p>
<%= image_tag(url_to_avatar(@first_page), width:@first_page.image_width,height: @first_page.image_height) %> </div>
<% else %> <div class="cl"></div>
<%= image_tag '/images/transparent.png', width:@first_page.image_width,height: @first_page.image_height %> </div>
<% end %> <div class="inner-man">
<% else %> <img src="images/inner/jobs-astronaut.png" width="200" alt="高校教育大数据服务平台">
<%= image_tag(url_to_avatar(@organization), width:@first_page.image_width,height: @first_page.image_height) %> </div>
<% end %>
</div>
<div class="welcome_left" id="welcome_left">
<% if @organization.nil? %>
<% unless @first_page.nil? %>
<!-- 改为国际化后无法通过后台配置
<%#= @first_page.description.html_safe %>
-->
<!--<span class="font_welcome_trustie"><%#= @first_page.title.html_safe %></span>,&nbsp;-->
<span class="font_welcome_tdescription"><span class="font_welcome_tdescription"><%= @first_page.description.html_safe %></span></span>
<% end %>
<% else %>
<span class="font_welcome_school" style="color: #E8770D">
<%= @organization.name %>
</span>
<br/>
<span class="font_welcome_trustie">
<%= @enterprise_page.title %>
</span>
<% end %>
</div>
<div class="search-bar" id="search-bar">
<%= render :partial => "search_project", :locals => {:project_type => 0}%>
</div>
<div style="clear: both;"></div>
</div>
</div> </div>
<div style="clear:both"></div> <div class="new-container">
<div id="J_Slide" class="d-p-index-box d-p-index-hot"> <div class="new-container-inner clearfix">
<h3 style="margin-left: 5px; color: #e8770d;"><strong> <%= l(:lable_hot_projects)%> </strong></h3> <h3 class="new-container-inner-h3 " >标准化高校教学实践流程和协作工具套件</h3>
<span style="margin-top: -20px;float: right; display: block;"> <% if User.current.logged? %> <div class="inner-img fr " style="margin-right:80px;"><img src="images/inner/inner-banner01.jpg" height="600" alt="高校教育大数据服务平台"></div>
<%= link_to(l(:label_project_new), {:controller => 'projects', <div class="inner-txtbox fl mt50" style="margin-left:120px;">
:action => 'new', <h3 class="innerbox-txt-h3">课程社区</h3>
:course => 0, <p class="innerbox-txt-p">为老师和学生教学<br>提供丰富的交流与协作工具</p>
:project_type =>( @project_type||=0)}, <div class="mb10" style="height: 10px; border-bottom: 1px solid #20BEFF;">&nbsp;</div>
:class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %> <p class="innerbox-txt-p">
&nbsp;&nbsp;&nbsp;&nbsp; 支持发布和复用<br>各种类型的教学资源
<%= link_to l(:label_join_project), join_project_projects_path ,:remote => true, :class => 'icon icon-add' %> </p>
&nbsp;&nbsp;&nbsp;&nbsp; <div class="mb10" style="height: 10px; border-bottom: 1px solid #20BEFF;">&nbsp;</div>
<% end %> </span> <p class="innerbox-txt-p">
<div class="d-p-projectlist-box"> 实时统计分析教学行为<br>为各种教学评估提供数据支撑
<ul class="d-p-projectlist"> </p>
<!-- 如果企业版参数正确，这进入企业版页面 --> <div class="mb20" style="height: 10px; border-bottom: 1px solid #20BEFF;">&nbsp;</div>
<% if @organization.nil? %> <%= link_to "创建课程", new_syllabus_path, :class => "btn-blue" %>
<% @projects.map do |project| %> </div>
<%= render :partial => 'hot_projects_list', :locals => {:project => project} %> </div>
<% end; reset_cycle %>
<!-- 企业版项目 -->
<% else %>
<% if @part_projects.empty? %>
<% @projects.map do |project| %>
<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
<% end %>
<% else %>
<% @organization_projects.map do |project| %>
<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
<% end %>
<li>
<h1></h1>
<div id="errorExplanation">
<%= l(:label_part_enterprise_tips) %>
</div>
<h1></h1>
</li>
<% @part_projects.map do |project| %>
<%= render :partial => 'hot_projects_list', :locals => {:project => project} %>
<% end %>
<% end %>
<% end %>
</ul>
</div>
</div> </div>
<div class="right" style="float: right; width: 48%; padding-top: 8px;"> <div class="new-container back-color-grey">
<ul class="welcome-message-list"> <div class="new-container-inner clearfix">
<div class="forum-topic" style="height: 25px; width: 98%; margin-left: 2px;"> <div class="inner-img fl " style="margin-left:120px;"><img src="images/inner/inner-banner02.jpg" width="651" alt="高校教育大数据服务平台"></div>
<h3 style="color: rgb(21, 188, 207);"><strong> <%= l(:lable_bar_active)%> </strong> <%= link_to l(:label_my_question) , newbie_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> <div class="inner-txtbox fr mt50 " style="margin-right:80px;">
<%= link_to l(:label_my_feedback) , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%> </h3> <h3 class="innerbox-txt-h3">项目社区</h3>
<span style="margin-top: -30px;float: right; display: block;"> <%= link_to l(:button_more), forums_path %> </span> <p class="innerbox-txt-p">支持分组开发与实验<br>提供灵活的分布式协同手段</p>
</div> <div class="mb10" style="height: 10px; border-bottom: 1px solid #60B25E;">&nbsp;</div>
<div class="welcome-box-list-new memo_activity"> <p class="innerbox-txt-p">
<% topics = find_new_forum_topics(12) %> 支持Git和Pull Request协同<br>全面支持分布式软件开发
<% topics.includes(:forum, :last_reply, :author).each do |topic|%> </p>
<li class="message-brief-intro" style="line-height:1.4em;"> <div class="mb10" style="height: 10px; border-bottom: 1px solid #60B25E;">&nbsp;</div>
<div class='memo_title text_nowrap'> <p class="innerbox-txt-p">
<%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %> 与课程社区集成<br>实现了教学与工程实践一体化
<%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %> </p>
</div> <div class="mb20" style="height: 10px; border-bottom: 1px solid #60B25E;">&nbsp;</div>
<div class='memo_attr'> <%= link_to "创建项目", new_project_path, :class => "new-bigbtn-green" %>
<span class='memo_timestamp'> </div>
<%#= "#{l(:field_updated_on, value: format_time(topic_last_time topic))}" %> </div>
<%= l(:field_updated_on) %> </div>
<%= format_time topic_last_time topic %> <div class="new-container">
</span> <div class="new-container-inner clearfix">
<span class="memo_author"> <h3 class="new-container-inner-h3" style="margin-bottom:50px;" >自动化高校教学实践全生命期管理与助理平台</h3>
<%= l(:label_question_sponsor)%> <div class="inner-img02 "><img src="images/inner/inner-banner03.jpg" width="1000" alt="高校教育大数据服务平台"></div>
<%= link_to topic.author.login.truncate(10, omission: '...'),user_path(topic.author),title: topic.author.login %> <div class="inner-txtbox02 ">
</span> <p class="">自动化作业与<br>代码查重<span class="ml10 fb">›</span></p>
<span class="memo_last_person"> <p class=" ">自动化试卷与<br>程序批改<span class="ml10 fb">›</span></p>
<% unless (topic.last_reply.nil? || topic.last_reply.author.nil?) %> <p class=" ">自动化资源与<br>流程复用<span class="ml10 fb">›</span></p>
<%= l(:label_final_reply)%> <p class="">自动化教学与<br>工程评估<span class="ml10 fb">›</span></p>
<%=link_to topic.last_reply.author.login.truncate(10, omission: '...'),user_path(topic.last_reply.author),title: topic.last_reply.author.login%> </div>
<% end %> </div>
</span> </div>
<span class="memo_reply"> <div class="new-container back-color-grey">
<%= l(:label_reply)%> <div class="new-container-inner clearfix">
(<%= link_to topic.try(:replies_count), topic.event_url %>) <h3 class="new-container-inner-h3 " >个性化课程建设与教学评估的深度助理服务</h3>
</span> <div class="inner-img02"><img src="images/inner/inner-banner04.jpg" width="1000"alt="高校教育大数据服务平台"></div>
</div> </div>
</li> </div>
<% end %> <div class="new-container back-color-black">
</div> <div class="new-container-inner02 clearfix">
</ul> <h3 class="inner-banner-con-h3 inner-t-c">跑步进入基于数据智能的教学管理服务化时代</h3>
<div class="inner-btnbox02 ">
<a href="<%= user_join_path %>" class=" btn-blue mb10 ">创 建 账 户</a>
<a href="<%= User.current.logged? ? user_url(User.current) : signin_url %>" class=" btn-blue-line ">创 建 社 区</a>
</div>
</div>
</div> </div>
<div class="clearfix"></div>
<%= render partial: 'link_to_another' %>

1
config/routes.rb
View File

@ -561,6 +561,7 @@ RedmineApp::Application.routes.draw do
match 'account/heartbeat', to: 'account#heartbeat', :via => :get match 'account/heartbeat', to: 'account#heartbeat', :via => :get
match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post] match 'login', :to => 'account#login', :as => 'signin', :via => [:get, :post]
match 'user_join', :to => 'account#user_join', :as => 'user_join', :via => [:get, :post]
match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post] match 'logout', :to => 'account#logout', :as => 'signout', :via => [:get, :post]
match 'agreement',:to => 'account#agreement',:as => 'agreement',:via=>[:get] match 'agreement',:to => 'account#agreement',:as => 'agreement',:via=>[:get]
match 'about_us',:to=>'account#about_us',:as=>'about_us',:via=>[:get] match 'about_us',:to=>'account#about_us',:as=>'about_us',:via=>[:get]

BIN
public/images/bigdata/banner01.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 96 KiB

BIN
public/images/bigdata/banner03.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 98 KiB

BIN
public/images/bigdata/banner04.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

BIN
public/images/bigdata/banner05.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 134 KiB

BIN
public/images/bigdata/banner06.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 83 KiB

BIN
public/images/bigdata/icons_login.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
public/images/bigdata/new-logo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 60 KiB

BIN
public/images/bigdata/slider-bg-1.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 282 KiB

BIN
public/images/bigdata/trustie_QR.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 156 KiB

BIN
public/images/inner/banner-inner.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 63 KiB

BIN
public/images/inner/img-back-qq.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 20 KiB

BIN
public/images/inner/img-back-weixin.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 21 KiB

BIN
public/images/inner/inner-banner01.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 183 KiB

BIN
public/images/inner/inner-banner02.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 119 KiB

BIN
public/images/inner/inner-banner03.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 113 KiB

BIN
public/images/inner/inner-banner04.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 50 KiB

BIN
public/images/inner/jobs-astronaut.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 60 KiB

BIN
public/images/inner/male.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

BIN
public/images/inner/saoma-qq.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 53 KiB

17
public/javascripts/bigdata.js Normal file
View File

@ -0,0 +1,17 @@
function loginin(){
$('#main_login_form').submit(); //表单提交没有任何反应的原因：js冲突
}
function register(){
if($("#loginUpButton").hasClass('new_login_submit_disable')){
return;
}
if($login_correct && $mail_correct && $passwd_correct && $passwd_comfirm_correct && $("#read_and_confirm").attr("checked") == 'checked'){
$("#main_reg_form").submit();
}else{
$('#user_login').blur();
$('#user_mail').blur();
$('#user_password').blur();
$('#user_password_confirmation').blur();
}
}

166
public/stylesheets/css/login.css Normal file
View File

@ -0,0 +1,166 @@
body,h1,h2,h3,h4,h5,h6,hr,p,blockquote,dl,dt,dd,ul,ol,li,pre,form,fieldset,legend,button,input,textarea,th,td{ margin:0; padding:0;}
body,table,input,textarea,select,button { font-family: "微软雅黑","宋体"; font-size:12px;line-height:1.9; background:#fff;}
div,img,tr,td,table{ border:0;}
table,tr,td{border:0;cellspacing:0; cellpadding:0;}
ol,ul,li{ list-style-type:none}
a:link,a:visited{color:#333;text-decoration:none;}
a:hover,a:active{color:#026434;}
/* 公共 */
.clear:after {content:".";height:0;visibility:hidden;display:block;clear:both;}
.f12{font-size: 12px;}
.fl{ float:left;}
.fr{ float:right;}
.cl{ clear:both; overflow:hidden;}
.fb{ font-weight: bold;}
.mt5{ margin-top:5px;}
.mt10{ margin-top:10px;}
.mt20{ margin-top:20px;}
.mt30{ margin-top:30px;}
.mt50{ margin-top:50px;}
.mb5{ margin-bottom:5px;}
.mb10{ margin-bottom:10px;}
.mb20{ margin-bottom:20px;}
.mb30{ margin-bottom:30px;}
.mb50{ margin-bottom:50px;}
.ml5{ margin-left:5px;}
.ml10{ margin-left:10px;}
.ml15{ margin-left:15px;}
.ml30{margin-left: 30px;}
.ml50{margin-left: 50px;}
.mr5{ margin-right:5px;}
.mr10{ margin-right:15px;}
.mr15{ margin-right:10px;}
.mr45{ margin-right:45px;}
.mr30{ margin-right:30px;}
.mr50{ margin-right:50px;}
.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden}
.clearfix{clear:both;zoom:1}
a.new-btn{display: inline-block;border:none; padding:0 10px;color: #666;background: #e1e1e1; text-align:center;font-size: 12px; height: 30px;border-radius: 3px; line-height: 30px;}
a.new-btn:hover{background: #c3c3c3; color: #333;}
a.new-btn-green{background: #3b94d6; color: #fff;}
a.new-btn-green:hover{background: #2384cd; color: #fff;}
a.new-bigbtn{display: inline-block;border:none; padding:2px 30px;color: #666;background: #e1e1e1; text-align:center;font-size: 14px; height: 30px;line-height: 30px; border-radius: 3px;}
a:hover.new-bigbtn{background: #c3c3c3; color: #333;}
a.new-bigbtn-green{display: block; background:#60B25E; color:#fff; border-radius:5px; text-align:center; font-size:18px; padding: 5px 20px; width: 220px;}
a.new-bigbtn-green:hover{background: #51a74f; color: #fff;}
/* 头部 */
.header{ width:100%; min-width: 1200px; height:51px;background:#46484c; }
.header_con{ width:1200px; height:50px; margin:0 auto; }
.new-logo img{ width: 45px; height: 45px; margin-top:3px;}
.new-logo p{ font-size: 18px; color:#fff; line-height: 50px; }
a.new-nav-a{ display: block; font-size: 14px; line-height: 50px; color:#fff;}
a:hover.new-nav-a{ color:#3b94d6;}
input.new-search{border-radius:3px; width:300px; height:30px; margin-top: 10px; padding:0 5px; border-style: none; border: solid 1px #ccc;}
/* 登录注册 */
.new_login{ width:100%; height:450px;background:url(../images/bigdata/slider-bg-1.jpg) 0 0 no-repeat;}
.new_login_con{ width:1200px; height:450px; margin:0 auto; }
.new_login_box{width:320px; padding:10px 30px; border-radius:5px; margin:0 auto; border:solid 1px #fff;}
.new_login_h2{ font-size:18px; color:#fff; border-bottom:1px solid #fff; font-weight:normal; padding-bottom:5px; margin-bottom:30px;}
.new_login_h2 a{font-size:12px; color:#fff;background:url(images/icons_login.png) 0 -69px no-repeat; padding-left:10px;}
input.new_register_input{ -webkit-box-shadow: 0 0 0px 1000px white inset; margin-left:5px; width:305px; height:45px; border:none;outline: none;}
input.new_loggin_input{ -webkit-box-shadow: 0 0 0px 1000px white inset; margin-left:5px; width:305px; height:45px; border:none;outline: none;}
.new_loggin_users{width:320px;height:45px;border-radius:5px; border:none; background:#fff url(images/icons_login.png) 8px 9px no-repeat;}
.new_login_lock{background:#fff url(images/icons_login.png) 8px -28px no-repeat; width:320px; height:45px; border-radius:5px; border:none;}
.new_register_li{background:#fff; width:320px; height:45px; border-radius:5px; border:none;}
.new_login_form ul li{ margin-bottom:30px;}
.new_login_error{ color:#3b94d6;}
.new_login_submit_disable{ width:265px; height:40px; line-height: 40px; background:#ccc; color:#fff; font-size:14px; border-radius:5px; border:none; text-align:center; cursor:pointer; vertical-align: middle;}
a.new_login_submit{ width:320px; height:40px; display:block;line-height: 40px; background:#3b94d6; color:#fff; font-size:14px; border-radius:5px; border:none; text-align:center; cursor:pointer; vertical-align: middle;}
a.new_login_submit:hover{background: #2384cd;}
.new_login_check{ width:15px; height:15px; border:1px solid #fff; border-style:none; margin-right:5px; vertical-align: -2px;}
.new_login_form label{ color:#fff;}
.new_login_form a{ color:#fff; text-decoration:underline;}
.new_register{ width:100%; min-width:1200px; height:550px; background:#46484c; padding-top:80px;}
.new_register_con{width:1200px; height:550px; margin:0 auto; }
.new_login_txt{width:450px; height:140px; padding:30px 12px 0; color:#fff; margin:100px 0 0 100px;}
.new_login_txt h3{ font-size:24px; text-align:center; margin-bottom:20px;}
.new_login_txt p{ line-height:2.0; font-size: 16px;}
.new_register_left{ margin-top:150px;}
.new_login_tishi{ color: #fff; }
/* 展示内容 */
.new-container{ width: 100%; min-width:1200px;}
.new-container-inner{width:1200px; margin:0px auto; padding:100px 0;}
.inner-txt{ width:300px;}
.inner-txt-h3{ font-size: 18px; color: #333; margin-bottom:20px;}
.inner-txt-p{font-size: 14px; color: #666; margin-bottom:20px;}
.back-color-grey{ background:#f5f5f5;}
.guanzhu-box{ position: relative;}
.img-guanzhu{ position: absolute; top:0; left: 0;}
.guanzhu-img-box{ display: none;}
.guanzhu-box li:hover ul{display:block; }
/* 底部 */
.footer{width:100%; height:100px; background-color:#fff; }
.footer_con{ width:1200px; height:100px; margin:0 auto; text-align: center; padding:20px 0; }
.footer_con-inner{ width: 300px; margin:0px auto;}
.footer_con-inner li{ }
.footer_con-inner li a{ font-size: 14px; color: #888;display: block;padding:0 15px; border-right: solid 1px #888;}
.footer_con-inner li a:hover{text-decoration: underline;}
.footer_con-p{ color: #888; margin-top:10px;}
/* 新版内页 */
.innner-nav li{ float: left; margin-right: 25px;}
.inner-banner{ background:url(/images/inner/banner-inner.jpg) 0px 0px repeat-x; width: 100%; min-width:1200px; height: 550px; padding-top:50px; position:relative;}
.inner-banner-con{ width: 1200px; margin: 0px auto; color:#fff; text-align: center;}
.inner-man{ position: absolute; right:100px; top:115px;}
.inner-man img{width:200px; }
.inner-banner-con h2{ font-size: 60px; font-weight: normal;}
.inner-banner-con-h3{font-size: 24px; font-weight: normal; color: #fff;}
.inner-banner-con-h3 a{color: #fff;}
.inner-c_blue{ color:#3b94d6;}
a.btn-blue{ display: block; background:#3b94d6; color:#fff; border-radius:5px; text-align:center;border: 3px solid #3b94d6; font-size:18px; padding: 5px 20px; width: 220px; }
a:hover.btn-blue{background: #2384cd; border: 3px solid #2384cd;}
a.btn-blue-line{ display: block; border: 3px solid #3b94d6; color:#3b94d6; border-radius:5px; text-align:center; font-size:18px; padding: 5px 20px; width: 220px; }
a:hover.btn-blue-line{background: #3b94d6; color:#fff;}
.inner-btnbox{ width: 580px; margin: 30px auto;}
.innner-banner-bottom{ width: 300px; text-align: left; float: left; margin-top: 50px; font-size: 14px;}
.inner-border{ display: block; width: 50px; border-top:3px solid #fff; margin-bottom: 15px;}
.new-container-inner-h3{ font-size:40px; font-weight: normal; color: #333; text-align: center; margin-bottom: 20px;}
.innerbox-txt{ width:300px;}
.back-color-black{ background:#47494d;}
.inner-t-c{ text-align: center;}
.inner-footer{ width: 100%;min-width: 1200px; background:#323232; padding-bottom:30px;}
.inner-footer_con{ width: 1200px; margin: 0 auto;}
.inner-footer-nav{ height: 50px; border-bottom:1px solid #47494d;}
.inner-footer-nav li a{ float: left; margin-right:15px; font-size: 14px; color: #888; line-height: 50px;}
.saoma-box{ position: relative;}
.img-saoma{ }
.saoma-img-box{ position: absolute; top:-300px; left: -95px; border-radius:3px; background:#fff; padding:15px;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display: none;}
.saoma-box li:hover ul{display:block; }
.img-show{ width:50px; height:50px; border-radius:50px; }
.saoma-img-box font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top:289px;left: 110px; border-style:solid; border-color:#fff transparent transparent transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
.inner-footer-p-big{ display: block; height: 50px; line-height: 50px; color:#888; font-size: 16px; border-left:2px solid #888; padding-left:15px;}
.inner-btnbox02{ width:270px; margin: 30px auto 0;}
.new-container-inner02{width:1200px; margin:0px auto; padding:50px 0;}
.inner-nav-mes{ font-size:28px; color: #fff; position: relative; margin-top:3px; margin-right:35px;}
.inner-nav-cir{ position: absolute; top:0px; left:15px; background:#3b94d6; color:#fff; border-radius:15px;padding:0 5px; display: inline-block; font-size: 10px;}
.inner-nav-user{ width: 40px; height: 40px; margin-top:5px; position: relative;}
.inner-nav-user-img{ width: 40px; height: 40px; border-radius:50px;}
.inner-nav-user font{border: 1px solid #dddddd; display: block; border-width: 6px; position: absolute; top:18px;left:45px; border-style:solid; border-color:#fff transparent transparent transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5);}
/*消息弹框*/
.shadowbox_news{ width:305px; background-color:#fff; border-radius: 3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; font-size: 12px; top:50px; left:-135px;display: none; z-index:999;}
.shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
.shadowbox_news font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color: transparent transparent #fff transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
.shadowbox_news_list{ max-height:200px; overflow:hidden;}
.shadowbox_news_list a{ color:#999;}
.shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
.shadowbox_news_list li:hover{ background-color:#eee;}
span.shadowbox_news_user{ color:#3b94d6;}
a.shadowbox_news_all{ display:block; width:305px; height:40px; line-height:40px; color:#3b94d6; text-align:center;border-top:1px solid #eee;}
.inner-nav-mes li:hover ul{ display: block;}
a.menuGreyNew {color:#808080;}
a.menuGreyNew:hover {color:#297fb8;}
/*头像下拉弹框*/
.my_account_info{ width:160px; background-color:#fff; border-radius: 3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; font-size: 14px; top:50px; left:-97px;display: none; z-index:999;}
.my_account_info li a{ color: #888;}
.my_account_info font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color: transparent transparent #fff transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
.my_account_info li{ padding-left: 5px;}
.li_bottom_border{ border-bottom:1px solid #eee;}
.inner-user-info{ border-radius:3px; background:#fff; padding:15px;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); width:305px; display:block; width:300px; display: none;}
.inner-user-info font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top:289px;left: 110px; border-style:solid; border-color:transparent transparent #fff transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
.inner-user-info li a{ display: block; height: 30px; line-height: 30px; color: #fff; width: 200px; }
.inner-img02{ width: 1000px; margin:0 auto;}
.inner-txtbox02{width: 800px; margin:0 auto;}
.inner-txtbox02 p{ display: block; width: 200px; font-size: 20px; float: left; margin-top:30px; text-align: center; color:#666;}
.innerbox-txt-h3{ font-size:28px; color: #333; margin-bottom:20px;}
.innerbox-txt-p{font-size: 20px; color: #666;}

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

@ -340,7 +340,9 @@ a.newsBlue {color:#3b94d6;}
a.newsBlue:hover {color:#297fb8;} a.newsBlue:hover {color:#297fb8;}
a.newsBlack {color:#4b4b4b; font-size:14px; font-weight:bold} a.newsBlack {color:#4b4b4b; font-size:14px; font-weight:bold}
a.menuGrey {color:#808080;} a.menuGrey {color:#808080;}
a.menuGreyNew {color:#808080;}
a.menuGrey:hover {color:#fe7d68;} a.menuGrey:hover {color:#fe7d68;}
a.menuGreyNew:hover {color:#297fb8;}
.navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;} .navSearchTypeBox {width:368px; height:35px; position:absolute; border:1px solid #e1e1e1; background-color:#ffffff; padding-left:10px; display:none; color:#3e3e3e; font-size:14px;}
#navSearchAlert {display:none;} #navSearchAlert {display:none;}
/*151228侧导航样式更新*/ /*151228侧导航样式更新*/
@ -436,8 +438,25 @@ a.topnav_login_box:hover {color:#a1ebff;}
.copyright{ width:100%; text-align: center; } .copyright{ width:100%; text-align: center; }
a.f_grey {color:#666666;} a.f_grey {color:#666666;}
a.f_grey:hover {color:#000000;} a.f_grey:hover {color:#000000;}
.inner-footer{ width: 100%; background:#323232; padding-bottom:30px;}
.inner-footer_con{ width: 1200px; margin: 0 auto;}
.inner-footer-nav{ height: 50px; border-bottom:1px solid #47494d;}
.inner-footer-nav li a{ float: left; margin-right:15px; font-size: 14px; color: #888; line-height: 50px;}
.saoma-box{ position: relative;}
.img-saoma{ }
.saoma-img-box{ position: absolute; top:-300px; left: -95px; border-radius:3px; background:#fff; padding:15px;box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); display: none;}
.saoma-box li:hover ul{display:block; }
.img-show{ width:50px; height:50px; border-radius:50px; }
.saoma-img-box font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top:289px;left: 110px; border-style:solid; border-color:#fff transparent transparent transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
.footer{width:100%; height:100px; background-color:#fff; }
.footer_con{ width:1200px; height:100px; margin:0 auto; text-align: center; padding:20px 0; }
.footer_con-inner{ width: 300px; margin:0px auto;}
.footer_con-inner li{ }
.footer_con-inner li a{ font-size: 14px; color: #888;display: block;padding:0 15px; border-right: solid 1px #888;}
.footer_con-inner li a:hover{text-decoration: underline;}
.footer_con-p{ color: #888; margin-top:10px;}
/*消息弹框*/ /*消息弹框*/
.shadowbox_news{ width:305px; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;} .shadowbox_news{ width:305px; background-color:#fff; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -135px; top: 45px; z-index: 9999; font-size: 12px;display: none;}
.shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;} .shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
.shadowbox_news_p{ height:40px; line-height:40px; font-size:12px; color:#333;} .shadowbox_news_p{ height:40px; line-height:40px; font-size:12px; color:#333;}
.shadowbox_news font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color: transparent transparent #fff transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); } .shadowbox_news font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color: transparent transparent #fff transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
@ -502,4 +521,38 @@ a.user_editinfo{border-top:1px solid #e5e5e5; height:30px; line-height:30px; tex
.messageInformationContents{ margin-right:10px; font-size:14px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height:49px; float:left; } .messageInformationContents{ margin-right:10px; font-size:14px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height:49px; float:left; }
.homepageBackground{ background-color:#90C5EC; flex:1; text-align: center } .homepageBackground{ background-color:#90C5EC; flex:1; text-align: center }
.homepageClickBackground{ background-color:#3b94d6; flex:1; text-align: center } .homepageClickBackground{ background-color:#3b94d6; flex:1; text-align: center }
.flex-cell_homepage:hover{ background-color:#3b94d6;} .flex-cell_homepage:hover{ background-color:#3b94d6;}
/* 头部 */
.header{ width:100%; height:51px;background:#46484c; }
.header_con{ width:1200px; height:50px; margin:0 auto; }
.new-logo img{ width: 45px; height: 45px; margin-top:3px;}
.new-logo p{ font-size: 18px; color:#fff; line-height: 50px; }
a.new-nav-a{ display: block; font-size: 14px; line-height: 50px; color:#fff;}
a:hover.new-nav-a{ color:#3b94d6;}
input.new-search{border-radius:3px; width:300px; height:30px; margin-top: 10px; padding:0 5px; border-style: none; border: solid 1px #ccc;}
.inner-nav-user{ width: 40px; height: 40px; margin-top:5px; position: relative;}
.inner-nav-user-img{ width: 40px; height: 40px; border-radius:50px;}
.inner-nav-user font{border: 1px solid #dddddd; display: block; border-width: 6px; position: absolute; top:18px;left:45px; border-style:solid; border-color:#fff transparent transparent transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5);}
.innner-nav li{ float: left; margin-right: 25px;}
.inner-banner{ background:url(/images/inner/banner-inner.jpg) 0px 0px no-repeat; width: 100%; height: 550px; padding-top:50px;}
.inner-banner-con{ width: 1200px; margin: 0px auto; color:#fff; text-align: center;}
.inner-banner-con h2{ font-size: 60px; font-weight: normal;}
.inner-banner-con-h3{font-size: 24px; font-weight: normal; color: #fff;}
.inner-c_blue{ color:#3b94d6;}
.inner-nav-mes{ font-size:28px; color: #fff; position: relative; margin-top:3px; margin-right:35px;}
.inner-nav-mes li:hover ul{ display: block;}
.inner-nav-cir{ position: absolute; top:0px; left:15px; background:#3b94d6; color:#fff; border-radius:15px;padding:0 5px; display: inline-block; font-size: 10px;}
.inner-nav-user{ width: 40px; height: 40px; margin-top:5px; position: relative;}
.inner-nav-user-img{ width: 40px; height: 40px; border-radius:50px;}
.inner-nav-user font{border: 1px solid #dddddd; display: block; border-width: 6px; position: absolute; top:18px;left:45px; border-style:solid; border-color:#fff transparent transparent transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5);}
.my_account_info{ width:160px; background-color:#fff; border-radius: 3px; box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position:absolute; font-size: 14px; top:50px; left:-97px;display: none; z-index:999;}
.my_account_info li a{ color: #888;}
.my_account_info font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color: transparent transparent #fff transparent;font-size: 0;line-height: 0; box-shadow:2px rgba(146, 153, 169, 0.5); }
.my_account_info li{ padding-left: 5px;}
.li_bottom_border{ border-bottom:1px solid #eee;margin-top: 2px;margin-bottom: 2px;}
.inner-footer-p-big{ display: block; height: 50px; line-height: 50px; color:#888; font-size: 16px; border-left:2px solid #888; padding-left:15px;}
a.new-btn{display: inline-block;border:none; padding:0 10px;color: #666;background: #e1e1e1; text-align:center;font-size: 12px; height: 30px;border-radius: 3px; line-height: 30px;}
a.new-btn:hover{background: #c3c3c3; color: #333;}
a.new-btn-green{background: #3b94d6; color: #fff;}
a.new-btn-green:hover{background: #2384cd; color: #fff;}

22
public/stylesheets/nyan.css
View File

@ -85,17 +85,17 @@ span[id^=valid_user] {
opacity: 0.7; opacity: 0.7;
} }
.clearfix { /*.clearfix {*/
/*width: 100%; /*width: 100%;*/
height: 0px; /*height: 0px;*/
clear: both; /*clear: both;*/
display: block;*/ /*display: block;*/
display: inline-block; /*display: inline-block;*/
width: 80px; /*width: 80px;*/
overflow: hidden; /*overflow: hidden;*/
white-space: nowrap; /*white-space: nowrap;*/
text-overflow: ellipsis; /*text-overflow: ellipsis;*/
} /*}*/
/*.hidden {*/ /*.hidden {*/
/*display: none;*/ /*display: none;*/