From 9c0797675158954d402936943c95c667d75ae1ae Mon Sep 17 00:00:00 2001 From: whimlex Date: Thu, 16 Apr 2015 09:54:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E5=BC=80=E5=92=8C=E6=94=B6=E8=B5=B7?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E4=BF=A1=E6=81=AF=E5=9B=BE=E7=89=87=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=EF=BC=9B=E8=B7=9F=E8=B8=AA=E8=80=85?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 2 +- app/helpers/watchers_helper.rb | 2 +- app/views/issues/_edit.html.erb | 5 ----- app/views/issues/new.html.erb | 4 ++++ app/views/issues/show.html.erb | 6 +++++- app/views/layouts/base_projects.html.erb | 2 +- public/images/jiantou.jpg | Bin 7528 -> 22174 bytes public/images/jiantouup.jpg | Bin 0 -> 22179 bytes public/javascripts/project.js | 3 +++ 9 files changed, 15 insertions(+), 9 deletions(-) create mode 100644 public/images/jiantouup.jpg diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index fad54f056..f9070c417 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -750,7 +750,7 @@ module ApplicationHelper end def other_formats_links(&block) - concat('

'.html_safe + l(:label_export_to)) + concat('

'.html_safe + l(:label_export_to)) yield Redmine::Views::OtherFormatsBuilder.new(self) concat('

'.html_safe) end diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index c4219f4ae..d3b2a49b1 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -301,7 +301,7 @@ module WatchersHelper c = checked.nil? ? object.watched_by?(user) : checked s = content_tag(:ul, content_tag(:li, "#{check_box_tag 'issue[watcher_user_ids][]', user.id, c, :id => nil } #{h link_to user.userInfo, user_path( user.id)}".html_safe, - :id=>"issue_watcher_user_ids_#{user.id}",:style=>"float: left;width: 270px;margin: 0px 20px 10px 0px; overflow: hidden; line-height:1.6em;" ), + :id=>"issue_watcher_user_ids_#{user.id}",:style=>"float: left;width: 175px;margin: 0px 20px 10px 0px; overflow: hidden; line-height:1.6em;" ), :class => "mb10 ml80") end.join.html_safe diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 14e2d0201..02c262dbe 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -32,11 +32,6 @@ <%= f.hidden_field :lock_version %> <%= hidden_field_tag 'last_journal_id', params[:last_journal_id] || @issue.last_journal_id %> <%= hidden_field_tag 'reference_user_id', params[:reference_user_id]%> - - <%= 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 fl ml10"}%> <% end %>
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb index 9bd068fcd..2c4cf4cd3 100644 --- a/app/views/issues/new.html.erb +++ b/app/views/issues/new.html.erb @@ -11,6 +11,10 @@ <%= render :partial => 'issues/form', :locals => {:f => f} %> + + <%= l(:button_create) %> + + <%= preview_link preview_new_issue_path(:project_id => @project), 'issue-form', 'preview', {:class => "blue_btn fl ml10"} %> <% end %>
diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 9c1ce60ab..0b3c4fb06 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -115,7 +115,11 @@ <% 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"}%> <% if @changesets.present? %> diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 15e30bfbb..36dbef692 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -187,7 +187,7 @@
- +
diff --git a/public/images/jiantou.jpg b/public/images/jiantou.jpg index cd28409886d0f4f3d97e76ce5e6f920a4458da3e..daed7f5df8c318351ec5cedb7ad8292520e256be 100644 GIT binary patch literal 22174 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 N{>%1d(`C6s{{jS?_-X(E delta 1190 zcmbQYmhpvE{r?;PA2OG@R%E6zFnD@uF>o+2Ft9TSF)}kS0$Cs|#mEY#lYne#C_4+t z)_|&E0&0*EvI|7T!eS^zPM2P6Y!vjN!Qah%m24r9g_t_Bz5^^7^4`N zrB&T!fa;lMEn~27^7Lg<1?glE5UTpV=fk?izt_hvoL95xV$bF-5hpGtp2L$AWG26o zGhGd~Zg9V`^&;s##8IXksPAvG_>R;gUc-tPZ920q7>{G?Qd6j10e{=d!8!obGD!oteJ#>&dZ z$p*yS9BgbH+&o-d++18d0z6l|V!O6wV2#i~1WLcm9GYcylSWi*QKl@p=o7h>VJk87p?2xbfnLrln_OW@YEhl{-(~eECz$$}1|Xs%zG& zU8ion`UUhY6VOqttUxETa4<9H0-Z0&%mQ*CYaq~pY=w;zjTUbFAad~HLuDt?proRY z#wsSxO=6RRRTm|1I>cUl$@Gy+vv|m4U|>i{s+qY;si&0Ghnjy{y!o((=H>DT`CsLK NhN}YX diff --git a/public/images/jiantouup.jpg b/public/images/jiantouup.jpg new file mode 100644 index 0000000000000000000000000000000000000000..01445ab5463f297df93225f3aa067f373211eba0 GIT binary patch literal 22179 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 Ry;ZyK_sb4nw?vyi_)mbJ02u%P literal 0 HcmV?d00001 diff --git a/public/javascripts/project.js b/public/javascripts/project.js index 2ee9c1c83..3a60f51c0 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -38,16 +38,19 @@ function expand_tools_expand() function show_more_msg(){ $("#course_description").toggleClass("course_description_none"); var information = $("#expend_more_information"); + var arrow = $("#arrow"); var val = information.attr("value"); if (val=="展开更多信息" ) { $("#expend_more_information").text("收起描述信息"); information.attr("value","收起描述信息"); + arrow.attr("src","/images/jiantouup.jpg") } else { $("#expend_more_information").text("展开更多信息"); information.attr("value","展开更多信息"); + arrow.attr("src","/images/jiantou.jpg") } }