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 cd2840988..daed7f5df 100644 Binary files a/public/images/jiantou.jpg and b/public/images/jiantou.jpg differ diff --git a/public/images/jiantouup.jpg b/public/images/jiantouup.jpg new file mode 100644 index 000000000..01445ab54 Binary files /dev/null and b/public/images/jiantouup.jpg differ 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") } }