card 1.96.8 → 1.97.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/VERSION +1 -1
- data/config/initializers/01_core_extensions/hash.rb +7 -7
- data/config/initializers/01_core_extensions/object.rb +8 -4
- data/config/initializers/02_patches/kaminari.rb +0 -6
- data/config/locales/de.yml +7 -4
- data/config/locales/en.yml +46 -39
- data/db/migrate/20110511221913_require_earlier_migrations.rb +1 -0
- data/db/migrate/20120105203350_require_1_8_migrations.rb +1 -0
- data/db/migrate/20190116170824_add_left_key_to_card_virtuals.rb +11 -0
- data/db/migrate/20190131223248_add_codename_index.rb +9 -0
- data/db/migrate_core_cards/20120611203506_rails_inflection_updates.rb +8 -2
- data/db/migrate_core_cards/20180712042655_head_rule.rb +14 -0
- data/db/migrate_core_cards/20180905061536_migrate_layouts.rb +64 -0
- data/db/migrate_core_cards/20190125125150_add_script_rules_card.rb +9 -0
- data/db/migrate_core_cards/20190204195039_add_rule_card.rb +7 -0
- data/db/migrate_core_cards/data/decko_logo.svg +59 -0
- data/db/schema.rb +3 -2
- data/db/seed/new/card_actions.yml +1506 -1458
- data/db/seed/new/card_acts.yml +2 -2
- data/db/seed/new/card_references.yml +633 -633
- data/db/seed/new/cards.yml +1802 -1634
- data/db/seed/new/schema_migrations.yml +4 -0
- data/db/seed/new/schema_migrations_core_cards.yml +28 -2
- data/db/seed/test/fixtures/card_actions.yml +2485 -2533
- data/db/seed/test/fixtures/card_acts.yml +520 -460
- data/db/seed/test/fixtures/card_changes.yml +66 -66
- data/db/seed/test/fixtures/card_references.yml +1533 -1407
- data/db/seed/test/fixtures/cards.yml +3392 -2945
- data/db/seed/test/fixtures/schema_migrations.yml +4 -0
- data/db/seed/test/fixtures/schema_migrations_core_cards.yml +28 -2
- data/db/seed/test/seed.rb +33 -1
- data/db/version.txt +1 -1
- data/db/version_core_cards.txt +1 -1
- data/lib/card.rb +1 -0
- data/lib/card/act_manager.rb +6 -2
- data/lib/card/act_manager/stage.rb +5 -5
- data/lib/card/act_manager/stage_director.rb +11 -7
- data/lib/card/act_manager/stage_director/phases.rb +4 -8
- data/lib/card/auth.rb +1 -0
- data/lib/card/auth/current.rb +1 -1
- data/lib/card/auth/permissions.rb +1 -0
- data/lib/card/auth/proxy.rb +1 -0
- data/lib/card/cache.rb +10 -9
- data/lib/card/cache/persistent.rb +2 -1
- data/lib/card/cache/prepopulate.rb +1 -0
- data/lib/card/cache/temporary.rb +1 -0
- data/lib/card/codename.rb +11 -6
- data/lib/card/content/chunk.rb +24 -9
- data/lib/card/content/clean.rb +4 -2
- data/lib/card/content/diff.rb +4 -4
- data/lib/card/content/diff/lcs.rb +1 -3
- data/lib/card/content/diff/processor.rb +2 -0
- data/lib/card/content/diff/result.rb +3 -0
- data/lib/card/content/parser.rb +2 -1
- data/lib/card/content/truncate.rb +4 -1
- data/lib/card/dirty.rb +3 -2
- data/lib/card/env.rb +11 -2
- data/lib/card/env/location_history.rb +3 -1
- data/lib/card/env/success.rb +3 -1
- data/lib/card/error.rb +42 -8
- data/lib/card/format.rb +22 -9
- data/lib/card/format/content.rb +10 -2
- data/lib/card/format/context_names.rb +4 -2
- data/lib/card/format/error.rb +1 -1
- data/lib/card/format/nest.rb +4 -3
- data/lib/card/format/nesting.rb +2 -0
- data/lib/card/format/nesting/main.rb +11 -5
- data/lib/card/format/nesting/mode.rb +1 -0
- data/lib/card/format/nesting/subformat.rb +12 -0
- data/lib/card/format/permission.rb +3 -0
- data/lib/card/format/registration.rb +7 -3
- data/lib/card/format/render.rb +73 -17
- data/lib/card/mailer.rb +2 -1
- data/lib/card/mark.rb +2 -2
- data/lib/card/migration.rb +115 -113
- data/lib/card/migration/core.rb +1 -0
- data/lib/card/migration/deck_structure.rb +1 -0
- data/lib/card/migration/import.rb +1 -1
- data/lib/card/migration/import/import_data.rb +6 -3
- data/lib/card/migration/import/import_data/card_attributes.rb +56 -54
- data/lib/card/migration/import/import_data/card_content.rb +0 -1
- data/lib/card/mod.rb +4 -1
- data/lib/card/mod/dirs.rb +11 -2
- data/lib/card/mod/load_strategy.rb +4 -4
- data/lib/card/mod/load_strategy/set_binding_magic.rb +9 -5
- data/lib/card/mod/load_strategy/set_tmp_files.rb +1 -1
- data/lib/card/mod/load_strategy/tmp_files.rb +1 -0
- data/lib/card/mod/loader.rb +8 -9
- data/lib/card/mod/loader/set_loader.rb +4 -4
- data/lib/card/mod/loader/set_pattern_loader.rb +2 -2
- data/lib/card/mod/module_template.rb +12 -12
- data/lib/card/model/save_helper.rb +13 -4
- data/lib/card/name.rb +3 -2
- data/lib/card/name/name_variants.rb +3 -3
- data/lib/card/query.rb +19 -12
- data/lib/card/query/abstract_query/query_helper.rb +2 -0
- data/lib/card/query/card_query.rb +1 -0
- data/lib/card/query/card_query/conjunctions.rb +2 -0
- data/lib/card/query/card_query/interpretation.rb +2 -7
- data/lib/card/query/card_query/match_attributes.rb +1 -0
- data/lib/card/query/card_query/reference_attributes.rb +4 -4
- data/lib/card/query/card_query/run.rb +1 -0
- data/lib/card/query/card_query/sorting.rb +1 -0
- data/lib/card/query/clause.rb +14 -12
- data/lib/card/query/join.rb +4 -2
- data/lib/card/query/reference_query.rb +1 -0
- data/lib/card/query/sql_statement.rb +4 -8
- data/lib/card/query/sql_statement/joins.rb +1 -0
- data/lib/card/query/sql_statement/order.rb +7 -6
- data/lib/card/query/sql_statement/where.rb +3 -1
- data/lib/card/query/value.rb +1 -0
- data/lib/card/reference.rb +1 -0
- data/lib/card/set/advanced_api.rb +2 -2
- data/lib/card/set/code_nest.rb +15 -0
- data/lib/card/set/event.rb +4 -3
- data/lib/card/set/event/callbacks.rb +1 -0
- data/lib/card/set/event/delayed_event.rb +7 -6
- data/lib/card/set/event/options.rb +5 -1
- data/lib/card/set/format.rb +21 -0
- data/lib/card/set/format/abstract_format.rb +15 -6
- data/lib/card/set/format/haml_views.rb +1 -1
- data/lib/card/set/format/wrapper.rb +89 -0
- data/lib/card/set/helpers.rb +5 -0
- data/lib/card/set/i18n_scanner.rb +5 -4
- data/lib/card/set/i18n_scope.rb +10 -10
- data/lib/card/set/inheritance.rb +3 -0
- data/lib/card/set/loader.rb +1 -0
- data/lib/card/set/required_field.rb +74 -0
- data/lib/card/set/trait.rb +6 -0
- data/lib/card/set_pattern.rb +8 -4
- data/lib/card/subcards.rb +9 -1
- data/lib/card/subcards/add.rb +1 -3
- data/lib/card/subcards/remove.rb +2 -0
- data/lib/card/tasks/card.rake +2 -0
- data/lib/card/tasks/card/create.rake +2 -1
- data/lib/card/tasks/card/file_card_creator.rb +1 -1
- data/lib/card/tasks/card/file_card_creator/abstract_file_card/migration_file.rb +1 -0
- data/lib/card/tasks/card/migrate.rake +3 -3
- data/lib/card/version.rb +6 -4
- data/lib/card/view.rb +15 -2
- data/lib/card/view/cache.rb +12 -12
- data/lib/card/view/cache_action.rb +11 -14
- data/lib/card/view/classy.rb +168 -0
- data/lib/card/view/layout.rb +14 -0
- data/lib/card/view/options.rb +12 -8
- data/lib/card/view/options/key_lists.rb +4 -4
- data/lib/card/view/options/voo_api.rb +46 -9
- data/lib/card/view/stub.rb +2 -2
- data/lib/card/view/visibility.rb +4 -5
- data/lib/card/view/wrapper.rb +28 -0
- data/lib/cardio.rb +2 -1
- data/mod/Modfile +2 -0
- data/mod/account/set/right/account.rb +4 -6
- data/mod/account/set/right/password.rb +2 -2
- data/mod/account/set/self/signin.rb +16 -9
- data/mod/account/set/type/signup.rb +1 -1
- data/mod/account/spec/set/right/password_spec.rb +26 -19
- data/mod/account/spec/set/type/signup_spec.rb +1 -1
- data/mod/basic_formats/set/self/head.rb +4 -0
- data/mod/bootstrap/lib/javascript/script_load_select2.js.coffee +2 -0
- data/mod/bootstrap/lib/stylesheets/style_bootstrap_cards.scss +76 -21
- data/mod/bootstrap/lib/stylesheets/style_select2_bootstrap.scss +24 -6
- data/mod/bootstrap/set/abstract/bootswatch_theme/html_views.rb +2 -1
- data/mod/bootstrap/set/type/customized_bootswatch_skin/core.haml +2 -2
- data/mod/bootstrap/set/type/customized_bootswatch_skin/html_views.rb +14 -14
- data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors.rb +4 -0
- data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/core.haml +10 -0
- data/mod/carrierwave/lib/carrier_wave/file_card_uploader.rb +2 -2
- data/mod/carrierwave/set/abstract/attachment.rb +1 -1
- data/mod/carrierwave/set/type/file.rb +4 -0
- data/mod/carrierwave/set/type/image.rb +13 -0
- data/mod/carrierwave/spec/lib/carrier_wave/file_card_uploader_spec.rb +2 -2
- data/mod/carrierwave/spec/set/type/file_spec.rb +4 -4
- data/mod/carrierwave/spec/set/type/image_spec.rb +6 -6
- data/mod/core/chunk/nest.rb +9 -1
- data/mod/core/format/html_format.rb +9 -45
- data/mod/core/layout/blank.html +5 -5
- data/mod/core/layout/default.html +10 -8
- data/mod/core/layout/noside.html +6 -9
- data/mod/core/layout/pre.html +1 -2
- data/mod/core/layout/simple.html +1 -5
- data/mod/core/set/abstract/code_file.rb +1 -1
- data/mod/core/set/all/cache.rb +0 -2
- data/mod/core/set/all/codename.rb +2 -0
- data/mod/core/set/all/collection.rb +3 -1
- data/mod/core/set/all/event_conditions.rb +36 -4
- data/mod/core/set/all/export.rb +1 -10
- data/mod/core/set/all/haml.rb +3 -2
- data/mod/core/set/all/layouts.rb +34 -0
- data/mod/core/set/all/name_events.rb +1 -1
- data/mod/core/set/all/pattern.rb +6 -11
- data/mod/core/set/all/subcards.rb +4 -0
- data/mod/core/set/all/utils.rb +21 -1
- data/mod/core/set_pattern/07_type_plus_right.rb +1 -1
- data/mod/core/set_pattern/08_rule.rb +17 -0
- data/mod/core/set_pattern/{08_self.rb → 09_self.rb} +0 -0
- data/mod/core/spec/format/html_format_spec.rb +6 -99
- data/mod/core/spec/set/all/codename_spec.rb +1 -1
- data/mod/core/spec/set/all/collection_spec.rb +9 -5
- data/mod/core/spec/set/all/event_conditions_spec.rb +91 -0
- data/mod/core/spec/set/all/pattern_spec.rb +17 -10
- data/mod/developer/spec/set/right/debug_spec.rb +1 -1
- data/mod/edit/set/all/bridge.rb +61 -0
- data/mod/edit/set/all/bridge/bridge.haml +6 -0
- data/mod/edit/set/all/bridge/follow_section.rb +37 -0
- data/mod/edit/set/all/bridge/tab_views.rb +75 -0
- data/mod/edit/set/all/bridge/tab_visibility.rb +51 -0
- data/mod/edit/set/all/edit_content.rb +58 -0
- data/mod/edit/set/all/edit_in_place.rb +58 -0
- data/mod/edit/set/all/edit_name.rb +87 -0
- data/mod/edit/set/all/edit_type.rb +28 -0
- data/mod/edit/set/all/editing.rb +79 -0
- data/mod/{standard/set/all/rich_html → edit/set/all}/editor.rb +1 -0
- data/mod/{standard/set/all/rich_html → edit/set/all}/form.rb +17 -10
- data/mod/edit/set/all/form_buttons.rb +52 -0
- data/mod/{standard/set/all/rich_html → edit/set/all}/form_elements.rb +2 -1
- data/mod/{standard/set/all/rich_html → edit/set/all}/formgroup.rb +3 -1
- data/mod/{standard/set/all/rich_html → edit/set/all}/new.rb +0 -2
- data/mod/edit/set/all/toolbar.rb +8 -0
- data/mod/edit/spec/set/all/bridge/tab_views_spec.rb +14 -0
- data/mod/{standard/spec/set/all/rich_html/editing_spec.rb → edit/spec/set/all/bridge_spec.rb} +1 -1
- data/mod/edit/spec/set/all/editing_spec.rb +15 -0
- data/mod/{standard/spec/set/all/rich_html → edit/spec/set/all}/form_elements_spec.rb +10 -8
- data/mod/edit/spec/set/all/form_spec.rb +50 -0
- data/mod/follow/lib/card/follower_stash.rb +5 -0
- data/mod/follow/set/abstract/follow_option.rb +0 -1
- data/mod/follow/set/all/follow/follow_link.rb +42 -54
- data/mod/follow/set/all/follow/follow_link_views.rb +29 -0
- data/mod/follow/set/all/follow/followed_by.rb +3 -0
- data/mod/follow/set/all/follow/follower_ids.rb +5 -0
- data/mod/follow/set/all/follow/start_follow_link.rb +11 -0
- data/mod/follow/set/all/follow/stop_follow_link.rb +12 -0
- data/mod/follow/set/all/notify.rb +4 -0
- data/mod/follow/set/all/notify/base_views.rb +11 -0
- data/mod/follow/set/right/account.rb +2 -1
- data/mod/follow/set/right/follow.rb +4 -0
- data/mod/follow/set/right/follow/follow_status.haml +2 -2
- data/mod/follow/set/right/followers.rb +1 -0
- data/mod/follow/set/right/following.rb +2 -3
- data/mod/follow/set/self/follow_defaults.rb +17 -16
- data/mod/follow/set/type/set.rb +2 -0
- data/mod/follow/set/type/user.rb +1 -0
- data/mod/follow/set/type_plus_right/user/follow.rb +1 -0
- data/mod/follow/set/type_plus_right/user/follow/follow_editor.haml +4 -1
- data/mod/follow/set/type_plus_right/user/follow/follow_editor_helper.rb +6 -0
- data/mod/follow/spec/set/all/follow/follow_link_views_spec.rb +27 -0
- data/mod/follow/spec/set/all/follow/start_follow_link_spec.rb +11 -0
- data/mod/follow/spec/set/all/follow/stop_follow_link_spec.rb +13 -0
- data/mod/follow/spec/set/all/follow_spec.rb +13 -9
- data/mod/follow/spec/set/all/notify_spec.rb +4 -3
- data/mod/follow/spec/set/right/account_spec.rb +29 -31
- data/mod/follow/spec/set/right/following_spec.rb +2 -8
- data/mod/history/lib/card/act.rb +9 -7
- data/mod/history/lib/card/act/act_renderer.rb +12 -9
- data/mod/history/lib/card/act/act_renderer/absolute_act_renderer.rb +2 -2
- data/mod/history/lib/card/act/act_renderer/bridge_act_renderer.rb +53 -0
- data/mod/history/lib/card/act/act_renderer/relative_act_renderer.rb +3 -0
- data/mod/history/lib/card/action.rb +9 -4
- data/mod/history/lib/card/action/action_renderer.rb +5 -3
- data/mod/history/lib/card/action/differ.rb +3 -0
- data/mod/history/set/all/history.rb +2 -1
- data/mod/history/set/all/history/act_listing.rb +11 -8
- data/mod/history/set/all/history/actions.rb +11 -2
- data/mod/history/set/all/history/events.rb +0 -1
- data/mod/history/set/all/history/last.rb +2 -1
- data/mod/history/set/all/history/revision.rb +1 -0
- data/mod/history/set/all/history/selected.rb +1 -1
- data/mod/history/set/all/history/views.rb +0 -1
- data/mod/history/set/all/history_bridge.rb +66 -0
- data/mod/item/set/all/bar.haml +1 -3
- data/mod/item/set/all/bar.rb +39 -21
- data/mod/item/set/all/box.haml +1 -0
- data/mod/item/set/all/box.rb +13 -3
- data/mod/item/set/all/expanded_bar.haml +4 -6
- data/mod/machines/file/all_script_machine_output/file.js +37380 -65
- data/mod/machines/file/all_style_machine_output/file.css +2 -2
- data/mod/machines/file/script_html5shiv_printshiv_machine_output/file.js +1 -1
- data/mod/machines/lib/javascript/decko.js.coffee +2 -17
- data/mod/machines/lib/javascript/decko_bridge.js.coffee +28 -0
- data/mod/machines/lib/javascript/decko_components.js.coffee +21 -0
- data/mod/machines/lib/javascript/decko_filter.js.coffee +3 -1
- data/mod/machines/lib/javascript/decko_mod.js.coffee +7 -64
- data/mod/machines/lib/javascript/decko_modal.js.coffee +108 -0
- data/mod/machines/lib/javascript/decko_navbox.js.coffee +2 -0
- data/mod/machines/lib/javascript/decko_overlay.js.coffee +42 -0
- data/mod/machines/lib/javascript/decko_recaptcha.js.coffee +9 -1
- data/mod/machines/lib/javascript/decko_slot.js.coffee +46 -50
- data/mod/machines/lib/javascript/decko_slotter.js.coffee +204 -63
- data/mod/machines/lib/javascript/script_card_menu.js.coffee +3 -3
- data/mod/machines/lib/stylesheets/style_cards.scss +234 -107
- data/mod/machines/set/abstract/machine.rb +4 -3
- data/mod/machines/set/self/script_slot.rb +2 -2
- data/mod/machines/set/type/css.rb +8 -1
- data/mod/machines/set/type/skin.rb +1 -1
- data/mod/machines/spec/set/type/coffeescript_spec.rb +3 -3
- data/mod/pointer/set/abstract/00_paging_params.rb +2 -0
- data/mod/pointer/set/abstract/01_paging.rb +12 -6
- data/mod/pointer/set/abstract/02_pointer/html_views.rb +25 -0
- data/mod/pointer/set/abstract/02_pointer/html_views/filter.rb +20 -4
- data/mod/pointer/set/abstract/02_pointer/html_views/filter/filter_items.haml +1 -6
- data/mod/pointer/set/abstract/02_pointer/html_views/filter/filtered_list_input.haml +4 -13
- data/mod/pointer/set/type/pointer.rb +9 -0
- data/mod/pointer/spec/set/abstract/pointer/events_spec.rb +6 -0
- data/mod/rules/lib/javascript/script_rules.js.coffee +23 -0
- data/mod/rules/set/rstar/rule_user.rb +8 -0
- data/mod/rules/set/rule/bridge_rules_editor.rb +32 -0
- data/mod/rules/set/rule/editor.rb +144 -0
- data/mod/rules/set/rule/rule_form.rb +57 -0
- data/mod/rules/set/rule/rule_form/buttons.rb +44 -0
- data/mod/rules/set/rule/rule_form/form_elements.rb +52 -0
- data/mod/rules/set/rule/rule_form/rule_form.haml +20 -0
- data/mod/rules/set/rule/rule_form/rule_set_radio.rb +86 -0
- data/mod/rules/set/rule/rule_form/set_selection.rb +46 -0
- data/mod/{standard/set/rstar → rules/set/rule}/rules.rb +5 -9
- data/mod/rules/set/rule/table.rb +27 -0
- data/mod/rules/set/rule/table_row.rb +62 -0
- data/mod/rules/set/self/script_rules.rb +3 -0
- data/mod/{standard → rules}/set/type/set.rb +8 -10
- data/mod/rules/set/type/set/html_views.rb +72 -0
- data/mod/{standard → rules}/set/type/set/html_views/group_panel.haml +0 -0
- data/mod/rules/set/type/set/html_views/rules_bridge.rb +129 -0
- data/mod/rules/set/type/set/html_views/rules_table.haml +11 -0
- data/mod/{standard → rules}/set/type/set/html_views/template.rb +3 -7
- data/mod/{standard → rules}/set/type/set/html_views/template/template_editor.haml +0 -0
- data/mod/rules/spec/set/rule/editor_spec.rb +9 -0
- data/mod/rules/spec/set/rule/table_row_spec.rb +9 -0
- data/mod/rules/spec/set/rule/table_spec.rb +15 -0
- data/mod/rules/spec/set/type/set/html_views_spec.rb +22 -0
- data/mod/{standard → rules}/spec/set/type/set_spec.rb +18 -18
- data/mod/search/set/abstract/00_filter_helper.rb +15 -7
- data/mod/search/set/abstract/01_filter_form_helper.rb +1 -0
- data/mod/search/set/abstract/02_search_params.rb +7 -5
- data/mod/search/set/abstract/03_filter.rb +3 -2
- data/mod/search/set/abstract/04_right_filter_form.rb +1 -2
- data/mod/search/set/abstract/search.rb +1 -1
- data/mod/search/set/abstract/search/views.rb +2 -0
- data/mod/search/set/abstract/wql_search.rb +6 -0
- data/mod/search/set/self/navbox.rb +1 -1
- data/mod/search/set/self/search.rb +2 -2
- data/mod/settings/lib/card/setting.rb +6 -1
- data/mod/settings/set/right/help.rb +4 -0
- data/mod/settings/set/right/read.rb +14 -4
- data/mod/settings/set/right/structure.rb +3 -0
- data/mod/settings/set/right/style.rb +2 -1
- data/mod/settings/set/self/create.rb +2 -1
- data/mod/settings/set/self/default.rb +2 -1
- data/mod/settings/set/self/delete.rb +2 -1
- data/mod/settings/set/self/head.rb +2 -0
- data/mod/settings/set/self/help.rb +2 -1
- data/mod/settings/set/self/input.rb +1 -1
- data/mod/settings/set/self/read.rb +2 -1
- data/mod/settings/set/self/structure.rb +2 -1
- data/mod/settings/set/self/thanks.rb +2 -1
- data/mod/settings/set/self/update.rb +2 -1
- data/mod/settings/set/type/setting.rb +1 -1
- data/mod/solid_cache/set/abstract/solid_cache.rb +2 -2
- data/mod/standard/file/logo/image-original.svg +59 -0
- data/mod/standard/lib/card/layout.rb +79 -0
- data/mod/standard/lib/card/layout/card_layout.rb +44 -0
- data/mod/standard/lib/card/layout/code_layout.rb +9 -0
- data/mod/standard/lib/card/layout/proc_layout.rb +9 -0
- data/mod/standard/lib/card/layout/unknown_layout.rb +20 -0
- data/mod/standard/set/all/links.rb +5 -20
- data/mod/standard/set/all/rich_html.rb +4 -0
- data/mod/standard/set/all/rich_html/alert.rb +23 -0
- data/mod/standard/set/all/rich_html/content.rb +26 -100
- data/mod/standard/set/all/rich_html/error.rb +27 -3
- data/mod/standard/set/all/rich_html/error/debug_server_error.haml +1015 -0
- data/mod/standard/set/all/rich_html/frame.rb +10 -54
- data/mod/standard/set/all/rich_html/header.rb +25 -15
- data/mod/standard/set/all/rich_html/header/header_wrap.haml +2 -1
- data/mod/standard/set/all/rich_html/html_views/help.rb +18 -0
- data/mod/standard/set/all/rich_html/html_views/info.rb +59 -0
- data/mod/standard/set/all/rich_html/html_views/size.rb +17 -0
- data/mod/standard/set/all/rich_html/menu.rb +44 -146
- data/mod/standard/set/all/rich_html/modal.rb +99 -24
- data/mod/standard/set/all/rich_html/modal/modal_dialog.haml +12 -0
- data/mod/standard/set/all/rich_html/overlay.rb +57 -13
- data/mod/standard/set/all/rich_html/process_layout.rb +91 -0
- data/mod/standard/set/all/rich_html/show.rb +37 -0
- data/mod/standard/set/all/rich_html/wrapper.rb +47 -10
- data/mod/standard/set/right/head.rb +11 -0
- data/mod/standard/set/type/cardtype.rb +1 -1
- data/mod/standard/set/type/listed_by.rb +3 -3
- data/mod/standard/spec/set/all/email_html_format_spec.rb +17 -0
- data/mod/standard/spec/set/all/links_spec.rb +1 -22
- data/mod/standard/spec/set/all/rich_html/overlay_spec.rb +18 -0
- data/mod/standard/spec/set/all/rich_html/process_layout/explicit_modal_wrapper_spec.rb +29 -0
- data/mod/standard/spec/set/all/rich_html/process_layout_spec.rb +110 -0
- data/mod/standard/spec/set/all/rich_html/show_spec.rb +9 -0
- data/mod/standard/spec/set/all/rich_html/wrapper_spec.rb +17 -24
- data/mod/standard/spec/set/type/email_template/email_config_spec.rb +9 -5
- data/mod/standard/spec/set/type/layout_type_spec.rb +6 -0
- data/mod/standard/spec/set/type/search_type_spec.rb +1 -1
- data/mod/tinymce_editor/db/migrate_core_cards/20190306172623_update_tinymce_config_to_v5.rb +23 -0
- data/mod/tinymce_editor/lib/javascript/script_tinymce.js +9 -2
- data/mod/tinymce_editor/lib/javascript/script_tinymce_config.js.coffee +3 -2
- data/mod/tinymce_editor/public/assets/tinymce/jquery.tinymce.min.js +92 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/advlist/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/anchor/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/autolink/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/autoresize/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/autosave/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/bbcode/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/charmap/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/code/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/codesample/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/colorpicker/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/contextmenu/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/directionality/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/js/emojis.js +9015 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/js/emojis.min.js +2 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/fullpage/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/fullscreen/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/help/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/hr/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/image/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/imagetools/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/importcss/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/insertdatetime/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/legacyoutput/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/link/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/lists/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/media/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/nonbreaking/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/noneditable/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/pagebreak/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/paste/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/preview/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/print/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/quickbars/plugin.min.js +9 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/save/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/searchreplace/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/spellchecker/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/tabfocus/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/table/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/template/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/textcolor/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/textpattern/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/toc/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/visualblocks/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/visualchars/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/wordcount/plugin.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/content/default/content.min.css +7 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/content/document/content.min.css +7 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/content/writer/content.min.css +7 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide-dark/content.inline.min.css +7 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide-dark/content.min.css +7 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide-dark/skin.min.css +7 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/content.inline.min.css +7 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/content.min.css +7 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/content.mobile.min.css +1 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/fonts/tinymce-mobile.woff +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/skin.min.css +7 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/skin.mobile.min.css +1 -0
- data/mod/tinymce_editor/public/assets/tinymce/themes/mobile/theme.min.js +9 -1
- data/mod/tinymce_editor/public/assets/tinymce/themes/silver/theme.min.js +9 -0
- data/mod/tinymce_editor/public/assets/tinymce/tinymce.min.js +9 -2
- data/mod/utility/spec/set/abstract/media_spec.rb +6 -6
- data/mod/virtual/lib/card/virtual.rb +17 -2
- data/mod/virtual/set/abstract/virtual_cache.rb +1 -1
- data/mod/virtual/spec/set/lib/card/virtual_spec.rb +1 -1
- metadata +121 -42
- data/mod/core/layout/modal.html +0 -9
- data/mod/core/layout/simple_modal.html +0 -3
- data/mod/follow/spec/set/all/follow/follow_link_spec.rb +0 -7
- data/mod/standard/file/logo/image-icon.png +0 -0
- data/mod/standard/file/logo/image-large.png +0 -0
- data/mod/standard/file/logo/image-medium.png +0 -0
- data/mod/standard/file/logo/image-original.png +0 -0
- data/mod/standard/file/logo/image-small.png +0 -0
- data/mod/standard/set/abstract/toolbar_split_button.rb +0 -22
- data/mod/standard/set/all/rich_html/classy.rb +0 -37
- data/mod/standard/set/all/rich_html/editing.rb +0 -176
- data/mod/standard/set/all/rich_html/related.rb +0 -30
- data/mod/standard/set/all/rich_html/toolbar.rb +0 -264
- data/mod/standard/set/rstar/rules_editor.rb +0 -371
- data/mod/standard/set/self/activity_toolbar_button.rb +0 -14
- data/mod/standard/set/self/rules_toolbar_button.rb +0 -44
- data/mod/standard/set/type/set/html_views.rb +0 -155
- data/mod/standard/set/type/set/html_views/rules_table.haml +0 -9
- data/mod/standard/spec/set/all/rich_html/form_spec.rb +0 -47
- data/mod/standard/spec/set/all/rich_html/toolbar_spec.rb +0 -25
- data/mod/standard/spec/set/rstar/rules_spec.rb +0 -26
- data/mod/standard/spec/set/self/activity_toolbar_button_spec.rb +0 -22
- data/mod/standard/spec/set/type/set/html_views_spec.rb +0 -10
@@ -0,0 +1,51 @@
|
|
1
|
+
format :html do
|
2
|
+
def visible_bridge_tabs
|
3
|
+
BRIDGE_TABS.select do |key, _title|
|
4
|
+
send "show_#{key}?"
|
5
|
+
end
|
6
|
+
end
|
7
|
+
|
8
|
+
private
|
9
|
+
|
10
|
+
def show_account_tab?
|
11
|
+
return unless card.real?
|
12
|
+
|
13
|
+
card.account && card.ok?(:update)
|
14
|
+
end
|
15
|
+
|
16
|
+
def show_engage_tab?
|
17
|
+
return unless card.real?
|
18
|
+
|
19
|
+
show_follow? || show_discussion?
|
20
|
+
end
|
21
|
+
|
22
|
+
def show_history_tab?
|
23
|
+
card.real?
|
24
|
+
end
|
25
|
+
|
26
|
+
def show_related_tab?
|
27
|
+
card.real?
|
28
|
+
end
|
29
|
+
|
30
|
+
def show_rules_tab?
|
31
|
+
true
|
32
|
+
end
|
33
|
+
|
34
|
+
def show_discussion?
|
35
|
+
d_card = discussion_card
|
36
|
+
return unless d_card
|
37
|
+
|
38
|
+
permission_task = d_card.new_card? ? :comment : :read
|
39
|
+
d_card.ok? permission_task
|
40
|
+
end
|
41
|
+
|
42
|
+
def discussion_card?
|
43
|
+
card.junction? && card.name.tag_name.key == :discussion.cardname.key
|
44
|
+
end
|
45
|
+
|
46
|
+
def discussion_card
|
47
|
+
return if card.new_card? || discussion_card?
|
48
|
+
|
49
|
+
card.fetch trait: :discussion, skip_modules: true, new: {}
|
50
|
+
end
|
51
|
+
end
|
@@ -0,0 +1,58 @@
|
|
1
|
+
format :html do
|
2
|
+
view :edit_content_form, wrap: :slot do
|
3
|
+
with_nest_mode :edit do
|
4
|
+
edit_form
|
5
|
+
end
|
6
|
+
end
|
7
|
+
|
8
|
+
def edit_form
|
9
|
+
card_form(:update, edit_form_opts) do
|
10
|
+
[
|
11
|
+
edit_view_hidden,
|
12
|
+
_render_content_formgroup,
|
13
|
+
_render_edit_buttons
|
14
|
+
]
|
15
|
+
end
|
16
|
+
end
|
17
|
+
|
18
|
+
view :edit, perms: :update, tags: :unknown_ok, cache: :never,
|
19
|
+
wrap: { modal: { footer: "",
|
20
|
+
size: :edit_modal_size,
|
21
|
+
title: :render_title,
|
22
|
+
menu: :edit_modal_menu } } do
|
23
|
+
with_nest_mode :edit do
|
24
|
+
voo.show :help
|
25
|
+
voo.hide :save_button
|
26
|
+
wrap true do
|
27
|
+
[
|
28
|
+
frame_help,
|
29
|
+
_render_edit_content_form
|
30
|
+
]
|
31
|
+
end
|
32
|
+
end
|
33
|
+
end
|
34
|
+
|
35
|
+
view :bridge_link, tags: :unknown_ok do
|
36
|
+
bridge_link
|
37
|
+
end
|
38
|
+
|
39
|
+
def edit_modal_size
|
40
|
+
:large
|
41
|
+
end
|
42
|
+
|
43
|
+
def edit_modal_menu
|
44
|
+
wrap_with_modal_menu do
|
45
|
+
[close_modal_window, render_bridge_link]
|
46
|
+
end
|
47
|
+
end
|
48
|
+
|
49
|
+
def bridge_link
|
50
|
+
link_to_view :bridge, material_icon(:more_horiz),
|
51
|
+
class: "text-muted close", "data-slotter-mode": "modal-replace"
|
52
|
+
end
|
53
|
+
|
54
|
+
def edit_form_opts
|
55
|
+
# for override
|
56
|
+
{ "data-slot-selector": "._modal-origin", "data-slot-error-selector": ".card-slot" }
|
57
|
+
end
|
58
|
+
end
|
@@ -0,0 +1,58 @@
|
|
1
|
+
format :html do
|
2
|
+
view :edit_in_place, perms: :update, tags: :unknown_ok, cache: :never, wrap: :slot do
|
3
|
+
with_nest_mode :edit do
|
4
|
+
card_form :update, success: { view: :editable } do
|
5
|
+
[
|
6
|
+
edit_view_hidden,
|
7
|
+
_render_content_formgroup,
|
8
|
+
_render_edit_in_place_buttons
|
9
|
+
]
|
10
|
+
end
|
11
|
+
end
|
12
|
+
end
|
13
|
+
|
14
|
+
view :edit_row, wrap: { div: { class: "row" } } do
|
15
|
+
["<label class='col-sm-1'>#{render_title}</label>",
|
16
|
+
"<div class='col-sm-11'>#{render_editable}</div>"]
|
17
|
+
end
|
18
|
+
|
19
|
+
view :editable, perms: :update, tags: :unknown_ok, wrap: :slot do
|
20
|
+
[render_core, edit_in_place_link]
|
21
|
+
end
|
22
|
+
|
23
|
+
view :edit_name_row do
|
24
|
+
edit_row_fixed_width "Name", card.name, :edit_name_form
|
25
|
+
end
|
26
|
+
|
27
|
+
view :edit_type_row do
|
28
|
+
edit_row_fixed_width "Type", link_to_card(card.type), :edit_type_form
|
29
|
+
end
|
30
|
+
|
31
|
+
view :edit_in_place_buttons do
|
32
|
+
button_formgroup do
|
33
|
+
wrap_with "div", class: "d-flex" do
|
34
|
+
[standard_save_button, cancel_in_place_button, delete_button]
|
35
|
+
end
|
36
|
+
end
|
37
|
+
end
|
38
|
+
|
39
|
+
def edit_row_fixed_width title, content, edit_view
|
40
|
+
class_up "card-slot", "d-flex"
|
41
|
+
wrap do
|
42
|
+
["<label class='w-50px'>#{title}</label>",
|
43
|
+
content,
|
44
|
+
edit_in_place_link(edit_view, align: :right)]
|
45
|
+
end
|
46
|
+
end
|
47
|
+
|
48
|
+
def edit_in_place_link view=:edit_in_place, align: :left
|
49
|
+
align = align == :left ? "ml-2" : "ml-auto"
|
50
|
+
link_to_view view, fa_icon(:edit), class: "#{align} edit-link",
|
51
|
+
"data-cy": "edit-link"
|
52
|
+
end
|
53
|
+
|
54
|
+
def cancel_in_place_button args={}
|
55
|
+
args.reverse_merge! class: "cancel-button btn-sm", href: path(view: :editable)
|
56
|
+
cancel_button args
|
57
|
+
end
|
58
|
+
end
|
@@ -0,0 +1,87 @@
|
|
1
|
+
format :html do
|
2
|
+
# note: depends on js with selector ".edit_name-view .card-form"
|
3
|
+
view :edit_name, perms: :update do
|
4
|
+
frame do
|
5
|
+
edit_name_form
|
6
|
+
end
|
7
|
+
end
|
8
|
+
|
9
|
+
# note: depends on js with selector ".edit_name_form-view .card-form"
|
10
|
+
view :edit_name_form, perms: :update, wrap: :slot do
|
11
|
+
edit_name_form :edit_name_row
|
12
|
+
end
|
13
|
+
|
14
|
+
def edit_name_form success_view=nil
|
15
|
+
card_form({ action: :update, id: card.id },
|
16
|
+
# "main-success" => "REDIRECT",
|
17
|
+
"data-update-foreign-slot": "._modal-origin") do
|
18
|
+
output [hidden_edit_name_fields(success_view),
|
19
|
+
_render_name_formgroup,
|
20
|
+
rename_confirmation_alert,
|
21
|
+
edit_name_buttons]
|
22
|
+
end
|
23
|
+
end
|
24
|
+
|
25
|
+
def hidden_edit_name_fields success_view=nil
|
26
|
+
success = { id: "_self" }
|
27
|
+
success[:view] = success_view if success_view
|
28
|
+
hidden_tags success: success, old_name: card.name, card: { update_referers: false }
|
29
|
+
end
|
30
|
+
|
31
|
+
def edit_name_buttons
|
32
|
+
button_formgroup do
|
33
|
+
[rename_and_update_button, rename_button, standard_cancel_button]
|
34
|
+
end
|
35
|
+
end
|
36
|
+
|
37
|
+
def rename_and_update_button
|
38
|
+
submit_button text: "Rename and Update", disable_with: "Renaming",
|
39
|
+
class: "renamer-updater"
|
40
|
+
end
|
41
|
+
|
42
|
+
def rename_button
|
43
|
+
button_tag "Rename", data: { disable_with: "Renaming" }, class: "renamer"
|
44
|
+
end
|
45
|
+
|
46
|
+
def rename_confirmation_alert
|
47
|
+
msg = "<h5>Are you sure you want to rename <em>#{safe_name}</em>?</h5>"
|
48
|
+
msg << rename_effects_and_options
|
49
|
+
alert("warning", false, false, class: "hidden-alert") { msg }
|
50
|
+
end
|
51
|
+
|
52
|
+
def rename_effects_and_options
|
53
|
+
descendant_effect = rename_descendant_effect
|
54
|
+
referer_effect, referer_option = rename_referer_effect_and_option
|
55
|
+
effects = [descendant_effect, referer_effect].compact
|
56
|
+
return "" if effects.empty?
|
57
|
+
|
58
|
+
format_rename_effects_and_options effects, referer_option
|
59
|
+
end
|
60
|
+
|
61
|
+
def format_rename_effects_and_options effects, referer_option
|
62
|
+
effects = effects.map { |effect| "<li>#{effect}</li>" }.join
|
63
|
+
info = %(<h6>This change will...</h6>)
|
64
|
+
info += %(<ul>#{effects}</ul>)
|
65
|
+
info += %(<p>#{referer_option}</p>) if referer_option
|
66
|
+
info
|
67
|
+
end
|
68
|
+
|
69
|
+
def rename_descendant_effect
|
70
|
+
descendants = card.descendants
|
71
|
+
return unless descendants.any? # FIXME: count, don't instantiate
|
72
|
+
|
73
|
+
"automatically alter #{descendants.size} related name(s)."
|
74
|
+
end
|
75
|
+
|
76
|
+
def rename_referer_effect_and_option
|
77
|
+
referers = card.family_referers
|
78
|
+
return unless referers.any? # FIXME: count, don't instantiate
|
79
|
+
|
80
|
+
count = referers.size
|
81
|
+
refs = count == 1 ? "reference" : "references"
|
82
|
+
effect = "affect at least #{count} #{refs} to \"#{card.name}\""
|
83
|
+
effect += hidden_field_tag(:referers, count)
|
84
|
+
option = "You may choose to <em>update or ignore</em> the referers."
|
85
|
+
[effect, option]
|
86
|
+
end
|
87
|
+
end
|
@@ -0,0 +1,28 @@
|
|
1
|
+
format :html do
|
2
|
+
view :edit_type, cache: :never, perms: :update do
|
3
|
+
frame do
|
4
|
+
_render_edit_type_form
|
5
|
+
end
|
6
|
+
end
|
7
|
+
|
8
|
+
view :edit_type_form, cache: :never, perms: :update, wrap: :slot do
|
9
|
+
card_form :update, "data-update-foreign-slot": "._modal-origin, .card-slot.edit_content_form-view" do
|
10
|
+
output [hidden_edit_type_fields,
|
11
|
+
_render_type_formgroup,
|
12
|
+
edit_type_buttons]
|
13
|
+
end
|
14
|
+
end
|
15
|
+
|
16
|
+
def hidden_edit_type_fields
|
17
|
+
# because the content editor can change with a type change
|
18
|
+
# we have to reload the whole edit view
|
19
|
+
hidden_field_tag "success[view]", "edit_type_row"
|
20
|
+
end
|
21
|
+
|
22
|
+
def edit_type_buttons
|
23
|
+
cancel_path = path view: :edit
|
24
|
+
button_formgroup do
|
25
|
+
[standard_cancel_button(href: cancel_path)]
|
26
|
+
end
|
27
|
+
end
|
28
|
+
end
|
@@ -0,0 +1,79 @@
|
|
1
|
+
format :html do
|
2
|
+
###---( TOP_LEVEL (used by menu) NEW / EDIT VIEWS )
|
3
|
+
view :bridge, perms: :update, tags: :unknown_ok, cache: :never,
|
4
|
+
bridge: true, wrap: :bridge do
|
5
|
+
with_nest_mode :edit do
|
6
|
+
voo.show :help
|
7
|
+
wrap true, breadcrumb_data("Editing", "edit") do
|
8
|
+
bridge_parts
|
9
|
+
end
|
10
|
+
end
|
11
|
+
end
|
12
|
+
|
13
|
+
def bridge_parts
|
14
|
+
[
|
15
|
+
_render_edit_name_row,
|
16
|
+
_render_edit_type_row,
|
17
|
+
frame_help,
|
18
|
+
_render_edit_content_form
|
19
|
+
]
|
20
|
+
end
|
21
|
+
|
22
|
+
def edit_view_hidden
|
23
|
+
# for override
|
24
|
+
end
|
25
|
+
|
26
|
+
view :edit_buttons do
|
27
|
+
button_formgroup do
|
28
|
+
wrap_with "div", class: "d-flex" do
|
29
|
+
[standard_submit_button, edit_cancel_button, delete_button]
|
30
|
+
end
|
31
|
+
end
|
32
|
+
end
|
33
|
+
|
34
|
+
# TODO: add undo functionality
|
35
|
+
view :just_deleted, tag: :unknown_ok do
|
36
|
+
wrap { "#{render_title} deleted" }
|
37
|
+
end
|
38
|
+
|
39
|
+
view :edit_rules, cache: :never, tags: :unknown_ok do
|
40
|
+
nest current_set_card, view: :bridge_rules_tab
|
41
|
+
end
|
42
|
+
|
43
|
+
view :edit_structure, cache: :never do
|
44
|
+
return unless card.structure
|
45
|
+
|
46
|
+
nest card.structure_rule_card, view: :edit
|
47
|
+
# FIXME: this stuff:
|
48
|
+
# slot: {
|
49
|
+
# cancel_slot_selector: ".card-slot.related-view",
|
50
|
+
# cancel_path: card.format.path(view: :edit), hide: :edit_toolbar,
|
51
|
+
# hidden: { success: { view: :open, "slot[subframe]" => true } }
|
52
|
+
# }
|
53
|
+
# }
|
54
|
+
end
|
55
|
+
|
56
|
+
view :edit_nests, cache: :never do
|
57
|
+
frame do
|
58
|
+
with_nest_mode :edit do
|
59
|
+
multi_card_edit
|
60
|
+
end
|
61
|
+
end
|
62
|
+
end
|
63
|
+
|
64
|
+
# FIXME: - view can recurse. temporarily turned off
|
65
|
+
#
|
66
|
+
# view :edit_nest_rules, cache: :never do
|
67
|
+
# return ""#
|
68
|
+
# voo.show :toolbar
|
69
|
+
# view = args[:rule_view] || :field_related_rules
|
70
|
+
# frame do
|
71
|
+
# # with_nest_mode :edit do
|
72
|
+
# nested_fields.map do |name, _options|
|
73
|
+
# nest Card.fetch(name.to_name.trait(:self)),
|
74
|
+
# view: :titled, title: name, rule_view: view,
|
75
|
+
# hide: :set_label, show: :rule_navbar
|
76
|
+
# end
|
77
|
+
# end
|
78
|
+
# end
|
79
|
+
end
|
@@ -49,6 +49,7 @@ format :html do
|
|
49
49
|
|
50
50
|
def type_field_current_value args, typelist
|
51
51
|
return if args.delete :no_current_type
|
52
|
+
|
52
53
|
if !card.new_card? && !typelist.include?(card.type_name)
|
53
54
|
# current type should be an option on existing cards,
|
54
55
|
# regardless of create perms
|
@@ -73,6 +74,7 @@ format :html do
|
|
73
74
|
def content_field_revision_tracking skip_rev_id
|
74
75
|
card.last_action_id_before_edit = card.last_action_id
|
75
76
|
return if !card || card.new_card? || skip_rev_id
|
77
|
+
|
76
78
|
hidden_field :last_action_id_before_edit, class: "current_revision_id"
|
77
79
|
end
|
78
80
|
|
@@ -85,7 +87,8 @@ format :html do
|
|
85
87
|
end
|
86
88
|
end
|
87
89
|
|
88
|
-
# test: render nests within a normal rendering of the card's content?
|
90
|
+
# test: render nests within a normal rendering of the card's content?
|
91
|
+
# (as opposed to a standardized form)
|
89
92
|
def inline_nests_editor?
|
90
93
|
voo.editor == :inline_nests
|
91
94
|
end
|
@@ -110,7 +113,7 @@ format :html do
|
|
110
113
|
def single_card_edit_field
|
111
114
|
if voo.show?(:type_formgroup) || voo.show?(:name_formgroup)
|
112
115
|
# display content field in formgroup for consistency with other fields
|
113
|
-
formgroup("", editor: :content, help: false) { content_field }
|
116
|
+
formgroup("content", editor: :content, help: false) { content_field }
|
114
117
|
else
|
115
118
|
editor_wrap(:content) { content_field }
|
116
119
|
end
|
@@ -126,9 +129,7 @@ format :html do
|
|
126
129
|
|
127
130
|
def multi_card_edit fields_only=false
|
128
131
|
nested_cards_for_edit(fields_only).map do |name, options|
|
129
|
-
options
|
130
|
-
options[:hide] = [options[:hide], :toolbar].flatten.compact
|
131
|
-
nest name, options
|
132
|
+
nest name, options || {}
|
132
133
|
end.join "\n"
|
133
134
|
end
|
134
135
|
|
@@ -161,13 +162,17 @@ format :html do
|
|
161
162
|
|
162
163
|
def form_prefix
|
163
164
|
case
|
164
|
-
when explicit_form_prefix
|
165
|
-
when
|
166
|
-
when parent.card == card
|
167
|
-
else
|
165
|
+
when explicit_form_prefix then explicit_form_prefix # configured
|
166
|
+
when simple_form? then "card" # simple form
|
167
|
+
when parent.card.name == card.name then parent.form_prefix # card nests self
|
168
|
+
else edit_in_form_prefix
|
168
169
|
end
|
169
170
|
end
|
170
171
|
|
172
|
+
def simple_form?
|
173
|
+
form_root? || !form_root || !parent
|
174
|
+
end
|
175
|
+
|
171
176
|
def edit_in_form_prefix
|
172
177
|
"#{parent.form_prefix}[subcards][#{card.name.from form_context.card.name}]"
|
173
178
|
end
|
@@ -177,7 +182,7 @@ format :html do
|
|
177
182
|
end
|
178
183
|
|
179
184
|
def form_context
|
180
|
-
|
185
|
+
form_root? || !form_root ? self : parent
|
181
186
|
end
|
182
187
|
|
183
188
|
def form_root?
|
@@ -186,6 +191,7 @@ format :html do
|
|
186
191
|
|
187
192
|
def form_root
|
188
193
|
return self if @form_root
|
194
|
+
|
189
195
|
parent ? parent.form_root : nil
|
190
196
|
end
|
191
197
|
|
@@ -240,6 +246,7 @@ format :html do
|
|
240
246
|
|
241
247
|
def add_junction_class
|
242
248
|
return unless card.name.junction?
|
249
|
+
|
243
250
|
class_up "card-editor", "RIGHT-#{card.name.tag_name.safe_key}"
|
244
251
|
end
|
245
252
|
end
|