diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index 55bac3e46..ff211cde9 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -789,6 +789,7 @@ class CoursesController < ApplicationController @homework = Bid.new @homework.safe_attributes = params[:bid] @homework.open_anonymous_evaluation = 1 + @homework.deadline = (Time.now + 3600 * 24).strftime('%Y-%m-%d') if (User.current.logged? && User.current.member_of_course?(Course.find params[:id] )) render :layout => 'base_courses' else diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index 0949899dd..034cbdf1a 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -31,7 +31,7 @@ <%#= button_tag "浏览", :type=>"button", :onclick=>"CompatibleSend();" %> - <%= button_tag "浏览", :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()' %> + <%= button_tag "文件浏览", :type=>"button", :onclick=>"_file.click()",:onmouseover => 'this.focus()',:class => 'sb' %> <%= file_field_tag 'attachments[dummy][file]', :id => '_file', :class => 'file_selector', diff --git a/app/views/bids/_new_homework_form.html.erb b/app/views/bids/_new_homework_form.html.erb new file mode 100644 index 000000000..3150d6b6a --- /dev/null +++ b/app/views/bids/_new_homework_form.html.erb @@ -0,0 +1,41 @@ +<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %> +<%= error_messages_for 'bid' %> +<%= hidden_field_tag 'course_id', @course.id %> +
+

<%= l(:label_course_homework_new)%>

+
+
+ +
+
diff --git a/app/views/courses/homework.html.erb b/app/views/courses/homework.html.erb index 8d79c9607..bc210fcff 100644 --- a/app/views/courses/homework.html.erb +++ b/app/views/courses/homework.html.erb @@ -1,9 +1,11 @@
-

课程作业

+

+ <%= l(:label_homework)%> +

- 共有<%= @obj_count%>个作业 + <%= l(:label_totle)%><%= @obj_count%><%= l(:label_homework_count)%>

<%= link_to( l(:label_course_homework_new), new_homework_course_path(@course), :class => 'problem_new_btn fl c_dorange') if @is_teacher %>
@@ -16,7 +18,7 @@ <%= l(:label_user_create_project_homework) %>： <%= link_to(bid.name, course_for_bid_path(bid), :class => 'problem_tit fl fb c_dblue') %>
-

已提交的作业 ( <%= link_to bid.homeworks.count, course_for_bid_path(bid.id), :class => 'c_red'%> )

+

<%= l(:lebel_homework_commit)%> ( <%= link_to bid.homeworks.count, course_for_bid_path(bid.id), :class => 'c_red'%> )

<% if @is_teacher%> <%= bid_anonymous_comment(bid)%> <%= link_to(l(:button_edit),edit_bid_path(:course_id =>@course.id, :bid_id => bid.id), :class => "fr mr10 work_edit") %> @@ -24,8 +26,8 @@

<%= textilizable bid, :description %> -
创建时间 ： <%= format_time bid.created_on%>

-
展开更多信息 +
<%= l(:label_create_time)%> ： <%= format_time bid.created_on%>

+
<%= l(:label_expend_information)%>
diff --git a/app/views/courses/new_homework.html.erb b/app/views/courses/new_homework.html.erb index 2e0b35c6d..04456c4d2 100644 --- a/app/views/courses/new_homework.html.erb +++ b/app/views/courses/new_homework.html.erb @@ -1,115 +1,8 @@ - - -

<%=l(:label_course_new_homework)%>

- <%= labelled_form_for @homework, :url => {:controller => 'bids', :action => 'create_homework',:course_id => "#{params[:id] || params[:course_id]}"} do |f| %> -
- <%= render :partial => 'homework_form', :locals => { :f => f } %> - - <%= l(:button_create)%> - <%= javascript_tag "$('#bid_name').focus();" %> - <% end %> -
\ No newline at end of file + <%= render :partial => 'bids/new_homework_form', :locals => { :f => f } %> +
  • + <%= l(:button_create)%> + <%= link_to l(:button_cancel), homework_course_path(@course), :class => "blue_btn grey_btn fl c_white"%> +
    +
    • +<% end %> \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 2618c8b46..373943f05 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2016,7 +2016,7 @@ zh: label_anonymous_comments: 匿评 label_submit_comments: 提交评论 - field_evaluation_num: 匿评分配数量 + field_evaluation_num: 匿评分配数 label_my_score: 我的评分 field_open_anonymous_evaluation: 是否使用匿评 label_course_empty_select: 尚未选择课程！ @@ -2081,4 +2081,12 @@ zh: label_input_email: 请输入邮箱地址 project_module_files: 资源库 + label_totle: 共有 + label_homework_count: 个作业 + lebel_homework_commit: 已提交的作业 + label_open_anonymous_evaluation: 是否匿评 + label_evaluation_description: 即每份作业被允许匿评的人数 + label_name_not_null: 名称不能为空 + + diff --git a/public/images/img_floatbox.png b/public/images/img_floatbox.png new file mode 100644 index 000000000..b2167f5ff Binary files /dev/null and b/public/images/img_floatbox.png differ diff --git a/public/javascripts/course.js b/public/javascripts/course.js index 4204180d5..ffffe594b 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -1,3 +1,4 @@ +//验证搜索时输入名字 function regexName(content) { var name = $.trim($("#name").val()); @@ -14,16 +15,17 @@ function regexName(content) return true; } } - +//提交搜索 function submitSerch(content) { if(regexName(content)){$("#course_search_form").submit();} } - +//课程描述显示更多信息 function show_more_msg() { $("#course_description").toggleClass("course_description_none"); } +//作业描述显示更多信息 function news_show_more_des(id) { $('#news_description_' + id).toggleClass("news_description_none"); @@ -32,11 +34,11 @@ function bid_show_more_des(id) { $("#bid_description_" + id).toggleClass("news_description_none"); } - +//将右侧的最小高度设置成左侧高度，美化界面 $(document).ready(function () { $("#RSide").css("min-height",$("#LSide").height()-30); }); - +//课程作业结束时间倒计时 function ShowCountDown(year,month,day,divname) { var now = new Date(); @@ -52,4 +54,76 @@ function ShowCountDown(year,month,day,divname) +hour+" 时 " +minute+" 分 " +second+" 秒"); +} +//验证新建作业的名字 +function regex_bid_name() +{ + var name = $.trim($("#bid_name").val()); + + if(name=="") + { + $("#bid_name_span").text("名称不能为空"); + return false; + } + else + { + $("#bid_name_span").text(""); + return true; + } +} +function regex_evaluation_num() +{ + var evaluation_num = $.trim($("#bid_evaluation_num").val()); + var regex = /^\d+$/; + if($("#bid_open_anonymous_evaluation").attr("checked") == "checked") + { + if(evaluation_num=="") + { + $("#bid_evaluation_num_span").text("匿评分配数量不能为空"); + return false; + } + else if(regex.test(evaluation_num)) + { + if(evaluation_num > 0) + { + $("#bid_evaluation_num_span").text(""); + return true; + } + else + { + $("#bid_evaluation_num_span").text("匿评分配数量必须为大于0"); + return false; + } + } + else + { + $("#bid_evaluation_num_span").text("匿评分配数量只能为数字"); + return false; + } + } + else + { + return true; + } +} + +$(function(){ + $("#bid_open_anonymous_evaluation").click(function(){ + if($("#bid_open_anonymous_evaluation").attr("checked") == "checked") + { + $("#bid_evaluation_num").slideDown(); + } + else + { + $("#bid_evaluation_num").slideUp(); + } + }); +}); + +function submit_new_bid() +{ + if(regex_bid_name()&®ex_evaluation_num()) + { + $("#new_bid").submit(); + } } \ No newline at end of file diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 8f8364761..6848a98f2 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -13,21 +13,18 @@ .img_talk{ background:url(../images/new_project/img_project.png) 0 -62px no-repeat;} .img_ziyuan{ background:url(../images/new_project/img_project.png) 0 -115px no-repeat;} .img_edition{ background:url(../images/new_project/img_project.png) 0 -167px no-repeat;} -.project_name{ color:#058c42;} -.project_name:hover{ color:#016f33;} +a.project_name{ color:#058c42;} +a:hover.project_name{ color:#016f33;} .project_txt{ color:#0781b4; width:445px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} -.project_txt02{ color:#0781b4; width:618px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} -.project_txt:hover{ color:#066e9a;} +a.project_txt02{ color:#0781b4; width:618px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +a:hover.project_txt{ color:#066e9a;} .noline{ border-bottom:none;} -.news_description{max-height: 38px;overflow:hidden;} +.news_description{max-height: 38px;overflow:hidden; } .news_description_none{max-height: none;} -.news_foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:600px; height:20px; padding-top:3px; cursor:pointer;} -.news_foot:hover{ color:#787b7e; border:1px solid #d4d4d4;} +a.news_foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:600px; height:20px; padding-top:3px; cursor:pointer;} +a:hover.news_foot{ color:#787b7e; border:1px solid #d4d4d4;} + -/*弹框*/ -.floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;} -/*.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;}*/ -/*.box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}*/ /*邮件邀请*/ .box_main{ width:345px; margin:0 auto;} .box_h3{ color:#15bccf; text-align:center; font-size:16px;} @@ -37,29 +34,29 @@ /*.icon_addm:hover{background:url(../images/img_floatbox.png) 0 -61px no-repeat; }*/ /*.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px no-repeat;width:16px; height:16px; display:block; margin:5px 0 0 5px}*/ /*.icon_removem:hover{background:url(../images/img_floatbox.png) -22px -61px no-repeat;}*/ -.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;} -.btn_free:hover{ background:#d63502;} +a.btn_free{ background:#ff5722; display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;} +a:hover.btn_free{ background:#d63502;} /*成员邀请*/ .invi_search{ width:230px; margin:0 auto;} .invi_search_input{ border:1px solid #15bccf; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;} -.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} -.invi_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;} +a.invi_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} +a:hover.invi_search_btn{ background:#0da1b2; border:1px solid #0da1b2;} /*问题跟踪*/ .problem_top{ margin:10px 0 ;} .problem_search_input{ border:1px solid #64bdd9; width:180px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;} -.problem_search_btn{ background:#64bdd9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;} -.problem_search_btn:hover{ background:#3da1c1; border:1px solid #3da1c1;} -.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; padding:1px 3px; font-size:12px; text-align:center; padding-top:2px;} -.problem_new_btn:hover{ background:#ff7143; color:#fff;} +a.problem_search_btn{ background:#64bdd9; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #64bdd9; padding-top:2px; cursor:pointer;} +a:hover.problem_search_btn{ background:#3da1c1; border:1px solid #3da1c1;} +a.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143; padding:1px 3px; font-size:12px; text-align:center; padding-top:2px;} +a:hover.problem_new_btn{ background:#ff7143; color:#fff;} .problem_p{ color:#535252; margin-top:5px;} .problem_p span{ color:#ff3e00;} .problem_pic{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3;} -.problem_pic:hover{border:1px solid #64bdd9;} -.problem_txt{ width:610px; margin-left:10px; color:#777777;word-break: break-all;word-wrap: break-word;} -.problem_name{ color:#ff5722;} -.problem_name:hover{ color:#d33503;} -.problem_tit{ color:#0781b4; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} -.problem_tit:hover{ color:#09658c; } +a:hover.problem_pic{border:1px solid #64bdd9;} +.problem_txt{ width:610px; margin-left:10px; color:#777777;} +a.problem_name{ color:#ff5722;} +a:hover.problem_name{ color:#d33503;} +a.problem_tit{ color:#0781b4; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +a:hover.problem_tit{ color:#09658c; } .problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;} /****翻页***/ ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; } @@ -73,13 +70,13 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;} .talk_txt{ width:460px; margin-left:10px; color:#676868;} .talk_up{ color:#f63c00;} .talk_pic{width:32px; height:32px; padding:2px;} -.talk_btn{ background:#64bdd9; width:50px; height:20px; color:#fff; text-align:center; margin-top:12px; padding-top:3px;} -.talk_btn:hover{ background:#2a9dc1;} +a.talk_btn{ background:#64bdd9; width:50px; height:20px; color:#fff; text-align:center; margin-top:12px; padding-top:3px;} +a:hover.talk_btn{ background:#2a9dc1;} /****讨论区内页***/ .mt0{ margin-top:0px;} .talk_info{ color:#7d7d7d; margin-left:50px; margin-top:10px;} -.talk_edit{ color:#426e9a; margin-right:5px;} -.talk_edit:hover{ color:#ff5722;} +a.talk_edit{ color:#426e9a; margin-right:5px;} +a:hover.talk_edit{ color:#ff5722;} .talk_reply { background:#eeeeee; padding:10px; margin-bottom:10px;} .talkpage_text{ border:1px solid #64bdd9; width:600px; color:#7d7d7d; padding:5px; margin:10px 0 10px 50px; background:#fff;} /****新建讨论***/ @@ -88,10 +85,10 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;} .talk_text{ border:1px solid #64bdd9; height:100px;width:585px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;} .talk_new ul li{ } .sb{width:70px; height:26px; color:#606060; cursor:pointer;} -.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; height:26px; width:50px; text-align:center; margin-left:10px; margin-top:10px; padding-top:3px;} -.blue_btn:hover{ background:#329cbd;} -.grey_btn{ background:#d9d9d9; color:#656565;} -.grey_btn:hover{ background:#717171; color:#fff;} +a.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;} +a:hover.blue_btn{ background:#329cbd;} +a.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center; margin-left:10px; margin-bottom:10px; padding:2px 10px;} +a:hover.grey_btn{ background:#717171; color:#fff;} /****资源库***/ .f_l{ float:left;} .f_r{ float:right;} @@ -117,12 +114,12 @@ a:hover.re_fabu{background:#55a1b9;} .re_con{ margin:5px; width:665px;} .re_con_top{color:#494949; } .re_con_top span{ color:#999999; font-weight:bold;} -a.re_select{ display:block;height:20px; border:1px solid #ff9900; color:#ff9900; margin-left:10px; padding:2px 5px 1px;} +a.re_select{ display:block; height:20px; border:1px solid #ff9900; color:#ff9900; margin-left:10px; padding:2px 5px 1px;} a:hover.re_select{ background:#ff9900; color:#fff; text-decoration:none;} a.re_open{display:block; width:46px; height:19px; border:1px solid #64bdd9; color:#64bdd9; margin-left:10px;padding-top:3px;} a:hover.re_open{ background:#64bdd9; color:#fff; text-decoration:none;} a.re_de{ color:#6883b6; margin-left:15px;} -.re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;} +a:hover.re_con_box{ border-bottom:1px dashed #dadada; padding-bottom:10px; margin-bottom:10px;} /****资源库***/ /*.setting{ background:url(../images/setting.jpg) 0 0 no-repeat; width:670px; height:443px;}*/ @@ -223,35 +220,60 @@ a:hover.ping_sub{ background:#14a8b9;} .ping_distop span a{ float:right; width:20px; height:20px; background:url(images/star.png) -24px 0 no-repeat; margin-right:3px;} /* 创建作品 work */ -.Newwork{ width:668px; height:418px; border:1px solid #c3c3c3;} -.N_top{margin-left:600px; height:20px; width:60px;} -.N_top a{ font-size:14px; color:#15bccf; display:block; background:url(images/pic_ad.png) 0 5px no-repeat; height:20px; width:60px; padding-left:16px;} -.N_con{ color:#484747; font-weight:bold; width:720px; margin:15px auto;} -.N_con p{ margin-bottom:15px;} -.w430{ width:430px;} +.Newwork{ width:668px; height:418px;} +.N_top{ float:right; margin-left:390px; } +.N_con{ color:#484747; font-weight:bold; width:660px; margin-top:10px; } +.N_con p{ } +.w430{ width:470px;} +.w557{ width:557px;} .w350{ width:350px;} .w620{ width:480px; height:160px; border:1px solid #CCC;} -.bo{height:26px; border:1px solid #CCC; } +.bo{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:470px; } +.bo02{height:26px; border:1px solid #CCC; padding-left:5px; background:#fff;width:480px; margin-left:2px; color: #999; } +.hwork_txt{ width:560px; padding-left:5px; background:#fff;} a.tijiao{ height:28px; display:block; width:80px; color:#fff; background:#15bccf; text-align:center; padding-top:4px; float:left; margin-right:10px;} a:hover.tijiao{ background:#0f99a9;} -.members_left{ float:left; width:370px; margin-right:20px;} +.members_left{ float:left; width:410px; margin-right:20px; text-align:center;} .members_left{} -.members_left ul li{ height:30px; border-bottom:1px solid #CCC; width:570px; padding-top:5px; } -.members_left ul li a{ float:left;} +.members_left ul li{ height:30px; border-bottom:1px solid #E4E4E4; width:410px; padding-top:10px; } +.members_left ul li a{ float:left; text-align:center;} .members_left ul li span{ float:left; text-align:center; color:#484747;} -.w260{ text-align:center; width:160px;} +.w150{ text-align:center; width:150px;} .f_b{ font-weight: bold;} .members_right label{ margin-left:15px;} .N_search{ height:20px; border:1px solid #999;} /* 创建作品 homework */ .hwork_new{ color:#4c4c4c;} .c_red{ color:#F00;} -.hwork_input{ border:1px solid #64bdd9; height:16px; width:555px; background:#fff; margin-bottom:10px; padding:5px;} +.hwork_input{ border:1px solid #64bdd9; height:22px; width:555px; background:#fff; margin-bottom:10px; padding:5px;} .hwork_input02{ border:1px solid #64bdd9; height:15px; width:120px; background:#fff; margin-bottom:10px; padding:5px;} .hwork_text{ border:1px solid #64bdd9; height:100px;width:555px; background:#fff; margin-left:5px; padding:5px; margin-bottom:10px;} .hwork_new ul li{ } .ml21{ margin-left:21px;} .ml9{ margin-left:9px;} +.hwork_ttl{height:24px;} +.hwork_ctt{height:auto; padding-left:10px;clear:both;} +.hwork_tb_{ border-bottom:3px solid #e4e4e4; text-align:center;} +.hwork_tb_ ul{height:24px;} +.hwork_tb_ li{float:left;height: 24px;width: auto; padding:0 10px;cursor:pointer;} +.hwork_normaltab { color:#15bccf ; border-bottom:3px solid #e4e4e4; } +.hwork_hovertab { color:#656767; font-weight:bold; border-bottom:3px solid #15bccf; } +.hwork_dis{display:block; } +.hwork_undis{display:none;} +.project_none{ display:none;} +.about_project{ overflow:hidden;display:none;} +/*成员搜索*/ +.members_right{ float:left; margin-left:8px;} +.member_search{ width:220px; margin:0 auto;} +.member_search_input{ border:1px solid #15bccf; background:#fff; width:170px; height:24px; color:#9b9b9b; padding-left:5px; margin-bottom:10px;} +.member_search_btn{ background:#15bccf; color:#fff; text-align: center; width:40px; height:22px;border:1px solid #15bccf; padding-top:2px; cursor:pointer;} +.member_search_btn:hover{ background:#0da1b2; border:1px solid #0da1b2;} +a.member_btn{ padding:5px; background:#15bccf; color:#fff;} +a:hover.member_btn{ background:#329cbd;} + +/* 新建项目 */ +.pro_new{ } +.pro_new ul li{ margin-bottom:5px; width:auto; padding:2px 5px;} /* 匿名评分弹框 */ #popbox02{width:480px;height:200px;position:absolute;z-index:100;left:50%;top:50%;margin:-215px 0 0 -300px; background:#fff; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px; box-shadow:0px 0px 8px #194a81; overflow:auto;} @@ -302,6 +324,12 @@ a:hover.st_add{ color:#ff8e15;} .upimg:hover{ border:1px solid #64bdd9; } .upbtn{ margin:40px 0 0 15px; display:block; padding:2px 5px; border:1px solid #eaeaea;} .upbtn:hover{border:1px solid #64bdd9; color:#64bdd9;} +/* 功能倒计时*/ +.w_img{ float:left; margin:10px 10px 15px 0px;} +.w_p{ float:left; color:#15bccf; font-size:16px; font-weight:bold; margin-top:70px; } +/* 新建项目弹框*/ +.table_left{ width:90px; text-align:right; color:#4c4c4c; font-weight:bold;} + diff --git a/public/stylesheets/leftside.css b/public/stylesheets/leftside.css index 9e8c15442..ee7cd2001 100644 --- a/public/stylesheets/leftside.css +++ b/public/stylesheets/leftside.css @@ -16,32 +16,30 @@ a.pr_join_a{ color:#fff; display:block; padding:0 5px 0 3px; padding-top:2px; h .pr_add{display:block; background:url(../images/leftside.png) 0px -71px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } .pr_arrow{display:block; background:url(../images/leftside.png) 0px -90px no-repeat; width:11px; height:11px; margin-top:3px; float:left; } .pr_info_name{ color:#3e4040; font-size:14px; line-height:1.5;} -.pr_info_name:hover{ color:#3ca5c6;} +a:hover.pr_info_name{ color:#3ca5c6;} .pr_info_score{ font-size:14px; color:#3e4040; } .pr_info_score a{ color:#ff7143;} .pr_info_score a:hover{ color:#64bdd9;} .img_private{ background:url(../images/new_project/img_project.png) 0 0 no-repeat; width:33px; height:16px; color:#fff; font-size:12px; padding-left:7px; } .info_foot_num{ color:#3ca5c6; } -.pr_info_foot{ color:#7f7f7f; margin-top:5px; } -.info_foot_num:hover{ color:#2390b2;} +a.pr_info_foot{ color:#7f7f7f; margin-top:5px; } +a:hover.info_foot_num{ color:#2390b2;} .info_box{background:#fff; padding:10px;width:220px; } .info_box ul li{ font-size:12px; color: #3e4040; line-height:1.7;} /*左侧导航*/ .subNavBox{width:240px; background:#fff;margin:10px 10px 0 0;} -.subNav{border-bottom:solid 1px #e5e3da;cursor:pointer;font-weight:bold;font-size:14px;color:#3ca5c6;line-height:28px;padding-left:10px;background-color:#fff;} -.subNav_jiantou{background:url(../images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;} -.subNav_jiantou:hover{color:#0781b4; } +.subNav{border-bottom:solid 1px #e5e3da;cursor:pointer;font-weight:bold;font-size:14px;color:#3ca5c6; height:26px;padding-left:10px;background-color:#fff; padding-top:2px;} +a.subNav_jiantou{background:url(../images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;} +a:hover.subNav_jiantou:hover{color:#0781b4; } .currentDd{color:#0781b4; } .currentDt{background-color:#fff; } .navContent{display: none;border-bottom:solid 1px #e5e3da; } .navContent li a{display:block;width:240px;heigh:28px;text-align:center;font-size:12px;line-height:28px;color:#333} .navContent li a:hover{color:#fff;background-color:#b3e0ee} -.subnav_num{ font-weight:normal; color:#ff7143; font-size:12px;} -.subnav_green{ background:#28be6c; color:#fff; font-size:12px; font-weight:normal;height:20px; padding:0px 5px; text-align:center; margin-top:5px; margin-left:82px;} -.ml95{ margin-left:97px;} -.ml105{ margin-left:120px;} -.subnav_green:hover{ background:#14ad5a;} +a.subnav_num{ font-weight:normal; color:#ff7143; font-size:12px;} +a.subnav_green{ background:#28be6c; color:#fff; font-size:12px; font-weight:normal;height:18px; padding:0px 5px; padding-top:2px; display:block; margin-top:2px; margin-bottom:5px; float:right; margin-right:5px;} +a:hover.subnav_green{ background:#14ad5a;} /*简介*/ diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 502015dd5..d2528510c 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -13,6 +13,7 @@ a:hover,a:active{color:#000;} .fr{ float:right;} .f_l{ float:left;} .f_r{ float:right;} +.ml2{ margin-left:2px;} .ml5{ margin-left:5px;} .ml10{ margin-left:10px;} .ml15{ margin-left:15px;} @@ -25,12 +26,16 @@ a:hover,a:active{color:#000;} .mr10{ margin-right:10px;} .mr20{ margin-right:20px;} .mr30{ margin-right:30px;} +.mr40{ margin-right:40px;} .mt3{ margin-top:3px;} .mt5{ margin-top:5px;} .mt10{ margin-top:10px;} .mb5{ margin-bottom:5px;} .mb10{ margin-bottom:10px;} .pl15{ padding-left:15px;} +.w280{ width:280px;} +.h26{ height:26px;} +.h150{ height:150px;} h2{ font-size:18px; color:#15bccf;} h3{ font-size:14px; color:#e8770d;} @@ -77,6 +82,11 @@ a:hover.c_red{ color: #C00;} .more{ font-weight:normal; color:#999; font-size:12px;} .no_line{ border-bottom:none;} +select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#999; padding-left:5px;} +.sub_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #999; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;} +.sub_btn:hover{ background:#999; color:#fff; } +table{ background:#fff;} + /*框架主类容*/ #Container{ width:940px; margin:0 auto; } @@ -108,7 +118,7 @@ div#menu a {position: relative;z-index: 10; height: 41px; display: block; float: div#menu a:hover, div#menu a:hover span { color: #a1ebff; } div#menu li.current a {} div#menu {display: block; cursor: pointer; background-repeat: no-repeat;background-position: 95% 0;padding-right: 15px; _padding-right: 20px;} -div#menu ul a.parent {background: url(../images/item.png) -20px -30px no-repeat;} +div#menu ul a.parent {background: url(../images/item.png) -20px -30px no-repeat; width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} div#menu ul a.parent:hover {background: url(../images/item.png) -20px -60px no-repeat;} div#menu ul ul a.parent {background: url(../images/item.png) -20px 6px no-repeat;} div#menu ul ul a.parent:hover {background: url(../images/item.png) -20px -11px no-repeat;} @@ -139,8 +149,8 @@ div#menu ul ul ul li a{ width:125px; overflow:hidden; white-space: nowrap; text- .search{ margin-top:8px; margin-left:71px;} .search_form{margin-top:8px;margin-left:72px;} .topbar_info{ width:350px; color:#5c5c5c; font-size:16px; margin-right:50px; line-height:1.3; padding-left:100px;} -.search_btn{ display:block; background:#15bccf; color:#fff; width:60px; height:24px; text-align:center; padding-top:3px;} -.search_btn:hover{ background: #0fa9bb;} +a.search_btn{ display:block; background:#15bccf; color:#fff; width:60px; height:24px; text-align:center; padding-top:3px;} +a:hover.search_btn{ background: #0fa9bb;} .search_text{ border:1px solid #15bccf; background:#fff; width:220px; height:25px; padding-left:5px; } /*主类容左右分栏*/ #LSide{ width:240px; } @@ -169,18 +179,17 @@ html{ overflow-x:hidden;} .msgserver { margin-top:5px;} .msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; } .opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;} -.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;} -.opnionButton:hover{background: #0fa9bb; } +a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;} +a:hover.opnionButton{background: #0fa9bb; } /* blue skin as the default skin */ .side_title {background-position:-195px 0;} .side_center {background:url(../images/blue_line.png) repeat-y center; } .side_bottom {background-position:-195px -50px;} -.close_btn {background-position:-44px 0;} -.close_btn:hover {background-position:-66px 0;} +a.close_btn {background-position:-44px 0;} +a:hover.close_btn {background-position:-66px 0;} .show_btn {background-position:-119px 0;} .msgserver a {color:#15bccf; } .msgserver a:hover { text-decoration:underline; } - /***** Ajax indicator ******/ #ajax-indicator { position: absolute; /* fixed not supported by IE */ @@ -205,3 +214,9 @@ html>body #ajax-indicator { position: fixed; } padding-left: 26px; vertical-align: bottom; } +/*弹出框*/ +.black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);} +.white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} +.floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;} +a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;} +a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;}