<%= render :partial => "/praise_tread/praise_tread",:locals => {:obj => @topic,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
diff --git a/app/views/projects/_member_list.html.erb b/app/views/projects/_member_list.html.erb
index 09173b835..590ffbe3c 100644
--- a/app/views/projects/_member_list.html.erb
+++ b/app/views/projects/_member_list.html.erb
@@ -3,7 +3,7 @@
<% next if member.new_record? %>
<% unless member.created_on.nil? %>
- <%= content_tag "p", "#{format_date(member.created_on)}#{l(:label_member_since)}", :class => "float_right member_since" %>
+ <%= content_tag "p", (User.current.language == ""|| User.current.language == "zh")?("#{format_date(member.created_on)}"+" "+"#{l(:label_member_since)}"):("#{l(:label_member_since)}+" "+#{format_date(member.created_on)}"), :class => "float_right member_since" %>
<% end %>
<%= member.user.nil? ? '' : (image_tag(url_to_avatar(member.user), :class => 'avatar')) %>
<%= content_tag "div", link_to(member.user.name, user_path(member.user)), :class => "nomargin avatar_name" %>
diff --git a/app/views/projects/watcherlist.html.erb b/app/views/projects/watcherlist.html.erb
index 1acefe092..126f6c265 100644
--- a/app/views/projects/watcherlist.html.erb
+++ b/app/views/projects/watcherlist.html.erb
@@ -25,7 +25,7 @@
- | <%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
+ | <%= l(:label_user_joinin) %> <%= format_date(user.created_on) %>
|
diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb
index e616004e6..373ed9234 100644
--- a/app/views/users/_my_joinedcourse.html.erb
+++ b/app/views/users/_my_joinedcourse.html.erb
@@ -16,8 +16,8 @@
diff --git a/config/locales/commons/en.yml b/config/locales/commons/en.yml
index 5998ee875..561fc09cc 100644
--- a/config/locales/commons/en.yml
+++ b/config/locales/commons/en.yml
@@ -189,7 +189,7 @@ en:
text_are_you_sure: Are you sure? #js 提示
-
+ label_no_data: No data to display
# 项目、课程、用户公用
label_settings: Settings
label_information_plural: Information
@@ -209,7 +209,8 @@ en:
label_more: "More>>"
button_download: Download
button_delete: Delete
-
+ button_unfollow: Unfollow
+ button_follow: Follow
diff --git a/config/locales/commons/zh.yml b/config/locales/commons/zh.yml
index a0eb6e74a..35087eb06 100644
--- a/config/locales/commons/zh.yml
+++ b/config/locales/commons/zh.yml
@@ -147,10 +147,7 @@ zh:
cant_link_an_issue_with_a_descendant: "问题不能关联到它的子任务"
groupname_repeat: "该班名已存在"
- attachment_all: "全部"
- attachment_sufix_browse: "文件类型"
- attachment_browse: "内容类型"
- attachment_type: '分类'
+
general_text_No: '否'
general_text_Yes: '是'
general_text_no: '否'
@@ -190,7 +187,10 @@ zh:
text_are_you_sure: 您确定要删除吗？ #js 提示
-
+
+
+
+ label_no_data: 没有任何数据可供显示
# 项目、课程、用户公用
label_settings: 配置
label_information_plural: 信息
@@ -211,8 +211,10 @@ zh:
button_download: 下载
button_more: 更多
button_delete: 删除
-
-
+ button_unfollow: 取消关注
+ button_follow: 关注
+ button_watch: 跟踪
+ button_unwatch: 取消跟踪
#
# Trustie上传头像模块
#
diff --git a/config/locales/en.yml b/config/locales/en.yml
index f0f953f11..ac98c4005 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -340,7 +340,6 @@ en:
label_create_new_projects: Create a project
label_work_scores_people: The total number of users given scores
label_project_grade: Score
- label_user_for_project_grade: Score
label_relation_files: Select an existing resource
# Personal signature tips
@@ -478,7 +477,6 @@ en:
label_text: Long text
label_attribute: Attribute
label_attribute_plural: Attributes
- label_no_data: No data to display
label_change_status: Change status
label_history: History
label_attachment: Files
@@ -933,9 +931,7 @@ en:
text_turning_multiple_off: "If you disable multiple values, multiple values will be removed in order to preserve only one value per item."
text_applied_project: "User %{id} Apply Join Project %{project}"
- default_role_manager: Manager
- default_role_developer: Developer
- default_role_reporter: Reporter
+
default_tracker_bug: Bug
default_tracker_feature: Feature
default_tracker_support: Support
@@ -1019,8 +1015,7 @@ en:
#end by huang
#added by liuping
- button_unfollow: Unfollow
- button_follow: Follow
+
label_delete_confirm: Confirm delete？
label_exit_project: Exit Project
@@ -1067,11 +1062,6 @@ en:
zero: Follower
one: Follower
other: Followers
- #end
- label_member_since: joined
- label_contribute_to: Participates %{project_count} projects：
- #modify by men
-
#end
label_total_commit: Totally %{total_commit} commits # modified by bai
#modify by men
@@ -1084,7 +1074,7 @@ en:
label_type_as: Type as
label_status_as: Status as
label_priority_as: Priority as
- label_member_list: Member list
+
label_author_name: Posted by %{author_name}
label_comments_count: (%{count} comments)
label_post_on: posts on
diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml
index d3743a247..458311bda 100644
--- a/config/locales/projects/en.yml
+++ b/config/locales/projects/en.yml
@@ -66,6 +66,38 @@ en:
label_expend_information: More Information
+ #
+ # 项目托管平台
+ #
+ # 项目成员
+ #
+ label_member_list: Members
+
+ label_member_since: "joined at"
+ label_user_for_project_grade: Score
+
+ default_role_manager: Manager
+ default_role_developer: Developer
+ default_role_reporter: Reporter
+
+
+ #
+ # 项目托管平台
+ #
+ # 关注者列表
+ #
+ label_followers: Followers
+ label_contribute_to: "Participates %{project_count} projects—"
+
+
+ #
+ # 项目托管平台
+ #
+ # 资源库
+ #
+
+
+
#
# 项目托管平台
#
@@ -80,6 +112,20 @@ en:
#
+ #
+ # 项目托管平台
+ #
+ # 资源库
+ #
+
+
+ #
+ # 项目托管平台
+ #
+ # 版本库
+ #
+
+
#
# 项目托管平台
#
@@ -98,7 +144,6 @@ en:
project_module_files: Files
project_module_boards: Forums
-
#
# 项目托管平台
#
@@ -122,7 +167,7 @@ en:
#
# 项目托管平台
#
- # 新建项目
+ # 新建项目/项目配置 >信息
#
label_project_new_description: "A project can be used to do anything that requires distributed collaboration."
field_name: Name
@@ -177,6 +222,10 @@ en:
-
+ #
+ # 项目托管平台
+ #
+ # 项目得分
+ #
label_approve: Approve
label_refusal: Refusal
\ No newline at end of file
diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml
index 2e6c06366..b68d9b64d 100644
--- a/config/locales/projects/zh.yml
+++ b/config/locales/projects/zh.yml
@@ -38,7 +38,8 @@ zh:
label_exit_project: 退出项目
label_apply_project_waiting: 已处理申请，请等待管理员审核
label_unapply_project: 取消申请
-
+ lable_sure_exit_project: 是否确认退出该项目
+
label_member: 成员
project_module_attachments: 资源
@@ -65,6 +66,81 @@ zh:
label_project_overview: "项目简介："
label_expend_information: 展开更多信息
+
+ #
+ # 项目托管平台
+ #
+ # 项目成员
+ #
+ label_member_list: 成员列表
+
+ label_member_since: "加入"
+ label_user_for_project_grade: 个人得分
+
+ default_role_manager: 管理人员
+ default_role_developer: 开发人员
+ default_role_reporter: 报告人员
+
+
+ #
+ # 项目托管平台
+ #
+ # 关注者列表
+ #
+ label_followers: 关注
+ label_contribute_to: 参与了 %{project_count} 个项目：
+
+
+ #
+ # 项目托管平台
+ #
+ # 资源库
+ #
+ lable_file_sharingarea: 资源共享区
+
+ label_upload_files: 上传文件
+
+
+ # 附件公用
+ label_relation_files: 关联已有资源
+ label_search_by_keyword: "按关键字搜索："
+ label_files_filter: "资源过滤："
+ attachment_all: "全部"
+ attachment_sufix_browse: "文件类型"
+ attachment_browse: "内容类型"
+ attachment_type: "分类"
+
+
+
+ #
+ # 项目托管平台
+ #
+ # 问题跟踪
+ #
+
+
+
+
+
+ #
+ # 项目托管平台
+ #
+ # 项目讨论区
+ #
+
+
+ #
+ # 项目托管平台
+ #
+ # 资源库
+ #
+
+
+ #
+ # 项目托管平台
+ #
+ # 版本库
+ #
#
# 项目托管平台
@@ -83,7 +159,9 @@ zh:
project_moule_boards_show: 项目论坛
project_module_time_tracking: 时间跟踪
project_module_course: 课程
-
+ project_module_files: 资源库
+
+
#
# 项目托管平台
#
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index a66182668..626a12abd 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -509,7 +509,7 @@ zh:
label_summer: 夏季学期
label_autumn: 秋季学期
label_winter: 冬季学期
- label_followers: 关注
+
label_teacher_list: 教师列表
label_student_list: 学生列表
@@ -558,7 +558,7 @@ zh:
label_text: 文本
label_attribute: 属性
label_attribute_plural: 属性
- label_no_data: 没有任何数据可供显示
+
label_change_status: 变更状态
label_history: 历史记录
label_attachment: 文件
@@ -915,8 +915,6 @@ zh:
button_sort: 排序
button_log_time: 登记工时
button_rollback: 恢复到这个版本
- button_watch: 跟踪
- button_unwatch: 取消跟踪
button_reply: 回复
button_archive: 存档
button_unarchive: 取消存档
@@ -1003,9 +1001,6 @@ zh:
text_applied_project: "用户 %{id} 申请加入项目 %{project}"
text_issue_expire: "分配给您的任务%{issue}即将到期"
- default_role_manager: 管理人员
- default_role_developer: 开发人员
- default_role_reporter: 报告人员
default_tracker_bug: 错误
default_tracker_feature: 功能
default_tracker_support: 支持
@@ -1228,11 +1223,6 @@ zh:
zero: 个关注者
one: 个关注者
other: 个关注者
- #end
- label_member_since: 加入
- label_contribute_to: 参与了 %{project_count} 个项目：
- #modify by men
-
#end
label_total_commit: 共%{total_commit}次提交
label_question_number: 第%{question_number}题：
@@ -1249,7 +1239,7 @@ zh:
label_type_as: 类型为
label_status_as: 状态为
label_priority_as: 优先级为
- label_member_list: 成员列表
+
label_author_name: 由%{author_name}发表了
label_post_on: 发表了
@@ -1263,9 +1253,6 @@ zh:
#added by liuping
- button_unfollow: 取消关注
- button_follow: 关注
- label_followers: 关注
label_delete_confirm: 确认删除？
label_tags_bid: 需求名称
@@ -1604,8 +1591,6 @@ zh:
label_code_submit_number: 代码提交次数
label_topic_number: 讨论区发言数量
- label_files_filter: 资源过滤：
-
label_join_contest: 加入竞赛
@@ -1732,7 +1717,6 @@ zh:
label_project_grade: 项目得分
label_user_grade: 个人得分
- label_user_for_project_grade: 个人得分
label_system_grade: 系统评分
label_ta: 助教
@@ -1798,7 +1782,6 @@ zh:
you_are_master: 您是该项目的版主
#add by linchun (竞赛相关)
- label_upload_files: 上传文件
label_upload_softwarepackage: 上传软件包
label_upload_cuttingphoto: 上传截图
label_contests_reward_method: 奖励方式
@@ -1879,7 +1862,6 @@ zh:
one: 个动态
other: 个动态
- label_relation_files: 关联已有资源
label_contest_settings: 配置竞赛
label_contest_delete: 删除竞赛
label_noawards_current: 暂未评奖
@@ -1976,7 +1958,6 @@ zh:
lable_hot_course: 活跃课程
lable_student_list_visable: 学生列表是否公开
- lable_sure_exit_project: 是否确认退出该项目
lable_input_class_vilidate: 学时只能为整数
lable_school_list: 学校列表
@@ -1984,7 +1965,6 @@ zh:
lable_teacher_evaluation: 作业综评
lable_course_teacher: 主讲老师
lable_course_end: 课程学期已结束
- lable_file_sharingarea: 资源共享区
label_no_contest_news_description: 竞赛描述不能为空
label_contest_news_condition: 竞赛描述超过5000个汉字
label_no_contest_news_title: 竞赛标题不能为空
@@ -2069,6 +2049,6 @@ zh:
label_end_time: 截止时间
label_send_email: 确定发送
label_input_email: 请输入邮箱地址
- project_module_files: 资源库
+
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
index 8ea71909b..8fbaa5981 100644
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -135,8 +135,11 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
loadstartEventHandler: $.noop,
progressEventHandler: $.noop
}, options);
-
- uploadUrl = uploadUrl + '?attachment_id=' + attachmentId;
+ if(uploadUrl.indexOf('?') > 0){
+ uploadUrl = uploadUrl + '&attachment_id=' + attachmentId;
+ }else{
+ uploadUrl = uploadUrl + '?attachment_id=' + attachmentId;
+ }
if (blob instanceof window.File) {
uploadUrl += '&filename=' + encodeURIComponent(blob.name);
}
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 5786c5758..6d50d8bd2 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -70,14 +70,14 @@ a:hover.subnav_green{ background:#14ad5a;}
/*简介*/
.project_intro{ width:220px; padding:10px; background:#fff; padding-top:5px; color:#6d6d6d;}
-.course_description{max-height: 105px;overflow:hidden;}
+.course_description{max-height: 110px;overflow:hidden;}
.course_description_none{max-height: none;}
.lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;}
.lg-foot:hover{ color:#787b7e;}
/*右侧内容--动态*/
-
-.project_r_h{ height:40px; background:#eaeaea; margin-bottom: 5px;}
-.project_h2{ background:#64bdd9; color:#fff; height:30px; width:90px; text-align:center; font-weight:normal; padding-top:3px; font-size:16px; padding-top:9px;}
+/*右侧内容--动态*/
+.project_r_h{height:40px; background:#eaeaea; margin-bottom:10px;}
+.project_h2{ background:#64bdd9; color:#fff; height:33px; width:90px; text-align:center; font-weight:normal; padding-top:7px; font-size:16px;}
.project_r_box{ border:1px solid #e2e1e1; width:670px; margin-top:10px;}
.project_h3 { color:#646464; font-size:14px; padding:0 10px; border-bottom:1px solid #e2e1e1;}
a.more{ float:right; font-size:12px; font-weight:normal; color:#a9a9a9; margin-top:3px;}
@@ -100,42 +100,124 @@ a:hover.more{ color:#64bdd9;}
.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;padding-left:28px;}
-.box_h3{ color:#15bccf; text-align:center; font-size:16px;margin-right:40px;}
+.box_main{ width:345px; margin:0 auto;}
+.box_main02{ width:390px; margin:15px auto;}
+.box_h3{ color:#15bccf; text-align:center; font-size:16px;}
.box_p{ color:#404040; margin-bottom:5px;}
.fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;}
.icon_addm{ background:url(../images/img_floatbox.png) 0 -33px no-repeat; width:16px; height:16px; display:block; margin:5px 0 0 5px;}
.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 !important; height:26px; padding-top:8px; margin-bottom:10px;}
+.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;}
/*成员邀请*/
-.invi_search{ width:345px; margin:0 auto;}
+.invi_search{ margin-left:50px;}
.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;}
-.rolebox{ margin-left: -40px;}
+.rolebox{ margin:10px 0;}
/*问题跟踪*/
.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; width:60px; height:22px; text-align:center; padding-top:2px;}
-.problem_new_btn:hover{ background:#ff7143; color:#fff;}
-.problem_p{ color:#535252; margin-right: 8px;}
+.problem_new_btn{ margin-left:10px; border:1px solid #ff7143; color:#ff7143 !important; width:60px; height:19px; font-size:12px; text-align:center; padding-top:4px;margin-top:-2px;}
+.problem_new_btn:hover{ background:#ff7143; color:#fff !important;}
+.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{ display:block; width:42px; height:42px; padding:3px; border:1px solid #e3e3e3; margin-top:5px;}
+.problem_pic:hover{border:1px solid #64bdd9;}
+.problem_txt{ width:610px; margin-left:10px; color:#777777;}
+.problem_name{ color:#ff5722 !important;}
+.problem_line{margin-top:5px;}
+.problem_name:hover{ color:#d33503;}
+.problem_tit{ color:#0781b4 !important; width:430px; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;}
+.problem_tit:hover{ color:#09658c !important; }
+.problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;}
+/****翻页***/
+.wlist{}
+.wlist a{ float:right; border:1px solid #64bdd9; padding:0 5px; margin-left:3px; color:#64bdd9;}
+.wlist_l a{ float:left; margin-right:3px; margin-left:0px;}
+.wlist a:hover{border:1px solid #64bdd9; background-color:#64bdd9; color:#fff; text-decoration:none;}
+.wlist_select a { background-color:#48aac9; color:#fff;}
+/****讨论区***/
+.talk_top{ margin:10px 0; font-size:14px; color:#4c4c4c;}
+.talk_top span{ color:#ff7143;}
+.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:22px; color:#fff; text-align:center; margin-top:9px; padding-top:2px;}
+.talk_btn:hover{ 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;}
+.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;}
+/****新建讨论***/
+.talk_new{ padding-left:15px; color:#4c4c4c;}
+.c_red{ color:#F00;}
+.talk_input{ border:1px solid #64bdd9; height:22px; width:595px; margin-bottom:10px;}
+.talk_text{ border:1px solid #64bdd9; height:100px;width:595px; margin-bottom:10px;}
+.talk_new ul li{ }
+.view_span{font-weight:normal; color:#999;}
+.sb{width:70px; height:26px; color:#606060;}
+.ml60{ margin-left:60px;}
+.blue_btn{ background:#64bdd9; display:block; font-size:14px;color:#fff; height:28px; width:50px; text-align:center; margin-left:10px; margin-top:10px;}
+.blue_btn:hover{ background:#329cbd;}
+.grey_btn{ background:#d9d9d9; color:#656565;}
+.grey_btn:hover{ background:#717171; color:#fff;}
+/****资源库***/
+.f_l{ float:left;}
+.f_r{ float:right;}
+.resource a{ text-align:center;}
+.b_lblue{ background:#64bdd9;}
+.b_dblue{ background:#55a1b9; cursor:pointer;}
+.f_b{ font-weight: bold;}
+.c_blue{ color:#64bdd9;}
+a.c_dblue{ color: #3ca5c6;}
+a:hover.c_dblue{ color: #0781b4;}
+.c_grey{ color:#999999;}
+.c_grey02{ color:#666666;}
+.f_14{ font-size:14px;}
+.c_dblue{ color:#3e6d8e;}
+.w90{width:90px;}
+.ml10{margin-left:10px;}
+.resource{ width:670px;}
+.re_top{width:660px; height:40px; background:#eaeaea; padding:5px;}
+.re_top input{ float:left;}
+.re_search{ margin-top:7px; margin-left:5px;}
+.re_schbox{ width:240px; height:24px; border:1px solid #64bdd9; color:#666666;}
+.re_schbtn{ width:60px; height:26px; color:#fff; margin-right:5px; border:none; margin-left:0px; }
+a.re_fabu { display:block; width:90px; height:35px; font-size:14px; color:#fff; text-align:center; padding-top:5px; }
+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; width:88px; height:22px; border:1px solid #ff9900; color:#ff9900; margin-left:10px;}
+a:hover.re_select{ background:#ff9900; color:#fff; text-decoration:none;}
+.re_open{display:block; width:46px; height:22px; border:1px solid #64bdd9; color:#64bdd9; margin-left:10px;}
+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;}
+
+.upload_con { }
+.upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto; margin-top:25px; padding-left:20px; padding-top:5px;}
+.upload_box{ width:430px; height:80px;}
+a.upload_btn02{ display:block; float:left; margin-top:15px; width:80px; height:30px; text-align: center; color:#fff; font-size:14px; background:#15bccf; margin-right:15px;}
+a:hover.upload_btn02{ background:#55a1b9;}
+a.upload_btn_grey{background:#a3a3a3;}
+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;}
+.newproblem{}
+
-/****标签(和资源库的tag样式一致)***/
-.project_Label{ width:220px; padding:10px; background:#fff; margin-top:0px; padding-top:5px;}
-a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
-.submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; }
-.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
-.re_tag{ width: auto; padding:0 5px; height:22px; border:1px solid #f8df8c; background:#fffce6; margin-right:10px; }
-.re_tag a{ color:#0d90c3;}
-.tag_h span,.tag_h a{ margin-bottom:0px;}
/*企业版样式*/
.content_syqy{ width:940px; height:400px; border:1px;}
.content_syqy .list{ font-size:14px; font-weight:normal; margin-left:10px; font-weight:bold; padding-top:10px}
@@ -1414,8 +1496,8 @@ input#openid_url { background: url(../images/openid-bg.gif) no-repeat; backgroun
.clear:after{ content: "."; display: block; height: 0; clear: both; visibility: hidden; }
/***** Links *****/
-a, a:link, a:visited{ color: #169 ; text-decoration: none; }
-a:hover, a:active{ color: #c61a1a; text-decoration: underline;}
+a, a:link, a:visited{ color: #0781B4 ; text-decoration: none; }
+a:hover, a:active{ color: #09658c;}
a img{ border: 0; }
a.issue.closed, a.issue.closed:link, a.issue.closed:visited { color: #999; text-decoration: line-through; }
@@ -3086,3 +3168,4 @@ input[class~='m3p10'], .m3p10 {
}
*/
+