jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'szzh' into develop

This commit is contained in:
sw 2014-08-29 15:08:56 +08:00
parent 9c4ed9c8f9 24a0f3e774
commit 27251545f3
36 changed files with 256 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/controllers/files_controller.rb
View File

@ -45,11 +45,45 @@ class FilesController < ApplicationController
'filename' => "#{Attachment.table_name}.filename", 'filename' => "#{Attachment.table_name}.filename",
'size' => "#{Attachment.table_name}.filesize", 'size' => "#{Attachment.table_name}.filesize",
'downloads' => "#{Attachment.table_name}.downloads" 'downloads' => "#{Attachment.table_name}.downloads"
sort = ""
if params[:project_id] if params[:project_id]
@isproject = true @isproject = true
@containers = [ Project.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").find(@project.id)]
@containers += @project.versions.includes(:attachments).reorder("#{Attachment.table_name}.created_on DESC").all.sort if params[:sort]
params[:sort].split(",").each do |sort_type|
order_by = sort_type.split(":")
case order_by[0]
when "filename"
attribute = "filename"
when "size"
attribute = "filesize"
when "attach_type"
attribute = "attachtype"
when "content_type"
attribute = "created_on"
when "field_file_dense"
attribute = "is_public"
when "downloads"
attribute = "downloads"
when "created_on"
attribute = "created_on"
end
if order_by.count == 1
sort += "#{Attachment.table_name}.#{attribute} desc "
elsif order_by.count == 2
sort += "#{Attachment.table_name}.#{attribute} #{order_by[1]} "
end
if sort_type != params[:sort].split(",").last
sort += ","
end
end
end
@containers = [ Project.includes(:attachments).reorder(sort).find(@project.id)]
@containers += @project.versions.includes(:attachments).reorder(sort).all.sort
show_attachments @containers show_attachments @containers
@ -57,7 +91,6 @@ class FilesController < ApplicationController
elsif params[:course_id] elsif params[:course_id]
@isproject = false @isproject = false
sort = ""
if params[:sort] if params[:sort]
params[:sort].split(",").each do |sort_type| params[:sort].split(",").each do |sort_type|
order_by = sort_type.split(":") order_by = sort_type.split(":")

21
app/helpers/application_helper.rb
View File

@ -737,7 +737,7 @@ module ApplicationHelper
text = text.dup text = text.dup
macros = catch_macros(text) macros = catch_macros(text)
text = Redmine::WikiFormatting.to_html("CKEditor", text, :object => obj, :attribute => attr) #text = Redmine::WikiFormatting.to_html("CKEditor", text, :object => obj, :attribute => attr)
@parsed_headings = [] @parsed_headings = []
@heading_anchors = {} @heading_anchors = {}
@ -1555,6 +1555,25 @@ module ApplicationHelper
date = time.strftime("%Y年%m月%d日") date = time.strftime("%Y年%m月%d日")
end end
#当TAG数量过多时，更多链接
#1代表是user类型 2代表是project类型 3代表是issue类型 4代表需求 9代表课程
def more_tags id,object_flag
a= 1
case object_flag
when "1"
s = link_to l(:label_more_tags),:controller => "users", :action => "show", :id => id
when "2"
s = link_to l(:label_more_tags),:controller => "projects", :action => "show", :id => id
when "3"
s = link_to l(:label_more_tags),:controller => "issues", :action => "show", :id => id
when "4"
s = link_to l(:label_more_tags),:controller => "bids", :action => "show", :id => id
when "9"
s = link_to l(:label_more_tags),:controller => "courses", :action => "show", :id => id
end
s
end
private private
def wiki_helper def wiki_helper

13
app/models/issue.rb
View File

@ -240,11 +240,14 @@ class Issue < ActiveRecord::Base
self.custom_field_values = issue.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h} self.custom_field_values = issue.custom_field_values.inject({}) {|h,v| h[v.custom_field_id] = v.value; h}
self.status = issue.status self.status = issue.status
self.author = User.current self.author = User.current
unless options[:attachments] == false #赞不提供附件复制功能
self.attachments = issue.attachments.map do |attachement| #unless options[:attachments] == false
attachement.copy(:container => self) #self.attachments = issue.attachments.map do |attachement|
end # a = attachement.copy(:container => self)
end # #a.save
# a
#end
#end
@copied_from = issue @copied_from = issue
@copy_options = options @copy_options = options
self self

6
app/views/attachments/_form.html.erb
View File

@ -4,7 +4,11 @@
<span id="attachments_p<%= i %>" class="attachment"> <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}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%>
<%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") + <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 255, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") +
link_to('&nbsp;'.html_safe, attachment_path(attachment, :attachment_id => "p#{i}", :format => 'js'), :method => 'delete', :remote => true, :class => 'remove-upload') %> if attachment.id.nil?
else
link_to('&nbsp;'.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"} %> <%#= render :partial => 'tags/tag', :locals => {:obj => attachment, :object_flag => "6"} %>
<%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%> <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, :class => 'is_public')%>
<%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %> <%= hidden_field_tag "attachments[p#{i}][token]", "#{attachment.token}" %>

2
app/views/attachments/autocomplete.js.erb
View File

@ -4,5 +4,5 @@ $('#relation_file').html('<%=render_attachments_for_new_project(@project, nil)%>
<% elsif @course%> <% elsif @course%>
$('#relation_file').html('<%=render_attachments_for_new_course(@course, nil)%>'); $('#relation_file').html('<%=render_attachments_for_new_course(@course, nil)%>');
<% end%> <% end%>
$('#attachments').children().css("width","100%").css("word-break","break-all"); $('#attachments').children().css("width","100%").css("word-break","break-all").css("word-wrap", "break-word");

5
app/views/attachments/file.html.erb
View File

@ -6,8 +6,9 @@
<p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%> <p><%= link_to_attachment @attachment, :text => l(:button_download), :download => true -%>
<span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp <span class="size">(<%= number_to_human_size @attachment.filesize %>)</span>&nbsp&nbsp&nbsp
<span class="size"> <span class="size">
<% if @attachment!=nil&&@attachment.container_type == 'Document'&&User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %> <!-- &&(@attachment.container_type == 'Document' || @attachment.container_type == 'WikiPage') -->
<%= link = link_to(l(:button_add), {:controller => 'code_review', <% if @attachment!=nil&&User.current.allowed_to?({:controller => 'code_review', :action => 'update_diff_view'}, @attachment.project) %>
<%= l(:review_assignments)+":" %><%= link = link_to(l(:button_add), {:controller => 'code_review',
:action => 'assign', :action_type => 'attachment', :action => 'assign', :action_type => 'attachment',
:id=>@attachment.project, :id=>@attachment.project,
:change_id => '', :attachment_id => @attachment.id, :change_id => '', :attachment_id => @attachment.id,

2
app/views/boards/_project_show.html.erb
View File

@ -53,7 +53,7 @@
</span> </span>
<% end %> <% end %>
</div> </div>
<div style="width: 100%;word-break: break-all;"> <div style="width: 100%;word-break: break-all;word-wrap: break-word;">
<% if @topics.any? %> <% if @topics.any? %>
<!-- <table class="list messages"> <!-- <table class="list messages">
<thead><tr> <thead><tr>

2
app/views/contests/show_contest.html.erb
View File

@ -6,7 +6,7 @@
<p> <p>
<strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @contest.budget%></span></strong> <strong><%= l(:label_bids_reward_method) %><span class="bonus"><%= @contest.budget%></span></strong>
</p> </p>
<div class="bid_description" style="width: 100%;word-break:break-all;"> <div class="bid_description" style="width: 100%;word-break:break-all;word-wrap: break-word;">
<%= @contest.description %> <%= @contest.description %>
<!-- <%# if @contest.attachments.any?%> <!-- <%# if @contest.attachments.any?%>
<%# options = {:author => true} %> <%# options = {:author => true} %>

2
app/views/courses/show.html.erb
View File

@ -29,7 +29,7 @@
<%= l(:label_new_activity) %> </span> <%= l(:label_new_activity) %> </span>
<%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:style => "word-break:break-all;" %> <%= link_to "#{eventToLanguageCourse(e.event_type, @course)}: "<< format_activity_title(e.event_title), (e.event_type.eql?("attachment")&&e.container.kind_of?(Course)) ? course_files_path(e.container) : e.event_url,:style => "word-break:break-all;word-wrap: break-word;" %>
</td> </td>
</tr> </tr>
<tr> <tr>

5
app/views/issues/_list.html.erb
View File

@ -37,11 +37,8 @@
</ul> </ul>
<% end -%> <% end -%>
<ul class="list-group-item-meta"> <ul class="list-group-item-meta">
<div class="issue-list-description"> <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
<div class="wiki" style="width: 100%;word-break: break-all;">
<%= textilizable issue, :description %> <%= textilizable issue, :description %>
</div>
<!-- <#%= l(:field_description)%>:&nbsp;<#%= issue.short_description %> -->
</div> </div>
</ul> </ul>
<ul class="list-group-item-meta"> <ul class="list-group-item-meta">

12
app/views/issues/index.html.erb
View File

@ -37,21 +37,21 @@
<!-- <!--
<fieldset class="collapsible collapsed"> <fieldset class="collapsible collapsed">
<legend onclick="toggleFieldset(this);"> <legend onclick="toggleFieldset(this);">
<%#= l(:label_options) %> <%= l(:label_options) %>
</legend> </legend>
<div style="display: none;"> <div style="display: none;">
<table> <table>
<tr> <tr>
<td><%#= l(:field_column_names) %></td> <td><%= l(:field_column_names) %></td>
<td><%#= render_query_columns_selection(@query) %></td> <td><%= render_query_columns_selection(@query) %></td>
</tr> </tr>
<tr> <tr>
<td><label for='group_by'><%= l(:field_group_by) %></label></td> <td><label for='group_by'><%= l(:field_group_by) %></label></td>
<td><%#= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td> <td><%= select_tag('group_by', options_for_select([[]] + @query.groupable_columns.collect { |c| [c.caption, c.name.to_s] }, @query.group_by)) %></td>
</tr> </tr>
<tr> <tr>
<td><%#= l(:button_show) %></td> <td><%= l(:button_show) %></td>
<td><%#= available_block_columns_tags(@query) %></td> <td><%= available_block_columns_tags(@query) %></td>
</tr> </tr>
</table> </table>
</div> </div>

5
app/views/issues/new.html.erb
View File

@ -11,8 +11,9 @@
<% if @copy_from && @copy_from.attachments.any? %> <% if @copy_from && @copy_from.attachments.any? %>
<p> <p>
<label for="copy_attachments"><%= l(:label_copy_attachments) %></label> <!-- 去除附件复制功能 -->
<%= check_box_tag 'copy_attachments', '1', @copy_attachments %> <!-- <label for="copy_attachments"><#%= l(:label_copy_attachments) %></label>
<#%= check_box_tag 'copy_attachments', '1', @copy_attachments %> -->
</p> </p>
<% end %> <% end %>
<% if @copy_from && !@copy_from.leaf? %> <% if @copy_from && !@copy_from.leaf? %>

2
app/views/journals/diff.html.erb
View File

@ -1,7 +1,7 @@
<h3><%=h @issue.tracker %> #<%= @issue.id %></h3> <h3><%=h @issue.tracker %> #<%= @issue.id %></h3>
<p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p> <p><%= authoring @journal.created_on, @journal.user, :label => :label_updated_time_by %></p>
<div class="text-diff" style="word-break: break-all;width: 100%;"> <div class="text-diff" style="word-break: break-all;width: 100%;word-wrap: break-word;">
<%= simple_format_without_paragraph @diff.to_html %> <%= simple_format_without_paragraph @diff.to_html %>
</div> </div>

2
app/views/layouts/base_courses.html.erb
View File

@ -191,7 +191,7 @@
<div style="padding-bottom: 8px"> <div style="padding-bottom: 8px">
<% if @course.description && @course.description.size>0 %> <% if @course.description && @course.description.size>0 %>
<div class="font_lighter_sidebar" style="word-break:break-all; word-wrap:break-all;"> <div class="font_lighter_sidebar" style="word-break:break-all; word-wrap:break-word;">
<%= textilizable @course.description %> <%= textilizable @course.description %>
</div> </div>

2
app/views/layouts/base_projects.html.erb
View File

@ -112,7 +112,7 @@
</div> </div>
<div style="padding-bottom: 8px"> <div style="padding-bottom: 8px">
<div class="font_lighter_sidebar" style="word-break:break-all"> <div class="font_lighter_sidebar" style="word-break:break-all;word-wrap: break-word;">
<%= textilizable @project.description %> <%= textilizable @project.description %>
</div> </div>
<div class="created_on_project"> <div class="created_on_project">

2
app/views/layouts/base_users.html.erb
View File

@ -116,7 +116,7 @@
</p> </p>
<% end %> <% end %>
<% unless @user.user_extensions.nil? %> <% unless @user.user_extensions.nil? %>
<p style="width: 100%;word-break: break-all"> <p style="width: 100%;word-break: break-all;word-wrap: break-word;">
<%= @user.user_extensions.brief_introduction %> <%= @user.user_extensions.brief_introduction %>
</p> </p>
<% end %> <% end %>

2
app/views/memos/show.html.erb
View File

@ -46,7 +46,7 @@
</div> </div>
<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>" style="word-break: break-all;"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div> <div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>" style="word-break: break-all;word-wrap: break-word;"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
<div class="memo-content"> <div class="memo-content">
<%= textAreailizable(@memo,:content) %> <%= textAreailizable(@memo,:content) %>
<p> <p>

2
app/views/messages/_course_show.html.erb
View File

@ -156,7 +156,7 @@
<tr> <tr>
<td class="comments"> <td class="comments">
<div class="wiki" style="width: 100%;word-break: break-all;"> <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
<%= textAreailizable message,:content,:attachments => message.attachments %> <%= textAreailizable message,:content,:attachments => message.attachments %>
<%#= message.content.html_safe %> <%#= message.content.html_safe %>
</div> </div>

9
app/views/messages/_form.html.erb
View File

@ -27,14 +27,15 @@
<p><label><%= l(:label_board) %></label><br /> <p><label><%= l(:label_board) %></label><br />
<%# modify by nwb%> <%# modify by nwb%>
<% if @message.project %> <% if @message.project %>
<%= f.select :board_id, boards_options_for_select(@message.project.boards) %></p> <%= f.select :board_id, boards_options_for_select(@message.project.boards) %>
<% elsif @message.course %> <% elsif @message.course %>
<%= f.select :board_id, boards_options_for_select(@message.course.boards) %></p> <%= f.select :board_id, boards_options_for_select(@message.course.boards) %>
<% end %> <% end %>
</p>
<% end %> <% end %>
<div id="message_quote" class="wiki" style="width: 100%;word-break: break-all"></div> <p><label for="message_subject"><%= l(:field_description) %><span class="required"> *&nbsp;&nbsp;</span></label>
<%= text_area :quote,:quote,:style => 'display:none' %> <%= text_area :quote,:quote,:style => 'display:none' %>
</p>
<p> <p>
<%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %> <%= label_tag "message_content", l(:description_message_content), :class => "hidden-for-sighted" %>
<%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %></p> <%= f.text_area :content, :cols => 80, :rows => 13, :class => 'wiki-edit', :id => 'message_content' %></p>

5
app/views/messages/_project_show.html.erb
View File

@ -37,6 +37,7 @@
background-color: #F6F6F6; background-color: #F6F6F6;
white-space: normal; white-space: normal;
word-break: break-all; word-break: break-all;
word-wrap: break-word;
/*word-wrap: break-word;*/ /*word-wrap: break-word;*/
} }
.memo-timestamp { .memo-timestamp {
@ -94,7 +95,7 @@
<%= link_to @topic.author, user_path(@topic.author) %> <%= link_to @topic.author, user_path(@topic.author) %>
</p> </p>
</div> </div>
<div class="memo-section" style="width: 100%;word-break: break-all;"> <div class="memo-section" style="width: 100%;word-break: break-all;word-wrap: break-word;">
<div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 83%;word-break: break-all;"> <div class="memo-title <%= @topic.sticky? ? 'sticky' : '' %> <%= @topic.locked? ? 'locked' : '' %>" style="width: 83%;word-break: break-all;">
<% if @project %> <% if @project %>
<%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %> <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject.truncate(24, omission: '...'), project_boards_path(@topic.project),title: @topic.subject.to_s %>
@ -161,7 +162,7 @@
</tr> </tr>
<tr> <tr>
<td class="comments"> <td class="comments">
<div class="wiki" style="width: 100%;word-break: break-all;"> <div class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;">
<%= textAreailizable message,:content,:attachments => message.attachments %> <%= textAreailizable message,:content,:attachments => message.attachments %>
<%#= message.content.html_safe %> <%#= message.content.html_safe %>
</div> </div>

2
app/views/messages/edit.html.erb
View File

@ -4,7 +4,7 @@
<%= course_board_breadcrumb(@message) %> <%= course_board_breadcrumb(@message) %>
<% end %> <% end %>
<h3><%= avatar(@topic.author, :size => "24") %><span style = "width:100%;word-break:break-all;"><%=h @topic.subject %></span></h3> <h3><%= avatar(@topic.author, :size => "24") %><span style = "width:100%;word-break:break-all;word-wrap: break-word;"><%=h @topic.subject %></span></h3>
<%= form_for @message, { <%= form_for @message, {
:as => :message, :as => :message,

6
app/views/news/_form.html.erb
View File

@ -3,9 +3,11 @@
<%= @project ? l(:label_news_new) : l(:bale_news_notice) %> <%= @project ? l(:label_news_new) : l(:bale_news_notice) %>
</div> </div>
<div class="box tabular"> <div class="box tabular">
<p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;" %></p> <p><%= f.text_field :title, :required => true, :size => 60, :style => "width:488px;", :onblur => "regexTitle();" %></p>
<P><span id="title_notice_span">(60个字符以内)</span></P>
<!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> --> <!-- <p style="margin-left:-10px;"><%#= f.text_area :summary, :cols => 60, :rows => 2, :style => "width:490px;margin-left:10px;" %></p> -->
<p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;" %></p> <p><%= f.text_area :description, :required => true, :cols => 60, :rows => 11, :class => 'wiki-edit', :style => "width:490px;", :onblur => "regexDescription();" %></p>
<P><span id="description_notice_span"></span></P>
<p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p> <p id="attachments_form" style="margin-left:-10px;"><label style="padding-right: 15px;"><%= l(:label_attachment_plural) %></label><%= render :partial => 'attachments/form', :locals => {:container => @news} %></p>
</div> </div>

57
app/views/news/_project_news.html.erb
View File

@ -1,3 +1,56 @@
<script type="text/javascript">
function regexTitle()
{
var name = $("#news_title").val();
if(name.length ==0)
{
$("#title_notice_span").text("标题不能为空");
$("#title_notice_span").css('color','#ff0000');
$("#title_notice_span").focus();
return false;
}
else if(name.length <= 60)
{
$("#title_notice_span").text("填写正确");
$("#title_notice_span").css('color','#008000');
return true;
}
else
{
$("#title_notice_span").text("标题超过60个字符");
$("#title_notice_span").css('color','#ff0000');
$("#title_notice_span").focus();
return false;
}
}
function regexDescription()
{
var name = $("#news_description").val();
if(name.length ==0)
{
$("#description_notice_span").text("描述不能为空");
$("#description_notice_span").css('color','#ff0000');
$("#description_notice_span").focus();
return false;
}
else
{
$("#description_notice_span").text("填写正确");
$("#description_notice_span").css('color','#008000');
return true;
}
}
function submitNews()
{
if(regexTitle() && regexDescription())
{
$("#news-form").submit();
}
}
</script>
<% <%
if @project.project_type == Project::ProjectType_course if @project.project_type == Project::ProjectType_course
btn_tips = l(:label_news_notice) btn_tips = l(:label_news_notice)
@ -22,7 +75,9 @@
<%= labelled_form_for @news, :url => project_news_index_path(@project), <%= labelled_form_for @news, :url => project_news_index_path(@project),
:html => {:id => 'news-form', :multipart => true} do |f| %> :html => {:id => 'news-form', :multipart => true} do |f| %>
<%= render :partial => 'news/form', :locals => {:f => f} %> <%= render :partial => 'news/form', :locals => {:f => f} %>
<%= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit --> | <%#= submit_tag l(:button_create), :class => 'whiteButton m3p10 h30', :name => nil %><!-- button-submit -->
<%= link_to l(:button_create), "#", :onclick => 'submitNews();', :class => 'whiteButton m3p10' %>
|
<%= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %> <%= preview_link preview_news_path(:project_id => @project), 'news-form', target='preview', {:class => 'whiteButton m3p10'} %>
| |
<%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %> <%= link_to l(:button_cancel), "#", :onclick => '$("#add-news").hide()', :class => 'whiteButton m3p10' %>

59
app/views/news/_project_show.html.erb
View File

@ -1,3 +1,55 @@
<script type="text/javascript">
function regexTitle()
{
var name = $("#news_title").val();
if(name.length ==0)
{
$("#title_notice_span").text("标题不能为空");
$("#title_notice_span").css('color','#ff0000');
$("#title_notice_span").focus();
return false;
}
else if(name.length <= 60)
{
$("#title_notice_span").text("填写正确");
$("#title_notice_span").css('color','#008000');
return true;
}
else
{
$("#title_notice_span").text("标题超过60个字符");
$("#title_notice_span").css('color','#ff0000');
$("#title_notice_span").focus();
return false;
}
}
function regexDescription()
{
var name = $("#news_description").val();
if(name.length ==0)
{
$("#description_notice_span").text("描述不能为空");
$("#description_notice_span").css('color','#ff0000');
$("#description_notice_span").focus();
return false;
}
else
{
$("#description_notice_span").text("填写正确");
$("#description_notice_span").css('color','#008000');
return true;
}
}
function submitNews()
{
if(regexTitle() && regexDescription())
{
$("#news-form").submit();
}
}
</script>
<div class="contextual"> <div class="contextual">
<%= watcher_link(@news, User.current) %> <%= watcher_link(@news, User.current) %>
<%= link_to(l(:button_edit), <%= link_to(l(:button_edit),
@ -15,9 +67,10 @@
<%= labelled_form_for :news, @news, :url => news_path(@news), <%= labelled_form_for :news, @news, :url => news_path(@news),
:html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %> :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
<%= render :partial => 'form', :locals => { :f => f } %> <%= render :partial => 'form', :locals => { :f => f } %>
<%= submit_tag l(:button_save) %> <%#= submit_tag l(:button_save) %>
<%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => ''} %> | <%= link_to l(:button_save), "#", :onclick => 'submitNews();',:class => 'whiteButton m3p10' %>
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %> <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form',target='preview',{:class => 'whiteButton m3p10'} %> |
<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;',:class => 'whiteButton m3p10' %>
<% end %> <% end %>
<div id="preview" class="wiki"></div> <div id="preview" class="wiki"></div>
</div> </div>

4
app/views/projects/show.html.erb
View File

@ -7,7 +7,7 @@
<% @events_by_day.keys.sort.reverse.each do |day| %> <% @events_by_day.keys.sort.reverse.each do |day| %>
<% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%> <% sort_activity_events(@events_by_day[day]).each do |e, in_group| -%>
<div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-break: break-all;"> <div class="activity-item underline-evreycontent" style="font-size: 14px;line-height:1.5em;width: 100%;word-wrap: break-word;word-break: break-all;">
<div class="activity-avatar" style="float: left; margin:3px; height: 100%;"> <div class="activity-avatar" style="float: left; margin:3px; height: 100%;">
<%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %> <%= image_tag(url_to_avatar(e.event_author), :class => "avatar") %>
</div> </div>
@ -24,7 +24,7 @@
</span> </span>
<%= 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 %> <%= 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 %>
<div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;"> <div class="activity_description info-break" style="font-size: 13px;width: 100%;word-break: break-all;word-wrap: break-word;">
<%= textAreailizable e,:event_description %> <%= textAreailizable e,:event_description %>
<%#= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %> <%#= h(truncate(strip_tags(e.event_description).gsub(/&nbsp;/, ' '), length: 30, omission: '...')) %>
</div> </div>

2
app/views/tags/_tag_name.html.erb
View File

@ -22,7 +22,7 @@
<% i += 1 %> <% i += 1 %>
<% end %> <% end %>
<%= link_to l(:label_more_tags),:controller => "tags", :action => "show", :id => obj.id %> <%= more_tags(obj.id,object_flag)%>
<% else %> <% else %>

2
app/views/users/_course_form.html.erb
View File

@ -30,7 +30,7 @@
</span></td> </span></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" style="word-break:break-all"> <td colspan="2" width="580" style="word-break:break-all;word-wrap: break-word;">
<p class="font_description"> <p class="font_description">
<%= textilizable membership.course.short_description %> <%= textilizable membership.course.short_description %>
</p> </p>

17
app/views/users/user_fanslist.html.erb
View File

@ -20,27 +20,18 @@
<tr> <tr>
<!-- added by bai 区分了个人列表里的项目与课程 --> <!-- added by bai 区分了个人列表里的项目与课程 -->
<td colspan="2" width="580px"><p class="font_description"> <td colspan="2" width="580px"><p class="font_description">
<% unless user.memberships.empty? %>
<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %> <% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
<% memberships = user.memberships.all(:conditions => cond) %> <% memberships = user.memberships.all(:conditions => cond) %>
<%= l(:label_x_contribute_to, :count => memberships.count) %> <%= l(:label_x_contribute_to, :count => memberships.count) %>
<% for member in memberships %> <% for member in memberships %>
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
<% end %> <% end %>
<% else %>
<%= l(:label_x_contribute_to, :count => 0) %>
<% end %>
<p class="font_description"> <p class="font_description">
<% unless user.memberships.empty? %> <% user_courses = user_courses_list(user) %>
<% cond = Project.visible_condition(User.current) + " AND projects.project_type = 1" %> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
<% memberships = user.memberships.all(:conditions => cond) %> <% for course in user_courses %>
<%= l(:label_x_course_contribute_to, :count => memberships.count) %> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
<% for member in memberships %>
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
<% end %>
<% else %>
<%= l(:label_x_course_contribute_to, :count => 0) %>
<% end %> <% end %>
</p> </p>
</td> </td>

2
app/views/users/user_projects.html.erb
View File

@ -28,7 +28,7 @@
<span class="font_lighter"> <%= l(:label_peoject_take_in) %></span> <%= link_to_project(membership.project) %></td> <span class="font_lighter"> <%= l(:label_peoject_take_in) %></span> <%= link_to_project(membership.project) %></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" width="580" style="word-break:break-all"> <td colspan="2" width="580" style="word-break:break-all;word-wrap: break-word;">
<p class="font_description"> <p class="font_description">
<%= membership.project.short_description%> <%= membership.project.short_description%>
</p></td> </p></td>

21
app/views/users/user_watchlist.html.erb
View File

@ -7,29 +7,30 @@
<td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td> <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), user_path(user), :title => "#{user.name}" %></td>
<td><table width="580px" border="0"> <td><table width="580px" border="0">
<tr> <!-- modified by bai 增加了关注人的名字全称--> <tr> <!-- modified by bai 增加了关注人的名字全称-->
<td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %> <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %></strong>
</td> </td>
</tr> </tr>
<tr> <!-- modified by bai 区别了“关注”里个人参与的项目与课程--> <tr> <!-- modified by bai 区别了“关注”里个人参与的项目与课程-->
<td colspan="2" width="580px" ><p class="font_description"> <td colspan="2" width="580px" ><p class="font_description">
<% unless user.memberships.empty? %> <%# unless user.memberships.empty? %>
<% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %> <% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
<% memberships = user.memberships.all(:conditions => cond) %> <% memberships = user.memberships.all(:conditions => cond) %>
<%= l(:label_x_contribute_to, :count => memberships.count) %> <%= l(:label_x_contribute_to, :count => memberships.count) %>
<% for member in memberships %> <% for member in memberships %>
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
<% end %> <% end %>
<% end %> <%# end %>
</p> </p>
<p class="font_description"> <p class="font_description">
<% unless user.memberships.empty? %> <%# unless user.memberships.empty? %>
<% cond = Project.visible_condition(User.current) + " AND projects.project_type = 1" %> <% user_courses = user_courses_list(user) %>
<% memberships = user.memberships.all(:conditions => cond) %> <%= l(:label_x_course_contribute_to, :count => user_courses.count) %>
<%= l(:label_x_course_contribute_to, :count => memberships.count) %> <% for course in user_courses %>
<% for member in memberships %> <%# if course.name != nil %>
<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <%= link_to course.name,{:controller => 'courses',:action => 'show',id:course.id, host: Setting.course_domain} %><%= (user_courses.last == course) ? '' : '，' %>
<% end %> <%# end %>
<% end %> <% end %>
<%# end %>
</p> </p>
</td> </td>
</tr> </tr>

4
app/views/welcome/contest.html.erb
View File

@ -158,7 +158,7 @@
<div class="d-p-projectlist"> <div class="d-p-projectlist">
<% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %> <% find_all_hot_contest.map do |contest| break if(contest == find_all_hot_contest[5]) %>
<li style="overflow:auto;word-break:break-all;height:100%;" class='<%= cycle("odd", "even") %>'> <li style="overflow:auto;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
<div class="avatar-4" style="float: left; margin-top: 7px"> <div class="avatar-4" style="float: left; margin-top: 7px">
<%= image_tag('/images/contest1.png')%> <%= image_tag('/images/contest1.png')%>
</div> </div>
@ -197,7 +197,7 @@
<span style="margin-top: -20px;float: right; display: block;"><%#= link_to l(:label_more_information), forums_path %></span> <span style="margin-top: -20px;float: right; display: block;"><%#= link_to l(:label_more_information), forums_path %></span>
<div style="height: 167px; padding-top:6px;"> <div style="height: 167px; padding-top:6px;">
<fieldset style="padding-left: 36px; margin-left: 13px; height: 150px; width:380px; border-radius:10px;"> <fieldset style="padding-left: 36px; margin-left: 13px; height: 150px; width:380px; border-radius:10px;">
<div style="font-size:14px; color: #1166AD;text-align:center;word-break: break-all; "><strong style="margin:auto;"><%= @contestNotification.title %></strong></div> <div style="font-size:14px; color: #1166AD;text-align:center;word-break: break-all;word-wrap: break-word; "><strong style="margin:auto;"><%= @contestNotification.title %></strong></div>
<div class="underline-contests_four"></div> <div class="underline-contests_four"></div>
<div id="up_zzjs"> <div id="up_zzjs">
<div id="marqueebox"> <div id="marqueebox">

2
app/views/welcome/index.html.erb
View File

@ -66,7 +66,7 @@
<% #projects = find_miracle_project(10, 3) %> <% #projects = find_miracle_project(10, 3) %>
<% @projects.map do |project| %> <% @projects.map do |project| %>
<!--<%# cache cache_key_for_project(project) do %> --> <!--<%# cache cache_key_for_project(project) do %> -->
<li style="overflow:auto;word-break:break-all;height:100%;" class='<%= cycle("odd", "even") %>'> <li style="overflow:auto;word-break:break-all;height:100%;word-wrap: break-word;" class='<%= cycle("odd", "even") %>'>
<div style="float: left;"> <div style="float: left;">
<%= image_tag(get_project_avatar(project), :class => "avatar-4") %> <%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
</div> </div>

2
app/views/wiki/diff.html.erb
View File

@ -22,6 +22,6 @@
%>, <%= format_time(@diff.content_to.updated_on) %>)</em> %>, <%= format_time(@diff.content_to.updated_on) %>)</em>
</p> </p>
<div class="text-diff" style=" width: 100%;word-break: break-all;"> <div class="text-diff" style=" width: 100%;word-break: break-all;word-wrap: break-word;">
<%= simple_format_without_paragraph @diff.to_html %> <%= simple_format_without_paragraph @diff.to_html %>
</div> </div>

1
config/locales/en.yml
View File

@ -1809,3 +1809,4 @@ en:
notice_account_invalid_creditentials_new: You have not to the mailbox activation notice_account_invalid_creditentials_new: You have not to the mailbox activation
lable_unknow_type: Unknow type lable_unknow_type: Unknow type
lable_score_less_than_zero: Score less than 0, revised to 0 lable_score_less_than_zero: Score less than 0, revised to 0
review_assignments: review assignments

2
config/locales/zh.yml
View File

@ -276,6 +276,7 @@ zh:
field_is_default: 默认值 field_is_default: 默认值
field_tracker: 跟踪 field_tracker: 跟踪
field_subject: 主题 field_subject: 主题
field_quote: 描述
field_due_date: 计划完成日期 field_due_date: 计划完成日期
field_assigned_to: 指派给 field_assigned_to: 指派给
field_priority: 优先级 field_priority: 优先级
@ -2116,4 +2117,5 @@ zh:
lable_forums_max_length: 贴吧描述最大长度为65535个字符 lable_forums_max_length: 贴吧描述最大长度为65535个字符
lable_unknow_type: 未知类型 lable_unknow_type: 未知类型
lable_score_less_than_zero: 得分小于0，修正为0 lable_score_less_than_zero: 得分小于0，修正为0
review_assignments: 评审任务

2
public/stylesheets/scm.css
View File

@ -97,7 +97,7 @@ table.annotate td.author {
background: inherit; background: inherit;
} }
table.annotate td.line-code { background-color: #fafafa; } table.annotate td.line-code { background-color: #fafafa; word-break: break-all;}
div.action_M { background: #fd8 } div.action_M { background: #fd8 }
div.action_D { background: #f88 } div.action_D { background: #f88 }