-
Notifications
You must be signed in to change notification settings - Fork 14
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #423 from matomo-org/PG-2903-ga-import-no-data-screen
Added GA import tab in no data screen
- Loading branch information
Showing
17 changed files
with
697 additions
and
66 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| {% if isGA3 %} | ||
| <div class="ga-import-warning" piwik-alert="warning" id="ga3WarningNotification"> | ||
| {{ 'GoogleAnalyticsImporter_ConfigureTheImporterHelp'|translate('<strong>', '</strong>')|raw }} | ||
| <button type="button" class="close" data-dismiss="alert"> × </button> | ||
| </div> | ||
| {% endif %} | ||
| <div class="right"> | ||
| <img src="plugins/GoogleAnalyticsImporter/images/google-analytics.png" style="height: 5rem;"> | ||
| </div> | ||
| <p>{{ 'GoogleAnalyticsImporter_NoDataScreenIntro'|translate }}</p> | ||
| <br> | ||
|
|
||
| {% if isConnectAccountsActivated %} | ||
| <p>{{ 'GoogleAnalyticsImporter_NoDataScreenOptionsDescription'|translate }}</p> | ||
| <br> | ||
| <ul class="list-style-decimal" id="manual-advance-option"> | ||
| <div vue-entry="ConnectAccounts.ConfigureConnection" manual-config-nonce="{{ nonce }}" | ||
| manual-forward-to-auth-nonce="{{ auth_nonce }}" | ||
| manual-action-url="{{ linkTo({'action': 'configureClient', 'module': 'GoogleAnalyticsImporter'}) }}" | ||
| manual-authorize-url="{{ linkTo({'action': 'forwardToAuth', 'module': 'GoogleAnalyticsImporter'}) }}" | ||
| manual-is-configured="{{ isConfigured|json_encode }}" | ||
| index-action-url="{{ linkTo({'action': 'index', 'module': 'GoogleAnalyticsImporter'}) }}" | ||
| primary-text="{{ 'GoogleAnalyticsImporter_ConfigureTheImporterLabel1'|translate }}" | ||
| radio-options="{{ radioOptions|json_encode|e('html_attr') }}" | ||
| manual-config-text="{{ manualUploadText|e('html_attr') }}" | ||
| connect-accounts-url="{{googleAuthUrl|e('html_attr')}}" | ||
| is-no-data-page="true" | ||
| has-client-configuration="{{ hasClientConfiguration|json_encode }}" | ||
| connect-accounts-btn-text="{{ 'ConnectAccounts_GaImportBtn' |translate}}" | ||
| strategy="{{ strategy|json_encode }}" | ||
| additional-help-text="{{ 'GoogleAnalyticsImporter_ConfigureTheImporterHelp'|translate('<strong>', '</strong>')|raw }}"></div> | ||
| </ul> | ||
| {% else %} | ||
| <p>{{ 'GoogleAnalyticsImporter_NoDataScreenFollowThisSteps'|translate }}</p> | ||
| <ul class="list-style-decimal" id="manual-option"> | ||
| <div vue-entry="GoogleAnalyticsImporter.ConfigureConnection" config-nonce="{{ nonce }}" | ||
| is-no-data-page="true" | ||
| is-configured="{{ isConfigured|json_encode }}" | ||
| has-client-configuration="{{ hasClientConfiguration|json_encode }}" | ||
| forward-to-auth-nonce="{{ auth_nonce }}" | ||
| index-action-url="{{ linkTo({'action': 'index', 'module': 'GoogleAnalyticsImporter'}) }}" | ||
| action-url="{{ linkTo({'action': 'configureClient', 'module': 'GoogleAnalyticsImporter'}) }}" | ||
| strategy="{{ strategy|json_encode }}" | ||
| authorize-url="{{ linkTo({'action': 'forwardToAuth', 'module': 'GoogleAnalyticsImporter'}) }}"></div> | ||
| </ul> | ||
| {% endif %} | ||
| <br> | ||
| <p>{{ 'GoogleAnalyticsImporter_NoDataScreenFollowStepComplete'|translate('<strong>', '</strong>', '<a href="'~ linkTo({'action': 'index', 'module': 'GoogleAnalyticsImporter'}) ~ '" target="_blank" rel="noreferrer noopener ">', '</a>')|raw }}</p> | ||
| <script> | ||
| $('body').on('click', '#ga3WarningNotification .close', function(){ | ||
| $('#ga3WarningNotification').hide(); | ||
| }); | ||
| </script> |
Oops, something went wrong.