-
- <% acts[6..16].each do |activity| %>
+ <% acts[5..16].each do |activity| %>
<% if activity.container_type == 'Organization' && activity.org_act_type == 'OrgDocumentComment' %>
<% document = activity.org_act %>
- <%= link_to "#{document.title}".html_safe, org_document_comment_path(:id => document.id, :organization_id => document.organization.id), class: 'por_hidden_w270 link-black', :target => "_blank" %> diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb index ebf3f5445..a2f8a8f29 100644 --- a/app/views/organizations/setting.html.erb +++ b/app/views/organizations/setting.html.erb @@ -112,7 +112,8 @@ <%= form_tag url_for(:controller => 'org_member', :action => 'create', :org => @organization),:id=>'org_member_add_form',:remote=>true do |f|%> <%# if @organization.secdomain_name.nil? %> - <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript host_with_protocol + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> + <%= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> + <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{url_for(:controller => 'organizations', :action => 'org_member_autocomplete', :org=> @organization.id)}')" %> <%# else %> <%#= javascript_tag "observeSearchfield('not_org_member_search', null, '#{ escape_javascript secdomain_with_protocol(@organization.secdomain_name) + "/org_member/org_member_autocomplete?" + {:org=> @organization.id}.to_query }')" %> <%# end %> diff --git a/app/views/quality_analysis/_hightchars.html.erb b/app/views/quality_analysis/_hightchars.html.erb new file mode 100644 index 000000000..fb60eaed3 --- /dev/null +++ b/app/views/quality_analysis/_hightchars.html.erb @@ -0,0 +1,483 @@ + \ No newline at end of file diff --git a/app/views/quality_analysis/_result_list.html.erb b/app/views/quality_analysis/_result_list.html.erb new file mode 100644 index 000000000..507ded0fe --- /dev/null +++ b/app/views/quality_analysis/_result_list.html.erb @@ -0,0 +1,25 @@ +
- 名称 +
- 版本 +
- 分支 +
- 语言 +
- 时间 + +
- <%=link_to "#{qa.author_login}:#{qa.rep_identifier}", project_quality_analysis_path(:resource_id => qa.author_login+":"+qa.rep_identifier, :branch => qa.branch.nil? ? "master" : qa.branch), :class => "analysis-result-name fl fontBlue2" %> +
- 1.0 +
- <%= qa.branch %> +
- <%= qa.language %> +
- <%= format_time(qa.created_at) %> + +
+
+分析结果
+-
+
-
+
+
+
+
+ 质量分析
+项目代码质量分析报告
+ 概要信息
+
+
+
+
+
+
+
+ 质量等级
+<%= @complexity["msr"][9]["frmt_val"] %>
+
+
+
+ 复杂度
+<%= @complexity["msr"][6]["val"] %>
+
+
+
+
+
+ 代码重复度
+<%= @complexity["msr"][7]["frmt_val"] %>
+
+
+
+ 注释率
+<%= @complexity["msr"][5]["frmt_val"] %>
+ 质量等级<%= score_sqale_rating(@complexity["msr"][9]["val"]) %>/5分可定性评价为：质量<%= sqale_rating_status(@complexity["msr"][9]["val"])[0] %>
+
+
+
+
+
+
+ 阻断<%= @sonar_issues["msr"][1]["frmt_val"] %>%;">
+ 严重<%= @sonar_issues["msr"][2]["frmt_val"] %>%;">
+ 主要<%= @sonar_issues["msr"][3]["frmt_val"] %>%;">
+ 次要<%= @sonar_issues["msr"][4]["frmt_val"] %>%;">
+ 信息<%= @sonar_issues["msr"][5]["frmt_val"] %>%;">
+ 代码规模可定性评价为：<%= lines_scale(@complexity["msr"][0]["frmt_val"]) %>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/views/quality_analysis/index.html.erb b/app/views/quality_analysis/index.html.erb
new file mode 100644
index 000000000..9b06e6483
--- /dev/null
+++ b/app/views/quality_analysis/index.html.erb
@@ -0,0 +1,6 @@
+<% if @name_flag %>
+ <%= render :partial => "result_list" %>
+<% else %>
+ <%= render "show" %>
+<% end %>
+
diff --git a/app/views/quality_analysis/show.html.erb b/app/views/quality_analysis/show.html.erb
new file mode 100644
index 000000000..e69de29bb
diff --git a/app/views/repositories/_quality_analysis.html.erb b/app/views/repositories/_quality_analysis.html.erb
new file mode 100644
index 000000000..f9726fb9b
--- /dev/null
+++ b/app/views/repositories/_quality_analysis.html.erb
@@ -0,0 +1,23 @@
+
+
+ 代码行数
+<%= @complexity["msr"][0]["frmt_val"] %>
+
+
+ 文件
+<%= @complexity["msr"][2]["frmt_val"] %>
+
+
+ 目录
+<%= @complexity["msr"][3]["frmt_val"] %>
+
+
+ 类
+<%= @complexity["msr"][1]["frmt_val"] %>
+
+
+ 方法
+<%= @complexity["msr"][4]["frmt_val"] %>
+代码质量分析
+
+ <%= form_tag( url_for(:controller => 'quality_analysis', :action => 'create', :project_id => @project.id, :user_id => User.current.id, :identifier => @repository.identifier), :remote => true, :id => 'quality_analyses_form') do %>
+
diff --git a/app/views/repositories/quality_analyses.html.erb b/app/views/repositories/quality_analyses.html.erb
new file mode 100644
index 000000000..69dae2629
--- /dev/null
+++ b/app/views/repositories/quality_analyses.html.erb
@@ -0,0 +1,76 @@
+<%= javascript_include_tag 'highcharts','highcharts-more' %>
+
+
+ <% end %>
+
+
+
+
+
+
+ <%= select_tag :branch, options_for_select(["#{@gitlab_default_branch}"]+ @branch_names, @rev), :id => 'branch', :class => "analysis-option-box" %>
+
+
+
+
+
+
+
+ <%= select_tag :language, options_for_select(["java","python","ruby","c++","c#", "Web"]), :id => 'branch', :class => "analysis-option-box" %>
+
+
+
+
+<%= l(:label_quality_analyses) %>
+
+ <%#= render :partial => 'navigation' %>
+
+
+
+
+
+
+
+
+
+
+<%= link_to l(:button_back), :action => 'show', :id => @project %>
+<% html_title(l(:label_repository), l(:label_statistics)) -%> \ No newline at end of file diff --git a/app/views/repositories/quality_analysis.js.erb b/app/views/repositories/quality_analysis.js.erb new file mode 100644 index 000000000..bafe28cdf --- /dev/null +++ b/app/views/repositories/quality_analysis.js.erb @@ -0,0 +1,8 @@ +$('#ajax-modal').html('<%= escape_javascript( render :partial => 'repositories/quality_analysis', :locals => {}) %>'); +showModal('ajax-modal', '615px'); +$('#ajax-modal').siblings().remove(); +$('#ajax-modal').before("
");
+$('#ajax-modal').parent().css("top","20%").css("left","32%").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("popbox_polls");
+
+
diff --git a/app/views/repositories/show.html.erb b/app/views/repositories/show.html.erb
index 43be57760..124e3ef4d 100644
--- a/app/views/repositories/show.html.erb
+++ b/app/views/repositories/show.html.erb
@@ -2,7 +2,13 @@
<%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %>
<% if @entries.nil? %>
@@ -45,7 +51,7 @@
<% end %>
diff --git a/app/views/student_work/_evaluation_title.html.erb b/app/views/student_work/_evaluation_title.html.erb
index 1914b1018..9875a4cc6 100644
--- a/app/views/student_work/_evaluation_title.html.erb
+++ b/app/views/student_work/_evaluation_title.html.erb
@@ -3,7 +3,7 @@
<%= @changesets_latest_coimmit.message %>
<% else %>
-
+
提交于<%= time_tag(@changesets_latest_coimmit.created_at) %>：
<%= @changesets_latest_coimmit.message %>
@@ -57,7 +63,6 @@
<%=link_to @changesets_all_count, {:action => 'changes', :path => to_path_param(@path), :id => @project, :repository_id => @repository.identifier_param, :rev => @rev,:page=>1 ,:commit_count =>"#{@changesets_all_count}"} %> 提交
-
<%#= format_date(activity.updated_on) %>
<%if count>3 %>
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index fd56eb712..621b56fbd 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -1,9 +1,7 @@
-
-
- <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
-
-
- <% if User.current.logged? %>
+
\ No newline at end of file
diff --git a/app/views/users/_show_unlogged_reply.html.erb b/app/views/users/_show_unlogged_reply.html.erb
new file mode 100644
index 000000000..b428fd249
--- /dev/null
+++ b/app/views/users/_show_unlogged_reply.html.erb
@@ -0,0 +1,4 @@
+
+ <% if User.current.logged? %>
+
+
+
+ <% else %>
+ <%= render :partial => "users/show_unlogged_reply" %>
+ <% end %>
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
+
<% if @type == 'HomeworkCommon' %>
<%= form_for('new_form',:url => {:controller => 'words', :action => 'reply_to_homework', :id => reply.id},:method => "post", :remote => true) do |f| %>
@@ -32,10 +30,10 @@
<% end%>
<% end %>
- <% else %>
- <%= render :partial => "users/show_unlogged" %>
- <% end %>
-
-
+ 登录后可添加回复
+ <%#= link_to "登录", signin_path, :class => "linkBlue", :target => "_blank" %>
+
\ No newline at end of file
diff --git a/app/views/wechats/user_activities.html.erb b/app/views/wechats/user_activities.html.erb
index 2b4ebc703..80d254dae 100644
--- a/app/views/wechats/user_activities.html.erb
+++ b/app/views/wechats/user_activities.html.erb
@@ -28,27 +28,27 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+