diff --git a/app/views/pull_requests/_show.html.erb b/app/views/pull_requests/_show.html.erb index c46ebddb9..30c640ee8 100644 --- a/app/views/pull_requests/_show.html.erb +++ b/app/views/pull_requests/_show.html.erb @@ -9,35 +9,42 @@
<%= @request.title %>

<%= @request.description %>

-
- 请求将 <%= @request.source_branch %> 合并至 <%= @request.target_branch %> -
-<% if @commits_count == 0 && @changes_count == 0 %> - <%= @request.source_branch %>没有新内容可以合并至<%= @request.target_branch %>
-

请将新改动提交至源分支或者切换到其它目标分支

-<% else %> - <% if @request.state == "merged" %> - Hjqreturn于两小时前合并
-

改动已合并至<%= @request.target_branch %>

+
+ 请求将 <%= @request.source_branch %> 合并至 <%= @request.target_branch %> + + <% if @commits_count == 0 && @changes_count == 0 %> +
+ <%= @request.source_branch %>没有新内容可以合并至<%= @request.target_branch %>
+

请将新改动提交至源分支或者切换到其它目标分支

+
+
<% else %> + <% if @request.state == "merged" %> +
+ <%= link_to @request.author.try(:username), user_path(get_user_by_login_and(@request.author.try(:username))), :class => "link-blue" %>于<%= time_tag(@request.created_at) %> 前合并
+

改动已合并至<%= @request.target_branch %>

+
+ <% else %> <% if is_project_manager?(User.current.id, @project.id) %> - <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn", :remote => true %> +
+ <%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn", :remote => true %> +
<% end %> + <% end %> + +
+ +
根据最近提交时间排列
+
+ <%= render :partial => "pull_requests/pull_request_commits" %> +
+
+ <%= render :partial => "pull_requests/pull_request_changes" %> +
<% end %> -
- - -
根据最近提交时间排列
-
- <%= render :partial => "pull_requests/pull_request_commits" %> -
-
- <%= render :partial => "pull_requests/pull_request_changes" %> -
- <% end %> diff --git a/app/views/users/choose_user_course.js.erb b/app/views/users/choose_user_course.js.erb index 512a66018..19a244396 100644 --- a/app/views/users/choose_user_course.js.erb +++ b/app/views/users/choose_user_course.js.erb @@ -8,7 +8,7 @@ <%# else %> <% if params[:is_observe].nil? %> var htmlvalue = "<%= escape_javascript(render :partial => 'users/send_homework_to_course', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>"; - pop_box_new(htmlvalue,460,50,50); + pop_box_new(htmlvalue,460,435); <% else %> $("#send_homework_to_course_form").html("<%= escape_javascript(render :partial => 'users/send_homework_to_course_form', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>"); <% end %> diff --git a/app/views/users/send_homework_to_course.js.erb b/app/views/users/send_homework_to_course.js.erb index 7db28b869..2541c5bc7 100644 --- a/app/views/users/send_homework_to_course.js.erb +++ b/app/views/users/send_homework_to_course.js.erb @@ -1,4 +1,4 @@ $("#subject_count_homework_<%=@homework.id %>").html(<%= @homework.quotes %>); hideModal(); var htmlvalue = "<%= escape_javascript(render :partial => 'homework_post_notice') %>"; -pop_box_new(htmlvalue,380,40,50); \ No newline at end of file +pop_box_new(htmlvalue,380,182); \ No newline at end of file diff --git a/app/views/users/show_homework_detail.js.erb b/app/views/users/show_homework_detail.js.erb index 8c0e3c54a..cbb0cf057 100644 --- a/app/views/users/show_homework_detail.js.erb +++ b/app/views/users/show_homework_detail.js.erb @@ -3,5 +3,5 @@ $("#choose_courses_notice").html(""); <% else %> var htmlvalue = "<%= escape_javascript(render :partial => 'users/homework_repository_detail') %>"; - pop_box_new(htmlvalue,820,50,50); + pop_box_new(htmlvalue,820,155); <% end %> \ No newline at end of file diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 20040f559..cfeb4b341 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -1495,7 +1495,7 @@ function pop_up_box(value,tWidth,tTop,tLeft){ // 公共弹框样式 function pop_box_new(value, Width, Height){ w = ($(window).width() - Width)/2; - h = ($(window).height() - Height)/2; + h = ($(window).height() - Height)/2 - 100; $("#ajax-modal").html(value); showModal('ajax-modal', Width + 'px'); $('#ajax-modal').siblings().remove(); @@ -1552,9 +1552,7 @@ function pop_box_new(value, Width, Height){ document.onmousemove = null; } - window.onload = function () { - new Drag("popupWrap"); - } + new Drag("popupWrap"); } // 公共提示弹框样式