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
@@ -53,8 +53,8 @@ RSpec.describe Card::Set::Self::Signin do
|
|
53
53
|
context "#reset password" do
|
54
54
|
it "is triggered by an update" do
|
55
55
|
# Card['joe admin'].account.token.should be_nil FIXME: this should be t
|
56
|
-
@card.update! "+*email" => "joe@admin.com"
|
57
|
-
expect(
|
56
|
+
@card.update! "+*email" => "joe@admin.com", trigger: :send_reset_password_token
|
57
|
+
expect(Mail::TestMailer.deliveries.last.to.first).to eq("joe@admin.com")
|
58
58
|
end
|
59
59
|
|
60
60
|
it "returns an error if email is not found" do
|
@@ -5,6 +5,14 @@ RSpec.describe Card::Set::Type::Signup do
|
|
5
5
|
Card::Auth.current_id = Card::AnonymousID
|
6
6
|
end
|
7
7
|
|
8
|
+
let :big_bad_signup do
|
9
|
+
Mail::TestMailer.deliveries.clear
|
10
|
+
Card.create!(
|
11
|
+
name: "Big Bad Wolf", type_id: Card::SignupID,
|
12
|
+
"+*account" => { "+*email" => "wolf@wagn.org", "+*password" => "wolf" }
|
13
|
+
)
|
14
|
+
end
|
15
|
+
|
8
16
|
context "signup form form" do
|
9
17
|
subject do
|
10
18
|
Card.new(type_id: Card::SignupID).format.render! :new
|
@@ -19,29 +27,21 @@ RSpec.describe Card::Set::Type::Signup do
|
|
19
27
|
|
20
28
|
context "signup (without approval)" do
|
21
29
|
before do
|
22
|
-
ActionMailer::Base.deliveries = [] # needed?
|
23
|
-
|
24
30
|
Card::Auth.as_bot do
|
25
31
|
Card.create! name: "User+*type+*create", content: "[[Anyone]]"
|
26
32
|
end
|
27
|
-
|
28
33
|
Card::Auth.current_id = Card::AnonymousID
|
29
|
-
@signup = Card.create!(
|
30
|
-
name: "Big Bad Wolf", type_id: Card::SignupID,
|
31
|
-
"+*account" => { "+*email" => "wolf@wagn.org", "+*password" => "wolf" }
|
32
|
-
)
|
33
34
|
|
35
|
+
@signup = big_bad_signup
|
34
36
|
@account = @signup.account
|
35
|
-
@token = @account.token
|
36
37
|
end
|
37
38
|
|
38
39
|
it "creates all the necessary cards" do
|
39
40
|
expect(@signup.type_id).to eq(Card::SignupID)
|
40
41
|
expect(@account.email).to eq("wolf@wagn.org")
|
41
|
-
expect(@account.status).to eq("
|
42
|
+
expect(@account.status).to eq("unverified")
|
42
43
|
expect(@account.salt).not_to eq("")
|
43
44
|
expect(@account.password.length).to be > 10 # encrypted
|
44
|
-
expect(@account.token).to be_present
|
45
45
|
end
|
46
46
|
|
47
47
|
it "renders in core view" do
|
@@ -50,9 +50,9 @@ RSpec.describe Card::Set::Type::Signup do
|
|
50
50
|
expect(@signup.format.render_core).to have_tag "div.invite-links" do
|
51
51
|
with_tag "div", text: "A verification email has been sent to wolf@wagn.org"
|
52
52
|
with_tag "div" do
|
53
|
-
with_tag "a", href: "/update/Big_Bad_Wolf?
|
53
|
+
with_tag "a", href: "/update/Big_Bad_Wolf?approve_with_verification=true",
|
54
54
|
text: "Resend verification email"
|
55
|
-
with_tag "a", href: "/update/Big_Bad_Wolf?
|
55
|
+
with_tag "a", href: "/update/Big_Bad_Wolf?approve_without_verification=true",
|
56
56
|
text: "Approve without verification"
|
57
57
|
with_tag "a", href: "/delete/Big_Bad_Wolf",
|
58
58
|
text: "Deny and delete"
|
@@ -67,73 +67,41 @@ RSpec.describe Card::Set::Type::Signup do
|
|
67
67
|
expect(body).to match(Card.global_setting(:title))
|
68
68
|
end
|
69
69
|
|
70
|
-
it "creates an authenticable token" do
|
71
|
-
expect(@account.token).to eq(@token)
|
72
|
-
expect(@account.validate_token!(@token)).to be_truthy
|
73
|
-
expect(@account.errors).to be_empty
|
74
|
-
end
|
75
|
-
|
76
70
|
it "notifies someone" do
|
77
71
|
expect(ActionMailer::Base.deliveries.map(&:to).sort).to(
|
78
72
|
eq [["signups@wagn.org"], ["wolf@wagn.org"]]
|
79
73
|
)
|
80
74
|
end
|
81
75
|
|
82
|
-
it "
|
83
|
-
Card::Env.params[:token] = @
|
84
|
-
|
85
|
-
|
76
|
+
it "can be activated by verification token" do
|
77
|
+
Card::Env.params[:token] = Card::Auth::Token.encode @signup.id, anonymous: true
|
78
|
+
account = @signup.account
|
79
|
+
account.update! trigger: :verify_and_activate
|
86
80
|
# puts @signup.errors.full_messages * "\n"
|
87
|
-
expect(
|
88
|
-
expect(
|
89
|
-
expect(
|
90
|
-
expect(
|
91
|
-
end
|
92
|
-
|
93
|
-
it "rejects expired token and creates new token" do
|
94
|
-
@account.token_card.update_column :updated_at,
|
95
|
-
8.days.ago.strftime("%F %T")
|
96
|
-
@account.token_card.expire
|
97
|
-
Card::Env.params[:token] = @token
|
98
|
-
@signup = Card.fetch "big bad wolf"
|
99
|
-
result = @signup.update!({})
|
100
|
-
# successfully completes save
|
101
|
-
expect(result).to eq(true)
|
102
|
-
@account.reload
|
103
|
-
# token gets updated
|
104
|
-
expect(@account.token).not_to eq(@token)
|
105
|
-
# user notified of expired token
|
106
|
-
expect(Card::Env.success.message).to match(/expired/)
|
81
|
+
expect(account.errors).to be_empty
|
82
|
+
expect(account.status).to eq("active")
|
83
|
+
expect(account.refresh(true)).to be_active
|
84
|
+
expect(@signup.refresh(true).type_id).to eq(Card::UserID)
|
107
85
|
end
|
108
86
|
end
|
109
87
|
|
110
88
|
context "signup (with approval)" do
|
111
89
|
before do
|
112
90
|
# NOTE: by default Anonymous does not have permission
|
113
|
-
# to create User cards
|
114
|
-
Mail::TestMailer.deliveries.clear
|
91
|
+
# to create User cards and thus requires approval
|
115
92
|
Card::Auth.current_id = Card::AnonymousID
|
116
|
-
@signup =
|
117
|
-
type_id: Card::SignupID,
|
118
|
-
"+*account" => {
|
119
|
-
"+*email" => "wolf@wagn.org",
|
120
|
-
"+*password" => "wolf"
|
121
|
-
}
|
93
|
+
@signup = big_bad_signup
|
122
94
|
@account = @signup.account
|
123
95
|
end
|
124
96
|
|
125
|
-
it "creates all the necessary cards
|
97
|
+
it "creates all the necessary cards" do
|
126
98
|
expect(@signup.type_id).to eq(Card::SignupID)
|
127
99
|
expect(@account.email).to eq("wolf@wagn.org")
|
128
|
-
expect(@account.status).to eq("
|
100
|
+
expect(@account.status).to eq("unapproved")
|
129
101
|
expect(@account.salt).not_to eq("")
|
130
102
|
expect(@account.password.length).to be > 10 # encrypted
|
131
103
|
end
|
132
104
|
|
133
|
-
it "does not create a token" do
|
134
|
-
expect(@account.token).not_to be_present
|
135
|
-
end
|
136
|
-
|
137
105
|
it "sends signup alert email" do
|
138
106
|
signup_alert = ActionMailer::Base.deliveries.last
|
139
107
|
expect(signup_alert.to).to eq(["signups@wagn.org"])
|
@@ -148,27 +116,24 @@ RSpec.describe Card::Set::Type::Signup do
|
|
148
116
|
expect(Mail::TestMailer.deliveries[-2]).to be_nil
|
149
117
|
end
|
150
118
|
|
151
|
-
context "
|
152
|
-
it "
|
153
|
-
Card::Env.params[:approve_with_token] = true
|
119
|
+
context "when approving with verification" do
|
120
|
+
it "sets status to 'unverified'" do
|
154
121
|
Card::Auth.as "joe_admin"
|
122
|
+
@signup.update! trigger: :approve_with_verification
|
123
|
+
|
124
|
+
expect(@signup.account.status).to eq("unverified")
|
125
|
+
expect(@signup.type_id).to eq(Card::SignupID)
|
155
126
|
|
156
|
-
|
157
|
-
@signup.save!
|
158
|
-
expect(@signup.account.token).to be_present
|
127
|
+
# test that verification email goes out?
|
159
128
|
end
|
160
129
|
end
|
161
130
|
|
162
|
-
context "
|
163
|
-
it "
|
164
|
-
Card::Env.params[:approve_without_token] = true
|
131
|
+
context "when approving without verification" do
|
132
|
+
it "immediately converts signup to active user" do
|
165
133
|
Card::Auth.as "joe_admin"
|
166
|
-
|
167
|
-
@signup = Card.fetch @signup.id
|
168
|
-
@signup.save!
|
169
|
-
expect(@signup.account.token).not_to be_present
|
134
|
+
@signup.update! trigger: :approve_without_verification
|
170
135
|
expect(@signup.type_id).to eq(Card::UserID)
|
171
|
-
expect(@signup.account
|
136
|
+
expect(@signup.account).to be_active
|
172
137
|
end
|
173
138
|
end
|
174
139
|
end
|
@@ -192,7 +157,8 @@ RSpec.describe Card::Set::Type::Signup do
|
|
192
157
|
|
193
158
|
it "sends welcome email when account is activated" do
|
194
159
|
# @signup.run_phase :approve do
|
195
|
-
|
160
|
+
Card::Auth.as "joe admin"
|
161
|
+
@signup.update! trigger: :approve_without_verification
|
196
162
|
# end
|
197
163
|
@mail = ActionMailer::Base.deliveries.find { |a| a.subject == "welcome" }
|
198
164
|
Mail::TestMailer.deliveries.clear
|
@@ -207,18 +173,15 @@ RSpec.describe Card::Set::Type::Signup do
|
|
207
173
|
# NOTE:
|
208
174
|
# by default Anonymous does not have permission to create User cards.
|
209
175
|
Card::Auth.current_id = Card::WagnBotID
|
210
|
-
@signup =
|
211
|
-
"+*account" => { "+*email" => "wolf@wagn.org" }
|
176
|
+
@signup = big_bad_signup
|
212
177
|
@account = @signup.account
|
213
178
|
end
|
214
179
|
|
215
|
-
it "creates all the necessary cards
|
180
|
+
it "creates all the necessary cards" do
|
216
181
|
expect(@signup.type_id).to eq(Card::SignupID)
|
217
182
|
expect(@account.email).to eq("wolf@wagn.org")
|
218
|
-
expect(@account.status).to eq("
|
183
|
+
expect(@account.status).to eq("unverified")
|
219
184
|
expect(@account.salt).not_to eq("")
|
220
|
-
expect(@account.token).to be_present
|
221
|
-
expect(@account.password).not_to be_present
|
222
185
|
end
|
223
186
|
|
224
187
|
it "considers signups created by signed-in users to be invitations" do
|
data/mod/admin/set/self/trash.rb
CHANGED
@@ -25,7 +25,7 @@ format :html do
|
|
25
25
|
return unless (res_id = Env.params[:restore]) &&
|
26
26
|
(res_card = Card[res_id.to_i])
|
27
27
|
alert :success, true do
|
28
|
-
wrap_with(:h5, "restored") + subformat(res_card).
|
28
|
+
wrap_with(:h5, "restored") + subformat(res_card).render_bar
|
29
29
|
end
|
30
30
|
end
|
31
31
|
|
@@ -6,7 +6,7 @@ format do
|
|
6
6
|
|
7
7
|
# NAME VIEWS
|
8
8
|
|
9
|
-
view :name,
|
9
|
+
view :name, compact: true, perms: :none do
|
10
10
|
name_variant safe_name
|
11
11
|
end
|
12
12
|
|
@@ -18,20 +18,20 @@ format do
|
|
18
18
|
voo.variant ? name.to_name.vary(voo.variant) : name
|
19
19
|
end
|
20
20
|
|
21
|
-
view(:key,
|
22
|
-
view(:linkname,
|
23
|
-
view(:url,
|
21
|
+
view(:key, compact: true, perms: :none) { card.key }
|
22
|
+
view(:linkname, compact: true, perms: :none) { card.name.url_key }
|
23
|
+
view(:url, compact: true, perms: :none) { card_url _render_linkname }
|
24
24
|
|
25
25
|
|
26
|
-
view :url_link,
|
26
|
+
view :url_link, compact: true, perms: :none do
|
27
27
|
link_to_resource card_url(_render_linkname)
|
28
28
|
end
|
29
29
|
|
30
|
-
view :link,
|
30
|
+
view :link, compact: true, perms: :none do
|
31
31
|
link_view
|
32
32
|
end
|
33
33
|
|
34
|
-
view :nav_link,
|
34
|
+
view :nav_link, compact: true, perms: :none do
|
35
35
|
link_view class: "nav-link"
|
36
36
|
end
|
37
37
|
|
@@ -47,15 +47,15 @@ format do
|
|
47
47
|
end
|
48
48
|
|
49
49
|
|
50
|
-
view(:codename,
|
51
|
-
view(:id,
|
52
|
-
view(:type,
|
50
|
+
view(:codename, compact: true) { card.codename.to_s }
|
51
|
+
view(:id, compact: true) { card.id }
|
52
|
+
view(:type, compact: true) { card.type_name }
|
53
53
|
|
54
54
|
# DATE VIEWS
|
55
55
|
|
56
|
-
view(:created_at,
|
57
|
-
view(:updated_at,
|
58
|
-
view(:acted_at,
|
56
|
+
view(:created_at, compact: true) { date_view card.created_at }
|
57
|
+
view(:updated_at, compact: true) { date_view card.updated_at }
|
58
|
+
view(:acted_at, compact: true) { date_view card.acted_at }
|
59
59
|
|
60
60
|
def date_view date
|
61
61
|
if voo.variant
|
@@ -76,7 +76,7 @@ format do
|
|
76
76
|
voo.structure ? Card[voo.structure] : card
|
77
77
|
end
|
78
78
|
|
79
|
-
view :core,
|
79
|
+
view :core, compact: true do
|
80
80
|
process_content _render_raw
|
81
81
|
end
|
82
82
|
|
@@ -88,29 +88,21 @@ format do
|
|
88
88
|
_render_core
|
89
89
|
end
|
90
90
|
|
91
|
-
view :
|
92
|
-
with_nest_mode :
|
91
|
+
view :one_line_content, compact: true do
|
92
|
+
with_nest_mode :compact do
|
93
93
|
Card::Content.smart_truncate _render_core
|
94
94
|
end
|
95
95
|
end
|
96
96
|
|
97
|
-
view :labeled_content, unknown:
|
98
|
-
|
99
|
-
end
|
100
|
-
|
101
|
-
def valid_labeled_content
|
102
|
-
if card.known?
|
103
|
-
yield
|
104
|
-
else
|
105
|
-
createable { missing_link(fa_icon("plus-square")) }
|
106
|
-
end
|
97
|
+
view :labeled_content, unknown: :mini_unknown do
|
98
|
+
render_core
|
107
99
|
end
|
108
100
|
|
109
101
|
view :titled_content, unknown: :blank do
|
110
102
|
render_core
|
111
103
|
end
|
112
104
|
|
113
|
-
view :blank,
|
105
|
+
view :blank, compact: true, perms: :none do
|
114
106
|
""
|
115
107
|
end
|
116
108
|
|
@@ -139,39 +131,6 @@ format do
|
|
139
131
|
end.inspect
|
140
132
|
end
|
141
133
|
|
142
|
-
# none of the below belongs here!!
|
143
|
-
|
144
|
-
view :template_rule, cache: :never, unknown: true do
|
145
|
-
return "" unless voo.nest_name
|
146
|
-
if voo.nest_name.to_name.field_only?
|
147
|
-
set_card = Card.fetch template_link_set_name
|
148
|
-
subformat(set_card).render_template_link
|
149
|
-
else
|
150
|
-
"{{#{voo.nest_syntax}}}"
|
151
|
-
end
|
152
|
-
end
|
153
|
-
|
154
|
-
def template_link_set_name
|
155
|
-
name = voo.nest_name.to_name
|
156
|
-
if name.absolute?
|
157
|
-
name.trait_name :self
|
158
|
-
elsif (type = on_type_set)
|
159
|
-
[type, name].to_name.trait_name :type_plus_right
|
160
|
-
else
|
161
|
-
name.stripped.gsub(/^\+/, "").to_name.trait_name :right
|
162
|
-
end
|
163
|
-
end
|
164
|
-
|
165
|
-
def on_type_set
|
166
|
-
return unless
|
167
|
-
(tmpl_set_name = parent.card.name.trunk_name) &&
|
168
|
-
(tmpl_set_class_name = tmpl_set_name.tag_name) &&
|
169
|
-
(tmpl_set_class_card = Card[tmpl_set_class_name]) &&
|
170
|
-
(tmpl_set_class_card.codename == :type)
|
171
|
-
|
172
|
-
tmpl_set_name.left_name
|
173
|
-
end
|
174
|
-
|
175
134
|
# DEPRECATED
|
176
135
|
view :naked do
|
177
136
|
Rails.logger.info "DEPRECATED: naked view (used with #{card.name} card)"
|
@@ -7,8 +7,8 @@ def diff_args
|
|
7
7
|
end
|
8
8
|
|
9
9
|
format do
|
10
|
-
view :
|
11
|
-
|
10
|
+
view :one_line_content do
|
11
|
+
raw_one_line_content
|
12
12
|
end
|
13
13
|
|
14
14
|
def chunk_list
|
@@ -17,7 +17,11 @@ format do
|
|
17
17
|
end
|
18
18
|
|
19
19
|
format :html do
|
20
|
-
def
|
20
|
+
def input_type
|
21
21
|
:ace_editor
|
22
22
|
end
|
23
|
+
|
24
|
+
view :one_line_content, wrap: {} do
|
25
|
+
raw_one_line_content
|
26
|
+
end
|
23
27
|
end
|