From 54b81bdfb3e19be7ed54916f4f9b2724d60b7df1 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 17 Apr 2015 10:13:47 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 10 ++++++++++ app/views/attachments/_project_file_links.html.erb | 2 +- app/views/layouts/_join_exit_project.html.erb | 2 +- app/views/layouts/base_projects.html.erb | 5 ++--- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 599f27215..b4526c1f5 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -49,6 +49,16 @@ module ApplicationHelper end end + def get_project_type_css(value) + if value == 1 + "pr_friend" + elsif value == 1 + "pr_keyan" + else + "pr_kafa" + end + end + # Time 2015-03-24 16:38:05 # Author lizanle # Description after save后需要进行资源记录的更新 diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb index 97cbefce9..d8b53acd0 100644 --- a/app/views/attachments/_project_file_links.html.erb +++ b/app/views/attachments/_project_file_links.html.erb @@ -53,7 +53,7 @@ <% end %> <% if options[:author] %> - <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange ml20" %>, + <%= link_to h(truncate(attachment.author.name, length: 10, omission: '...')),user_path(attachment.author),:class => "c_orange" %>, <%= format_time(attachment.created_on) %> <% end %> diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb index 64e9f64d2..13baae37f 100644 --- a/app/views/layouts/_join_exit_project.html.erb +++ b/app/views/layouts/_join_exit_project.html.erb @@ -10,6 +10,6 @@ <% if ((User.current.member_of? @project) && User.current.login? && 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"%> + <%= 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 24f2c6ebf..d71722ce8 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -182,7 +182,7 @@

<%= l(:label_project_overview)%>：

-
+
<%= textilizable(@project.description) if @project.description && !@project.description.blank? %>
@@ -205,7 +205,7 @@
- +
<%= render_flash_messages %> @@ -213,7 +213,6 @@ <%= call_hook :view_layouts_base_content %>
-
<%= render :partial => 'layouts/new_footer'%> From 19617680316b3ea591d67211a8ff1b888f545fc8 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 17 Apr 2015 10:37:40 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=89=8D=E5=8E=BB=E6=8E=89=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84?= =?UTF-8?q?*=20=E5=8E=BB=E6=8E=89=E8=B7=9F=E8=B8=AA=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_action_menu.html.erb | 2 +- app/views/issues/_form.html.erb | 34 +++++++++++++------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb index 4b23897d3..49ea0d57e 100644 --- a/app/views/issues/_action_menu.html.erb +++ b/app/views/issues/_action_menu.html.erb @@ -1,5 +1,5 @@ -<%= watcher_link_issue(@issue, User.current) %> +<%#= watcher_link_issue(@issue, User.current) %> <%#= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:add_issues, @project) %> <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'talk_edit fr' if User.current.allowed_to?(:delete_issues, @project) %> diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 7349a5f1d..5679c92d4 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -52,7 +52,7 @@
  • <% if @issue.safe_attribute? 'description' %> - + <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label => true, :class => "label" %> <%= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %> <%= content_tag 'span', :id => "issue_description_and_toolbar", :style => (@issue.new_record? ? nil : 'display:none') do %> @@ -87,7 +87,7 @@

  • - + <%= render :partial => 'attachments/form', :locals => {:container => @issue} %>
    • @@ -95,22 +95,22 @@ <%= render :partial => 'issues/attributes' %>
    -
    - + + - - <%= link_to "", - {:controller => 'watchers', :action => 'new', :project_id => @issue.project}, - :remote => true, - :method => 'get', + + <%#= link_to "", +# {:controller => 'watchers', :action => 'new', :project_id => @issue.project}, +# :remote => true, +# :method => 'get', :class => "pic_sch mt5 ml5" %> - - <%= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture') }')" %> -
    - - <%= watchers_checkboxes(@issue, @available_watchers) %> - -
    -
    + + <%#= javascript_tag "observeSearchfield('user_search', 'users_for_watcher', '#{ escape_javascript watchers_autocomplete_for_user_path(:user => @available_watchers, :format => 'js', :flag => 'ture') }')" %> + + + + + + <%= call_hook(:view_issues_form_details_bottom, {:issue => @issue, :form => f}) %> <% end %> \ No newline at end of file From e4abc86093937b78eaffdf4ee8d9bf424250b11a Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 10:38:39 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=92=8C=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E5=BA=93bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/versions_controller.rb | 2 +- app/helpers/application_helper.rb | 4 ++-- .../projects/settings/_new_repositories.html.erb | 7 +++---- app/views/projects/settings/_new_versions.html.erb | 14 +++++++------- app/views/versions/_form.html.erb | 14 +++++++------- 5 files changed, 20 insertions(+), 21 deletions(-) diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 57f26103c..36ce47d9e 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -136,7 +136,7 @@ class VersionsController < ApplicationController respond_to do |format| format.html { flash[:notice] = l(:notice_successful_update) - redirect_back_or_default settings_project_path(@project, :tab => 'versions') + redirect_to settings_project_path(@project, :tab => 'versions') } format.api { render_api_ok } end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index dc52de3e3..4c3f08fe4 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -370,9 +370,9 @@ module ApplicationHelper def format_version_name(version) if version.project == @project - h(version) + h(truncate(version.name,:length=>30)) else - h("#{version.project} - #{version}") + h("#{version.project} - #{truncate(version.name,:length=>30)}") end end diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb index 783c4a24d..aa188bd69 100644 --- a/app/views/projects/settings/_new_repositories.html.erb +++ b/app/views/projects/settings/_new_repositories.html.erb @@ -21,15 +21,14 @@ <% @project.repositories.sort.each do |repository| %> - <%= link_to repository.identifier, ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?), :class =>"c_blue" %> + <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?), :class =>"c_blue" %> <%= checked_image repository.is_default? %> <%=h repository.scm_name %> <%if repository.scm_name=="Git"%> http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %> - <%=h repository.url.slice(project_path_cut, repository.url.length) %> + <%=h repository.url.slice(project_path_cut, repository.url.length) %>"> <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%> <%else %> - <%=h repository.url %> + <%=h truncate(repository.url,:length=>10) %> <% end %> <% if repository.scm_name=="Git"%> diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index 7d513f192..c7566abf1 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -27,7 +27,7 @@ <%= l("version_status_#{version.status}") %> <%=h format_version_sharing(version.sharing) %> - <%= link_to_if_authorized(h(version.wiki_page_title), {:controller => 'wiki', + <%= link_to_if_authorized(h(truncate(version.wiki_page_title,:length=>20)), {:controller => 'wiki', :action => 'show', :project_id => version.project, :id => Wiki.titleize(version.wiki_page_title)}) || h(version.wiki_page_title) unless version.wiki_page_title.blank? || version.project.wiki.nil? %> @@ -57,29 +57,29 @@
    • - + <%= f.text_field :name, :maxlength => 60, :required => true %>
    • - + <%= f.text_field :description, :maxlength => 60 %>
    • - + <%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]} %>
    • - + <%= f.text_field :wiki_page_title, :size =>60, :label => :label_wiki_page, :disabled => @project.wiki.nil? %>
    • - + <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>" fl" %> <%= calendar_for('version_effective_date') %>
    • - + <%= f.select :sharing, @project.versions.build.allowed_sharings.collect {|v| [format_version_sharing(v), v]} %>
      • 保存 diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb index 734fc459e..abb28c658 100644 --- a/app/views/versions/_form.html.erb +++ b/app/views/versions/_form.html.erb @@ -3,29 +3,29 @@
      • - + <%= f.text_field :name, :maxlength => 60,:class=>" w280", :label => ""%>
      • - + <%= f.text_field :description, :maxlength => 60,:class=>" w280", :label => "" %>
      • - + <%= f.select :status, Version::VERSION_STATUSES.collect {|s| [l("version_status_#{s}"), s]}, :label => "" %>
      • - + <%= f.text_field :wiki_page_title, :size =>60, :label => "", :disabled => @project.wiki.nil? %>
      • - - <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>'f1',:label => "" %> + + <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>"fl" ,:style=>"margin-left:7px;"%> <%= calendar_for('version_effective_date') %>
      • - + <%= f.select :sharing, @version.allowed_sharings.collect {|v| [format_version_sharing(v), v]},:label=>"" %>
      From 43442d6f62fa5e44ed293b2df7980985c0ab0a8d Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 10:45:49 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E6=88=AA=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 34bb4680e..9afd67001 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -394,9 +394,9 @@ module ApplicationHelper def format_version_name(version) if version.project == @project - h(truncate(version.name,:length=>30)) + h(truncate(version.name,:length=>20)) else - h("#{version.project} - #{truncate(version.name,:length=>30)}") + h("#{version.project} - #{truncate(version.name,:length=>20)}") end end From 1902d557c03adb3014c0d998d23ce2b7499a5c23 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 10:48:40 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E6=9C=89=E6=97=A5=E6=9C=9Flabel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/versions/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/versions/_form.html.erb b/app/views/versions/_form.html.erb index abb28c658..d9a02b8f1 100644 --- a/app/views/versions/_form.html.erb +++ b/app/views/versions/_form.html.erb @@ -20,7 +20,7 @@
    • - <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>"fl" ,:style=>"margin-left:7px;"%> + <%= f.text_field :effective_date, :size => 10, :readonly => true,:class=>"fl" ,:style=>"margin-left:7px;",:label=>""%> <%= calendar_for('version_effective_date') %>
      • From 640f6a1ca76c8cc30220281e11accf28ceca27fa Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 17 Apr 2015 10:58:40 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=A1=86=E8=B7=9D=E7=A6=BB=20=E5=8E=BB=E6=8E=89=E8=AE=A8?= =?UTF-8?q?=E8=AE=BA=E5=8C=BA=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84*?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/_form_project.html.erb | 2 +- app/views/projects/invite_members_by_mail.html.erb | 9 +++++---- public/stylesheets/project.css | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/views/messages/_form_project.html.erb b/app/views/messages/_form_project.html.erb index 3e932b047..a1ef69fa9 100644 --- a/app/views/messages/_form_project.html.erb +++ b/app/views/messages/_form_project.html.erb @@ -26,7 +26,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个英文字符)" %>
      diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index 9a0694ea6..7f952cb3c 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -67,15 +67,16 @@
      • <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get') do %> -
      +
        +
      • <%= text_field_tag 'mail', '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onkeyup => "this.value=this.value.replace(' ','')", :style => "ime-mode:disabled;", :onblur => "verifyAddress(this);" %> -
      -
      + +
    <%= l(:label_send_email)%> - <%#= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %> + <% end %>
    diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 2f08af6d6..66d04aa0c 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -42,7 +42,7 @@ a:hover.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} .box_main02{ width:390px; margin:15px auto;} .box_h3{ color:#15bccf; 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;} +.fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:5px; padding-left:5px; width:290px;} a.icon_addm{ background:url(../images/img_floatbox.png) 0 -33px no-repeat; width:16px; height:16px; display:block; margin:5px 0 0 5px;} a:hover.icon_addm{background:url(../images/img_floatbox.png) 0 -61px no-repeat; } a.icon_removem{ background:url(../images/img_floatbox.png) -22px -33px no-repeat;width:16px; height:16px; display:block; margin:5px 0 0 5px} From d2b0eae1196dac6e5ae4ab8abbdcf88890584046 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 11:13:36 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/settings/_new_versions.html.erb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index c7566abf1..6365354c3 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -9,13 +9,13 @@ - - - - - - - + + + + + + + <% for version in @project.shared_versions.sort %> @@ -23,7 +23,7 @@ <%= 'shared' if version.project != @project %> <%= link_to_version version %> - +
    <%= l(:label_version) %> <%= l(:field_effective_date) %><%= l(:field_description) %> <%= l(:field_status) %><%= l(:field_sharing) %><%= l(:label_wiki_page) %><%= l(:label_version) %> <%= l(:field_effective_date) %><%= l(:field_description) %> <%= l(:field_status) %><%= l(:field_sharing) %><%= l(:label_wiki_page) %>
    <%= format_date(version.effective_date) %><%=h version.description %><%=h version.description %> <%= l("version_status_#{version.status}") %>