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

Merge remote-tracking branch 'remotes/origin/szzh' into develop

This commit is contained in:
nwb 2014-07-03 16:17:01 +08:00
parent 41ff47b839 9f7951a22c
commit a03cdf272e
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,11 +60,6 @@
<% end -%> <% end -%>
<div class="pagination">
<ul>
<%= pagination_links_full @events_pages %>
</ul>
</div>
</div> </div>
<% end %> <% end %>
@ -98,4 +93,11 @@
</div> </div>
<div class="pagination">
<ul>
<%= pagination_links_full @events_pages %>
</ul>
</div>

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

@ -51,12 +51,7 @@
<% end -%> <% end -%>
<div class="pagination">
<ul>
<%= pagination_links_full @events_pages%>
</ul>
</div>
</div> </div>
<%end%> <%end%>
@ -88,3 +83,10 @@
<div class="pagination">
<ul>
<%= pagination_links_full @events_pages%>
</ul>
</div>