card 1.98.0 → 1.99.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +5 -5
- data/VERSION +1 -1
- data/config/locales/de.yml +7 -7
- data/config/locales/en.yml +7 -7
- data/config/locales/es.yml +7 -7
- data/db/migrate/20190929202325_rename_present_in_reference_table.rb +9 -0
- data/db/migrate_core_cards/20150610180019_add_recaptcha_key_and_admin_info_cards.rb +3 -3
- data/db/migrate_core_cards/20160801143221_change_bootstrap_card_type_to_scss.rb +1 -1
- data/db/migrate_core_cards/20160804112510_reorganize_scripts.rb +1 -1
- data/db/migrate_core_cards/20160908154210_add_trash_card.rb +1 -1
- data/db/migrate_core_cards/20180508210903_add_json_type.rb +3 -3
- data/db/migrate_core_cards/20180712042655_head_rule.rb +1 -1
- data/db/migrate_core_cards/{20180905061536_migrate_layouts.rb → 20180905061537_migrate_layouts.rb} +12 -1
- data/db/migrate_core_cards/20190204195039_add_rule_card.rb +3 -0
- data/db/migrate_core_cards/20190320091257_upgrade_recaptcha_to_v3.rb +5 -6
- data/db/migrate_core_cards/20190417142612_reorganize_scripts_2.rb +3 -3
- data/db/migrate_core_cards/20190502130029_add_shark_and_help_desk_role.rb +4 -5
- data/db/migrate_core_cards/20190618110446_add_dropdown_divider.rb +1 -1
- data/db/migrate_core_cards/20190710090209_homepage_tweaks.rb +17 -0
- data/db/migrate_core_cards/20190718140126_add_guides.rb +19 -0
- data/db/migrate_core_cards/20190820155833_update_cardtype_type_structure.rb +7 -0
- data/db/migrate_core_cards/20190822093633_move_help_text_to_code.rb +38 -0
- data/db/migrate_core_cards/20190823220018_cleanup_for_decko_1_0.rb +21 -0
- data/db/migrate_core_cards/20190826132738_add_more_guides.rb +7 -0
- data/db/migrate_core_cards/20190829093961_cardtype_grouping.rb +16 -0
- data/db/migrate_core_cards/20190829205148_remove_add_help.rb +14 -0
- data/db/migrate_core_cards/20190830131820_setting_settings_aside.rb +17 -0
- data/db/migrate_core_cards/20190902161223_add_style_media.rb +7 -0
- data/db/migrate_core_cards/20190902193208_input_type.rb +22 -0
- data/db/migrate_core_cards/20190904174403_token_upgrade.rb +14 -0
- data/db/migrate_core_cards/20190909104250_add_cardtype_input_types.rb +10 -0
- data/db/migrate_core_cards/20190918200115_ensure_description_card.rb +13 -0
- data/db/migrate_core_cards/20191008201046_fixture_fix.rb +9 -0
- data/db/migrate_core_cards/data/cards.yml +12 -8
- data/db/migrate_core_cards/data/cards/Xaccount +22 -0
- data/db/migrate_core_cards/data/cards/Xaccount_setting-Xright-Xstructure +9 -2
- data/db/migrate_core_cards/data/cards/Xgetting_started +5 -5
- data/db/migrate_core_cards/data/cards/{Xgetting_started-link → Xgetting_started_link} +0 -0
- data/db/migrate_core_cards/data/cards/Xmain_menu +1 -1
- data/db/migrate_core_cards/data/cards/Xstructure-Xright-Xguide +12 -0
- data/db/migrate_core_cards/data/cards/administrator-dashboard +5 -0
- data/db/migrate_core_cards/data/cards/anyone_signed_in-dashboard +0 -2
- data/db/migrate_core_cards/data/cards/cardtype-Xtype-Xguide +24 -0
- data/db/migrate_core_cards/data/cards/cardtype-Xtype-Xstructure +3 -3
- data/db/migrate_core_cards/data/cards/shark-dashboard +2 -2
- data/db/migrate_core_cards/data/mailer/password_reset_email.html +6 -3
- data/db/migrate_core_cards/data/mailer/password_reset_email.txt +1 -1
- data/db/migrate_core_cards/data/mailer/verification_email.html +5 -2
- data/db/migrate_core_cards/data/mailer/verification_email.txt +2 -1
- data/db/schema.rb +1 -1
- data/db/seed/README.md +1 -1
- data/db/seed/new/card_actions.yml +2904 -3448
- data/db/seed/new/card_acts.yml +2 -2
- data/db/seed/new/card_references.yml +3124 -3215
- data/db/seed/new/cards.yml +4199 -5156
- data/db/seed/new/schema_migrations.yml +2 -0
- data/db/seed/new/schema_migrations_core_cards.yml +81 -37
- data/db/seed/test/fixtures/card_actions.yml +4136 -4688
- data/db/seed/test/fixtures/card_acts.yml +503 -509
- data/db/seed/test/fixtures/card_changes.yml +66 -66
- data/db/seed/test/fixtures/card_references.yml +4083 -4174
- data/db/seed/test/fixtures/cards.yml +4220 -5429
- data/db/seed/test/fixtures/schema_migrations.yml +2 -0
- data/db/seed/test/fixtures/schema_migrations_core_cards.yml +81 -37
- data/db/{seed/test/seed.rb → test_seed.rb} +13 -11
- data/db/version.txt +1 -1
- data/lib/card/act_manager.rb +15 -45
- data/lib/card/act_manager/event_delay.rb +48 -0
- data/lib/card/act_manager/stage_director.rb +2 -2
- data/lib/card/act_manager/stage_director/phases.rb +3 -6
- data/lib/card/auth.rb +1 -0
- data/lib/card/auth/current.rb +30 -27
- data/lib/card/auth/setup.rb +13 -12
- data/lib/card/auth/token.rb +38 -0
- data/lib/card/content.rb +34 -7
- data/lib/card/content/clean.rb +2 -1
- data/lib/card/content/truncate.rb +2 -0
- data/lib/card/dirty.rb +2 -1
- data/lib/card/env/success.rb +1 -14
- data/lib/card/error.rb +3 -1
- data/lib/card/format.rb +4 -1
- data/lib/card/format/content.rb +2 -2
- data/lib/card/format/error.rb +3 -2
- data/lib/card/format/nest.rb +1 -1
- data/lib/card/format/nesting.rb +2 -2
- data/lib/card/format/nesting/mode.rb +15 -15
- data/lib/card/migration.rb +3 -5
- data/lib/card/mod/loader.rb +5 -0
- data/lib/card/model/save_helper.rb +2 -0
- data/lib/card/query.rb +1 -0
- data/lib/card/query/abstract_query/tie.rb +2 -2
- data/lib/card/query/card_query/match_attributes.rb +19 -1
- data/lib/card/query/card_query/reference_attributes.rb +4 -2
- data/lib/card/query/reference_query.rb +1 -1
- data/lib/card/seed_consts.rb +1 -1
- data/lib/card/set/event/delayed_event.rb +2 -0
- data/lib/card/set/format/abstract_format.rb +3 -5
- data/lib/card/set/format/abstract_format/view_opts.rb +1 -1
- data/lib/card/set/required_field.rb +8 -3
- data/lib/card/set_pattern.rb +10 -0
- data/lib/card/tasks/card/file_card_creator.rb +6 -1
- data/lib/card/tasks/card/file_card_creator/abstract_file_card.rb +5 -0
- data/lib/card/tasks/card/file_card_creator/script_card.rb +2 -0
- data/lib/card/view/cache/stub.rb +3 -20
- data/lib/card/view/options.rb +4 -3
- data/lib/card/view/options/voo_api.rb +1 -1
- data/lib/cardio.rb +7 -1
- data/lib/cardio/schema.rb +18 -14
- data/mod/Modfile +1 -0
- data/mod/account/set/abstract/account_field.rb +15 -0
- data/mod/account/set/abstract/accounted.rb +15 -0
- data/mod/account/set/all/account.rb +3 -4
- data/mod/account/set/right/account.rb +23 -155
- data/mod/account/set/right/account/events.rb +98 -0
- data/mod/account/set/right/account/views.rb +65 -0
- data/mod/account/set/right/api_key.rb +48 -0
- data/mod/account/set/right/email.rb +2 -2
- data/mod/account/set/right/password.rb +6 -9
- data/mod/account/set/right/salt.rb +5 -1
- data/mod/account/set/right/status.rb +10 -1
- data/mod/account/set/self/signin.rb +3 -3
- data/mod/account/set/type/role.rb +4 -0
- data/mod/account/set/type/signup.rb +31 -160
- data/mod/account/{template → set}/type/signup/core.haml +0 -0
- data/mod/account/set/type/signup/views.rb +93 -0
- data/mod/account/set/type/user.rb +16 -27
- data/mod/account/set/type/user/setup_help.haml +10 -0
- data/mod/account/spec/set/all/account_spec.rb +84 -98
- data/mod/account/spec/set/right/account_spec.rb +40 -34
- data/mod/account/spec/set/self/signin_spec.rb +2 -2
- data/mod/account/spec/set/type/signup_spec.rb +40 -77
- data/mod/ace_editor/db/migrate_core_cards/{20160805112548_delete_ace_help_card.rb → 20180805112548_delete_ace_help_card.rb} +1 -1
- data/mod/admin/set/self/debugger.rb +3 -0
- data/mod/admin/set/self/trash.rb +1 -1
- data/mod/basic_formats/set/all/all_css.rb +1 -1
- data/mod/basic_formats/set/all/all_csv.rb +1 -1
- data/mod/basic_formats/set/all/base.rb +19 -60
- data/mod/basic_formats/set/self/head.rb +1 -1
- data/mod/basic_types/set/type/html.rb +7 -3
- data/mod/basic_types/set/type/json.rb +1 -1
- data/mod/basic_types/set/type/plain_text.rb +1 -1
- data/mod/{standard → basic_types}/spec/set/type/html_spec.rb +6 -6
- data/mod/basic_types/spec/set/type/plain_text_spec.rb +7 -2
- data/mod/bootstrap/db/migrate_core_cards/20170719163733_update_bootswatch_themes_to_4_beta.rb +3 -3
- data/mod/bootstrap/db/migrate_core_cards/20180423160231_migrate_customized_bootstrap_skin.rb +2 -2
- data/mod/bootstrap/db/migrate_core_cards/20180423170283_add_type_bootswatch_skin.rb +1 -1
- data/mod/bootstrap/db/migrate_core_cards/lib/skin.rb +1 -1
- data/mod/bootstrap/lib/javascript/script_load_select2.js.coffee +27 -18
- data/mod/bootstrap/lib/stylesheets/style_bootstrap_cards.scss +19 -9
- data/mod/bootstrap/set/abstract/bootswatch_theme/html_views.rb +1 -1
- data/mod/bootstrap/set/all/bootstrap/helper.rb +9 -4
- data/mod/bootstrap/set/all/bootstrap/tabs.rb +1 -1
- data/mod/bootstrap/set/type/customized_bootswatch_skin.rb +1 -1
- data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors.rb +1 -1
- data/mod/bootstrap/set/type_plus_right/customized_bootswatch_skin/colors/{editor.haml → input.haml} +0 -0
- data/mod/bootstrap/spec/set/all/bootstrap/bootstrap_builder_spec.rb +1 -1
- data/mod/bootstrap/spec/set/all/bootstrap/form_spec.rb +2 -2
- data/mod/carrierwave/lib/carrier_wave/file_card_uploader.rb +8 -2
- data/mod/carrierwave/set/abstract/attachment.rb +2 -3
- data/mod/carrierwave/set/abstract/attachment/storage_type.rb +1 -2
- data/mod/carrierwave/set/abstract/attachment/upload_cache.rb +1 -2
- data/mod/carrierwave/set/self/favicon.rb +5 -0
- data/mod/carrierwave/set/self/new_file.rb +1 -1
- data/mod/carrierwave/set/self/new_image.rb +1 -1
- data/mod/carrierwave/set/type/file.rb +1 -1
- data/mod/carrierwave/set/type/image.rb +2 -2
- data/mod/carrierwave/set/type/image/html_views.rb +0 -35
- data/mod/carrierwave/spec/set/type/image_spec.rb +1 -1
- data/mod/core/chunk/link.rb +4 -2
- data/mod/core/chunk/view_stub.rb +5 -4
- data/mod/core/set/abstract/code_file.rb +1 -1
- data/mod/core/set/all/abort.rb +1 -0
- data/mod/core/set/all/codename.rb +2 -1
- data/mod/core/set/all/content.rb +59 -0
- data/mod/core/set/all/event_conditions.rb +33 -7
- data/mod/core/set/all/fetch_helper.rb +4 -1
- data/mod/core/set/all/location_history.rb +1 -1
- data/mod/core/set/all/name.rb +1 -1
- data/mod/core/set/all/name_events.rb +3 -2
- data/mod/core/set/all/permissions.rb +6 -36
- data/mod/core/set/all/references.rb +12 -5
- data/mod/core/set/all/rename.rb +3 -2
- data/mod/core/set/all/rules.rb +0 -5
- data/mod/core/set/all/update_read_rules.rb +1 -19
- data/mod/core/set_pattern/03_type.rb +4 -0
- data/mod/core/set_pattern/07_right.rb +4 -0
- data/mod/core/set_pattern/08_type_plus_right.rb +4 -0
- data/mod/core/set_pattern/09_self.rb +4 -0
- data/mod/core/spec/chunk/link_spec.rb +6 -0
- data/mod/core/spec/chunk/nest_spec.rb +2 -2
- data/mod/core/spec/set/all/event_conditions_spec.rb +36 -38
- data/mod/core/spec/set/all/name_events_spec.rb +1 -1
- data/mod/core/spec/set/all/permissions_spec.rb +1 -11
- data/mod/core/spec/set/all/rules_spec.rb +6 -16
- data/mod/date/set/all/calendar.rb +1 -1
- data/mod/date/set/self/datepicker.rb +6 -0
- data/mod/date/set/type/date.rb +1 -1
- data/mod/date/spec/set/type/date_spec.rb +1 -1
- data/mod/date/vendor/moment/CHANGELOG.md +8 -0
- data/mod/date/vendor/moment/Moment.js.nuspec +5 -5
- data/mod/date/vendor/moment/component.json +1 -1
- data/mod/date/vendor/moment/locale/az.js +1 -1
- data/mod/date/vendor/moment/locale/be.js +1 -1
- data/mod/date/vendor/moment/locale/pa-in.js +1 -1
- data/mod/date/vendor/moment/meteor/moment.js +1 -1
- data/mod/date/vendor/moment/meteor/package.js +1 -1
- data/mod/date/vendor/moment/min/locales.js +28 -28
- data/mod/date/vendor/moment/min/locales.min.js +1 -1
- data/mod/date/vendor/moment/min/moment-with-locales.js +33 -33
- data/mod/date/vendor/moment/min/moment-with-locales.min.js +1 -1
- data/mod/date/vendor/moment/min/moment.min.js +1 -1
- data/mod/date/vendor/moment/min/tests.js +48 -11
- data/mod/date/vendor/moment/moment.js +5 -5
- data/mod/date/vendor/moment/package.json +2 -2
- data/mod/date/vendor/moment/src/lib/create/from-string.js +1 -1
- data/mod/date/vendor/moment/src/lib/units/day-of-week.js +3 -3
- data/mod/date/vendor/moment/src/locale/az.js +1 -1
- data/mod/date/vendor/moment/src/locale/be.js +1 -1
- data/mod/date/vendor/moment/src/locale/pa-in.js +1 -1
- data/mod/date/vendor/moment/src/moment.js +2 -2
- data/mod/date/vendor/moment/src/test/locale/az.js +5 -5
- data/mod/date/vendor/moment/src/test/locale/be.js +3 -0
- data/mod/date/vendor/moment/src/test/locale/pa-in.js +3 -3
- data/mod/date/vendor/moment/src/test/moment/locale.js +33 -0
- data/mod/date/vendor/moment/src/test/moment/start_end_of.js +1 -1
- data/mod/date/vendor/moment/src/test/moment/weeks.js +2 -2
- data/mod/date/vendor/tempusdominus/Gruntfile.js +7 -49
- data/mod/date/vendor/tempusdominus/build/css/tempusdominus-bootstrap-4.css +3 -1
- data/mod/date/vendor/tempusdominus/build/css/tempusdominus-bootstrap-4.min.css +3 -1
- data/mod/date/vendor/tempusdominus/build/js/tempusdominus-bootstrap-4.js +128 -116
- data/mod/date/vendor/tempusdominus/build/js/tempusdominus-bootstrap-4.min.js +3 -3
- data/mod/date/vendor/tempusdominus/composer.json +3 -3
- data/mod/date/vendor/tempusdominus/docs/Changelog/index.html +20 -36
- data/mod/date/vendor/tempusdominus/docs/ContributorsGuide/index.html +20 -36
- data/mod/date/vendor/tempusdominus/docs/Events/index.html +20 -36
- data/mod/date/vendor/tempusdominus/docs/Extras/index.html +20 -36
- data/mod/date/vendor/tempusdominus/docs/FAQ/index.html +20 -36
- data/mod/date/vendor/tempusdominus/docs/Functions/index.html +20 -36
- data/mod/date/vendor/tempusdominus/docs/Installing/index.html +30 -50
- data/mod/date/vendor/tempusdominus/docs/Options/index.html +21 -37
- data/mod/date/vendor/tempusdominus/docs/Usage/index.html +20 -40
- data/mod/date/vendor/tempusdominus/docs/css/base.css +1682 -0
- data/mod/date/vendor/tempusdominus/docs/css/tempusdominus-bootstrap-4.css +3 -1
- data/mod/date/vendor/tempusdominus/docs/index.html +26 -41
- data/mod/date/vendor/tempusdominus/docs/js/tempusdominus-bootstrap-4.js +127 -115
- data/mod/date/vendor/tempusdominus/docs/search/search_index.json +11 -16
- data/mod/date/vendor/tempusdominus/docs/sitemap.xml +10 -10
- data/mod/date/vendor/tempusdominus/docs/theme/base.html +11 -12
- data/mod/date/vendor/tempusdominus/docs/theme/css/base.css +1682 -0
- data/mod/date/vendor/tempusdominus/docs/theme/css/tempusdominus-bootstrap-4.css +3 -1
- data/mod/date/vendor/tempusdominus/docs/theme/js/tempusdominus-bootstrap-4.js +127 -115
- data/mod/date/vendor/tempusdominus/docs/theme/toc.html +1 -0
- data/mod/date/vendor/tempusdominus/package-lock.json +4085 -8197
- data/mod/date/vendor/tempusdominus/package.json +17 -19
- data/mod/date/vendor/tempusdominus/src/docs/Installing.md +12 -18
- data/mod/date/vendor/tempusdominus/src/docs/Options.md +1 -1
- data/mod/date/vendor/tempusdominus/src/docs/Usage.md +0 -2
- data/mod/date/vendor/tempusdominus/src/docs/index.md +7 -5
- data/mod/date/vendor/tempusdominus/src/docs/theme/base.html +11 -12
- data/mod/date/vendor/tempusdominus/src/docs/theme/css/base.css +1682 -0
- data/mod/date/vendor/tempusdominus/src/docs/theme/css/tempusdominus-bootstrap-4.css +3 -1
- data/mod/date/vendor/tempusdominus/src/docs/theme/js/tempusdominus-bootstrap-4.js +127 -115
- data/mod/date/vendor/tempusdominus/src/docs/theme/toc.html +1 -0
- data/mod/date/vendor/tempusdominus/src/js/tempusdominus-bootstrap-4.js +32 -12
- data/mod/date/vendor/tempusdominus/src/sass/_tempusdominus-bootstrap-4.scss +4 -0
- data/mod/date/vendor/tempusdominus/src/sass/tempusdominus-bootstrap-4-build.scss +2 -2
- data/mod/edit/set/all/bridge.rb +4 -1
- data/mod/edit/set/all/bridge/account_section.rb +16 -0
- data/mod/edit/set/all/bridge/bridge_pills.rb +47 -0
- data/mod/edit/set/all/bridge/related_section.rb +34 -0
- data/mod/edit/set/all/bridge/tab_views.rb +13 -40
- data/mod/edit/set/all/bridge/tab_visibility.rb +6 -2
- data/mod/edit/set/all/edit_content.rb +12 -3
- data/mod/edit/set/all/edit_inline.rb +15 -8
- data/mod/edit/set/all/edit_name.rb +5 -7
- data/mod/edit/set/all/edit_type.rb +84 -11
- data/mod/edit/set/all/editing.rb +7 -3
- data/mod/edit/set/all/editor.rb +28 -15
- data/mod/edit/set/all/form.rb +34 -74
- data/mod/edit/set/all/form_buttons.rb +12 -3
- data/mod/edit/set/all/formgroup.rb +5 -5
- data/mod/edit/set/all/nest_editor.rb +20 -4
- data/mod/edit/set/all/nest_editor/_help.haml +7 -0
- data/mod/edit/set/all/nest_editor/nest_editor.haml +3 -2
- data/mod/edit/set/all/new.rb +65 -3
- data/mod/edit/set/all/overlay_guide.haml +7 -0
- data/mod/edit/set/all/overlay_guide.rb +9 -0
- data/mod/edit/set/all/template_nest.rb +42 -0
- data/mod/edit/set/type/list.rb +15 -0
- data/mod/edit/set/type/plain_text.rb +13 -0
- data/mod/edit/set/type/pointer.rb +11 -0
- data/mod/edit/spec/set/all/bridge/tab_views_spec.rb +1 -1
- data/mod/edit/spec/set/all/nest_editor_spec.rb +1 -1
- data/mod/email/set/all/email_html.rb +2 -2
- data/mod/email/set/all/email_text.rb +2 -2
- data/mod/follow/lib/card/follower_stash.rb +1 -1
- data/mod/follow/set/all/follow/followed_by.rb +1 -1
- data/mod/follow/set/all/notify/base_views.rb +4 -6
- data/mod/follow/set/right/following.rb +1 -1
- data/mod/follow/set/self/follow_defaults.rb +1 -1
- data/mod/follow/set/type/cardtype.rb +6 -0
- data/mod/follow/set/type_plus_right/user/follow.rb +1 -1
- data/mod/history/lib/card/act/act_renderer.rb +1 -1
- data/mod/history/lib/card/action.rb +2 -1
- data/mod/history/set/all/history_bridge.rb +0 -1
- data/mod/history/spec/set/all/history/views_spec.rb +1 -1
- data/mod/item/set/all/bar.rb +15 -7
- data/mod/machines/file/all_script_machine_output/file.js +72 -38108
- data/mod/machines/file/all_style_machine_output/file.css +4 -4
- data/mod/machines/file/script_html5shiv_printshiv_machine_output/file.js +1 -1
- data/mod/machines/lib/javascript/decko/bridge.js.coffee +4 -0
- data/mod/machines/lib/javascript/decko/card_menu.js.coffee +11 -0
- data/mod/machines/lib/javascript/decko/decko.js.coffee +12 -3
- data/mod/machines/lib/javascript/decko/name_editor.js.coffee +1 -1
- data/mod/machines/lib/javascript/decko/nest_editor.js.coffee +3 -1
- data/mod/machines/lib/javascript/decko/nest_editor_name.js.coffee +29 -6
- data/mod/machines/lib/javascript/decko/overlay.js.coffee +6 -2
- data/mod/machines/lib/javascript/decko/slot.js.coffee +12 -2
- data/mod/machines/lib/javascript/decko/slotter.js.coffee +8 -0
- data/mod/machines/lib/javascript/decko/upload.js.coffee +1 -1
- data/mod/machines/lib/stylesheets/style_cards.scss +57 -52
- data/mod/machines/lib/stylesheets/style_jquery_ui_smoothness.css +13 -13
- data/mod/machines/set/abstract/script.rb +1 -1
- data/mod/machines/set/type/css.rb +1 -1
- data/mod/machines/spec/set/type/css_spec.rb +14 -14
- data/mod/machines/spec/shared_examples/machine_input.rb +6 -10
- data/mod/media/lib/stylesheets/style_image_box.scss +79 -0
- data/mod/{utility → media}/set/abstract/media.rb +0 -0
- data/mod/{utility → media}/set/abstract/media/media_snippet.haml +0 -0
- data/mod/media/set/self/style_media.rb +6 -0
- data/mod/media/set/type/image.rb +38 -0
- data/mod/{utility → media}/spec/set/abstract/media_spec.rb +0 -0
- data/mod/navbar/set/abstract/{roles_dropdown.rb → account_dropdown.rb} +8 -2
- data/mod/navbar/set/right/enabled_roles.rb +7 -9
- data/mod/navbar/set/self/account_links.rb +4 -3
- data/mod/navbar/spec/set/self/account_links_spec.rb +31 -0
- data/mod/pointer/lib/javascript/script_pointer_config.js.coffee +13 -0
- data/mod/pointer/lib/javascript/script_pointer_list_editor.js.coffee +7 -2
- data/mod/pointer/set/abstract/02_pointer/html_views.rb +16 -7
- data/mod/pointer/set/abstract/02_pointer/html_views/checkbox_input.haml +1 -2
- data/mod/pointer/set/abstract/02_pointer/html_views/list_input.haml +1 -2
- data/mod/pointer/set/abstract/02_pointer/html_views/list_item.haml +2 -0
- data/mod/pointer/set/abstract/02_pointer/html_views/radio_input.haml +1 -2
- data/mod/pointer/set/abstract/02_pointer/options_api.rb +6 -13
- data/mod/pointer/set/right/{options.rb → content_options.rb} +0 -0
- data/mod/pointer/set/type/link_list.rb +23 -6
- data/mod/pointer/set/type/link_list/link_list_input.haml +24 -0
- data/mod/pointer/set/type/mirrored_list.rb +1 -1
- data/mod/pointer/spec/set/abstract/pointer/html_views_spec.rb +20 -18
- data/mod/pointer/spec/set/abstract/pointer/options_api_spec.rb +2 -1
- data/mod/pointer/spec/set/self/input_options_spec.rb +1 -1
- data/mod/rules/set/right/self.rb +3 -0
- data/mod/rules/set/rule/bar_view.rb +88 -0
- data/mod/rules/set/rule/bridge_rules_editor.rb +5 -10
- data/mod/rules/set/rule/editor.rb +40 -113
- data/mod/rules/set/rule/html_views.rb +13 -0
- data/mod/rules/set/rule/quick_editor.rb +39 -0
- data/mod/rules/set/rule/{editor → quick_editor}/quick_edit.haml +0 -0
- data/mod/rules/set/rule/{editor → quick_editor}/set_info.haml +1 -1
- data/mod/rules/set/rule/rule_form/buttons.rb +3 -1
- data/mod/rules/set/rule/rule_form/form_elements.rb +2 -2
- data/mod/rules/set/rule/rule_form/rule_set_radio.rb +3 -6
- data/mod/rules/set/rule/rule_form/set_selection.rb +3 -10
- data/mod/rules/set/rule/rules.rb +10 -1
- data/mod/rules/set/type/set.rb +37 -20
- data/mod/rules/set/type/set/html_views.rb +17 -35
- data/mod/rules/set/type/set/html_views/group_panel.haml +1 -1
- data/mod/rules/set/type/set/html_views/rule_lists.rb +42 -0
- data/mod/rules/set/type/set/html_views/template.rb +1 -32
- data/mod/rules/set/type/set/rules_filter.rb +24 -10
- data/mod/rules/set/type/set/setting_lists.rb +18 -25
- data/mod/rules/spec/set/rule/bar_view_spec.rb +15 -0
- data/mod/rules/spec/set/rule/editor_spec.rb +15 -1
- data/mod/rules/spec/set/type/set/html_views_spec.rb +0 -13
- data/mod/rules/spec/set/type/set/setting_lists_spec.rb +17 -0
- data/mod/rules/spec/set/type/set_spec.rb +3 -8
- data/mod/search/set/abstract/03_filter/form_helper.rb +11 -9
- data/mod/search/set/abstract/search/views.rb +2 -2
- data/mod/search/set/right/children.rb +4 -0
- data/mod/search/set/right/created.rb +3 -0
- data/mod/search/set/right/edited.rb +3 -0
- data/mod/search/set/right/editors.rb +3 -0
- data/mod/search/set/right/follow.rb +3 -0
- data/mod/search/set/right/linked_to_by.rb +3 -0
- data/mod/search/set/right/links_to.rb +3 -0
- data/mod/search/set/right/mates.rb +3 -0
- data/mod/search/set/right/nested_by.rb +3 -0
- data/mod/search/set/right/nests.rb +3 -0
- data/mod/search/set/right/referred_to_by.rb +3 -0
- data/mod/search/set/right/refers_to.rb +3 -0
- data/mod/search/set/self/search.rb +3 -1
- data/mod/search/set/type/search_type.rb +6 -5
- data/mod/settings/lib/card/setting.rb +17 -4
- data/mod/settings/set/abstract/permission.rb +6 -2
- data/mod/settings/set/all/supports_content_options.rb +7 -0
- data/mod/settings/set/right/content_option_view.rb +10 -0
- data/mod/settings/set/right/content_options.rb +18 -0
- data/mod/settings/set/right/default.rb +18 -2
- data/mod/settings/set/right/guide.rb +8 -0
- data/mod/settings/set/right/help.rb +2 -1
- data/mod/settings/set/right/input_type.rb +35 -0
- data/mod/settings/set/right/read.rb +1 -1
- data/mod/settings/set/right/script.rb +6 -0
- data/mod/settings/set/right/structure.rb +7 -1
- data/mod/settings/set/right/style.rb +2 -2
- data/mod/settings/set/right/style/{editor.haml → input.haml} +0 -0
- data/mod/settings/set/self/autoname.rb +3 -1
- data/mod/settings/set/self/captcha.rb +4 -1
- data/mod/settings/set/self/content_option_view.rb +10 -0
- data/mod/settings/set/self/content_options.rb +10 -0
- data/mod/settings/set/self/create.rb +2 -1
- data/mod/settings/set/self/default.rb +1 -1
- data/mod/settings/set/self/delete.rb +2 -1
- data/mod/settings/set/self/guide.rb +3 -0
- data/mod/settings/set/self/head.rb +3 -1
- data/mod/settings/set/self/help.rb +3 -1
- data/mod/settings/set/self/input_type.rb +13 -0
- data/mod/settings/set/self/layout.rb +3 -1
- data/mod/settings/set/self/on_create.rb +2 -1
- data/mod/settings/set/self/on_delete.rb +2 -1
- data/mod/settings/set/self/on_update.rb +2 -1
- data/mod/settings/set/self/read.rb +2 -1
- data/mod/settings/set/self/structure.rb +3 -1
- data/mod/settings/set/self/style.rb +3 -1
- data/mod/settings/set/self/table_of_contents.rb +4 -1
- data/mod/settings/set/self/thanks.rb +3 -1
- data/mod/settings/set/self/update.rb +2 -1
- data/mod/settings/set/type/setting.rb +15 -37
- data/mod/settings/spec/set/right/comment_spec.rb +0 -27
- data/mod/settings/spec/set/right/create_spec.rb +1 -1
- data/mod/settings/spec/set/right/structure_spec.rb +13 -10
- data/mod/settings/spec/set/type/setting_spec.rb +1 -8
- data/mod/solid_cache/set/right/solid_cache.rb +3 -3
- data/mod/standard/set/all/comment.rb +2 -1
- data/mod/standard/set/all/error.rb +2 -2
- data/mod/standard/set/all/path.rb +7 -7
- data/mod/standard/set/all/rich_html/content.rb +41 -17
- data/mod/standard/set/all/rich_html/error.rb +16 -24
- data/mod/standard/set/all/rich_html/html_views/guide.rb +51 -0
- data/mod/standard/set/all/rich_html/html_views/help.rb +23 -5
- data/mod/standard/set/all/rich_html/html_views/info.rb +1 -1
- data/mod/standard/set/all/rich_html/menu.rb +50 -2
- data/mod/standard/set/all/rich_html/overlay.rb +24 -2
- data/mod/standard/set/all/rich_html/title.rb +3 -3
- data/mod/standard/set/right/discussion.rb +8 -2
- data/mod/standard/set/right/head.rb +4 -0
- data/mod/standard/set/right/type_plus_right.rb +4 -0
- data/mod/standard/set/self/cardtype.rb +42 -0
- data/mod/standard/set/self/sidebar.rb +5 -0
- data/mod/standard/set/type/basic.rb +2 -2
- data/mod/standard/set/type/cardtype.rb +25 -11
- data/mod/standard/set/type/number.rb +1 -1
- data/mod/standard/set/type/phrase.rb +1 -1
- data/mod/standard/set/type/toggle.rb +9 -1
- data/mod/standard/set/type/uri.rb +1 -1
- data/mod/standard/spec/set/all/error_spec.rb +1 -1
- data/mod/standard/spec/set/type/cardtype_spec.rb +4 -3
- data/mod/standard/spec/set/type/number_spec.rb +1 -1
- data/mod/standard/spec/set/type/phrase_spec.rb +1 -1
- data/mod/standard/spec/set/type/toggle_spec.rb +3 -4
- data/mod/standard/spec/set/type/uri_spec.rb +1 -1
- data/mod/tinymce_editor/lib/javascript/script_tinymce.js +2 -2
- data/mod/tinymce_editor/lib/javascript/script_tinymce_config.js.coffee +4 -2
- data/mod/tinymce_editor/public/assets/tinymce/jquery.tinymce.min.js +1 -1
- data/mod/tinymce_editor/public/assets/tinymce/plugins/advlist/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/anchor/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/autolink/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/autoresize/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/autosave/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/bbcode/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/charmap/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/code/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/codesample/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/colorpicker/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/contextmenu/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/directionality/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/js/emojis.js +8941 -8941
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/fullpage/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/fullscreen/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/help/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/hr/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/image/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/imagetools/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/importcss/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/insertdatetime/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/legacyoutput/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/link/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/lists/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/media/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/nonbreaking/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/noneditable/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/pagebreak/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/paste/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/preview/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/print/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/quickbars/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/save/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/searchreplace/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/spellchecker/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/tabfocus/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/table/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/template/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/textcolor/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/textpattern/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/toc/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/visualblocks/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/visualchars/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/plugins/wordcount/plugin.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/skins/content/default/content.min.css +1 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/content/document/content.min.css +1 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/content/writer/content.min.css +1 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide-dark/content.inline.min.css +1 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide-dark/content.min.css +1 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide-dark/skin.min.css +1 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/content.inline.min.css +1 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/content.min.css +1 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/content.mobile.min.css +7 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/skin.min.css +1 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/ui/oxide/skin.mobile.min.css +7 -1
- data/mod/tinymce_editor/public/assets/tinymce/themes/mobile/theme.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/themes/silver/theme.min.js +2 -2
- data/mod/tinymce_editor/public/assets/tinymce/tinymce.min.js +2 -2
- data/mod/tinymce_editor/set/self/tiny_mce.rb +7 -0
- metadata +147 -119
- data/db/migrate_core_cards/20190710090207_homepage_tweaks.rb +0 -12
- data/db/migrate_core_cards/data/cards/eagle-description +0 -1
- data/mod/account/set/right/token.rb +0 -54
- data/mod/account/spec/set/right/token_spec.rb +0 -23
- data/mod/bootstrap/set/abstract/bootswatch_theme/thumbnail.haml +0 -10
- data/mod/date/vendor/tempusdominus/src/nuget/NuGet.exe +0 -0
- data/mod/date/vendor/tempusdominus/src/nuget/Tempus.Dominus.Bootstrap.4.nuspec +0 -29
- data/mod/rules/set/rule/table.rb +0 -27
- data/mod/rules/set/rule/table_row.rb +0 -63
- data/mod/rules/set/type/set/html_views/nest_rules.rb +0 -14
- data/mod/rules/set/type/set/html_views/rules_bridge.rb +0 -21
- data/mod/rules/set/type/set/html_views/rules_table.haml +0 -11
- data/mod/rules/set/type/set/html_views/template/template_editor.haml +0 -6
- data/mod/rules/spec/set/rule/table_row_spec.rb +0 -9
- data/mod/rules/spec/set/rule/table_spec.rb +0 -15
- data/mod/settings/set/right/add_help.rb +0 -1
- data/mod/settings/set/self/accountable.rb +0 -3
- data/mod/settings/set/self/add_help.rb +0 -2
- data/mod/settings/set/self/input.rb +0 -3
- data/mod/settings/set/self/options.rb +0 -4
- data/mod/settings/set/self/options_label.rb +0 -4
- data/mod/settings/spec/set/right/add_help_spec.rb +0 -5
- data/mod/tinymce_editor/public/assets/tinymce/plugins/codesample/css/prism.css +0 -138
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-cool.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-cry.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-embarassed.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-foot-in-mouth.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-frown.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-innocent.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-kiss.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-laughing.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-money-mouth.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-sealed.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-smile.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-surprised.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-tongue-out.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-undecided.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-wink.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/emoticons/img/smiley-yell.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/help/img/logo.png +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/plugins/visualblocks/css/visualblocks.css +0 -154
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/content.inline.min.css +0 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/content.min.css +0 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/content.mobile.min.css +0 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/fonts/tinymce-mobile.woff +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/fonts/tinymce-small.eot +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/fonts/tinymce-small.svg +0 -63
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/fonts/tinymce-small.ttf +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/fonts/tinymce-small.woff +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/fonts/tinymce.eot +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/fonts/tinymce.svg +0 -131
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/fonts/tinymce.ttf +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/fonts/tinymce.woff +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/img/anchor.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/img/loader.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/img/object.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/img/trans.gif +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/skin.min.css +0 -1
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/skin.min.css.map +0 -0
- data/mod/tinymce_editor/public/assets/tinymce/skins/lightgray/skin.mobile.min.css +0 -2
- data/mod/tinymce_editor/public/assets/tinymce/themes/inlite/theme.min.js +0 -1
- data/mod/tinymce_editor/public/assets/tinymce/themes/modern/theme.min.js +0 -1
@@ -7,6 +7,8 @@ $.extend decko.editorContentFunctionMap,
|
|
7
7
|
pointerContent @find('input:checked').val()
|
8
8
|
'.pointer-list-ul': ->
|
9
9
|
pointerContent @find('input').map( -> $(this).val() )
|
10
|
+
'.pointer-link-list-ul': ->
|
11
|
+
decko.linkListContent @find('.input-group')
|
10
12
|
'.pointer-checkbox-list': ->
|
11
13
|
pointerContent @find('input:checked').map( -> $(this).val() )
|
12
14
|
'.pointer-select-list': ->
|
@@ -44,6 +46,17 @@ $.extend decko,
|
|
44
46
|
list = $.map $.makeArray(vals), (v) -> if v then '[[' + v + ']]'
|
45
47
|
$.makeArray(list).join "\n"
|
46
48
|
|
49
|
+
linkListContent: (input_groups) ->
|
50
|
+
vals = input_groups.map( ->
|
51
|
+
v = $(this).find('input._reference').val()
|
52
|
+
title = $(this).find('input._title').val()
|
53
|
+
v += "|#{title}" if title.length > 0
|
54
|
+
v
|
55
|
+
)
|
56
|
+
list = $.map $.makeArray(vals), (v) -> if v then '[[' + v + ']]'
|
57
|
+
$.makeArray(list).join "\n"
|
58
|
+
|
59
|
+
|
47
60
|
pointerContent = (vals) ->
|
48
61
|
decko.pointerContent vals
|
49
62
|
# deprecated. backwards compatibility
|
@@ -1,6 +1,6 @@
|
|
1
1
|
$(window).ready ->
|
2
2
|
# add pointer item when clicking on "add another" button
|
3
|
-
$('body').on 'click', '.
|
3
|
+
$('body').on 'click', '._pointer-item-add', (event)->
|
4
4
|
decko.addPointerItem this
|
5
5
|
event.preventDefault() # Prevent link from following its href
|
6
6
|
|
@@ -10,6 +10,7 @@ $(window).ready ->
|
|
10
10
|
decko.addPointerItem this
|
11
11
|
event.preventDefault() # was triggering extra item in unrelated pointer
|
12
12
|
|
13
|
+
# enable/disable add
|
13
14
|
$('body').on 'keyup', '.pointer-item-text', (_event)->
|
14
15
|
decko.updateAddItemButton this
|
15
16
|
|
@@ -26,8 +27,12 @@ decko.slotReady (slot) ->
|
|
26
27
|
|
27
28
|
$.extend decko,
|
28
29
|
addPointerItem: (el) ->
|
30
|
+
slot = $(el).slot()
|
31
|
+
slot.trigger "slotDestroy"
|
29
32
|
newInput = decko.nextPointerInput decko.lastPointerItem(el)
|
30
33
|
newInput.val ''
|
34
|
+
|
35
|
+
slot.trigger "slotReady"
|
31
36
|
newInput.focus()
|
32
37
|
decko.updateAddItemButton el
|
33
38
|
decko.initPointerList newInput
|
@@ -43,6 +48,6 @@ $.extend decko,
|
|
43
48
|
$(el).closest('.content-editor').find '.pointer-li:last'
|
44
49
|
|
45
50
|
updateAddItemButton: (el)->
|
46
|
-
button = $(el).closest('.content-editor').find '.
|
51
|
+
button = $(el).closest('.content-editor').find '._pointer-item-add'
|
47
52
|
disabled = decko.lastPointerItem(el).find('input').val() == ''
|
48
53
|
button.prop 'disabled', disabled
|
@@ -21,7 +21,7 @@ format :html do
|
|
21
21
|
pointer_items(paging_args.extract!(:limit, :offset)).join(voo.separator || "\n")
|
22
22
|
end
|
23
23
|
|
24
|
-
view :
|
24
|
+
view :one_line_content do
|
25
25
|
item_view = implicit_item_view
|
26
26
|
item_view = item_view == "name" ? "name" : "link"
|
27
27
|
wrap_with :div, class: "pointer-list" do
|
@@ -34,11 +34,11 @@ format :html do
|
|
34
34
|
%(<div class="pointer-item item-#{item_view}">#{rendered}</div>)
|
35
35
|
end
|
36
36
|
|
37
|
-
view :
|
37
|
+
view :input do
|
38
38
|
_render_hidden_content_field + super()
|
39
39
|
end
|
40
40
|
|
41
|
-
def
|
41
|
+
def default_input_type
|
42
42
|
:list
|
43
43
|
end
|
44
44
|
|
@@ -54,7 +54,8 @@ format :html do
|
|
54
54
|
items = items_for_input args[:item_list]
|
55
55
|
extra_class = "pointer-list-ul"
|
56
56
|
ul_classes = classy "pointer-list-editor", extra_class
|
57
|
-
haml :list_input, items: items, ul_classes: ul_classes
|
57
|
+
haml :list_input, items: items, ul_classes: ul_classes,
|
58
|
+
options_card: options_card_name
|
58
59
|
end
|
59
60
|
|
60
61
|
%i[autocomplete checkbox radio select multiselect].each do |editor_view|
|
@@ -67,11 +68,11 @@ format :html do
|
|
67
68
|
end
|
68
69
|
|
69
70
|
def checkbox_input
|
70
|
-
haml :checkbox_input
|
71
|
+
haml :checkbox_input, submit_on_change: @submit_on_change
|
71
72
|
end
|
72
73
|
|
73
74
|
def radio_input
|
74
|
-
haml :radio_input
|
75
|
+
haml :radio_input, submit_on_change: @submit_on_change
|
75
76
|
end
|
76
77
|
|
77
78
|
def select_input
|
@@ -90,7 +91,7 @@ format :html do
|
|
90
91
|
def add_item_modal_link
|
91
92
|
modal_link "Add Item",
|
92
93
|
size: :large,
|
93
|
-
class: "btn btn-sm btn-
|
94
|
+
class: "btn btn-sm btn-outline-secondary _add-item-link",
|
94
95
|
path: { view: :filter_items_modal,
|
95
96
|
item: implicit_item_view,
|
96
97
|
filter_card: filter_card.name,
|
@@ -102,6 +103,14 @@ format :html do
|
|
102
103
|
|
103
104
|
def add_item_overlay_link; end
|
104
105
|
|
106
|
+
def one_line_content
|
107
|
+
if count == 1
|
108
|
+
card.item_names.first
|
109
|
+
else
|
110
|
+
short_content
|
111
|
+
end
|
112
|
+
end
|
113
|
+
|
105
114
|
private
|
106
115
|
|
107
116
|
# currently only used by :list and :autocomplete. could be generalized?
|
@@ -4,6 +4,5 @@
|
|
4
4
|
- checked = card.item_names.include? option_name
|
5
5
|
.pointer-checkbox
|
6
6
|
= check_box_tag "pointer_checkbox-#{unique_id}", option_name, checked,
|
7
|
-
id: id, class: "pointer-checkbox-button"
|
7
|
+
id: id, class: "pointer-checkbox-button #{'_submit-on-change' if submit_on_change}"
|
8
8
|
= option_label option_label, id
|
9
|
-
= option_description "checkbox", option_name
|
@@ -1,5 +1,4 @@
|
|
1
1
|
%ul{class: ul_classes}
|
2
|
-
- options_card = options_card_name
|
3
2
|
- items.each do |item|
|
4
3
|
%li.pointer-li.mb-1
|
5
4
|
%span.input-group
|
@@ -12,6 +11,6 @@
|
|
12
11
|
%button.pointer-item-delete.btn.btn-secondary{ type: "button"}
|
13
12
|
= icon_tag :remove
|
14
13
|
%span.input-group
|
15
|
-
%button.
|
14
|
+
%button._pointer-item-add.btn.btn-secondary{ type: "submit" }
|
16
15
|
= icon_tag "add"
|
17
16
|
add another
|
@@ -9,6 +9,5 @@
|
|
9
9
|
- id = "pointer-radio-#{option_name.to_name.key}"
|
10
10
|
%li.pointer-radio.radio
|
11
11
|
= radio_button_tag input_name, option_name, checked,
|
12
|
-
id: id, class: "pointer-radio-button"
|
12
|
+
id: id, class: "pointer-radio-button #{'_submit-on-change' if submit_on_change}"
|
13
13
|
= option_label option_label, id
|
14
|
-
= option_description "radio", option_name
|
@@ -29,7 +29,7 @@ def option_cards
|
|
29
29
|
end
|
30
30
|
|
31
31
|
def options_rule_card
|
32
|
-
rule_card :
|
32
|
+
rule_card :content_options
|
33
33
|
end
|
34
34
|
|
35
35
|
def standard_option_names
|
@@ -65,20 +65,13 @@ format :html do
|
|
65
65
|
%(<label for="#{id}">#{option_label_text option_name}</label>)
|
66
66
|
end
|
67
67
|
|
68
|
-
def
|
69
|
-
|
68
|
+
def option_view
|
69
|
+
@option_view ||= card.rule(:content_option_view) || :smart_label
|
70
70
|
end
|
71
71
|
|
72
|
-
|
73
|
-
|
74
|
-
return "" unless (description = option_description_core(option_name))
|
75
|
-
%(<div class="#{option_type}-option-description">#{description}</div>)
|
76
|
-
end
|
72
|
+
def option_label_text option_name
|
73
|
+
return option_name unless (option_card = Card.fetch option_name)
|
77
74
|
|
78
|
-
|
79
|
-
# DISCUSS: "options label" is an obscure rule. still support?
|
80
|
-
desc_name = card.rule(:options_label) || "description"
|
81
|
-
return unless (desc_card = Card[option, desc_name])
|
82
|
-
nest desc_card, { view: :core }, nest_mode: :normal
|
75
|
+
nest option_card, view: option_view
|
83
76
|
end
|
84
77
|
end
|
File without changes
|
@@ -1,12 +1,12 @@
|
|
1
1
|
include_set Abstract::Pointer
|
2
2
|
|
3
|
-
def
|
4
|
-
reference_chunks.map(&:referee_name)
|
3
|
+
def all_raw_item_strings content=nil
|
4
|
+
reference_chunks(content).map(&:referee_name)
|
5
5
|
end
|
6
6
|
|
7
|
-
def item_titles
|
7
|
+
def item_titles default_to_name=true
|
8
8
|
reference_chunks.map do |chunk|
|
9
|
-
chunk.options[:title] || chunk.referee_name
|
9
|
+
chunk.options[:title] || (default_to_name ? chunk.referee_name : nil)
|
10
10
|
end
|
11
11
|
end
|
12
12
|
|
@@ -17,7 +17,24 @@ format do
|
|
17
17
|
end
|
18
18
|
|
19
19
|
format :html do
|
20
|
-
def
|
21
|
-
:
|
20
|
+
def input_type
|
21
|
+
:link_list
|
22
|
+
end
|
23
|
+
|
24
|
+
view :link_list_input, cache: :never do
|
25
|
+
link_list_input
|
26
|
+
end
|
27
|
+
|
28
|
+
def items_for_input items=nil
|
29
|
+
items ||= card.item_names context: :raw
|
30
|
+
items.empty? ? [["", ""]] : items.zip(card.item_titles(false))
|
31
|
+
end
|
32
|
+
|
33
|
+
def link_list_input args={}
|
34
|
+
items = items_for_input args[:item_list]
|
35
|
+
extra_class = "pointer-link-list-ul"
|
36
|
+
ul_classes = classy "pointer-list-editor", extra_class
|
37
|
+
haml :link_list_input, items: items, ul_classes: ul_classes,
|
38
|
+
options_card: options_card_name
|
22
39
|
end
|
23
40
|
end
|
@@ -0,0 +1,24 @@
|
|
1
|
+
%ul{class: ul_classes}
|
2
|
+
- items.each do |reference, title|
|
3
|
+
%li.pointer-li.mb-1
|
4
|
+
%span.input-group
|
5
|
+
.input-group-prepend.handle
|
6
|
+
%span.input-group-text
|
7
|
+
= icon_tag :reorder
|
8
|
+
%span.input-group-text.text-muted.group-text-left
|
9
|
+
[[
|
10
|
+
= text_field_tag "pointer_item", reference, class: "_reference pointer-item-text form-control group-text-middle",
|
11
|
+
"data-options-card": options_card
|
12
|
+
%span.input-group-text.text-muted.group-text-middle
|
13
|
+
|
|
14
|
+
= text_field_tag "pointer_item_title", title, class: "_title pointer-item-text form-control group-text-middle"
|
15
|
+
%span.input-group-text.text-muted.group-text-right
|
16
|
+
]]
|
17
|
+
.input-group-append
|
18
|
+
%span.input-group-text.p-0
|
19
|
+
%button.pointer-item-delete.btn.btn-secondary{ type: "button"}
|
20
|
+
= icon_tag :remove
|
21
|
+
%span.input-group
|
22
|
+
%button._pointer-item-add.btn.btn-secondary{ type: "submit" }
|
23
|
+
= icon_tag "add"
|
24
|
+
add another
|
@@ -1,7 +1,7 @@
|
|
1
1
|
include_set Abstract::Pointer
|
2
2
|
|
3
3
|
event :validate_list_name, :validate, on: :save, changed: :name do
|
4
|
-
errors.add :name, tr(:cardtype_right)
|
4
|
+
errors.add :name, tr(:cardtype_right) unless right&.type_id == CardtypeID
|
5
5
|
end
|
6
6
|
|
7
7
|
event :validate_list_item_type_change, :validate,
|
@@ -8,7 +8,7 @@ describe Card::Set::Abstract::Pointer do
|
|
8
8
|
pointer
|
9
9
|
end
|
10
10
|
|
11
|
-
check_views_for_errors :core, :
|
11
|
+
check_views_for_errors :core, :one_line_content, :input,
|
12
12
|
:list, :autocomplete, :checkbox,
|
13
13
|
:radio, :select, :multiselect
|
14
14
|
end
|
@@ -37,25 +37,27 @@ describe Card::Set::Abstract::Pointer do
|
|
37
37
|
end
|
38
38
|
|
39
39
|
it "includes nonexisting card in radio options" do
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
40
|
+
common_with = { type: "radio",
|
41
|
+
value: "nonexistingcardmustnotexistthisistherule",
|
42
|
+
id: "pointer-radio-nonexistingcardmustnotexistthisistherule",
|
43
|
+
checked: "checked" }
|
44
|
+
expect(pointer.format.render_radio)
|
45
|
+
.to have_tag "input.pointer-radio-button",
|
46
|
+
with: common_with.merge(name: "pointer_radio_button-tp")
|
47
|
+
expect(inherit_pointer.format.render_radio)
|
48
|
+
.to have_tag "input.pointer-radio-button",
|
49
|
+
with: common_with.merge(name: "pointer_radio_button-ip")
|
49
50
|
end
|
50
51
|
|
51
52
|
it "includes nonexisting card in checkbox options" do
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
53
|
+
expect(inherit_pointer.format.render_checkbox)
|
54
|
+
.to have_tag "input.pointer-checkbox-button",
|
55
|
+
with: {
|
56
|
+
type: "checkbox",
|
57
|
+
value: "nonexistingcardmustnotexistthisistherule",
|
58
|
+
id: "pointer-checkbox-nonexistingcardmustnotexistthisistherule",
|
59
|
+
checked: "checked"
|
60
|
+
}
|
59
61
|
end
|
60
62
|
|
61
63
|
it "includes nonexisting card in select options" do
|
@@ -77,7 +79,7 @@ describe Card::Set::Abstract::Pointer do
|
|
77
79
|
describe "list_input" do
|
78
80
|
subject do
|
79
81
|
pointer = Card.new name: "tp", type: "pointer", content: pointer_content
|
80
|
-
pointer.format._render :
|
82
|
+
pointer.format._render :input
|
81
83
|
end
|
82
84
|
|
83
85
|
let(:pointer_content) { "[[Jane]]\n[[John]]" }
|
@@ -1,6 +1,7 @@
|
|
1
1
|
RSpec.describe Card::Set::Abstract::Pointer::OptionsApi do
|
2
2
|
def define_options_rule type_id, content
|
3
|
-
Card.create! name: %i[pointer type
|
3
|
+
Card.create! name: %i[pointer type content_options],
|
4
|
+
type_id: type_id, content: content
|
4
5
|
end
|
5
6
|
|
6
7
|
let :sample_pointer do
|
@@ -1,6 +1,6 @@
|
|
1
1
|
describe Card::Set::Self::InputOptions do
|
2
2
|
it "loads the self set" do
|
3
|
-
expect(Card[:
|
3
|
+
expect(Card[:input_type, :right, :content_options].item_names).to contain_exactly(
|
4
4
|
"radio", "checkbox", "select", "multiselect", "list", "ace editor", "filtered list",
|
5
5
|
"prosemirror editor", "tinymce editor", "text area", "text field", "calendar"
|
6
6
|
)
|
@@ -0,0 +1,88 @@
|
|
1
|
+
format :html do
|
2
|
+
bar_cols 6, 6
|
3
|
+
info_bar_cols 5, 4, 3
|
4
|
+
|
5
|
+
def existing_rule_card
|
6
|
+
@existing_rule_card ||= find_existing_rule_card
|
7
|
+
end
|
8
|
+
|
9
|
+
view :bar, unknown: true do
|
10
|
+
voo.hide :bar_nav unless existing_rule_card
|
11
|
+
super()
|
12
|
+
end
|
13
|
+
|
14
|
+
view :expanded_bar, unknown: true do
|
15
|
+
super()
|
16
|
+
end
|
17
|
+
|
18
|
+
view :one_line_content,
|
19
|
+
wrap: { div: { class: "text-muted one-line" } }, unknown: true do
|
20
|
+
return render_mini_unknown unless existing_rule_card
|
21
|
+
|
22
|
+
with_nest_mode :compact do
|
23
|
+
one_line_content
|
24
|
+
end
|
25
|
+
end
|
26
|
+
|
27
|
+
view :raw_one_line_content,
|
28
|
+
wrap: { div: { class: "text-muted one-line" } }, unknown: true do
|
29
|
+
return render_mini_unknown unless existing_rule_card
|
30
|
+
|
31
|
+
raw_one_line_content
|
32
|
+
end
|
33
|
+
|
34
|
+
view :bar_bottom, unknown: true do
|
35
|
+
if nest_mode == :edit
|
36
|
+
current_rule_form
|
37
|
+
else
|
38
|
+
nest existing_rule_card, view: :core
|
39
|
+
end
|
40
|
+
end
|
41
|
+
|
42
|
+
view :bar_middle, unknown: true do
|
43
|
+
rule_info
|
44
|
+
end
|
45
|
+
|
46
|
+
view :bar_left, unknown: true do
|
47
|
+
super()
|
48
|
+
end
|
49
|
+
|
50
|
+
view :bar_right, unknown: true do
|
51
|
+
voo.show?(:bar_bottom) ? rule_info : rule_short_content
|
52
|
+
end
|
53
|
+
|
54
|
+
def rule_short_content
|
55
|
+
return "" unless existing_rule_card
|
56
|
+
|
57
|
+
nest existing_rule_card, { view: :one_line_content },
|
58
|
+
set_context: card.name.trunk_name
|
59
|
+
end
|
60
|
+
|
61
|
+
def bar_title
|
62
|
+
return super() if voo.show? :full_name
|
63
|
+
|
64
|
+
if existing_rule_card && voo.show?(:toggle)
|
65
|
+
link_to_view bar_title_toggle_view, card.rule_setting_title
|
66
|
+
else
|
67
|
+
card.rule_setting_title
|
68
|
+
end
|
69
|
+
end
|
70
|
+
|
71
|
+
# LOCALIZE
|
72
|
+
def rule_info
|
73
|
+
return wrap_with(:em, "no existing #{setting_link} rule") unless existing_rule_card
|
74
|
+
|
75
|
+
wrap_with :span,
|
76
|
+
"#{rule_setting_link} rule that applies to "\
|
77
|
+
"#{rule_set_link existing_rule_card}"
|
78
|
+
end
|
79
|
+
|
80
|
+
def rule_setting_link
|
81
|
+
link_to_card card.rule_setting, card.rule_setting_name
|
82
|
+
end
|
83
|
+
|
84
|
+
def rule_set_link existing_rule
|
85
|
+
count = link_to_card [card.rule_set, :by_name], card.rule_set.count
|
86
|
+
"#{link_to_card card.rule_set, existing_rule.trunk&.label&.downcase} (#{count})"
|
87
|
+
end
|
88
|
+
end
|