diff options
author | Ben Burgess <88810029+bx80@users.noreply.github.com> | 2021-12-06 23:01:12 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-06 23:01:12 +0300 |
commit | 01a7b3718643953a40450dded2bc415687bc4939 (patch) | |
tree | aeeecf22a9bc48c39768ca152739574364072d44 /plugins/CoreAdminHome | |
parent | b7bfb36a3d37e4d056ab3f0355672b85f318f3d9 (diff) |
Added table of contents for general settings (#18404)
* Added table of contents for general settings
* Update UI test screenshots
* Fix UI tests
* Fix for wrapping issue, improved text formatting, fix missing core home settings
* Update submodule
Diffstat (limited to 'plugins/CoreAdminHome')
-rw-r--r-- | plugins/CoreAdminHome/stylesheets/generalSettings.less | 4 | ||||
-rw-r--r-- | plugins/CoreAdminHome/templates/generalSettings.twig | 31 |
2 files changed, 31 insertions, 4 deletions
diff --git a/plugins/CoreAdminHome/stylesheets/generalSettings.less b/plugins/CoreAdminHome/stylesheets/generalSettings.less index 869804124b..7f49ed7fea 100644 --- a/plugins/CoreAdminHome/stylesheets/generalSettings.less +++ b/plugins/CoreAdminHome/stylesheets/generalSettings.less @@ -13,6 +13,10 @@ display: none !important; } +#generalSettingsTOC a { + text-transform: none !important; +} + #content.admin { font-size: 13px; margin-top: 0; diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index b9c49bb4b7..86c66e1730 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -10,8 +10,28 @@ {{ ajax.errorDiv() }} {{ ajax.loadingDiv() }} + <div class="card generalSettingsTOCCard"> + <div id="generalSettingsTOC" class="card-action"> + {{ 'General_GoTo2'|translate }}: + {% if isGeneralSettingsAdminEnabled %} + <a href="#/archivingSettings">{{ 'CoreAdminHome_ArchivingSettings'|translate }}</a> + {% if not isMultiServerEnvironment %} + <a href="#/mailSettings">{{ 'CoreAdminHome_EmailServerSettings'|translate }}</a> + {% endif %} + {% endif %} + {% if customLogoEnabled %} + <a href="#/brandingSettings">{{ 'CoreAdminHome_BrandingSettings'|translate }}</a> + {% endif %} + {% if isDataPurgeSettingsEnabled %} + <a href="#/deleteDataSettings">{{ 'PrivacyManager_DeleteDataSettings'|translate }}</a> + {% endif %} + {{ postEvent('Template.endGeneralSettingsPageTableOfContents') }} + </div> + </div> + {% if isGeneralSettingsAdminEnabled %} - <div piwik-content-block content-title="{{ 'CoreAdminHome_ArchivingSettings'|translate|e('html_attr') }}"> + <div piwik-content-block content-title="{{ 'CoreAdminHome_ArchivingSettings'|translate|e('html_attr') }}" + anchor="archivingSettings"> <div ng-controller="ArchivingController as archivingSettings"> <div class="form-group row"> <h3 class="col s12">{{ 'General_AllowPiwikArchivingToTriggerBrowser'|translate }}</h3> @@ -81,7 +101,8 @@ </div> {% if not isMultiServerEnvironment %} - <div piwik-content-block content-title="{{ 'CoreAdminHome_EmailServerSettings'|translate|e('html_attr') }}"> + <div piwik-content-block content-title="{{ 'CoreAdminHome_EmailServerSettings'|translate|e('html_attr') }}" + anchor="mailSettings"> <div piwik-form ng-controller="MailSmtpController as mailSettings"> <div piwik-field uicontrol="checkbox" name="mailUseSmtp" @@ -164,7 +185,8 @@ {% endif %} {% if customLogoEnabled %} -<div piwik-content-block content-title="{{ 'CoreAdminHome_BrandingSettings'|translate|e('html_attr') }}"> +<div piwik-content-block content-title="{{ 'CoreAdminHome_BrandingSettings'|translate|e('html_attr') }}" + anchor="brandingSettings"> <div piwik-form ng-controller="BrandingController as brandingSettings"> @@ -242,7 +264,8 @@ {% endif %} {% if isDataPurgeSettingsEnabled %} - <div piwik-content-block content-title="{{ 'PrivacyManager_DeleteDataSettings'|translate|e('html_attr') }}"> + <div piwik-content-block content-title="{{ 'PrivacyManager_DeleteDataSettings'|translate|e('html_attr') }}" + anchor="deleteDataSettings"> <p>{{ 'PrivacyManager_DeleteDataDescription'|translate }}</p> <p> <a href='{{ linkTo({'module':"PrivacyManager", 'action':"privacySettings"}) }}#deleteLogsAnchor'> |