Merge branch 'ntu' of github.com:Rulingcom/orbit into ntu

This commit is contained in:
Fu Matthew committed 2012-12-28 15:31:32 +08:00
commit 5587e83419
17 files changed
+317 -50

No files matched your search

+1 -1
View File
@@ -14,4 +14,4 @@
<p>
<%= f.submit t(:update_) %> <%= link_back %>
</p>
<% end %>
<% end %>
+1 -1
View File
@@ -1,7 +1,7 @@
<% if @menu_page && @menu_page.visible_children.size > 0 %>
<div class='category_list'>
<h3 class='h3'><%= @menu_page.title %></h3>
<ul class='list'>"
<ul class='list'>
<% @menu_page.visible_children.each do |child| %>
<li class="<%= @page_id.eql?(child.id) ? 'active' : nil %>">
<a href="<%= (child.class.to_s.eql?('Page') ? '/' + child.path : child.url) %>"><%= child.title %></a>