From 5bfef259dea98392ec48c79fcf08aec5f8272ce8 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 21 Apr 2015 15:22:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=A9=BA=E7=99=BD=E5=A4=84=E7=9A=84=E9=93=BE?= =?UTF-8?q?=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_list.html.erb | 4 +++- public/stylesheets/project.css | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/app/views/issues/_list.html.erb b/app/views/issues/_list.html.erb index 1a77c03d3..f1b5a319d 100644 --- a/app/views/issues/_list.html.erb +++ b/app/views/issues/_list.html.erb @@ -11,7 +11,9 @@
<%= link_to issue.author.name, user_path(issue.author), :class => "problem_name c_orange fl" %> <%= l(:label_post_on_issue) %>(<%= "#{raw column_content[2]}" %>)： - <%=link_to "#{column_content[4]}#{get_issue_typevalue(column_content[1])}".html_safe, issue_path(issue.id), :class => "problem_tit02 fl break_word" %> +
+ <%=link_to "#{column_content[4]}#{get_issue_typevalue(column_content[1])}".html_safe, issue_path(issue.id), :class => "problem_tit_a break_word" %> +

<% unless issue.assigned_to_id.nil? %> diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index c2eb127c9..c4f06f2f0 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -73,6 +73,9 @@ 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;max-width:400px;} +.problem_tit_div{ color:#0781b4; font-weight:bold;width:400px; } +a.problem_tit_a{ color:#0781b4; } +.problem_tit_a:hover{ color:#09658c; } 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; } From 861469e39fa4795c3352caaf58b2aaef06d0f6f8 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 21 Apr 2015 16:11:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E5=B8=96=E5=AD=90=E5=92=8C=E6=96=B0=E5=BB=BA=E5=B8=96?= =?UTF-8?q?=E5=AD=90=E6=A0=87=E9=A2=98=E5=86=B2=E7=AA=81=202=E3=80=81?= =?UTF-8?q?=E5=AF=B9=E9=BD=90=E6=96=B0=E5=BB=BA=E6=A1=86=203=E3=80=81?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=BA=93=E6=96=B0=E5=BB=BA=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/boards/_project_show.html.erb | 1 + app/views/messages/_form_project.html.erb | 5 ++--- app/views/messages/_project_show.html.erb | 3 ++- app/views/users/show.html.erb | 10 +++++----- app/views/versions/index.html.erb | 5 +---- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/app/views/boards/_project_show.html.erb b/app/views/boards/_project_show.html.erb index 43cea4b4f..31748014f 100644 --- a/app/views/boards/_project_show.html.erb +++ b/app/views/boards/_project_show.html.erb @@ -19,6 +19,7 @@

<% if User.current.logged? %> <%= form_for @message, :url => new_board_message_path(@board), :html => {:multipart => true, :id => 'message-form'} do |f| %> +

<%= l(:project_module_boards_post) %>

<%= render :partial => 'messages/form_project', :locals => {:f => f} %>

<%= l(:button_submit)%> diff --git a/app/views/messages/_form_project.html.erb b/app/views/messages/_form_project.html.erb index a1ef69fa9..5724acf47 100644 --- a/app/views/messages/_form_project.html.erb +++ b/app/views/messages/_form_project.html.erb @@ -1,7 +1,6 @@ <%= error_messages_for 'message' %> <% replying ||= false %> <% extra_option = replying ? { readonly: true} : { maxlength: 200 } %> -

<%= l(:label_message_reply) %>

  • <% if replying %> @@ -26,7 +25,7 @@
  • - + <%= text_area :quote,:quote,:style => 'display:none' %> <%= f.text_area :content, :class => 'talk_text fl', :id => 'message_content', :onkeyup => "regexContent();", :maxlength => 5000,:placeholder => "最多3000个汉字(或6000个英文字符)" %>
    @@ -35,7 +34,7 @@
  • -
    +
    <%= render :partial => 'attachments/form_project', :locals => {:container => @message,:isReply => @isReply} %>
    • diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb index 069fd9d80..28b9e28d5 100644 --- a/app/views/messages/_project_show.html.erb +++ b/app/views/messages/_project_show.html.erb @@ -88,8 +88,9 @@ <% if !@topic.locked? && authorize_for('messages', 'reply') %> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 055a00a82..aab206151 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -63,12 +63,12 @@ <%= link_to("#{l(:label_i)}", user_path(e.user_id)) %>   - <% if User.current.language == "zh" %> + <% if User.current.language == "zh" %> <%= l(:label_i_have_feedback) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> <%= l(:label_of_feedback) + l(:label_layouts_feedback) %> - + <% else %> <%= l(:label_i_have_feedback) %> @@ -80,19 +80,19 @@ <%= link_to("#{e.user.name}", user_path(e.user_id)) %> - <% if User.current.language == "zh" %> + <% if User.current.language == "zh" %> <%= l(:label_have_feedback) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> <%= l(:label_of_feedback) + l(:label_layouts_feedback) %> - + <% else %> <%= l(:label_have_feedback) %> <%= l(:label_layouts_feedback) + l(:label_of_feedback) %> <%= link_to("#{e.act.user.name}", user_path(e.act.user.id)) %> - <% end %> + <% end %> <% end %> diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb index cccc53726..0b71fa5e2 100644 --- a/app/views/versions/index.html.erb +++ b/app/views/versions/index.html.erb @@ -1,10 +1,6 @@

    <%= l(:label_roadmap) %>

    -
    - <%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'orange_u_btn fl' if User.current.allowed_to?(:manage_versions, @project) %> -
    -

    From 2043b963c84794d07eb3a6120865f7406c3d13fa Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 21 Apr 2015 16:35:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=84=8F=E8=A7=81?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=20=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_join_exit_project.html.erb | 2 +- app/views/layouts/base_projects.html.erb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb index 13baae37f..8b4b897ce 100644 --- a/app/views/layouts/_join_exit_project.html.erb +++ b/app/views/layouts/_join_exit_project.html.erb @@ -8,7 +8,7 @@ <%= join_in_project_link(@project, User.current) %> <% end %> - <% if ((User.current.member_of? @project) && User.current.login? && User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project)) %> + <% if User.current.admin? || User.current.allowed_to?({:controller => 'projects', :action => 'settings'}, @project) %> <%= link_to "#{l(:button_configure)}".html_safe, settings_project_path(@project), :class => "pr_join_a" %> <%= link_to "#{text}".html_safe,"javascript:void(0)" ,:onClick => "show_window();", :class => "pr_join_a",:id => "setting_project_type"%> <% end %> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index b825800e1..f3dc61c8a 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -234,6 +234,7 @@
    123
    + <%= render :partial => 'layouts/new_feedback' %> From da7528c7803104fb53fdc18e2f3d0fcaccbe3b32 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 21 Apr 2015 17:10:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=87=8D=E5=AE=9A=E5=90=91=E5=88=B0?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE=E9=87=8C=E7=9A=84=E6=96=B0?= =?UTF-8?q?=E5=BB=BA=E7=89=88=E6=9C=AC=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/versions_controller.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index fe7bcf0be..defc36868 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -85,13 +85,14 @@ class VersionsController < ApplicationController end def new - @version = @project.versions.build - @version.safe_attributes = params[:version] - - respond_to do |format| - format.html - format.js - end + # @version = @project.versions.build + # @version.safe_attributes = params[:version] + # + # respond_to do |format| + # format.html + # format.js + # end + redirect_to settings_project_url(@project, :tab => 'versions') end def create