diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index d68e1fc7d..bed1e3d77 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -113,12 +113,13 @@
<%= render :partial => 'edit' %>
+ +

+ + <%= l(:button_submit) %> + <% end %> - -

- - <%= l(:button_submit) %> - + <%#= submit_tag l(:button_submit) %> <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index ca9f43d53..b825800e1 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -225,9 +225,9 @@

请选择项目类型:

确定 diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 3c4d4a97c..49fe0e19a 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -55,9 +55,9 @@ zh: label_apply_project_waiting: 已处理申请,请等待管理员审核 label_unapply_project: 取消申请 lable_sure_exit_project: 是否确认退出该项目 - label_friend_organization: 朋友圈 - label_research_group: 科研组 - label_development_team: 开发组 + label_friend_organization: 圈子模式 + label_research_group: 研讨模式 + label_development_team: 开发模式 label_member: 成员 project_module_attachments: 资源 diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 75caa9c14..c2eb127c9 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -72,7 +72,7 @@ a:hover.problem_pic{border:1px solid #64bdd9;} a.problem_name{ color:#ff5722; } a:hover.problem_name{ color:#d33503;} a.problem_tit{ color:#0781b4; max-width:430px; font-weight:bold; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} -a.problem_tit02{ color:#0781b4; font-weight:bold;width:400px; } +a.problem_tit02{ color:#0781b4; font-weight:bold;max-width:400px;} a:hover.problem_tit,a:hover.problem_tit02{ color:#09658c; } .problem_main{ border-bottom:1px dashed #d4d4d4; padding-bottom:10px; margin-bottom:10px;} a.pro_mes{ float:left; color:#a0a0a0; display:block; width:100px; height:20px; }