diff options
| -rw-r--r-- | plugins/CoreAdminHome/stylesheets/generalSettings.less | 3 | ||||
| -rw-r--r-- | plugins/CoreAdminHome/templates/generalSettings.twig | 52 | ||||
| -rw-r--r-- | plugins/Morpheus/javascripts/morpheus.js | 8 | ||||
| -rw-r--r-- | plugins/Morpheus/stylesheets/forms.less | 24 | ||||
| -rw-r--r-- | plugins/PrivacyManager/templates/privacySettings.twig | 66 | ||||
| -rw-r--r-- | plugins/UsersManager/templates/userSettings.twig | 37 |
6 files changed, 104 insertions, 86 deletions
diff --git a/plugins/CoreAdminHome/stylesheets/generalSettings.less b/plugins/CoreAdminHome/stylesheets/generalSettings.less index 9b97ee18d6..98b3a02ee5 100644 --- a/plugins/CoreAdminHome/stylesheets/generalSettings.less +++ b/plugins/CoreAdminHome/stylesheets/generalSettings.less @@ -174,3 +174,6 @@ table.admin tbody td:hover, table.admin tbody th:hover { padding: 12px 24px; } +#useCustomLogo-0 { + margin-left:20px; +}
\ No newline at end of file diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index 1f231c4dad..f94e303c88 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -14,17 +14,14 @@ <td style="width:400px;">{{ 'General_AllowPiwikArchivingToTriggerBrowser'|translate }}</td> <td style="width:220px;"> <fieldset> - <label> - <input type="radio" value="1" name="enableBrowserTriggerArchiving"{% if enableBrowserTriggerArchiving==1 %} checked="checked"{% endif %} /> - {{ 'General_Yes'|translate }} <br/> - <span class="form-description">{{ 'General_Default'|translate }}</span> - </label><br/><br/> + <input id="enableBrowserTriggerArchiving-yes" type="radio" value="1" name="enableBrowserTriggerArchiving"{% if enableBrowserTriggerArchiving==1 %} checked="checked"{% endif %} /> + <label for="enableBrowserTriggerArchiving-yes">{{ 'General_Yes'|translate }}</label><br/> + <span class="form-description">{{ 'General_Default'|translate }}</span> + <br/><br/> - <label> - <input type="radio" value="0" name="enableBrowserTriggerArchiving"{% if enableBrowserTriggerArchiving==0 %} checked="checked"{% endif %} /> - {{ 'General_No'|translate }} <br/> - <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span> - </label> + <input id="enableBrowserTriggerArchiving-no" type="radio" value="0" name="enableBrowserTriggerArchiving"{% if enableBrowserTriggerArchiving==0 %} checked="checked"{% endif %} /> + <label for="enableBrowserTriggerArchiving-no">{{ 'General_No'|translate }}</label><br/> + <span class="form-description">{{ 'General_ArchivingTriggerDescription'|translate("<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>","</a>")|raw }}</span> </fieldset> <td> {% set browserArchivingHelp %} @@ -64,15 +61,14 @@ <td style="width:400px;">{{ 'CoreAdminHome_CheckReleaseGetVersion'|translate }}</td> <td style="width:220px;"> <fieldset> - <label><input type="radio" value="0" name="enableBetaReleaseCheck"{% if enableBetaReleaseCheck==0 %} checked="checked"{% endif %} /> - {{ 'CoreAdminHome_LatestStableRelease'|translate }} <br/> - <span class="form-description">{{ 'General_Recommended'|translate }}</span> - </label><br/><br/> + <input id="enableBetaReleaseCheck-0" type="radio" value="0" name="enableBetaReleaseCheck"{% if enableBetaReleaseCheck==0 %} checked="checked"{% endif %} /> + <label for="enableBetaReleaseCheck-0">{{ 'CoreAdminHome_LatestStableRelease'|translate }}</label><br/> + <span class="form-description">{{ 'General_Recommended'|translate }}</span> + <br/><br/> - <label><input type="radio" value="1" name="enableBetaReleaseCheck"{% if enableBetaReleaseCheck==1 %} checked="checked"{% endif %} /> - {{ 'CoreAdminHome_LatestBetaRelease'|translate }} <br/> - <span class="form-description">{{ 'CoreAdminHome_ForBetaTestersOnly'|translate }}</span> - </label> + <input id="enableBetaReleaseCheck-1" type="radio" value="1" name="enableBetaReleaseCheck"{% if enableBetaReleaseCheck==1 %} checked="checked"{% endif %} /> + <label for="enableBetaReleaseCheck-1">{{ 'CoreAdminHome_LatestBetaRelease'|translate }}</label><br/> + <span class="form-description">{{ 'CoreAdminHome_ForBetaTestersOnly'|translate }}</span> </fieldset> <td> {% set checkReleaseHelp %} @@ -92,9 +88,11 @@ <span class="form-description">{{ 'General_SelectYesIfYouWantToSendEmailsViaServer'|translate }}</span> </td> <td style="width:200px;"> - <label><input type="radio" name="mailUseSmtp" value="1" {% if mail.transport == 'smtp' %} checked {% endif %}/> {{ 'General_Yes'|translate }}</label> - <label><input type="radio" name="mailUseSmtp" value="0" - style="margin-left:20px;" {% if mail.transport == '' %} checked {% endif %}/> {{ 'General_No'|translate }}</label> + <input id="mailUseSmtp-1" type="radio" name="mailUseSmtp" value="1" {% if mail.transport == 'smtp' %} checked {% endif %}/> + <label for="mailUseSmtp-1">{{ 'General_Yes'|translate }}</label> + <input id="mailUseSmtp-0" type="radio" name="mailUseSmtp" value="0" + style="margin-left:20px;" {% if mail.transport == '' %} checked {% endif %}/> + <label for="mailUseSmtp-0">{{ 'General_No'|translate }}</label> </td> </tr> </table> @@ -193,14 +191,10 @@ <tr> <td style="width:200px;">{{ 'CoreAdminHome_UseCustomLogo'|translate }}</td> <td style="width:200px;"> - <label> - <input type="radio" name="useCustomLogo" value="1" {% if branding.use_custom_logo == 1 %} checked {% endif %}/> - {{ 'General_Yes'|translate }} - </label> - <label> - <input type="radio" name="useCustomLogo" value="0" style="margin-left:20px;" {% if branding.use_custom_logo == 0 %} checked {% endif %} /> - {{ 'General_No'|translate }} - </label> + <input id="useCustomLogo-1" type="radio" name="useCustomLogo" value="1" {% if branding.use_custom_logo == 1 %} checked {% endif %}/> + <label for="useCustomLogo-1">{{ 'General_Yes'|translate }}</label> + <input id="useCustomLogo-0" type="radio" name="useCustomLogo" value="0" {% if branding.use_custom_logo == 0 %} checked {% endif %} /> + <label for="useCustomLogo-0">{{ 'General_No'|translate }}</label> </td> <td> {% set giveUsFeedbackText %}"{{ 'General_GiveUsYourFeedback'|translate }}"{% endset %} diff --git a/plugins/Morpheus/javascripts/morpheus.js b/plugins/Morpheus/javascripts/morpheus.js index 5d54373708..daefbc3a34 100644 --- a/plugins/Morpheus/javascripts/morpheus.js +++ b/plugins/Morpheus/javascripts/morpheus.js @@ -1,10 +1,14 @@ $(document).ready(function () { - // datepicker actions crashed $('input').iCheck({ checkboxClass: 'form-checkbox', radioClass: 'form-radio', checkedClass: 'checked', hoverClass: 'form-hover', }); -}); + $('body').on('ifClicked', 'input', function () { + $(this).triggerHandler('click'); + }).on('ifChanged', 'input', function () { + $(this).triggerHandler('change'); + }); +});
\ No newline at end of file diff --git a/plugins/Morpheus/stylesheets/forms.less b/plugins/Morpheus/stylesheets/forms.less index f654ee21b5..4d90a14233 100644 --- a/plugins/Morpheus/stylesheets/forms.less +++ b/plugins/Morpheus/stylesheets/forms.less @@ -152,13 +152,30 @@ button[type="button"], .form-radio, .form-checkbox { height: 15px; width: 15px; - display: block; float: left; cursor: pointer; background: url('plugins/Morpheus/images/forms-sprite.png'); margin: 2px 5px 2px 0; } +.form-radio + label, .form-checkbox + label { + float:left; + display:inline-block; + + + br { + clear:both; + } + + + .form-radio, + .form-checkbox { + margin-left:32px; + } +} + +fieldset > .form-radio + label { // assumes <br/> after the label + display: inline-block; + margin-bottom: -.5em; +} + label { &.hover, &:hover { @@ -246,4 +263,7 @@ label { background-position: -205px 0; } - +// specific form control overrides +#useCustomLogo-0 { + margin:0; +}
\ No newline at end of file diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index f208067abb..8ce6cf6c5c 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -15,12 +15,10 @@ <span class="form-description">{{ 'PrivacyManager_AnonymizeIpDescription'|translate }}</span> </td> <td width='500'> - <label> - <input type="radio" name="anonymizeIPEnable" value="1" {% if anonymizeIP.enabled == '1' %}checked {% endif %}/> {{ 'General_Yes'|translate }} - </label> - <label> - <input type="radio" name="anonymizeIPEnable" value="0" style="margin-left:20px;" {% if anonymizeIP.enabled == '0' %} checked {% endif %}/> {{ 'General_No'|translate }} - </label> + <input id="anonymizeIPEnable-1" type="radio" name="anonymizeIPEnable" value="1" {% if anonymizeIP.enabled == '1' %}checked {% endif %}/> + <label for="anonymizeIPEnable-1">{{ 'General_Yes'|translate }}</label> + <input id="anonymizeIPEnable-0" type="radio" name="anonymizeIPEnable" value="0" style="margin-left:20px;" {% if anonymizeIP.enabled == '0' %} checked {% endif %}/> + <label for="anonymizeIPEnable-0">{{ 'General_No'|translate }}</label> <input type="hidden" name="token_auth" value="{{ token_auth }}"/> <input type="hidden" name="pluginName" value="{{ anonymizeIP.name }}"/> </td> @@ -37,14 +35,16 @@ <tr> <td width="250">{{ 'PrivacyManager_AnonymizeIpMaskLengtDescription'|translate }}</td> <td width="500"> - <label><input type="radio" name="maskLength" value="1" {% if anonymizeIP.maskLength == '1' %} - checked {% endif %}/> {{ 'PrivacyManager_AnonymizeIpMaskLength'|translate("1","192.168.100.xxx") }} - </label><br/> - <label><input type="radio" name="maskLength" value="2" {% if anonymizeIP.maskLength == '2' %} - checked {% endif %}/> {{ 'PrivacyManager_AnonymizeIpMaskLength'|translate("2","192.168.xxx.xxx") }} <span + <input id="maskLength-1" type="radio" name="maskLength" value="1" {% if anonymizeIP.maskLength == '1' %} + checked {% endif %}/> + <label for="maskLength-1">{{ 'PrivacyManager_AnonymizeIpMaskLength'|translate("1","192.168.100.xxx") }}</label><br/> + <input id="maskLength-2" type="radio" name="maskLength" value="2" {% if anonymizeIP.maskLength == '2' %} + checked {% endif %}/> + <label for="maskLength-2">{{ 'PrivacyManager_AnonymizeIpMaskLength'|translate("2","192.168.xxx.xxx") }} <span class="form-description">{{ 'General_Recommended'|translate }}</span></label><br/> - <label><input type="radio" name="maskLength" value="3" {% if anonymizeIP.maskLength == '3' %} - checked {% endif %}/> {{ 'PrivacyManager_AnonymizeIpMaskLength'|translate("3","192.xxx.xxx.xxx") }}</label> + <input id="maskLength-3" type="radio" name="maskLength" value="3" {% if anonymizeIP.maskLength == '3' %} + checked {% endif %}/> + <label for="maskLength-3">{{ 'PrivacyManager_AnonymizeIpMaskLength'|translate("3","192.xxx.xxx.xxx") }}</label> </td> <td width="200"> <div style="width:180px"> @@ -57,17 +57,14 @@ {{ 'PrivacyManager_UseAnonymizedIpForVisitEnrichment'|translate }} </td> <td width='500'> - <label> - <input type="radio" name="useAnonymizedIpForVisitEnrichment" value="1" {% if anonymizeIP.useAnonymizedIpForVisitEnrichment == '1' %}checked {% endif %}/> {{ 'General_Yes'|translate }} - - <span class="form-description"> - {{ 'PrivacyManager_RecommendedForPrivacy'|translate }} - </span> - </label> + <input id="useAnonymizedIpForVisitEnrichment-1" type="radio" name="useAnonymizedIpForVisitEnrichment" value="1" {% if anonymizeIP.useAnonymizedIpForVisitEnrichment == '1' %}checked {% endif %}/> + <label for="useAnonymizedIpForVisitEnrichment-1">{{ 'General_Yes'|translate }}</label> + <span class="form-description"> + {{ 'PrivacyManager_RecommendedForPrivacy'|translate }} + </span> <br/> - <label> - <input type="radio" name="useAnonymizedIpForVisitEnrichment" value="0" {% if anonymizeIP.useAnonymizedIpForVisitEnrichment == '0' %} checked {% endif %}/> {{ 'General_No'|translate }} - </label> + <input id="useAnonymizedIpForVisitEnrichment-2" type="radio" name="useAnonymizedIpForVisitEnrichment" value="0" {% if anonymizeIP.useAnonymizedIpForVisitEnrichment == '0' %} checked {% endif %}/> + <label for="useAnonymizedIpForVisitEnrichment-2">{{ 'General_No'|translate }}</label> </td> <td width="200"> <div style="width:180px"> @@ -109,12 +106,13 @@ </td> <td width='500'> - <label><input type="radio" name="deleteEnable" value="1" {% if deleteData.config.delete_logs_enable == '1' %} - checked {% endif %}/> {{ 'General_Yes'|translate }}</label> - <label><input type="radio" name="deleteEnable" value="0" + <input id="deleteEnable-1" type="radio" name="deleteEnable" value="1" {% if deleteData.config.delete_logs_enable == '1' %} + checked {% endif %}/> + <label for="deleteEnable-1">{{ 'General_Yes'|translate }}</label> + <input id="deleteEnable-2" type="radio" name="deleteEnable" value="0" style="margin-left:20px;" {% if deleteData.config.delete_logs_enable == '0' %} - checked {% endif %}/> {{ 'General_No'|translate }} - </label> + checked {% endif %}/> + <label for="deleteEnable-2">{{ 'General_No'|translate }}</label> <span id="privacyManagerDeleteLogDescription" style="margin-top: 10px;display:inline-block;"> {% set deleteLogDescription %} {{ 'PrivacyManager_DeleteLogDescription2'|translate|raw }} @@ -154,14 +152,10 @@ <td width="250">{{ 'PrivacyManager_UseDeleteReports'|translate }} </td> <td width="500"> - <label> - <input type="radio" name="deleteReportsEnable" value="1" {% if deleteData.config.delete_reports_enable == '1' %}checked="true"{% endif %} /> - {{ 'General_Yes'|translate }} - </label> - <label> - <input type="radio" name="deleteReportsEnable" value="0" {% if deleteData.config.delete_reports_enable == '0' %}checked="true"{% endif %} style="margin-left:20px;"/> - {{ 'General_No'|translate }} - </label> + <input id="deleteReportsEnable-1" type="radio" name="deleteReportsEnable" value="1" {% if deleteData.config.delete_reports_enable == '1' %}checked="true"{% endif %} /> + <label for="deleteReportsEnable-1">{{ 'General_Yes'|translate }}</label> + <input id="deleteReportsEnable-2" type="radio" name="deleteReportsEnable" value="0" {% if deleteData.config.delete_reports_enable == '0' %}checked="true"{% endif %} style="margin-left:20px;"/> + <label for="deleteReportsEnable-2">{{ 'General_No'|translate }}</label> {% set useDeleteLog %} {% set deleteOldLogs %}{{ 'PrivacyManager_UseDeleteLog'|translate }}{% endset %} diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index 21cf13cbec..af8a0ff71d 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -38,11 +38,12 @@ <td>{{ 'UsersManager_ReportToLoadByDefault'|translate }}</td> <td> <fieldset> - <label><input type="radio" value="MultiSites" - name="defaultReport"{% if defaultReport=='MultiSites' %} checked="checked"{% endif %} /> {{ 'General_AllWebsitesDashboard'|translate }}</label><br/> - <label style="padding-right:12px;"><input type="radio" value="1" - name="defaultReport"{% if defaultReport != 'MultiSites' %} checked="checked"{% endif %} /> {{ 'General_DashboardForASpecificWebsite'|translate }} - </label> + <input id="defaultReportRadioAll" type="radio" value="MultiSites" + name="defaultReport"{% if defaultReport=='MultiSites' %} checked="checked"{% endif %} /> + <label for="defaultReportRadioAll">{{ 'General_AllWebsitesDashboard'|translate }}</label><br/> + <input id="defaultReportSpecific" type="radio" value="1" + name="defaultReport"{% if defaultReport != 'MultiSites' %} checked="checked"{% endif %} /> + <label for="defaultReportSpecific" style="padding-right:12px;">{{ 'General_DashboardForASpecificWebsite'|translate }}</label> {% if defaultReport=='MultiSites' %} {% set defaultReportIdSite=1 %} {% else %} @@ -64,7 +65,8 @@ <td> <fieldset> {% for value,description in availableDefaultDates %} - <label><input type="radio"{% if defaultDate==value %} checked="checked"{% endif %} value="{{ value }}" name="defaultDate"/> {{ description }}</label> + <input id="defaultDate-{{ loop.index }}" type="radio"{% if defaultDate==value %} checked="checked"{% endif %} value="{{ value }}" name="defaultDate"/> + <label for="defaultDate-{{ loop.index }}">{{ description }}</label> <br/> {% endfor %} </fieldset> @@ -129,16 +131,16 @@ <td style="width:400px;">{{ 'UsersManager_WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess'|translate }}</td> <td> <fieldset> - <label><input type="radio" value="Login" - name="anonymousDefaultReport"{% if anonymousDefaultReport==loginModule %} checked="checked"{% endif %} /> {{ 'UsersManager_TheLoginScreen'|translate }} - </label><br/> - <label><input {% if anonymousSites is empty %}disabled="disabled" {% endif %}type="radio" value="MultiSites" - name="anonymousDefaultReport"{% if anonymousDefaultReport=='MultiSites' %} checked="checked"{% endif %} /> {{ 'General_AllWebsitesDashboard'|translate }} - </label><br/> + <input id="anonymousDefaultReport-login" type="radio" value="Login" + name="anonymousDefaultReport"{% if anonymousDefaultReport==loginModule %} checked="checked"{% endif %} /> + <label for="anonymousDefaultReport-login">{{ 'UsersManager_TheLoginScreen'|translate }}</label><br/> + <input id="anonymousDefaultReport-multisites" {% if anonymousSites is empty %}disabled="disabled" {% endif %}type="radio" value="MultiSites" + name="anonymousDefaultReport"{% if anonymousDefaultReport=='MultiSites' %} checked="checked"{% endif %} /> + <label for="anonymousDefaultReport-multisites">{{ 'General_AllWebsitesDashboard'|translate }}</label><br/> - <label><input {% if anonymousSites is empty %}disabled="disabled" {% endif %}type="radio" value="1" - name="anonymousDefaultReport"{% if anonymousDefaultReport>0 %} checked="checked"{% endif %} /> {{ 'General_DashboardForASpecificWebsite'|translate }} - </label> + <input id="anonymousDefaultReport-specific" {% if anonymousSites is empty %}disabled="disabled" {% endif %}type="radio" value="1" + name="anonymousDefaultReport"{% if anonymousDefaultReport>0 %} checked="checked"{% endif %} /> + <label for="anonymousDefaultReport-specific">{{ 'General_DashboardForASpecificWebsite'|translate }}</label> {% if anonymousSites is not empty %} <select id="anonymousDefaultReportWebsite"> {% for info in anonymousSites %} @@ -154,8 +156,9 @@ <td> <fieldset> {% for value,description in availableDefaultDates %} - <label><input type="radio" {% if anonymousDefaultDate==value %}checked="checked" {% endif %}value="{{ value }}" - name="anonymousDefaultDate"/> {{ description }}</label> + <input id="anonymousDefaultDate-{{ loop.index }}" type="radio" {% if anonymousDefaultDate==value %}checked="checked" {% endif %}value="{{ value }}" + name="anonymousDefaultDate"/> + <label for="anonymousDefaultDate-{{ loop.index }}">{{ description }}</label> <br/> {% endfor %} </fieldset> |