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

在课程列表中添加加入课程按钮

Browse Source 
在课程主页中添加关注按钮，修改加入课程和关注的样式
修改作业列表中提交作业的数量显示问题
exceptionHandle
fanqiang 12 years ago
parent b14f0e2901
commit 7d2bdbc935
4 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File

5
app/views/bids/_bid_show.html.erb
Unescape View File

@ -17,7 +17,10 @@
</tr>
<% unless bid.reward_type == 3 %>
<tr>
<td><span class="font_lighter"><%= l(:label_x_biding_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid) %></strong>)</span><span class="font_lighter"><%= l(:label_x_bids_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span><span class="font_lighter"> <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<strong><%= link_to bid.watcher_users.count, respond_path(bid) %></strong>)</span></td>
<td><span class="font_lighter"><% if bid.homework_type == 1%>
<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<strong><%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %></strong>)
<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)<% end %>
</span><span class="font_lighter"><%= l(:label_x_bids_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span><span class="font_lighter"> <%= l(:label_x_followers, :count => bid.watcher_users.count) %>(<strong><%= link_to bid.watcher_users.count, respond_path(bid) %></strong>)</span></td>
</tr>
<% else %>
<tr>

13
app/views/layouts/base_courses.html.erb
Unescape View File

@ -52,8 +52,17 @@
<div class="info_font" style=" word-wrap: break-word; word-break: break-all">
<%= @project.name %>
</div> <% unless @course.teacher.id == User.current.id%>
<%= join_in_course(@project, User.current)%>
<% end %> </td>
<!-- <%= image_tag "/images/sidebar/add.png" %>
<%= image_tag "/images/add.png" %> -->
<div class="icon-add icon" style="margin-right: 30px; margin-left: 20px">
<%= join_in_course(@project, User.current)%></div>
<% end %>
<% unless User.current.member_of?(@project) %>
<!-- <%= image_tag "/images/fav.png" %> -->
<div class="icon-fav icon" style="margin-right: 30px; margin-left: 20px">
<%= watcher_link(@project, User.current) %></div>
<% end %></td>
</tr>
</table>
</div>

20
app/views/projects/_project.html.erb
Unescape View File

@ -2,11 +2,11 @@
<div class="project-block">
<div class="img-tag">
<% if(@project.project_type==1)%>
<% if get_avatar?(project)%>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %>
<% else %>
<%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(project)%>
<% end %>
<% if get_avatar?(project)%>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %>
<% else %>
<%= link_to image_tag('../images/avatars/Project/course.jpg', :class => "avatar2"), project_path(project)%>
<% end %>
<% else %>
<%= link_to image_tag(url_to_avatar(project), :class => "avatar2"), project_path(project) %>
</div>
@ -56,6 +56,7 @@
<% end %>
<%= content_tag('span', files_count, :class => "info") %><%= content_tag('span', l(:label_x_data)) %>
</p>
</div>
<% end %>
@ -72,7 +73,7 @@
<!-- <%= content_tag('span', "#{l(:default_role_manager)}: ") %> -->
<% @admin = @project.project_infos%>
<% if @admin.size > 0 %>
<%= content_tag('a', @admin.collect{|u| link_to(u.user.name, user_path(u.user_id))}.join(", ").html_safe) %>
<%= content_tag('a', @admin.collect{|u| link_to(u.user.lastname+u.user.firstname, user_path(u.user_id))}.join(", ").html_safe) %>
<% end %>
<% if(@project.project_type==1)%>
&nbsp;&nbsp;&nbsp;大学：
@ -86,6 +87,13 @@
<% unless User.current.member_of?(@project) %>
<%= watcher_link(@project, User.current) %>
<% end %>
<span style="float: right; margin-right: 100px">
<% if @project.project_type == 1 %>
<% unless Course.find_by_extra(@project.identifier).tea_id == User.current.id%>
<%= join_in_course(@project, User.current)%>
<% end %>
<% end %>
</span>
</div>
<div class="tags">

6
app/views/users/_my_homework.html.erb
Unescape View File

@ -23,7 +23,11 @@
<td> <% if bid.reward_type.nil? or bid.reward_type == 1 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #ed8924;font-family: 14px; font-family: 微软雅黑"><%= l(:label_call_bonus) %>&nbsp;<%= l(:label_RMB_sign) %><%= bid.budget%></span></strong> <% elsif bid.reward_type == 2 %> <strong><%= l(:label_bids_reward_method) %><span style="color: #15bccf;font-family: 14px; font-family: 微软雅黑"><%= bid.budget%></span></strong> <% else %> <!-- <strong><%= l(:label_bids_reward_method) %><span style="color: #00aa83;font-family: 14px; font-family: 微软雅黑"><%= l(:label_bids_credit) %>&nbsp;<%= bid.budget%>&nbsp;<%= l(:label_bids_credit_number) %></span></strong> --> <% end %> <!-- <td style="color: rgb(255, 0, 0);"><strong><%= l(:label_price) %><%= l(:label_RMB_sign) %><%= bid.budget%></strong></td> --></td>
</tr>
<tr>
<td><span class="font_lighter"><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)</span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span></td>
<td><span class="font_lighter">
<% if bid.homework_type == 1%>
<%= l(:label_x_homework_project, :count => bid.homeworks.count) %>(<strong><%= link_to bid.homeworks.count, project_for_bid_path(bid.id) %></strong>)
<% else %><%= l(:label_x_homework_project, :count => bid.biding_projects.count) %>(<strong><%= link_to bid.biding_projects.count, project_for_bid_path(bid.id) %></strong>)<% end %>
</span><span class="font_lighter"><%= l(:label_x_responses, :count => bid.commit) %>(<strong><%= link_to bid.commit, respond_path(bid) %></strong>)</span></td>
</tr>
</table></td>
<td width="200" align="right" class="a"><span class="font_lighter"> <%= format_time bid.created_on %></span></td>

Write Preview
Loading…
Cancel
Save