<% for attachment in attachments %>
-
<%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+
+
+ <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%>
+
<% if attachment.is_text? %>
<%= link_to image_tag('magnifier.png'),
:controller => 'attachments', :action => 'show',
@@ -15,11 +18,20 @@
:method => :delete,
:class => 'delete',
:title => l(:button_delete) %>
- <% else %>
+ <%# elsif attachment.container_type == 'Softapplication'%>
+ <%#= link_to image_tag('delete.png'), delete_softapplications_attachments_path(:id => attachment.id),
+ :data => {:confirm => l(:text_are_you_sure)},
+ :method => :delete,
+ :class => 'delete',
+ :remote => true,
+ :title => l(:button_delete) %>
+ <% else %>
<%= link_to image_tag('delete.png'), attachment_path(attachment),
:data => {:confirm => l(:text_are_you_sure)},
:method => :delete,
:class => 'delete',
+ :remote => true,
+ #:id => "attachments_" + attachment.id.to_s,
:title => l(:button_delete) %>
<% end %>
<% end %>
diff --git a/app/views/attachments/delete_softapplications.js.erb b/app/views/attachments/delete_softapplications.js.erb
new file mode 100644
index 000000000..95085ba93
--- /dev/null
+++ b/app/views/attachments/delete_softapplications.js.erb
@@ -0,0 +1,2 @@
+<% options = {:author => true, :deletable => true} %>
+$("#soft_attachments_links").html('<%= escape_javascript(render(:partial => 'links', :locals => {:attachments => @softapplication.attachments, :options => options} )) %>');
\ No newline at end of file
diff --git a/app/views/auto_completes/issues.html.erb b/app/views/auto_completes/issues.html.erb
index b097eaff4..1df31e41b 100644
--- a/app/views/auto_completes/issues.html.erb
+++ b/app/views/auto_completes/issues.html.erb
@@ -1,6 +1,6 @@
<%= raw @issues.map {|issue| {
'id' => issue.id,
- 'label' => "#{issue.tracker} ##{issue.id}: #{truncate issue.subject.to_s, :length => 60}",
+ 'label' => "#{issue.tracker} ##{issue.project_index}: #{truncate issue.subject.to_s, :length => 60}",
'value' => issue.id
}
}.to_json
diff --git a/app/views/contests/_new_softapplication.html.erb b/app/views/contests/_new_softapplication.html.erb
new file mode 100644
index 000000000..c83bdf6e9
--- /dev/null
+++ b/app/views/contests/_new_softapplication.html.erb
@@ -0,0 +1,98 @@
+<%#= error_messages_for 'softapplication' %>
+<%= form_for Softapplication.new, :url => softapplications_path do |f| %>
+
+ <%= hidden_field_tag 'contest_id', @contest.id %>
+
+ <%= l(:label_work_name) %>
+ * :
+ <%= f.text_field :name, :required => true, :size => 60, :style => "width:350px;" %>
+ (<%= l(:label_workname_lengthlimit) %>)
+
+
+ <%= l(:label_running_platform) %>
+ * :
+
+ <%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:350px;" %>
+
+ (<%= l(:label_workdescription_lengthlimit) %>)
+
+
+ <%= l(:label_work_type) %>
+ * :
+
+
+ <%#= select_tag 'app_type_name', work_type_opttion, {:name => 'app_type_name',:style => "width:358px;"} %>
+
+ <%= f.select :app_type_name,work_type_opttion, {},{:style => "width:358px;",:onchange => "selectChange(this)"} %>
+ <%#= f.text_field :app_type_name, :required => true, :size => 60, :style => "width:400px;" %>
+
+
+ <%#= f.text_field :other_input, :required => true, :size => 60, :style => "width:100px;" %>
+
+
+
+ <%= l(:label_work_description) %>
+ * :
+ <%= f.text_field :description, :required => true, :size => 60, :style => "width:350px;" %>
+
+
+
+ <%= l(:label_softapplication_developers) %>
+ * :
+ <%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:350px;" %>
+ (<%= l(:label_workdescription_lengthlimit) %>)
+
+
+ <%= l(:label_work_deposit_project) %>：
+ <%= select_tag 'project', options_for_select(select_option_helper(@option)), :name => 'project', :class => 'grayline2',:style => "width:358px;" %>
+ <%= link_to l(:label_create_new_projects),{:controller => 'projects',:action => 'new',course: 0, project_type: 0,host: Setting.project_domain}, :target => '_blank' %>
+
+
+
+ <%= l(:label_upload_softworkpacket_photo) %>
+
+ <%#= render_flash_messages %>
+
+ <%= render :partial => 'attachments/form' %>
+
+
+
+ 1、<%= l(:label_upload_softapplication_packets_mustpacketed) %>
+
+
+
+
+ <%= submit_tag l(:button_create) %>
+ <%= submit_tag l(:button_cancel), :name => nil, :onclick => "cancel();",
+ :type => 'button', :class => "enterprise", :onmouseout => "this.style.backgroundPosition = 'left top'",
+ :onmouseover => "this.style.backgroundPosition = 'left -30px'" %>
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/contests/index.html.erb b/app/views/contests/index.html.erb
index 8c999f941..6f8430ca0 100644
--- a/app/views/contests/index.html.erb
+++ b/app/views/contests/index.html.erb
@@ -6,17 +6,17 @@
<%= l(:label_user_location) %> :
<% if User.current.logged? %>
- <% unless User.current.user_extensions.identity == 1 %>
- <%= link_to(l(:label_newtype_contest), {:controller => 'contests', :action => 'new_contest'}, :class => 'icon icon-add', :target => "_blank") %>
- <% end %>
- <% end %>
+ <% unless User.current.user_extensions.identity == 1 %>
+ <%= link_to(l(:label_newtype_contest), {:controller => 'contests', :action => 'new_contest'}, :class => 'icon icon-add', :target => "_blank") %>
+ <% end %>
+ <% end %>
-
-
+
+
<%= text_field_tag 'name', params[:name], :size => 30 %>
<%= hidden_field_tag 'project_type', params[:project_type] %>
<%= submit_tag l(:label_search), :class => "enterprise", :name => "contests_search" %>
-
+
diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb
index b261780bd..799656f36 100644
--- a/app/views/contests/show_attendingcontest.html.erb
+++ b/app/views/contests/show_attendingcontest.html.erb
@@ -88,7 +88,7 @@
<%= l(:label_attending_contest) %>： <%= link_to l(:label_new_attendingcontest_work), "javascript:void(0);", onclick: "$('#put-project-form').toggle();" %>
+ <%= link_to l(:label_new_attendingcontest_work), "javascript:void(0);", onclick: "$('#put-project-form').slideToggle();" %>
<% else %>
@@ -99,102 +99,8 @@
<% end %>
-
<%= format_time(comment.created_on) %> <%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
+ <%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
:data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:button_delete) %>
diff --git a/app/views/projects/_form.html.erb b/app/views/projects/_form.html.erb
index f5781b26a..47a87f441 100644
--- a/app/views/projects/_form.html.erb
+++ b/app/views/projects/_form.html.erb
@@ -15,9 +15,11 @@
<%= f.check_box :is_public, :style => "margin-left:10px;" %>
<%= f.check_box :hidden_repo, :style => "margin-left:10px;" %>
+
<%= f.text_field :project_type, :value => 0 %>
<%= wikitoolbar_for 'project_description' %>
diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb
index c057202f8..41ad2a62c 100644
--- a/app/views/projects/_project.html.erb
+++ b/app/views/projects/_project.html.erb
@@ -12,7 +12,7 @@
- <% find_project_repository @project %>
+ <% #find_project_repository @project %>
<%= content_tag('span', "#{@project.repository.nil? || @project.project_status.nil? ? '0' : @project.project_status.changesets_count }", :class => "info") %>
diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb
index 5ee70fa9d..df6cd481b 100644
--- a/app/views/projects/_tools_expand.html.erb
+++ b/app/views/projects/_tools_expand.html.erb
@@ -16,7 +16,7 @@
<%= link_to l(:project_module_gantt) ,project_gantt_path(@project) %>
其他工具
- <% if @project.dts_test == 1 %>
+ <% if @project.enabled_modules.where(" name = 'dts'").count > 0 %>
<%= link_to l(:label_module_share) ,share_show_path(@project) %>
<% end %>
<%= link_to l(:project_module_documents), project_documents_path(@project) %>
diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb
index 0b76a7f44..184a67e3d 100644
--- a/app/views/projects/new.html.erb
+++ b/app/views/projects/new.html.erb
@@ -1,28 +1,15 @@
<% @nav_dispaly_project_label = 1
@nav_dispaly_forum_label = 1 %>
+
<%= labelled_form_for @project do |f| %>
-
- <% if @course_tag == '1' %>
- <%=l(:label_course_new)%>
-
-
- <%= render :partial => 'course_form', :locals => { :f => f } %>
-
- <%= submit_tag l(:button_create), :class => "enterprise"%>
-
-
-
- <% else %>
- <%=l(:label_project_new)%>
-
-
<%=raw l(:label_project_new_description)%>
- <%= render :partial => 'form', :locals => { :f => f } %>
-
- <%= submit_tag l(:button_create), :class => "enterprise"%>
-
-
<%=l(:label_project_new)%>
+
+
<%=raw l(:label_project_new_description)%>
+ <%= render :partial => 'form', :locals => { :f => f } %>
+
+ <%= submit_tag l(:button_create), :class => "enterprise"%>
+
+
<%= render_principals_for_applied_members(@project) %>
+ <%= l(:label_role_plural) %>:
<% roles.each do |role| %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index db51eca1d..e299be182 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -25,6 +25,11 @@
<%= link_to "#{eventToLanguageCourse(e.event_type, @project)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Project)) ? project_files_path(e.container) : e.event_url %>
+
+
+ <%#= textilizable e.event_url,:description %>
+
+
<%= h(truncate(strip_tags(e.event_description).gsub(/ /, ' '), length: 30, omission: '...')) %>
diff --git a/app/views/repositories/_form_create.html.erb b/app/views/repositories/_form_create.html.erb
index 89ae6ffd0..669f47071 100644
--- a/app/views/repositories/_form_create.html.erb
+++ b/app/views/repositories/_form_create.html.erb
@@ -22,12 +22,12 @@ border:none
<% end %>
<%= f.check_box :is_default, :label => :field_repository_is_default %>
-
<%= f.text_field :identifier, :required=>true, :disabled => @repository.identifier_frozen?, :label => l(:label_repository_name) %>
+
<%= f.text_field :identifier, :required=>true, :disabled => @repository.identifier_frozen?, :label => l(:label_repository_name)%>
<% unless @repository.identifier_frozen? %>
<%= l(:text_length_between, :min => 1, :max => Repository::IDENTIFIER_MAX_LENGTH) %>
<%= l(:text_repository_identifier_info).html_safe %>
<% end %>
-
+
<%= f.password_field :upassword, :required =>true, :label=> :field_password %>
<%= l(:label_upassword_info)%>
<%= l(:label_work_name) %>
* : <%= f.text_field :name, :required => true, :size => 60, :style => "width:400px;" %>
- <%= l(:label_softapplication_name_condition)%>
+ (<%= l(:label_workname_lengthlimit) %>)
<%= l(:label_running_platform) %>
* : <%= f.text_field :android_min_version_available, :required => true, :size => 60, :style => "width:400px;" %>
-
+ (<%= l(:label_workdescription_lengthlimit) %>)
<%= l(:label_work_description) %>
* : <%= f.text_field :description, :required => true, :size => 60, :style => "width:400px;" %>
- <%= l(:label_softapplication_description_condition)%>
+
<%= l(:label_softapplication_developers) %>
* : <%= f.text_field :application_developers, :required => true, :size => 60, :style => "width:400px;" %>
-
+ (<%= l(:label_workdescription_lengthlimit) %>)
+
+ <% options = {:author => true, :deletable => true} %>
+
+ <%= render :partial => 'attachments/links',
+ :locals => {:attachments => @softapplication.attachments, :options => options} %>
+
+
<%=l(:label_upload_softworkpacket_photo)%>
<%= render_flash_messages %>
- <%= render :partial => 'attachments/form' %>
+ <%= render :partial => 'attachments/form' %>
1、<%=l(:label_upload_softapplication_packets_mustpacketed)%>
<%=l(:label_updated_caution)%>
diff --git a/app/views/softapplications/_list.html.erb b/app/views/softapplications/_list.html.erb
new file mode 100644
index 000000000..4f99519b5
--- /dev/null
+++ b/app/views/softapplications/_list.html.erb
@@ -0,0 +1,24 @@
+
+ <% @softapplications.each do |softapplication| %>
+
+ <%= link_to softapplication.name, softapplication, :target => "_blank" %> <%= rating_for softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>
+
+
+ <%= image_tag('/images/app1.png')%>
+ <%= softapplication.description.truncate(95, omission: '...') %>
+
+ <%contest = softapplication.contests.first%>
+
<%=l(:label_attendingcontestwork_belongs_contest)%>：<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%>
+
<%=l(:label_attendingcontestwork_belongs_type)%>：<%= softapplication.app_type_name.truncate(10, omission: '...') %>
+
<%=l(:label_attendingcontestwork_adaptive_system)%>：<%= softapplication.android_min_version_available %>
+
+ <%=l(:label_attendingcontestwork_developers)%>：<%= softapplication.application_developers %>
+ <%=l(:label_attendingcontestwork_release_time)%>：<%=format_time softapplication.created_at %>
+
+
+
+ <% end %>
+
+
\ No newline at end of file
diff --git a/app/views/softapplications/index.html.erb b/app/views/softapplications/index.html.erb
index 5b355f65c..bccbd9bee 100644
--- a/app/views/softapplications/index.html.erb
+++ b/app/views/softapplications/index.html.erb
@@ -3,37 +3,15 @@
<%=render :partial => 'layouts/base_softapplication_index_top_content'%>
<% if @softapplications.size > 0%>
- <%= sort_softapplication(@s_state)%>
-
-
- <% @softapplications.each do |softapplication| %>
-
- <%= link_to softapplication.name, softapplication, :target => "_blank" %> <%= rating_for softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>
-
-
-
<%= image_tag('/images/app1.png')%>
-
<%= softapplication.description.truncate(95, omission: '...') %>
-
- <%contest = softapplication.contests.first%>
-
<%=l(:label_attendingcontestwork_belongs_contest)%>：<%= contest ? link_to(contest.name.truncate(14, omission: '...'), show_attendingcontest_contest_path(contest), title: contest.name.to_s ) : '尚未加入竞赛'%>
-
<%=l(:label_attendingcontestwork_belongs_type)%>：<%= softapplication.app_type_name.truncate(10, omission: '...') %>
-
<%=l(:label_attendingcontestwork_adaptive_system)%>：<%= softapplication.android_min_version_available %>
-
-
- <%=l(:label_attendingcontestwork_developers)%>：<%= softapplication.application_developers %>
- <%=l(:label_attendingcontestwork_release_time)%>：<%=format_time softapplication.created_at %>
-
-
-
- <% end %>
+
+ <%= sort_softapplication(@s_state)%>
+ <%= render :partial => "list" %>
-
<% else %>
<%= render :partial => "layouts/no_content"%>
<% end %>
-
+
<% html_title l(:label_contest_work_list)%>
\ No newline at end of file
diff --git a/app/views/softapplications/search.html.erb b/app/views/softapplications/search.html.erb
new file mode 100644
index 000000000..0f0913139
--- /dev/null
+++ b/app/views/softapplications/search.html.erb
@@ -0,0 +1,11 @@
+<%=render :partial => 'layouts/base_softapplication_index_top_content'%>
+
+<% if @softapplications.size > 0%>
+ <%#= sort_softapplication(@s_state)%>
+
+ <%= render :partial => "list" %>
+
+<% else %>
+ <%= render :partial => "layouts/no_content"%>
+<% end %>
+<% html_title l(:label_contest_work_list)%>
\ No newline at end of file
diff --git a/app/views/softapplications/search.js.erb b/app/views/softapplications/search.js.erb
new file mode 100644
index 000000000..8b4b8afb2
--- /dev/null
+++ b/app/views/softapplications/search.js.erb
@@ -0,0 +1,2 @@
+
+$('#softapplications_list').html('<%= escape_javascript(render(:partial => 'list' )) %>');
\ No newline at end of file
diff --git a/app/views/tags/_show_attachments.html.erb b/app/views/tags/_show_attachments.html.erb
index 43ed76e02..8b0bb1f8b 100644
--- a/app/views/tags/_show_attachments.html.erb
+++ b/app/views/tags/_show_attachments.html.erb
@@ -1,5 +1,5 @@
-<% if attachments_results.try(:size).to_i < 0 %>
+<% if attachments_results.nil? || attachments_results.try(:size).to_i < 0 %>
<% else %>
<% when 'Bid' %>