enju_biblio 0.1.0.pre36 → 0.1.0.pre37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5caef6f3a30d5dcd1d31fbee67731c0c51473db1
-  data.tar.gz: 3ec65c71e7689f0b8fad787a469e003dd47c15e3
+  metadata.gz: 41a6675a780e68eea3ee082220ebb165f09b927b
+  data.tar.gz: af7fbb006e722aacad738bca1f303755629a317e
 SHA512:
-  metadata.gz: 3fe4d121fff219e8a6b2205a0b300d3c4e4b65be960beaab3df2701e4db24330e33e42ba144ddb24a8493f18f54c24998686845f472d886cfa6be875ebe9bcdd
-  data.tar.gz: 5f64907e365a4bad74e5e5174c64d3741e3dbb6e9cd611e4caf8bccf9ef5af2b09974a145a1fb9ea65a27084abe5b08eb4d1da6d14ec9fcfc8d54a848353f8f0
+  metadata.gz: f73678cf486d992ce16bab6427e91982fe5be32e87986dc5c1caec236154b8d14c6609a6808eb5c3c13d0f80fc77bbf7a727922af6be211c0f406c4af2868ebb
+  data.tar.gz: e296e9fa6733baffa7363734cfc2b63f2b8a15be0269edb60a94231e88ea5a0a163c684cff8e9cfeb72bf931bccaa196727213fca04064a1e7c12c78a00ed77a

data/app/assets/stylesheets/scaffold.css

@@ -0,0 +1,56 @@
+body { background-color: #fff; color: #333; }
+
+body, p, ol, ul, td {
+  font-family: verdana, arial, helvetica, sans-serif;
+  font-size:   13px;
+  line-height: 18px;
+}
+
+pre {
+  background-color: #eee;
+  padding: 10px;
+  font-size: 11px;
+}
+
+a { color: #000; }
+a:visited { color: #666; }
+a:hover { color: #fff; background-color:#000; }
+
+div.field, div.actions {
+  margin-bottom: 10px;
+}
+
+#notice {
+  color: green;
+}
+
+.field_with_errors {
+  padding: 2px;
+  background-color: red;
+  display: table;
+}
+
+#error_explanation {
+  width: 450px;
+  border: 2px solid red;
+  padding: 7px;
+  padding-bottom: 0;
+  margin-bottom: 20px;
+  background-color: #f0f0f0;
+}
+
+#error_explanation h2 {
+  text-align: left;
+  font-weight: bold;
+  padding: 5px 5px 5px 15px;
+  font-size: 12px;
+  margin: -7px;
+  margin-bottom: 0px;
+  background-color: #c00;
+  color: #fff;
+}
+
+#error_explanation ul li {
+  font-size: 12px;
+  list-style: square;
+}

data/app/controllers/manifestations_controller.rb

@@ -125,7 +125,6 @@ class ManifestationsController < ApplicationController
           with(:creator_ids).equal_to patron[:creator].id if patron[:creator]
           with(:contributor_ids).equal_to patron[:contributor].id if patron[:contributor]
           with(:publisher_ids).equal_to patron[:publisher].id if patron[:publisher]
-          with(:original_manifestation_ids).equal_to manifestation.id if manifestation
           with(:series_statement_ids).equal_to series_statement.id if series_statement
           with(:parent_ids).equal_to parent.id if parent
         end
@@ -153,7 +152,7 @@ class ManifestationsController < ApplicationController
             #end
           else
             if mode != 'add'
-              with(:periodical).equal_to false
+              with(:resource_master).equal_to true
             end
           end
         end
@@ -182,7 +181,8 @@ class ManifestationsController < ApplicationController
         :issue_number,
         :serial_number,
         :edition_string,
-        :edition
+        :edition,
+        :periodical
       ] if params[:format] == 'html' or params[:format].nil?
       all_result = search.execute
       @count[:query_result] = all_result.total
@@ -447,7 +447,6 @@ class ManifestationsController < ApplicationController
       @manifestation.original_title = parent.original_title
       @manifestation.title_transcription = parent.title_transcription
       @manifestation.periodical = true if parent.periodical
-      @manifestation.series_statements.new(:original_title => parent.root_series_statement.original_title)
     end
 
     respond_to do |format|
@@ -463,9 +462,6 @@ class ManifestationsController < ApplicationController
         access_denied; return
       end
     end
-    if defined?(EnjuSubject)
-      @classification_types = ClassificationType.select(:display_name)
-    end
     if defined?(EnjuBookmark)
       if params[:mode] == 'tag_edit'
         @bookmark = current_user.bookmarks.where(:manifestation_id => @manifestation.id).first if @manifestation rescue nil
@@ -485,9 +481,12 @@ class ManifestationsController < ApplicationController
     end
 
     respond_to do |format|
-      set_patrons
       if @manifestation.save
-        parent.derived_manifestations << @manifestation if parent
+        if parent
+          parent.derived_manifestations << @manifestation
+          parent.index
+          @manifestation.index
+        end
         Sunspot.commit
 
         format.html { redirect_to @manifestation, :notice => t('controller.successfully_created', :model => t('activerecord.models.manifestation')) }
@@ -505,7 +504,6 @@ class ManifestationsController < ApplicationController
   def update
     respond_to do |format|
       if @manifestation.update_attributes(params[:manifestation])
-        set_patrons
         Sunspot.commit
         format.html { redirect_to @manifestation, :notice => t('controller.successfully_updated', :model => t('activerecord.models.manifestation')) }
         format.json { head :no_content }
@@ -676,12 +674,16 @@ class ManifestationsController < ApplicationController
   end
 
   def prepare_options
-    @carrier_types = CarrierType.all
-    @content_types = ContentType.all
-    @roles = Role.all
-    @languages = Language.all_cache
-    @frequencies = Frequency.all
-    @nii_types = NiiType.all if defined?(EnjuNii)
+    @carrier_types = CarrierType.select([:id, :display_name, :position])
+    @content_types = ContentType.select([:id, :display_name, :position])
+    @roles = Role.select([:id, :display_name, :position])
+    @languages = Language.select([:id, :display_name, :position])
+    @frequencies = Frequency.select([:id, :display_name, :position])
+    @nii_types = NiiType.select([:id, :display_name, :position]) if defined?(EnjuNii)
+    if defined?(EnjuSubject)
+      @subject_types = SubjectType.select([:id, :display_name, :position])
+      @classification_types = ClassificationType.select([:id, :display_name, :position])
+    end
   end
 
   def get_index_patron
@@ -769,10 +771,4 @@ class ManifestationsController < ApplicationController
     end
     query
   end
-
-  def set_patrons
-    @manifestation.set_creators(@manifestation.creators)
-    @manifestation.set_contributors(@manifestation.contributors)
-    @manifestation.set_publishers(@manifestation.publishers)
-  end
 end

data/app/controllers/series_statements_controller.rb

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 class SeriesStatementsController < ApplicationController
   load_and_authorize_resource
-  before_filter :get_work, :get_manifestation, :get_parent_and_child, :except => [:create, :update, :destroy]
+  before_filter :get_manifestation, :except => [:create, :update, :destroy]
   cache_sweeper :page_sweeper, :only => [:create, :update, :destroy]
   after_filter :solr_commit, :only => [:create, :update, :destroy]
   if defined?(EnjuResourceMerge)
@@ -26,21 +26,10 @@ class SeriesStatementsController < ApplicationController
     end
     #work = @work
     manifestation = @manifestation
-    parent = @parent
-    child = @child
     series_statement_merge_list = @series_statement_merge_list
-    unless params[:mode] == 'add'
-      search.build do
-      #  with(:work_id).equal_to work.id if work
-        with(:parent_ids).equal_to parent.id if parent
-        with(:child_ids).equal_to child.id if child
-        with(:manifestation_id).equal_to manifestation.id if manifestation
-        with(:series_statement_merge_list_ids).equal_to series_statement_merge_list.id if series_statement_merge_list
-      end
-    else
-      search.build do
-        without(:parent_ids, parent.id) if parent
-      end
+    search.build do
+      with(:manifestation_id).equal_to manifestation.id if manifestation
+      with(:series_statement_merge_list_ids).equal_to series_statement_merge_list.id if series_statement_merge_list
     end
     page = params[:page] || 1
     search.query.paginate(page.to_i, SeriesStatement.default_per_page)
@@ -56,18 +45,11 @@ class SeriesStatementsController < ApplicationController
   # GET /series_statements/1
   # GET /series_statements/1.json
   def show
-    #@manifestations = @series_statement.manifestations.order('date_of_publication DESC').page(params[:manifestation_page]).per(Manifestation.default_per_page)
-    #store_location
-
     respond_to do |format|
-      format.html { # show.html.erb
-        redirect_to series_statement_manifestations_url(@series_statement)
-      }
+      format.html # show.html.erb
       format.json { render :json => @series_statement }
       #format.js
-      format.mobile {
-        redirect_to series_statement_manifestations_url(@series_statement)
-      }
+      #format.mobile
     end
   end
 
@@ -75,8 +57,6 @@ class SeriesStatementsController < ApplicationController
   # GET /series_statements/new.json
   def new
     @series_statement = SeriesStatement.new
-    @frequencies = Frequency.all
-    @series_statement.parent = @parent_series_statement if @parent_series_statement
 
     respond_to do |format|
       format.html # new.html.erb
@@ -86,9 +66,6 @@ class SeriesStatementsController < ApplicationController
 
   # GET /series_statements/1/edit
   def edit
-    @series_statement.work = @work if @work
-    @frequencies = Frequency.all
-    @series_statement.parent = @parent_series_statement if @parent_series_statement
   end
 
   # POST /series_statements
@@ -140,10 +117,4 @@ class SeriesStatementsController < ApplicationController
       format.json { head :no_content }
     end
   end
-
-  private
-  def get_parent_and_child
-    @parent = SeriesStatement.find(params[:parent_id]) if params[:parent_id]
-    @child = SeriesStatement.find(params[:child_id]) if params[:child_id]
-  end
 end

data/app/models/enju_biblio/ability.rb

@@ -36,8 +36,7 @@ module EnjuBiblio
           Realize,
           RealizeType,
           ResourceImportFile,
-          SeriesStatement,
-          SeriesStatementRelationship
+          SeriesStatement
         ]
         can :update, [
           ContentType,
@@ -95,8 +94,7 @@ module EnjuBiblio
           Produce,
           Realize,
           ResourceImportFile,
-          SeriesStatement,
-          SeriesStatementRelationship
+          SeriesStatement
         ]
         can :read, [
           CarrierType,

data/app/models/manifestation.rb

@@ -513,35 +513,22 @@ class Manifestation < ActiveRecord::Base
     }.compact
   end
 
-  def set_creators(creators = [])
-    self.creators = set_patrons(creators)
-  end
-
-  def set_contributors(contributors = [])
-    self.contributors = set_patrons(contributors)
-  end
-
-  def set_publishers(publishers = [])
-    self.publishers = set_patrons(publishers)
-  end
-
   def self.import_isbn(isbn)
     manifestation = Manifestation.import_from_ndl_search(:isbn => isbn) if defined?(EnjuNdl)
     #manifestation = Manifestation.import_from_cinii_books(:isbn => isbn) if defined?(EnjuNii)
     manifestation
   end
 
-  private
-  def set_patrons(patrons)
-    new_patrons = []
-    patrons.each do |patron|
-      if patron.full_name.present?
-        new_patron = Patron.where(:full_name => patron.full_name).first
-        new_patron = Patron.create(:full_name => patron.full_name) unless new_patron
-      end
-      new_patrons << new_patron if new_patron
+  def latest_issue
+    if series_master?
+      derived_manifestations.where('date_of_publication IS NOT NULL').order('date_of_publication DESC').first
+    end
+  end
+
+  def first_issue
+    if series_master?
+      derived_manifestations.where('date_of_publication IS NOT NULL').order('date_of_publication DESC').first
     end
-    new_patrons
   end
 end
 
@@ -549,75 +536,71 @@ end
 #
 # Table name: manifestations
 #
-#  id                                :integer          not null, primary key
-#  original_title                    :text             not null
-#  title_alternative                 :text
-#  title_transcription               :text
-#  classification_number             :string(255)
-#  manifestation_identifier          :string(255)
-#  date_of_publication               :datetime
-#  date_copyrighted                  :datetime
-#  created_at                        :datetime         not null
-#  updated_at                        :datetime         not null
-#  deleted_at                        :datetime
-#  access_address                    :string(255)
-#  language_id                       :integer          default(1), not null
-#  carrier_type_id                   :integer          default(1), not null
-#  extent_id                         :integer          default(1), not null
-#  start_page                        :integer
-#  end_page                          :integer
-#  height                            :integer
-#  width                             :integer
-#  depth                             :integer
-#  isbn                              :string(255)
-#  isbn10                            :string(255)
-#  wrong_isbn                        :string(255)
-#  nbn                               :string(255)
-#  lccn                              :string(255)
-#  oclc_number                       :string(255)
-#  issn                              :string(255)
-#  price                             :integer
-#  fulltext                          :text
-#  volume_number_string              :string(255)
-#  issue_number_string               :string(255)
-#  serial_number_string              :string(255)
-#  edition                           :integer
-#  note                              :text
-#  repository_content                :boolean          default(FALSE), not null
-#  lock_version                      :integer          default(0), not null
-#  required_role_id                  :integer          default(1), not null
-#  state                             :string(255)
-#  required_score                    :integer          default(0), not null
-#  frequency_id                      :integer          default(1), not null
-#  subscription_master               :boolean          default(FALSE), not null
-#  attachment_file_name              :string(255)
-#  attachment_content_type           :string(255)
-#  attachment_file_size              :integer
-#  attachment_updated_at             :datetime
-#  title_alternative_transcription   :text
-#  description                       :text
-#  abstract                          :text
-#  available_at                      :datetime
-#  valid_until                       :datetime
-#  date_submitted                    :datetime
-#  date_accepted                     :datetime
-#  date_caputured                    :datetime
-#  pub_date                          :string(255)
-#  edition_string                    :string(255)
-#  volume_number                     :integer
-#  issue_number                      :integer
-#  serial_number                     :integer
-#  ndc                               :string(255)
-#  content_type_id                   :integer          default(1)
-#  year_of_publication               :integer
-#  attachment_meta                   :text
-#  month_of_publication              :integer
-#  fulltext_content                  :boolean
-#  doi                               :string(255)
-#  periodical                        :boolean
-#  series_original_title             :text
-#  series_title_transcription        :text
-#  series_title_creator_string       :text
-#  series_title_volume_number_string :text
+#  id                              :integer          not null, primary key
+#  original_title                  :text             not null
+#  title_alternative               :text
+#  title_transcription             :text
+#  classification_number           :string(255)
+#  manifestation_identifier        :string(255)
+#  date_of_publication             :datetime
+#  date_copyrighted                :datetime
+#  created_at                      :datetime         not null
+#  updated_at                      :datetime         not null
+#  deleted_at                      :datetime
+#  access_address                  :string(255)
+#  language_id                     :integer          default(1), not null
+#  carrier_type_id                 :integer          default(1), not null
+#  extent_id                       :integer          default(1), not null
+#  start_page                      :integer
+#  end_page                        :integer
+#  height                          :integer
+#  width                           :integer
+#  depth                           :integer
+#  isbn                            :string(255)
+#  isbn10                          :string(255)
+#  wrong_isbn                      :string(255)
+#  nbn                             :string(255)
+#  lccn                            :string(255)
+#  oclc_number                     :string(255)
+#  issn                            :string(255)
+#  price                           :integer
+#  fulltext                        :text
+#  volume_number_string            :string(255)
+#  issue_number_string             :string(255)
+#  serial_number_string            :string(255)
+#  edition                         :integer
+#  note                            :text
+#  repository_content              :boolean          default(FALSE), not null
+#  lock_version                    :integer          default(0), not null
+#  required_role_id                :integer          default(1), not null
+#  state                           :string(255)
+#  required_score                  :integer          default(0), not null
+#  frequency_id                    :integer          default(1), not null
+#  subscription_master             :boolean          default(FALSE), not null
+#  attachment_file_name            :string(255)
+#  attachment_content_type         :string(255)
+#  attachment_file_size            :integer
+#  attachment_updated_at           :datetime
+#  title_alternative_transcription :text
+#  description                     :text
+#  abstract                        :text
+#  available_at                    :datetime
+#  valid_until                     :datetime
+#  date_submitted                  :datetime
+#  date_accepted                   :datetime
+#  date_caputured                  :datetime
+#  pub_date                        :string(255)
+#  edition_string                  :string(255)
+#  volume_number                   :integer
+#  issue_number                    :integer
+#  serial_number                   :integer
+#  ndc                             :string(255)
+#  content_type_id                 :integer          default(1)
+#  year_of_publication             :integer
+#  attachment_meta                 :text
+#  month_of_publication            :integer
+#  fulltext_content                :boolean
+#  doi                             :string(255)
+#  periodical                      :boolean
 #
 

data/app/models/series_statement.rb

@@ -1,19 +1,15 @@
 class SeriesStatement < ActiveRecord::Base
   attr_accessible :original_title, :numbering, :title_subseries,
     :numbering_subseries, :title_transcription, :title_alternative,
-    :series_statement_identifier, :note, :series_master,
-    :root_manifestation_id,
+    :series_statement_identifier, :note,
+    :root_manifestation_id, :url,
     :title_subseries_transcription, :creator_string, :volume_number_string
-  attr_accessible :url, :frequency_id
+  attr_accessible :series_master
 
   belongs_to :manifestation
   belongs_to :root_manifestation, :foreign_key => :root_manifestation_id, :class_name => 'Manifestation'
-  has_many :child_relationships, :foreign_key => 'parent_id', :class_name => 'SeriesStatementRelationship', :dependent => :destroy
-  has_many :parent_relationships, :foreign_key => 'child_id', :class_name => 'SeriesStatementRelationship', :dependent => :destroy
-  has_many :children, :through => :child_relationships, :source => :child
-  has_many :parents, :through => :parent_relationships, :source => :parent
-  belongs_to :frequency
   validates_presence_of :original_title
+  before_save :create_root_series_statement
 
   acts_as_list
   searchable do
@@ -24,12 +20,6 @@ class SeriesStatement < ActiveRecord::Base
     integer :manifestation_id
     integer :position
     integer :series_statement_merge_list_ids, :multiple => true if defined?(EnjuResourceMerge)
-    integer :parent_ids, :multiple => true do
-      parents.pluck('series_statements.id')
-    end
-    integer :child_ids, :multiple => true do
-      children.pluck('series_statements.id')
-    end
   end
 
   attr_accessor :selected
@@ -40,10 +30,14 @@ class SeriesStatement < ActiveRecord::Base
   def titles
     [
       original_title,
-      title_transcription,
-      parents.map{|parent| [parent.original_title, parent.title_transcription]},
-      children.map{|child| [child.original_title, child.title_transcription]}
-    ].flatten.compact
+      title_transcription
+    ]
+  end
+
+  def create_root_series_statement
+    if series_master? and root_manifestation.nil?
+      self.root_manifestation = manifestation
+    end
   end
 
   if defined?(EnjuResourceMerge)
@@ -74,5 +68,6 @@ end
 #  volume_number_string               :text
 #  volume_number_transcription_string :text
 #  series_master                      :boolean
+#  root_manifestation_id              :integer
 #
 

data/app/views/manifestations/_edit_detail.html.erb

@@ -0,0 +1,10 @@
+<ul>
+  <li>
+    <%= link_to t('page.edit'), edit_manifestation_path(@manifestation) -%>
+  </li>
+  <li><%= link_to t('manifestation.edit_item'), manifestation_items_path(@manifestation) -%></li>
+  <li><%= link_to t('manifestation.add_derivation'), manifestations_path(:parent_id => @manifestation.id, :mode => 'add') -%></li>
+  <% if can? :delete, @manifestation %>
+    <li><%= link_to t('page.destroy'), @manifestation, :data => {:confirm => t('page.are_you_sure')}, :method => :delete -%></li>
+  <% end %>
+</ul>

data/app/views/manifestations/_form.html.erb

@@ -16,16 +16,38 @@
   </div>
 
   <div class="field">
-    <%= f.label :periodical %><br />
+    <%= f.label :periodical %>
     <%= f.check_box :periodical %>
   </div>
 
+  <div class="field">
+    <%= f.label :edition_string -%>
+    <%= f.text_field :edition_string %>
+    <%= f.label :edition -%>
+    <%= f.text_field :edition, :class => 'resource_integer' -%>
+    <br />
+    <%= f.label :volume_number_string -%>
+    <%= f.text_field :volume_number_string %>
+    <%= f.label :volume_number -%>
+    <%= f.text_field :volume_number, :class => 'resource_integer' -%>
+    <br />
+    <%= f.label :issue_number_string -%>
+    <%= f.text_field :issue_number_string %>
+    <%= f.label :issue_number -%>
+    <%= f.text_field :issue_number, :class => 'resource_integer' -%>
+    <br />
+    <%= f.label :serial_number -%>
+    <%= f.text_field :serial_number, :class => 'resource_integer' -%>
+  </div>
+
   <div class="field">
     <%= f.label :series_statement_string -%><br />
     <%= f.fields_for :series_statements do |series_form| %>
       <%= f.label :original_title %><br />
-      <%= series_form.text_field :original_title %>
+      <%= series_form.text_field :original_title, :class => 'resource_title' %>
       <%= series_form.link_to_remove t('page.remove'), :confirm => t('page.are_you_sure') %><br />
+      <%= f.label :title_transcription %><br />
+      <%= series_form.text_field :title_transcription, :class => 'resource_title' %><br />
       <%= f.label :volume_number_string %><br />
       <%= series_form.text_field :volume_number_string %><br />
       <%= f.label :creator_string %><br />
@@ -63,33 +85,20 @@
     <p><%= f.link_to_add t('page.add'), :publishers %></p>
   </div>
 
-  <%- if @series_statement.try(:periodical?) -%>
-    <%= render :partial => 'manifestations/serial_form', :locals => {:f => f, :manifestation => @manifestation} -%>
-  <%- else -%>
-    <div class="field">
-      <%= f.label :edition_string -%>
-      <%= f.text_field :edition_string %>
-      <%= f.label :edition -%>
-      <%= f.text_field :edition, :class => 'resource_integer' -%>
-      <br />
-      <%= f.label :volume_number_string -%>
-      <%= f.text_field :volume_number_string %>
-      <%= f.label :volume_number -%>
-      <%= f.text_field :volume_number, :class => 'resource_integer' -%>
-    </div>
-  <% end %>
-
-  <div class="field">
-    <%= f.label t('page.file') -%><br />
+  <div class="field">
+    <%= f.label :pub_date -%>
+    <%= f.text_field :pub_date, :class => 'date_field', :placeholder => "#{t('page.example')}: 2011, 2011-04-12"-%>
+  </div>
+
+  <div class="field">
+    <%= f.label t('page.file') -%>
     <%= f.file_field :attachment -%>
   </div>
 
   <div class="field">
     <%= f.label t('activerecord.models.content_type') -%>
     <%= f.select(:content_type_id, @content_types.collect{|c| [c.display_name.localize, c.id]}) -%>
-  </div>
 
-  <div class="field">
     <%= f.label t('activerecord.models.carrier_type') -%>
     <%= f.select(:carrier_type_id, @carrier_types.collect{|c| [c.display_name.localize, c.id]}) -%>
     <!-- TODO: Formの切り替え時に入力項目をAjaxで書き換える -->
@@ -98,14 +107,7 @@
   <div class="field">
     <%= f.label t('activerecord.models.frequency') -%>
     <%= f.select(:frequency_id, @frequencies.collect{|frequency| [frequency.display_name.localize, frequency.id]}) -%>
-  </div>
-
-  <div class="field">
-    <%= f.label :pub_date -%>
-    <%= f.text_field :pub_date, :class => 'date_field', :placeholder => "#{t('page.example')}: 2011, 2011-04-12"-%>
-  </div>
 
-  <div class="field">
     <%= f.label t('activerecord.models.language') -%>
     <%= f.select(:language_id, @languages.collect{|language| [language.display_name.localize, language.id]}) -%>
   </div>
@@ -119,15 +121,28 @@
   <div class="field">
     <%= f.label :lccn -%>
     <%= f.text_field :lccn, :class => 'resource_isbn_issn', :style => 'ime-mode: disabled' -%>
-    <%- if @series_statement.try(:periodical?) -%>
-      <%= f.label :issn -%>
-      <%= f.text_field :issn, :class => 'resource_isbn_issn', :style => 'ime-mode: disabled' -%>
+    <%= f.label :issn -%>
+    <%= f.text_field :issn, :class => 'resource_isbn_issn', :style => 'ime-mode: disabled' -%>
+  </div>
+
+  <div class="field">
+    <%= f.label :subject -%><br />
+    <%= f.fields_for :subjects do |subject_form| %>
+      <%= subject_form.text_field :term %>
+      <%= subject_form.select(:subject_type_id, @subject_types.collect{|s| [s.display_name.localize, s.id]}) %>
+      <%= subject_form.link_to_remove t('page.remove'), :confirm => t('page.are_you_sure')  %>
     <% end %>
+    <p><%= f.link_to_add t('page.add'), :subjects %></p>
   </div>
 
   <div class="field">
-    <%= f.label :classification_number -%><br />
-    <%= f.text_area :classification_number, :class => 'resource_textarea' -%>
+    <%= f.label :classification -%><br />
+    <%= f.fields_for :classifications do |classification_form| %>
+      <%= classification_form.select(:classification_type_id, @classification_types.collect{|c| [c.display_name.localize, c.id]}) %>
+      <%= classification_form.text_field :category %>
+      <%= classification_form.link_to_remove t('page.remove'), :confirm => t('page.are_you_sure')  %>
+    <% end %>
+    <p><%= f.link_to_add t('page.add'), :classifications %></p>
   </div>
 
   <div class="field">