From dc955c7e2ddd8627ee33e113df426cedd529589a Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 17 Apr 2015 14:14:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E7=BC=96=E8=BE=91=E9=97=AE=E9=A2=98=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E3=80=81?= =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=AE=8C=E6=88=90=E6=97=B6=E9=97=B4=E5=8F=B3?= =?UTF-8?q?=E4=BE=A7=E7=9A=84=E6=97=B6=E9=97=B4=E9=80=89=E6=8B=A9=E5=99=A8?= =?UTF-8?q?=E4=B8=8D=E8=A7=81=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_project_file_links.html.erb | 4 +++- app/views/issues/_attributes.html.erb | 3 ++- app/views/issues/update_form.js.erb | 2 +- app/views/repositories/_breadcrumbs.html.erb | 2 +- public/stylesheets/project.css | 10 ++++++++++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb index d8b53acd0..9a65556d8 100644 --- a/app/views/attachments/_project_file_links.html.erb +++ b/app/views/attachments/_project_file_links.html.erb @@ -59,12 +59,14 @@ <% end %>

<% end %> +
<% if defined?(thumbnails) && thumbnails %> <% images = attachments.select(&:thumbnailable?) %> <% if images.any? %> <% images.each do |attachment| %> -
<%= thumbnail_issue_tag(attachment) %>
+
<%= thumbnail_issue_tag(attachment) %>
<% end %> <% end %> <% end %> +
diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index 4ce029217..68bd9f82c 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -9,7 +9,8 @@ <%= f.select :status_id, (@allowed_statuses.collect { |p| [p.name, p.id] }), {:no_label => true}, - :onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')", + # ajax 刷新 + #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')", :class => "w150" %> <% else %> <%= h(@issue.status.name) %> diff --git a/app/views/issues/update_form.js.erb b/app/views/issues/update_form.js.erb index 615bbfcb3..cc4fb18fc 100644 --- a/app/views/issues/update_form.js.erb +++ b/app/views/issues/update_form.js.erb @@ -1,5 +1,5 @@ $('#all_attributes').html('<%= escape_javascript(render :partial => 'form') %>'); -$(.splitcontent).style("display", "block") +//$(.splitcontent).style("display", "block") <% if User.current.allowed_to?(:log_time, @issue.project) %> $('#log_time').show(); <% else %> diff --git a/app/views/repositories/_breadcrumbs.html.erb b/app/views/repositories/_breadcrumbs.html.erb index 780cb47cb..db570d948 100644 --- a/app/views/repositories/_breadcrumbs.html.erb +++ b/app/views/repositories/_breadcrumbs.html.erb @@ -25,7 +25,7 @@ <% # @rev is revsion or Git and Mercurial branch or tag. # For Mercurial *tip*, @rev and @changeset are nil. - rev_text = @changeset.nil? ? "master" : format_revision(@changeset) + rev_text = @changeset.nil? ? @rev : format_revision(@changeset) %>

<%= "@ #{h rev_text}" unless rev_text.blank? %>

diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 1658339ec..0c52ac4a3 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -534,3 +534,13 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; } /*pre标签换行*/ .break_word{word-break: break-all;word-wrap: break-word;} .break_word_firefox{white-space: pre-wrap;word-break: break-all;} + +/*问题跟踪attachment显示*/ +div.attachments { margin-top: 12px; } +div.attachments p { margin:4px 0 2px 0; } +div.attachments img { vertical-align: middle; } +div.attachments span.author { font-size: 0.9em; color: #888; } + +div.thumbnails {margin-top:0.6em;} +div.thumbnails div {background:#fff;display:inline-block;margin-right:2px;} + From 532a8cb5c3f7239db0fb623beec5078fc7171b2e Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 14:20:53 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E5=B1=95=E5=BC=80=E8=BE=93=E5=85=A5=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/projects/settings.html.erb b/app/views/projects/settings.html.erb index 6fe71d7c3..d3499cfdd 100644 --- a/app/views/projects/settings.html.erb +++ b/app/views/projects/settings.html.erb @@ -5,8 +5,10 @@ project_setting(2); <% elsif @select_tab == "versions"%> project_setting(4); + $("#pro_st_edit_ban").toggle(); <% elsif @select_tab == "repositories" %> project_setting(6); + $("#pro_st_edit_ku").toggle(); <%else%> <% end%> From 15e54dd7653f4484ab9c5d7f9e2941024c04ac52 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 14:21:18 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E7=89=88=E6=9C=AC=20=E8=BE=93=E5=85=A5?= =?UTF-8?q?=E5=90=8D=E5=AD=97=E4=B8=8D=E8=83=BD=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/versions_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 36ce47d9e..2389284b8 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -116,7 +116,8 @@ class VersionsController < ApplicationController end else respond_to do |format| - format.html { render :action => 'new' } + format.html { flash[:error] = @version.errors.full_messages.to_s + redirect_to settings_project_url(@project, :tab => 'versions') } format.js { render :action => 'new' } format.api { render_validation_errors(@version) } end From 17f9ed52ce70f05804522ca3231a04d5f07385ff Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 17 Apr 2015 14:21:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?Wiki=E5=88=97=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/settings/_new_versions.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/settings/_new_versions.html.erb b/app/views/projects/settings/_new_versions.html.erb index ffc301cf5..ae2250774 100644 --- a/app/views/projects/settings/_new_versions.html.erb +++ b/app/views/projects/settings/_new_versions.html.erb @@ -14,7 +14,7 @@ <%= l(:field_description) %> <%= l(:field_status) %> <%= l(:field_sharing) %> - <%= l(:label_wiki_page) %> + <%= l(:label_wiki_page) %> <% for version in @project.shared_versions.sort %> @@ -58,7 +58,7 @@