diff --git a/app/controllers/admin/links_controller.rb b/app/controllers/admin/links_controller.rb index 20a7d766..9813c560 100644 --- a/app/controllers/admin/links_controller.rb +++ b/app/controllers/admin/links_controller.rb @@ -1,9 +1,5 @@ class Admin::LinksController < Admin::ItemsController - def show - @item ||= Link.find(params[:id]) - end - def new @item = Link.new @item.parent = Page.find(params[:parent_id]) rescue nil diff --git a/app/helpers/admin/items_helper.rb b/app/helpers/admin/items_helper.rb index 2d760294..da1ecf19 100644 --- a/app/helpers/admin/items_helper.rb +++ b/app/helpers/admin/items_helper.rb @@ -1,45 +1,4 @@ module Admin::ItemsHelper - - def render_node_and_children(node) - ret = '' - if node - case node.class.to_s - when 'Page' - dest = admin_page_path(node) - when 'Link' - dest = admin_link_path(node) - no_nested = 'no-nest' - end - ret << "
- <%= submit_tag t(:delete_) %> - <%= link_back %> -
-<% end %> \ No newline at end of file diff --git a/app/views/admin/links/delete.js.erb b/app/views/admin/links/delete.js.erb deleted file mode 100644 index 8ea2a642..00000000 --- a/app/views/admin/links/delete.js.erb +++ /dev/null @@ -1,3 +0,0 @@ -$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); -$('#back_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); -history.pushState(null, document.title, "<%= escape_javascript(admin_items_url) %>"); \ No newline at end of file diff --git a/app/views/admin/links/show.html.erb b/app/views/admin/links/show.html.erb deleted file mode 100644 index 28c1ecfd..00000000 --- a/app/views/admin/links/show.html.erb +++ /dev/null @@ -1,5 +0,0 @@ -<% 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 deleted file mode 100644 index 92676945..00000000 --- a/app/views/admin/links/show.js.erb +++ /dev/null @@ -1 +0,0 @@ -$('#back_main').html("<%= escape_javascript(render(:partial => 'show')) %>"); \ 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 00c2ba90..edad4233 100644 --- a/app/views/admin/pages/_show.html.erb +++ b/app/views/admin/pages/_show.html.erb @@ -1,7 +1 @@ -<%#= flash_messages %> - - -<%#= page_stylesheets(@item, true).html_safe %> -<%#= page_javascripts(@item, true).html_safe %> - <%= parse_page_edit_noko(@item).html_safe %> \ No newline at end of file diff --git a/app/views/admin/pages/delete.html.erb b/app/views/admin/pages/delete.html.erb deleted file mode 100644 index 9c58189e..00000000 --- a/app/views/admin/pages/delete.html.erb +++ /dev/null @@ -1,7 +0,0 @@ -<% form_for :page, :url => admin_page_path(@item), :html => { :method => :delete } do |f| %> -- <%= submit_tag t(:delete_) %> - <%= link_back %> -
-<% end %> \ No newline at end of file diff --git a/app/views/admin/pages/delete.js.erb b/app/views/admin/pages/delete.js.erb deleted file mode 100644 index 8ea2a642..00000000 --- a/app/views/admin/pages/delete.js.erb +++ /dev/null @@ -1,3 +0,0 @@ -$('#back_sidebar').html("<%= escape_javascript(render(:partial => 'admin/items/site_map_left_bar')) %>"); -$('#back_main').html("<%= escape_javascript(render(:partial => 'admin/pages/show')) %>"); -history.pushState(null, document.title, "<%= escape_javascript(admin_items_url) %>"); \ No newline at end of file diff --git a/app/views/admin/pages/show.js.erb b/app/views/admin/pages/show.js.erb deleted file mode 100644 index 92676945..00000000 --- a/app/views/admin/pages/show.js.erb +++ /dev/null @@ -1 +0,0 @@ -$('#back_main').html("<%= escape_javascript(render(:partial => 'show')) %>"); \ No newline at end of file