commit
6e7f1a3713
@ -0,0 +1,3 @@
|
|||||||
|
# Place all the behaviors and hooks related to the matching controller here.
|
||||||
|
# All this logic will automatically be available in application.js.
|
||||||
|
# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
// Place all the styles related to the pull_requests controller here.
|
||||||
|
// They will automatically be included in application.css.
|
||||||
|
// You can use Sass (SCSS) here: http://sass-lang.com/
|
||||||
@ -0,0 +1,17 @@
|
|||||||
|
module PullRequestsHelper
|
||||||
|
|
||||||
|
# 获取diff内容行号
|
||||||
|
def diff_line_num content
|
||||||
|
content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.nil? ? "" : content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
|
||||||
|
end
|
||||||
|
|
||||||
|
# 处理内容
|
||||||
|
def diff_content content
|
||||||
|
content.gsub!(/.*@@ -\d+,\d+ \+\d+,\d+ @@\n/m,'')
|
||||||
|
end
|
||||||
|
|
||||||
|
def get_user_name user_id
|
||||||
|
User.find(user_id).try(:login)
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
@ -1,3 +1,3 @@
|
|||||||
var htmlvalue = "<%= escape_javascript(render :partial => 'applied_join_project', locals: {:project_id => (@project.nil? ? nil : @project.id)}) %>";
|
var htmlvalue = "<%= escape_javascript(render :partial => 'applied_join_project', locals: {:project_id => (@project.nil? ? nil : @project.id)}) %>";
|
||||||
pop_box_new(htmlvalue,460,40,50);
|
pop_box_new(htmlvalue,460,190);
|
||||||
|
|
||||||
|
|||||||
@ -1,2 +1,2 @@
|
|||||||
var htmlvalue = "<%= escape_javascript(render :partial => 'join_private_course') %>";
|
var htmlvalue = "<%= escape_javascript(render :partial => 'join_private_course') %>";
|
||||||
pop_box_new(htmlvalue,460,40,50);
|
pop_box_new(htmlvalue,460,220);
|
||||||
|
|||||||
@ -1,11 +1,11 @@
|
|||||||
<% if User.current.logged?%>
|
<% if User.current.logged?%>
|
||||||
<% if User.current == target%>
|
<% if User.current == target%>
|
||||||
<%= link_to("编辑资料", my_account_path, :class => "fl UsersEditBtn")%>
|
<%= link_to("编辑个人资料", my_account_path, :class => "user_editinfo")%>
|
||||||
<% else%>
|
<% else%>
|
||||||
<%if(target.watched_by?(User.current))%>
|
<%if(target.watched_by?(User.current))%>
|
||||||
<%= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "UsersApBtn", :method => "delete",:remote => "true", :title => "取消关注"%>
|
<%= link_to "取消关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "user_editinfo", :method => "delete",:remote => "true", :title => "取消关注"%>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "UsersAttBtn", :method => "post",:remote => "true", :title => "添加关注"%>
|
<%= link_to "添加关注",watch_path(:object_type=> 'user',:object_id=>target.id,:target_id=>target.id),:class => "user_editinfo", :method => "post",:remote => "true", :title => "添加关注"%>
|
||||||
<% end %>
|
<% end %>
|
||||||
<% end%>
|
<% end%>
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1,5 +1,5 @@
|
|||||||
<% if @flash_message %>
|
<% if @flash_message %>
|
||||||
alert("<%= @flash_message %>");
|
alert("<%= @flash_message %>");
|
||||||
<% else%>
|
<% else%>
|
||||||
$("#applied_project_<%= @applied_message.id %>").html('<%= render :partial => "users/user_message_applide_action", :locals =>{:ma => @applied_message} %>');
|
$("#applied_project_<%= @applied_message.id %>").html('<%= escape_javascript(render :partial => 'users/applied_project_content', :locals => {:ma => @applied_message}) %>');
|
||||||
<% end%>
|
<% end%>
|
||||||
|
|||||||
@ -1 +1 @@
|
|||||||
$("#applied_project_<%= @applied_message.id %>").html('<%= render :partial => "users/user_message_applide_action", :locals =>{:ma => @applied_message} %>');
|
$("#applied_project_<%= @applied_message.id %>").html('<%= escape_javascript(render :partial => 'users/applied_project_content', :locals => {:ma => @applied_message}) %>');
|
||||||
@ -0,0 +1,85 @@
|
|||||||
|
<%= form_tag(url_for(:controller => 'pull_requests', :action => 'create', :project_id => @project.id, :forked_project_id => @forked_project.try(:gpid)), :id => 'pull_request_form', :method => "post", :remote => true) do %>
|
||||||
|
<div class="new-merge-wrap">
|
||||||
|
<div class="merge-option-name fl mt8"><span class="c_red">*</span>标题</div><input type="text" id="pr_name" name="title" class="merge-title-input fl ml30" />
|
||||||
|
<p id ="pull_request_title" class="fl ml100 fontGrey2 mt5 c_red" style="display: none">标题不能为空</p>
|
||||||
|
<div class="cl mb10"></div>
|
||||||
|
<div class="merge-option-name fl">描述</div><textarea type="text" name="description" class="merge-description-input fl ml30"></textarea>
|
||||||
|
<!--<p class="fl ml100 f12 mt5"><a href="javascript:void(0);" class="AnnexBtn fl mr10">上传附件</a></p>-->
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
|
<div class="new-merge-wrap borderBottomNone">
|
||||||
|
<div class="merge-option-name fl" style="padding:5px 0">源分支</div>
|
||||||
|
<%= select_tag :branch, options_for_select(@source_rev), :id => "source_branch", :name => "source_branch", :value => "source_branch", :class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
|
||||||
|
<div class="cl mb10"></div>
|
||||||
|
<div class="merge-option-name fl" style="padding:5px 0">目标分支</div>
|
||||||
|
<% if @forked_project.nil? %>
|
||||||
|
<%= select_tag :branch, options_for_select(@source_rev), :id => "pull_request_branch", :name => "target_branch", :value => "target_branch",:class => "ml30 fontGrey3 fb fl", :style => "padding:5px 0 5px 5px;" %>
|
||||||
|
<% else %>
|
||||||
|
<select onchange="choice_branch(this.value, document.getElementById('pull_request_branch'), <%= @source_rev %>, <%= @forked_rev %>);" name="source_project" value="source_project" class="ml30 fontGrey3 fb fl" style = "padding:5px 0 5px 5px;">
|
||||||
|
<option value="source_project_name"><%= @source_project_name %></option>
|
||||||
|
<option value="forked_project_name"><%= @forked_project_name %></option>
|
||||||
|
</select>
|
||||||
|
<select name="target_branch" id="pull_request_branch" class = "ml30 fontGrey3 fb fl" style = "width:140px; padding:5px 0 5px 5px;">
|
||||||
|
<% @source_rev.each do |rev| %>
|
||||||
|
<option value="<%= rev %>"><%= rev %></option>
|
||||||
|
<% end %>
|
||||||
|
</select>
|
||||||
|
<% end %>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<p id ="pull_request_branch_error" class="ml100 fontGrey2 mt5 c_red" style="display: none">同一个项目的源分支和目标分支不能相同</p>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
|
<div class="new-merge-row b_grey" style="border-top:1px solid #ddd;">
|
||||||
|
<a href="javascript:void(0);" class="BlueCirBtn fl ml10" onclick="pull_request_commit()">提交请求</a>
|
||||||
|
<%= link_to "返回", project_pull_requests_path(:project_id => @project.id), :class => "fr linkGrey2 mt5 mr10" %>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
function regex_pr_name()
|
||||||
|
{
|
||||||
|
var name = $.trim($("#pr_name").val());
|
||||||
|
if(name.length == 0)
|
||||||
|
{
|
||||||
|
$("#pull_request_title").show();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$("#pull_request_title").hide();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function regex_branch()
|
||||||
|
{
|
||||||
|
var source_branch = $.trim($("#source_branch").val());
|
||||||
|
var target_branch = $.trim($("#pull_request_branch").val());
|
||||||
|
if(source_branch == target_branch)
|
||||||
|
{
|
||||||
|
$("#pull_request_branch_error").show();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$("#pull_request_branch_error").hide();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//提交pull request
|
||||||
|
function pull_request_commit()
|
||||||
|
{
|
||||||
|
if(regex_pr_name())
|
||||||
|
{
|
||||||
|
$("#pull_request_form").submit();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//切换项目时，替换分支
|
||||||
|
$("#targetProject").change(function(){
|
||||||
|
var defaultBranch = $("#targetBranch option:first-child").val();
|
||||||
|
$("#targetBranch").val(defaultBranch);
|
||||||
|
});
|
||||||
|
</script>
|
||||||
@ -0,0 +1,30 @@
|
|||||||
|
<div id="pull_request_new_form">
|
||||||
|
<div id="create_pull_request_error">
|
||||||
|
<%= render :partial => "pull_requests/error_message" %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="new-merge-request">
|
||||||
|
<div class="f14 fontGrey3 fb mb10">新的合并请求</div>
|
||||||
|
</div>
|
||||||
|
<%= render :partial => "pull_requests/form" %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$("#pull_request_new_form").parent().css("width","730px");
|
||||||
|
|
||||||
|
$("#changed-files").toggle(function(){
|
||||||
|
$("#changed-files-detail").show();
|
||||||
|
},function(){
|
||||||
|
$("#changed-files-detail").hide();
|
||||||
|
});
|
||||||
|
|
||||||
|
$(".merge-record li a").click(function(){
|
||||||
|
$(".merge-record li a").removeClass("active");
|
||||||
|
$(this).addClass("active");
|
||||||
|
|
||||||
|
var index = $(".merge-record li a").index(this);
|
||||||
|
|
||||||
|
$("#merge_record_0, #merge_record_1").hide();
|
||||||
|
$("#merge_record_" + index).show();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
@ -0,0 +1,33 @@
|
|||||||
|
<% unless @changes.blank? %>
|
||||||
|
<% @changes.each do |cd| %>
|
||||||
|
<div class="showing-changes-row fontGrey2" style="width:710px;">
|
||||||
|
<a class="linkGrey3" id="changed-files">
|
||||||
|
<img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= cd['new_path'] %>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div class="autoscroll">
|
||||||
|
<table class="filecontent syntaxhl" style="width:100%;" >
|
||||||
|
<tbody>
|
||||||
|
<% line_num = diff_line_num(cd['diff']) %>
|
||||||
|
<% diff_content = diff_content(cd['diff']) %>
|
||||||
|
<% syntax_highlight_lines('new_path', Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %>
|
||||||
|
<tr>
|
||||||
|
<th class="line-num" id="L<%= line_num %>" style="vertical-align: top;">
|
||||||
|
<a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
|
||||||
|
</th>
|
||||||
|
<% if line[0,1] == "-" %>
|
||||||
|
<td class="line-code diff_out"><pre style="white-space:pre;"><%= line.html_safe %></pre></td>
|
||||||
|
<% elsif line[0,1] == "+" %>
|
||||||
|
<td class="line-code diff_in"><pre style="white-space:pre;"><%= line.html_safe %></pre></td>
|
||||||
|
<% else%>
|
||||||
|
<td class="line-code"><pre style="white-space:pre;"><%= line.html_safe %></pre></td>
|
||||||
|
<% end %>
|
||||||
|
</tr>
|
||||||
|
<% line_num += 1 %>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
@ -0,0 +1,19 @@
|
|||||||
|
<% @commits.each do |commit| %>
|
||||||
|
<div class="new-merge-wrap">
|
||||||
|
<div class="merge-commit-time">
|
||||||
|
<img width="16" class="ui-datepicker-trigger mr15" style="cursor:default; margin-top:3px; margin-left:0;" /><span class="fontGrey3"><%= format_date(commit.created_at) %></span>
|
||||||
|
<!--<p class="mt10 fontGrey2">1次提交</p>-->
|
||||||
|
<p class="mt10 fontGrey2"><%= link_to commit.author_name, user_path(get_user_by_mail(commit.author_email)), :class => "link-blue" %>创建于<%= time_tag(commit.created_at) %>前</p>
|
||||||
|
</div>
|
||||||
|
<div class="merge-commit-detail">
|
||||||
|
<span class="fontGrey3 fb"><%= commit.title %></span>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<div class="merge-commit-code">
|
||||||
|
<span class="fontGrey3">
|
||||||
|
<%= link_to truncate(commit.short_id, :length => 20), {:controller => 'repositories', :action => 'commit_diff', :id => @project.id, :changeset => commit.id}, :target => "_blank" %>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
<script>
|
||||||
|
$("#RSide").before("<div class='homepageRightBanner mb10'><span class='f16 fontGrey3'>Pull Request</span></div>");
|
||||||
|
</script>
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
<% if @requests.blank? %>
|
||||||
|
<div class="no-merge-content">没有可显示的请求</div>
|
||||||
|
<% else %>
|
||||||
|
<% @requests.each do |request| %>
|
||||||
|
<li>
|
||||||
|
<% request %>
|
||||||
|
<%=link_to request.title, project_pull_request_path(request.id, :project_id => @project.id), :class => "linkGrey3 fb fl"%>
|
||||||
|
<!--<a href="javascript:void(0);" class="fr fontGrey2 fb"><img src="/images/comments.png" class="mr5" width="15" />0</a><span class="fr mr15 fb fontGrey2">关闭</span>-->
|
||||||
|
<div class="cl mb5"></div>
|
||||||
|
<span class="fontGrey2">由 <%= 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) %></span>
|
||||||
|
<span class="fr fontGrey2"><%= time_tag(request.updated_at) %>更新</span>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</li>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
@ -0,0 +1,69 @@
|
|||||||
|
<div id="create_pull_request_error">
|
||||||
|
<%= render :partial => "pull_requests/error_message" %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="pull_request_show">
|
||||||
|
<div id="mergeShow" class="f14 fontGrey2 merge-show">
|
||||||
|
<span class="mr10 open-status"><%= @request.state == "merged" ? "已合并" : "待处理" %></span><span class="mr10">合并请求</span> 由<%= 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) %>提交 · 最后编辑时间<%= time_tag(@request.updated_at) %>
|
||||||
|
<!--<a href="javascript:void(0);" class="BlueCirBtnMini fr mt5">编辑</a>-->
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
|
<div class="new-merge-row b_grey"><strong><%= @request.title %></strong><p class="mt10"><%= @request.description %></p></div>
|
||||||
|
<div class="mt10 mb15">
|
||||||
|
请求将 <span class="fontGrey3 fb"><%= @request.source_branch %></span> 合并至 <span class="fontGrey3 fb"><%= @request.target_branch %></span>
|
||||||
|
|
||||||
|
<% if @commits_count == 0 && @changes_count == 0 %>
|
||||||
|
<div class="merge-commit-option mt15">
|
||||||
|
<span class="fontGrey3 fb" style="font-size:13px;"><img src="/images/warning.png" width="16" class="mr5 mt2 fl"><%= @request.source_branch %>没有新内容可以合并至<%= @request.target_branch %></span><br />
|
||||||
|
<p class="fontGrey2 mt5">请将新改动提交至源分支或者切换到其它目标分支</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<% else %>
|
||||||
|
<% if @request.state == "merged" %>
|
||||||
|
<div class="merge-commit-option mt15">
|
||||||
|
<span class="fontGrey3 fb" style="font-size:13px;"><%#= 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) %> 前合并</span><br />
|
||||||
|
<p class="fontGrey2 mt5">改动已合并至<%= @request.target_branch %></p>
|
||||||
|
</div>
|
||||||
|
<% else %>
|
||||||
|
<% if is_project_manager?(User.current.id, @project.id) %>
|
||||||
|
<div class="merge-commit-option mt15">
|
||||||
|
<%= link_to "接受请求", accept_pull_request_project_pull_request_path(@request.id, :project_id => @project.id), :class => "BlueCirBtn", :remote => true %>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<ul class="merge-record" style="border-top:1px solid #ddd;">
|
||||||
|
<li><%= link_to "提交<span class='project-number-dot'>#{@commits_count}</span>".html_safe, pull_request_commits_project_pull_request_path(@request.id, :project_id => @project.id, :type => 1), :remote => true, :class => "active" %></li>
|
||||||
|
<li><%= link_to "改动<span class='project-number-dot'>#{@changes_count}</span>".html_safe, pull_request_changes_project_pull_request_path(@request.id, :project_id => @project.id, :type => 2), :remote => true %></li>
|
||||||
|
</ul>
|
||||||
|
<div class="new-merge-row b_grey fontGrey2"><span class="ml10"> 根据最近提交时间排列</span></div>
|
||||||
|
<div id="merge_record_0">
|
||||||
|
<%= render :partial => "pull_requests/pull_request_commits" %>
|
||||||
|
</div>
|
||||||
|
<div id="merge_record_1" class="undis">
|
||||||
|
<%= render :partial => "pull_requests/pull_request_changes" %>
|
||||||
|
</div>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$("#pull_request_show").parent().css("width","730px");
|
||||||
|
|
||||||
|
$("#changed-files").toggle(function(){
|
||||||
|
$("#changed-files-detail").show();
|
||||||
|
},function(){
|
||||||
|
$("#changed-files-detail").hide();
|
||||||
|
});
|
||||||
|
|
||||||
|
$(".merge-record li a").click(function(){
|
||||||
|
$(".merge-record li a").removeClass("active");
|
||||||
|
$(this).addClass("active");
|
||||||
|
|
||||||
|
var index = $(".merge-record li a").index(this);
|
||||||
|
|
||||||
|
$("#merge_record_0, #merge_record_1").hide();
|
||||||
|
$("#merge_record_" + index).show();
|
||||||
|
});
|
||||||
|
</script>
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
$("#create_pull_request_error").html('<%= escape_javascript(render :partial => "pull_requests/error_message") %>');
|
||||||
|
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
<%= render :partial => "pull_requests/pull_request_container" %>
|
||||||
|
<%= render :partial => "pull_requests/new" %>
|
||||||
|
|
||||||
@ -0,0 +1 @@
|
|||||||
|
$("#create_pull_request_error").html('<%= escape_javascript(render :partial => "pull_requests/error_message") %>');
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
<%= render :partial => "pull_requests/pull_request_container" %>
|
||||||
|
<ul id="mergeBanner" class="project-merge-banner">
|
||||||
|
<li class="active"><%= link_to "待处理<span class='project-number-dot'>#{@requests_opened_count}</span>".html_safe, project_pull_requests_path(:type => "1"), :remote => true %></li>
|
||||||
|
<li><%= link_to "已处理<span class='project-number-dot'>#{@requests_merged_count}</span>".html_safe, project_pull_requests_path(:type => "2"), :remote => true %></li>
|
||||||
|
|
||||||
|
<%= link_to "创建Pull Request", new_project_pull_request_path, :class => "BlueCirBtn fr ml10 mt10", :style => "width:110px;" %>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</ul>
|
||||||
|
<div class="cl"></div>
|
||||||
|
|
||||||
|
<ul class="project-merge-content" id="pull_requests_list">
|
||||||
|
<%= render "pull_requests/pull_requests_list" %>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
$("#mergeBanner").parent().css("width","730px");
|
||||||
|
|
||||||
|
$(".project-merge-banner li").click(function(){
|
||||||
|
$(".project-merge-banner li").removeClass("active");
|
||||||
|
$(this).addClass("active");
|
||||||
|
});
|
||||||
|
</script>
|
||||||
@ -0,0 +1 @@
|
|||||||
|
$("#pull_requests_list").html('<%= escape_javascript( render :partial => "pull_requests/pull_requests_list", :locals => {:type => @type} ) %>');
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
<%= render :partial => "pull_requests/pull_request_container" %>
|
||||||
|
<%= render :partial => "pull_requests/new" %>
|
||||||
|
|
||||||
@ -0,0 +1 @@
|
|||||||
|
$("#merge_record_1").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_changes", :locals => {:type => @type} ) %>');
|
||||||
@ -0,0 +1 @@
|
|||||||
|
$("#merge_record_0").html('<%= escape_javascript( render :partial => "pull_requests/pull_request_commits", :locals => {:type => @type} ) %>');
|
||||||
@ -0,0 +1,2 @@
|
|||||||
|
<%= render :partial => "pull_requests/pull_request_container" %>
|
||||||
|
<%= render :partial => "pull_requests/show" %>
|
||||||
@ -0,0 +1,3 @@
|
|||||||
|
<%# 详情页面和新建页面都会跳入，所以用两种局部刷新 %>
|
||||||
|
$("#pull_request_new_form").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
|
||||||
|
$("#pull_request_show").html('<%= escape_javascript(render :partial => "pull_requests/show") %>');
|
||||||
@ -0,0 +1,15 @@
|
|||||||
|
<li class="homepageNewsPortrait fl">
|
||||||
|
<a href="javascript:void(0);"><%=link_to image_tag(url_to_avatar(applied_project_users(ma)), :width => "30", :height => "30"), user_path(applied_project_users(ma)), :target => '_blank' %></a>
|
||||||
|
</li>
|
||||||
|
<li class="homepageNewsPubType fl">
|
||||||
|
<%= render :partial => "users/user_message_applide_users", :locals =>{:ma => ma} %>
|
||||||
|
</li>
|
||||||
|
<li class="homepageNewsContent fl" style="width:283px;"><a href="javascript:void(0);" class="newsGrey">
|
||||||
|
以“<%= applied_project_message_type(ma.role) %>”身份加入<% project = Project.find(ma.project_id) %>
|
||||||
|
<%= link_to project.name, project_path(ma.project_id), :class => "link-blue", :target => '_blank', :title => "#{project.name}" %>
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li class="fl" style="width:71px; height:49px;">
|
||||||
|
<span><%= render :partial => "users/user_message_applide_action", :locals =>{:ma => ma} %></span>
|
||||||
|
</li>
|
||||||
|
<li class="homepageNewsTime fl"><%= time_tag(ma.created_at).html_safe %> </li>
|
||||||
@ -1,12 +1,17 @@
|
|||||||
<div id="popbox02">
|
<div id="sy_popup_box" style="width:380px;">
|
||||||
<div class="ni_con">
|
<div class="sy_popup_top sy_popup_top_tishi">
|
||||||
<p style="display: block;font-size: 14px;margin-left: 30px;margin-top: 20px;">
|
<h3 class="fl">提示</h3>
|
||||||
题目已发送到目标课程的作业列表，但需要您设置发布和截止时间，以激活相应作业，谢谢！
|
<a href="javascript:void(0);" class="sy_icons_close02 fr" onclick="hideModal()"></a>
|
||||||
</p>
|
<div class="cl"></div>
|
||||||
<div class="ni_btn">
|
|
||||||
<a href="javascript:void(0)" class="tijiao c_white ml45" onclick="hideModal();">
|
|
||||||
确 定
|
|
||||||
</a>
|
|
||||||
</div>
|
</div>
|
||||||
|
<div class="sy_popup_con02" >
|
||||||
|
<ul class="sy_popup_tishi">
|
||||||
|
<li>
|
||||||
|
题目已发送到目标课程的作业列表，但需要您设置发布和截止时间，以激活相应作业，谢谢！
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="javascript:void(0);" class="sy_btn_blue mt10" onclick="hideModal()">知道了</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -0,0 +1,13 @@
|
|||||||
|
<span class="sy_cgrey ">排序：</span>
|
||||||
|
<%= link_to "发布时间",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort),:class => "sy_cgrey fl",:remote => true%>
|
||||||
|
<% if order == "publish_time" %>
|
||||||
|
<%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort), :class => "#{@r_sort == 'asc' ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
|
||||||
|
<% else %>
|
||||||
|
<%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "publish_time", :sort => @r_sort), :class => "sortdownbtn sort_no mt15 fl", :remote => true %>
|
||||||
|
<% end %>
|
||||||
|
<%= link_to "引用数",user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort),:class => "sy_cgrey fl",:remote => true%>
|
||||||
|
<% if order == "quotes" %>
|
||||||
|
<%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort), :class => "#{@r_sort == 'asc' ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
|
||||||
|
<% else %>
|
||||||
|
<%= link_to "", user_search_homeworks_user_path(@user,:name=>search,:type => type,:is_import=>is_import,:property=>property,:order => "quotes", :sort => @r_sort), :class => "sortdownbtn sort_no mt15 fl", :remote => true %>
|
||||||
|
<% end %>
|
||||||
@ -0,0 +1,45 @@
|
|||||||
|
<div class="sy_classbox" >
|
||||||
|
<% if homeworks.empty? %>
|
||||||
|
<div class="icons_tishi"><img src="/images/sy/icons_tan.png" width="110" height="110" alt="" ></div>
|
||||||
|
<p class="sy_tab_con_p">暂无可显示的内容~</p>
|
||||||
|
<% else %>
|
||||||
|
<% homeworks.each do |homework| %>
|
||||||
|
<ul class="sy_classlist">
|
||||||
|
<span class="hw_icons_cir fl mt5 mr5"></span>
|
||||||
|
<div class="fl ">
|
||||||
|
<h3 class="sy_classlist_title fl">
|
||||||
|
<%= link_to homework.name, student_work_index_path(:homework => homework.id), :class => 'sy_cblack', :target => '_blank' %>
|
||||||
|
</h3>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<p class="sy_cgrey clear">
|
||||||
|
<span class="fl">来源：</span>
|
||||||
|
<%= link_to homework.course.name, course_path(homework.course), :target => '_blank', :class => 'hw_cgrey hw_classname fl mr15' %>
|
||||||
|
<span class="mr15 fl">类别：<%=homework.homework_type_ch %></span>
|
||||||
|
<span class="fl">作品：</span>
|
||||||
|
<span class="sy_corange hw_w20 fl "><%=homework.student_works.has_committed.count %></span>
|
||||||
|
<span class="fl">/</span>
|
||||||
|
<span class="sy_cgrey hw_w20 fl mr15"><%= homework.homework_type == 3 ? '--' : homework.course.student.count %></span>
|
||||||
|
<span class="fl">待评阅：</span>
|
||||||
|
<span class="sy_corange hw_w20 fl"><%= homework.student_works.has_committed.where("teacher_score is null and teaching_asistant_score is null").count %></span>
|
||||||
|
<span class="fl">/</span>
|
||||||
|
<span class="sy_cgrey hw_w20 fl mr15"><%=homework.student_works.has_committed.count %></span>
|
||||||
|
<span class="mr15 fl">发布时间：
|
||||||
|
<% if homework.publish_time %>
|
||||||
|
<%= format_date(homework.publish_time) %>
|
||||||
|
<% else %>
|
||||||
|
<span> -- </span>
|
||||||
|
<% end %>
|
||||||
|
</span>
|
||||||
|
<span class="mr15 fl"><%=(cur_homework_end_time homework).html_safe %></span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<% if homework.student_works.has_committed.count == 0 %>
|
||||||
|
<%= link_to '编 辑'.html_safe, edit_homework_common_path(homework, :is_manage => is_manage), :class => 'hw_btn_green fr mt5', :target => '_blank' %>
|
||||||
|
<% else %>
|
||||||
|
<%= link_to '评 分'.html_safe, student_work_index_path(:homework => homework.id), :class => 'hw_btn_green fr mt5', :target => '_blank' %>
|
||||||
|
<% end %>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</ul>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
<div class="hw_tab_top clear">
|
||||||
|
<span class="sy_cgrey fl"><%= @manage_pre ? '我管理的作业：' : '我收到的的作业：' %></span>
|
||||||
|
<%= link_to '查看更多', @manage_pre ? manage_or_receive_homeworks_user_path(@user) : manage_or_receive_homeworks_user_path(@user, :type =>2), :class => 'sy_cgrey fr mr15' %>
|
||||||
|
</div>
|
||||||
|
<%= render :partial => "#{@manage_pre ? 'manage_homework_list' : 'receive_homework_list'}", :locals => {:homeworks => @manage_pre ? @manage_homeworks : @receive_homeworks, :is_manage => 2} %>
|
||||||
|
|
||||||
|
<div class="hw_tab_top clear">
|
||||||
|
<span class="sy_cgrey fl"><%= @manage_pre ? '我收到的的作业：' : '我管理的作业：' %></span>
|
||||||
|
<%= link_to '查看更多', @manage_pre ? manage_or_receive_homeworks_user_path(@user, :type =>2) : manage_or_receive_homeworks_user_path(@user), :class => 'sy_cgrey fr mr15' %>
|
||||||
|
</div>
|
||||||
|
<%= render :partial => "#{@manage_pre ? 'receive_homework_list' : 'manage_homework_list'}", :locals => {:homeworks => @manage_pre ? @receive_homeworks : @manage_homeworks, :is_manage => 2} %>
|
||||||
@ -0,0 +1,22 @@
|
|||||||
|
<span class="sy_cgrey ">排序：</span>
|
||||||
|
<% if type == 1 %>
|
||||||
|
<%= link_to "发布时间",search_m_r_homeworks_user_path(@user,:name=>search,:type => type,:property=>property,:order => "publish_time", :sort => @r_sort),:class => "sy_cgrey fl",:remote => true%>
|
||||||
|
<% if order == "publish_time" %>
|
||||||
|
<%= link_to "", search_m_r_homeworks_user_path(@user,:name=>search,:type => type,:property=>property,:order => "publish_time", :sort => @r_sort), :class => "#{@r_sort == 'asc' ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
|
||||||
|
<% else %>
|
||||||
|
<%= link_to "", search_m_r_homeworks_user_path(@user,:name=>search,:type => type,:property=>property,:order => "publish_time", :sort => @r_sort), :class => "sortdownbtn sort_no mt15 fl", :remote => true %>
|
||||||
|
<% end %>
|
||||||
|
<% else %>
|
||||||
|
<%= link_to "状态", search_m_r_homeworks_user_path(@user,:name=>search,:type => type,:property=>property,:order => "status", :sort => @r_sort),:class => "sy_cgrey fl",:remote => true%>
|
||||||
|
<% if order == "status" %>
|
||||||
|
<%= link_to "", search_m_r_homeworks_user_path(@user,:name=>search,:type => type,:property=>property,:order => "status", :sort => @r_sort), :class => "#{@r_sort == 'asc' ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
|
||||||
|
<% else %>
|
||||||
|
<%= link_to "", search_m_r_homeworks_user_path(@user,:name=>search,:type => type,:property=>property,:order => "status", :sort => @r_sort), :class => "sortdownbtn sort_no mt15 fl", :remote => true %>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
<%= link_to "截止时间",search_m_r_homeworks_user_path(@user,:name=>search,:type => type,:property=>property,:order => "end_time", :sort => @r_sort),:class => "sy_cgrey fl",:remote => true%>
|
||||||
|
<% if order == "end_time" %>
|
||||||
|
<%= link_to "", search_m_r_homeworks_user_path(@user,:name=>search,:type => type,:property=>property,:order => "end_time", :sort => @r_sort), :class => "#{@r_sort == 'asc' ? 'sortupbtn' : 'sortdownbtn'} mt15 fl", :remote => true %>
|
||||||
|
<% else %>
|
||||||
|
<%= link_to "", search_m_r_homeworks_user_path(@user,:name=>search,:type => type,:property=>property,:order => "end_time", :sort => @r_sort), :class => "sortdownbtn sort_no mt15 fl", :remote => true %>
|
||||||
|
<% end %>
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
<div id="my_homework_sort">
|
||||||
|
<%= render :partial => 'users/my_homework_sort', :locals => {:type => type,:property => property,:order => @order,:search => search} %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="hw_search_box fr mr10">
|
||||||
|
<input class="hw_search-input" name="search" value='<%=search %>' placeholder="输入作业关键词进行搜索" type="text" >
|
||||||
|
<span class="hw_btn_search"></span>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<script type="text/javascript">
|
||||||
|
var lastSearchCondition = '';
|
||||||
|
var count = 0;
|
||||||
|
function search_hws(e){
|
||||||
|
if($(e.target).val().trim() == lastSearchCondition && lastSearchCondition != '')
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
lastSearchCondition = $(e.target).val().trim();
|
||||||
|
$.ajax({
|
||||||
|
url: '<%= url_for(:controller => 'users', :action => 'search_m_r_homeworks') %>'+'?name='+ e.target.value+'&type=<%=type %>&property=<%=property %>',
|
||||||
|
type:'get'
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
function throttle(method,context,e){
|
||||||
|
clearTimeout(method.tId);
|
||||||
|
method.tId=setTimeout(function(){
|
||||||
|
method.call(context,e);
|
||||||
|
},500);
|
||||||
|
}
|
||||||
|
|
||||||
|
//查询项目
|
||||||
|
$("input[name='search']").on('input', function (e) {
|
||||||
|
throttle(search_hws,window,e);
|
||||||
|
});
|
||||||
|
</script>
|
||||||
@ -0,0 +1,36 @@
|
|||||||
|
<div class="sy_classbox">
|
||||||
|
<% if homeworks.empty? %>
|
||||||
|
<div class="icons_tishi"><img src="/images/sy/icons_tan.png" width="110" height="110" alt="" ></div>
|
||||||
|
<p class="sy_tab_con_p">暂无可显示的内容~</p>
|
||||||
|
<% else %>
|
||||||
|
<% homeworks.each do |homework| %>
|
||||||
|
<ul class="sy_classlist">
|
||||||
|
<span class="hw_icons_cir fl mt5 mr5"></span>
|
||||||
|
<div class="fl ">
|
||||||
|
<h3 class="sy_classlist_title fl">
|
||||||
|
<%= link_to homework.name, student_work_index_path(:homework => homework.id), :class => 'sy_cblack', :target => '_blank' %>
|
||||||
|
</h3>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<p class="sy_cgrey clear">
|
||||||
|
<span class=" fl">来源：</span>
|
||||||
|
<%= link_to homework.course.name, course_path(homework.course), :target => '_blank', :class => 'hw_cgrey hw_classname fl mr15' %>
|
||||||
|
<span class="mr15 fl">类别：<%=homework.homework_type_ch %></span>
|
||||||
|
<% my_work = cur_user_works_for_homework(homework) %>
|
||||||
|
<span class="fl">状态：</span><span class="<%= my_work ? '' : 'hw_cir_nomal hw_cir_lorange' %> fl mr15"><%= my_work ? '已提交' : '未提交' %></span>
|
||||||
|
<span class="fl">作品：</span><span class="sy_corange hw_w20 fl mr15"><%=homework.student_works.has_committed.count %></span>
|
||||||
|
<span class="fl">成绩：</span>
|
||||||
|
<% if my_work && !my_work.work_score.nil? %>
|
||||||
|
<span class="sy_corange hw_w40 fl mr15"><%= format("%.1f",my_work.work_score.to_f) %></span>
|
||||||
|
<% else %>
|
||||||
|
<span class="sy_cgrey hw_w40 fl mr15">--</span>
|
||||||
|
<% end %>
|
||||||
|
<span class="mr15 fl">发布时间：<%= format_date homework.publish_time %></span>
|
||||||
|
<span class="mr15 fl"><%=cur_homework_end_time homework %></span>
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<%= student_for_homework_common homework %>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</ul>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
@ -1,20 +1,15 @@
|
|||||||
<% if @status == 1 || @status == 2 || @status == 3 %>
|
<%# if @status == 1 || @status == 2 || @status == 3 %>
|
||||||
$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/send_notice', :locals => {:status => @status}) %>');
|
// $("#ajax-modal").html('<%#= escape_javascript( render :partial => 'users/send_notice', :locals => {:status => @status}) %>');
|
||||||
showModal('ajax-modal', '500px');
|
// showModal('ajax-modal', '500px');
|
||||||
$('#ajax-modal').siblings().remove();
|
// $('#ajax-modal').siblings().remove();
|
||||||
$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
|
// $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
|
||||||
"<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
|
// "<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
|
||||||
$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
|
// $('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");
|
||||||
<% else %>
|
<%# else %>
|
||||||
<% if params[:is_observe].nil? %>
|
<% if params[:is_observe].nil? %>
|
||||||
$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/send_homework_to_course', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>');
|
var htmlvalue = "<%= escape_javascript(render :partial => 'users/send_homework_to_course', :locals => {:courses => @course, :user => @user, :send_id => @send_id}) %>";
|
||||||
showModal('ajax-modal', '452px');
|
pop_box_new(htmlvalue,460,435);
|
||||||
$('#ajax-modal').siblings().remove();
|
|
||||||
$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
|
|
||||||
$('#ajax-modal').parent().css("top","50%").css("left","50%");
|
|
||||||
$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
|
|
||||||
$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
|
|
||||||
<% else %>
|
<% 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}) %>");
|
$("#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 %>
|
<% end %>
|
||||||
<% end %>
|
<%# end %>
|
||||||
@ -0,0 +1,53 @@
|
|||||||
|
<script type="text/javascript" language="javascript">
|
||||||
|
function HoverLi(url){
|
||||||
|
window.location.href = url;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<div class="hw_content" >
|
||||||
|
<ul id="hw_tab_nav">
|
||||||
|
<li id="hw_tab_nav_1" onclick="HoverLi('<%= my_homeworks_user_path(@user) %>');">
|
||||||
|
<a href="javascript:void(0);" class="hw_tab_type">我的作业</a>
|
||||||
|
</li>
|
||||||
|
<li id="hw_tab_nav_2" class="<%=@type == 1 ? 'hw_tab_hover' : '' %>" onclick="HoverLi('<%= manage_or_receive_homeworks_user_path(@user) %>');">
|
||||||
|
<a href="javascript:void(0);" class="hw_tab_type">我管理的作业</a>
|
||||||
|
</li>
|
||||||
|
<li id="hw_tab_nav_3" class="<%=@type == 2 ? 'hw_tab_hover' : '' %>" onclick="HoverLi('<%= manage_or_receive_homeworks_user_path(@user, :type =>2) %>');">
|
||||||
|
<a href="javascript:void(0);" class="hw_tab_type" >我收到的作业</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div class="hw_more_box" >
|
||||||
|
<ul>
|
||||||
|
<li class="hw_more_icons">
|
||||||
|
<ul class="hw_more_txt">
|
||||||
|
<li> <a href="<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 0) %>" id="homework_type_all" class="hw_more_li" data-method="get" data-remote="true">全部作业</a> </li>
|
||||||
|
<li> <a href="<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 1) %>" id="homework_type_nor" class="hw_more_li" data-method="get" data-remote="true">普通作业</a> </li>
|
||||||
|
<li> <a href="<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 2) %>" id="homework_type_pro" class="hw_more_li" data-method="get" data-remote="true">编程作业</a> </li>
|
||||||
|
<li> <a href="<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 3) %>" id="homework_type_gro" class="hw_more_li" data-method="get" data-remote="true">分组作业</a> </li>
|
||||||
|
</ul>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div id="hw_tab_con_2">
|
||||||
|
<div class="sy_category" id="homework_search_input">
|
||||||
|
<%=render :partial=>'my_homeworks_search', :locals=>{:type => @type,:property => nil,:order => @order, :search => ''} %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="sy_classbox" style="min-height:800px;" id="my_homework_list">
|
||||||
|
<% if @type == 1 %>
|
||||||
|
<%= render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks, :is_manage => 1} %>
|
||||||
|
<% else %>
|
||||||
|
<%= render :partial => "receive_homework_list", :locals => {:homeworks => @homeworks} %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div style="text-align:center;">
|
||||||
|
<div class="pages" style="width:auto; display:inline-block;">
|
||||||
|
<ul id="homework_list_ref_pages">
|
||||||
|
<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
|
||||||
|
</ul>
|
||||||
|
<div class="cl"></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
<% if @type == 1 %>
|
||||||
|
$("#my_homework_list").html('<%= escape_javascript(render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks, :is_manage => 1})%>');
|
||||||
|
<% else %>
|
||||||
|
$("#my_homework_list").html('<%= escape_javascript(render :partial => "receive_homework_list", :locals => {:homeworks => @homeworks})%>');
|
||||||
|
<% end %>
|
||||||
|
$("#homework_list_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>');
|
||||||
|
$("#my_homework_sort").html('<%= escape_javascript( render :partial => 'users/my_homework_sort', :locals => {:type => @type,:property => @property,:order => @order,:search => @search})%>');
|
||||||
|
$("#homework_type_all").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 0) %>');
|
||||||
|
$("#homework_type_nor").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 1) %>');
|
||||||
|
$("#homework_type_pro").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 2) %>');
|
||||||
|
$("#homework_type_gro").attr('href','<%= manage_or_receive_homeworks_user_path(@user, :type => @type, :property => 3) %>');
|
||||||
@ -0,0 +1,28 @@
|
|||||||
|
<script type="text/javascript" language="javascript">
|
||||||
|
//课程大纲tab
|
||||||
|
//function g(o){return document.getElementById(o);}
|
||||||
|
function HoverLi(url){
|
||||||
|
// for(var i=1;i<=3;i++){
|
||||||
|
// g('hw_tab_nav_'+i).className='hw_tab_nomal';
|
||||||
|
// }
|
||||||
|
// g('hw_tab_nav_'+n).className='hw_tab_hover';
|
||||||
|
window.location.href = url;
|
||||||
|
}
|
||||||
|
</script>
|
||||||
|
<div class="hw_content" >
|
||||||
|
<ul id="hw_tab_nav">
|
||||||
|
<li id="hw_tab_nav_1" class="hw_tab_hover" onclick="HoverLi('<%= my_homeworks_user_path(@user) %>');">
|
||||||
|
<a href="javascript:void(0);" class="hw_tab_type">我的作业</a>
|
||||||
|
</li>
|
||||||
|
<li id="hw_tab_nav_2" onclick="HoverLi('<%= manage_or_receive_homeworks_user_path(@user) %>');">
|
||||||
|
<a href="javascript:void(0);" class="hw_tab_type">我管理的作业</a>
|
||||||
|
</li>
|
||||||
|
<li id="hw_tab_nav_3" onclick="HoverLi('<%= manage_or_receive_homeworks_user_path(@user, :type =>2) %>');">
|
||||||
|
<a href="javascript:void(0);" class="hw_tab_type" >我收到的作业</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
<div id="hw_tab_con_1">
|
||||||
|
<%=render :partial => 'my_homework_list' %>
|
||||||
|
</div> <!-- hw_tab_con_1 end-->
|
||||||
|
</div><!--sy_content end-->
|
||||||
@ -0,0 +1 @@
|
|||||||
|
$("#hw_tab_con_1").html("<%= escape_javascript(render :partial => 'users/my_homework_list') %>");
|
||||||
@ -0,0 +1,7 @@
|
|||||||
|
<% if @type == 1 %>
|
||||||
|
$("#my_homework_list").html('<%= escape_javascript(render :partial => "manage_homework_list", :locals => {:homeworks => @homeworks, :is_manage => 1})%>');
|
||||||
|
<% else %>
|
||||||
|
$("#my_homework_list").html('<%= escape_javascript(render :partial => "receive_homework_list", :locals => {:homeworks => @homeworks})%>');
|
||||||
|
<% end %>
|
||||||
|
$("#homework_list_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>');
|
||||||
|
$("#my_homework_sort").html('<%= escape_javascript( render :partial => 'users/my_homework_sort', :locals => {:type => @type,:property => @property,:order => @order,:search => @search})%>');
|
||||||
@ -1,9 +1,4 @@
|
|||||||
$("#subject_count_homework_<%=@homework.id %>").html(<%= @homework.quotes %>);
|
$("#subject_count_homework_<%=@homework.id %>").html(<%= @homework.quotes %>);
|
||||||
$("#ajax-modal").html("<%=escape_javascript(render :partial => 'homework_post_notice') %>");
|
hideModal();
|
||||||
showModal('ajax-modal', '500px');
|
var htmlvalue = "<%= escape_javascript(render :partial => 'homework_post_notice') %>";
|
||||||
$('#ajax-modal').siblings().remove();
|
pop_box_new(htmlvalue,380,182);
|
||||||
$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
|
|
||||||
"<a href='javascript:' onclick='hideModal();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
|
|
||||||
$('#ajax-modal').parent().css("top","50%").css("left","50%");
|
|
||||||
$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
|
|
||||||
$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
|
|
||||||
@ -1,5 +1,7 @@
|
|||||||
<% if @is_import.to_i == 1 %>
|
<% if @is_import.to_i == 1 %>
|
||||||
$("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>@homework}) %>");
|
$("#homework_detail_information").html("<%=escape_javascript(render :partial => 'users/homework_detail_information', :locals => {:homework=>@homework}) %>");
|
||||||
|
$("#choose_courses_notice").html("");
|
||||||
<% else %>
|
<% else %>
|
||||||
$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>@homework}) %>");
|
var htmlvalue = "<%= escape_javascript(render :partial => 'users/homework_repository_detail') %>";
|
||||||
|
pop_box_new(htmlvalue,820,155);
|
||||||
<% end %>
|
<% end %>
|
||||||
@ -1 +1 @@
|
|||||||
$("#user_show_more_course").replaceWith("<%= escape_javascript( render :partial => 'layouts/user_courses',:locals => {:courses => @courses,:user => @user,:type=>@type,:page => @page, :all_count => @all_count} )%>");
|
$("#user_show_more_course").replaceWith("<%= escape_javascript( render :partial => 'layouts/user_courses',:locals => {:courses => @courses,:user => @user,:page => @page, :all_count => @all_count} )%>");
|
||||||
|
|||||||
@ -1,88 +1,67 @@
|
|||||||
<%= stylesheet_link_tag 'css/common','css/structure','css/public','css/org','repository' %>
|
<%= stylesheet_link_tag 'css/org','repository' %>
|
||||||
<script>
|
<script>
|
||||||
$(document).ready(function(){
|
function g(o){return document.getElementById(o);}
|
||||||
$(".resource-switch").click(function(){
|
function HoverLi(n, url){
|
||||||
$(".resource-switch").children().removeClass("resource-tab-active");
|
for(var i=1;i<=2;i++){
|
||||||
$(this).children().addClass("resource-tab-active");
|
g('hw_tab_nav_'+i).className='hw_tab_nomal';
|
||||||
});
|
|
||||||
$("input[name='checkMenu']").click(function(){
|
|
||||||
if($("input[name='checkMenu']:checked").length >= 1){
|
|
||||||
$(".resourcesSelectSendButton").removeClass("inactive-border");
|
|
||||||
$(".resourcesSelectSendButton").mouseover(function(){
|
|
||||||
$(this).css("backgroundColor","#297fb8");
|
|
||||||
});
|
|
||||||
$(".resourcesSelectSendButton").mouseout(function(){
|
|
||||||
$(this).css("backgroundColor","#fff");
|
|
||||||
});
|
|
||||||
$(".sendButtonBlue").removeClass("inactive-text");
|
|
||||||
}
|
}
|
||||||
});
|
g('hw_tab_nav_'+n).className='hw_tab_hover';
|
||||||
});
|
$.get(url, {}, function(data){});
|
||||||
function choose_course(user_id) {
|
}
|
||||||
var check = $('input[name="checkMenu"]:checked');
|
function show_homework_detail(url){
|
||||||
if(check.length == 0) {
|
$.get(
|
||||||
$("#choose_homework_notice").text("请先选择一个作业");
|
url,
|
||||||
} else {
|
{},
|
||||||
var hw_id = $('input[name="checkMenu"]:checked').val();
|
function (data) {
|
||||||
$("#choose_homework_notice").text("");
|
}
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
function choose_course(user_id, hw_id) {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
type: 'get',
|
type: 'get',
|
||||||
url: '/users/' + user_id + '/choose_user_course?homework='+hw_id,
|
url: '/users/' + user_id + '/choose_user_course?homework='+hw_id
|
||||||
data:{send_id:$('input[name="checkMenu"]:checked').val()}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="homepageContentContainer">
|
<div class="hw_content mb10">
|
||||||
<div class="homepageContent">
|
<ul id="hw_tab_nav">
|
||||||
<div class="resource-wrapper mb10">
|
<li id="hw_tab_nav_1" class="hw_tab_hover" onclick="HoverLi(1, '<%= user_homework_type_user_path(@user,:is_import => 0) %>');">
|
||||||
<ul class="resource-banner">
|
<a href="javascript:void(0)" id="public_homeworks_choose" class="hw_tab_type" style="text-align: center;">我的题库</a>
|
||||||
<li class="fl resource-switch">
|
|
||||||
<a href="<%= user_homework_type_user_path(@user,:is_import => 0) %>" id="public_homeworks_choose" class="resource-tab resource-tab-active" data-remote="true">我的题库</a>
|
|
||||||
</li>
|
|
||||||
<li class="fl resource-switch">
|
|
||||||
<a href="<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 0) %>" id="user_homeworks_choose" class="resource-tab" style="text-align: center;" data-remote="true">题库</a>
|
|
||||||
</li>
|
</li>
|
||||||
<li class="fl resource-switch">
|
<li id="hw_tab_nav_2" onclick="HoverLi(2, '<%= user_homework_type_user_path(@user,:type=>'2',:is_import => 0) %>');">
|
||||||
<a href="<%= user_homework_type_user_path(@user,:type=>'3',:is_import => 0) %>" id="apply_homeworks_choose" class="resource-tab" data-remote="true">申请题库</a>
|
<a href="javascript:void(0)" id="user_homeworks_choose" class="hw_tab_type" style="text-align: center;">公共题库</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="fl w680 border-bottom h34"> </li>
|
|
||||||
<li class="fr resource-banner-li border-bottom h34">
|
|
||||||
<ul class="resourcesSelect">
|
|
||||||
<li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
|
|
||||||
<ul class="resourcesType">
|
|
||||||
<li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0) %>" id="homework_type_all" class="resourcesTypeAll resourcesGrey" data-method="get" data-remote="true">全部</a> </li>
|
|
||||||
<li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 1) %>" id="homework_type_nor" class="homepagePostTypeAssignment postTypeGrey" data-method="get" data-remote="true">普通作业</a> </li>
|
|
||||||
<li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 2) %>" id="homework_type_pro" class="program-btn postTypeGrey" data-method="get" data-remote="true" style="white-space:nowrap;">编程作业</a> </li>
|
|
||||||
<li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 3) %>" id="homework_type_gro" class="group-btn resourcesGrey" data-method="get" data-remote="true">分组作业</a> </li>
|
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
<div class="hw_more_box" >
|
||||||
|
<ul>
|
||||||
|
<li class="hw_more_icons">
|
||||||
|
<ul class="hw_more_txt">
|
||||||
|
<li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0) %>" id="homework_type_all" class="hw_more_li" data-method="get" data-remote="true">全部作业</a> </li>
|
||||||
|
<li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 1) %>" id="homework_type_nor" class="hw_more_li" data-method="get" data-remote="true">普通作业</a> </li>
|
||||||
|
<li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 2) %>" id="homework_type_pro" class="hw_more_li" data-method="get" data-remote="true" style="white-space:nowrap;">编程作业</a> </li>
|
||||||
|
<li> <a href="<%= user_homework_type_user_path(@user,:type => @type,:is_import => 0,:property => 3) %>" id="homework_type_gro" class="hw_more_li" data-method="get" data-remote="true">分组作业</a> </li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<div class="cl"></div>
|
|
||||||
</ul>
|
</ul>
|
||||||
<div class="cl"></div>
|
|
||||||
<div id="homework_search_input" class="mt10 fl">
|
|
||||||
<%=render :partial=>'homework_repository_search', :locals=>{:type => @type,:is_import => 0,:property => nil} %>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
<div class="cl"></div>
|
||||||
<div class="w683 fl mr10 mt10" id="homework_repository_list">
|
<div id="hw_tab_con_1">
|
||||||
<%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>@type,:is_import => 0,:property => @property,:search=>''} %>
|
<div class="sy_category" id="homework_search_input">
|
||||||
|
<%=render :partial=>'homework_repository_search', :locals=>{:type => '1',:is_import => 0,:property => nil,:order => @order, :search => ''} %>
|
||||||
</div>
|
</div>
|
||||||
<div id="homework_repository_detail">
|
|
||||||
<%=render :partial => 'homework_repository_detail', :locals => {:homework => nil} %>
|
<div class="sy_classbox" style="min-height:800px;" id="homework_repository_list">
|
||||||
|
<%=render :partial => 'homework_repository_list', :locals => {:homeworks => @homeworks,:type=>'1',:is_import => 0,:property => @property,:search=>''} %>
|
||||||
</div>
|
</div>
|
||||||
<div class="cl"></div>
|
|
||||||
<div>
|
<div style="text-align:center;">
|
||||||
<ul class="wlist mt10" id="homework_pository_ref_pages" style="margin-top: 5px;margin-right: 295px">
|
<div class="pages" style="width:auto; display:inline-block;">
|
||||||
<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
|
<ul id="homework_pository_ref_pages">
|
||||||
|
<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true%>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
<div class="cl"></div>
|
||||||
<div class="fl resourcesSelectSendButton mr15 inactive-border mt10">
|
|
||||||
<a href="javascript:void(0)" onclick="choose_course('<%=User.current.id %>');" class="sendButtonBlue db inactive-text" data-remote="true">发送至</a>
|
|
||||||
</div>
|
|
||||||
<span class="c_red fl mt15" id="choose_homework_notice"></span>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@ -1,4 +1,3 @@
|
|||||||
/*$("#homework_repository").html('<%#= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');*/
|
/*$("#homework_repository").html('<%#= escape_javascript(render :partial => 'users/homework_repository', :locals => {:homeworks => @homeworks})%>');*/
|
||||||
$("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => 0,:property => @property,:search=>''})%>');
|
$("#homework_repository_list").html('<%= escape_javascript(render :partial => 'users/homework_repository_list', :locals => {:homeworks => @homeworks,:sort => @order,:b_sort => @b_sort,:type=>@type,:is_import => 0,:property => @property,:search=>''})%>');
|
||||||
$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
|
$("#homework_pository_ref_pages").html('<%= pagination_links_full @hw_pages, @hw_count, :per_page_links => false, :remote => @is_remote, :flag => true, :is_new => true %>');
|
||||||
$("#homework_repository_detail").html("<%=escape_javascript(render :partial => 'users/homework_repository_detail', :locals => {:homework=>nil}) %>");
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue