Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
commit
958532bedc
@ -0,0 +1,71 @@
|
|||||||
|
<% checkBox = (@course.present? && @course.is_public?) ? 'public' : 'private'%>
|
||||||
|
<button name="button" class="sub_btn" onclick="_file.click()" onmouseover="this.focus()" style="<%= ie8? ? 'display:none' : ''%>" type="button" ><%= l(:label_browse) %></button>
|
||||||
|
<% if @course %>
|
||||||
|
<%= file_field_tag 'attachments[dummy][file]',
|
||||||
|
:id => '_file',
|
||||||
|
:class => ie8? ? '':'file_selector',
|
||||||
|
:multiple => true,
|
||||||
|
:onchange => 'addInputFilesCourseSource(this,"'+ checkBox.to_s+'");',
|
||||||
|
:style => ie8? ? '': 'display:none',
|
||||||
|
:data => {
|
||||||
|
:max_file_size => Setting.attachment_max_size.to_i.kilobytes,
|
||||||
|
:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
|
||||||
|
:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
|
||||||
|
:upload_path => uploads_path(:format => 'js'),
|
||||||
|
:description_placeholder => l(:label_optional_description),
|
||||||
|
:field_is_public => l(:field_is_public),
|
||||||
|
:are_you_sure => l(:text_are_you_sure),
|
||||||
|
:file_count => l(:label_file_count),
|
||||||
|
:delete_all_files => l(:text_are_you_sure_all)
|
||||||
|
} %>
|
||||||
|
<% else %>
|
||||||
|
<%= file_field_tag 'attachments[dummy][file]',
|
||||||
|
:id => '_file',
|
||||||
|
:class => ie8? ? '':'file_selector',
|
||||||
|
:multiple => true,
|
||||||
|
:onchange => 'addInputFiles(this);',
|
||||||
|
:style => ie8? ? '': 'display:none',
|
||||||
|
:data => {
|
||||||
|
:max_file_size => Setting.attachment_max_size.to_i.kilobytes,
|
||||||
|
:max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)),
|
||||||
|
:max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i,
|
||||||
|
:upload_path => uploads_path(:format => 'js'),
|
||||||
|
:description_placeholder => l(:label_optional_description),
|
||||||
|
:field_is_public => l(:field_is_public),
|
||||||
|
:are_you_sure => l(:text_are_you_sure),
|
||||||
|
:file_count => l(:label_file_count),
|
||||||
|
:delete_all_files => l(:text_are_you_sure_all)
|
||||||
|
} %>
|
||||||
|
<% end %>
|
||||||
|
|
||||||
|
<!--<input type="submit" name="" value="上传文件" class="f_l ml10" style="width:80px; height:26px;">-->
|
||||||
|
|
||||||
|
<span id="upload_file_count">
|
||||||
|
<%= l(:label_no_file_uploaded)%>
|
||||||
|
</span>
|
||||||
|
(<%= l(:label_max_size) %>:
|
||||||
|
<%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)
|
||||||
|
<div class="cl"></div>
|
||||||
|
<div>
|
||||||
|
<span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
|
||||||
|
<% if defined?(container) && container && container.saved_attachments %>
|
||||||
|
<% container.attachments.each_with_index do |attachment, i| %>
|
||||||
|
<span id="attachments_p<%= i %>" class="attachment">
|
||||||
|
<%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
|
||||||
|
<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %>
|
||||||
|
<span class="ispublic-label"><%= l(:field_is_public)%>:</span>
|
||||||
|
<%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public,attachment.is_public == 1 ? true : false,:class => 'is_public')%>
|
||||||
|
<%= if attachment.id.nil?
|
||||||
|
#待补充代码
|
||||||
|
else
|
||||||
|
link_to(' '.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload')
|
||||||
|
end
|
||||||
|
%>
|
||||||
|
<%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
|
||||||
|
|
||||||
|
<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>
|
||||||
|
</span>
|
||||||
|
<% end %>
|
||||||
|
<% end %>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
@ -0,0 +1,42 @@
|
|||||||
|
|
||||||
|
<div id="popbox_upload" class="mb10" style="margin-top: -30px;color:#15bccf; font-size:16px;">
|
||||||
|
<div class="upload_con">
|
||||||
|
<h2 style="text-align: center"><%= l(:label_upload_files)%></h2>
|
||||||
|
<div class="upload_box">
|
||||||
|
<%= error_messages_for 'attachment' %>
|
||||||
|
<div id="network_issue" style="color: red; display: none;"><%= l(:label_file_upload_error_messages)%></div>
|
||||||
|
|
||||||
|
<%= form_tag(course_files_path(course), :multipart => true,:remote => !ie8?,:name=>"upload_form") do %>
|
||||||
|
<input type="hidden" name="course_attachment_type" value="<%= course_attachment_type%>">
|
||||||
|
<!--<p class="c_grey fr mt10 mr5">-->
|
||||||
|
<div class="c_dark">
|
||||||
|
<input name="course_attachment_type" type="radio" value="1" checked class="c_dark" >课件</input> <span class="c_grey">|</span>
|
||||||
|
<input name="course_attachment_type" type="radio" value="2" class="c_dblue">软件</input> <span class="c_grey">|</span>
|
||||||
|
<input name="course_attachment_type" type="radio" value="3" class="c_dblue">媒体</input> <span class="c_grey">|</span>
|
||||||
|
<input name="course_attachment_type" type="radio" value="4" class="c_dblue">代码</input> <span class="c_grey">|</span>
|
||||||
|
<input name="course_attachment_type" type="radio" value="6" class="c_dblue">论文</input> <span class="c_grey">|</span>
|
||||||
|
<input name="course_attachment_type" type="radio" value="5" class="c_dblue">其他</input></a>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<div>
|
||||||
|
<%= render :partial => 'files/new_style_attachment_list',:locals => {:course => course} %>
|
||||||
|
</div>
|
||||||
|
<div class="cl"></div>
|
||||||
|
<a href="javascript:void(0);" class=" fr grey_btn mr40" onclick="hideModal();"><%= l(:button_cancel)%></a>
|
||||||
|
<a id="submit_resource" href="javascript:void(0);" class="blue_btn fr" onclick="submit_resource();"><%= l(:button_confirm)%></a>
|
||||||
|
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<% content_for :header_tags do %>
|
||||||
|
<%= javascript_include_tag 'attachments' %>
|
||||||
|
<% end %>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
function submit_resource()
|
||||||
|
{
|
||||||
|
$('#submit_resource').parent().submit();
|
||||||
|
}
|
||||||
|
</script>
|
||||||
@ -0,0 +1,38 @@
|
|||||||
|
<table class="pro_table">
|
||||||
|
<tbody>
|
||||||
|
<tr class="pro_table_tit">历史版本</tr>
|
||||||
|
<tr class="pro_table_tit">
|
||||||
|
<td class=" w150"><%= l(:field_identifier) %></td>
|
||||||
|
<td class="w150"> <%= l(:field_repository_is_default) %></td>
|
||||||
|
<td class="w150"><%= l(:label_scm) %> </td>
|
||||||
|
<td class="w150" ><%= l(:label_repository_path) %> </td>
|
||||||
|
<td class="w150"> </td>
|
||||||
|
<td class="w150"> </td>
|
||||||
|
</tr>
|
||||||
|
<% rep_forge(project).sort.each do |repository| %>
|
||||||
|
<tr class="<%= cycle 'pro_table_on', '' %>">
|
||||||
|
<td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
|
||||||
|
<%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a></td>
|
||||||
|
<td> <%= checked_image repository.is_default? %></td>
|
||||||
|
<td><%=h repository.scm_name %></td>
|
||||||
|
<%if repository.scm_name=="Git"%>
|
||||||
|
<td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="http://<%= repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
|
||||||
|
<%=h repository.url.slice(project_path_cut, repository.url.length) %>"> <%=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)%></td><!--Modified by tanxianbo-->
|
||||||
|
<%else %>
|
||||||
|
<td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
|
||||||
|
<% end %>
|
||||||
|
<td><a href="javascript:viod(0)" class="c_blue" >
|
||||||
|
<% 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 %>
|
||||||
|
</a></td>
|
||||||
|
<td>
|
||||||
|
<% if repository.login.to_s==User.current.login.to_s %>
|
||||||
|
<%= delete_new_link repository_path(repository) %>
|
||||||
|
<% end %></td>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
@ -0,0 +1,26 @@
|
|||||||
|
<% rep_gitlab(project).sort.each do |repository| %>
|
||||||
|
|
||||||
|
<table class="pro_table">
|
||||||
|
<tbody>
|
||||||
|
<tr class="pro_table_tit">
|
||||||
|
<td class=" w150"><%= l(:field_identifier) %></td>
|
||||||
|
<td class="w150"><%= l(:label_scm) %> </td>
|
||||||
|
<td class="w362" ><%= l(:label_repository_path) %> </td>
|
||||||
|
</tr>
|
||||||
|
|
||||||
|
<tr class="<%= cycle 'pro_table_on', '' %>">
|
||||||
|
<td><a href="javascript:viod(0)" title="<%= repository.identifier %>">
|
||||||
|
<%= link_to truncate(repository.identifier), ({:controller => 'repositories', :action => 'show', :id => @project, :repository_id => repository.identifier_param} if repository.identifier.present?) %></a>
|
||||||
|
</td>
|
||||||
|
<td><%=h repository.scm_name %></td>
|
||||||
|
<%if repository.scm_name=="Gitlab"%>
|
||||||
|
<td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" title="<%= rep_gitlab_url(project) %>">
|
||||||
|
<%=truncate(rep_gitlab_url(project), :length => 360) %>
|
||||||
|
</td>
|
||||||
|
<%else %>
|
||||||
|
<td style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" ><%=h truncate(repository.url,:length=>10) %></td>
|
||||||
|
<% end %>
|
||||||
|
</tr>
|
||||||
|
<% end %>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
@ -0,0 +1,8 @@
|
|||||||
|
class DropOrganization < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
drop_table :organizations
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,18 @@
|
|||||||
|
class CreateOrganization < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
create_table :organizations do |t|
|
||||||
|
t.string :name
|
||||||
|
t.text :description
|
||||||
|
t.integer :creator_id
|
||||||
|
t.integer :home_id
|
||||||
|
t.string :domain
|
||||||
|
t.boolean :is_public
|
||||||
|
|
||||||
|
t.timestamps
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
drop_table :organizations
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,14 @@
|
|||||||
|
class CreateOrgMembers < ActiveRecord::Migration
|
||||||
|
def up
|
||||||
|
create_table :org_members do |t|
|
||||||
|
t.integer :user_id
|
||||||
|
t.integer :organization_id
|
||||||
|
t.string :role
|
||||||
|
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down
|
||||||
|
drop_table :org_members
|
||||||
|
end
|
||||||
|
end
|
||||||
@ -0,0 +1,11 @@
|
|||||||
|
#coding=utf-8
|
||||||
|
|
||||||
|
namespace :rep_fault do
|
||||||
|
desc "set ossean's type value"
|
||||||
|
task :rep_update => :environment do
|
||||||
|
rep = Repository.find(400)
|
||||||
|
rep.type = "Repository::Gitlab"
|
||||||
|
rep.save
|
||||||
|
end
|
||||||
|
|
||||||
|
end
|
||||||
|
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 7.1 KiB |
Loading…
Reference in new issue