card 1.98.3 → 1.99.0

data/mod/standard/set/type/basic.rb

@@ -12,7 +12,7 @@ format :html do
   end
 
   def table_of_contents content
-    return if nest_mode == :closed || !content.present?
+    return if nest_mode == :compact || !content.present?
 
     min = card.rule(:table_of_contents).to_i
     return unless min && min > 0

data/mod/standard/set/type/cardtype.rb

@@ -4,18 +4,24 @@ def wql_content
   { type_id: id, sort: :name }
 end
 
+def related_sets with_self=false
+  sets = []
+  sets << ["#{name}+*type", Card::Set::Type.label(name)] if known?
+  sets + super
+end
+
 format :html do
-  view :type do
+  view :type, unknown: true do
     link_args = { class: "cardtype" }
     add_class link_args, "no-edit" if card.cards_of_type_exist?
     link_to_card card.type_card, nil, link_args
   end
 
-  def type_formgroup
+  def type_formgroup args={}
     if card.cards_of_type_exist?
       wrap_with :div, tr(:cards_exist, cardname: safe_name)
     else
-      super()
+      super
     end
   end
 
@@ -24,13 +30,13 @@ format :html do
   end
 
   view :add_button do
-    add_link "btn btn-outline-secondary"
+    add_link "btn btn-secondary"
   end
 
   def add_link css_class=nil
     voo.title ||= tr(:add_card, cardname: safe_name)
     title = _render_title
-    link_to title, path: _render_add_path, class: css_class
+    link_to title, modal_link_opts(class: css_class, path: _render_add_path)
   end
 
   view :add_url do
@@ -47,7 +53,7 @@ format :html do
         path_args[key] = value
       end
     end
-    path path_args.merge(action: :new, mark: card.name)
+    path path_args.merge(action: :type, mark: card.name, view: :new_in_modal)
   end
 
   # don't cache because it depends on update permission for another card
@@ -59,14 +65,15 @@ format :html do
     Card.fetch(card, :type, :structure, new: {}).ok? :update
   end
 
-  view :configure_button, cache: :never, perms:  ->(fmt) { fmt.can_configure? } do
-    configure_link "btn btn-outline-secondary"
+  view :configure_button, cache: :never, denial: :blank,
+                          perms:  ->(fmt) { fmt.can_configure? } do
+    configure_link "btn btn-secondary"
   end
 
   def configure_link css_class=nil
     return "" unless Card.fetch(card, :type, :structure, new: {}).ok? :update
 
-    voo.title ||= tr(:configure_card, cardname: safe_name)
+    voo.title ||= tr(:configure_card, cardname: safe_name.pluralize)
     title = _render_title
     link_to_card card, title, path: { view: :bridge, bridge: { tab: :rules_tab },
                                       set: Card::Name[safe_name, :type] },
@@ -84,12 +91,19 @@ def create_ok?
   Card.new(type_id: id).ok? :create
 end
 
+def was_cardtype?
+  type_id_before_act == CardtypeID
+end
+
 event :check_for_cards_of_type, after: :validate_delete do
   errors.add :cardtype, tr(:cards_exist, cardname: name) if cards_of_type_exist?
 end
 
-event :check_for_cards_of_type_when_type_changed, :validate, changing: :type do
-  errors.add :cardtype, tr(:error_cant_alter, name: name) if cards_of_type_exist?
+event :check_for_cards_of_type_when_type_changed,
+      :validate, changing: :type, when: :was_cardtype? do
+  if cards_of_type_exist?
+    errors.add :cardtype, tr(:error_cant_alter, name: name_before_act)
+  end
 end
 
 event :validate_cardtype_name, :validate, on: :save, changed: :name do

data/mod/standard/set/type/number.rb

@@ -1,6 +1,6 @@
 
 format :html do
-  def editor
+  def input_type
     :text_field
   end
 end

data/mod/standard/set/type/phrase.rb

@@ -1,5 +1,5 @@
 format :html do
-  def editor
+  def input_type
     :text_field
   end
 end

data/mod/standard/set/type/toggle.rb

@@ -12,7 +12,7 @@ view :core do
 end
 
 format :html do
-  view :editor do
+  view :input do
     toggle
   end
 
@@ -27,4 +27,12 @@ format :html do
   def toggle_label
     label :content, card.name.tag
   end
+
+  def one_line_content
+    short_content
+  end
+
+  def short_content
+    render_core
+  end
 end

data/mod/standard/set/type/uri.rb

@@ -9,7 +9,7 @@ format do
 end
 
 format :html do
-  def editor
+  def input_type
     :text_field
   end
 end

data/mod/standard/spec/set/all/error_spec.rb

@@ -1,7 +1,7 @@
 # -*- encoding : utf-8 -*-
 
 describe Card::Set::All::Error do
-  describe "missing view" do
+  describe "unknown view" do
     it "prompts to add" do
       expect(render_content("{{+cardipoo|open}}")).to match(/fa-plus-square.*cardipoo/)
     end

data/mod/standard/spec/set/type/cardtype_spec.rb

@@ -4,15 +4,16 @@ RSpec.describe Card::Set::Type::Cardtype do
   describe "view: add_button" do
     it "creates link with correct path" do
       expect(render_content("{{RichText|add_button}}"))
-        .to have_tag('a[href="/new/RichText"]', text: "Add RichText")
+        .to have_tag('a[href="/type/RichText?view=new_in_modal"]', text: "Add RichText")
     end
     it "handles title argument" do
       expect(render_content("{{RichText|add_button;title: custom link text}}"))
-        .to have_tag('a[href="/new/RichText"]', text: "custom link text")
+        .to have_tag('a[href="/type/RichText?view=new_in_modal"]',
+                     text: "custom link text")
     end
     it "handles params" do
       expect(render_content("{{RichText|add_button;params:_project=_self}}"))
-        .to have_tag('a[href="/new/RichText?_project=Tempo+Rary+2"]')
+        .to have_tag('a[href="/type/RichText?_project=Tempo+Rary+2&view=new_in_modal"]')
     end
   end
 

data/mod/standard/spec/set/type/number_spec.rb

@@ -2,6 +2,6 @@
 
 describe Card::Set::Type::Number do
   it "has special editor" do
-    assert_view_select render_editor("Number"), 'input[type="text"]'
+    assert_view_select render_input("Number"), 'input[type="text"]'
   end
 end

data/mod/standard/spec/set/type/phrase_spec.rb

@@ -2,7 +2,7 @@
 
 describe Card::Set::Type::Phrase do
   it "has special editor" do
-    assert_view_select render_editor("Phrase"),
+    assert_view_select render_input("Phrase"),
                        'input[type="text"][class~="d0-card-content"]'
   end
 end

data/mod/standard/spec/set/type/toggle_spec.rb

@@ -1,14 +1,13 @@
 # -*- encoding : utf-8 -*-
 
-describe Card::Set::Type::Toggle do
+RSpec.describe Card::Set::Type::Toggle do
   it "has special editor" do
-    assert_view_select render_editor("Toggle"), 'input[type="checkbox"]'
+    assert_view_select render_input("Toggle"), 'input[type="checkbox"]'
   end
 
   it "has yes/no as processed content" do
     expect(render_view(:core, type: "Toggle", content: "0")).to eq("no")
-    expect(render_view(:closed_content, type: "Toggle", content: "1"))
-      .to eq("yes")
+    expect(render_view(:core, type: "Toggle", content: "1")).to eq("yes")
   end
 
   describe "view :labeled_editor" do

data/mod/standard/spec/set/type/uri_spec.rb

@@ -2,7 +2,7 @@
 
 describe Card::Set::Type::Uri do
   it "has special editor" do
-    assert_view_select render_editor("Uri"),
+    assert_view_select render_input("Uri"),
                        'input[type="text"][class~="d0-card-content"]'
   end
 

data/mod/tinymce_editor/set/self/tiny_mce.rb

@@ -0,0 +1,7 @@
+def raw_help_text
+  <<-TEXT
+    Configure [[http://tinymce.com|TinyMCE]], Decko's default 
+    [[http://en.wikipedia.org/wiki/Wysiwyg|wysiwyg]] editor. 
+    [[http://decko.org/TinyMCE|more]]
+  TEXT
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: card
 version: !ruby/object:Gem::Version
-  version: 1.98.3
+  version: 1.99.0
 platform: ruby
 authors:
 - Ethan McCutchen
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cardname
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -266,61 +266,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.11.2
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: activerecord-import
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: card-mod-markdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2.1
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.2.2.1
+        version: '0.4'
 - !ruby/object:Gem::Dependency
-  name: activerecord-import
+  name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: card-mod-markdown
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 12.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<="
+      - !ruby/object:Gem::Version
+        version: 12.3.0
+- !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 5.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: 5.2.2.1
 description: Cards are wiki-inspired data atoms."Carditects" use links, nests, types,
   patterned names, queries, views, events, and rules to create rich structures.
 email:
@@ -447,7 +461,7 @@ files:
 - db/migrate_core_cards/20180508210903_add_json_type.rb
 - db/migrate_core_cards/20180515175726_add_codenames.rb
 - db/migrate_core_cards/20180712042655_head_rule.rb
-- db/migrate_core_cards/20180905061536_migrate_layouts.rb
+- db/migrate_core_cards/20180905061537_migrate_layouts.rb
 - db/migrate_core_cards/20181120200937_update_layout.rb
 - db/migrate_core_cards/20190125125150_add_script_rules_card.rb
 - db/migrate_core_cards/20190204195039_add_rule_card.rb
@@ -464,8 +478,20 @@ files:
 - db/migrate_core_cards/20190618110446_add_dropdown_divider.rb
 - db/migrate_core_cards/20190621143156_add_role_assign_permissions.rb
 - db/migrate_core_cards/20190625153616_pointer_overhaul.rb
-- db/migrate_core_cards/20190710090207_homepage_tweaks.rb
+- db/migrate_core_cards/20190710090209_homepage_tweaks.rb
 - db/migrate_core_cards/20190718140126_add_guides.rb
+- db/migrate_core_cards/20190820155833_update_cardtype_type_structure.rb
+- db/migrate_core_cards/20190822093633_move_help_text_to_code.rb
+- db/migrate_core_cards/20190823220018_cleanup_for_decko_1_0.rb
+- db/migrate_core_cards/20190826132738_add_more_guides.rb
+- db/migrate_core_cards/20190829093961_cardtype_grouping.rb
+- db/migrate_core_cards/20190829205148_remove_add_help.rb
+- db/migrate_core_cards/20190830131820_setting_settings_aside.rb
+- db/migrate_core_cards/20190902161223_add_style_media.rb
+- db/migrate_core_cards/20190902193208_input_type.rb
+- db/migrate_core_cards/20190904174403_token_upgrade.rb
+- db/migrate_core_cards/20190909104250_add_cardtype_input_types.rb
+- db/migrate_core_cards/20190918200115_ensure_description_card.rb
 - db/migrate_core_cards/data/1.11_help_text.json
 - db/migrate_core_cards/data/1.12_stylesheets/classic_cards.scss
 - db/migrate_core_cards/data/1.12_stylesheets/common.scss
@@ -475,26 +501,28 @@ files:
 - db/migrate_core_cards/data/1.14_config_descriptions_etc.json
 - db/migrate_core_cards/data/bootstrap_layout.json
 - db/migrate_core_cards/data/cards.yml
+- db/migrate_core_cards/data/cards/Xaccount
 - db/migrate_core_cards/data/cards/Xaccount_setting-Xright-Xstructure
 - db/migrate_core_cards/data/cards/Xall-Xlayout
 - db/migrate_core_cards/data/cards/Xcredit
 - db/migrate_core_cards/data/cards/Xfooter
 - db/migrate_core_cards/data/cards/Xgetting_started
-- db/migrate_core_cards/data/cards/Xgetting_started-link
 - db/migrate_core_cards/data/cards/Xgetting_started-shark
+- db/migrate_core_cards/data/cards/Xgetting_started_link
 - db/migrate_core_cards/data/cards/Xheader
 - db/migrate_core_cards/data/cards/Xhome
 - db/migrate_core_cards/data/cards/Xlogo
 - db/migrate_core_cards/data/cards/Xmain_menu
 - db/migrate_core_cards/data/cards/Xrecaptcha_setting-Xself-Xstructure
 - db/migrate_core_cards/data/cards/Xsidebar
+- db/migrate_core_cards/data/cards/Xstructure-Xright-Xguide
 - db/migrate_core_cards/data/cards/Xtitle
 - db/migrate_core_cards/data/cards/administrator-dashboard
 - db/migrate_core_cards/data/cards/administrator-description
 - db/migrate_core_cards/data/cards/anyone_signed_in-dashboard
+- db/migrate_core_cards/data/cards/cardtype-Xtype-Xguide
 - db/migrate_core_cards/data/cards/cardtype-Xtype-Xstructure
 - db/migrate_core_cards/data/cards/default_layout
-- db/migrate_core_cards/data/cards/eagle-description
 - db/migrate_core_cards/data/cards/full_width_layout
 - db/migrate_core_cards/data/cards/help_desk-dashboard
 - db/migrate_core_cards/data/cards/help_desk-description
@@ -574,8 +602,8 @@ files:
 - db/seed/test/fixtures/rails.gif
 - db/seed/test/fixtures/schema_migrations.yml
 - db/seed/test/fixtures/schema_migrations_core_cards.yml
-- db/seed/test/seed.rb
 - db/seeds.rb
+- db/test_seed.rb
 - db/version.txt
 - db/version_core_cards.txt
 - lib/application_job.rb
@@ -592,6 +620,7 @@ files:
 - lib/card/auth/permissions.rb
 - lib/card/auth/proxy.rb
 - lib/card/auth/setup.rb
+- lib/card/auth/token.rb
 - lib/card/cache.rb
 - lib/card/cache/persistent.rb
 - lib/card/cache/prepopulate.rb
@@ -750,18 +779,25 @@ files:
 - lib/generators/card/template/templates/haml_template.erb
 - mod/Modfile
 - mod/account/README.md
+- mod/account/set/abstract/account_field.rb
+- mod/account/set/abstract/accounted.rb
 - mod/account/set/all/account.rb
 - mod/account/set/right/account.rb
+- mod/account/set/right/account/events.rb
+- mod/account/set/right/account/views.rb
+- mod/account/set/right/api_key.rb
 - mod/account/set/right/email.rb
 - mod/account/set/right/password.rb
 - mod/account/set/right/roles.rb
 - mod/account/set/right/salt.rb
 - mod/account/set/right/status.rb
-- mod/account/set/right/token.rb
 - mod/account/set/self/signin.rb
 - mod/account/set/type/role.rb
 - mod/account/set/type/signup.rb
+- mod/account/set/type/signup/core.haml
+- mod/account/set/type/signup/views.rb
 - mod/account/set/type/user.rb
+- mod/account/set/type/user/setup_help.haml
 - mod/account/set/type_plus_right/user/email.rb
 - mod/account/spec/set/all/account_spec.rb
 - mod/account/spec/set/right/account_spec.rb
@@ -770,13 +806,11 @@ files:
 - mod/account/spec/set/right/roles_spec.rb
 - mod/account/spec/set/right/salt_spec.rb
 - mod/account/spec/set/right/status_spec.rb
-- mod/account/spec/set/right/token_spec.rb
 - mod/account/spec/set/self/signin_spec.rb
 - mod/account/spec/set/type/signup_spec.rb
 - mod/account/spec/set/type/user_spec.rb
-- mod/account/template/type/signup/core.haml
 - mod/ace_editor/db/migrate_core_cards/20160804112538_add_ace_cards.rb
-- mod/ace_editor/db/migrate_core_cards/20160805112548_delete_ace_help_card.rb
+- mod/ace_editor/db/migrate_core_cards/20180805112548_delete_ace_help_card.rb
 - mod/ace_editor/lib/javascript/script_ace.js
 - mod/ace_editor/lib/javascript/script_ace_config.js.coffee
 - mod/ace_editor/public/assets/ace/ext-beautify.js
@@ -1153,6 +1187,7 @@ files:
 - mod/ace_editor/set/self/script_ace_config.rb
 - mod/admin/set/self/admin.rb
 - mod/admin/set/self/admin_info.rb
+- mod/admin/set/self/debugger.rb
 - mod/admin/set/self/recaptcha_proxy.rb
 - mod/admin/set/self/recaptcha_secret_key.rb
 - mod/admin/set/self/recaptcha_settings.rb
@@ -1193,6 +1228,7 @@ files:
 - mod/basic_types/set/type/html.rb
 - mod/basic_types/set/type/json.rb
 - mod/basic_types/set/type/plain_text.rb
+- mod/basic_types/spec/set/type/html_spec.rb
 - mod/basic_types/spec/set/type/json_spec.rb
 - mod/basic_types/spec/set/type/plain_text_spec.rb
 - mod/bootstrap/db/migrate_core_cards/20170719163733_update_bootswatch_themes_to_4_beta.rb
@@ -1373,7 +1409,6 @@ files:
 - mod/bootstrap/set/abstract/bootstrap_code_file.rb
 - mod/bootstrap/set/abstract/bootswatch_theme.rb
 - mod/bootstrap/set/abstract/bootswatch_theme/html_views.rb
-- mod/bootstrap/set/abstract/bootswatch_theme/thumbnail.haml
 - mod/bootstrap/set/all/bootstrap/accordion.rb
 - mod/bootstrap/set/all/bootstrap/dropdown.rb
 - mod/bootstrap/set/all/bootstrap/form.rb
@@ -1404,7 +1439,7 @@ files:
 - mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors.rb
 - mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/_colorpicker.haml
 - mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/core.haml
-- mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/editor.haml
+- mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/input.haml
 - mod/bootstrap/spec/set/all/bootstrap/bootstrap_builder_spec.rb
 - mod/bootstrap/spec/set/all/bootstrap/bootstrap_spec.rb
 - mod/bootstrap/spec/set/all/bootstrap/carousel_spec.rb
@@ -4196,6 +4231,7 @@ files:
 - mod/date/lib/javascript/script_datepicker_config.js.coffee
 - mod/date/lib/stylesheets/tempusdominus.scss
 - mod/date/set/all/calendar.rb
+- mod/date/set/self/datepicker.rb
 - mod/date/set/self/script_datepicker.rb
 - mod/date/set/self/script_datepicker_config.rb
 - mod/date/set/self/style_datepicker.rb
@@ -4895,8 +4931,11 @@ files:
 - mod/developer/spec/set/all/view_viz_spec.rb
 - mod/developer/spec/set/right/debug_spec.rb
 - mod/edit/set/all/bridge.rb
+- mod/edit/set/all/bridge/account_section.rb
 - mod/edit/set/all/bridge/bridge.haml
+- mod/edit/set/all/bridge/bridge_pills.rb
 - mod/edit/set/all/bridge/follow_section.rb
+- mod/edit/set/all/bridge/related_section.rb
 - mod/edit/set/all/bridge/tab_views.rb
 - mod/edit/set/all/bridge/tab_visibility.rb
 - mod/edit/set/all/edit_content.rb
@@ -4910,6 +4949,7 @@ files:
 - mod/edit/set/all/form_elements.rb
 - mod/edit/set/all/formgroup.rb
 - mod/edit/set/all/nest_editor.rb
+- mod/edit/set/all/nest_editor/_help.haml
 - mod/edit/set/all/nest_editor/_options.haml
 - mod/edit/set/all/nest_editor/_options_select.haml
 - mod/edit/set/all/nest_editor/_options_select_row.haml
@@ -4917,6 +4957,12 @@ files:
 - mod/edit/set/all/nest_editor/nest_parser.rb
 - mod/edit/set/all/nest_image.rb
 - mod/edit/set/all/new.rb
+- mod/edit/set/all/overlay_guide.haml
+- mod/edit/set/all/overlay_guide.rb
+- mod/edit/set/all/template_nest.rb
+- mod/edit/set/type/list.rb
+- mod/edit/set/type/plain_text.rb
+- mod/edit/set/type/pointer.rb
 - mod/edit/spec/set/all/bridge/tab_views_spec.rb
 - mod/edit/spec/set/all/bridge_spec.rb
 - mod/edit/spec/set/all/editing_spec.rb
@@ -5175,6 +5221,12 @@ files:
 - mod/machines/vendor/jquery_rails/vendor/assets/javascripts/jquery3.min.js
 - mod/machines/vendor/jquery_rails/vendor/assets/javascripts/jquery3.min.map
 - mod/machines/vendor/jquery_rails/vendor/assets/javascripts/jquery_ujs.js
+- mod/media/lib/stylesheets/style_image_box.scss
+- mod/media/set/abstract/media.rb
+- mod/media/set/abstract/media/media_snippet.haml
+- mod/media/set/self/style_media.rb
+- mod/media/set/type/image.rb
+- mod/media/spec/set/abstract/media_spec.rb
 - mod/navbar/set/abstract/account_dropdown.rb
 - mod/navbar/set/abstract/pointer/html_views.rb
 - mod/navbar/set/all/navbar_links.rb
@@ -5209,7 +5261,7 @@ files:
 - mod/pointer/set/abstract/02_pointer/options_api.rb
 - mod/pointer/set/abstract/02_pointer/other_views.rb
 - mod/pointer/set/abstract/code_pointer.rb
-- mod/pointer/set/right/options.rb
+- mod/pointer/set/right/content_options.rb
 - mod/pointer/set/self/input_options.rb
 - mod/pointer/set/self/script_editors.rb
 - mod/pointer/set/self/script_libraries.rb
@@ -5218,6 +5270,7 @@ files:
 - mod/pointer/set/self/style_libraries.rb
 - mod/pointer/set/self/style_mods.rb
 - mod/pointer/set/type/link_list.rb
+- mod/pointer/set/type/link_list/link_list_input.haml
 - mod/pointer/set/type/list.rb
 - mod/pointer/set/type/mirror_list.rb
 - mod/pointer/set/type/mirrored_list.rb
@@ -5243,11 +5296,15 @@ files:
 - mod/prosemirror_editor/set/self/style_prosemirror.rb
 - mod/recaptcha/set/all/recaptcha.rb
 - mod/rules/lib/javascript/script_rules.js.coffee
+- mod/rules/set/right/self.rb
 - mod/rules/set/rstar/rule_user.rb
+- mod/rules/set/rule/bar_view.rb
 - mod/rules/set/rule/bridge_rules_editor.rb
 - mod/rules/set/rule/editor.rb
-- mod/rules/set/rule/editor/quick_edit.haml
-- mod/rules/set/rule/editor/set_info.haml
+- mod/rules/set/rule/html_views.rb
+- mod/rules/set/rule/quick_editor.rb
+- mod/rules/set/rule/quick_editor/quick_edit.haml
+- mod/rules/set/rule/quick_editor/set_info.haml
 - mod/rules/set/rule/rule_form.rb
 - mod/rules/set/rule/rule_form/buttons.rb
 - mod/rules/set/rule/rule_form/form_elements.rb
@@ -5255,23 +5312,18 @@ files:
 - mod/rules/set/rule/rule_form/rule_set_radio.rb
 - mod/rules/set/rule/rule_form/set_selection.rb
 - mod/rules/set/rule/rules.rb
-- mod/rules/set/rule/table.rb
-- mod/rules/set/rule/table_row.rb
 - mod/rules/set/self/script_rules.rb
 - mod/rules/set/type/set.rb
 - mod/rules/set/type/set/html_views.rb
 - mod/rules/set/type/set/html_views/group_panel.haml
-- mod/rules/set/type/set/html_views/nest_rules.rb
-- mod/rules/set/type/set/html_views/rules_bridge.rb
-- mod/rules/set/type/set/html_views/rules_table.haml
+- mod/rules/set/type/set/html_views/rule_lists.rb
 - mod/rules/set/type/set/html_views/template.rb
-- mod/rules/set/type/set/html_views/template/template_editor.haml
 - mod/rules/set/type/set/rules_filter.rb
 - mod/rules/set/type/set/setting_lists.rb
+- mod/rules/spec/set/rule/bar_view_spec.rb
 - mod/rules/spec/set/rule/editor_spec.rb
-- mod/rules/spec/set/rule/table_row_spec.rb
-- mod/rules/spec/set/rule/table_spec.rb
 - mod/rules/spec/set/type/set/html_views_spec.rb
+- mod/rules/spec/set/type/set/setting_lists_spec.rb
 - mod/rules/spec/set/type/set_spec.rb
 - mod/search/lib/card/filter_query.rb
 - mod/search/set/abstract/00_filter_helper.rb
@@ -5288,6 +5340,18 @@ files:
 - mod/search/set/abstract/search.rb
 - mod/search/set/abstract/search/views.rb
 - mod/search/set/abstract/wql_search.rb
+- mod/search/set/right/children.rb
+- mod/search/set/right/created.rb
+- mod/search/set/right/edited.rb
+- mod/search/set/right/editors.rb
+- mod/search/set/right/follow.rb
+- mod/search/set/right/linked_to_by.rb
+- mod/search/set/right/links_to.rb
+- mod/search/set/right/mates.rb
+- mod/search/set/right/nested_by.rb
+- mod/search/set/right/nests.rb
+- mod/search/set/right/referred_to_by.rb
+- mod/search/set/right/refers_to.rb
 - mod/search/set/self/recent.rb
 - mod/search/set/self/search.rb
 - mod/search/set/type/search_type.rb
@@ -5300,24 +5364,27 @@ files:
 - mod/settings/lib/card/setting.rb
 - mod/settings/set/abstract/permission.rb
 - mod/settings/set/abstract/templated_nests.rb
-- mod/settings/set/right/add_help.rb
+- mod/settings/set/all/supports_content_options.rb
 - mod/settings/set/right/autoname.rb
 - mod/settings/set/right/comment.rb
+- mod/settings/set/right/content_option_view.rb
+- mod/settings/set/right/content_options.rb
 - mod/settings/set/right/create.rb
 - mod/settings/set/right/default.rb
 - mod/settings/set/right/delete.rb
 - mod/settings/set/right/guide.rb
 - mod/settings/set/right/help.rb
+- mod/settings/set/right/input_type.rb
 - mod/settings/set/right/read.rb
 - mod/settings/set/right/script.rb
 - mod/settings/set/right/structure.rb
 - mod/settings/set/right/style.rb
-- mod/settings/set/right/style/editor.haml
+- mod/settings/set/right/style/input.haml
 - mod/settings/set/right/update.rb
-- mod/settings/set/self/accountable.rb
-- mod/settings/set/self/add_help.rb
 - mod/settings/set/self/autoname.rb
 - mod/settings/set/self/captcha.rb
+- mod/settings/set/self/content_option_view.rb
+- mod/settings/set/self/content_options.rb
 - mod/settings/set/self/create.rb
 - mod/settings/set/self/csv_structure.rb
 - mod/settings/set/self/default.rb
@@ -5327,13 +5394,11 @@ files:
 - mod/settings/set/self/guide.rb
 - mod/settings/set/self/head.rb
 - mod/settings/set/self/help.rb
-- mod/settings/set/self/input.rb
+- mod/settings/set/self/input_type.rb
 - mod/settings/set/self/layout.rb
 - mod/settings/set/self/on_create.rb
 - mod/settings/set/self/on_delete.rb
 - mod/settings/set/self/on_update.rb
-- mod/settings/set/self/options.rb
-- mod/settings/set/self/options_label.rb
 - mod/settings/set/self/read.rb
 - mod/settings/set/self/recent_settings.rb
 - mod/settings/set/self/script.rb
@@ -5343,7 +5408,6 @@ files:
 - mod/settings/set/self/thanks.rb
 - mod/settings/set/self/update.rb
 - mod/settings/set/type/setting.rb
-- mod/settings/spec/set/right/add_help_spec.rb
 - mod/settings/spec/set/right/comment_spec.rb
 - mod/settings/spec/set/right/create_spec.rb
 - mod/settings/spec/set/right/default_spec.rb
@@ -5402,13 +5466,16 @@ files:
 - mod/standard/set/all/rich_html/wrapper.rb
 - mod/standard/set/right/discussion.rb
 - mod/standard/set/right/head.rb
+- mod/standard/set/right/type_plus_right.rb
 - mod/standard/set/right/when_created.rb
 - mod/standard/set/right/when_last_edited.rb
 - mod/standard/set/self/alerts.rb
+- mod/standard/set/self/cardtype.rb
 - mod/standard/set/self/codenames.rb
 - mod/standard/set/self/foot.rb
 - mod/standard/set/self/home.rb
 - mod/standard/set/self/now.rb
+- mod/standard/set/self/sidebar.rb
 - mod/standard/set/type/basic.rb
 - mod/standard/set/type/cardtype.rb
 - mod/standard/set/type/layout_type.rb
@@ -5449,7 +5516,6 @@ files:
 - mod/standard/spec/set/type/cardtype_spec.rb
 - mod/standard/spec/set/type/email_template/email_config_spec.rb
 - mod/standard/spec/set/type/email_template_spec.rb
-- mod/standard/spec/set/type/html_spec.rb
 - mod/standard/spec/set/type/layout_type_spec.rb
 - mod/standard/spec/set/type/number_spec.rb
 - mod/standard/spec/set/type/phrase_spec.rb
@@ -5531,6 +5597,7 @@ files:
 - mod/tinymce_editor/set/abstract/tinymce_editor.rb
 - mod/tinymce_editor/set/self/script_tinymce.rb
 - mod/tinymce_editor/set/self/script_tinymce_config.rb
+- mod/tinymce_editor/set/self/tiny_mce.rb
 - mod/twitter/Gemfile
 - mod/twitter/db/migrate_core_cards/20170305112346_add_twitter_cards.rb
 - mod/twitter/set/type/twitter_template.rb
@@ -5540,11 +5607,8 @@ files:
 - mod/utility/set/abstract/bs_badge/tab_badge.haml
 - mod/utility/set/abstract/filterable.rb
 - mod/utility/set/abstract/filterable_bar.rb
-- mod/utility/set/abstract/media.rb
-- mod/utility/set/abstract/media/media_snippet.haml
 - mod/utility/set/abstract/utility.rb
 - mod/utility/spec/set/abstract/bs_badge_spec.rb
-- mod/utility/spec/set/abstract/media_spec.rb
 - mod/utility/spec/set/abstract/utility_spec.rb
 - mod/virtual/lib/card/virtual.rb
 - mod/virtual/set/abstract/virtual_cache.rb