From d0aaab95f1ef6d8b748b0e8d54f811a366864249 Mon Sep 17 00:00:00 2001 From: diosmosis Date: Sun, 7 Jun 2020 16:46:56 -0700 Subject: Switch from bower to npm and update JS libraries (#14082) * Starting to replace bower with npm: use updated jquery-ui from npm. * Use jquery from npm./ * Use angular from npm. * Add more angular libraries. * Use chroma-js from npm. * Remove html5shiv, does not appear to be used. * Use iframe resizer library from npm. * Add jquery-mousewheel * Add jquery.dotdotdot from npm. * Get jquery.scrollto from npm. * Get jscrollpane from npm. * Get materialize-css from npm. * Get mousetrap from npm. * Remove ngDialog, as it is no longer used. * Install qrcode.js from npm. * Get sprintf-js from npm. * Get visibillityjs from npm. * Remove bower.json. * Getting parts of matomo to work w/ new versions of libraries installed by npm. * Ignore node_modules subfolders in node_modules since we only use npm for frontend dependencies + fix a test. * Fix button padding. * Fix series picker checkboxes. * Fix karma conf. * Fix CSS in right place. * Fixing more css/less issues. * More test fixes. * Limit selection style fix. * Fix more tests + materializecss issues. * Fix a couple more tests. * Fix annotation styling. * remove error * add ng-dialog files * try to fix some tests * Fix several UI tests. * fixing more build issues * Fix several more tests and issues. * fixing more tests * split ui tests into 3 groups * fix several more issues and tests * Fix some console warnings on chrome. * Updating more test files. * fix some tests * yet more fixes * couple more fixes * another form fix * Fix some tests. * update screenshot * update more expected files * Fix two more form issues. * test commit (travis is not fetching submodules for some reason...) * remove scripts removed in merge * three travis builds * split UIIntegrationTest into multiple suites * lets try this again * updae several expected screenshots * fix some more tests * fix plugin details material select and tabs initiaialization * update screenshots + css fix * re-initialize materialize tabs since we load jquery-ui afterwards for datepicker which unsets materialize tabs * update more screenshots and fix couple more issues * update more screenshots + tweak to test * more fixes and screenshot updates * fix some issues and update more screenshots * update submodules * more fixes + more updated screenshots * more css fixes and test fixes * couple fixes & updated screenshots * update screenshots * fix random failure * Map old bower_component files to new ones in AssetManager. * Remove node_modules from PR and ignore node_modules in .gitignore and remove libs/jquery (adding new required libs). * Update .travis.yml. * update screenshots * fixing some more issues * fix copy pasta * update screenshots * fix more modal issues * Update css & screenshots. * correct close modal calls * fixing more issues * data-target instead of data-activates * fix more tests * trigger build that works? * fix more tests * update submodule * debugging travis * more debugging * try to fix test * fix modal no button click in test * update more screenshots * couple more test fixes * some more fixes and updated screenshots * update screenshots * apply some review feedback * Fix modal centering and initial top position. * apply some more pr feedback * another pr fix * update submodule * remove style * fix color of checkbox mark * Fix centering the popover Note: centering the popover relative to body doesn't work poperly anymore, maybe because of the fixed position of the widget overlay. Using the ui-widget-overlay to position the dialog centered seems to work * ignore line endings check for node modules * updates expected UI files * submodule updates * use minified file of jquery.browser.js * updates expected test files * ensure to hide parent tooltips when row action tooltips are shown * tweak less for datatable navigation * style is only useful for dashboard * update some screenshots * update submodules Co-authored-by: sgiehl --- plugins/Actions/tests/UI/ActionsDataTable_spec.js | 1 + .../ActionsDataTable_column_sorted.png | 4 +- .../ActionsDataTable_exclude_low_population.png | 4 +- .../ActionsDataTable_flattened.png | 4 +- .../ActionsDataTable_initial.png | 4 +- .../ActionsDataTable_pageview_percentages.png | 4 +- .../ActionsDataTable_search.png | 4 +- .../ActionsDataTable_search_closed.png | 4 +- .../ActionsDataTable_search_visible.png | 4 +- .../ActionsDataTable_segmented_visitor_log.png | 4 +- ...ctionsDataTable_segmented_visitor_log_hover.png | 4 +- .../ActionsDataTable_unflattened.png | 4 +- ...ctionsDataTable_unique_pageview_percentages.png | 4 +- plugins/Annotations/stylesheets/annotations.less | 14 ++-- plugins/Annotations/templates/_annotation.twig | 2 +- plugins/Annotations/templates/_annotationList.twig | 2 +- plugins/AnonymousPiwikUsageMeasurement | 2 +- plugins/Bandwidth | 2 +- plugins/CoreAdminHome/CoreAdminHome.php | 10 +-- .../CoreAdminHome/templates/generalSettings.twig | 21 +++-- .../TrackingFailures_manage_no_failures.png | 4 +- .../TrackingFailures_manage_with_failures.png | 4 +- ...e_with_failures_delete_all_ask_confirmation.png | 4 +- ...s_manage_with_failures_delete_all_confirmed.png | 4 +- ...e_with_failures_delete_one_ask_confirmation.png | 4 +- ...s_manage_with_failures_delete_one_confirmed.png | 4 +- ...est_ArchiveCronTest_archive_php_cron_output.txt | 88 ++++++++++++++++++++ plugins/CoreHome/CoreHome.php | 41 +++++----- .../angularjs/common/directives/dropdown-button.js | 22 +++-- .../common/directives/show-sensitive-data.js | 2 +- .../angularjs/common/directives/side-nav.js | 3 +- .../dialogtoggler-urllistener.service.js | 90 --------------------- .../dialogtoggler/dialogtoggler.controller.js | 68 ---------------- .../dialogtoggler/dialogtoggler.directive.js | 30 ------- .../CoreHome/angularjs/dialogtoggler/ngdialog.less | 70 ---------------- .../dropdown-menu/dropdown-menu.directive.js | 4 +- .../field-array/field-array.directive.html | 1 + .../angularjs/field-array/field-array.directive.js | 1 + .../multipairfield/multipairfield.directive.html | 2 + .../multipairfield/multipairfield.directive.js | 1 + .../period-selector/period-selector.controller.js | 6 ++ .../period-selector/period-selector.directive.html | 34 ++++---- .../period-selector/period-selector.directive.less | 10 ++- plugins/CoreHome/angularjs/piwikApp.js | 3 +- .../quick-access/quick-access.directive.js | 2 +- .../report-export/reportexport.directive.js | 2 +- .../reporting-menu/reportingmenu.directive.html | 2 +- .../siteselector/siteselector.directive.less | 4 + plugins/CoreHome/javascripts/corehome.js | 2 +- plugins/CoreHome/javascripts/dataTable.js | 18 +++++ plugins/CoreHome/javascripts/materialize-bc.js | 18 +++++ plugins/CoreHome/javascripts/popover.js | 7 +- plugins/CoreHome/stylesheets/coreHome.less | 1 + .../CoreHome/stylesheets/dataTable/_dataTable.less | 8 +- .../stylesheets/dataTable/_limitSelection.less | 10 +-- plugins/CoreHome/templates/_dataTableActions.twig | 8 +- plugins/CoreHome/templates/_menu.twig | 2 +- plugins/CoreHome/templates/_topBar.twig | 6 +- plugins/CorePluginsAdmin/CorePluginsAdmin.php | 2 +- .../angularjs/field/field.directive.js | 2 + .../angularjs/form-field/field-checkbox-array.html | 20 ++--- .../angularjs/form-field/field-checkbox.html | 17 ++-- .../form-field/field-expandable-select.html | 5 +- .../angularjs/form-field/field-field-array.html | 4 +- .../angularjs/form-field/field-multiselect.html | 16 ++-- .../angularjs/form-field/field-multituple.html | 4 +- .../angularjs/form-field/field-number.html | 2 +- .../angularjs/form-field/field-radio.html | 24 +++--- .../angularjs/form-field/field-select.html | 18 ++--- .../angularjs/form-field/field-text-array.html | 2 +- .../angularjs/form-field/field-text.html | 24 +++--- .../angularjs/form-field/field-textarea-array.html | 2 +- .../angularjs/form-field/field-textarea.html | 16 ++-- .../angularjs/form-field/form-field.directive.js | 12 +-- plugins/CorePluginsAdmin/templates/macros.twig | 12 ++- .../TagManagerTeaser_admin_page.png | 4 +- ...TagManagerTeaser_super_user_activate_plugin.png | 4 +- .../TagManagerTeaser_superuser_page.png | 4 +- plugins/CoreUpdater/Controller.php | 21 ++--- .../UI/expected-screenshots/CoreUpdaterDb_main.png | 4 +- .../CoreUpdaterDb_main_instance.png | 4 +- .../expected-screenshots/CoreUpdaterDb_updated.png | 4 +- .../series-picker/series-picker.component.html | 14 ++-- plugins/CoreVisualizations/javascripts/jqplot.js | 1 - plugins/CustomAlerts | 2 +- plugins/CustomDimensions | 2 +- .../CustomVariables_manage.png | 4 +- .../UI/expected-screenshots/DBStats_admin_page.png | 4 +- plugins/Dashboard/javascripts/dashboardWidget.js | 1 - plugins/Dashboard/stylesheets/dashboard.less | 5 ++ plugins/Dashboard/tests/UI/Dashboard_spec.js | 2 + .../DashboardManager_create_new.png | 4 +- .../DashboardManager_removed.png | 4 +- .../DashboardManager_widget_preview.png | 4 +- .../Dashboard_invalid_token_auth.png | 4 +- .../UI/expected-screenshots/Dashboard_reset.png | 4 +- .../Dashboard_rowevolution.png | 4 +- .../Dashboard_widget_maximise.png | 4 +- .../Dashboard_widget_unmaximise.png | 4 +- .../UI/expected-screenshots/Diagnostics_page.png | 4 +- ...heduledReports.generateReport_week.original.pdf | Bin 579793 -> 580210 bytes .../UI/expected-screenshots/FeedbackForm_show.png | 4 +- .../FeedbackPopup_feedback_popup.png | 4 +- plugins/GeoIp2/templates/_updaterManage.twig | 2 +- .../UI/expected-screenshots/Insights_initial.png | 4 +- plugins/Installation/Controller.php | 21 ++--- .../expected-screenshots/Installation_congrats.png | 4 +- .../Installation_db_created.png | 4 +- .../expected-screenshots/Installation_db_setup.png | 4 +- .../Installation_db_setup_fail.png | 4 +- .../Installation_js_tracking.png | 4 +- .../Installation_setup_website.png | 4 +- .../Installation_setup_website_fail.png | 4 +- .../UI/expected-screenshots/Installation_start.png | 4 +- .../Installation_superuser.png | 4 +- .../Installation_superuser_de.png | 4 +- .../Installation_superuser_fail.png | 4 +- .../Installation_system_check.png | 4 +- .../IntranetMeasurable_add_new_dialog.png | 4 +- .../IntranetMeasurable_intranet_create.png | 4 +- .../IntranetMeasurable_intranet_created.png | 4 +- plugins/Live/Live.php | 2 +- plugins/Live/stylesheets/live.less | 5 ++ plugins/Live/stylesheets/visitor_profile.less | 1 + .../expected-screenshots/Live_visitor_profile.png | 4 +- .../Live_visitor_profile_action_details.png | 4 +- .../Live_visitor_profile_actions_hidden.png | 4 +- .../Live_visitor_profile_limited.png | 4 +- .../Live_visitor_profile_more_visits.png | 4 +- .../Live_visitor_profile_visit_details.png | 4 +- plugins/LogViewer | 2 +- plugins/Login/templates/login.twig | 8 +- .../Login_bruteforcelog_noentries.png | 4 +- .../Login_bruteforcelog_withentries.png | 4 +- .../expected-screenshots/Login_forgot_password.png | 4 +- .../UI/expected-screenshots/Login_login_fail.png | 4 +- .../UI/expected-screenshots/Login_login_form.png | 4 +- .../Login_login_form_logout.png | 4 +- .../expected-screenshots/Login_password_reset.png | 4 +- .../Login_password_reset_complete.png | 4 +- .../Login_password_reset_error.png | 4 +- plugins/MarketingCampaignsReporting | 2 +- plugins/Marketplace/Marketplace.php | 2 +- plugins/Marketplace/stylesheets/marketplace.less | 5 +- plugins/Marketplace/templates/plugin-details.twig | 4 +- ...ce_free_plugin_details_multiUserEnvironment.png | 4 +- .../Marketplace_free_plugin_details_superuser.png | 4 +- .../Marketplace_free_plugin_details_user.png | 4 +- ...tails_exceeded_license_multiUserEnvironment.png | 4 +- ...d_plugin_details_exceeded_license_superuser.png | 4 +- ...e_paid_plugin_details_exceeded_license_user.png | 4 +- ...gin_details_no_license_multiUserEnvironment.png | 4 +- ...ce_paid_plugin_details_no_license_superuser.png | 4 +- ...etplace_paid_plugin_details_no_license_user.png | 4 +- ...alid_license_multiUserEnvironment_installed.png | 4 +- ...n_details_valid_license_superuser_installed.png | 4 +- ...plugin_details_valid_license_user_installed.png | 4 +- ...aid_plugins_no_license_multiUserEnvironment.png | 4 +- ...rketplace_paid_plugins_no_license_superuser.png | 4 +- .../Marketplace_paid_plugins_no_license_user.png | 4 +- ..._with_exceeded_license_multiUserEnvironment.png | 4 +- ...aid_plugins_with_exceeded_license_superuser.png | 4 +- ...ace_paid_plugins_with_exceeded_license_user.png | 4 +- ...d_plugins_with_license_multiUserEnvironment.png | 4 +- ...etplace_paid_plugins_with_license_superuser.png | 4 +- .../Marketplace_paid_plugins_with_license_user.png | 4 +- ...place_subscription_overview_exceededLicense.png | 4 +- ...tplace_subscription_overview_expiredLicense.png | 4 +- ...Marketplace_subscription_overview_noLicense.png | 4 +- ...ketplace_subscription_overview_validLicense.png | 4 +- .../Marketplace_superuser_enable_plugins_admin.png | 4 +- ...able_plugins_admin_with_multiserver_enabled.png | 4 +- ..._superuser_install_all_paid_plugins_at_once.png | 4 +- ...place_superuser_invalid_license_key_entered.png | 4 +- ...e_superuser_remove_license_key_confirmation.png | 4 +- ...lace_superuser_remove_license_key_confirmed.png | 4 +- ...etplace_superuser_valid_license_key_entered.png | 4 +- ...mes_with_valid_license_multiUserEnvironment.png | 4 +- ...etplace_themes_with_valid_license_superuser.png | 4 +- .../Marketplace_themes_with_valid_license_user.png | 4 +- .../Marketplace_updates_multiUserEnvironment.png | 4 +- .../Marketplace_updates_superuser.png | 4 +- plugins/Morpheus/javascripts/piwikHelper.js | 2 +- plugins/Morpheus/stylesheets/base.less | 1 + plugins/Morpheus/stylesheets/general/_forms.less | 23 +++++- .../Morpheus/stylesheets/general/_jqueryUI.less | 5 ++ plugins/Morpheus/stylesheets/general/_misc.less | 4 + plugins/Morpheus/stylesheets/main.less | 2 +- plugins/Morpheus/stylesheets/ui/_buttons.less | 5 ++ plugins/Morpheus/stylesheets/ui/_components.less | 7 +- plugins/Morpheus/stylesheets/ui/_navs.less | 4 + plugins/Morpheus/stylesheets/ui/_popups.less | 12 ++- .../Morpheus/stylesheets/uibase/_periodSelect.less | 6 +- plugins/Morpheus/templates/demo.twig | 2 +- .../UI/expected-screenshots/Morpheus_load.png | 4 +- .../angularjs/dashboard/dashboard.directive.html | 21 ++--- .../angularjs/dashboard/dashboard.directive.less | 12 ++- plugins/MultiSites/tests/UI/MultiSites_spec.js | 6 +- .../MultiSitesTest_all_websites.png | 4 +- ...tiSitesTest_all_websites_changed_sort_order.png | 4 +- .../MultiSitesTest_all_websites_page_1.png | 4 +- .../MultiSitesTest_all_websites_range.png | 4 +- .../MultiSitesTest_all_websites_search.png | 4 +- .../expected-screenshots/Overlay_framed_loaded.png | 4 +- .../UI/expected-screenshots/Overlay_loaded.png | 4 +- .../Overlay_loaded_with_segment.png | 4 +- .../expected-screenshots/Overlay_page_change.png | 4 +- .../Overlay_page_link_clicks.png | 4 +- .../Overlay_page_new_links.png | 4 +- .../expected-screenshots/Overlay_period_change.png | 4 +- .../expected-screenshots/Overlay_row_evolution.png | 4 +- .../expected-screenshots/Overlay_transitions.png | 4 +- .../tests/UI/PagePerformance_spec.js | 21 ++++- .../expected-screenshots/PagePerformance_load.png | 4 +- .../PagePerformance_pagetitle_overlay.png | 4 +- .../PagePerformance_pageurl_overlay.png | 4 +- .../PagePerformance_performance_visualization.png | 4 +- .../PagePerformance_rowactions.png | 4 +- .../PagePerformance_rowactions_subtable.png | 4 +- .../PagePerformance_visualizations.png | 4 +- ...data_anonymizeip_and_visit_column_cancelled.png | 4 +- ...izeip_and_visit_column_confirmation_message.png | 4 +- ...data_anonymizeip_and_visit_column_confirmed.png | 4 +- ...data_anonymizeip_and_visit_column_prefilled.png | 4 +- ...ation_anduserid_and_action_column_confirmed.png | 4 +- ...ation_anduserid_and_action_column_prefilled.png | 4 +- ...elogdata_one_site_and_custom_date_confirmed.png | 4 +- ...elogdata_one_site_and_custom_date_prefilled.png | 4 +- .../PrivacyManager_consent_default.png | 4 +- .../PrivacyManager_gdpr_overview.png | 4 +- .../PrivacyManager_gdpr_overview_no_retention.png | 4 +- .../PrivacyManager_gdpr_tools_default.png | 4 +- ...cyManager_gdpr_tools_delete_visit_cancelled.png | 4 +- ...te_visit_cancelled_verified_no_data_deleted.png | 4 +- ...cyManager_gdpr_tools_delete_visit_confirmed.png | 4 +- ...Manager_gdpr_tools_delete_visit_unconfirmed.png | 4 +- ...vacyManager_gdpr_tools_enrich_segment_by_ip.png | 4 +- .../PrivacyManager_gdpr_tools_no_visits_found.png | 4 +- ...PrivacyManager_gdpr_tools_uncheck_one_visit.png | 4 +- .../PrivacyManager_gdpr_tools_visits_found.png | 4 +- ...rivacyManager_gdpr_tools_visits_showprofile.png | 4 +- .../PrivacyManager_privacy_settings_default.png | 4 +- .../PrivacyManager_users_opt_out_default.png | 4 +- plugins/QueuedTracking | 2 +- .../CampaignBuilder_generate_url_nokeyword.png | 4 +- .../CampaignBuilder_generate_url_reset.png | 4 +- .../CampaignBuilder_generate_url_withkeyword.png | 4 +- .../CampaignBuilder_loaded.png | 4 +- plugins/ScheduledReports/templates/_addReport.twig | 8 +- .../ScheduledReports_invalid_token.png | 4 +- .../ScheduledReports_no_token.png | 4 +- .../ScheduledReports_unsubscribe_form.png | 4 +- .../ScheduledReports_unsubscribe_success.png | 4 +- plugins/SecurityInfo | 2 +- plugins/SegmentEditor/javascripts/Segmentation.js | 4 +- .../SegmentEditor/stylesheets/segmentation.less | 21 ++++- .../SegmentEditor/templates/_segmentSelector.twig | 18 +++-- .../tests/UI/SegmentSelectorEditor_spec.js | 2 +- ...tSelectorEditorTest_2_segment_editor_update.png | 4 +- ...lectorEditorTest_3_segment_editor_edit_name.png | 4 +- ...electorEditorTest_6_segment_editor_droplist.png | 4 +- ...tSelectorEditorTest_8_segment_editor_create.png | 4 +- ...entSelectorEditorTest_add_new_and_condition.png | 4 +- ...mentSelectorEditorTest_add_new_or_condition.png | 4 +- .../SegmentSelectorEditorTest_complex_segment.png | 4 +- .../SegmentSelectorEditorTest_deleted_dialog.png | 4 +- ...gmentSelectorEditorTest_dimension_drag_drop.png | 4 +- ...egmentSelectorEditorTest_drag_and_condition.png | 4 +- ...SegmentSelectorEditorTest_drag_or_condition.png | 4 +- .../SegmentSelectorEditorTest_saved_details.png | 4 +- .../SegmentSelectorEditorTest_suggested_values.png | 4 +- ...gmentSelectorEditorTest_update_confirmation.png | 4 +- .../SegmentSelectorEditorTest_updated.png | 4 +- .../SegmentSelectorEditorTest_updated_details.png | 4 +- .../UnprocessedSegmentTest_custom_segment.png | 4 +- .../UnprocessedSegmentTest_unprocessed_segment.png | 4 +- .../SitesManager_global_settings.png | 4 +- .../expected-screenshots/SitesManager_loaded.png | 4 +- .../expected-screenshots/SitesManager_page_1.png | 4 +- .../SitesManager_page_1_again.png | 4 +- .../expected-screenshots/SitesManager_page_2.png | 4 +- .../expected-screenshots/SitesManager_search.png | 4 +- .../SitesManager_search_page_1.png | 4 +- plugins/TasksTimetable | 2 +- plugins/Transitions/stylesheets/transitions.less | 10 +++ plugins/Transitions/tests/UI/Transitions_spec.js | 2 +- .../Transitions_transitions_popup_titles.png | 4 +- .../Transitions_transitions_popup_urls.png | 4 +- ...ansitions_transitions_report_no_data_widget.png | 4 +- ...itions_transitions_report_switch_type_title.png | 4 +- .../Transitions_transitions_report_switch_url.png | 4 +- ...sitions_transitions_report_with_data_report.png | 4 +- ...sitions_transitions_report_with_data_widget.png | 4 +- plugins/TreemapVisualization | 2 +- plugins/TwoFactorAuth/TwoFactorAuth.php | 2 +- .../templates/_showRecoveryCodes.twig | 2 +- .../TwoFactorAuth/tests/UI/TwoFactorAuth_spec.js | 1 + .../TwoFactorAuthUsersManager_edit_with_2fa.png | 4 +- ...uthUsersManager_edit_with_2fa_reset_confirm.png | 4 +- ...hUsersManager_edit_with_2fa_reset_confirmed.png | 4 +- .../TwoFactorAuthUsersManager_list.png | 4 +- .../TwoFactorAuth_logme_not_verified.png | 4 +- ...TwoFactorAuth_logme_not_verified_wrong_code.png | 4 +- .../TwoFactorAuth_show_recovery_codes_step1.png | 4 +- .../TwoFactorAuth_show_recovery_codes_step2.png | 4 +- .../TwoFactorAuth_twofa_forced_step1.png | 4 +- .../TwoFactorAuth_twofa_forced_step2.png | 4 +- .../TwoFactorAuth_twofa_forced_step3.png | 4 +- .../TwoFactorAuth_twofa_setup_step1.png | 4 +- .../TwoFactorAuth_twofa_setup_step2.png | 4 +- .../TwoFactorAuth_twofa_setup_step3.png | 4 +- ...FactorAuth_usersettings_twofa_disable_step1.png | 4 +- ...FactorAuth_usersettings_twofa_disable_step2.png | 4 +- ...FactorAuth_usersettings_twofa_disable_step3.png | 4 +- .../TwoFactorAuth_usersettings_twofa_enabled.png | 4 +- ...torAuth_usersettings_twofa_enabled_required.png | 4 +- plugins/UserCountry/templates/adminIndex.twig | 17 ++-- .../UserCountry_admin_geoip2.png | 4 +- .../UserCountry_admin_no_providers.png | 4 +- plugins/UserCountryMap/UserCountryMap.php | 4 +- .../UI/expected-screenshots/VisitorMap_cities.png | 4 +- .../UI/expected-screenshots/VisitorMap_regions.png | 4 +- .../capabilities-edit.component.js | 4 +- .../capabilities-edit.component.less | 2 +- .../paged-users-list.component.html | 16 ++-- .../paged-users-list/paged-users-list.component.js | 4 +- .../paged-users-list.component.less | 3 +- .../personal-settings.controller.js | 6 +- .../user-edit-form/user-edit-form.component.js | 10 +-- .../user-edit-form/user-edit-form.component.less | 2 +- .../user-permissions-edit.component.html | 16 ++-- .../user-permissions-edit.component.js | 8 +- .../user-permissions-edit.component.less | 4 +- .../users-manager/users-manager.component.js | 2 +- .../users-manager/users-manager.component.less | 2 +- plugins/UsersManager/stylesheets/usersManager.less | 2 +- plugins/UsersManager/templates/userSettings.twig | 2 +- plugins/UsersManager/tests/UI/UserSettings_spec.js | 2 +- plugins/UsersManager/tests/UI/UsersManager_spec.js | 52 ++++++------ .../UserSettings_add_token.png | 4 +- .../UserSettings_add_token_check_password.png | 4 +- .../UserSettings_add_token_success.png | 4 +- .../UserSettings_already_signed_up.png | 4 +- .../UserSettings_asks_confirmation.png | 4 +- .../UI/expected-screenshots/UserSettings_load.png | 4 +- .../UserSettings_load_security.png | 4 +- .../UserSettings_signup_success.png | 4 +- .../UsersManager_add_new_user_form.png | 4 +- .../UsersManager_admin_view_admin_add_user.png | 4 +- ...sManager_admin_view_admin_add_user_by_email.png | 4 +- ...sManager_admin_view_admin_add_user_by_login.png | 4 +- ...anager_admin_view_admin_add_user_not_exists.png | 4 +- ...rsManager_admin_view_admin_edit_permissions.png | 4 +- ...anager_admin_view_admin_existing_user_modal.png | 4 +- .../UsersManager_admin_view_admin_load.png | 4 +- ...sersManager_admin_view_edit_user_basic_info.png | 4 +- .../UsersManager_all_rows_deselected.png | 4 +- .../UsersManager_all_rows_in_search.png | 4 +- .../UsersManager_all_rows_selected.png | 4 +- .../UsersManager_bulk_remove_access.png | 4 +- .../UsersManager_bulk_set_access.png | 4 +- .../UsersManager_bulk_set_access_confirm.png | 4 +- .../UsersManager_delete_bulk_access.png | 4 +- .../UsersManager_delete_single.png | 4 +- ...rsManager_edit_user_basic_asks_confirmation.png | 4 +- ...er_edit_user_basic_confirmed_wrong_password.png | 4 +- .../UsersManager_edit_user_form.png | 4 +- .../expected-screenshots/UsersManager_filters.png | 4 +- .../UI/expected-screenshots/UsersManager_load.png | 4 +- .../UsersManager_manage_users_back.png | 4 +- .../UsersManager_next_click.png | 4 +- ...UsersManager_permissions_all_rows_in_search.png | 4 +- .../UsersManager_permissions_all_sites_access.png | 4 +- .../UsersManager_permissions_bulk_access_set.png | 4 +- ...sersManager_permissions_bulk_access_set_all.png | 4 +- ...sManager_permissions_capability_single_site.png | 4 +- .../UsersManager_permissions_edit.png | 4 +- .../UsersManager_permissions_filters.png | 4 +- .../UsersManager_permissions_next.png | 4 +- .../UsersManager_permissions_remove_access.png | 4 +- .../UsersManager_permissions_remove_single.png | 4 +- .../UsersManager_permissions_select_all.png | 4 +- .../UsersManager_permissions_select_multiple.png | 4 +- ...UsersManager_permissions_single_site_access.png | 4 +- .../expected-screenshots/UsersManager_previous.png | 4 +- .../expected-screenshots/UsersManager_role_for.png | 4 +- .../UsersManager_rows_selected.png | 4 +- .../UsersManager_superuser_confirm.png | 4 +- .../UsersManager_superuser_set.png | 4 +- .../UsersManager_superuser_tab.png | 4 +- .../UsersManager_user_created.png | 4 +- plugins/Widgetize/Widgetize.php | 3 +- 392 files changed, 1199 insertions(+), 1137 deletions(-) delete mode 100644 plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler-urllistener.service.js delete mode 100644 plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler.controller.js delete mode 100644 plugins/CoreHome/angularjs/dialogtoggler/dialogtoggler.directive.js delete mode 100644 plugins/CoreHome/angularjs/dialogtoggler/ngdialog.less create mode 100644 plugins/CoreHome/javascripts/materialize-bc.js (limited to 'plugins') diff --git a/plugins/Actions/tests/UI/ActionsDataTable_spec.js b/plugins/Actions/tests/UI/ActionsDataTable_spec.js index bc4386281d..97d54c5a27 100644 --- a/plugins/Actions/tests/UI/ActionsDataTable_spec.js +++ b/plugins/Actions/tests/UI/ActionsDataTable_spec.js @@ -41,6 +41,7 @@ describe("ActionsDataTable", function () { await page.click('.dropdownConfigureIcon'); await page.mouse.move(-10, -10); const element = await page.$('.tableConfiguration'); + await page.waitFor(250); // rendering expect(await element.screenshot()).to.matchImage('configuration_options'); }); diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png index 6c754e41d8..c10bca3a54 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_column_sorted.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f6a68613b16f277108e9dbb619c62b7798f87c9cd3ebf4ac2d2ef991ce62cf1 -size 357737 +oid sha256:5de7b7a7a0fc1d720fcb234b608aa7a0e071fc8b9d8c504630f9808d562c30d5 +size 357699 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png index d184d5ddbf..3e49ef7c9f 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_exclude_low_population.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7759287c304992f1f842e66cf16b79a9d1ce8494c58827acfc5b2d0fe3533b39 -size 69427 +oid sha256:27d3f95e7b4ef8eb30bcaeb02fac72091c9e8b411b1e821f6b60ec89ea60219e +size 69377 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png index 097c9f57af..647c7e4c12 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:24dd7d66d2045aa9ea8614b6be895e46cee27a8d3d331467af2a4a752ed32fc6 -size 461742 +oid sha256:ca15bf66fe5f55da4cfcc223412fd8a8960d90f989f69a87fae086e415fb5663 +size 461698 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png index 320fb20ed5..492c9000c0 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_initial.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:11d1c3bd15893259ff59337bade8b1e1d54db4cbc7829f08f054a0e1e1eaf964 -size 357082 +oid sha256:716859abfcc15b35c194c33b2b1105b51a7d46fe6ae31bbbca9c87ac0a25b568 +size 357043 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png index bdf602bde6..30b07fbd20 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:746378ca200921bfeb1520e6e8f92022417d6fb7ff6ec022bffc22997d72c73d -size 58816 +oid sha256:9b3b19d0ab0c55875975ed00239caebbcbd07684bde88737a21dfe882a51a1f5 +size 58768 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png index af54ed0b8e..15713f218a 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:962880a9260b646a9175fa5863d940f9622d425e77d5621610cc63ea4aa0b949 -size 70619 +oid sha256:63b4e00beb89ff63ade5bb4a64cb86abeab9da8cb659ec092f0ae881330442ae +size 70564 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png index 791e62e87d..ef573c08bb 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_closed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b189a4cf9bae52784f96e556ba78af48e756644244ffc8a1e4c65f0f62df69ac -size 50980 +oid sha256:4a9c49e14f360db921b2f984ce05723e835759487735d8009b5d87296585f4cc +size 50939 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png index 849b20b551..00089871d6 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_search_visible.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6361d4f231068d7c50d80ad42affaea174f2b6f7147302cd7d8c20d412142e22 -size 56484 +oid sha256:4f016783248998f66b070b954c6d990b6752ce700078c4f36736ef912f57f9b3 +size 56427 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png index c80b646e0d..e3d26f3edf 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d3784d05437ee1d386d6bdfd55f44cfdaa2b0a5401152e137f29570c82c64b4e -size 381976 +oid sha256:2d222e160410b7993cb97985d8efcbdccb374805b255e62ba6fdb5395946b1eb +size 377585 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png index 9eec71f9c6..5a9cc1e341 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_segmented_visitor_log_hover.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f9a57f53cc739c6d7d12430f85e84f63e8eefb8ea5d1a98551b29d05f8021447 -size 63357 +oid sha256:865bff54679f89311a48de0c73776100bc98953f654e6ed5e93f5ddd47b072ad +size 63312 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png index 791e62e87d..ef573c08bb 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unflattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b189a4cf9bae52784f96e556ba78af48e756644244ffc8a1e4c65f0f62df69ac -size 50980 +oid sha256:4a9c49e14f360db921b2f984ce05723e835759487735d8009b5d87296585f4cc +size 50939 diff --git a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png index bdf602bde6..30b07fbd20 100644 --- a/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png +++ b/plugins/Actions/tests/UI/expected-screenshots/ActionsDataTable_unique_pageview_percentages.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:746378ca200921bfeb1520e6e8f92022417d6fb7ff6ec022bffc22997d72c73d -size 58816 +oid sha256:9b3b19d0ab0c55875975ed00239caebbcbd07684bde88737a21dfe882a51a1f5 +size 58768 diff --git a/plugins/Annotations/stylesheets/annotations.less b/plugins/Annotations/stylesheets/annotations.less index 74ede38ba3..ac958a811e 100644 --- a/plugins/Annotations/stylesheets/annotations.less +++ b/plugins/Annotations/stylesheets/annotations.less @@ -30,9 +30,6 @@ height: 145px; .input-field { margin-top: 2px; - .new-annotation-edit { - padding-bottom: 4px; - } } } @@ -41,11 +38,16 @@ .input-field { margin-top: 2px; - .annotation-edit { - padding-bottom: 4px; - } } } + + .input-field { + margin-bottom: 0; + input { + height: 1rem; + padding-bottom: 4px; + } + } } span.annotation { diff --git a/plugins/Annotations/templates/_annotation.twig b/plugins/Annotations/templates/_annotation.twig index c90e99a428..77f9f3304d 100644 --- a/plugins/Annotations/templates/_annotation.twig +++ b/plugins/Annotations/templates/_annotation.twig @@ -36,7 +36,7 @@ {% if annotation.canEditOrDelete %}