hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1、 实践课程->课程动态 列表 动态显示（有了最新动态后）应该为：如果是项目则显示新闻，课程则显示通知【光辉 周三】

Browse Source 
2、	系统中需要加空格地方：留言时间后加空格；作业截止日期前加空格；项目-缺陷：指派给**加空格；项目动态-发布时间加空格，而且去掉a标签；项目-新闻（更新时间后缺空格）【光辉 周三】
3、	竞赛—左下角 参与项目后面的“更多“位置应该调整【光辉 周三】
4、	看别人的主页时没有标签【光辉 周三】
exceptionHandle
nieguanghui 12 years ago
parent 6bab3a95a7
commit ca9da99f7e
10 changed files with 27 additions and 41 deletions
Show Stats Download Patch File Download Diff File

17
app/helpers/projects_helper.rb
Unescape View File

@ -237,7 +237,22 @@ module ProjectsHelper
when "attachment"
l :label_attachment
when "news"
l :label_news
l :label_news
else
""
end
end
def eventToLanguageCourse event_type, project
case event_type
when "issue-note"
l :label_issue
when "issue"
l :label_issue
when "attachment"
l :label_attachment
when "news"
project.project_type == 1 ? (l :label_notification) : (l :label_news)
else
""
end

2
app/views/bids/_bid_homework_show.html.erb
Unescape View File

@ -56,7 +56,7 @@
<td colspan="2" width="580px" ><span class="font_description"><%= bid.description %></span></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"><span> <%= l(:label_create_time) %> : <%=format_time bid.created_on %></span><span style="float: right"> <%= l(:field_deadline) %> : <%=bid.deadline %></span></td>
<td align="left"><span class="font_lighter"><span> <%= l(:label_create_time) %> :&nbsp; <%=format_time bid.created_on %></span><span style="float: right"> <%= l(:field_deadline) %> :&nbsp; <%=bid.deadline %></span></td>
<td></td>
</tr>
</table></td>

2
app/views/bids/_homework_list.html.erb
Unescape View File

@ -18,7 +18,6 @@
<% if homework.attachments.any?%>
<table width="660px" border="0" align="center">
<tr>
<!-- <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(homework.user), :class => "avatar"), user_path(homework.user), :class => "avatar" %></td> -->
<td colspan="2" valign="top" width="50" ><%= image_tag(url_to_avatar(homework.user), :class => "avatar")%></td>
<td>
<table width="580px" border="0">
@ -28,7 +27,6 @@
<tr>
<td colspan="2" valign="top"><strong><%= l(:label_bidding_user_studentcode) %> ：<%= homework.user.user_extensions.student_id%></td>
</tr>
<tr>
<td colspan="2" width="580px" >
<% if (User.current == homework.user) || (!Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @bid.courses.first.id).first.roles&Role.where('id = ? or id = ? or id =?',3,7, 9)).size >0) %>

4
app/views/issues/_list.html.erb
Unescape View File

@ -38,12 +38,12 @@
<% end -%>
<ul class="list-group-item-meta">
<div class="issue-list-description">
<%= l(:field_description)%>:<%= issue.description %>
<%= l(:field_description)%>:&nbsp;<%= issue.description %>
</div>
</ul>
<ul class="list-group-item-meta">
<% unless issue.assigned_to_id.nil? %>
<span><%= l(:field_assigned_to)%></span><%= raw column_content[5] %>
<span><%= l(:field_assigned_to)%>&nbsp;</span><%= raw column_content[5] %>&nbsp;
<% end %>
<%= l(:label_updated_time_on, format_date(issue.updated_on)).html_safe %>
<div class="find-comment-class">

2
app/views/layouts/base_contest.html.erb
Unescape View File

@ -181,7 +181,7 @@
<div class="user_fans">
<div class="font_title_left">
<strong><%= l(:label_bidding_project) %></strong>
<span style="font-size: 13px"><%= link_to "更多>>", :controller => 'bids', :action => 'show_project'%>
<span style="display:inline-block;font-size: 13px; float:right; margin-bottom: -4px;"><%= link_to "更多>>", :controller => 'bids', :action => 'show_project'%>
</div>
<div class="user_underline"></div>

12
app/views/layouts/base_users.html.erb
Unescape View File

@ -162,24 +162,12 @@
</div>
<!--Modified by nie-->
<!--tags-->
<% if User.current.logged? %>
<% if User.current.admin?||User.current.login==@user.login%>
<div class="user_underline"></div>
<!-- <div class="user_fans"> -->
<!-- added by william -for tag -->
<!-- <div class="user_tags"> -->
<div class="user_tags">
<div id="tags">
<%= render :partial => 'tags/tag', :locals => {:obj => @user,:object_flag => "1"}%>
</div>
</div>
<% end %>
<% end %>
<!-- </div> -->
<!-- </div> -->
<!--watch-->
<div class="user_underline"></div>
<div class="user_fans">
<div class="font_title_left">

19
app/views/news/index.html.erb
Unescape View File

@ -28,23 +28,6 @@
<% end if @project %>
<div id="preview" class="wiki"></div>
</div>
<!--<h3><%=l(:label_news_plural)%></h3>
<% if @newss.empty? %>
<p class="nodata"><%= l(:label_no_data) %></p>
<% else %>
<% @newss.each do |news| %>
<h3><%= avatar(news.author, :size => "24") %><%= link_to_project(news.project) + ': ' unless news.project == @project %>
<%= link_to h(news.title), news_path(news) %>
<%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count > 0 %></h3>
<p class="author"><%= authoring news.created_on, news.author %></p>
<div class="wiki">
<%= textilizable(news, :description) %>
</div>
<% end %>
<% end %> -->
<!--add by huang :list news-->
<div>
<% if @newss.empty? %>
@ -73,7 +56,7 @@
<td colspan="2" width="580px" ><span class="font_description"><%= textilizable(news, :description) %></span></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"> <%= l :label_update_time %>: <%= format_time(news.created_on) %></span></td>
<td align="left"><span class="font_lighter"> <%= l :label_update_time %>：&nbsp;<%= format_time(news.created_on) %></span></td>
<td width="350" align="right" class="a"><%= link_to l(:label_project_newother),news_path(news)%><%= "(#{l(:label_x_comments, :count => news.comments_count)})" if news.comments_count >= 0 %></td>
</tr>
</table></td>

5
app/views/projects/show.html.erb
Unescape View File

@ -20,7 +20,8 @@
<span class="font_lighter">
<%= link_to_user(e.event_author) if e.respond_to?(:event_author) %>
<%= l(:label_new_activity) %> </span>
<%= link_to "#{eventToLanguage(e.event_type)}: "<< format_activity_title(e.event_title), e.event_type.eql?("attachment") ? 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") ? project_files_path(e.container) : e.event_url %>
</td>
</tr>
<tr>
@ -30,7 +31,7 @@
</p></td>
</tr>
<tr>
<td align="left"><a class="font_lighter"> <%= l :label_activity_time %>: <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></a></td>
<td align="left"><span class="font_lighter"> <%= l :label_activity_time %>：&nbsp; <%= format_activity_day(day) %> <%= format_time(e.event_datetime, false) %></span></td>
<% if e.event_type == "issue" %>
<td align="right"><span> <%= link_to l(:label_find_all_comments), issue_path(e) %> </span><span class="font_lighter"><%= l(:label_comments_count, :count => e.journals.count)%></span></td>
<% end %>

2
app/views/words/_message.html.erb
Unescape View File

@ -23,7 +23,7 @@
</p></td>
</tr>
<tr>
<td align="left"><span class="font_lighter"> <%= l :label_comment_time %>: <%= format_time journal.created_on %></span></td>
<td align="left"><span class="font_lighter"> <%= l :label_comment_time %>：&nbsp; <%= format_time journal.created_on %></span></td>
<td width="200" align="right" class="a"> <% if @user == User.current %>
<%= link_to(l(:label_newfeedback_quote), {:controller => 'words', :action => 'new', :id => user, :journal_id => journal}, :remote => true,

3
config/locales/zh.yml
Unescape View File

@ -1750,4 +1750,5 @@ zh:
label_downloads_list: 进入附件列表
label_join_contest: 参与了竞赛
label_contest_user: 参赛人：
label_contest_reason: 参赛宣言：
label_contest_reason: 参赛宣言：
label_notification: 通知
Write Preview
Loading…
Cancel
Save