+
+ <%= link_to image_tag(url_to_avatar(@topic.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@topic.author) %>
+
+
+ <% if @topic.author.id == User.current.id%>
+
+
+
+
+
+ <%= link_to(
+ l(:button_edit),
+ {:action => 'edit', :id => @topic},
+ :class => 'postOptionLink'
+ ) if @message.course_editable_by?(User.current) %>
+
+
+ <%= link_to(
+ l(:button_delete),
+ {:action => 'destroy', :id => @topic},
+ :method => :post,
+ :data => {:confirm => l(:text_are_you_sure)},
+ :class => 'postOptionLink'
+ ) if @message.course_destroyable_by?(User.current) %>
+
+
+
+
+
+ <%end%>
+
+
-
-
- <%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %>
+
+ <% if @topic.try(:author).try(:realname) == ' ' %>
+ <%= link_to @topic.try(:author), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+ <% else %>
+ <%= link_to @topic.try(:author).try(:realname), user_path(@topic.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+ <% end %>
+
+
<%= format_time( @topic.created_on)%>
+
+
+ <%= @topic.content.html_safe%>
+
+
+
+ <%= link_to_attachments_course @topic, :author => false %>
+
+
+
-
-
- <%= @topic.subject %>
-
-
-
- 由<%= link_to_user_header @topic.author,false,:class=> 'problem_name' %>
- 添加于<%= format_time(@topic.created_on) %>
-
-
- <%= link_to(
- l(:button_delete),
- {:action => 'destroy', :id => @topic},
- :method => :post,
- :data => {:confirm => l(:text_are_you_sure)},
- :class => 'talk_edit fr'
- ) if @message.course_destroyable_by?(User.current) %>
- <%= link_to(
- l(:button_edit),
- {:action => 'edit', :id => @topic},
- :class => 'talk_edit fr'
- ) if @message.course_editable_by?(User.current) %>
-
<%= @topic.content.html_safe %>
-
<%= link_to_attachments_course @topic, :author => false %>
-
-
- <% if User.current.logged? %>
- <%= toggle_link l(:button_reply), "reply", :focus => 'message_subject',:class => 'talk_edit fr' %>
- <% else %>
- <%= link_to l(:button_reply), signin_path,:class => 'talk_edit fr' %>
- <% end %>
- <%= link_to(
- l(:button_quote),
- {:action => 'quote', :id => @topic},
- :remote => true,
- :method => 'get',
- :class => 'talk_edit fr',
- :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %>
-
-
-<% unless @replies.empty? %>
- <% reply_count = 0 %>
- <% @replies.each do |message| %>
-
">
-
<%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %>
-
-
- <%= link_to_user_header message.author,false,:class => 'c_blue fb fl mb10 ' %>
-
<%= format_time(message.created_on) %>
-
-
<%= textAreailizable message,:content,:attachments => message.attachments %>
- <%= link_to_attachments_course message, :author => false %>
+
+ <% unless @replies.empty? %>
+
+
回复（<%=@reply_count %>）
+
+
+
+
+ <% @replies.each_with_index do |reply,i| %>
+
+
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
-
-
-
- <% end %>
-<% end %>
-<% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
-
- <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
- <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
- <%= link_to l(:button_submit),"javascript:void(0)",:onclick => 'course_board_submit_message_replay();' ,:class => "blue_btn fl c_white" ,:style=>"margin-left: 50px;"%>
- <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fl c_white" %>
<% end %>
-<% end %>
-
-
- <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-
-<% html_title @topic.subject %>
+ <% end %>
+
+
+
+
+
+ <% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
+ <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+ <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
+ <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fr c_white mt10 mr5" %>
+ <%= link_to l(:button_submit),"javascript:void(0)",:onclick => 'course_board_submit_message_replay();' ,:class => "blue_btn fr c_white mt10" ,:style=>"margin-left: 50px;"%>
+ <% end %>
+ <% end %>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/messages/_course_show_old.html.erb b/app/views/messages/_course_show_old.html.erb
new file mode 100644
index 000000000..de9205433
--- /dev/null
+++ b/app/views/messages/_course_show_old.html.erb
@@ -0,0 +1,117 @@
+
+
+ <%= l(:label_board) %>
+
+
+
+
+
+ <%= l(:label_user_location) %> :
+ <%= link_to l(:label_borad_course), course_boards_path(@course) %>
+ >
+ <%= link_to @topic.subject, course_board_path(@course, @board) %>
+
+
+
+
+
+
+ <%= link_to image_tag(url_to_avatar(@topic.author),:width => '46',:height => '46'), user_path(@topic.author) %>
+
+
+
+ <%= @topic.subject %>
+
+
+
+ 由<%= link_to_user_header @topic.author,false,:class=> 'problem_name' %>
+ 添加于<%= format_time(@topic.created_on) %>
+
+
+ <%= link_to(
+ l(:button_delete),
+ {:action => 'destroy', :id => @topic},
+ :method => :post,
+ :data => {:confirm => l(:text_are_you_sure)},
+ :class => 'talk_edit fr'
+ ) if @message.course_destroyable_by?(User.current) %>
+ <%= link_to(
+ l(:button_edit),
+ {:action => 'edit', :id => @topic},
+ :class => 'talk_edit fr'
+ ) if @message.course_editable_by?(User.current) %>
+
+
<%= @topic.content.html_safe %>
+
<%= link_to_attachments_course @topic, :author => false %>
+
+
+ <% if User.current.logged? %>
+ <%= toggle_link l(:button_reply), "reply", :focus => 'message_subject',:class => 'talk_edit fr' %>
+ <% else %>
+ <%= link_to l(:button_reply), signin_path,:class => 'talk_edit fr' %>
+ <% end %>
+ <%= link_to(
+ l(:button_quote),
+ {:action => 'quote', :id => @topic},
+ :remote => true,
+ :method => 'get',
+ :class => 'talk_edit fr',
+ :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %>
+
+
+<% unless @replies.empty? %>
+ <% reply_count = 0 %>
+ <% @replies.each do |message| %>
+
">
+
<%= link_to image_tag(url_to_avatar(message.author), :width => '46',:height => '46'), user_path(message.author) %>
+
+
+ <%= link_to_user_header message.author,false,:class => 'c_blue fb fl mb10 ' %>
+
<%= format_time(message.created_on) %>
+
+
<%= textAreailizable message,:content,:attachments => message.attachments %>
+ <%= link_to_attachments_course message, :author => false %>
+
+
+
+
+
+
+ <% end %>
+<% end %>
+<% if !@topic.locked? && authorize_for_course('messages', 'reply') %>
+
+ <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message_form'} do |f| %>
+ <%= render :partial => 'form_course', :locals => {:f => f, :replying => true} %>
+ <%= link_to l(:button_submit),"javascript:void(0)",:onclick => 'course_board_submit_message_replay();' ,:class => "blue_btn fl c_white" ,:style=>"margin-left: 50px;"%>
+ <%= link_to l(:button_cancel), "javascript:void(0)", :onclick => 'course_board_canel_message_replay();', :class => "blue_btn grey_btn fl c_white" %>
+ <% end %>
+
+<% end %>
+
+
+ <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+
+<% html_title @topic.subject %>
+
diff --git a/app/views/messages/_form_course.html.erb b/app/views/messages/_form_course.html.erb
index 7952e4820..86a6df836 100644
--- a/app/views/messages/_form_course.html.erb
+++ b/app/views/messages/_form_course.html.erb
@@ -28,16 +28,17 @@
-
+
<%= text_area :quote,:quote,:style => 'display:none' %>
<%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
<% if replying %>
<%= f.kindeditor :content, :editor_id => 'message_content_editor',
- :width => '89%',
- :height => 300,
+ :width => '99%',
+ :height => 100,
+ :minHeight=>100,
:input_html => { :id => 'message_content',
:class => 'talk_text fl',
:maxlength => 5000 }%>
@@ -47,21 +48,24 @@
:owner_type => OwnerTypeHelper::MESSAGE,
:width => '90%',
:height => 300,
+ :minHeight=>300,
:class => 'talk_text fl',
:input_html => { :id => 'message_content',
:class => 'talk_text fl',
:maxlength => 5000 }%>
<% end %>
-
+
-
- <%= l(:label_attachment_plural) %> ：
-
- <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
-
-
+<% unless replying %>
+
+ <%= l(:label_attachment_plural) %> ：
+
+ <%= render :partial => 'attachments/form_course', :locals => {:container => @message,:isReply => @isReply} %>
+
+
+<% end %>
diff --git a/app/views/messages/_reply_message.html.erb b/app/views/messages/_reply_message.html.erb
new file mode 100644
index 000000000..a859a088a
--- /dev/null
+++ b/app/views/messages/_reply_message.html.erb
@@ -0,0 +1,31 @@
+
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
+
+
+
\ No newline at end of file
diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index d30aee45d..0817594ab 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -1,45 +1,38 @@
-
-
<%= l(:label_course_board) %>
-
+<% if @message.project %>
+
+
<%= l(:label_course_board) %>
+
+
- <% if @message.project %>
<%#= board_breadcrumb(@message) %>
-
-
-
- <%= form_for @message, { :as => :message,
- :url => {:action => 'edit'},
- :html => {:multipart => true,
- :id => 'message-form',
- :method => :post}
- } do |f| %>
+
+
+
+ <%= form_for @message, {:as => :message,
+ :url => {:action => 'edit'},
+ :html => {:multipart => true,
+ :id => 'message-form',
+ :method => :post}
+ } do |f| %>
<%= render :partial => 'form_project',
- :locals => {:f => f, :replying => !@message.parent.nil?} %>
- <%= l(:button_submit)%>
- <%= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "blue_btn grey_btn fl c_white" %>
-
-
<%= l(:button_submit) %>
+ <%= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "blue_btn grey_btn fl c_white" %>
+
+
+ <% end %>
<% elsif @message.course %>
- <%#= course_board_breadcrumb(@message) %>
-
-
0
- <%= form_for @message, {
- :as => :message,
- :url => {:action => 'edit'},
- :html => {:multipart => true,
- :id => 'message-form',
- :method => :post}
- } do |f| %>
- <%= render :partial => 'form_course',
- :locals => {:f => f, :replying => !@message.parent.nil?} %>
- <%= l(:button_submit)%>
- <%= link_to l(:button_cancel), board_message_url(@message.board, @message.root, :r => (@message.parent_id && @message.id)), :class => "blue_btn grey_btn fl c_white" %>
+ <%= form_for @message, {
+ :as => :message,
+ :url => {:action => 'edit'},
+ :html => {:multipart => true,
+ :id => 'message-form',
+ :method => :post}
+ } do |f| %>
+ <%= render :partial => 'boards/course_message_edit',
+ :locals => {:f => f, :edit_mode => true, :topic => @message} %>
- <% end %>
-
-
+ <% end %>
<% end %>
-
diff --git a/app/views/messages/quote.js.erb b/app/views/messages/quote.js.erb
index e7ee0bca0..eee820c61 100644
--- a/app/views/messages/quote.js.erb
+++ b/app/views/messages/quote.js.erb
@@ -1,8 +1,18 @@
-$('#message_subject').val("<%= raw escape_javascript(@subject) %>");
-$('#message_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
+/*$('#message_subject').val("<%#= raw escape_javascript(@subject) %>");
+$('#message_quote').html("<%#= raw escape_javascript(@temp.content.html_safe) %>");
//$('#message_content').val("<#%= raw escape_javascript(@content) %>");
-$('#quote_quote').html("<%= raw escape_javascript(@temp.content.html_safe) %>");
+$('#quote_quote').html("<%#= raw escape_javascript(@temp.content.html_safe) %>");
showAndScrollTo("reply", "message_content");
$('#message_content').scrollTop = $('#message_content').scrollHeight - $('#message_content').clientHeight;
-$("img").removeAttr("align");
+$("img").removeAttr("align");*/
+if($("#reply_message_<%= @message.id%>").length > 0) {
+ $("#reply_message_<%= @message.id%>").replaceWith("<%= escape_javascript(render :partial => 'reply_message', :locals => {:reply => @message,:temp =>@temp,:subject =>@subject}) %>");
+ $(function(){
+ $('#reply_subject').val("<%= raw escape_javascript(@subject) %>");
+ $('#quote_quote').val("<%= raw escape_javascript(@temp.content.html_safe) %>");
+ init_activity_KindEditor_data(<%= @message.id%>,null,"85%");
+ });
+}else if($("#reply_to_message_<%= @message.id%>").length >0) {
+ $("#reply_to_message_<%= @message.id%>").replaceWith("
");
+}
\ No newline at end of file
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 0e36d5fd9..d0125cd3b 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -18,8 +18,8 @@
登录名 : *
邮箱 : *
身份 :
-
姓氏 : *
-
名字 : *
+
姓(First Name) : *
+
名(Last Name) : *
组织名 : *
性别 :
工作单位 :
@@ -72,21 +72,25 @@
<% if User.current.user_extensions.nil? %>
- 平台找到了0 个包含"国防" 的高校
+
<% elsif User.current.user_extensions.identity == 3 || User.current.user_extensions.identity == 2 %>
- 平台找到了0 个包含"国防" 的高校
+
<% elsif User.current.user_extensions.school.nil? %>
- 平台找到了0 个包含"国防" 的高校
+
<% else %>
- 平台找到了0 个包含"国防" 的高校
+
<% end %>
@@ -140,7 +144,7 @@
<%= f.select :language, :Chinese => :zh, :English => :en %>
- 确认
+ 确认
@@ -166,7 +170,7 @@
确认
-
@@ -180,7 +184,9 @@
-
+
+
<%= l(:lable_school_list)%>
@@ -202,6 +208,7 @@
+
<%= stylesheet_link_tag 'nyan' %>
@@ -518,10 +525,118 @@
}
}
}
- $(function(){
- //学校
- $("#province").attr("href", "#WOpenWindow")
- $("#province").leanModal({top: 100, closeButton: ".modal_close"});
+ function changeValue(value,data){
+ //console.log(value+","+data)
+ $("input[name='province']").val(value);
+ $("input[name='occupation']").val(data);
+ $("#search_school_result_list").hide();
+ $("#hint").hide();
+ }
+ function add_school(name){
+ $.ajax({
+ url: '<%= url_for(:controller => 'school',:action => 'add_school') %>' + '?name=' + name,
+ type: 'post',
+ success: function (data) {
+
+ }
+ });
+ }
+ var lastSearchCondition = '';
+ $(function() {
+// $("input[name='province']").keydown(function(e){
+// if(e.keyCode == 13 && $("#search_school_result_list").css('display') == 'block'){
+// str = $("#search_school_result_list").children().eq(0).attr('onclick').match(/\(.*\)/)[0]
+//
+// str = str.replace(/\(/,'').replace(/\)/,'');
+// arr = str.split(',');
+// id = arr[1].replace(/\'/,'')
+// name = arr.replace(/\'/,'')
+// changeValue(name,id);
+// return false;
+// }
+// });
+ //查询学校
+ $("input[name='province']").on('input', function (e) {
+ $("input[name='occupation']").val(''); //一旦有输入就清空id。
+ if($(e.target).val().trim() == lastSearchCondition && $(e.target).val().trim() != ''){
+ return;
+ }
+ lastSearchCondition = $(e.target).val().trim();
+ $.ajax({
+ url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value,
+ type: 'post',
+ success: function (data) {
+ if(data.length != undefined && data.length != 0) {
+ var i = 0;
+ $("#search_school_result_list").html('');
+ for (; i < data.length; i++) {
+ link = '
' + data[i].school.name + ' ';
+ $("#search_school_result_list").append(link);
+ }
+ $("#search_school_result_list").css('left', $(e.target).offset().left);
+ $("#search_school_result_list").css('top', $(e.target).offset().top + 28);
+ $("#search_school_result_list").css("position", "absolute");
+ $("#search_school_result_list").show();
+ if($(e.target).val().trim() != '') {
+ str = e.target.value.length > 8 ? e.target.value.substr(0, 6)+"..." : e.target.value;
+ $("#hint").html('找到了' + data.length + '个包含"' + str + '"的高校');
+ $("#hint").show();
+ }else{
+ $("#hint").hide();
+ }
+ }else{
+ $("#search_school_result_list").html('');
+ str = e.target.value.length > 4 ? e.target.value.substr(0, 4)+"..." : e.target.value;
+ $("#hint").html('没有找到包含"'+str+'"的高校，
创建高校 ');
+ $("#hint").show();
+ }
+ }
+ });
+ });
+ $(document.body).click(function(e){
+ if($(e.target).attr("id") != 'search_school_result_list' && $(e.target).attr("id") != 'province')
+ {
+ $("#search_school_result_list").hide();
+ $("#hint").hide();
+ }
+ })
+ $("input[name='province']").on('focus', function (e) {
+ if($(e.target).val() == ''){
+ return;
+ }
+ $.ajax({
+ url: '<%= url_for(:controller => 'school',:action => 'on_search') %>' + '?name=' + e.target.value,
+ type: 'post',
+ success: function (data) {
+ if(data.length != undefined && data.length != 0) {
+ var i = 0;
+ $("#search_school_result_list").html('');
+ for (; i < data.length; i++) {
+ link = '
' + data[i].school.name + ' ';
+ $("#search_school_result_list").append(link);
+ }
+ $("#search_school_result_list").css('left', $(e.target).offset().left);
+ $("#search_school_result_list").css('top', $(e.target).offset().top + 28);
+ $("#search_school_result_list").css("position", "absolute");
+ $("#search_school_result_list").show();
+ if ($(e.target).val().trim() != '') {
+ str = e.target.value.length > 8 ? e.target.value.substr(0, 6) + "..." : e.target.value;
+ $("#hint").html('找到了' + data.length + '个包含"' + str + '"的高校');
+ $("#hint").show();
+ } else {
+ $("#hint").hide();
+ }
+ }else {
+ $("#search_school_result_list").html('');
+ str = e.target.value.length > 4 ? e.target.value.substr(0, 4)+"..." : e.target.value;
+ $("#hint").html('没有找到包含"'+str+'"的高校，
创建高校 ');
+ $("#hint").show();
+ }
+ }
+ });
+ });
+
+// $("#province").leanModal({top: 100, closeButton: ".modal_close"});
//地区
var province = "<%= "#{province}" %>"
@@ -544,6 +659,9 @@
$("#users_tb_2").click();
<% end %>
$('#my_account_form_link').click(function(){
+ if( $("input[name='province']").val().trim() != '' && $("input[name='occupation']").val().trim() == ''){ //学校名字和id不对的话
+ return;
+ }
$('#my_account_form_btn').click();
});
$('#my_password_form_link').click(function(){
diff --git a/app/views/projects/settings/_new_repositories.html.erb b/app/views/projects/settings/_new_repositories.html.erb
index 410bd8c32..0859e5e19 100644
--- a/app/views/projects/settings/_new_repositories.html.erb
+++ b/app/views/projects/settings/_new_repositories.html.erb
@@ -8,93 +8,98 @@
<% project_path_cut = RepositoriesHelper::PROJECT_PATH_CUT %>
<% ip = RepositoriesHelper::REPO_IP_ADDRESS %>
<% if @project.repositories.any? %>
-
-
-
- <%= l(:field_identifier) %>
- <%= l(:field_repository_is_default) %>
- <%= l(:label_scm) %>
- <%= l(:label_repository_path) %>
-
-
-
- <% @project.repositories.sort.each do |repository| %>
-
-
- <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %> <%= checked_image repository.is_default? %>
- <%=h repository.scm_name %>
- <%if repository.scm_name=="Git"%>
-
+
+
+ <%= l(:field_identifier) %>
+ <%= l(:field_repository_is_default) %>
+ <%= l(:label_scm) %>
+ <%= l(:label_repository_path) %>
+
+
+
+ <% @project.repositories.sort.each do |repository| %>
+
+
+ <%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %> <%= checked_image repository.is_default? %>
+ <%=h repository.scm_name %>
+ <%if repository.scm_name=="Git"%>
+ <%=truncate( 'http://' << repository.login.to_s << '_'<< repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>20)%>
- <%else %>
- <%=h truncate(repository.url,:length=>10) %>
- <% end %>
-
- <% if repository.scm_name=="Git"%>
- <%if User.current.allowed_to?(:manage_repository, @project) %>
- <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
- <% end %>
- <% end %>
-
- <% if repository.login.to_s==User.current.login.to_s %>
- <%= delete_new_link repository_path(repository) %>
- <% end %>
-
- <% end %>
-<% else %>
- <%= l(:label_no_data) %>
-<% end %>
-
-
-
-
-
- <% course_tag = @project.project_type %>
- <% if User.current.allowed_to?(:manage_repository, @project) %>
-
- <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %>
- <% end %>
-
-
-
-<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
-
-
-
- <%=l(:label_scm)%>：
- <%= select_tag('repository_scm',
- options_for_select(["Git"],@repository.class.name.demodulize),
- :data => {:remote => true, :method => 'get'})%>
- <% if @repository && ! @repository.class.scm_available %>
- <%= l(:text_scm_command_not_available) %>
- <% end %>
-
-
- <% unless judge_main_repository(@project) %>
-
- <%=l(:field_repository_is_default)%>：
- <%= f.check_box :is_default, :label => "", :no_label => true %>
-
- <% end %>
-
- * <%=l(:label_repository_name)%>：<%=l(:text_length_between,:min=>1,:max=>254)<
+ <%else %>
+ <%=h truncate(repository.url,:length=>10) %>
+ <% end %>
+
+ <% if repository.scm_name=="Git"%>
+ <%if User.current.allowed_to?(:manage_repository, @project) %>
+ <%= link_to(l(:label_user_plural), committers_repository_path(repository)) %>
+ <% end %>
+ <% end %>
+
+ <% if repository.login.to_s==User.current.login.to_s %>
+ <%= delete_new_link repository_path(repository) %>
+ <% end %>
+
<% end %>
-
-
- * <%=l(:label_password)%><%= l(:label_upassword_info)%>
-
-
-
-
<%=l(:button_save)%>
-
<%=l(:button_cancel)%>
-
+
+
+<% else %>
+
<%= l(:label_repository_no_data) %>
<% end %>
+
+<%# 新建版本库 %>
+<% if @project.repositories.count == 0 %>
+
+
+ <% course_tag = @project.project_type %>
+ <% if User.current.allowed_to?(:manage_repository, @project) %>
+
+ <%= link_to l(:label_repository_new_repos),"#" , :onclick=>"pro_st_show_ku();", :class => 'c_blue fl' %>
+ <% end %>
+
+
+
+ <%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form',:method=>"post",:autocomplete=>'off'} do |f| %>
+
+
+
+ <%=l(:label_scm)%>：
+ <%= select_tag('repository_scm',
+ options_for_select(["Git"],@repository.class.name.demodulize),
+ :data => {:remote => true, :method => 'get'})%>
+ <% if @repository && ! @repository.class.scm_available %>
+ <%= l(:text_scm_command_not_available) %>
+ <% end %>
+
+
+ <% unless judge_main_repository(@project) %>
+
+ <%=l(:field_repository_is_default)%>：
+ <%= f.check_box :is_default, :label => "", :no_label => true %>
+
+ <% end %>
+
+ * <%=l(:label_repository_name)%>：<%=l(:text_length_between,:min=>1,:max=>254)<
+ <% end %>
+
+
+ * <%=l(:label_password)%><%= l(:label_upassword_info)%>
+
+
+
+
<%=l(:button_save)%>
+
<%=l(:button_cancel)%>
+
+ <% end %>
+
+<% end %>
+
diff --git a/app/views/school/add_school.js.erb b/app/views/school/add_school.js.erb
new file mode 100644
index 000000000..9ebecb682
--- /dev/null
+++ b/app/views/school/add_school.js.erb
@@ -0,0 +1,2 @@
+$("input[name='occupation']").val('<%= @school.id%>');
+$("#hint").html('
创建成功 ').show();
\ No newline at end of file
diff --git a/app/views/student_work/_add_score.html.erb b/app/views/student_work/_add_score.html.erb
index bdfcff6e1..961f351de 100644
--- a/app/views/student_work/_add_score.html.erb
+++ b/app/views/student_work/_add_score.html.erb
@@ -16,7 +16,7 @@
<%= render :partial => 'student_work/student_work_attachment_form', :locals => {:work => work,:score => score} %>
<% end%>
\ No newline at end of file
diff --git a/app/views/student_work/_evaluation_un_work.html.erb b/app/views/student_work/_evaluation_un_work.html.erb
index 94fcfcee2..832350e3e 100644
--- a/app/views/student_work/_evaluation_un_work.html.erb
+++ b/app/views/student_work/_evaluation_un_work.html.erb
@@ -3,7 +3,7 @@
- 