<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
diff --git a/app/views/common/_file.html.erb b/app/views/common/_file.html.erb
index 97443beea..486c760f1 100644
--- a/app/views/common/_file.html.erb
+++ b/app/views/common/_file.html.erb
@@ -8,7 +8,7 @@
<%= line_num %>
-
<% line_num += 1 %>
diff --git a/app/views/courses/_user_homework_search_list.html.erb b/app/views/courses/_user_homework_search_list.html.erb
index 585d8761a..750e7537c 100644
--- a/app/views/courses/_user_homework_search_list.html.erb
+++ b/app/views/courses/_user_homework_search_list.html.erb
@@ -2,18 +2,6 @@
<%= import_ke(enable_at: true, prettify: false, init_activity: true) %>
<% end %>
-
<%= line.html_safe %>+
<%= line.html_safe %>
<% homework_commons.each do |homework_common|%>
+发布设置
+
+<%= form_tag(republish_file_course_file_path(@course,@file), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
+
-
+
<% end %>
diff --git a/app/views/files/file_hidden.js.erb b/app/views/files/file_hidden.js.erb
new file mode 100644
index 000000000..b95ab5104
--- /dev/null
+++ b/app/views/files/file_hidden.js.erb
@@ -0,0 +1,6 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'files/hidden_file',:locals => {:course => @course,:course_attachment_type => 1}) %>');
+showModal('ajax-modal', '311px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("
");
+$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
\ No newline at end of file
diff --git a/app/views/files/republish_file.js.erb b/app/views/files/republish_file.js.erb
new file mode 100644
index 000000000..e85e5eb50
--- /dev/null
+++ b/app/views/files/republish_file.js.erb
@@ -0,0 +1,2 @@
+hideModal();
+$("#resource_detail_<%=@file.id %>").html("<%= escape_javascript(render :partial=>'files/resource_detail',:locals => {:file => @file}) %>")
\ No newline at end of file
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index ad5d971ed..b63897951 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,18 +1,7 @@
<%= content_for(:header_tags) do %>
<%= import_ke(enable_at: true,init_activity: true) %>
<% end %>
-
+
+<% domain = Secdomain.where("sub_type=2 and pid=?", @organization.id).first %>
@@ -53,12 +54,12 @@
+
+
+
+
+<% end %>
+
+
\ No newline at end of file
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
new file mode 100644
index 000000000..fd0a165aa
--- /dev/null
+++ b/app/views/files/_resource_detail.html.erb
@@ -0,0 +1,77 @@
+<% delete_allowed = User.current.allowed_to?(:manage_files, @course) %>
+
+
+ <%#= calendar_for('attachment_publish_time')%>
+
+
+
+
+
\ No newline at end of file
diff --git a/app/views/files/_upload_course_files.erb b/app/views/files/_upload_course_files.erb
index 2e53f05d2..de43977cd 100644
--- a/app/views/files/_upload_course_files.erb
+++ b/app/views/files/_upload_course_files.erb
@@ -1,3 +1,4 @@
+
+
+
+ <%= link_to image_tag(url_to_avatar(file.author), :width => 50, :height => 50), user_path(file.author) %>
+
+
+
+
+
+ <%= link_to truncate(file.filename,length: 35, omission: '...'),
+ download_named_attachment_path(file.id, file.filename),
+ :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "linkBlue f_14 f_b" %>
+ <%= file_preview_eye(file, class: 'preview') %>
+
+ <% if file.is_public? == false%>
+ 私有
+ <%end %>
+
+ <% if file.is_publish == 0 %>
+ <%=file.publish_time %> 0点发布
+ <% end %>
+
+
+ 上传时间：<%= format_time(file.created_on)%>
+ <% if file.tag_list.length > 0%>
+ 上传类型：<%= file.tag_list[0] %>
+ <% end %>
+
+
+ 文件大小：<%= number_to_human_size(file.filesize) %>
+下载<%= file.downloads%> | 引用<%= file.quotes.nil? ? 0:file.quotes %>
+
+
+ <%= render :partial => 'tags/tag_new', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+ <%= render :partial => 'tags/tag_add', :locals => {:obj => file, :object_flag => "6",:tag_name => @tag_name} %>
+
+
+
+
+
+ -
+
-
+ <% if User.current.logged? %>
+
+ <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
+ <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" %>
+
-
+
+
- <%= link_to("发 送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %> +
- <%= link_to '延期发布',file_hidden_course_file_path(@course,file),:class => "postOptionLink",:remote=>true %> +
- <%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %> + <% if @course.is_public? %> +
- + + <%= link_to (file.is_public? ? "设为私有":"设为公开"), update_file_dense_attachments_path(:attachmentid=>file.id,:newtype=>(file.is_public? ? 0:1)),:remote=>true,:class=>"postOptionLink",:method => :post %> + + + <%end%> +
- + <%= link_to( '删除资源', attachment_path(file), + :data => {:confirm => l(:text_are_you_sure)}, :method => :delete,:class => "postOptionLink") if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course" && file.destroyable %> + +
-
+
- <%= link_to("发 送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %> +
+
<%= l(:label_upload_files)%>
@@ -28,7 +29,7 @@ <%#= calendar_for('attachment_publish_time')%>");
+$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
\ No newline at end of file
diff --git a/app/views/files/republish_file.js.erb b/app/views/files/republish_file.js.erb
new file mode 100644
index 000000000..e85e5eb50
--- /dev/null
+++ b/app/views/files/republish_file.js.erb
@@ -0,0 +1,2 @@
+hideModal();
+$("#resource_detail_<%=@file.id %>").html("<%= escape_javascript(render :partial=>'files/resource_detail',:locals => {:file => @file}) %>")
\ No newline at end of file
diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index ad5d971ed..b63897951 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,18 +1,7 @@
<%= content_for(:header_tags) do %>
<%= import_ke(enable_at: true,init_activity: true) %>
<% end %>
-
+
+<% domain = Secdomain.where("sub_type=2 and pid=?", @organization.id).first %>
配置
组织描述：
-
+
组织URL：
http：//
-
+
.trustie.net申请
- <% if @organization.domain.present? and OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content == @organization.domain %>
+ <% if domain.present? and OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content == domain.subname %>
(已批准)
<% elsif OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).count > 0 %>
(您申请了子域名<%= OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content %>，还未批准)
@@ -127,8 +128,8 @@
域名目录（用户自定义url，可选）
- <% if @organization.domain %> - <%= @organization.domain %>.trustie.net/ + <% if domain %> + <%= domain.subname %>.trustie.net/ <% else %> 您还没有子域名，请先在左侧信息栏申请子域名 <% end %> diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb index 062d64096..c036633a5 100644 --- a/app/views/projects/_project_activities.html.erb +++ b/app/views/projects/_project_activities.html.erb @@ -35,18 +35,7 @@ }) }) - + <% unless forge_acts.empty? %> <% forge_acts.each do |activity| -%> --> + Commit
+ <%= @commit_details.id %>
+
+ <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %>
+
+
++
<%= @commit_details.message %>
+
+
+
+
+
+
+
+
+<% @commit_diff.each do |cd| %>
+
+ 
<%= cd.new_path %>
+
+
+
+ <% line_num = diff_line_num(cd.diff) %>
+ <% diff_content = diff_content(cd.diff) %>
+ <% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %>
+
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/tags/update_project_tag_name.js.erb b/app/views/tags/update_project_tag_name.js.erb
index c1d181e35..1dc5d58fa 100644
--- a/app/views/tags/update_project_tag_name.js.erb
+++ b/app/views/tags/update_project_tag_name.js.erb
@@ -1,11 +1,11 @@
-<% if @obj %>
-$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
-$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
- :locals => {:obj => @obj,:object_flag => @obj_flag,:select_tag_name => @select_tag_name}) %>');
-$("#tags_name_<%=@obj.id%>").val("");
-$("#add_tag_<%=@obj.id%>").hide();
-<% else %>
-$("#course_list").html("<%= escape_javascript(render :partial => 'files/project_list',
- :locals => {project: @project,all_attachments: @all_attachments,sort:@sort,order:@order,project_attachments:@obj_attachments}) %>");
-<% end %>
+<% if @obj %>
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").empty();
+$("#tags_show-<%=@obj.class%>-<%=@obj.id%>").html('<%= escape_javascript(render :partial => 'tags/tag_list',
+ :locals => {:obj => @obj,:object_flag => @obj_flag,:select_tag_name => @select_tag_name}) %>');
+$("#tags_name_<%=@obj.id%>").val("");
+$("#add_tag_<%=@obj.id%>").hide();
+<% else %>
+$("#course_list").html("<%= escape_javascript(render :partial => 'files/project_list',
+ :locals => {project: @project,all_attachments: @all_attachments,sort:@sort,order:@order,project_attachments:@obj_attachments}) %>");
+<% end %>
$("#files_tag_project").html("<%= escape_javascript(render :partial => "files/tag_yun_project", :locals => {:tag_list => @tag_list,:project => @project,:tag_name => @select_tag_name}) %>");
\ No newline at end of file
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 59d605a09..0e55c246c 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -38,18 +38,7 @@
})
})
-
+
<% user_activities.each do |user_activity|
if user_activities %>
| + <%= line_num %> + | + <% if line[0,1] == "-" %> +<%= line.html_safe %> |
+ <% elsif line[0,1] == "+" %>
+ <%= line.html_safe %> |
+ <% else%>
+ <%= line.html_safe %> |
+ <% end %>
+
|---|