p49726105
/
bigdir
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1、修改了“加入课程”位置 

2、修改了我的账号里的格式
This commit is contained in:
baiyu 2013-10-15 09:39:42 +08:00
parent 13e7280245
commit 8335c111c7
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/helpers/application_helper.rb
View File

@ -248,6 +248,18 @@ module ApplicationHelper
classes = (ancestors.empty? ? 'root' : 'child')
s << "<li class='project-table'><div class='#{classes}'>"
s << h(block_given? ? yield(project) : project.name)
unless User.current.member_of?(@project)
s << "<span style = 'float: right;'>"
s << watcher_link(@project, User.current)
s << "</span>"
end
if @project.project_type == 1
unless Course.find_by_extra(@project.identifier).tea_id == User.current.id
s << "<span style = 'float: right;'>"
s << join_in_course(@project, User.current)
s << "</span>"
end
end
s << (render :partial => 'projects/project', :locals => {:project => project}).to_s
s << "</div>\n"
ancestors << project

2
app/views/my/account.html.erb
View File

@ -59,7 +59,7 @@
<!-- added by bai 单位-->
<% unless @user.user_extensions.nil?%>
<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%>
<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%>&nbsp;<%= text_field_tag "occupation", @user.user_extensions.occupation, :class => 'occupation'%>
</p>
<%else%>
<p style="width:400px;padding-left: 26px;"><%= l(:field_occupation)%><%= text_field_tag "occupation", nil, :class => 'occupation'%>

10
app/views/projects/_project.html.erb
View File

@ -63,7 +63,7 @@
</div>
<div class="add-info">
<div class="main-language">
<!-- add by huang -->
<!-- added by huang -->
<% if(@project.project_type==1)%>
<%= content_tag('span', "#{l(:field_tea_name)}: ") %>
<% else %>
@ -86,16 +86,16 @@
<%= content_tag('span', "#{l(:label_create_time)}: ") %><%= content_tag('span', format_time(@project.created_on)) %>
</div>
<!-- added by liuping -->
<% unless User.current.member_of?(@project) %>
<!-- del by nyan -->
<!-- <% 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%>
<% unless Course.find_by_extra(@project.identifier).tea_id == User.current.id %>
<%= join_in_course(@project, User.current)%>
<% end %>
<% end %>
<% end %> -->
</span>
</div>