diff --git a/app/controllers/creatures_controller.rb b/app/controllers/creatures_controller.rb
index a97f1b83..40f13f70 100644
--- a/app/controllers/creatures_controller.rb
+++ b/app/controllers/creatures_controller.rb
@@ -11,7 +11,7 @@ class CreaturesController < ContentController
materials preferred_habitat sounds strengths weaknesses spoils aggressiveness
attack_method defense_method maximum_speed food_sources
migratory_patterns reproduction herd_patterns
- similar_animals symbolisms privacy
+ similar_animals symbolisms privacy notes private_notes
) + [
wildlifeships_attributes: [:id, :habitat_id, :_destroy],
]
diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb
index 8a455004..17cb26de 100644
--- a/app/controllers/groups_controller.rb
+++ b/app/controllers/groups_controller.rb
@@ -10,7 +10,7 @@ class GroupsController < ContentController
name description other_names universe_id
organization_structure
motivation goal obstacles risks
- inventory
+ inventory notes private_notes
) + [
group_leaderships_attributes: [:id, :leader_id, :_destroy],
supergroupships_attributes: [:id, :supergroup_id, :_destroy],
diff --git a/app/controllers/races_controller.rb b/app/controllers/races_controller.rb
index 1a9ec9a5..384d8c64 100644
--- a/app/controllers/races_controller.rb
+++ b/app/controllers/races_controller.rb
@@ -8,7 +8,7 @@ class RacesController < ContentController
def content_param_list
%i(
name description other_names universe_id
- body_shape skin_colors height weight notable_features variance_clothing
+ body_shape skin_colors height weight notable_features variance clothing
strengths weaknesses
traditions beliefs governments technologies occupations economics favorite_foods
notable_events
diff --git a/app/models/content_types/creature.rb b/app/models/content_types/creature.rb
index c55e14fc..21fb85ac 100644
--- a/app/models/content_types/creature.rb
+++ b/app/models/content_types/creature.rb
@@ -14,6 +14,7 @@ class Creature < ActiveRecord::Base
belongs_to :universe
+ include HasAttributes
include HasPrivacy
include HasContentGroupers
include Serendipitous::Concern
@@ -31,32 +32,7 @@ class Creature < ActiveRecord::Base
'pets'
end
- def self.attribute_categories
- {
- overview: {
- icon: 'info',
- attributes: %w(name description type_of other_names universe_id)
- },
- looks: {
- icon: 'pets',
- attributes: %w(color shape size notable_features materials)
- },
- traits: {
- icon: 'fingerprint',
- attributes: %w(aggressiveness attack_method defense_method maximum_speed strengths weaknesses sounds spoils)
- },
- habitat: {
- icon: 'location_on',
- attributes: %w(preferred_habitat habitats food_sources migratory_patterns reproduction herd_patterns)
- },
- comparisons: {
- icon: 'call_split',
- attributes: %w(similar_animals symbolisms)
- },
- notes: {
- icon: 'edit',
- attributes: %w(notes private_notes)
- }
- }
+ def self.content_name
+ 'creature'
end
end
diff --git a/app/models/content_types/group.rb b/app/models/content_types/group.rb
index edb93b05..845aa669 100644
--- a/app/models/content_types/group.rb
+++ b/app/models/content_types/group.rb
@@ -6,6 +6,7 @@ class Group < ActiveRecord::Base
belongs_to :universe
+ include HasAttributes
include HasPrivacy
include HasContentGroupers
include Serendipitous::Concern
@@ -41,36 +42,7 @@ class Group < ActiveRecord::Base
'wc'
end
- def self.attribute_categories
- {
- overview: {
- icon: 'info',
- attributes: %w(name description other_names universe_id)
- },
- hierarchy: {
- icon: 'call_split',
- attributes: %w(organization_structure leaders supergroups subgroups sistergroups)
- },
- location: {
- icon: 'location_on',
- attributes: %w(headquarters offices)
- },
- purpose: {
- icon: 'business',
- attributes: %w(motivation goal obstacles risks)
- },
- politics: {
- icon: 'thumbs_up_down',
- attributes: %w(allies enemies rivals clients)
- },
- inventory: {
- icon: 'shopping_cart',
- attributes: %w(inventory equipment key_items suppliers)
- },
- notes: {
- icon: 'edit',
- attributes: %w(notes private_notes)
- }
- }
+ def self.content_name
+ 'group'
end
end
diff --git a/app/models/content_types/language.rb b/app/models/content_types/language.rb
index 340b3a1e..2e22a585 100644
--- a/app/models/content_types/language.rb
+++ b/app/models/content_types/language.rb
@@ -6,6 +6,7 @@ class Language < ActiveRecord::Base
belongs_to :universe
+ include HasAttributes
include HasPrivacy
include HasContentGroupers
include Serendipitous::Concern
@@ -25,40 +26,7 @@ class Language < ActiveRecord::Base
'forum'
end
- def self.attribute_categories
- {
- overview: {
- icon: 'info',
- attributes: %w(name other_names universe_id)
- },
- info: {
- icon: 'forum',
- attributes: %w(history typology dialectical_information register)
- },
- phonology: {
- icon: 'speaker_notes',
- attributes: %w(phonology)
- },
- grammar: {
- icon: 'list',
- attributes: %w(grammar)
- },
- entities: {
- icon: 'settings_input_component',
- attributes: %w(numbers quantifiers)
- },
- # lexicon: {
- # icon: 'info',
- # attributes: %w()
- # },
- # spoken_by: {
- # icon: 'info',
- # attributes: %w()
- # },
- notes: {
- icon: 'edit',
- attributes: %w(notes private_notes)
- }
- }
+ def self.content_name
+ 'language'
end
end
diff --git a/app/models/content_types/magic.rb b/app/models/content_types/magic.rb
index ffb050a0..567f0782 100644
--- a/app/models/content_types/magic.rb
+++ b/app/models/content_types/magic.rb
@@ -6,6 +6,7 @@ class Magic < ActiveRecord::Base
belongs_to :universe
+ include HasAttributes
include HasPrivacy
include HasContentGroupers
include Serendipitous::Concern
@@ -23,32 +24,7 @@ class Magic < ActiveRecord::Base
'flash_on'
end
- def self.attribute_categories
- {
- overview: {
- icon: 'info',
- attributes: %w(name description type_of universe_id)
- },
- appearance: {
- icon: 'flash_on',
- attributes: %w(visuals effects)
- },
- effects: {
- icon: 'flare',
- attributes: %w(positive_effects negative_effects neutral_effects)
- },
- alignment: {
- icon: 'polymer',
- attributes: %w(element deities)
- },
- requirements: {
- icon: 'lock',
- attributes: %w(resource_costs materials skills_required limitations)
- },
- notes: {
- icon: 'edit',
- attributes: %w(notes private_notes)
- }
- }
+ def self.content_name
+ 'magic'
end
end
diff --git a/app/models/content_types/race.rb b/app/models/content_types/race.rb
index dee6b69f..5516eb4b 100644
--- a/app/models/content_types/race.rb
+++ b/app/models/content_types/race.rb
@@ -12,6 +12,7 @@ class Race < ActiveRecord::Base
belongs_to :universe
+ include HasAttributes
include HasPrivacy
include HasContentGroupers
include Serendipitous::Concern
@@ -29,32 +30,7 @@ class Race < ActiveRecord::Base
'face'
end
- def self.attribute_categories
- {
- overview: {
- icon: 'info',
- attributes: %w(name description other_names universe_id)
- },
- looks: {
- icon: 'face',
- attributes: %w(body_shape skin_colors height weight notable_features variance clothing)
- },
- traits: {
- icon: 'fingerprint',
- attributes: %w(strengths weaknesses)
- },
- culture: {
- icon: 'groups',
- attributes: %w(famous_figures traditions beliefs governments technologies occupations economics favorite_foods)
- },
- history: {
- icon: 'import_contacts',
- attributes: %w(notable_events)
- },
- notes: {
- icon: 'edit',
- attributes: %w(notes private_notes)
- }
- }
+ def self.content_name
+ 'race'
end
end
diff --git a/app/models/content_types/religion.rb b/app/models/content_types/religion.rb
index 2404842f..0a41d9fc 100644
--- a/app/models/content_types/religion.rb
+++ b/app/models/content_types/religion.rb
@@ -6,6 +6,7 @@ class Religion < ActiveRecord::Base
belongs_to :universe
+ include HasAttributes
include HasPrivacy
include HasContentGroupers
include Serendipitous::Concern
@@ -33,32 +34,7 @@ class Religion < ActiveRecord::Base
'brightness_7'
end
- def self.attribute_categories
- {
- overview: {
- icon: 'info',
- attributes: %w(name description other_names universe_id)
- },
- history: {
- icon: 'import_contacts',
- attributes: %w(origin_story notable_figures artifacts)
- },
- beliefs: {
- icon: 'forum',
- attributes: %w(deities teachings prophecies places_of_worship worship_services obligations paradise)
- },
- traditions: {
- icon: 'account_balance',
- attributes: %w(initiation rituals holidays)
- },
- spread: {
- icon: 'location_on',
- attributes: %w(practicing_locations races)
- },
- notes: {
- icon: 'edit',
- attributes: %w(notes private_notes)
- }
- }
+ def self.content_name
+ 'religion'
end
end
diff --git a/app/models/content_types/scene.rb b/app/models/content_types/scene.rb
index 16f77bc6..004749ba 100644
--- a/app/models/content_types/scene.rb
+++ b/app/models/content_types/scene.rb
@@ -6,6 +6,7 @@ class Scene < ActiveRecord::Base
belongs_to :universe
+ include HasAttributes
include HasPrivacy
include HasContentGroupers
include Serendipitous::Concern
@@ -29,24 +30,7 @@ class Scene < ActiveRecord::Base
'local_movies'
end
- def self.attribute_categories
- {
- overview: {
- icon: 'info',
- attributes: %w(name summary universe_id)
- },
- members: {
- icon: 'face',
- attributes: %w(scene_characters scene_locations scene_items)
- },
- action: {
- icon: 'gesture',
- attributes: %w(cause description results)
- },
- notes: {
- icon: 'edit',
- attributes: %w(notes private_notes)
- }
- }
+ def self.content_name
+ 'scene'
end
end
diff --git a/app/views/attribute_fields/_modal.html.erb b/app/views/attribute_fields/_modal.html.erb
index 87ae01fa..d2f8ae30 100644
--- a/app/views/attribute_fields/_modal.html.erb
+++ b/app/views/attribute_fields/_modal.html.erb
@@ -15,6 +15,11 @@
<%= f.text_area :label, class: "materialize-textarea", placeholder: "Field Name" %>
+
+
+ Please save any changes before adding a field. It will refresh the page and any changes in your form
+ will be lost.
+
- <% button_text = content_list.any? ? "Create another #{content_type}" : "Create your first #{content_type}" %>
+ <% button_text = content_list.any? ? "Create another #{content_type}" : "Create one" %>
<%= link_to button_text, new_polymorphic_path(content_type), class: "btn #{content_type_class.color}" if current_user %>
diff --git a/app/views/content/form/_text_input.html.erb b/app/views/content/form/_text_input.html.erb
index e9749ad2..f8478ddf 100644
--- a/app/views/content/form/_text_input.html.erb
+++ b/app/views/content/form/_text_input.html.erb
@@ -14,10 +14,10 @@
%>
- <%= f.label attribute, I18n.translate( # todo use field.name here instead of attribute?
- "attributes.#{class_name}.#{attribute}",
+ <%= f.label field.name, I18n.translate(
+ "attributes.#{f.object.class.name}.#{field.name}",
scope: :activerecord,
- default: attribute.humanize.capitalize
+ default: field.label.humanize.capitalize
) %>
<%
placeholder = I18n.translate "attributes.#{content_name}.#{field.name}",
diff --git a/app/views/content/index.html.erb b/app/views/content/index.html.erb
index 692ca5d6..44fb38f5 100644
--- a/app/views/content/index.html.erb
+++ b/app/views/content/index.html.erb
@@ -1,5 +1,6 @@
<%
content_type_class = @content.build.class
+ content_type = content_type_class.name.downcase
%>
<% content_for :sidebar_top do %>
@@ -43,7 +44,7 @@
<% end %>
- <%= render partial: 'content/list/list', locals: { content_list: @content.content_name, show_add_another_form: true } %>
+ <%= render partial: 'content/list/list', locals: { content_list: @content, show_add_another_form: true } %>
<% elsif @content.empty? %>
@@ -55,7 +56,7 @@
- <%= t("content_descriptions.#{content_type_class.name.downcase}") %>
+ <%= t("content_descriptions.#{content_type}") %>
<%= link_to "Create your first #{@content.content_name.humanize.downcase}", new_polymorphic_path(@content.build), class: "btn #{content_type_class.color}" %>