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

topics未登录footer飞出去的问题，擦屁股+10086,dom结构还有错，找不到崩溃

This commit is contained in:
yanxd 2014-04-11 16:44:02 +08:00
parent 96fcdbacf2
commit 28a5eff048
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td style="padding-left: 8px"><a><%=link_to request.host()+"/course", :controller => 'projects', :action => 'course' %></a></td> <td style="padding-left: 8px"><%=link_to request.host()+"/course", :controller => 'projects', :action => 'course' %></td>
<td><p class="top-content-list"><%=link_to "主页", home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course' %> > <%=link_to @project.name, nil %></p></td> <td><p class="top-content-list"><%=link_to "主页", home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course' %> > <%=link_to @project.name, nil %></p></td>
</tr> </tr>
</table> </table>
@ -79,8 +79,8 @@
<%= render :partial => 'courses/set_course_time', :locals => {:project => @project}%> <%= render :partial => 'courses/set_course_time', :locals => {:project => @project}%>
<% else %> <% else %>
<%= join_in_course(@project, User.current) %></div> <%= join_in_course(@project, User.current) %>
<% end %> </div> <% end %>
<% unless User.current.member_of?(@project) %> <% unless User.current.member_of?(@project) %>
<!-- <%= image_tag "/images/fav.png" %> --> <!-- <%= image_tag "/images/fav.png" %> -->
<div style="padding-right: 10px"> <div style="padding-right: 10px">
@ -88,7 +88,7 @@
<%= watcher_link(@project, User.current) %></span></div> <%= watcher_link(@project, User.current) %></span></div>
<% end %> <% end %>
<% end %> <% end %>
</div>
</td></tr></table> </td></tr></table>
</td> </td>
</tr> </tr>
@ -233,8 +233,8 @@
<!-- <li><%= link_to(l(:label_course_repository), {:controller => 'repositories', :action => 'show', :id => @project, :repository_id => nil, :path => nil, :rev => nil, :course => 1 })%></li> --> <!-- <li><%= link_to(l(:label_course_repository), {:controller => 'repositories', :action => 'show', :id => @project, :repository_id => nil, :path => nil, :rev => nil, :course => 1 })%></li> -->
<% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 7, 9)).size >0))%> <% if User.current.logged? && (User.current.admin? || (!Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.nil? && (Member.where('user_id = ? and project_id = ?', User.current.id, @project.id).first.roles&Role.where('id = ? or id = ?', 7, 9)).size >0))%>
</ul>
<% end %> <% end %>
</ul>
</div> </div>
<%= render_flash_messages %> <%= render_flash_messages %>
<%= yield %> <%= yield %>

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

@ -104,7 +104,7 @@
<div style="float: right"><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></div> <div style="float: right"><%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %></div>
</div> </div>
<% if !@topic.locked? && authorize_for('messages', 'reply') %>
@ -172,7 +172,7 @@
<% if !@topic.locked? && authorize_for('messages', 'reply') %>
<div id="reply" style="display:none;"> <div id="reply" style="display:none;">
<%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %> <%= form_for @reply, :as => :reply, :url => {:action => 'reply', :id => @topic}, :html => {:multipart => true, :id => 'message-form'} do |f| %>
<%= render :partial => 'form', :locals => {:f => f, :replying => true} %> <%= render :partial => 'form', :locals => {:f => f, :replying => true} %>