diff --git a/app/assets/javascripts/side_bar_history.js b/app/assets/javascripts/side_bar_history.js index c3c7a486d..036c63d45 100644 --- a/app/assets/javascripts/side_bar_history.js +++ b/app/assets/javascripts/side_bar_history.js @@ -1,5 +1,5 @@ $(function () { - $('#back_sidebar a, #panel_main a.nav').live('click', + $('#back_sidebar a, #back_main a.nav').live('click', function () { $.getScript(this.href); history.pushState(null, document.title, this.href); @@ -8,7 +8,7 @@ $(function () { } ); - $('#panel_main a.reload').live('click', + $('#back_main a.reload').live('click', function () { $.getScript(this.href); history.replaceState(null, document.title, this.href); diff --git a/app/views/admin/items/index.js.erb b/app/views/admin/items/index.js.erb index 652cdfc75..8dc860888 100644 --- a/app/views/admin/items/index.js.erb +++ b/app/views/admin/items/index.js.erb @@ -1,9 +1,9 @@ -$('#panel_main').empty(); +$('#back_main').empty(); switch ("<%= escape_javascript(@item._type)%>") { case 'Link': - $('#panel_main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); + $('#back_main').append("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); break; case 'Page': - $('#panel_main').append("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); + $('#back_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 1580a6d57..efb284188 100644 --- a/app/views/admin/links/create.js.erb +++ b/app/views/admin/links/create.js.erb @@ -1,3 +1,3 @@ $('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); -$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); +$('#back_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/edit.js.erb b/app/views/admin/links/edit.js.erb index 34783329a..083328cce 100644 --- a/app/views/admin/links/edit.js.erb +++ b/app/views/admin/links/edit.js.erb @@ -1 +1 @@ -$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/edit')) %>"); \ No newline at end of file +$('#back_main').html("<%= escape_javascript(render(:partial => 'admin/links/edit')) %>"); \ No newline at end of file diff --git a/app/views/admin/links/new.js.erb b/app/views/admin/links/new.js.erb index 8c60761ae..6914621f4 100644 --- a/app/views/admin/links/new.js.erb +++ b/app/views/admin/links/new.js.erb @@ -1 +1 @@ -$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/new')) %>"); \ No newline at end of file +$('#back_main').html("<%= escape_javascript(render(:partial => 'admin/links/new')) %>"); \ No newline at end of file diff --git a/app/views/admin/links/show.js.erb b/app/views/admin/links/show.js.erb index 6d60d86e9..92676945a 100644 --- a/app/views/admin/links/show.js.erb +++ b/app/views/admin/links/show.js.erb @@ -1 +1 @@ -$('#panel_main').html("<%= escape_javascript(render(:partial => 'show')) %>"); \ No newline at end of file +$('#back_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 e82a6a6bf..be187b0db 100644 --- a/app/views/admin/links/update.js.erb +++ b/app/views/admin/links/update.js.erb @@ -1,2 +1,2 @@ -$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/links/show')) %>"); +$('#back_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.js.erb b/app/views/admin/page_parts/edit.js.erb index 01446ed93..37367ef26 100644 --- a/app/views/admin/page_parts/edit.js.erb +++ b/app/views/admin/page_parts/edit.js.erb @@ -1 +1 @@ -$('#panel_main').html("<%= escape_javascript(render(:partial => @partial)) %>"); \ No newline at end of file +$('#back_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 d41e32870..bc4592e6e 100644 --- a/app/views/admin/page_parts/update.js.erb +++ b/app/views/admin/page_parts/update.js.erb @@ -1,2 +1,2 @@ -$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show' )) %>"); +$('#back_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 52b35e8da..efeb27a1f 100644 --- a/app/views/admin/pages/create.js.erb +++ b/app/views/admin/pages/create.js.erb @@ -1,3 +1,3 @@ $('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); -$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); +$('#back_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/edit.js.erb b/app/views/admin/pages/edit.js.erb index 67d528b56..8c7413099 100644 --- a/app/views/admin/pages/edit.js.erb +++ b/app/views/admin/pages/edit.js.erb @@ -1 +1 @@ -$('#panel_main').html("<%= escape_javascript(render 'edit') %>"); \ No newline at end of file +$('#back_main').html("<%= escape_javascript(render 'edit') %>"); \ 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 58070a22f..cdddb060e 100644 --- a/app/views/admin/pages/new.js.erb +++ b/app/views/admin/pages/new.js.erb @@ -1 +1 @@ -$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/new')) %>"); \ No newline at end of file +$('#back_main').html("<%= escape_javascript(render(:partial => 'admin/pages/new')) %>"); \ 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 6d60d86e9..92676945a 100644 --- a/app/views/admin/pages/show.js.erb +++ b/app/views/admin/pages/show.js.erb @@ -1 +1 @@ -$('#panel_main').html("<%= escape_javascript(render(:partial => 'show')) %>"); \ No newline at end of file +$('#back_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 4fdd43577..26561d07f 100644 --- a/app/views/admin/pages/update.js.erb +++ b/app/views/admin/pages/update.js.erb @@ -1,2 +1,2 @@ -$('#panel_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); +$('#back_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