From be08a9afbb54e3a186743265a020963b815ed528 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 15 Apr 2015 11:42:23 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9application.css=E4=B8=AD?= =?UTF-8?q?=E9=94=99=E8=AF=AFcss?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/application.css | 48 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 6ff013740..b42efdabd 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -59,7 +59,7 @@ a:hover.info_foot_num{ color:#2390b2;} /*左侧导航*/ .subNavBox{width:222px; 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{background:url(../images/jiantou1.jpg) no-repeat;background-position:95% 50%; background-color:#fff;} .subNav_jiantou:hover{color:#0781b4; } .currentDd{color:#0781b4; } .currentDt{background-color:#fff; } @@ -96,10 +96,10 @@ a.more{ float:right; font-size:12px; font-weight:normal; color:#a9a9a9; margin-t a:hover.more{ color:#64bdd9;} .project_box_ul{ padding:0 10px;} .project_box_list{ padding:10px 0; border-bottom:1px dashed #e2e1e1; padding-left:30px; color:#6f6c6c;} -.img_problem{ background:url(../images/img_project.png) 0 -20px no-repeat;} -.img_talk{ background:url(../images/img_project.png) 0 -62px no-repeat;} -.img_ziyuan{ background:url(../images/img_project.png) 0 -115px no-repeat;} -.img_edition{ background:url(../images/img_project.png) 0 -167px no-repeat;} +.img_problem{ background:url(../images/new_project/img_project.png) 0 -20px no-repeat;} +.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;} .project_txt{ color:#0781b4; width:445px; display:block; float:left; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} @@ -225,7 +225,7 @@ a:hover.upload_btn_grey{background:#8a8a8a;} .upload_btn{width:80px; height:26px;} .upload_check{ margin-top:4px;} /****其他未更新页面***/ -.setting{ background:url(../images/setting.jpg) 0 0 no-repeat; width:670px; height:443px;} +.setting{ /*background:url(../images/setting.jpg) 0 0 no-repeat;*/ width:670px; height:443px;} .newproblem{} @@ -640,8 +640,8 @@ span.forums-avatar-right{ /*added by bai*/ .user_underlinescore{ - margin:1; - padding:1; + margin: 1px; + padding: 1px; width:700px; height:1px; background-color:#15bccf; @@ -889,7 +889,7 @@ ul.tool li{list-style-type:none; font-size: 16px; color: #5c5c5c; text-align: justify; - text-justify: inter-ideograph; + /*text-justify: inter-ideograph; */ } .inf_user_image{ @@ -915,7 +915,7 @@ ul.tool li{list-style-type:none; font-size: 20px; color: #FF0000; text-align: justify; - text-justify: inter-ideograph; + /*text-justify: inter-ideograph; */ } @@ -1105,8 +1105,8 @@ ul.user_course_sort li{list-style-type:none; background-color:#adb6c5; } .user_underline{ - margin:1; - padding:1; + margin:1px; + padding:1px; width:240px; height:1px; background-color:#15bccf; @@ -1116,8 +1116,8 @@ ul.user_course_sort li{list-style-type:none; .user_enterprise_underline{ - margin:1; - padding:1; + margin:1px; + padding:1px; width:240px; height:1px; background-color:#ac344f; @@ -1125,16 +1125,16 @@ ul.user_course_sort li{list-style-type:none; } .user_underline2{ - margin:1; - padding:1; + margin:1px; + padding:1px; width:240px; height:1px; background-color:#c6e9fe; overflow:hidden } .user_underline3{ - margin:1; - padding:1; + margin: 1px; + padding:1px; width:120px; height:1px; background-color:#c6e9fe; @@ -1142,8 +1142,8 @@ ul.user_course_sort li{list-style-type:none; margin-top: 10px; } .homepage_underline{ - margin:1; - padding:1; + margin:1px; + padding:1px; width:240px; height:1px; background-color:#c6e9fe; @@ -1742,7 +1742,7 @@ margin-left:-10px; .table_font{font-size:20px;color:#DD0000} .registerd_box{padding-left: 600px;} -.project_table{margin:0,0,0,0;margin-bottom:10px;background-color:#0ee;height:50px;} +.project_table{margin:0;margin-bottom:10px;background-color:#0ee;height:50px;} .project_header_tag{float:right; color:#000000;} .project_right_tag{margin-top:44%;} @@ -2347,7 +2347,7 @@ p.progress-info {clear: left; font-size: 80%; margin-top:-4px; color:#777;} #roadmap table.progress td { height: 1.2em; } /***** Tabs *****/ #content .tabs {height: 2.6em; margin-bottom:1.2em; position:relative; overflow:hidden;} -#content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; font-family: 14px; width:2000px; border-bottom: 1px solid #15BCCF;} +#content .tabs ul {margin:0; position:absolute; bottom:0; padding-left:0.5em; width:2000px; border-bottom: 1px solid #15BCCF;} #content .tabs ul li { float:left; list-style-type:none; @@ -3062,8 +3062,8 @@ div.repos_explain{ /* new linchun compitition */ .contest_underline{ - margin:1; - padding:1; + margin:1px; + padding:1px; width:900px; height:0.5px; background-color:#aaa; From e5791576048001155f124ddebb01090c4c0ffc3d Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 15 Apr 2015 14:29:35 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0public.css=20=E8=AF=BE?= =?UTF-8?q?=E7=A8=8B=E8=AE=A8=E8=AE=BA=E5=8C=BA=E6=96=87=E4=BB=B6=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E5=92=8Ceditor=E9=9D=A0=E7=9A=84=E5=A4=AA=E8=BF=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/_form_course.html.erb | 4 +- public/images/new_project/public_icon.png | Bin 0 -> 4498 bytes public/stylesheets/public.css | 105 ++++++++++++++++++---- 3 files changed, 90 insertions(+), 19 deletions(-) create mode 100644 public/images/new_project/public_icon.png diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb index 54a62144a..9324ea59e 100644 --- a/app/views/messages/_form_course.html.erb +++ b/app/views/messages/_form_course.html.erb @@ -56,8 +56,8 @@
  • - -
    + +
    <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
    • diff --git a/public/images/new_project/public_icon.png b/public/images/new_project/public_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..8ff999f9aca1e01ad7de4921d3f098e7264f7b8a GIT binary patch literal 4498 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 U-4;68|5E^#W;R!9FL@^Z8z29Zg#Z8m literal 0 HcmV?d00001 diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 481eb2e4e..45568c913 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -8,11 +8,44 @@ a:link,a:visited{color:#7f7f7f;text-decoration:none;} a:hover,a:active{color:#000;} /*常用*/ +select,input,textarea{ border:1px solid #64bdd9; background:#fff; color:#000; padding-left:5px; } +.sub_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #707070; color:#000; border-radius:3px; padding:1px 10px; margin-bottom:10px; background:#dbdbdb;} +.sub_btn:hover{ background:#b5e2fa; color:#000; border:1px solid #3c7fb1;} +table{ background:#fff;} +.more{ font-weight:normal; color:#999; font-size:12px;} +.no_line{ border-bottom:none;} +.line{border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;} +.no_border{ border:none;} +.min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/new_project/public_icon.png) 135px -193px no-repeat; cursor:pointer;} + +/* font & color */ +h2{ font-size:18px; color:#15bccf;} +h3{ font-size:14px; color:#e8770d;} +h4{ font-size:14px; color:#3b3b3b;} +.f12{font-size:12px; font-weight:normal;} +.f14{font-size:14px;} +.f16{font-size:16px;} +.f18{font-size:18px;} +.fb{font-weight:bold;} +.lh20{line-height:20px;} +.lh22{line-height:22px;} +.lh24{line-height:24px;} +.lh26{line-height:26px;} +.fmYh{font-family:"MicroSoft Yahei";} +.font999{ color:#999;} +.fontRed{color:#770000;} + +/* Float & Clear */ .cl{ clear:both; overflow:hidden; } -.fl{ float: left;} -.fr{ float:right;} +.fl{float:left;display:inline;} +.fr{float:right;display:inline;} .f_l{ float:left;} .f_r{ float:right;} +.clearfix:after{clear:both;content:".";display:block;font-size:0;height:0;line-height:0;visibility:hidden} +.clearfix{clear:both;zoom:1} +.break_word{ word-break:break-all; word-wrap: break-word;} + +/* Spacing */ .ml2{ margin-left:2px;} .ml3{ margin-left:3px;} .ml4{ margin-left:4px;} @@ -21,12 +54,14 @@ a:hover,a:active{color:#000;} .ml10{ margin-left:10px;} .ml15{ margin-left:15px;} .ml20{ margin-left:20px;} +.ml40{ margin-left:40px;} .ml45{ margin-left:45px;} .ml55{ margin-left:55px;} .ml30{ margin-left:30px;} .ml60{ margin-left:60px;} .ml80{ margin-left:80px;} .ml90{ margin-left:90px;} +.ml110{ margin-left:110px;} .mr5{ margin-right:5px;} .mr10{ margin-right:10px;} .mr20{ margin-right:20px;} @@ -34,14 +69,20 @@ a:hover,a:active{color:#000;} .mr40{ margin-right:40px;} .mt3{ margin-top:3px;} .mt5{ margin-top:5px;} +.mt8{ margin-top:8px;} .mt10{ margin-top:10px;} .mb5{ margin-bottom:5px;} .mb10{ margin-bottom:10px;} .pl15{ padding-left:15px;} +.w90{ width:90px;} +.w210{ width:210px;} +.w150{ width:150px;} .w280{ width:280px;} .w430{ width:470px;} .w520{ width:520px;} +.w543{ width:543px;} .w557{ width:557px;} +.w583{ width:583px;} .w350{ width:350px;} .w610{ width:610px;} .w600{ width:600px;} @@ -55,8 +96,8 @@ h4{ font-size:14px; color:#3b3b3b;} a.b_grey{ background: #F5F5F5;} a.b_dgrey{ background: #CCC;} -a.c_orange{color:#e8770d;} -a:hover.c_orange{color: #F30;} +a.c_orange{color:#ff5722;} +a:hover.c_orange{color: #d33503;} a.c_lorange{color:#ff9900;} a:hover.c_lorange{color:#fff;} a.c_blue{ color:#15bccf;} @@ -74,10 +115,9 @@ a.c_blue02{color: #3ca5c6;} a:hover.c_blue02{color: #0781b4;} a.c_red{ color:#F00;} a:hover.c_red{ color: #C00;} - -.f14{ font-size:14px;} -.fb{ font-weight:bold;} -.f12{ font-size:12px; font-weight:normal;} +a.c_purple{color: #426e9a;} +a:hover.c_purple{color: #d33503;} +a.c_green{ color:#28be6c;} .b_grey{ background: #F5F5F5;} .b_dgrey{ background: #CCC;} @@ -86,28 +126,56 @@ a:hover.c_red{ color: #C00;} .c_purple{color: #6883b6;} .c_blue{ color:#15bccf;} .c_red{ color:#F00;} +.c_green{ color:#28be6c;} .c_dblue{ color:#09658c;} .b_blue{background:#64bdd9;} .b_green{background:#28be6c;} .b_w{ background:#fff;} +/* commonBtn */ .grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center;padding:2px 10px;} a.grey_btn{ background:#d9d9d9; color:#656565;font-size:14px; font-weight:normal; text-align:center;padding:2px 10px;} a:hover.grey_btn{ background:#717171; color:#fff;} +.green_btn{ background:#28be6c; color:#fff; font-size:14px; font-weight:normal;padding:2px 10px; text-align:center;} +a.green_btn{background:#28be6c;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center;} +a:hover.green_btn{ background:#14ad5a;} .blue_btn{ background:#64bdd9; color:#fff; font-size:14px; font-weight:normal;padding:2px 10px; text-align:center;} a.blue_btn{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center;} a:hover.blue_btn{ background:#329cbd;} +a.orange_btn{ background:#ff5722;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; text-align:center; } +a:hover.orange_btn{ background:#d63502;} +.green_u_btn{border:1px solid #3cb761; padding:2px 10px; color:#3cb761;} +a.green_u_btn{border:1px solid #3cb761; padding:2px 10px; color:#3cb761;} +a:hover.green_u_btn{ background:#3cb761; color:#fff;} +.orange_u_btn{border:1px solid #ff5d31; padding:2px 10px; color:#ff5d31;} +a.orange_u_btn{border:1px solid #ff5d31; padding:2px 10px; color:#ff5d31;} +a:hover.orange_u_btn{background:#ff5d31; color:#fff;} +.bgreen_u_btn{border:1px solid #1abc9c; padding:2px 10px; color:#1abc9c;} +a.bgreen_u_btn{border:1px solid #1abc9c; padding:2px 10px; color:#1abc9c;} +a:hover.bgreen_u_btn{background:#1abc9c; color:#fff;} +.blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;} +a.blue_u_btn{border:1px solid #64bdd9; padding:2px 10px; color:#64bdd9;} +a:hover.blue_u_btn{background:#64bdd9; color:#fff;} + +.nolink_btn{ background:#BCBCBC; color: #fff; padding:2px 5px;} +.more_btn{-moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #9DCEFF; color:#9DCEFF; border-radius:3px; padding:0px 3px;} +/*.upbtn{ margin:42px 0 0 10px; border:none; color:#999; }*/ +.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.blue_btn_cir{ background:#3498db; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;} +.orange_btn_cir{ background:#e67e22; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal; font-size:12px;} +/* commonpic */ +.pic_date{ display:block; background:url(../images/new_project/public_icon.png) -31px 0 no-repeat; width:16px; height:15px; float:left;} +.pic_add{ display:block; background:url(../images/new_project/public_icon.png) -31px -273px no-repeat; width:16px; height:15px; float:left;} +.pic_sch{ display:block; background:url(../images/new_project/public_icon.png) -31px -195px no-repeat; width:16px; height:15px; float:left;} +.pic_mes{ display:block; background:url(../images/new_project/public_icon.png) 0px -376px no-repeat; width:20px; height:15px; padding-left:18px;} +.pic_img{ display:block; background:url(../images/new_project/public_icon.png) -31px -419px no-repeat; width:20px; height:15px; } +.pic_del{ display:block; background:url(../images/new_project/public_icon.png) 0px -235px no-repeat; width:20px; height:15px; } -.more{ font-weight:normal; color:#999; font-size:12px;} -.no_line{ border-bottom:none;} -select,input,textarea{ border:1px solid #ccc; background:#fff; color:#999; padding-left:5px;} -.sub_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; 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; } @@ -159,7 +227,6 @@ div#menu ul ul li {width: 100%;} div#menu ul ul ul {padding: 0;margin: -38px 0 0 92px !important; width:200px; } div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf;} - /*主类容*/ #Main{ background:#fff; margin-bottom:10px;} #content{} @@ -199,7 +266,7 @@ html{ overflow-x:hidden;} .close_btn span { display:none;} .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;} .msgserver { margin-top:5px;} -.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; color:#15bccf;} +.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;} a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;} a:hover.opnionButton{background: #0fa9bb; } @@ -210,9 +277,11 @@ a:hover.opnionButton{background: #0fa9bb; } a.close_btn {background-position:-44px 0;} a:hover.close_btn {background-position:-66px 0;} .show_btn {background-position:-119px 0;} -.msgserver a:hover { color: #0fa9bb; } +.msgserver a {color:#15bccf; } .break_word{word-break: break-all;word-wrap: break-word;} .break_word_firefox{white-space: pre-wrap;word-break: break-all;} + + /***** Ajax indicator ******/ #ajax-indicator { position: absolute; /* fixed not supported by IE */ @@ -319,9 +388,11 @@ div.flash.warning, .conflict { .conflict-details {font-size:80%;} /***** end Flash & error messages ****/ + /*弹出框*/ .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;} +.white_content02{display:none;position:fixed;top:15%;left:30%;width:200px;height: auto; margin-bottom:20px;padding:10px;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;} From 898d15aa7a5624f9ec3d43ef4c4a33ec80e5b31f Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 15 Apr 2015 14:41:48 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=9B=B4=E6=96=B0course.css=E6=96=87?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 53 ++++++++++++++++++++++++++++++---- 1 file changed, 47 insertions(+), 6 deletions(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index a3e358b14..1e67e5f8d 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -123,8 +123,7 @@ a.re_open{display:block; width:46px; height:19px; border:1px solid #64bdd9; colo 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;} -/****资源库***/ -/*.setting{ background:url(../images/setting.jpg) 0 0 no-repeat; width:670px; height:443px;}*/ + /* 作业列表 */ .ttl{ } @@ -178,8 +177,6 @@ a.wzan_visited{background:url(images/pic_zan.png) 0 0 no-repeat;} .msg_box{ width:670px; height:205px; border-bottom:1px dashed #CCC; padding-top:10px;} .msg_box h4{ } .msg_box textarea{width:658px;height:90px;padding:5px;overflow:hidden;background-color: #ffffff; border:1px solid #CCC; margin:5px 0px; color:#666; font-size:12px; } -/*.msg_box a{ float:right; display:block; width:50px; height:22px; background:#15bccf; padding-top:3px; color:#fff; margin-left:10px; text-align:center; margin-top:5px; }*/ -/*.msg_box a:hover{ background-color:#03a1b3; text-decoration:none;}*/ /****评分弹框****/ @@ -242,7 +239,6 @@ a:hover.tijiao{ background:#0f99a9;} .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;} - .w150{ text-align:center; width:150px;min-height: 10px;} .f_b{ font-weight: bold;} .members_right label{ margin-left:15px;} @@ -251,7 +247,7 @@ a:hover.tijiao{ background:#0f99a9;} .hwork_new{ color:#4c4c4c;} .c_red{ color:#F00;} .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_input02{ border:1px solid #64bdd9; height:15px; width:140px; 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;} @@ -263,6 +259,7 @@ a:hover.tijiao{ background:#0f99a9;} .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;} @@ -471,6 +468,50 @@ blockquote { background: url('../images/requirements/reference.jpg'); } +a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-left:20px; color:#64bdd9; } +a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} +.r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} + +.label{ width:80px; text-align:right; font-size:14px; display:block; float:left;} +.label02{ width:110px; text-align:right; font-size:14px; display:block; float:left;} + +/*作业批次下拉*/ +div#menu_r {height:41px; font-size:14px; font-weight:bold; margin-bottom:10px;} +div#menu_r ul {float: left;} +div#menu_r ul.menu_r { background: #64bdd9; padding:0 10px; height:40px; } +div#menu_r li {position: relative; z-index: 9; margin: 0; display: block; float: left; } +div#menu_r li:hover>ul { left: -2px;} +div#menu_r a {position: relative;z-index: 10; height: 41px; display: block; float: left;line-height: 41px; text-decoration: none; font-size:14px; } +div#menu_r {display: block; cursor: pointer; background-repeat: no-repeat;background-position: 95% 0;padding-right: 15px; _padding-right: 20px;} +div#menu_r ul a.parent {background: url(../images/item.png) -20px -30px no-repeat; width:60px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} +div#menu_r ul a.parent:hover {background: url(../images/item.png) -20px -60px no-repeat;} +div#menu_r ul ul a.parent {background: url(../images/item.png) -20px 6px no-repeat;} +div#menu_r ul ul a.parent:hover {background: url(../images/item.png) -20px -11px no-repeat;} +/* menu::level1 */ +div#menu_r a { padding: 5px 12px 0 10px;line-height: 30px; color: #fff;} +/*div#menu_r li { background: url(images/main-delimiter.png) 98% 4px no-repeat; }*/ +div#menu_r li.last { background: none; } +/* menu::level2 */ +div#menu_r ul ul li { background: none; } +div#menu_r ul ul { position: absolute;top: 38px; left: -999em; width: 90px; padding: 5px 0 0 0; background:#fff; border:1px solid #15bccf; margin-top:1px;} +div#menu_r ul ul a {padding: 0 0 0 15px; height: auto; float: none;display: block; line-height: 24px; font-size:12px; font-weight:normal;color:#15bccf;} +div#menu_r ul ul a:hover { background:#64bdd9; color:#fff;} +div#menu_r ul ul li.last { margin-left:15px; } +div#menu_r ul ul li {width: 100%;} + +/* 20150414*/ +a.wzan_img{background:url(../images/new_project/public_icon.png) 0px -457px no-repeat; display:block; height:31px; width:30px; color:#fff; } +a.wzan_visited{background:url(../images/new_project/public_icon.png) 0px -503px no-repeat;} +.dis ul li.wname_st a{ width:260px; font-size:14px; color:#595959; padding:10px 0 0 0px; overflow:hidden; text-overflow:ellipsis; white-space:nowrap;} +.dis ul li.wname_st a:hover{ color:#41a8c8;} +.no_zan{color:#999999;} +.vi_zan{color:#28be6c;} +.newwork_btn a{background:#64bdd9;color:#fff;font-size:14px; font-weight:normal; padding:2px 10px; display:block; text-align:center; float:right;} +.newwork_btn a:hover{ background:#329cbd;} +a.files_tag_icon{ background:#dcdcdc; color:#fff; border:1px solid #c8c8c8; padding:1px 10px; float:left; margin-right:10px; margin-bottom:10px;} +a:hover.files_tag_icon{ background:#64bdd9; color:#fff; border:1px solid #54aeca; } + + From 1dc8190aa0741636713c4b241d37b869173fdba2 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 15 Apr 2015 14:53:07 +0800 Subject: [PATCH 4/9] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=97=A0?= =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E7=9A=84href=E9=93=BE=E6=8E=A5=E4=B8=BAjavas?= =?UTF-8?q?cript:void(0)=202=E3=80=81=E5=A2=9E=E5=8A=A0=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E7=9A=84=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_homework_list.html.erb | 2 +- app/views/bids/_new_homework_form.html.erb | 2 +- app/views/courses/_course_teacher.html.erb | 2 +- app/views/courses/_member_list.html.erb | 4 ++-- app/views/courses/_member_list_detail.html.erb | 2 +- app/views/courses/_new_member_list.html.erb | 2 +- app/views/files/_course_file.html.erb | 12 +++++++++++- app/views/files/_course_list.html.erb | 7 +++++++ app/views/homework_attach/_history.erb | 2 +- app/views/layouts/base_courses.html.erb | 2 +- app/views/layouts/base_homework.html.erb | 2 +- app/views/messages/_course_new.html.erb | 2 +- app/views/messages/edit.html.erb | 4 ++-- 13 files changed, 31 insertions(+), 14 deletions(-) diff --git a/app/views/bids/_homework_list.html.erb b/app/views/bids/_homework_list.html.erb index 577cd280f..a7e337a60 100644 --- a/app/views/bids/_homework_list.html.erb +++ b/app/views/bids/_homework_list.html.erb @@ -70,7 +70,7 @@

    下载文件包太大，分成多个下载包

    diff --git a/app/views/bids/_new_homework_form.html.erb b/app/views/bids/_new_homework_form.html.erb index 129bcec5e..aeb9a5c41 100644 --- a/app/views/bids/_new_homework_form.html.erb +++ b/app/views/bids/_new_homework_form.html.erb @@ -44,7 +44,7 @@
  • - <%= l(:button_create)%> + <%= l(:button_create)%> <%= link_to l(:button_cancel), homework_course_path(@course), :class => "blue_btn grey_btn fl c_white"%>
    • diff --git a/app/views/courses/_course_teacher.html.erb b/app/views/courses/_course_teacher.html.erb index 89a3eea7e..587d9d2da 100644 --- a/app/views/courses/_course_teacher.html.erb +++ b/app/views/courses/_course_teacher.html.erb @@ -1,6 +1,6 @@
    - 加入时间 + 加入时间
    <% members.each do |member| %> diff --git a/app/views/courses/_member_list.html.erb b/app/views/courses/_member_list.html.erb index 60c10dff6..a773b6147 100644 --- a/app/views/courses/_member_list.html.erb +++ b/app/views/courses/_member_list.html.erb @@ -26,9 +26,9 @@
  • <%= link_to '作业积分', member_score_sort_course_path(:sort_by => (@score_sort_by == "desc" ? "asc" : "desc"), :group_id => (@group ? @group.id : 0),:search_name => (@search_name ? @search_name : nil)) ,:result => members,method: 'get', remote: true%> <% if @score_sort_by == 'desc' %> - + <% else %> - + <% end %>
  • diff --git a/app/views/courses/_member_list_detail.html.erb b/app/views/courses/_member_list_detail.html.erb index bc6cbd242..1067f709d 100644 --- a/app/views/courses/_member_list_detail.html.erb +++ b/app/views/courses/_member_list_detail.html.erb @@ -4,7 +4,7 @@
    <% next if member.new_record? %> - <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 40, :height => 40)) %> + <%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :width => 40, :height => 40)) %>
      <% if @canShowCode %> <% if member.user.show_name == '' && member.user.user_extensions.student_id == '' %> diff --git a/app/views/courses/_new_member_list.html.erb b/app/views/courses/_new_member_list.html.erb index e7d282256..30b77ee50 100644 --- a/app/views/courses/_new_member_list.html.erb +++ b/app/views/courses/_new_member_list.html.erb @@ -32,7 +32,7 @@ <% end %> -
    • 加入时间
      • +
    • 加入时间
    diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb index 44dd50c5e..73828f2fe 100644 --- a/app/views/files/_course_file.html.erb +++ b/app/views/files/_course_file.html.erb @@ -44,11 +44,21 @@ <%= submit_tag "全站搜索", :class => "re_schbtn b_lblue",:name => "insite",:id => "insite",:onmouseover => "presscss('insite')",:onmouseout =>"buttoncss()" %> <% end %> <% if is_course_teacher(User.current,@course) %> - 上传资源 + + +

    + 上传： + 课件 |  + 软件 |  + 媒体 |  + 代码 |  + 其他 +

    <% end %>
    +
    <%= render :partial => 'course_list',:locals => {course: @course,all_attachments: @all_attachments,sort:@sort,order:@order,curse_attachments:@obj_attachments} %>
    diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index 3946b1da1..d33d58b77 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -14,6 +14,13 @@

    • + +
    + 实验（20） + 软件工程（20） +
    +
    +
    <% curse_attachments.each do |file| %> <% if file.is_public? || User.current.member_of_course?(course) %> diff --git a/app/views/homework_attach/_history.erb b/app/views/homework_attach/_history.erb index 686cdffd2..e99160f22 100644 --- a/app/views/homework_attach/_history.erb +++ b/app/views/homework_attach/_history.erb @@ -5,7 +5,7 @@ <% if journals.size > 0 %> <% for journal in journals %>
    -
    <%= image_tag(url_to_avatar(journal.user)) %>
    +
    <%= image_tag(url_to_avatar(journal.user)) %>
    diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index f277cbaa6..dec4a5f4d 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -49,7 +49,7 @@
    <%= form_tag({:controller => 'courses', :action => 'search'},:id => "course_search_form", :method => :get, :class => "search_form") do %> <%= text_field_tag 'name', params[:name], :placeholder => l(:label_course_name), :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %> - + <%= l(:label_search)%>
    diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 96671cc6d..3de539ab0 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -136,7 +136,7 @@ <% when 1 %> <%= link_to '关闭匿评', alert_anonymous_comment_bid_path(@bid), id: "#{@bid.id}_stop_anonymous_comment", remote: true %> <% when 2 %> - 匿评结束 + 匿评结束 <% end %> <%end%> diff --git a/app/views/messages/_course_new.html.erb b/app/views/messages/_course_new.html.erb index ad2db8281..168548682 100644 --- a/app/views/messages/_course_new.html.erb +++ b/app/views/messages/_course_new.html.erb @@ -6,7 +6,7 @@
      <%= form_for @message, :url => {:action => 'new'}, :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= render :partial => 'form_course', :locals => {:f => f,:is_new => true} %> - <%= l(:button_submit)%> + <%= l(:button_submit)%> <%#= preview_link({:controller => 'messages', :action => 'preview', :board_id => @board}, 'message-form' ,target='preview',{:class => 'blue_btn grey_btn fl c_white'} )%> <%= link_to l(:button_cancel), course_boards_path(@course), :class => "blue_btn grey_btn fl c_white"%> <% end %> diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb index 9a9ab3640..f5e143130 100644 --- a/app/views/messages/edit.html.erb +++ b/app/views/messages/edit.html.erb @@ -15,7 +15,7 @@ } do |f| %> <%= render :partial => 'form', :locals => {:f => f, :replying => !@message.parent.nil?} %> - + <%= l(:button_save) %> <%= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "ButtonColor m3p10" %> @@ -33,7 +33,7 @@ } do |f| %> <%= render :partial => 'form_course', :locals => {:f => f, :replying => !@message.parent.nil?} %> - <%= l(:button_submit)%> + <%= l(:button_submit)%> <%= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "blue_btn grey_btn fl c_white" %> <% end %> From 676cf8f18030aa8d2438e2c2632e421fca2d23a0 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 15 Apr 2015 16:00:45 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=98=AF=E6=A0=B9=E6=8D=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=AF=B9=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E7=9A=84TAG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 21 +++++++++++++++++ app/views/files/_course_file.html.erb | 31 ++++++++++++++++++------- app/views/files/_upload_show.html.erb | 2 +- app/views/files/upload_file_show.js.erb | 20 ++++++++-------- config/locales/zh.yml | 5 ++++ 5 files changed, 60 insertions(+), 19 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 1ca3e2fcf..c9380516c 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -346,6 +346,27 @@ class FilesController < ApplicationController Mailer.run.attachments_added(attachments[:files]) end + if params[:course_attachment_type] && params[:course_attachment_type] != "5" + case params[:course_attachment_type] + when "1" + tag_name = l(:label_courseware) + when "2" + tag_name = l(:label_software) + when "3" + tag_name = l(:label_media) + when "4" + tag_name = l(:label_code) + else + tag_name = "" + end + if !attachments.empty? && attachments[:files] && tag_name != "" + attachments[:files].each do |attachment| + attachment.tag_list.add(tag_name) + attachment.save + end + end + end + # TODO: 临时用 nyan sort_init 'created_on', 'desc' sort_update 'created_on' => "#{Attachment.table_name}.created_on", diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb index 73828f2fe..2bc780a27 100644 --- a/app/views/files/_course_file.html.erb +++ b/app/views/files/_course_file.html.erb @@ -1,7 +1,23 @@
      diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index 406038dca..5bbb8757d 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -18,7 +18,7 @@
      <% unless @tag_list.nil?%> <% @tag_list.each do |k,v|%> - <%= k%>（<%= v%>） + <%= k%>（<%= v%>） <% end%> <% end%>
      diff --git a/app/views/files/search_tag_attachment.js.erb b/app/views/files/search_tag_attachment.js.erb new file mode 100644 index 000000000..50f46d2f5 --- /dev/null +++ b/app/views/files/search_tag_attachment.js.erb @@ -0,0 +1 @@ +$("#course_list").html("<%= escape_javascript(render :partial => 'course_list',:locals => {course: @course,all_attachments: @result,sort:@sort,order:@order,curse_attachments:@searched_attach})%>"); \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 03ed4d2ab..911a45848 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -709,6 +709,7 @@ RedmineApp::Application.routes.draw do collection do match "getattachtype", :via => [:get, :post] match "search",:via => [:post,:get] + match "search_tag_attachment", :via => [:post,:get] end member do match "quote_resource_show", :via => [:get] diff --git a/public/javascripts/course.js b/public/javascripts/course.js index fd80a3e0f..c2a5da03d 100644 --- a/public/javascripts/course.js +++ b/public/javascripts/course.js @@ -449,3 +449,19 @@ $(function(){ } ) }); + +//查找TAG资源 +function search_tag_attachment(url,tag_name,q,course_id,sort) +{ + $.get( + url, + { + tag_name: tag_name, + q: q, + course_id:course_id + }, + function (data) { + + } + ); +}