enju_subject 0.1.0.pre13 → 0.1.0.pre14

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130504143515) do
+ActiveRecord::Schema.define(:version => 20130504195916) do
 
   create_table "accepts", :force => true do |t|
     t.integer  "basket_id"
@@ -734,16 +734,6 @@ ActiveRecord::Schema.define(:version => 20130504143515) do
 
   add_index "shelves", ["library_id"], :name => "index_shelves_on_library_id"
 
-  create_table "subject_heading_type_has_subjects", :force => true do |t|
-    t.integer  "subject_id",              :null => false
-    t.string   "subject_type"
-    t.integer  "subject_heading_type_id", :null => false
-    t.datetime "created_at",              :null => false
-    t.datetime "updated_at",              :null => false
-  end
-
-  add_index "subject_heading_type_has_subjects", ["subject_id"], :name => "index_subject_heading_type_has_subjects_on_subject_id"
-
   create_table "subject_heading_types", :force => true do |t|
     t.string   "name",         :null => false
     t.text     "display_name"
@@ -767,16 +757,17 @@ ActiveRecord::Schema.define(:version => 20130504143515) do
     t.integer  "use_term_id"
     t.string   "term"
     t.text     "term_transcription"
-    t.integer  "subject_type_id",                   :null => false
+    t.integer  "subject_type_id",                        :null => false
     t.text     "scope_note"
     t.text     "note"
-    t.integer  "required_role_id",   :default => 1, :null => false
-    t.integer  "lock_version",       :default => 0, :null => false
+    t.integer  "required_role_id",        :default => 1, :null => false
+    t.integer  "lock_version",            :default => 0, :null => false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "deleted_at"
     t.string   "url"
     t.integer  "manifestation_id"
+    t.integer  "subject_heading_type_id"
   end
 
   add_index "subjects", ["manifestation_id"], :name => "index_subjects_on_manifestation_id"
@@ -874,16 +865,4 @@ ActiveRecord::Schema.define(:version => 20130504143515) do
 
   add_index "versions", ["item_type", "item_id"], :name => "index_versions_on_item_type_and_item_id"
 
-  create_table "work_has_subjects", :force => true do |t|
-    t.integer  "subject_id"
-    t.string   "subject_type"
-    t.integer  "work_id"
-    t.integer  "position"
-    t.datetime "created_at",   :null => false
-    t.datetime "updated_at",   :null => false
-  end
-
-  add_index "work_has_subjects", ["subject_id"], :name => "index_work_has_subjects_on_subject_id"
-  add_index "work_has_subjects", ["work_id"], :name => "index_work_has_subjects_on_work_id"
-
 end

data/spec/fixtures/subjects.yml

@@ -10,6 +10,7 @@ subject_00001:
   parent_id: 
   created_at: 2008-03-01 17:53:06.118389 +09:00
   manifestation_id: 1
+  subject_heading_type_id: 1
 subject_00002: 
   updated_at: 2008-03-02 03:19:57.946759 +09:00
   term: test2
@@ -20,6 +21,7 @@ subject_00002:
   note: 
   parent_id: 
   created_at: 2008-03-01 17:50:34.658349 +09:00
+  subject_heading_type_id: 1
 subject_00003: 
   updated_at: 2008-03-02 03:19:58.048475 +09:00
   term: test3
@@ -30,6 +32,7 @@ subject_00003:
   note: 
   parent_id: 
   created_at: 2008-03-01 17:51:39.448430 +09:00
+  subject_heading_type_id: 2
 subject_00004: 
   updated_at: 2008-03-02 03:19:58.048475 +09:00
   term: test4
@@ -40,6 +43,7 @@ subject_00004:
   note: 
   parent_id: 
   created_at: 2008-03-01 17:51:39.448430 +09:00
+  subject_heading_type_id: 2
 subject_00005: 
   updated_at: 2008-03-02 03:19:58.048475 +09:00
   term: test5
@@ -50,6 +54,7 @@ subject_00005:
   note: 
   parent_id: 
   created_at: 2008-03-01 17:51:39.448430 +09:00
+  subject_heading_type_id: 2
 
 # == Schema Information
 #

data/spec/routing/subjects_routing_spec.rb

@@ -7,10 +7,6 @@ describe SubjectsController do
       { :get => "/subjects" }.should route_to(:controller => "subjects", :action => "index")
     end
 
-    it "recognizes and generates #index" do
-      { :get => "/works/1/subjects" }.should route_to(:controller => "subjects", :action => "index", :work_id => "1")
-    end
-
     it "recognizes and generates #new" do
       { :get => "/subjects/new" }.should route_to(:controller => "subjects", :action => "new")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: enju_subject
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre13
+  version: 0.1.0.pre14
 platform: ruby
 authors:
 - Kosuke Tanabe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: enju_core
@@ -114,28 +114,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre36
+        version: 0.1.0.pre37
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre36
+        version: 0.1.0.pre37
 - !ruby/object:Gem::Dependency
   name: enju_library
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre21
+        version: 0.1.0.pre22
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre21
+        version: 0.1.0.pre22
 - !ruby/object:Gem::Dependency
   name: sunspot_solr
   requirement: !ruby/object:Gem::Requirement
@@ -173,20 +173,16 @@ extra_rdoc_files: []
 files:
 - app/controllers/classification_types_controller.rb
 - app/controllers/classifications_controller.rb
-- app/controllers/subject_heading_type_has_subjects_controller.rb
 - app/controllers/subject_heading_types_controller.rb
 - app/controllers/subject_types_controller.rb
 - app/controllers/subjects_controller.rb
-- app/controllers/work_has_subjects_controller.rb
 - app/models/classification.rb
 - app/models/classification_type.rb
 - app/models/enju_subject/ability.rb
 - app/models/subject.rb
 - app/models/subject_heading_type.rb
-- app/models/subject_heading_type_has_subject.rb
 - app/models/subject_sweeper.rb
 - app/models/subject_type.rb
-- app/models/work_has_subject.rb
 - app/views/classification_types/_form.html.erb
 - app/views/classification_types/edit.html.erb
 - app/views/classification_types/index.html.erb
@@ -215,21 +211,12 @@ files:
 - app/views/subject_types/new.html.erb
 - app/views/subject_types/show.html.erb
 - app/views/subjects/_form.html.erb
-- app/views/subjects/_index.html.erb
-- app/views/subjects/_index_work.html.erb
-- app/views/subjects/_show_work_list.html.erb
 - app/views/subjects/edit.html.erb
 - app/views/subjects/index.atom.builder
 - app/views/subjects/index.html.erb
 - app/views/subjects/index.rss.builder
 - app/views/subjects/new.html.erb
 - app/views/subjects/show.html.erb
-- app/views/subjects/show.js.erb
-- app/views/work_has_subjects/_form.html.erb
-- app/views/work_has_subjects/edit.html.erb
-- app/views/work_has_subjects/index.html.erb
-- app/views/work_has_subjects/new.html.erb
-- app/views/work_has_subjects/show.html.erb
 - config/locales/translation_en.yml
 - config/locales/translation_ja.yml
 - config/routes.rb
@@ -240,12 +227,11 @@ files:
 - db/migrate/144_create_classification_types.rb
 - db/migrate/145_create_subject_heading_types.rb
 - db/migrate/146_create_subject_types.rb
-- db/migrate/20080606052544_create_work_has_subjects.rb
-- db/migrate/20090208044541_create_subject_heading_type_has_subjects.rb
 - db/migrate/20110913120629_add_lft_and_rgt_to_classification.rb
 - db/migrate/20120406020752_add_url_to_subject.rb
 - db/migrate/20130504133816_add_manifestation_id_to_subject.rb
 - db/migrate/20130504143515_add_manifestation_id_to_classification.rb
+- db/migrate/20130504195916_add_subject_heading_type_id_to_subject.rb
 - lib/enju_subject/engine.rb
 - lib/enju_subject/expire_editable_fragment.rb
 - lib/enju_subject/manifestation.rb
@@ -255,6 +241,7 @@ files:
 - lib/enju_subject.rb
 - lib/generators/enju_subject/setup/setup_generator.rb
 - lib/generators/enju_subject/setup/templates/db/fixtures/classification_types.yml
+- lib/generators/enju_subject/setup/templates/db/fixtures/subject_heading_types.yml
 - lib/generators/enju_subject/setup/templates/db/fixtures/subject_types.yml
 - lib/generators/enju_subject/setup/USAGE
 - lib/tasks/enju_subject_tasks.rake
@@ -263,11 +250,9 @@ files:
 - README.rdoc
 - spec/controllers/classification_types_controller_spec.rb
 - spec/controllers/classifications_controller_spec.rb
-- spec/controllers/subject_heading_type_has_subjects_controller_spec.rb
 - spec/controllers/subject_heading_types_controller_spec.rb
 - spec/controllers/subject_types_controller_spec.rb
 - spec/controllers/subjects_controller_spec.rb
-- spec/controllers/work_has_subjects_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -418,7 +403,7 @@ files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1n5
+- spec/dummy/solr/data/test/index/segments_1ss
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/spec/fixtures/subjects.yml
@@ -437,7 +422,6 @@ files:
 - spec/factories/subject_heading_type_has_subject.rb
 - spec/factories/subject_type.rb
 - spec/factories/user.rb
-- spec/factories/work_has_subject.rb
 - spec/fixtures/carrier_types.yml
 - spec/fixtures/classification_types.yml
 - spec/fixtures/classifications.yml
@@ -447,21 +431,17 @@ files:
 - spec/fixtures/patron_types.yml
 - spec/fixtures/patrons.yml
 - spec/fixtures/roles.yml
-- spec/fixtures/subject_heading_type_has_subjects.yml
 - spec/fixtures/subject_heading_types.yml
 - spec/fixtures/subject_types.yml
 - spec/fixtures/subjects.yml
 - spec/fixtures/user_groups.yml
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/users.yml
-- spec/fixtures/work_has_subjects.yml
 - spec/models/classification_spec.rb
 - spec/models/classification_type_spec.rb
-- spec/models/subject_heading_type_has_subject_spec.rb
 - spec/models/subject_heading_type_spec.rb
 - spec/models/subject_spec.rb
 - spec/models/subject_type_spec.rb
-- spec/models/work_has_subject_spec.rb
 - spec/requests/subjects_spec.rb
 - spec/routing/subject_heading_types_routing_spec.rb
 - spec/routing/subject_types_routing_spec.rb
@@ -495,11 +475,9 @@ summary: enju_subject plugin
 test_files:
 - spec/controllers/classification_types_controller_spec.rb
 - spec/controllers/classifications_controller_spec.rb
-- spec/controllers/subject_heading_type_has_subjects_controller_spec.rb
 - spec/controllers/subject_heading_types_controller_spec.rb
 - spec/controllers/subject_types_controller_spec.rb
 - spec/controllers/subjects_controller_spec.rb
-- spec/controllers/work_has_subjects_controller_spec.rb
 - spec/dummy/app/assets/javascripts/application.js
 - spec/dummy/app/assets/stylesheets/application.css
 - spec/dummy/app/controllers/application_controller.rb
@@ -650,7 +628,7 @@ test_files:
 - spec/dummy/solr/conf/stopwords.txt
 - spec/dummy/solr/conf/synonyms.txt
 - spec/dummy/solr/data/test/index/segments.gen
-- spec/dummy/solr/data/test/index/segments_1n5
+- spec/dummy/solr/data/test/index/segments_1ss
 - spec/dummy/solr/data/test/spellchecker/segments.gen
 - spec/dummy/solr/data/test/spellchecker/segments_1
 - spec/dummy/spec/fixtures/subjects.yml
@@ -669,7 +647,6 @@ test_files:
 - spec/factories/subject_heading_type_has_subject.rb
 - spec/factories/subject_type.rb
 - spec/factories/user.rb
-- spec/factories/work_has_subject.rb
 - spec/fixtures/carrier_types.yml
 - spec/fixtures/classification_types.yml
 - spec/fixtures/classifications.yml
@@ -679,21 +656,17 @@ test_files:
 - spec/fixtures/patron_types.yml
 - spec/fixtures/patrons.yml
 - spec/fixtures/roles.yml
-- spec/fixtures/subject_heading_type_has_subjects.yml
 - spec/fixtures/subject_heading_types.yml
 - spec/fixtures/subject_types.yml
 - spec/fixtures/subjects.yml
 - spec/fixtures/user_groups.yml
 - spec/fixtures/user_has_roles.yml
 - spec/fixtures/users.yml
-- spec/fixtures/work_has_subjects.yml
 - spec/models/classification_spec.rb
 - spec/models/classification_type_spec.rb
-- spec/models/subject_heading_type_has_subject_spec.rb
 - spec/models/subject_heading_type_spec.rb
 - spec/models/subject_spec.rb
 - spec/models/subject_type_spec.rb
-- spec/models/work_has_subject_spec.rb
 - spec/requests/subjects_spec.rb
 - spec/routing/subject_heading_types_routing_spec.rb
 - spec/routing/subject_types_routing_spec.rb

data/app/controllers/subject_heading_type_has_subjects_controller.rb

@@ -1,80 +0,0 @@
-class SubjectHeadingTypeHasSubjectsController < ApplicationController
-  load_and_authorize_resource
-  cache_sweeper :subject_sweeper, :only => [:create, :update, :destroy]
-
-  # GET /subject_heading_type_has_subjects
-  # GET /subject_heading_type_has_subjects.json
-  def index
-    @subject_heading_type_has_subjects = SubjectHeadingTypeHasSubject.page(params[:page])
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => @subject_heading_type_has_subjects }
-    end
-  end
-
-  # GET /subject_heading_type_has_subjects/1
-  # GET /subject_heading_type_has_subjects/1.json
-  def show
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render :json => @subject_heading_type_has_subject }
-    end
-  end
-
-  # GET /subject_heading_type_has_subjects/new
-  # GET /subject_heading_type_has_subjects/new.json
-  def new
-    @subject_heading_type_has_subject = SubjectHeadingTypeHasSubject.new
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render :json => @subject_heading_type_has_subject }
-    end
-  end
-
-  # GET /subject_heading_type_has_subjects/1/edit
-  def edit
-  end
-
-  # POST /subject_heading_type_has_subjects
-  # POST /subject_heading_type_has_subjects.json
-  def create
-    @subject_heading_type_has_subject = SubjectHeadingTypeHasSubject.new(params[:subject_heading_type_has_subject])
-
-    respond_to do |format|
-      if @subject_heading_type_has_subject.save
-        format.html { redirect_to @subject_heading_type_has_subject, :notice => 'SubjectHeadingTypeHasSubject was successfully created.' }
-        format.json { render :json => @subject_heading_type_has_subject, :status => :created, :location => @subject_heading_type_has_subject }
-      else
-        format.html { render :action => "new" }
-        format.json { render :json => @subject_heading_type_has_subject.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /subject_heading_type_has_subjects/1
-  # PUT /subject_heading_type_has_subjects/1.json
-  def update
-    respond_to do |format|
-      if @subject_heading_type_has_subject.update_attributes(params[:subject_heading_type_has_subject])
-        format.html { redirect_to @subject_heading_type_has_subject, :notice => 'SubjectHeadingTypeHasSubject was successfully updated.' }
-        format.json { head :no_content }
-      else
-        format.html { render :action => "edit" }
-        format.json { render :json => @subject_heading_type_has_subject.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /subject_heading_type_has_subjects/1
-  # DELETE /subject_heading_type_has_subjects/1.json
-  def destroy
-    @subject_heading_type_has_subject.destroy
-
-    respond_to do |format|
-      format.html { redirect_to subject_heading_type_has_subjects_url }
-      format.json { head :no_content }
-    end
-  end
-end

data/app/controllers/work_has_subjects_controller.rb

@@ -1,107 +0,0 @@
-class WorkHasSubjectsController < ApplicationController
-  load_and_authorize_resource
-  helper_method :get_work, :get_subject
-  after_filter :solr_commit, :only => [:create, :update, :destroy]
-  cache_sweeper :subject_sweeper, :only => [:create, :update, :destroy]
-
-  # GET /work_has_subjects
-  # GET /work_has_subjects.json
-  def index
-    get_work; get_subject
-    if @work
-      @work_has_subjects = @work.work_has_subjects.page(params[:page])
-    elsif @subject
-      @work_has_subjects = @subject.work_has_subjects.page(params[:page])
-    else
-      @work_has_subjects = WorkHasSubject.page(params[:page])
-    end
-
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => @work_has_subjects }
-    end
-  end
-
-  # GET /work_has_subjects/1
-  # GET /work_has_subjects/1.json
-  def show
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render :json => @work_has_subject }
-    end
-  end
-
-  # GET /work_has_subjects/new
-  # GET /work_has_subjects/new.json
-  def new
-    get_work; get_subject
-    @work_has_subject = WorkHasSubject.new(:work => @work, :subject => @subject)
-
-    respond_to do |format|
-      format.html # new.html.erb
-      format.json { render :json => @work_has_subject }
-    end
-  end
-
-  # GET /work_has_subjects/1/edit
-  def edit
-  end
-
-  # POST /work_has_subjects
-  # POST /work_has_subjects.json
-  def create
-    @work_has_subject = WorkHasSubject.new(params[:work_has_subject])
-
-    respond_to do |format|
-      if @work_has_subject.save
-        format.html { redirect_to @work_has_subject, :notice => t('controller.successfully_created', :model => t('activerecord.models.work_has_subject')) }
-        format.json { render :json => @work_has_subject, :status => :created, :location => @work_has_subject }
-      else
-        format.html { render :action => "new" }
-        format.json { render :json => @work_has_subject.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # PUT /work_has_subjects/1
-  # PUT /work_has_subjects/1.json
-  def update
-    get_work
-    if @work and params[:move]
-      move_position(@work_has_subject, params[:move], false)
-      redirect_to work_work_has_subjects_url(@work)
-      return
-    end
-
-    respond_to do |format|
-      if @work_has_subject.update_attributes(params[:work_has_subject])
-        format.html { redirect_to @work_has_subject, :notice => t('controller.successfully_updated', :model => t('activerecord.models.work_has_subject')) }
-        format.json { head :no_content }
-      else
-        format.html { render :action => "edit" }
-        format.json { render :json => @work_has_subject.errors, :status => :unprocessable_entity }
-      end
-    end
-  end
-
-  # DELETE /work_has_subjects/1
-  # DELETE /work_has_subjects/1.json
-  def destroy
-    get_work; get_subject
-    @work_has_subject.destroy
-
-    respond_to do |format|
-      format.html {
-        case
-        when @work
-          redirect_to work_work_has_subjects_url(@work)
-        when @subject
-          redirect_to subject_work_has_subjects_url(@subject)
-        else
-          redirect_to work_has_subjects_url
-        end
-      }
-      format.json { head :no_content }
-    end
-  end
-end

data/app/models/subject_heading_type_has_subject.rb

@@ -1,22 +0,0 @@
-class SubjectHeadingTypeHasSubject < ActiveRecord::Base
-  attr_accessible :subject_id, :subject_heading_type_id
-  belongs_to :subject #, :polymorphic => true
-  belongs_to :subject_heading_type
-
-  validates_presence_of :subject, :subject_heading_type
-  validates_associated :subject, :subject_heading_type
-  validates_uniqueness_of :subject_id, :scope => :subject_heading_type_id
-end
-
-# == Schema Information
-#
-# Table name: subject_heading_type_has_subjects
-#
-#  id                      :integer          not null, primary key
-#  subject_id              :integer          not null
-#  subject_type            :string(255)
-#  subject_heading_type_id :integer          not null
-#  created_at              :datetime         not null
-#  updated_at              :datetime         not null
-#
-

data/app/models/work_has_subject.rb

@@ -1,32 +0,0 @@
-class WorkHasSubject < ActiveRecord::Base
-  attr_accessible :subject_id, :work_id, :position
-  belongs_to :subject
-  belongs_to :work, :class_name => 'Manifestation'
-
-  validates_presence_of :work, :subject #, :subject_type
-  validates_associated :work, :subject
-  validates_uniqueness_of :subject_id, :scope => :work_id
-  after_save :reindex
-  after_destroy :reindex
-
-  acts_as_list :scope => :work_id
-
-  def reindex
-    work.try(:index)
-    subject.try(:index)
-  end
-end
-
-# == Schema Information
-#
-# Table name: work_has_subjects
-#
-#  id           :integer          not null, primary key
-#  subject_id   :integer
-#  subject_type :string(255)
-#  work_id      :integer
-#  position     :integer
-#  created_at   :datetime         not null
-#  updated_at   :datetime         not null
-#
-

data/app/views/subjects/_index.html.erb

@@ -1,48 +0,0 @@
-<div id="content_detail" class="ui-corner-all">
-<h1 class="title"><%= t('page.listing', :model => t('activerecord.models.subject')) -%></h1>
-<div id="content_list">
-  
-<div class="search_form">
-  <%= form_for :subjects, :url => subjects_path, :html => {:method => 'get'} do -%>
-    <p>
-      <%= t('page.search_term') -%>: <%= search_field_tag 'query', h(@query), {:id => 'search_form_top', :class => 'search_form', :placeholder => t('page.search_term')} -%>
-      <%= submit_tag t('page.search') -%>
-    </p>
-  <%- end -%>
-</div>
-
-<table class="table table-striped index">
-  <tr>
-    <th><%= t('activerecord.attributes.subject.term') -%></th>
-    <th></th>
-  </tr>
-  <%- subjects.each do |subject| -%>
-    <tr class="line<%= cycle("0", "1") -%>">
-      <td><%= link_to subject.term, subject -%></td>
-      <td>
-        <%- if can? :update, subject -%>
-          <%= link_to t('page.edit'), edit_subject_path(subject) -%>
-        <%- end -%>
-        <%- if can? :delete, subject -%>
-          <%= link_to t('page.destroy'), subject, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%>
-        <%- end -%>
-      </td>
-    </tr>
-  <%- end -%>
-</table>
-
-<%= paginate(subjects) -%>
-</div>
-</div>
-
-<div id="submenu" class="ui-corner-all">
-  <ul>
-    <%- if can? :create, Subject -%>
-      <%- if @subject_heading_type -%>
-        <li><%= link_to t('page.new', :model => t('activerecord.models.subject')), new_subject_heading_type_subject_path(@subject_heading_type) -%></li>
-      <%- else -%>
-        <li><%= link_to t('page.new', :model => t('activerecord.models.subject')), new_subject_path -%></li>
-      <%- end -%>
-    <%- end -%>
-  </ul>
-</div>