functional tests are ok
Oleg
committed Jun 23, 2011
commit ef25b7c512037322902cdd9510cabfa67e472037
Showing 3
changed files with
4 additions
and 4 deletions
app/controllers/cms_content_controller.rb
+1
-1
| @@ | @@ -25,7 +25,7 @@ class CmsContentController < ApplicationController |
| protected | |
| def load_cms_site | |
| - | Cms::Site.find_by_hostname(request.host.downcase) |
| + | @cms_site = Cms::Site.find_by_hostname(request.host.downcase) |
| render :text => 'Site Not Found', :status => 404 if !@cms_site | |
| end | |
app/views/cms_admin/sites/index.html.erb
+1
-1
| @@ | @@ -11,7 +11,7 @@ |
| <%= link_to 'Delete', cms_admin_site_path(site), :method => :delete, :confirm => 'Are you sure?' %> | |
| </div> | |
| <div class='label'> | |
| - | <%= link_to site.label, edit_cms_admin_site_path(site) %> |
| + | <%= link_to site.label, cms_admin_site_pages_path(site) %> |
| <div class='sublabel'> | |
| <%= link_to "http://#{site.hostname}#{site.path}", "http://#{site.hostname}#{site.path}", :target => '_blank' %> | |
| </div> | |
app/views/layouts/cms_admin/_left.html.erb
+2
-2
| @@ | @@ -1,6 +1,6 @@ |
| <ul class='nav'> | |
| - | <li><%= active_link_to 'Sites', cms_admin_sites_path %></li> |
| - | <% if @site.is_a?(Cms::Site) && !@site.new_record? %> |
| + | <li><%= active_link_to 'Sites', cms_admin_sites_path, :active => {:when => :self_only} %></li> |
| + | <% if @site && params[:controller] != 'cms_admin/sites' %> |
| <li><%= active_link_to 'Layouts', cms_admin_site_layouts_path(@site) %></li> | |
| <li><%= active_link_to 'Pages', cms_admin_site_pages_path(@site) %></li> | |
| <li><%= active_link_to 'Snippets', cms_admin_site_snippets_path(@site) %></li> | |