card 1.16.6 → 1.16.7
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.yardoc/checksums +234 -49
- data/.yardoc/object_types +0 -0
- data/.yardoc/objects/root.dat +0 -0
- data/VERSION +1 -1
- data/config/initializers/mime_types.rb +3 -3
- data/config/initializers/notification.rb +1 -1
- data/db/migrate/20121118115000_update_link_type.rb +8 -8
- data/db/migrate/20130411210957_update_codenames.rb +2 -2
- data/db/migrate/20140822073704_create_new_revision_tables.rb +12 -13
- data/db/migrate/20141001105348_move_revisions_to_actions.rb +16 -16
- data/db/migrate/20141121172918_rename_card_migration_table.rb +4 -4
- data/db/migrate_core_cards/20130419215612_import_help_text.rb +3 -3
- data/db/migrate_core_cards/20130823192433_add_style_cards.rb +45 -47
- data/db/migrate_core_cards/20130910183318_move_styles_to_content.rb +1 -1
- data/db/migrate_core_cards/20130920214038_jsonize_tinymce.rb +3 -3
- data/db/migrate_core_cards/20130920291703_update_stylesheets.rb +3 -3
- data/db/migrate_core_cards/20130927191728_account_events.rb +6 -6
- data/db/migrate_core_cards/20131016172445_common_css_patch.rb +1 -1
- data/db/migrate_core_cards/20140110193325_reset_account_request_type.rb +1 -1
- data/db/migrate_core_cards/20140307231621_user_data_to_cards.rb +19 -19
- data/db/migrate_core_cards/20140317035504_account_requests_to_signups.rb +11 -12
- data/db/migrate_core_cards/20140512155840_add_script_cards.rb +35 -36
- data/db/migrate_core_cards/20140629222005_add_email_cards.rb +55 -55
- data/db/migrate_core_cards/20140725180118_config_card_updates.rb +1 -1
- data/db/migrate_core_cards/20141111083921_delete_machine_output.rb +2 -2
- data/db/migrate_core_cards/20141115034214_config_descriptions_etc.rb +3 -3
- data/db/migrate_core_cards/20141120120605_fix_notification_html_message.rb +2 -2
- data/db/migrate_core_cards/20141204061304_watchers_to_following.rb +8 -8
- data/db/migrate_core_cards/20141208162106_add_ace_script.rb +2 -2
- data/db/migrate_core_cards/20141216155251_add_more_following_cards.rb +16 -16
- data/db/migrate_core_cards/20141230204340_uri_codename.rb +1 -1
- data/db/migrate_core_cards/20150202143810_import_bootstrap_layout.rb +19 -19
- data/db/migrate_core_cards/20150220134731_following_to_follow_rule.rb +3 -3
- data/db/migrate_core_cards/20150317162412_bootstrap_themes.rb +15 -15
- data/db/migrate_core_cards/20150326205655_bootswatch_themes.rb +11 -11
- data/db/migrate_core_cards/20150331135745_new_card_menu.rb +1 -1
- data/db/migrate_core_cards/20150429090551_search_card_context.rb +1 -1
- data/db/migrate_core_cards/20150508212032_menu_compatibility.rb +3 -3
- data/db/migrate_core_cards/20150510031118_fix_skin_images.rb +1 -1
- data/db/migrate_core_cards/20150528084659_add_session_cardtype.rb +4 -4
- data/db/migrate_core_cards/20150601133433_add_recent_setting_session_card.rb +5 -5
- data/db/migrate_core_cards/20150605115802_add_performance_log_card.rb +1 -1
- data/db/migrate_core_cards/20150610171702_add_debugger_session_card.rb +2 -2
- data/db/migrate_core_cards/20150611203506_rails_inflection_updates.rb +5 -5
- data/db/migrate_core_cards/20150627205133_fix_script_bootstrap_card_type.rb +1 -1
- data/db/migrate_core_cards/20150702130543_remove_edit_toolbar_pinned.rb +1 -1
- data/db/migrate_core_cards/20150724123438_update_file_and_image_cards.rb +5 -5
- data/db/migrate_core_cards/20150807205221_create_references_for_search_cards.rb +1 -1
- data/db/migrate_core_cards/20150824135418_update_file_history.rb +3 -3
- data/db/migrate_core_cards/20150903130006_attachment_upload_cards.rb +2 -2
- data/db/migrate_core_cards/20150910085603_remove_performance_log_card.rb +1 -1
- data/lib/card.rb +4 -4
- data/lib/card/active_record_ext.rb +8 -8
- data/lib/card/auth.rb +6 -6
- data/lib/card/cache.rb +1 -1
- data/lib/card/chunk.rb +1 -1
- data/lib/card/content.rb +1 -1
- data/lib/card/diff.rb +10 -10
- data/lib/card/env.rb +1 -1
- data/lib/card/format.rb +12 -12
- data/lib/card/loader.rb +1 -1
- data/lib/card/migration.rb +1 -1
- data/lib/card/name.rb +4 -4
- data/lib/card/query.rb +255 -61
- data/lib/card/query/attributes.rb +310 -0
- data/lib/card/query/clause.rb +12 -15
- data/lib/card/query/join.rb +73 -0
- data/lib/card/query/reference.rb +51 -0
- data/lib/card/query/sql_statement.rb +228 -0
- data/lib/card/query/value.rb +66 -0
- data/lib/card/reference.rb +6 -6
- data/lib/card/set.rb +12 -12
- data/lib/card/set_pattern.rb +9 -9
- data/lib/card/spec_helper.rb +5 -5
- data/lib/card/success.rb +1 -1
- data/lib/cardio.rb +7 -7
- data/lib/generators/card/format/format_generator.rb +3 -3
- data/lib/generators/card/migration/migration_generator.rb +5 -5
- data/lib/generators/card/set/set_generator.rb +4 -4
- data/mod/01_core/chunk/include.rb +4 -4
- data/mod/01_core/chunk/link.rb +5 -5
- data/mod/01_core/chunk/literal.rb +2 -2
- data/mod/01_core/chunk/query_reference.rb +8 -8
- data/mod/01_core/chunk/uri.rb +18 -18
- data/mod/01_core/format/html_format.rb +4 -4
- data/mod/01_core/set/all/active_card.rb +2 -2
- data/mod/01_core/set/all/collection.rb +21 -26
- data/mod/01_core/set/all/content.rb +2 -2
- data/mod/01_core/set/all/fetch.rb +6 -6
- data/mod/01_core/set/all/initialize.rb +4 -4
- data/mod/01_core/set/all/location_history.rb +2 -2
- data/mod/01_core/set/all/name.rb +14 -14
- data/mod/01_core/set/all/pattern.rb +1 -1
- data/mod/01_core/set/all/permissions.rb +12 -12
- data/mod/01_core/set/all/phases.rb +29 -12
- data/mod/01_core/set/all/references.rb +14 -14
- data/mod/01_core/set/all/rules.rb +8 -8
- data/mod/01_core/set/all/templating.rb +10 -9
- data/mod/01_core/set/all/tracked_attributes.rb +7 -7
- data/mod/01_core/set/all/trash.rb +6 -6
- data/mod/01_core/set/all/type.rb +7 -7
- data/mod/01_core/set/all/utils.rb +4 -4
- data/mod/01_core/set/all/view_cache.rb +1 -1
- data/mod/01_core/set_pattern/02_all_plus.rb +2 -2
- data/mod/01_core/set_pattern/03_type.rb +1 -1
- data/mod/01_core/set_pattern/04_star.rb +1 -1
- data/mod/01_core/set_pattern/05_rstar.rb +2 -2
- data/mod/01_core/set_pattern/06_right.rb +4 -4
- data/mod/01_core/set_pattern/07_type_plus_right.rb +4 -4
- data/mod/01_core/set_pattern/08_self.rb +1 -1
- data/mod/01_core/spec/chunk/uri_spec.rb +73 -73
- data/mod/01_core/spec/format/html_format_spec.rb +5 -5
- data/mod/01_core/spec/set/all/attribute_tracking_spec.rb +1 -1
- data/mod/01_core/spec/set/all/collection_spec.rb +22 -22
- data/mod/01_core/spec/set/all/content_spec.rb +1 -1
- data/mod/01_core/spec/set/all/fetch_spec.rb +24 -24
- data/mod/01_core/spec/set/all/initialize_spec.rb +9 -9
- data/mod/01_core/spec/set/all/name_spec.rb +8 -8
- data/mod/01_core/spec/set/all/pattern_spec.rb +10 -10
- data/mod/01_core/spec/set/all/permissions_spec.rb +45 -45
- data/mod/01_core/spec/set/all/references_spec.rb +1 -1
- data/mod/01_core/spec/set/all/rules2_spec.rb +15 -15
- data/mod/01_core/spec/set/all/rules_spec.rb +37 -37
- data/mod/01_core/spec/set/all/templating_spec.rb +21 -21
- data/mod/01_core/spec/set/all/tracked_attributes_spec.rb +55 -55
- data/mod/01_core/spec/set/all/trash_spec.rb +4 -4
- data/mod/01_core/spec/set/all/type_spec.rb +15 -15
- data/mod/01_history/lib/card/act.rb +2 -2
- data/mod/01_history/lib/card/action.rb +22 -22
- data/mod/01_history/lib/card/change.rb +1 -1
- data/mod/01_history/set/all/actions.rb +2 -2
- data/mod/01_history/set/all/content_history.rb +4 -4
- data/mod/01_history/set/all/history.rb +46 -46
- data/mod/02_basic_types/set/all/all_css.rb +10 -10
- data/mod/02_basic_types/set/all/all_csv.rb +7 -7
- data/mod/02_basic_types/set/all/base.rb +25 -25
- data/mod/02_basic_types/set/all/json.rb +16 -16
- data/mod/02_basic_types/set/all/rss.rb +7 -7
- data/mod/02_basic_types/set/type/html.rb +2 -2
- data/mod/02_basic_types/set/type/plain_text.rb +1 -1
- data/mod/02_basic_types/set/type/pointer.rb +39 -31
- data/mod/02_basic_types/spec/set/all/all_css_spec.rb +1 -1
- data/mod/02_basic_types/spec/set/all/all_csv_spec.rb +1 -1
- data/mod/02_basic_types/spec/set/all/base_spec.rb +18 -18
- data/mod/02_basic_types/spec/set/all/json_spec.rb +4 -4
- data/mod/02_basic_types/spec/set/all/rss_spec.rb +8 -2
- data/mod/02_basic_types/spec/set/type/plain_text_spec.rb +1 -1
- data/mod/02_basic_types/spec/set/type/pointer_spec.rb +54 -44
- data/mod/03_machines/lib/card/machine.rb +46 -29
- data/mod/03_machines/lib/card/machine_input.rb +34 -10
- data/mod/03_machines/set/type/coffee_script.rb +3 -3
- data/mod/03_machines/set/type/css.rb +8 -8
- data/mod/03_machines/set/type/java_script.rb +4 -4
- data/mod/03_machines/set/type/scss.rb +2 -2
- data/mod/03_machines/set/type/skin.rb +1 -1
- data/mod/03_machines/spec/lib/shared_machine_examples.rb +27 -27
- data/mod/03_machines/spec/lib/shared_machine_input_examples.rb +8 -8
- data/mod/03_machines/spec/set/type/coffeescript_spec.rb +6 -6
- data/mod/03_machines/spec/set/type/css_spec.rb +9 -9
- data/mod/03_machines/spec/set/type/javascript_spec.rb +6 -6
- data/mod/03_machines/spec/set/type/scss_spec.rb +5 -5
- data/mod/03_machines/spec/set/type/skin_spec.rb +25 -25
- data/mod/04_settings/lib/card/setting.rb +11 -11
- data/mod/04_settings/set/abstract/permission.rb +9 -9
- data/mod/04_settings/set/right/script.rb +1 -1
- data/mod/04_settings/set/right/structure.rb +0 -5
- data/mod/04_settings/set/right/style.rb +2 -2
- data/mod/04_settings/set/self/accountable.rb +1 -1
- data/mod/04_settings/set/self/add_help.rb +1 -1
- data/mod/04_settings/set/self/autoname.rb +1 -1
- data/mod/04_settings/set/self/captcha.rb +1 -1
- data/mod/04_settings/set/self/create.rb +1 -1
- data/mod/04_settings/set/self/default.rb +1 -1
- data/mod/04_settings/set/self/delete.rb +1 -1
- data/mod/04_settings/set/self/help.rb +1 -1
- data/mod/04_settings/set/self/input.rb +1 -1
- data/mod/04_settings/set/self/layout.rb +1 -1
- data/mod/04_settings/set/self/on_create.rb +1 -1
- data/mod/04_settings/set/self/on_delete.rb +1 -1
- data/mod/04_settings/set/self/on_update.rb +1 -1
- data/mod/04_settings/set/self/options.rb +1 -1
- data/mod/04_settings/set/self/options_label.rb +1 -1
- data/mod/04_settings/set/self/read.rb +1 -1
- data/mod/04_settings/set/self/script.rb +1 -1
- data/mod/04_settings/set/self/structure.rb +1 -1
- data/mod/04_settings/set/self/style.rb +1 -1
- data/mod/04_settings/set/self/table_of_contents.rb +1 -1
- data/mod/04_settings/set/self/thanks.rb +1 -1
- data/mod/04_settings/set/self/update.rb +1 -1
- data/mod/04_settings/set/type/setting.rb +14 -14
- data/mod/04_settings/spec/set/right/comment_spec.rb +5 -5
- data/mod/04_settings/spec/set/right/create_spec.rb +1 -1
- data/mod/04_settings/spec/set/right/script_spec.rb +5 -5
- data/mod/04_settings/spec/set/right/structure_spec.rb +4 -2
- data/mod/04_settings/spec/set/right/style_spec.rb +7 -7
- data/mod/04_settings/spec/set/type/setting_spec.rb +2 -2
- data/mod/05_email/lib/card/follow_option.rb +24 -24
- data/mod/05_email/set/all/follow.rb +24 -16
- data/mod/05_email/set/all/notify.rb +25 -23
- data/mod/05_email/set/all/observer.rb +5 -5
- data/mod/05_email/set/right/bcc.rb +8 -8
- data/mod/05_email/set/right/follow.rb +44 -17
- data/mod/05_email/set/right/follow_fields.rb +1 -1
- data/mod/05_email/set/right/following.rb +49 -40
- data/mod/05_email/set/self/always.rb +2 -2
- data/mod/05_email/set/self/created.rb +1 -1
- data/mod/05_email/set/self/edited.rb +4 -4
- data/mod/05_email/set/self/follow.rb +1 -1
- data/mod/05_email/set/self/follow_defaults.rb +9 -9
- data/mod/05_email/set/self/never.rb +1 -1
- data/mod/05_email/set/type/email_template.rb +9 -9
- data/mod/05_email/set/type_plus_right/user/follow.rb +16 -16
- data/mod/05_email/spec/set/all/follow_spec.rb +10 -10
- data/mod/05_email/spec/set/all/notify_spec.rb +82 -82
- data/mod/05_email/spec/set/all/observer_spec.rb +16 -16
- data/mod/05_email/spec/set/right/followers_spec.rb +6 -6
- data/mod/05_email/spec/set/self/follow_defaults_spec.rb +2 -2
- data/mod/05_standard/lib/carrier_wave/cardmount.rb +5 -5
- data/mod/05_standard/lib/image_uploader.rb +8 -8
- data/mod/05_standard/set/abstract/attachment.rb +18 -18
- data/mod/05_standard/set/all/account.rb +5 -5
- data/mod/05_standard/set/all/comment.rb +7 -7
- data/mod/05_standard/set/all/error.rb +25 -25
- data/mod/05_standard/set/all/event_viz.rb +1 -1
- data/mod/05_standard/set/all/links.rb +9 -9
- data/mod/05_standard/set/all/rich_html/content.rb +34 -34
- data/mod/05_standard/set/all/rich_html/editing.rb +35 -35
- data/mod/05_standard/set/all/rich_html/form.rb +20 -20
- data/mod/05_standard/set/all/rich_html/header.rb +8 -8
- data/mod/05_standard/set/all/rich_html/menu.rb +33 -33
- data/mod/05_standard/set/all/rich_html/modal.rb +16 -16
- data/mod/05_standard/set/all/rich_html/toolbar.rb +63 -63
- data/mod/05_standard/set/all/rich_html/wrapper.rb +8 -8
- data/mod/05_standard/set/right/account.rb +27 -27
- data/mod/05_standard/set/right/email.rb +5 -5
- data/mod/05_standard/set/right/password.rb +5 -5
- data/mod/05_standard/set/rstar/rules.rb +52 -52
- data/mod/05_standard/set/self/account_links.rb +27 -27
- data/mod/05_standard/set/self/all.rb +1 -1
- data/mod/05_standard/set/self/head.rb +5 -5
- data/mod/05_standard/set/self/navbox.rb +11 -11
- data/mod/05_standard/set/self/recent.rb +2 -2
- data/mod/05_standard/set/self/search.rb +13 -13
- data/mod/05_standard/set/self/signin.rb +19 -19
- data/mod/05_standard/set/self/stats.rb +2 -2
- data/mod/05_standard/set/type/basic.rb +1 -1
- data/mod/05_standard/set/type/cardtype.rb +5 -5
- data/mod/05_standard/set/type/date.rb +1 -1
- data/mod/05_standard/set/type/file.rb +7 -7
- data/mod/05_standard/set/type/image.rb +8 -8
- data/mod/05_standard/set/type/number.rb +2 -2
- data/mod/05_standard/set/type/phrase.rb +1 -1
- data/mod/05_standard/set/type/search_type.rb +27 -21
- data/mod/05_standard/set/type/session.rb +2 -2
- data/mod/05_standard/set/type/set.rb +37 -37
- data/mod/05_standard/set/type/signup.rb +25 -25
- data/mod/05_standard/set/type/uri.rb +1 -1
- data/mod/05_standard/set/type/user.rb +21 -21
- data/mod/05_standard/spec/chunk/include_spec.rb +16 -16
- data/mod/05_standard/spec/chunk/link_spec.rb +18 -18
- data/mod/05_standard/spec/chunk/query_reference_spec.rb +1 -1
- data/mod/05_standard/spec/set/all/account_spec.rb +7 -7
- data/mod/05_standard/spec/set/all/email_html_spec.rb +3 -3
- data/mod/05_standard/spec/set/all/history_spec.rb +14 -14
- data/mod/05_standard/spec/set/all/rich_html/editing_spec.rb +1 -1
- data/mod/05_standard/spec/set/all/rich_html/form_spec.rb +2 -2
- data/mod/05_standard/spec/set/right/account_spec.rb +9 -9
- data/mod/05_standard/spec/set/right/email_spec.rb +8 -8
- data/mod/05_standard/spec/set/right/password_spec.rb +9 -9
- data/mod/05_standard/spec/set/right/stats_spec.rb +1 -1
- data/mod/05_standard/spec/set/right/when_created_spec.rb +1 -1
- data/mod/05_standard/spec/set/right/when_last_edited_spec.rb +1 -1
- data/mod/05_standard/spec/set/rstar/rules_spec.rb +2 -2
- data/mod/05_standard/spec/set/self/account_links_spec.rb +2 -2
- data/mod/05_standard/spec/set/self/all_spec.rb +8 -11
- data/mod/05_standard/spec/set/self/head_spec.rb +1 -1
- data/mod/05_standard/spec/set/self/navbox_spec.rb +1 -1
- data/mod/05_standard/spec/set/self/now_spec.rb +1 -1
- data/mod/05_standard/spec/set/self/stats_spec.rb +1 -1
- data/mod/05_standard/spec/set/self/version_spec.rb +1 -1
- data/mod/05_standard/spec/set/type/email_template_spec.rb +25 -25
- data/mod/05_standard/spec/set/type/file_spec.rb +4 -4
- data/mod/05_standard/spec/set/type/html_spec.rb +3 -3
- data/mod/05_standard/spec/set/type/image_spec.rb +6 -6
- data/mod/05_standard/spec/set/type/layout_type_spec.rb +1 -1
- data/mod/05_standard/spec/set/type/search_type_spec.rb +10 -10
- data/mod/05_standard/spec/set/type/signup_spec.rb +11 -11
- data/mod/05_standard/spec/set/type/toggle_spec.rb +2 -2
- data/mod/05_standard/spec/set/type/uri_spec.rb +9 -9
- data/mod/06_bootstrap/set/all/bootstrap/helper.rb +10 -10
- data/mod/06_bootstrap/set/all/bootstrap/wrapper.rb +4 -4
- data/mod/06_bootstrap/set/all/rich_bootstrap.rb +1 -1
- data/spec/lib/card/action_spec.rb +2 -2
- data/spec/lib/card/cache_spec.rb +7 -7
- data/spec/lib/card/content_spec.rb +31 -37
- data/spec/lib/card/diff_spec.rb +56 -56
- data/spec/lib/card/format_spec.rb +11 -11
- data/spec/lib/card/query_spec.rb +382 -265
- data/spec/lib/card/reference_spec.rb +133 -140
- data/spec/lib/card/set_pattern_spec.rb +10 -9
- data/spec/lib/card/set_spec.rb +11 -11
- data/spec/lib/card/success_spec.rb +16 -8
- data/spec/mailers/mailer_spec.rb +5 -5
- data/spec/models/card/cardtype_spec.rb +20 -20
- data/spec/models/card/create_spec.rb +6 -6
- data/spec/models/card/trash_spec.rb +20 -20
- data/spec/models/card/type_transition_spec.rb +3 -3
- data/spec/models/card/validation_spec.rb +5 -5
- data/spec/models/card_spec.rb +24 -24
- data/spec/spec_helper.rb +5 -5
- data/tmpsets/set/mod001-01_core/all/active_card.rb +2 -2
- data/tmpsets/set/mod001-01_core/all/collection.rb +23 -26
- data/tmpsets/set/mod001-01_core/all/content.rb +2 -2
- data/tmpsets/set/mod001-01_core/all/fetch.rb +6 -6
- data/tmpsets/set/mod001-01_core/all/initialize.rb +8 -4
- data/tmpsets/set/mod001-01_core/all/name.rb +14 -14
- data/tmpsets/set/mod001-01_core/all/pattern.rb +1 -1
- data/tmpsets/set/mod001-01_core/all/permissions.rb +12 -12
- data/tmpsets/set/mod001-01_core/all/phases.rb +31 -13
- data/tmpsets/set/mod001-01_core/all/references.rb +14 -14
- data/tmpsets/set/mod001-01_core/all/rules.rb +8 -10
- data/tmpsets/set/mod001-01_core/all/templating.rb +10 -9
- data/tmpsets/set/mod001-01_core/all/tracked_attributes.rb +7 -7
- data/tmpsets/set/mod001-01_core/all/trash.rb +9 -8
- data/tmpsets/set/mod001-01_core/all/type.rb +7 -7
- data/tmpsets/set/mod001-01_core/all/utils.rb +16 -4
- data/tmpsets/set/mod001-01_core/all/view_cache.rb +1 -1
- data/tmpsets/set/mod002-01_history/all/actions.rb +2 -2
- data/tmpsets/set/mod002-01_history/all/content_history.rb +11 -7
- data/tmpsets/set/mod002-01_history/all/history.rb +46 -46
- data/tmpsets/set/mod003-02_basic_types/all/all_css.rb +10 -10
- data/tmpsets/set/mod003-02_basic_types/all/all_csv.rb +7 -7
- data/tmpsets/set/mod003-02_basic_types/all/base.rb +25 -25
- data/tmpsets/set/mod003-02_basic_types/all/json.rb +16 -16
- data/tmpsets/set/mod003-02_basic_types/all/rss.rb +7 -7
- data/tmpsets/set/mod003-02_basic_types/type/html.rb +2 -2
- data/tmpsets/set/mod003-02_basic_types/type/plain_text.rb +1 -1
- data/tmpsets/set/mod003-02_basic_types/type/pointer.rb +38 -31
- data/tmpsets/set/mod004-03_machines/right/machine_output.rb +4 -0
- data/tmpsets/set/mod004-03_machines/type/coffee_script.rb +3 -3
- data/tmpsets/set/mod004-03_machines/type/css.rb +8 -8
- data/tmpsets/set/mod004-03_machines/type/java_script.rb +4 -4
- data/tmpsets/set/mod004-03_machines/type/scss.rb +2 -2
- data/tmpsets/set/mod004-03_machines/type/skin.rb +1 -1
- data/tmpsets/set/mod005-04_settings/abstract/permission.rb +9 -9
- data/tmpsets/set/mod005-04_settings/right/script.rb +1 -1
- data/tmpsets/set/mod005-04_settings/right/structure.rb +0 -5
- data/tmpsets/set/mod005-04_settings/right/style.rb +2 -2
- data/tmpsets/set/mod005-04_settings/self/accountable.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/add_help.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/autoname.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/captcha.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/create.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/default.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/delete.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/help.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/input.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/layout.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/on_create.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/on_delete.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/on_update.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/options.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/options_label.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/read.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/script.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/structure.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/style.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/table_of_contents.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/thanks.rb +1 -1
- data/tmpsets/set/mod005-04_settings/self/update.rb +1 -1
- data/tmpsets/set/mod005-04_settings/type/setting.rb +14 -14
- data/tmpsets/set/mod006-05_email/all/follow.rb +24 -16
- data/tmpsets/set/mod006-05_email/all/notify.rb +25 -23
- data/tmpsets/set/mod006-05_email/all/observer.rb +8 -8
- data/tmpsets/set/mod006-05_email/right/bcc.rb +8 -8
- data/tmpsets/set/mod006-05_email/right/follow.rb +44 -17
- data/tmpsets/set/mod006-05_email/right/follow_fields.rb +1 -1
- data/tmpsets/set/mod006-05_email/right/following.rb +49 -40
- data/tmpsets/set/mod006-05_email/self/always.rb +2 -2
- data/tmpsets/set/mod006-05_email/self/created.rb +1 -1
- data/tmpsets/set/mod006-05_email/self/edited.rb +4 -4
- data/tmpsets/set/mod006-05_email/self/follow.rb +1 -1
- data/tmpsets/set/mod006-05_email/self/follow_defaults.rb +9 -9
- data/tmpsets/set/mod006-05_email/self/never.rb +1 -1
- data/tmpsets/set/mod006-05_email/type/email_template.rb +9 -9
- data/tmpsets/set/mod006-05_email/type_plus_right/user/follow.rb +17 -17
- data/tmpsets/set/mod007-05_standard/abstract/attachment.rb +98 -46
- data/tmpsets/set/mod007-05_standard/all/account.rb +5 -5
- data/tmpsets/set/mod007-05_standard/all/comment.rb +7 -7
- data/tmpsets/set/mod007-05_standard/all/error.rb +26 -26
- data/tmpsets/set/mod007-05_standard/all/event_viz.rb +1 -1
- data/tmpsets/set/mod007-05_standard/all/links.rb +10 -9
- data/tmpsets/set/mod007-05_standard/all/rich_html/content.rb +34 -34
- data/tmpsets/set/mod007-05_standard/all/rich_html/editing.rb +35 -35
- data/tmpsets/set/mod007-05_standard/all/rich_html/form.rb +20 -20
- data/tmpsets/set/mod007-05_standard/all/rich_html/header.rb +8 -8
- data/tmpsets/set/mod007-05_standard/all/rich_html/menu.rb +33 -33
- data/tmpsets/set/mod007-05_standard/all/rich_html/modal.rb +16 -16
- data/tmpsets/set/mod007-05_standard/all/rich_html/toolbar.rb +63 -63
- data/tmpsets/set/mod007-05_standard/all/rich_html/wrapper.rb +8 -8
- data/tmpsets/set/mod007-05_standard/right/account.rb +27 -27
- data/tmpsets/set/mod007-05_standard/right/email.rb +5 -5
- data/tmpsets/set/mod007-05_standard/right/password.rb +5 -5
- data/tmpsets/set/mod007-05_standard/rstar/rules.rb +52 -52
- data/tmpsets/set/mod007-05_standard/self/account_links.rb +27 -27
- data/tmpsets/set/mod007-05_standard/self/all.rb +1 -1
- data/tmpsets/set/mod007-05_standard/self/head.rb +5 -5
- data/tmpsets/set/mod007-05_standard/self/navbox.rb +11 -11
- data/tmpsets/set/mod007-05_standard/self/recent.rb +2 -2
- data/tmpsets/set/mod007-05_standard/self/search.rb +13 -13
- data/tmpsets/set/mod007-05_standard/self/signin.rb +19 -19
- data/tmpsets/set/mod007-05_standard/self/stats.rb +2 -2
- data/tmpsets/set/mod007-05_standard/type/basic.rb +1 -1
- data/tmpsets/set/mod007-05_standard/type/cardtype.rb +5 -5
- data/tmpsets/set/mod007-05_standard/type/date.rb +1 -1
- data/tmpsets/set/mod007-05_standard/type/file.rb +23 -8
- data/tmpsets/set/mod007-05_standard/type/image.rb +10 -8
- data/tmpsets/set/mod007-05_standard/type/number.rb +2 -2
- data/tmpsets/set/mod007-05_standard/type/phrase.rb +1 -1
- data/tmpsets/set/mod007-05_standard/type/search_type.rb +21 -19
- data/tmpsets/set/mod007-05_standard/type/session.rb +2 -2
- data/tmpsets/set/mod007-05_standard/type/set.rb +37 -37
- data/tmpsets/set/mod007-05_standard/type/signup.rb +25 -25
- data/tmpsets/set/mod007-05_standard/type/uri.rb +1 -1
- data/tmpsets/set/mod007-05_standard/type/user.rb +21 -21
- data/tmpsets/set/mod008-06_bootstrap/all/bootstrap/helper.rb +10 -10
- data/tmpsets/set/mod008-06_bootstrap/all/bootstrap/wrapper.rb +4 -4
- data/tmpsets/set/mod008-06_bootstrap/all/rich_bootstrap.rb +1 -1
- data/tmpsets/set_pattern/101-all_plus.rb +2 -2
- data/tmpsets/set_pattern/102-type.rb +1 -1
- data/tmpsets/set_pattern/103-star.rb +1 -1
- data/tmpsets/set_pattern/104-rstar.rb +2 -2
- data/tmpsets/set_pattern/105-right.rb +4 -4
- data/tmpsets/set_pattern/106-type_plus_right.rb +4 -4
- data/tmpsets/set_pattern/107-self.rb +1 -1
- metadata +7 -5
- data/lib/card/query/card_clause.rb +0 -528
- data/lib/card/query/ref_clause.rb +0 -47
- data/lib/card/query/value_clause.rb +0 -65
@@ -18,7 +18,7 @@ format :html do
|
|
18
18
|
if @slot_view == :open && toolbar_pinned?
|
19
19
|
args[:optional_toolbar] ||= :show
|
20
20
|
end
|
21
|
-
if show_view?(:toolbar,args.merge(:
|
21
|
+
if show_view?(:toolbar,args.merge(default_visibility: :hide)) && card.type_code != :basic
|
22
22
|
args[:optional_type_info] ||= :show
|
23
23
|
end
|
24
24
|
end
|
@@ -38,14 +38,14 @@ format :html do
|
|
38
38
|
verb, adjective, direction = ( args[:toggle_mode] == :close ? %w{ open open expand } : %w{ close closed collapse-down } )
|
39
39
|
|
40
40
|
link_to glyphicon(direction),
|
41
|
-
path( :
|
42
|
-
:
|
43
|
-
:
|
44
|
-
:
|
41
|
+
path( view: adjective ),
|
42
|
+
remote: true,
|
43
|
+
title: "#{verb} #{card.name}",
|
44
|
+
class: "#{verb}-icon toggler slotter nodblclick"
|
45
45
|
end
|
46
46
|
|
47
47
|
view :link_list do |args|
|
48
|
-
content_tag :ul, :
|
48
|
+
content_tag :ul, class: args[:class] do
|
49
49
|
item_links(args).map do |al|
|
50
50
|
content_tag :li, raw(al)
|
51
51
|
end.join "\n"
|
@@ -53,11 +53,11 @@ format :html do
|
|
53
53
|
end
|
54
54
|
|
55
55
|
view :navbar_right do |args|
|
56
|
-
render_link_list args.merge(:
|
56
|
+
render_link_list args.merge(class: "nav navbar-nav navbar-right")
|
57
57
|
end
|
58
58
|
|
59
59
|
view :navbar_left do |args|
|
60
|
-
render_link_list args.merge(:
|
60
|
+
render_link_list args.merge(class: "nav navbar-nav navbar-left")
|
61
61
|
end
|
62
62
|
|
63
63
|
def show_follow?
|
@@ -1,45 +1,45 @@
|
|
1
1
|
format :html do
|
2
|
-
view :menu, :
|
2
|
+
view :menu, denial: :blank, tags: :unknown_ok do |args|
|
3
3
|
return _render_template_closer if args[:menu_hack] == :template_closer
|
4
4
|
return '' if card.unknown?
|
5
|
-
wrap_with :div, :
|
5
|
+
wrap_with :div, class: 'menu-slot nodblclick' do
|
6
6
|
[
|
7
7
|
_optional_render(:horizontal_menu, args, :hide),
|
8
8
|
_render_menu_link(args),
|
9
|
-
_render_modal_slot(args.merge(:
|
9
|
+
_render_modal_slot(args.merge(modal_id: card.cardname.safe_key))
|
10
10
|
]
|
11
11
|
end
|
12
12
|
end
|
13
13
|
|
14
14
|
view :menu_link do |args|
|
15
|
-
path_opts = {:
|
15
|
+
path_opts = {slot: {home_view: args[:home_view]}}
|
16
16
|
path_opts[:is_main] = true if main?
|
17
|
-
css_class = if show_view?(:horizontal_menu,args.merge(:
|
17
|
+
css_class = if show_view?(:horizontal_menu,args.merge(default_visibility: :hide, optional: true))
|
18
18
|
'visible-xs'
|
19
19
|
else
|
20
20
|
'show-on-hover'
|
21
21
|
end
|
22
|
-
wrap_with :div, :
|
23
|
-
content_tag :div, :
|
24
|
-
view_link(glyphicon(args[:menu_icon]), :vertical_menu, :path_opts
|
22
|
+
wrap_with :div, class: "vertical-card-menu card-menu #{css_class}" do
|
23
|
+
content_tag :div, class: 'btn-group slotter card-slot pull-right' do
|
24
|
+
view_link(glyphicon(args[:menu_icon]), :vertical_menu, path_opts: path_opts).html_safe
|
25
25
|
end
|
26
26
|
end
|
27
27
|
end
|
28
28
|
|
29
|
-
view :vertical_menu, :
|
29
|
+
view :vertical_menu, tags: :unknown_ok do |args|
|
30
30
|
items = menu_item_list(args).map {|item| "<li class='#{args[:item_class]}'>#{item}</li>"}.join "\n"
|
31
|
-
wrap_with :ul, :
|
31
|
+
wrap_with :ul, class: 'btn-group pull-right slotter' do
|
32
32
|
[
|
33
33
|
content_tag( :span, "<a href='#'>#{ glyphicon args[:menu_icon] }</a>".html_safe,
|
34
|
-
:
|
35
|
-
content_tag( :ul, items.html_safe, :
|
34
|
+
class: 'open-menu dropdown-toggle', 'data-toggle'=>'dropdown', 'aria-expanded'=>'false'),
|
35
|
+
content_tag( :ul, items.html_safe, class: 'dropdown-menu', role: 'menu'),
|
36
36
|
]
|
37
37
|
end
|
38
38
|
end
|
39
39
|
|
40
40
|
view :horizontal_menu do |args|
|
41
|
-
content_tag :div, :
|
42
|
-
menu_item_list(args.merge(:
|
41
|
+
content_tag :div, class: 'btn-group slotter pull-right card-menu horizontal-card-menu hidden-xs' do
|
42
|
+
menu_item_list(args.merge(html_args: {class: 'btn btn-default'})).join("\n").html_safe
|
43
43
|
end
|
44
44
|
end
|
45
45
|
|
@@ -47,7 +47,7 @@ format :html do
|
|
47
47
|
menu_items = []
|
48
48
|
menu_items << menu_edit_link(args) if args[:show_menu_item][:edit]
|
49
49
|
menu_items << menu_discuss_link(args) if args[:show_menu_item][:discuss]
|
50
|
-
menu_items << _render_follow_link(args.merge(:
|
50
|
+
menu_items << _render_follow_link(args.merge(icon: true)) if args[:show_menu_item][:follow]
|
51
51
|
menu_items << menu_page_link(args) if args[:show_menu_item][:page]
|
52
52
|
menu_items << menu_rules_link(args) if args[:show_menu_item][:rules]
|
53
53
|
menu_items << menu_account_link(args) if args[:show_menu_item][:account]
|
@@ -56,31 +56,31 @@ format :html do
|
|
56
56
|
end
|
57
57
|
|
58
58
|
def menu_edit_link args
|
59
|
-
path_opts = { :
|
59
|
+
path_opts = { view: :edit }
|
60
60
|
menu_item('edit', 'edit', path_opts, args[:html_args] )
|
61
61
|
end
|
62
62
|
|
63
63
|
def menu_discuss_link args
|
64
|
-
menu_item('discuss', 'comment', { :
|
64
|
+
menu_item('discuss', 'comment', { related: Card[:discussion].key }, args[:html_args])
|
65
65
|
end
|
66
66
|
|
67
67
|
def menu_page_link args
|
68
|
-
menu_item('page', 'new-window', {:card
|
68
|
+
menu_item('page', 'new-window', {card: card}, args[:html_args])
|
69
69
|
end
|
70
70
|
|
71
71
|
def menu_rules_link args
|
72
|
-
menu_item('rules', 'wrench', {:
|
72
|
+
menu_item('rules', 'wrench', {view: :options}, args[:html_args])
|
73
73
|
end
|
74
74
|
|
75
75
|
def menu_account_link args
|
76
|
-
path_opts = { :
|
76
|
+
path_opts = { related: {name: '+*account',view: :edit} }
|
77
77
|
menu_item('account', 'user', path_opts, args[:html_args])
|
78
78
|
end
|
79
79
|
|
80
80
|
def menu_more_link args
|
81
81
|
path_opts = {
|
82
|
-
:
|
83
|
-
:
|
82
|
+
view: args[:home_view] || :open,
|
83
|
+
slot: {show: :toolbar}
|
84
84
|
}
|
85
85
|
menu_item('', 'option-horizontal', path_opts, args[:html_args])
|
86
86
|
end
|
@@ -98,30 +98,30 @@ format :html do
|
|
98
98
|
|
99
99
|
def default_vertical_menu_args args
|
100
100
|
default_menu_link_args args
|
101
|
-
args.merge! :
|
101
|
+
args.merge! show_menu_item: show_menu_items
|
102
102
|
end
|
103
103
|
|
104
104
|
def default_horizontal_menu_args args
|
105
|
-
args.merge! :
|
105
|
+
args.merge! show_menu_item: show_menu_items
|
106
106
|
end
|
107
107
|
|
108
108
|
def show_menu_items
|
109
|
-
disc_tagname = Card.fetch(:discussion, :
|
109
|
+
disc_tagname = Card.fetch(:discussion, skip_modules: true).cardname
|
110
110
|
disc_card = unless card.new_card? or card.junction? && card.cardname.tag_name.key == disc_tagname.key
|
111
|
-
Card.fetch "#{card.name}+#{disc_tagname}", :
|
111
|
+
Card.fetch "#{card.name}+#{disc_tagname}", skip_virtual: true, skip_modules: true, new: {}
|
112
112
|
end
|
113
113
|
|
114
114
|
res = {
|
115
|
-
:
|
116
|
-
:
|
117
|
-
:
|
115
|
+
discuss: disc_card && disc_card.ok?( disc_card.new_card? ? :comment : :read ),
|
116
|
+
page: card.name.present? && !main?,
|
117
|
+
rules: card.virtual?
|
118
118
|
}
|
119
119
|
if card.real?
|
120
120
|
res.merge!(
|
121
|
-
:
|
122
|
-
:
|
123
|
-
:
|
124
|
-
:
|
121
|
+
edit: card.ok?(:update) || structure_editable?,
|
122
|
+
account: card.account && card.ok?(:update),
|
123
|
+
follow: show_follow?,
|
124
|
+
more: true
|
125
125
|
)
|
126
126
|
end
|
127
127
|
res
|
@@ -5,7 +5,7 @@ format :html do
|
|
5
5
|
|
6
6
|
view :modal_link do |args|
|
7
7
|
path_opts = args[:path_opts] || {}
|
8
|
-
path_opts.merge!(:
|
8
|
+
path_opts.merge!(layout: :modal)
|
9
9
|
html_args = args[:html_args] || {}
|
10
10
|
#html_args.merge!('data-target'=>"#modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}",
|
11
11
|
html_args.merge!('data-target'=>"#modal-main-slot",
|
@@ -14,12 +14,12 @@ format :html do
|
|
14
14
|
end
|
15
15
|
|
16
16
|
view :modal_slot do |args|
|
17
|
-
#wrap_with(:div, :
|
17
|
+
#wrap_with(:div, class: 'modal fade', role: 'dialog', id: "modal-#{card.cardname.safe_key}#{args[:modal_slot_id_postfix]}") do
|
18
18
|
id = "modal-"
|
19
19
|
id += (args[:modal_id] || 'main-slot')
|
20
|
-
wrap_with(:div, :
|
21
|
-
wrap_with(:div, :
|
22
|
-
content_tag :div, :
|
20
|
+
wrap_with(:div, class: 'modal fade', role: 'dialog', id: id) do
|
21
|
+
wrap_with(:div, class: 'modal-dialog') do
|
22
|
+
content_tag :div, class: 'modal-content' do
|
23
23
|
''
|
24
24
|
end
|
25
25
|
end
|
@@ -27,25 +27,25 @@ format :html do
|
|
27
27
|
end
|
28
28
|
|
29
29
|
|
30
|
-
view :modal_menu, :
|
30
|
+
view :modal_menu, tags: :unknown_ok do |args|
|
31
31
|
popout_params = {}
|
32
32
|
popout_params[:view] = params[:view] if params[:view]
|
33
33
|
# we probably want to pass on a lot more params than just view, but not all of them
|
34
34
|
# (eg we don't want layout, id, controller...)
|
35
|
-
wrap_with :div, :
|
35
|
+
wrap_with :div, class: 'modal-menu' do
|
36
36
|
[
|
37
|
-
link_to( glyphicon('remove'), '', :
|
38
|
-
link_to( glyphicon('new-window'), popout_params, :
|
37
|
+
link_to( glyphicon('remove'), '', class: 'close-modal pull-right close', 'data-dismiss'=>'modal'),
|
38
|
+
link_to( glyphicon('new-window'), popout_params, class: 'pop-out-modal pull-right close ' )
|
39
39
|
]
|
40
40
|
end
|
41
41
|
end
|
42
42
|
|
43
|
-
view :modal_footer, :
|
43
|
+
view :modal_footer, tags: :unknown_ok do |args|
|
44
44
|
args[:buttons] || ''
|
45
45
|
end
|
46
46
|
|
47
47
|
def default_modal_footer_args args
|
48
|
-
args[:buttons] ||= button_tag 'Close', :
|
48
|
+
args[:buttons] ||= button_tag 'Close', class: 'btn-xs close-modal pull-right', 'data-dismiss'=>'modal'
|
49
49
|
end
|
50
50
|
|
51
51
|
=begin
|
@@ -62,9 +62,9 @@ format :html do
|
|
62
62
|
# use modal_content for ajax calls to fill a modal_slot with content
|
63
63
|
view :modal_content do |args|
|
64
64
|
output [
|
65
|
-
wrap_with( :div, _render_modal_header(args), :
|
66
|
-
wrap_with( :div, _render_modal_body(args), :
|
67
|
-
wrap_with( :div, _render_modal_footer(args), :
|
65
|
+
wrap_with( :div, _render_modal_header(args), class: 'modal-header' ),
|
66
|
+
wrap_with( :div, _render_modal_body(args), class: 'modal-body' ),
|
67
|
+
wrap_with( :div, _render_modal_footer(args), class: 'modal-footer' ),
|
68
68
|
]
|
69
69
|
end
|
70
70
|
|
@@ -81,11 +81,11 @@ format :html do
|
|
81
81
|
end
|
82
82
|
|
83
83
|
view :modal_title do |args|
|
84
|
-
"<h4>#{_render_title args.merge(:
|
84
|
+
"<h4>#{_render_title args.merge(title_class: 'modal-title')}</h4>"
|
85
85
|
end
|
86
86
|
|
87
87
|
view :modal do |args|
|
88
|
-
_render_modal_slot args.merge(:
|
88
|
+
_render_modal_slot args.merge(optional_modal_content: :show)
|
89
89
|
end
|
90
90
|
=end
|
91
91
|
|
@@ -5,11 +5,11 @@ format :html do
|
|
5
5
|
end
|
6
6
|
|
7
7
|
view :toolbar do |args|
|
8
|
-
navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}", :
|
9
|
-
:
|
8
|
+
navbar "toolbar-#{card.cardname.safe_key}-#{args[:home_view]}", toggle_align: :left, class: "slotter toolbar", navbar_type: 'inverse',
|
9
|
+
collapsed_content: close_link(args.merge(class: 'pull-right visible-xs')) do
|
10
10
|
[
|
11
|
-
close_link(args.merge(:
|
12
|
-
(wrap_with(:form, :
|
11
|
+
close_link(args.merge(class: 'hidden-xs navbar-right')),
|
12
|
+
(wrap_with(:form, class: 'navbar-form navbar-left') do
|
13
13
|
[
|
14
14
|
(account_split_button(args) if card.accountable?),
|
15
15
|
activity_split_button(args),
|
@@ -17,8 +17,8 @@ format :html do
|
|
17
17
|
edit_split_button(args),
|
18
18
|
]
|
19
19
|
end),
|
20
|
-
(wrap_with(:form, :
|
21
|
-
content_tag :div, :
|
20
|
+
(wrap_with(:form, class: 'navbar-form navbar-right') do
|
21
|
+
content_tag :div, class: 'form-group' do
|
22
22
|
_optional_render(:toolbar_buttons, args, :show)
|
23
23
|
end
|
24
24
|
end)
|
@@ -59,65 +59,65 @@ format :html do
|
|
59
59
|
if view == :edit_rules
|
60
60
|
current_set_card.name
|
61
61
|
else
|
62
|
-
{:
|
62
|
+
{edit: 'content', edit_name: 'name', edit_type: 'type', edit_structure: 'structure', edit_nests: 'nests', history: 'history', common_rules: 'common', recent_rules: 'recent', grouped_rules: 'all', edit_nest_rules: 'nests'}[view]
|
63
63
|
end
|
64
64
|
end
|
65
65
|
|
66
66
|
def activity_split_button args
|
67
|
-
discuss = smart_link 'discuss', { :
|
68
|
-
editors = smart_link 'editors', { :
|
69
|
-
toolbar_split_button 'activity', { :
|
67
|
+
discuss = smart_link 'discuss', { related: Card[:discussion].key }
|
68
|
+
editors = smart_link 'editors', { related: Card[:editors].key }
|
69
|
+
toolbar_split_button 'activity', { view: :history }, args do
|
70
70
|
{
|
71
|
-
:
|
72
|
-
:
|
73
|
-
:
|
74
|
-
:
|
71
|
+
history: (_render_history_link if card.history?),
|
72
|
+
discuss: discuss,
|
73
|
+
follow: _render_follow_link(args),
|
74
|
+
editors: editors
|
75
75
|
}
|
76
76
|
end
|
77
77
|
end
|
78
78
|
def rules_split_button args
|
79
|
-
recent = smart_link 'recent', {:
|
80
|
-
common = smart_link 'common', {:
|
81
|
-
group = smart_link 'by group', {:
|
82
|
-
all = smart_link 'by name', {:
|
83
|
-
nests = smart_link 'nests', {:
|
84
|
-
toolbar_split_button 'rules', {:
|
79
|
+
recent = smart_link 'recent', {view: :edit_rules, slot: {rule_view: :recent_rules}}
|
80
|
+
common = smart_link 'common', {view: :edit_rules, slot: {rule_view: :common_rules}}
|
81
|
+
group = smart_link 'by group', {view: :edit_rules, slot: {rule_view: :grouped_rules}}
|
82
|
+
all = smart_link 'by name', {view: :edit_rules, slot: {rule_view: :all_rules}}
|
83
|
+
nests = smart_link 'nests', {view: :edit_nest_rules, slot: {rule_view: :field_related_rules}}
|
84
|
+
toolbar_split_button 'rules', {view: :edit_rules }, args do
|
85
85
|
{
|
86
|
-
:
|
87
|
-
:
|
88
|
-
:
|
89
|
-
:
|
90
|
-
:
|
91
|
-
:
|
86
|
+
common_rules: common,
|
87
|
+
grouped_rules: group,
|
88
|
+
all_rules: all,
|
89
|
+
separator: (separator if args[:nested_fields].present?),
|
90
|
+
recent_rules: (recent if recently_edited_settings?),
|
91
|
+
edit_nest_rules: (nests if args[:nested_fields].present?)
|
92
92
|
}
|
93
93
|
end
|
94
94
|
end
|
95
95
|
def edit_split_button args
|
96
|
-
toolbar_split_button 'edit', {:
|
96
|
+
toolbar_split_button 'edit', {view: :edit}, args do
|
97
97
|
{
|
98
|
-
:
|
99
|
-
:
|
100
|
-
:
|
101
|
-
:
|
102
|
-
:
|
98
|
+
edit: _render_edit_content_link(args),
|
99
|
+
edit_nests: (_render_edit_nests_link if !card.structure && args[:nested_fields].present?),
|
100
|
+
structure: (smart_link 'structure', {view: :edit_structure} if structure_editable?),
|
101
|
+
edit_name: _render_edit_name_link,
|
102
|
+
edit_type: _render_edit_type_link,
|
103
103
|
}
|
104
104
|
end
|
105
105
|
end
|
106
106
|
def account_split_button args
|
107
|
-
toolbar_split_button 'account', {:
|
107
|
+
toolbar_split_button 'account', {related: Card[:account].key}, args do
|
108
108
|
{
|
109
|
-
:
|
110
|
-
:
|
111
|
-
:
|
112
|
-
:
|
113
|
-
:
|
109
|
+
account: smart_link('details',{related: {name: "#{card.name}+#{Card[:account].key}", view: :edit}}),
|
110
|
+
roles: smart_link('roles', {related: Card[:roles].key}),
|
111
|
+
created: smart_link('created',{related: Card[:created].key}),
|
112
|
+
edited: smart_link('edited', {related: Card[:edited].key}),
|
113
|
+
follow: smart_link('follow', {related: Card[:follow].key})
|
114
114
|
}
|
115
115
|
end
|
116
116
|
end
|
117
117
|
|
118
118
|
|
119
119
|
def toolbar_split_button name, button_args, args
|
120
|
-
button = button_link name, button_args, :
|
120
|
+
button = button_link name, button_args, class: ('active' if args[:active_toolbar_button] == name)
|
121
121
|
active_item =
|
122
122
|
if @slot_view == :related
|
123
123
|
if args[:rule_view]
|
@@ -128,34 +128,34 @@ format :html do
|
|
128
128
|
else
|
129
129
|
@slot_view
|
130
130
|
end
|
131
|
-
split_button button, args.merge(:active_item
|
131
|
+
split_button button, args.merge(active_item: active_item) do
|
132
132
|
yield
|
133
133
|
end
|
134
134
|
end
|
135
135
|
|
136
136
|
|
137
137
|
def close_link args
|
138
|
-
link_opts = {:
|
138
|
+
link_opts = {title: 'cancel'}
|
139
139
|
if args[:subslot]
|
140
|
-
link_opts[:path_opts] = {:
|
140
|
+
link_opts[:path_opts] = {slot: {subframe: true}}
|
141
141
|
end
|
142
142
|
|
143
|
-
link = view_link glyphicon('remove'), :home, link_opts.merge(:
|
143
|
+
link = view_link glyphicon('remove'), :home, link_opts.merge(class: 'btn-toolbar-control btn btn-primary')
|
144
144
|
css_class = ['nav navbar-nav', args[:class]].compact.join "\n"
|
145
|
-
wrap_with :div, :
|
145
|
+
wrap_with :div, class: css_class do
|
146
146
|
[
|
147
147
|
toolbar_pin_button,
|
148
148
|
link
|
149
149
|
]
|
150
150
|
end
|
151
|
-
#list_tag link, :
|
151
|
+
#list_tag link, class: css_class
|
152
152
|
end
|
153
153
|
def toolbar_pin_button
|
154
|
-
button_tag glyphicon('pushpin'), :
|
154
|
+
button_tag glyphicon('pushpin'), situation: :primary, remote: true, title: "#{'un' if toolbar_pinned?}pin", class: "btn-toolbar-control toolbar-pin #{'in' unless toolbar_pinned?}active"
|
155
155
|
end
|
156
156
|
|
157
157
|
view :toolbar_buttons do |args|
|
158
|
-
wrap_with(:div, :
|
158
|
+
wrap_with(:div, class: 'btn-group') do
|
159
159
|
[
|
160
160
|
_optional_render(:delete_button, args, (card.ok?(:delete) ? :show : :hide)),
|
161
161
|
_optional_render(:refresh_button, args, :show),
|
@@ -169,29 +169,29 @@ format :html do
|
|
169
169
|
|
170
170
|
|
171
171
|
view :related_button do |args|
|
172
|
-
path_opts = {:
|
173
|
-
dropdown_button '', :
|
172
|
+
path_opts = {slot: {show: :toolbar}}
|
173
|
+
dropdown_button '', icon: 'education', class: 'related' do #, icon: 'eye-open' do
|
174
174
|
[
|
175
|
-
menu_item(' children', 'baby-formula', path_opts.merge(:
|
176
|
-
menu_item(' mates', 'bed', path_opts.merge(:
|
177
|
-
menu_item(' references out', 'log-out', path_opts.merge(:
|
178
|
-
menu_item(' references in', 'log-in', path_opts.merge(:
|
175
|
+
menu_item(' children', 'baby-formula', path_opts.merge(related: '*children')),
|
176
|
+
menu_item(' mates', 'bed', path_opts.merge(related: '*mates')),
|
177
|
+
menu_item(' references out', 'log-out', path_opts.merge(related: '*refers_to')),
|
178
|
+
menu_item(' references in', 'log-in', path_opts.merge(related: '*referred_to_by'))
|
179
179
|
]
|
180
180
|
end
|
181
181
|
end
|
182
182
|
view :refresh_button do |args|
|
183
|
-
path_opts = {:
|
183
|
+
path_opts = {slot: {show: :toolbar},page: card}
|
184
184
|
icon = main? ? 'refresh' : 'new-window'
|
185
|
-
toolbar_button('refresh', icon, 'hidden-xs hidden-sm hidden-md hidden-lg', :path_opts
|
185
|
+
toolbar_button('refresh', icon, 'hidden-xs hidden-sm hidden-md hidden-lg', path_opts: path_opts)
|
186
186
|
end
|
187
187
|
|
188
188
|
|
189
189
|
view :delete_button do |args|
|
190
190
|
toolbar_button('delete', 'trash', 'hidden-xs hidden-sm hidden-md hidden-lg',
|
191
|
-
:
|
192
|
-
:
|
193
|
-
:
|
194
|
-
:
|
191
|
+
action: :delete,
|
192
|
+
class: 'slotter',
|
193
|
+
remote: true,
|
194
|
+
path_opts: {success: main? ? 'REDIRECT: *previous' : "TEXT: #{card.name} deleted"},
|
195
195
|
:'data-confirm' => "Are you sure you want to delete #{card.name}?"
|
196
196
|
)
|
197
197
|
end
|
@@ -205,19 +205,19 @@ format :html do
|
|
205
205
|
link_text = "#{glyphicon symbol}<span class='menu-item-label #{hide}'>#{text}</span>"
|
206
206
|
|
207
207
|
if cardname = tag_args.delete(:page)
|
208
|
-
card_link cardname, :
|
208
|
+
card_link cardname, class: klass, text: link_text
|
209
209
|
elsif viewname = tag_args.delete(:view)
|
210
|
-
tag_args[:path_opts] ||= {:
|
210
|
+
tag_args[:path_opts] ||= {slot: {show: :toolbar}}
|
211
211
|
view_link link_text, viewname, tag_args
|
212
212
|
else
|
213
213
|
path_opts = tag_args.delete(:path_opts) || {}
|
214
|
-
path_opts.merge! :
|
214
|
+
path_opts.merge! action: tag_args.delete(:action) if tag_args[:action]
|
215
215
|
link_to link_text, path_opts, tag_args
|
216
216
|
end
|
217
217
|
end
|
218
218
|
|
219
219
|
def autosaved_draft_link
|
220
|
-
view_link('autosaved draft', :edit, :
|
220
|
+
view_link('autosaved draft', :edit, path_opts: {edit_draft: true, slot: {show: :toolbar}}, class: 'navbar-link slotter pull-right')
|
221
221
|
end
|
222
222
|
|
223
223
|
|