From 9fa9aa0fb88a542ecc17183298fe67b4049228b0 Mon Sep 17 00:00:00 2001 From: baiyu Date: Thu, 17 Oct 2013 16:22:26 +0800 Subject: [PATCH] =?UTF-8?q?=E2=80=9C=E8=BF=94=E5=9B=9E=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E2=80=9D=E2=80=9C=E8=BF=94=E5=9B=9E=E4=B8=BB=E9=A1=B5=E2=80=9D?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=8F=98=E8=89=B2=E3=80=82=E6=94=B9=E8=BE=B9?= =?UTF-8?q?=E8=B7=9D=EF=BC=8C=E8=BE=B9=E6=A1=86=E5=8F=98=E5=9C=86=E6=B6=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_homework.html.erb | 2 +- config/locales/zh.yml | 18 +++++--------- .../stylesheets/application.css | 24 +++++++++++++++++-- 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index 84fe04b08..05583a180 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -53,7 +53,7 @@ -
<%= link_to l(:label_course_return), project_path(@bid.courses.first), :class => 'font-user-color' %><%= link_to "返回个人主页", user_path(User.current), :class => 'font-user-color'%> + <%= link_to "返回个人主页", user_path(User.current), :class => 'font-user-after-color'%>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 7e03fb1ea..355c2c40e 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -504,7 +504,6 @@ zh: label_requirement: 需求 label_new_course: 课程 label_new_homework: 作业 - label_create_homework: 布置了作业： label_new_contest: 竞赛 label_requirement_focus: 关注需求 label_developer: 用户 @@ -544,8 +543,6 @@ zh: label_limit_time: 截止日期 label_commit_homework: 提交作业 label_course_homework: 对应课程 - label_course_return: 返回课程 - label_course_view: 作业界面 label_homework_response: 作业咨询 label_bidding_homework: 提交作业 @@ -1381,8 +1378,6 @@ zh: label_jion_bidding_homework: 已提交！ label_bidding_user: 应标人： label_bidding_user_homework: 作业提交者 - label_homework_prompt: 贴心小提示： - label_homework_prompt_content: 亲，在这里我们的作业将以项目的形式提交，如果小伙伴们还没有创建项目，请先创建一个项目。项目创建成功后，就可以再回到这里来提交作业哦~ 这样在作业提交后，老师就可以随时关注你的作业进展啦~祝使用愉快^^ label_bidding_user_studentcode: 学号 label_bidding_reason: 应标宣言： label_bidding_reason_homewrok: 作业提交说明 @@ -1424,10 +1419,9 @@ zh: label_upassword_info: 该密码在项目组内可共享 label_how_commit_code: 查看如何提交代码： label_how_commit_code_chinese: 中文 - - label_welcome_leave_message: 您好！系统目前正在内测，有意见和建议请 - label_welcome_click_me: 点击我 # modified by bai + label_welcome_leave_message: 您好！系统目前正在公测，有意见和建议请 + label_welcome_click_me: 点击我 label_issue_praise: 好问题，顶！ label_issue_tread: 烂问题，踩！ label_issue_praise_over: 我刚才顶过了~ @@ -1547,6 +1541,8 @@ zh: label_my_course: 我的课程 button_submit_bid: 参与竞标 label_requirement_from: 需求来源 + label_course_view: 作业界面 + label_course_return: "返 回 课 程" #end @@ -1580,8 +1576,8 @@ zh: label_excellence_reward: 优秀奖 label_comfort_reward: 入围奖 label_course_settings: 课程设置 - label_course_modify_settings: 修改课程属性 -#aded by nie + +#added by nie label_x_task: zero: 份作业 one: 份作业 @@ -1630,5 +1626,3 @@ zh: label_new_join_order: 请输入课程密码 label_task_submit_form_accessory: 作业最终以附件形式提交 label_task_submit_form_project: 作业最终以项目形式提交 - label_has_been: 已经被 - label_course_userd_by: 个课程引用 \ No newline at end of file diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 29e08fb30..0140d68b9 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1851,10 +1851,30 @@ input[type="submit"] { cursor: pointer; } + + + + +/*added by bai*/ a.font-user-color{ color: #FFFFFF; - width:113px; - background-color: #3676c8; + width:90px; + background-color: #15BCCF; padding: 0px; margin: 0px; + border-radius:5px; + margin-left:17px; + height:25px; + line-height:23px; +} + +a.font-user-after-color{ + color: #FFFFFF; + width:90px; + background-color: #15BCCF; + border-radius:5px; + margin-left:13px; + height:25px; + line-height:23px; } +/*end*/ \ No newline at end of file