5 files changed, 0 insertions, 24 deletions

diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
index c23cec04..13bbfd56 100644
--- a/app/controllers/admin_controller.rb
+++ b/app/controllers/admin_controller.rb
@@ -12,10 +12,6 @@ class AdminController < ApplicationController
     @actions = NodeAction.order(:occurred_at => :desc, :id => :desc).limit(5)
   end
 
-  def conventions
-    @node_kinds = CccConventions::NODE_KINDS
-  end
-
   def search
     @results = Node.editor_search(params[:search_term])
 
diff --git a/app/views/admin/conventions.html.erb b/app/views/admin/conventions.html.erb
deleted file mode 100644
index 434c2e9c..00000000
--- a/app/views/admin/conventions.html.erb
+++ /dev/null
@@ -1,11 +0,0 @@
-<h1><%= t(".title") %></h1>
-
-<table id="conventions">
-  <tr><th><%= t(".kind") %></th><th><%= t(".what_happens") %></th></tr>
-  <% @node_kinds.each do |kind, config| %>
-    <tr>
-      <td><%= kind %></td>
-      <td><%= resolve_kind_text(config[:label]) %> — <%= resolve_kind_text(config[:hint]) %></td>
-    </tr>
-  <% end %>
-</table>
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 1bab646b..4e19bcc1 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -398,10 +398,6 @@ de:
       housekeeping: "Verwaltung"
       my_account: "Mein Konto"
       navigation: "Navigation"
-    conventions:
-      title: "Konventionen beim Anlegen von Nodes"
-      kind: "Art"
-      what_happens: "Was passiert"
     search_results:
       title: "Suchergebnisse"
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2acbe98f..83373bcd 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -351,10 +351,6 @@ en:
       housekeeping: "Housekeeping"
       my_account: "My account"
       navigation: "Navigation"
-    conventions:
-      title: "Node creation conventions"
-      kind: "Kind"
-      what_happens: "What happens"
     search_results:
       title: "Search Results"
   nodes:
diff --git a/config/routes.rb b/config/routes.rb
index e123a3fe..b7cbbc4c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -102,7 +102,6 @@ Cccms::Application.routes.draw do
       match ''                 => 'admin#index',            :as => :admin,                  :via => :get
       match 'search'           => 'admin#search',           :as => :admin_search,           :via => :get
       match 'menu_search'      => 'admin#menu_search',      :as => :admin_menu_search,      :via => :get
-      match 'conventions'      => 'admin#conventions',      :as => :admin_conventions,      :via => :get
       match 'dashboard_search' => 'admin#dashboard_search', :as => :admin_dashboard_search, :via => :get
       match 'log'              => 'node_actions#index',     :as => :admin_log,              :via => :get
       match 'boom'             => 'admin#boom',             :as => :admin_boom,             :via => :get