diff --git a/app/helpers/admin/item_helper.rb b/app/helpers/admin/item_helper.rb index 98dae9289..7994cb250 100644 --- a/app/helpers/admin/item_helper.rb +++ b/app/helpers/admin/item_helper.rb @@ -9,14 +9,16 @@ module Admin::ItemHelper when 'Link' dest = admin_link_path(node) end + ret << "" end ret.html_safe end diff --git a/app/views/admin/items/index.html.erb b/app/views/admin/items/index.html.erb index 44c814eda..6e224aa65 100644 --- a/app/views/admin/items/index.html.erb +++ b/app/views/admin/items/index.html.erb @@ -1,5 +1,5 @@ <% content_for :sidebar do %> - + <%= render 'admin/items/site_map_left_bar' %> <% end -%> <% content_for :page_specific_javascript do %> diff --git a/app/views/admin/items/index.js.erb b/app/views/admin/items/index.js.erb index ae1f73899..652cdfc75 100644 --- a/app/views/admin/items/index.js.erb +++ b/app/views/admin/items/index.js.erb @@ -1,9 +1,9 @@ -$('#main').empty(); +$('#panel_main').empty(); switch ("<%= escape_javascript(@item._type)%>") { case 'Link': - $('#main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); + $('#panel_main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); break; case 'Page': - $('#main').append("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); + $('#panel_main').append("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); break; }; \ No newline at end of file diff --git a/app/views/admin/links/create.js.erb b/app/views/admin/links/create.js.erb index 1679d64c0..67f6cc13d 100644 --- a/app/views/admin/links/create.js.erb +++ b/app/views/admin/links/create.js.erb @@ -1,3 +1,3 @@ -$('#sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); -$('#main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); +$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); +$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); history.pushState(null, document.title, "<%= escape_javascript(admin_link_url(@item)) %>"); \ No newline at end of file diff --git a/app/views/admin/links/delete.js.erb b/app/views/admin/links/delete.js.erb index d8771a3cc..e17801e6f 100644 --- a/app/views/admin/links/delete.js.erb +++ b/app/views/admin/links/delete.js.erb @@ -1 +1 @@ -$('#sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); \ No newline at end of file +$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); \ No newline at end of file diff --git a/app/views/admin/links/edit.html.erb b/app/views/admin/links/edit.html.erb index 7729178c2..1b5fb6b56 100644 --- a/app/views/admin/links/edit.html.erb +++ b/app/views/admin/links/edit.html.erb @@ -1,5 +1,5 @@ <% content_for :sidebar do %> - + <%= render 'admin/items/site_map_left_bar' %> <% end -%> <%= render 'edit' %> diff --git a/app/views/admin/links/edit.js.erb b/app/views/admin/links/edit.js.erb index b1292081a..34783329a 100644 --- a/app/views/admin/links/edit.js.erb +++ b/app/views/admin/links/edit.js.erb @@ -1 +1 @@ -$('#main').html("<%= escape_javascript(render(:partial => 'admin/links/edit')) %>"); \ No newline at end of file +$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/edit')) %>"); \ No newline at end of file diff --git a/app/views/admin/links/new.html.erb b/app/views/admin/links/new.html.erb index 7d7142b51..afb9580e7 100644 --- a/app/views/admin/links/new.html.erb +++ b/app/views/admin/links/new.html.erb @@ -1,5 +1,5 @@ <% content_for :sidebar do %> - + <%= render 'admin/items/site_map_left_bar' %> <% end -%> <%= render 'new' %> diff --git a/app/views/admin/links/new.js.erb b/app/views/admin/links/new.js.erb index fb85026e2..8c60761ae 100644 --- a/app/views/admin/links/new.js.erb +++ b/app/views/admin/links/new.js.erb @@ -1 +1 @@ -$('#main').html("<%= escape_javascript(render(:partial => 'admin/links/new')) %>"); \ No newline at end of file +$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/new')) %>"); \ No newline at end of file diff --git a/app/views/admin/links/show.html.erb b/app/views/admin/links/show.html.erb index bf733a474..28c1ecfda 100644 --- a/app/views/admin/links/show.html.erb +++ b/app/views/admin/links/show.html.erb @@ -1,5 +1,5 @@ <% content_for :sidebar do %> - + <%= render 'admin/items/site_map_left_bar' %> <% end -%> <%= render 'show' %> diff --git a/app/views/admin/links/show.js.erb b/app/views/admin/links/show.js.erb index f9411af54..6d60d86e9 100644 --- a/app/views/admin/links/show.js.erb +++ b/app/views/admin/links/show.js.erb @@ -1 +1 @@ -$('#main').html("<%= escape_javascript(render(:partial => 'show')) %>"); \ No newline at end of file +$('#panel_main').html("<%= escape_javascript(render(:partial => 'show')) %>"); \ No newline at end of file diff --git a/app/views/admin/links/update.js.erb b/app/views/admin/links/update.js.erb index 3b56ddb19..e82a6a6bf 100644 --- a/app/views/admin/links/update.js.erb +++ b/app/views/admin/links/update.js.erb @@ -1,2 +1,2 @@ -$('#main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); +$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); history.pushState(null, document.title, "<%= escape_javascript(admin_link_url(@item)) %>"); \ No newline at end of file diff --git a/app/views/admin/page_parts/edit.html.erb b/app/views/admin/page_parts/edit.html.erb index 9a962fdc9..a03e7ca61 100644 --- a/app/views/admin/page_parts/edit.html.erb +++ b/app/views/admin/page_parts/edit.html.erb @@ -1,5 +1,5 @@ <% content_for :sidebar do %> - + <%= render 'admin/items/site_map_left_bar' %> <% end -%> <%= render @partial %> \ No newline at end of file diff --git a/app/views/admin/page_parts/edit.js.erb b/app/views/admin/page_parts/edit.js.erb index e073cd8a0..01446ed93 100644 --- a/app/views/admin/page_parts/edit.js.erb +++ b/app/views/admin/page_parts/edit.js.erb @@ -1 +1 @@ -$('#main').html("<%= escape_javascript(render(:partial => @partial)) %>"); \ No newline at end of file +$('#panel_main').html("<%= escape_javascript(render(:partial => @partial)) %>"); \ No newline at end of file diff --git a/app/views/admin/page_parts/update.js.erb b/app/views/admin/page_parts/update.js.erb index eec63a321..d41e32870 100644 --- a/app/views/admin/page_parts/update.js.erb +++ b/app/views/admin/page_parts/update.js.erb @@ -1,2 +1,2 @@ -$('#main').html("<%= escape_javascript(render(:partial => 'admin/pages/show' )) %>"); +$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show' )) %>"); history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>"); \ No newline at end of file diff --git a/app/views/admin/pages/create.js.erb b/app/views/admin/pages/create.js.erb index 9c4b31c7c..ef5f78795 100644 --- a/app/views/admin/pages/create.js.erb +++ b/app/views/admin/pages/create.js.erb @@ -1,3 +1,3 @@ -$('#sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); -$('#main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); +$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); +$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>"); \ No newline at end of file diff --git a/app/views/admin/pages/delete.js.erb b/app/views/admin/pages/delete.js.erb index d8771a3cc..e17801e6f 100644 --- a/app/views/admin/pages/delete.js.erb +++ b/app/views/admin/pages/delete.js.erb @@ -1 +1 @@ -$('#sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); \ No newline at end of file +$('#panel_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); \ No newline at end of file diff --git a/app/views/admin/pages/edit.html.erb b/app/views/admin/pages/edit.html.erb index 6ef5beb13..b4bfc6077 100644 --- a/app/views/admin/pages/edit.html.erb +++ b/app/views/admin/pages/edit.html.erb @@ -1,3 +1,7 @@ +<% content_for :sidebar do %> + <%= render 'admin/items/site_map_left_bar' %> +<% end -%> +

<%= t('admin.editing_page') %>

<%= form_for @item, :url => admin_page_path(@item) do |f| %> diff --git a/app/views/admin/pages/edit.js.erb b/app/views/admin/pages/edit.js.erb index c0761ed6f..9c61245e6 100644 --- a/app/views/admin/pages/edit.js.erb +++ b/app/views/admin/pages/edit.js.erb @@ -1 +1 @@ -$('#main').html("<%= escape_javascript(render(:partial => @code ? 'edit_code' : 'edit')) %>"); \ No newline at end of file +$('#panel_main').html("<%= escape_javascript(render(:partial => @code ? 'edit_code' : 'edit')) %>"); \ No newline at end of file diff --git a/app/views/admin/pages/new.html.erb b/app/views/admin/pages/new.html.erb index cf930b917..f4b7c9068 100644 --- a/app/views/admin/pages/new.html.erb +++ b/app/views/admin/pages/new.html.erb @@ -1,5 +1,5 @@ <% content_for :sidebar do %> - + <%= render 'admin/items/site_map_left_bar' %> <% end -%> <%= render 'new' %> \ No newline at end of file diff --git a/app/views/admin/pages/new.js.erb b/app/views/admin/pages/new.js.erb index 7dd4e0489..58070a22f 100644 --- a/app/views/admin/pages/new.js.erb +++ b/app/views/admin/pages/new.js.erb @@ -1 +1 @@ -$('#main').html("<%= escape_javascript(render(:partial => 'admin/pages/new')) %>"); \ No newline at end of file +$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/new')) %>"); \ No newline at end of file diff --git a/app/views/admin/pages/show.html.erb b/app/views/admin/pages/show.html.erb index 5371ccde2..6dd0f9230 100644 --- a/app/views/admin/pages/show.html.erb +++ b/app/views/admin/pages/show.html.erb @@ -1 +1,5 @@ +<% content_for :sidebar do %> + <%= render 'admin/items/site_map_left_bar' %> +<% end -%> + <%= render @code ? 'show_code' : 'show' %> \ No newline at end of file diff --git a/app/views/admin/pages/show.js.erb b/app/views/admin/pages/show.js.erb index f9411af54..6d60d86e9 100644 --- a/app/views/admin/pages/show.js.erb +++ b/app/views/admin/pages/show.js.erb @@ -1 +1 @@ -$('#main').html("<%= escape_javascript(render(:partial => 'show')) %>"); \ No newline at end of file +$('#panel_main').html("<%= escape_javascript(render(:partial => 'show')) %>"); \ No newline at end of file diff --git a/app/views/admin/pages/update.js.erb b/app/views/admin/pages/update.js.erb index 6c6a1630e..4fdd43577 100644 --- a/app/views/admin/pages/update.js.erb +++ b/app/views/admin/pages/update.js.erb @@ -1,2 +1,2 @@ -$('#main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); +$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); history.pushState(null, document.title, "<%= escape_javascript(admin_page_url(@item)) %>"); \ No newline at end of file diff --git a/app/views/layouts/content.html.erb b/app/views/layouts/content.html.erb index c69eb22aa..8b4d3a13b 100644 --- a/app/views/layouts/content.html.erb +++ b/app/views/layouts/content.html.erb @@ -5,8 +5,7 @@ <%= @title || 'R4 rescue title' %> <%= yield :page_specific_link %> - <%= stylesheet_link_tag "easy", "main", "devise", "content", :media => "screen, projection" %> - <%= stylesheet_link_tag "easyprint", :media => "print" %> + <%= stylesheet_link_tag "content", :media => "screen, projection" %> <%= javascript_include_tag :ckeditor %> <%= javascript_include_tag "jquery", "jquery-ui", "rails", "easy", "application", :cache => 'all' %> @@ -18,8 +17,8 @@ <%= csrf_meta_tag %> -