diff options
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/Dashboard/stylesheets/widget.less | 9 | ||||
| -rw-r--r-- | plugins/Dashboard/templates/embeddedIndex.twig | 2 | ||||
| -rw-r--r-- | plugins/Login/FormLogin.php | 2 | ||||
| -rw-r--r-- | plugins/Login/FormResetPassword.php | 2 | ||||
| -rw-r--r-- | plugins/Login/lang/en.json | 2 | ||||
| -rw-r--r-- | plugins/Login/templates/login.twig | 8 | ||||
| -rw-r--r-- | plugins/SitesManager/SitesManager.php | 2 | ||||
| -rw-r--r-- | plugins/SitesManager/lang/en.json | 2 | ||||
| -rw-r--r-- | plugins/SitesManager/templates/help/excluded-ip-help.html | 2 | ||||
| -rw-r--r-- | plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml | 4 | ||||
| -rw-r--r-- | plugins/WebsiteMeasurable/MeasurableSettings.php | 2 | ||||
| -rw-r--r-- | plugins/Widgetize/templates/index.twig | 4 |
12 files changed, 23 insertions, 18 deletions
diff --git a/plugins/Dashboard/stylesheets/widget.less b/plugins/Dashboard/stylesheets/widget.less index 8e4f1b2211..7bf51ba107 100644 --- a/plugins/Dashboard/stylesheets/widget.less +++ b/plugins/Dashboard/stylesheets/widget.less @@ -53,10 +53,10 @@ float: right; } .buttons { + right: 8px; float: right; position: absolute; padding-left: 50px; - right: 8px; display: none; color: @theme-color-widget-title-text; background: -moz-linear-gradient(left, rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px); @@ -64,7 +64,7 @@ background: linear-gradient(to right, rgba(255,255,255,0) 0%, @theme-color-widget-title-background 45px); filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='@{theme-color-widget-title-background}',GradientType=1 ); } - + &:hover .buttons { display:block; } @@ -160,3 +160,8 @@ position: static; } } + + +.ui-dialog .widget .widgetTop .buttons { + right: 25px; +} diff --git a/plugins/Dashboard/templates/embeddedIndex.twig b/plugins/Dashboard/templates/embeddedIndex.twig index 77d6fe4bb3..2de7b7ae3e 100644 --- a/plugins/Dashboard/templates/embeddedIndex.twig +++ b/plugins/Dashboard/templates/embeddedIndex.twig @@ -63,7 +63,7 @@ <div class="col s12 m6"><input type="text" name="copyDashboardName" id="copyDashboardName" value=""/></div> </div> <div class="row"> - <div class="col s12 m6"><label for="copyDashboardUser">{{ 'General_Username'|translate }} </label></div> + <div class="col s12 m6"><label for="copyDashboardUser">{{ 'Login_LoginOrEmail'|translate }} </label></div> <div class="col s12 m6"><select class="browser-default" name="copyDashboardUser" id="copyDashboardUser"></select></div> </div> </div> diff --git a/plugins/Login/FormLogin.php b/plugins/Login/FormLogin.php index d7be8a900e..16213ab56b 100644 --- a/plugins/Login/FormLogin.php +++ b/plugins/Login/FormLogin.php @@ -25,7 +25,7 @@ class FormLogin extends QuickForm2 function init() { $this->addElement('text', 'form_login') - ->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Username'))); + ->addRule('required', Piwik::translate('General_Required', Piwik::translate('Login_LoginOrEmail'))); $this->addElement('password', 'form_password') ->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Password'))); diff --git a/plugins/Login/FormResetPassword.php b/plugins/Login/FormResetPassword.php index 66723d3c35..30eabcb963 100644 --- a/plugins/Login/FormResetPassword.php +++ b/plugins/Login/FormResetPassword.php @@ -24,7 +24,7 @@ class FormResetPassword extends QuickForm2 function init() { $this->addElement('text', 'form_login') - ->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Username'))); + ->addRule('required', Piwik::translate('General_Required', Piwik::translate('Login_LoginOrEmail'))); $password = $this->addElement('password', 'form_password'); $password->addRule('required', Piwik::translate('General_Required', Piwik::translate('General_Password'))); diff --git a/plugins/Login/lang/en.json b/plugins/Login/lang/en.json index 3508bcf89f..cfa860cee3 100644 --- a/plugins/Login/lang/en.json +++ b/plugins/Login/lang/en.json @@ -9,7 +9,7 @@ "InvalidOrExpiredToken": "Token is invalid or has expired.", "InvalidUsernameEmail": "Invalid username or e-mail address.", "LogIn": "Sign in", - "LoginOrEmail": "Username or E-mail", + "LoginOrEmail": "Username or Email", "LoginPasswordNotCorrect": "Wrong Username and password combination.", "LostYourPassword": "Lost your password?", "ChangeYourPassword": "Change your password", diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index 45fd7073bc..133d311452 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -80,7 +80,7 @@ <input type="text" name="form_login" placeholder="" id="login_form_login" class="input" value="" size="20" autocorrect="off" autocapitalize="none" tabindex="10" autofocus="autofocus"/> - <label for="login_form_login"><i class="icon-user icon"></i> {{ 'General_Username'|translate }}</label> + <label for="login_form_login"><i class="icon-user icon"></i> {{ 'Login_LoginOrEmail'|translate }}</label> </div> </div> @@ -135,7 +135,7 @@ <input type="text" placeholder="" name="form_login" id="reset_form_login" class="input" value="" size="20" autocorrect="off" autocapitalize="none" tabindex="10"/> - <label for="reset_form_login">{{ 'Login_LoginOrEmail'|translate }}</label> + <label for="reset_form_login"><i class="icon-user icon"></i> {{ 'Login_LoginOrEmail'|translate }}</label> </div> </div> <div class="row"> @@ -143,7 +143,7 @@ <input type="password" placeholder="" name="form_password" id="reset_form_password" class="input" value="" size="20" autocorrect="off" autocapitalize="none" tabindex="20" autocomplete="off"/> - <label for="reset_form_password">{{ 'Login_NewPassword'|translate }}</label> + <label for="reset_form_password"><i class="icon-locked icon"></i> {{ 'Login_NewPassword'|translate }}</label> </div> </div> <div class="row"> @@ -151,7 +151,7 @@ <input type="password" placeholder="" name="form_password_bis" id="reset_form_password_bis" class="input" value="" autocorrect="off" autocapitalize="none" size="20" tabindex="30" autocomplete="off"/> - <label for="reset_form_password_bis">{{ 'Login_NewPasswordRepeat'|translate }}</label> + <label for="reset_form_password_bis"><i class="icon-locked icon"></i> {{ 'Login_NewPasswordRepeat'|translate }}</label> </div> </div> diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index a588191901..c55d581e2c 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -308,7 +308,7 @@ class SitesManager extends \Piwik\Plugin $translationKeys[] = "SitesManager_OnlyMatchedUrlsAllowedHelp"; $translationKeys[] = "SitesManager_OnlyMatchedUrlsAllowedHelpExamples"; $translationKeys[] = "SitesManager_KeepURLFragmentsLong"; - $translationKeys[] = "SitesManager_HelpExcludedIps"; + $translationKeys[] = "SitesManager_HelpExcludedIpAddresses"; $translationKeys[] = "SitesManager_ListOfQueryParametersToExclude"; $translationKeys[] = "SitesManager_PiwikWillAutomaticallyExcludeCommonSessionParameters"; $translationKeys[] = "SitesManager_GlobalExcludedUserAgentHelp1"; diff --git a/plugins/SitesManager/lang/en.json b/plugins/SitesManager/lang/en.json index 3cb025fae2..d23e6c88d5 100644 --- a/plugins/SitesManager/lang/en.json +++ b/plugins/SitesManager/lang/en.json @@ -35,7 +35,7 @@ "GlobalListExcludedUserAgents_Desc": "If the visitor's user agent string contains any of the strings you specify, the visitor will be excluded from Matomo.", "GlobalSettings": "Global settings", "GlobalWebsitesSettings": "Global websites settings", - "HelpExcludedIps": "Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use wildcards, eg. %1$s or %2$s", + "HelpExcludedIpAddresses": "Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use CIDR notation eg. %1$s or you can use wildcards, eg. %2$s or %3$s", "JsTrackingTagHelp": "Here is the JavaScript Tracking code to include on all your pages", "KeepURLFragments": "Page URL fragments tracking", "KeepURLFragmentsHelp": "If the checkbox below is unchecked, Page URL fragments (everything after the %1$s) will be removed when tracking: %2$s will be tracked as %3$s", diff --git a/plugins/SitesManager/templates/help/excluded-ip-help.html b/plugins/SitesManager/templates/help/excluded-ip-help.html index 7bfa421d6f..df371f5473 100644 --- a/plugins/SitesManager/templates/help/excluded-ip-help.html +++ b/plugins/SitesManager/templates/help/excluded-ip-help.html @@ -1,5 +1,5 @@ <div> - {{ 'SitesManager_HelpExcludedIps' | translate : '1.2.3.*' : '1.2.*.*' }} + {{ 'SitesManager_HelpExcludedIpAddresses' | translate : '1.2.3.4/24' : '1.2.3.*' : '1.2.*.*' }} <br/><br/> diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml index 45ee7902c5..d9bfc97474 100644 --- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml +++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml @@ -78,7 +78,7 @@ </uiControlAttributes> <availableValues /> <description /> - <inlineHelp>Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use wildcards, eg. 1.2.3.* or 1.2.*.*<br /><br />Your current IP address is <i>127.0.0.1</i></inlineHelp> + <inlineHelp>Enter the list of IPs, one per line, that you wish to exclude from being tracked by Matomo. You can use CIDR notation eg. 1.2.3.4/24 or you can use wildcards, eg. 1.2.3.* or 1.2.*.*<br /><br />Your current IP address is <i>127.0.0.1</i></inlineHelp> <templateFile /> <introduction /> <condition /> @@ -241,4 +241,4 @@ </row> </settings> </row> -</result>
\ No newline at end of file +</result> diff --git a/plugins/WebsiteMeasurable/MeasurableSettings.php b/plugins/WebsiteMeasurable/MeasurableSettings.php index 7f3b5ce9c2..85a9ccb1f1 100644 --- a/plugins/WebsiteMeasurable/MeasurableSettings.php +++ b/plugins/WebsiteMeasurable/MeasurableSettings.php @@ -176,7 +176,7 @@ class MeasurableSettings extends \Piwik\Settings\Measurable\MeasurableSettings $ip = IP::getIpFromHeader(); $field->title = Piwik::translate('SitesManager_ExcludedIps'); - $field->inlineHelp = Piwik::translate('SitesManager_HelpExcludedIps', array('1.2.3.*', '1.2.*.*')) + $field->inlineHelp = Piwik::translate('SitesManager_HelpExcludedIpAddresses', array('1.2.3.4/24', '1.2.3.*', '1.2.*.*')) . '<br /><br />' . Piwik::translate('SitesManager_YourCurrentIpAddressIs', array('<i>' . $ip . '</i>')); $field->uiControl = FieldConfig::UI_CONTROL_TEXTAREA; diff --git a/plugins/Widgetize/templates/index.twig b/plugins/Widgetize/templates/index.twig index ae1591fd1f..80d77ee6af 100644 --- a/plugins/Widgetize/templates/index.twig +++ b/plugins/Widgetize/templates/index.twig @@ -14,7 +14,7 @@ <div class="widgetize" ng-controller="ExportWidgetController as exportWidget"> <div piwik-content-intro> <h2 piwik-enriched-headline>{{ title|e('html_attr') }}</h2> - <p>With Matomo, you can export your Web Analytics reports on your blog, website, or intranet dashboard... in one click.</p> + <p>With Matomo, you can <a rel="noreferrer" target="_blank" href="https://matomo.org/docs/embed-piwik-report/">export your Web Analytics reports</a> on your blog, website, or intranet dashboard... in one click.</p> </div> <div piwik-content-block content-title="Authentication"> <p> @@ -59,4 +59,4 @@ {% include "@Dashboard/_widgetFactoryTemplate.twig" %} -{% endblock %}
\ No newline at end of file +{% endblock %} |