diff --git a/app/views/layouts/application.rhtml b/app/views/layouts/application.rhtml index d759c19..ccec0dc 100644 --- a/app/views/layouts/application.rhtml +++ b/app/views/layouts/application.rhtml @@ -3,6 +3,7 @@ <%= javascript_include_tag 'prototype' %> + <%= javascript_include_tag 'sweetTitles' %> <%= javascript_include_tag 'tiny_mce/tiny_mce.js' %> <%= javascript_include_tag 'scriptaculous' %> <%= javascript_include_tag 'dragdrop' %> @@ -61,11 +62,17 @@
+ + @@ -74,35 +81,29 @@ prepareMenu('navigation_bar', { timeout: 50 }); - - - - +
<% if @category %> -
<%= @category.full_name %> -
+ <% else @category %> +
+ <%= header %> +
<% end %> +
+
- + <% if params[:controller] == 'cms' %> -
+
<%= yield %>
<% else %> @@ -110,12 +111,16 @@ <% end %>
+ + +
+ -
- diff --git a/app/views/shared/categories_menu.rhtml b/app/views/shared/categories_menu.rhtml index 8e3a4e2..4b202d9 100644 --- a/app/views/shared/categories_menu.rhtml +++ b/app/views/shared/categories_menu.rhtml @@ -1,6 +1,9 @@