diff options
| author | sgiehl <stefan@piwik.org> | 2013-08-13 18:17:38 +0400 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2013-08-14 15:02:40 +0400 |
| commit | aa8b2f1f0e6d1bc9af62694448f33d125bf8141a (patch) | |
| tree | 60521bcc9cd425460de99661498e317d80f90893 | |
| parent | d6c007dd4e87b0250a5ee3b2d6b50ec6e755af0c (diff) | |
added missing ';' / use double quotes for attribute values instead of single quotes
58 files changed, 204 insertions, 204 deletions
diff --git a/plugins/Annotations/templates/_annotation.twig b/plugins/Annotations/templates/_annotation.twig index 54e21fd650..7af7f9409d 100755 --- a/plugins/Annotations/templates/_annotation.twig +++ b/plugins/Annotations/templates/_annotation.twig @@ -10,9 +10,9 @@ </div> <div class="annotation-period {% if annotation.canEditOrDelete %}annotation-enter-edit-mode{% endif %}">({{ annotation.date }})</div> {% if annotation.canEditOrDelete %} - <div class="annotation-period-edit" style="display:none"> + <div class="annotation-period-edit" style="display:none;"> <a href="#">{{ annotation.date }}</a> - <div class="datepicker" style="display:none"/> + <div class="datepicker" style="display:none;"/> </div> {% endif %} </td> @@ -25,7 +25,7 @@ {% endif %} </div> {% if annotation.canEditOrDelete %} - <div class="annotation-edit-mode" style="display:none"> + <div class="annotation-edit-mode" style="display:none;"> <input class="annotation-edit" type="text" value="{{ annotation.note|e('html') }}"/> <br/> <input class="annotation-save submit" type="button" value="{{ 'General_Save'|translate }}"/> @@ -37,7 +37,7 @@ <td class="annotation-user-cell"> <span class="annotation-user">{{ annotation.user }}</span><br/> {% if annotation.canEditOrDelete %} - <a href="#" class="delete-annotation" style="display:none" title="{{ 'Annotations_ClickToDelete'|translate }}">{{ 'General_Delete'|translate }}</a> + <a href="#" class="delete-annotation" style="display:none;" title="{{ 'Annotations_ClickToDelete'|translate }}">{{ 'General_Delete'|translate }}</a> {% endif %} </td> {% endif %} diff --git a/plugins/Annotations/templates/_annotationList.twig b/plugins/Annotations/templates/_annotationList.twig index f3820ab833..79f7f31c22 100755 --- a/plugins/Annotations/templates/_annotationList.twig +++ b/plugins/Annotations/templates/_annotationList.twig @@ -8,13 +8,13 @@ {% for annotation in annotations %} {% include "@Annotations/_annotation.twig" %} {% endfor %} - <tr class="new-annotation-row" style="display:none" data-date="{{ startDate }}"> + <tr class="new-annotation-row" style="display:none;" data-date="{{ startDate }}"> <td class="annotation-meta"> <div class="annotation-star"> </div> <div class="annotation-period-edit"> <a href="#">{{ startDate }}</a> - <div class="datepicker" style="display:none"/> + <div class="datepicker" style="display:none;"/> </div> </td> <td class="annotation-value"> diff --git a/plugins/Annotations/templates/getAnnotationManager.twig b/plugins/Annotations/templates/getAnnotationManager.twig index cea1d7e2ac..41da86fa90 100755 --- a/plugins/Annotations/templates/getAnnotationManager.twig +++ b/plugins/Annotations/templates/getAnnotationManager.twig @@ -12,7 +12,7 @@ <div class="annotation-list"> {% include "@Annotations/_annotationList.twig" %} - <span class="loadingPiwik" style="display:none"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span> + <span class="loadingPiwik" style="display:none;"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span> </div> diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig index a84e3f6901..0ea25ee729 100644 --- a/plugins/CoreAdminHome/templates/generalSettings.twig +++ b/plugins/CoreAdminHome/templates/generalSettings.twig @@ -12,8 +12,8 @@ {{ ajax.loadingDiv('ajaxLoading') }} <table class="adminTable" style='width:900px;'> <tr> - <td style='width:400px'>{{ 'General_AllowPiwikArchivingToTriggerBrowser'|translate }}</td> - <td style='width:220px'> + <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 %} /> @@ -62,8 +62,8 @@ </td> </tr> <tr> - <td style='width:400px'>{{ 'CoreAdminHome_CheckReleaseGetVersion'|translate }}</td> - <td style='width:220px'> + <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/> @@ -92,7 +92,7 @@ <td>{{ 'General_UseSMTPServerForEmail'|translate }}<br/> <span class="form-description">{{ 'General_SelectYesIfYouWantToSendEmailsViaServer'|translate }}</span> </td> - <td style='width:200px'> + <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> @@ -104,7 +104,7 @@ <table class="adminTable" style='width:550px;'> <tr> <td><label for="mailHost">{{ 'General_SmtpServerAddress'|translate }}</label></td> - <td style='width:200px'><input type="text" id="mailHost" value="{{ mail.host }}"></td> + <td style="width:200px;"><input type="text" id="mailHost" value="{{ mail.host }}"></td> </tr> <tr> <td><label for="mailPort">{{ 'General_SmtpPort'|translate }}</label><br/> @@ -163,7 +163,7 @@ {# untrusted host warning (display again) #} {% if isValidHost is defined and invalidHostMessage is defined and not isValidHost %} <div class="ajaxSuccess"> - <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"> + <a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"> <img src="plugins/Zeitgeist/images/help_grey.png"/> </a> <strong>{{ 'General_Warning'|translate }}: </strong>{{ invalidHostMessage }} @@ -176,8 +176,8 @@ <p>{{ 'CoreAdminHome_PiwikIsInstalledAt'|translate }}:</p> <table class="adminTable"> <tr> - <th style="width:250px">{{ 'CoreAdminHome_ValidPiwikHostname'|translate }}</th> - <th style="width:10px"> </th> + <th style="width:250px;">{{ 'CoreAdminHome_ValidPiwikHostname'|translate }}</th> + <th style="width:10px;"> </th> </tr> {% for hostIdx, host in trustedHosts %} <tr> @@ -196,10 +196,10 @@ <h2>{{ 'CoreAdminHome_BrandingSettings'|translate }}</h2> <div id='brandSettings'> {{ 'CoreAdminHome_CustomLogoHelpText'|translate }} - <table class="adminTable" style='width:600px;'> + <table class="adminTable" style="width:600px;"> <tr> <td>{{ 'CoreAdminHome_UseCustomLogo'|translate }}</td> - <td style='width:200px'> + <td style="width:200px;"> <label> <input type="radio" name="useCustomLogo" value="1" {% if branding.use_custom_logo == 1 %} checked {% endif %}/> {{ 'General_Yes'|translate }} @@ -227,7 +227,7 @@ <span class="form-description">{{ 'CoreAdminHome_LogoUploadDescription'|translate("JPG / PNG / GIF",110) }}</span> </label> </td> - <td style='width:200px'> + <td style="width:200px;"> <input name="customLogo" type="file" id="customLogo"/> <img src="misc/user/logo.png?r={math equation='rand(10,1000)'}" id="currentLogo" height="150"/> </td> diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig index f5a8ee7799..3c9c44d447 100644 --- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig +++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig @@ -32,7 +32,7 @@ <br/><br/><br/> </div> - <table id="optional-js-tracking-options" class="adminTable" style='width:1024px'> + <table id="optional-js-tracking-options" class="adminTable" style="width:1024px;"> <tr> <th>{{ 'General_Options'|translate }}</th> <th>{{ 'Mobile_Advanced'|translate }} @@ -77,7 +77,7 @@ </td> <td> - <div id="javascript-advanced-options" style="display:none"> + <div id="javascript-advanced-options" style="display:none;"> {# visitor custom variable #} <div class="custom-variable tracking-option-section" id="javascript-tracking-visitor-cv"> <input class="section-toggler-link" type="checkbox" id="javascript-tracking-visitor-cv-check" data-section-id="js-visitor-cv-extra"/> @@ -87,7 +87,7 @@ {{ 'CoreAdminHome_JSTracking_VisitorCustomVarsDesc'|translate }} </div> - <table style="display:none" id="js-visitor-cv-extra"> + <table style="display:none;" id="js-visitor-cv-extra"> <tr> <td><strong>{{ 'General_Name'|translate }}</strong></td> <td><input type="textbox" class="custom-variable-name" placeholder="e.g. Type"/></td> @@ -95,7 +95,7 @@ <td><input type="textbox" class="custom-variable-value" placeholder="e.g. Customer"/></td> </tr> <tr> - <td colspan="4" style="text-align:right"> + <td colspan="4" style="text-align:right;"> <a href="#" class="add-custom-variable">{{ 'General_Add'|translate }}</a> </td> </tr> @@ -111,7 +111,7 @@ {{ 'CoreAdminHome_JSTracking_PageCustomVarsDesc'|translate }} </div> - <table style="display:none" id="js-page-cv-extra"> + <table style="display:none;" id="js-page-cv-extra"> <tr> <td><strong>{{ 'General_Name'|translate }}</strong></td> <td><input type="textbox" class="custom-variable-name" placeholder="e.g. Category"/></td> @@ -119,7 +119,7 @@ <td><input type="textbox" class="custom-variable-value" placeholder="e.g. White Papers"/></td> </tr> <tr> - <td colspan="4" style="text-align:right"> + <td colspan="4" style="text-align:right;"> <a href="#" class="add-custom-variable">{{ 'General_Add'|translate }}</a> </td> </tr> @@ -151,7 +151,7 @@ {{ 'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc'|translate('<a href="http://piwik.org/faq/general/#faq_119" target="_blank">','</a>')|raw }} </div> - <table style="display:none" id="js-campaign-query-param-extra"> + <table style="display:none;" id="js-campaign-query-param-extra"> <tr> <td><strong>{{ 'CoreAdminHome_JSTracking_CampaignNameParam'|translate }}</strong></td> <td><input type="text" id="custom-campaign-name-query-param"/></td> @@ -219,13 +219,13 @@ </div> </td> <td> - <div id="image-tracker-advanced-options" style="display:none"> + <div id="image-tracker-advanced-options" style="display:none;"> {# goal #} <div class="goal-picker tracking-option-section"> <input class="section-toggler-link" type="checkbox" id="image-tracking-goal-check" data-section-id="image-goal-picker-extra"/> <label for="image-tracking-goal-check">{{ 'CoreAdminHome_TrackAGoal'|translate }}</label> - <div style="display:none" id="image-goal-picker-extra"> + <div style="display:none;" id="image-goal-picker-extra"> <select id="image-tracker-goal"> <option value="">{{ 'UserCountryMap_None'|translate }}</option> </select> diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig index 6cec9b77c2..fe37c8d982 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig @@ -22,7 +22,7 @@ {% endif %} {% if displayTable %} - <table style="border-collapse:collapse; margin-left: 5px"> + <table style="border-collapse:collapse; margin-left: 5px;"> <thead style="background-color: rgb({{ tableHeaderBgColor }}); color: rgb({{ tableHeaderTextColor }}); font-size: {{ reportTableHeaderTextSize }}pt;"> {% for columnName in reportColumns %} <th style="padding: 6px 0;"> @@ -74,7 +74,7 @@ </table> {% endif %} <br/> - <a style="text-decoration:none; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportBackToTopTextSize }}pt" href="#reportTop"> + <a style="text-decoration:none; color: rgb({{ reportTitleTextColor }}); font-size: {{ reportBackToTopTextSize }}pt;" href="#reportTop"> {{ 'PDFReports_TopOfReport'|translate }} </a> {% endif %} diff --git a/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig index 184d6fe56a..ef939fe3a1 100644 --- a/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig +++ b/plugins/CoreHome/templates/ReportsByDimension/_reportsByDimension.twig @@ -18,7 +18,7 @@ </div> <div style="float:left;max-width:900px;"> - <div class="loadingPiwik" style="display:none"> + <div class="loadingPiwik" style="display:none;"> <img src="plugins/Zeitgeist/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }} </div> diff --git a/plugins/CoreHome/templates/_dataTableFooter.twig b/plugins/CoreHome/templates/_dataTableFooter.twig index 44b776b31d..3a800944c9 100644 --- a/plugins/CoreHome/templates/_dataTableFooter.twig +++ b/plugins/CoreHome/templates/_dataTableFooter.twig @@ -22,7 +22,7 @@ {% endif %} </div> - <span class="loadingPiwik" style='display:none'><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> + <span class="loadingPiwik" style="display:none;"><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> {% if properties.show_footer_icons %} <div class="dataTableFooterIcons"> <div class="dataTableFooterWrap" var="{{ javascriptVariablesToSet.viewDataTable }}"> @@ -93,7 +93,7 @@ <img width="16" height="16" src="plugins/Zeitgeist/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/> </a> </span> - <span class="exportToFormatItems" style="display:none"> + <span class="exportToFormatItems" style="display:none;"> {{ 'General_Export'|translate }}: <a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="CSV" filter_limit="{{ properties.export_limit }}">CSV</a> | <a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="TSV" filter_limit="{{ properties.export_limit }}">TSV (Excel)</a> | @@ -171,6 +171,6 @@ </div> -<span class="loadingPiwikBelow" style='display:none'><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> +<span class="loadingPiwikBelow" style="display:none;"><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> <div class="dataTableSpacer"></div> diff --git a/plugins/CoreHome/templates/_donate.twig b/plugins/CoreHome/templates/_donate.twig index ad5ad8dee7..5209a579fc 100755 --- a/plugins/CoreHome/templates/_donate.twig +++ b/plugins/CoreHome/templates/_donate.twig @@ -23,7 +23,7 @@ <div class="slider-range"> <div class="slider-position"></div> </div> - <div style="display:inline-block"> + <div style="display:inline-block;"> <div class="slider-donate-amount">$30/{{ 'General_YearShort_js'|translate }}</div> <img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/images/smileyprog_1.png"/> @@ -41,11 +41,11 @@ </div> <!-- to cache images --> - <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_0.png"/> - <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_1.png"/> - <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_2.png"/> - <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_3.png"/> - <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_4.png"/> + <img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_0.png"/> + <img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_1.png"/> + <img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_2.png"/> + <img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_3.png"/> + <img style="display:none;" src="plugins/Zeitgeist/images/smileyprog_4.png"/> </form> {% if footerMessage is defined %} <div class="form-description"> diff --git a/plugins/CoreHome/templates/_headerMessage.twig b/plugins/CoreHome/templates/_headerMessage.twig index d0740661d8..9af3ab2703 100644 --- a/plugins/CoreHome/templates/_headerMessage.twig +++ b/plugins/CoreHome/templates/_headerMessage.twig @@ -41,7 +41,7 @@ {% if hasSomeAdminAccess %} <br/> <div id="updateCheckLinkContainer"> - <span class='loadingPiwik' style="display:none"><img src='plugins/Zeitgeist/images/loading-blue.gif'/></span> + <span class='loadingPiwik' style="display:none;"><img src='plugins/Zeitgeist/images/loading-blue.gif'/></span> <img src="plugins/Zeitgeist/images/reload.png"/> <a href="#" id="checkForUpdates"><em>{{ 'CoreHome_CheckForUpdates'|translate }}</em></a> </div> diff --git a/plugins/CoreHome/templates/_siteSelect.twig b/plugins/CoreHome/templates/_siteSelect.twig index 7d3072cddc..e6b900bb74 100644 --- a/plugins/CoreHome/templates/_siteSelect.twig +++ b/plugins/CoreHome/templates/_siteSelect.twig @@ -14,7 +14,7 @@ * - idSite The currently selected idSite. Defaults to the first id in $sites set by View. #} {% set sitesSelector_allWebsitesLink %} - <div class="custom_select_all" style="clear: both"> + <div class="custom_select_all" style="clear: both;"> <a href="#" {% if showAllSitesItem is defined and showAllSitesItem == false %}style="display:none;"{% endif %}> {% if allSitesItemText is defined %} {{ allSitesItemText }} @@ -40,7 +40,7 @@ <div class="custom_select_container"> <ul class="custom_select_ul_list"> {% for info in sites %} - <li {% if (showSelectedSite is not defined or showSelectedSite == false) and idSite == info.idsite %} style="display: none"{% endif %}> + <li {% if (showSelectedSite is not defined or showSelectedSite == false) and idSite == info.idsite %} style="display: none;"{% endif %}> <a href="#" siteid="{{ info.idsite }}">{{ info.name|raw }}</a> </li> {% endfor %} diff --git a/plugins/CoreHome/templates/_warningInvalidHost.twig b/plugins/CoreHome/templates/_warningInvalidHost.twig index 7868e936d7..8251874e27 100644 --- a/plugins/CoreHome/templates/_warningInvalidHost.twig +++ b/plugins/CoreHome/templates/_warningInvalidHost.twig @@ -1,7 +1,7 @@ {# untrusted host warning #} {% if (isValidHost is defined and invalidHostMessage is defined and isValidHost == false) %} - <div class="ajaxSuccess" style='clear:both;width:800px'> - <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/images/help_grey.png"/></a> + <div class="ajaxSuccess" style="clear:both;width:800px;"> + <a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/images/help_grey.png"/></a> <strong>{{ 'General_Warning'|translate }}: </strong>{{ invalidHostMessage }} </div> {% endif %} diff --git a/plugins/CoreHome/templates/getPromoVideo.twig b/plugins/CoreHome/templates/getPromoVideo.twig index c162f0bc95..b0aafb005e 100755 --- a/plugins/CoreHome/templates/getPromoVideo.twig +++ b/plugins/CoreHome/templates/getPromoVideo.twig @@ -4,7 +4,7 @@ <img src="plugins/Zeitgeist/images/video_play.png"/> </div> - <div id="piwik-promo-embed" style="display:none"> + <div id="piwik-promo-embed" style="display:none;"> </div> </div> @@ -31,7 +31,7 @@ </a> </div> - <div style="clear:both"></div> + <div style="clear:both;"></div> - <div id="piwik-widget-footer" style='color:#666'>{{ 'CoreHome_CloseWidgetDirections'|translate }}</div> + <div id="piwik-widget-footer" style="color:#666;">{{ 'CoreHome_CloseWidgetDirections'|translate }}</div> </div> diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig index cf6dd9ae2b..b289ce1292 100644 --- a/plugins/CoreUpdater/templates/layout.twig +++ b/plugins/CoreUpdater/templates/layout.twig @@ -26,7 +26,7 @@ <body id="simple"> <div id="contentsimple"> <div id="title"> - <img title='Piwik' alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png' style='margin-left:10px'/> + <img title='Piwik' alt="Piwik" src="plugins/Zeitgeist/images/logo-header.png" style="margin-left:10px;"/> <span id="subh1"> # {{ 'General_OpenSourceWebAnalytics'|translate }}</span> </div> {% block content %} diff --git a/plugins/CoreUpdater/templates/newVersionAvailable.twig b/plugins/CoreUpdater/templates/newVersionAvailable.twig index 00f2d14b3b..2e4bbb0761 100644 --- a/plugins/CoreUpdater/templates/newVersionAvailable.twig +++ b/plugins/CoreUpdater/templates/newVersionAvailable.twig @@ -19,12 +19,12 @@ <input type="hidden" name="action" value="oneClickUpdate"/> <input type="submit" class="submit" value="{{ 'CoreUpdater_UpdateAutomatically'|translate }}"/> {% endif %} - <a style="margin-left:50px" class="submit button" + <a style="margin-left:50px;" class="submit button" href="{{ piwik_latest_version_url }}?cb={{ piwik_new_version }}">{{ 'CoreUpdater_DownloadX'|translate(piwik_new_version) }}</a><br/> {% if can_auto_update %} </form> {% endif %} <br/> -<a href='index.php'>« {{ 'General_BackToPiwik'|translate }}</a> +<a href="index.php">« {{ 'General_BackToPiwik'|translate }}</a> {% endblock %} diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig index 190852d609..1c9bb686bd 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_done.twig @@ -50,7 +50,7 @@ {% if deactivatedPlugins is defined and deactivatedPlugins|length > 0 %} {% set listOfDeactivatedPlugins=deactivatedPlugins|join(', ') %} - <p style="color:red"> + <p style="color:red;"> <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }} </p> diff --git a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig index 243650b99e..99546054dc 100644 --- a/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig +++ b/plugins/CoreUpdater/templates/runUpdaterAndExit_welcome.twig @@ -2,7 +2,7 @@ {% block content %} {% spaceless %} -<span style="float:right">{{ postEvent('template_topBar')|raw }}</span> +<span style="float:right;">{{ postEvent('template_topBar')|raw }}</span> {% set helpMessage %} {{ 'CoreUpdater_HelpMessageContent'|translate('<a target="_blank" href="?module=Proxy&action=redirect&url=http://piwik.org/faq/">','</a>','</li><li>')|raw }} {% endset %} @@ -43,14 +43,14 @@ {% endif %} <ul> <li>{{ 'CoreUpdater_TheUpgradeProcessMayFailExecuteCommand'|translate(commandUpgradePiwik)|raw }}</li> - <li>It is also recommended for high traffic Piwik servers to <a target='_blank' + <li>It is also recommended for high traffic Piwik servers to <a target="_blank" href='?module=Proxy&action=redirect&url={{ "http://piwik.org/faq/how-to/#faq_111"|url_encode }}'>momentarily disable visitor Tracking and put the Piwik User Interface in maintenance mode</a>. </li> <li>{{ 'CoreUpdater_YouCouldManuallyExecuteSqlQueries'|translate }}<br/> - <a href='#' id='showSql' style='margin-left:20px'>› {{ 'CoreUpdater_ClickHereToViewSqlQueries'|translate }}</a> + <a href="#" id="showSql" style="margin-left:20px;">› {{ 'CoreUpdater_ClickHereToViewSqlQueries'|translate }}</a> - <div id='sqlQueries' style='display:none'> + <div id="sqlQueries" style="display:none;"> <br/> <code> # {{ 'CoreUpdater_NoteItIsExpectedThatQueriesFail'|translate }}<br/><br/> @@ -64,7 +64,7 @@ </ul> <br/> <br/> - <h4 id='titleUpdate'>{{ 'CoreUpdater_ReadyToGo'|translate }}</h4> + <h4 id="titleUpdate">{{ 'CoreUpdater_ReadyToGo'|translate }}</h4> <p>{{ 'CoreUpdater_TheUpgradeProcessMayTakeAWhilePleaseBePatient'|translate }}</p> {% endif %} diff --git a/plugins/CoreVisualizations/stylesheets/jqplot.css b/plugins/CoreVisualizations/stylesheets/jqplot.css index bd5dec8e59..5a55ba760d 100644 --- a/plugins/CoreVisualizations/stylesheets/jqplot.css +++ b/plugins/CoreVisualizations/stylesheets/jqplot.css @@ -77,7 +77,7 @@ .rowevolution { position: relative; overflow: hidden; - text-align: left + text-align: left; } .rowevolution h2 { diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig index a052c092e7..c4c0caf655 100755 --- a/plugins/DBStats/templates/index.twig +++ b/plugins/DBStats/templates/index.twig @@ -15,15 +15,15 @@ <tr> <td>{{ databaseUsageSummary|raw }}</td> <td> - <h3 style="margin-top:0">{{ 'General_GeneralInformation'|translate }}</h3><br/> + <h3 style="margin-top:0;">{{ 'General_GeneralInformation'|translate }}</h3><br/> - <p style="font-size:1.4em;padding-left:21px;line-height:1.8em"> + <p style="font-size:1.4em;padding-left:21px;line-height:1.8em;"> <strong><em>{{ userCount }}</em></strong> {% if userCount == 1 %}{{ 'UsersManager_User'|translate }}{% else %}{{ 'UsersManager_MenuUsers'|translate }}{% endif %} <br/> <strong><em>{{ siteCount }}</em></strong> {% if siteCount == 1 %}{{ 'General_Website'|translate }}{% else %}{{ 'Referers_Websites'|translate }}{% endif %} </p><br/> {% set clickDeleteLogSettings %}{{ 'PrivacyManager_DeleteDataSettings'|translate }}{% endset %} - <h3 style="margin-top:0">{{ 'PrivacyManager_DeleteDataSettings'|translate }}</h3><br/> + <h3 style="margin-top:0;">{{ 'PrivacyManager_DeleteDataSettings'|translate }}</h3><br/> <p> {{ 'PrivacyManager_DeleteDataDescription'|translate }} diff --git a/plugins/ExamplePlugin/templates/piwikDownloads.twig b/plugins/ExamplePlugin/templates/piwikDownloads.twig index 3a87d426aa..5cc89d065f 100644 --- a/plugins/ExamplePlugin/templates/piwikDownloads.twig +++ b/plugins/ExamplePlugin/templates/piwikDownloads.twig @@ -1,4 +1,4 @@ -<div style="padding:1.5em;text-align:center"> +<div style="padding:1.5em;text-align:center;"> {{ "ExamplePlugin_PiwikForumReceivedVisits"|translate(prettyDate,'<b class="piwikDownloadCount_cnt" >...</b>')|raw }} </div> {# diff --git a/plugins/Goals/templates/_addEditGoal.twig b/plugins/Goals/templates/_addEditGoal.twig index 7dee5612ae..759905538e 100644 --- a/plugins/Goals/templates/_addEditGoal.twig +++ b/plugins/Goals/templates/_addEditGoal.twig @@ -43,7 +43,7 @@ {% endif %} {% include "@Goals/_formAddGoal.twig" %} {% if onlyShowAddNewGoal is not defined %} - <div class='entityCancel' style='display:none'> + <div class='entityCancel' style='display:none;'> {{ 'General_OrCancel'|translate("<a class='entityCancelLink'>","</a>")|raw }} </div> {% endif %} diff --git a/plugins/Goals/templates/_formAddGoal.twig b/plugins/Goals/templates/_formAddGoal.twig index a8ac48b6aa..e3c94eb8b7 100644 --- a/plugins/Goals/templates/_formAddGoal.twig +++ b/plugins/Goals/templates/_formAddGoal.twig @@ -48,14 +48,14 @@ <div id="examples_pattern" class="entityInlineHelp"></div> <br/> - <span style="float:right"> + <span style="float:right;"> {{ 'Goals_Optional'|translate }} <input type="checkbox" id="case_sensitive"/> <label for="case_sensitive">{{ 'Goals_CaseSensitive'|translate }}</label> </span> </td> </tr> </tbody> - <tbody id="manual_trigger_section" style="display:none"> + <tbody id="manual_trigger_section" style="display:none;"> <tr> <td colspan="2" class="first"> {{ 'Goals_WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore'|translate("<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/javascript-tracking/%23toc-manually-trigger-a-conversion-for-a-goal'>","</a>")|raw }} diff --git a/plugins/Goals/templates/_titleAndEvolutionGraph.twig b/plugins/Goals/templates/_titleAndEvolutionGraph.twig index a30b33e424..83335f0f7b 100644 --- a/plugins/Goals/templates/_titleAndEvolutionGraph.twig +++ b/plugins/Goals/templates/_titleAndEvolutionGraph.twig @@ -5,7 +5,7 @@ {% endif %} {{ graphEvolution|raw }} -<div id='leftcolumn' {% if not isWidget %}style='width:33%'{% endif %}> +<div id='leftcolumn' {% if not isWidget %}style='width:33%;'{% endif %}> <div class="sparkline">{{ sparkline(urlSparklineConversions) }} {% if ecommerce is defined %} <strong>{{ nb_conversions }}</strong> @@ -37,7 +37,7 @@ {% endif %} </div> -<div id='leftcolumn' {% if not isWidget %}style='width:33%'{% endif %}> +<div id='leftcolumn' {% if not isWidget %}style='width:33%;'{% endif %}> <div class="sparkline">{{ sparkline(urlSparklineConversionRate) }} {% if ecommerce is defined %} {% set ecommerceOrdersText %}{{ 'General_EcommerceOrders'|translate }}{% endset %} @@ -52,7 +52,7 @@ {% endif %} </div> {% if ecommerce is defined %} - <div id='rightcolumn' {% if not isWidget %}style='width:30%'{% endif %}> + <div id='rightcolumn' {% if not isWidget %}style='width:30%;'{% endif %}> <div> <img src='plugins/Zeitgeist/images/ecommerceAbandonedCart.gif'> <i>{{ 'General_AbandonedCarts'|translate }}</i> </div> diff --git a/plugins/Installation/templates/_systemCheckLegend.twig b/plugins/Installation/templates/_systemCheckLegend.twig index 04e1c20edf..fdd8f7475a 100644 --- a/plugins/Installation/templates/_systemCheckLegend.twig +++ b/plugins/Installation/templates/_systemCheckLegend.twig @@ -4,9 +4,9 @@ <br/> <img src='plugins/Zeitgeist/images/warning.png'/> <span class="warn">{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}</span> <br/> - <img src='plugins/Zeitgeist/images/error.png'/> <span style="color:red;font-weight:bold">{{ 'General_Error'|translate }} + <img src='plugins/Zeitgeist/images/error.png'/> <span style="color:red;font-weight:bold;">{{ 'General_Error'|translate }} : {{ 'Installation_SystemCheckError'|translate }} </span><br/> - <img src='plugins/Zeitgeist/images/ok.png'/> <span style="color:#26981C;font-weight:bold">{{ 'General_Ok'|translate }}</span><br/> + <img src='plugins/Zeitgeist/images/ok.png'/> <span style="color:#26981C;font-weight:bold;">{{ 'General_Ok'|translate }}</span><br/> </small> </div> diff --git a/plugins/Installation/templates/_systemCheckSection.twig b/plugins/Installation/templates/_systemCheckSection.twig index 454f19579d..2675e2467b 100755 --- a/plugins/Installation/templates/_systemCheckSection.twig +++ b/plugins/Installation/templates/_systemCheckSection.twig @@ -110,7 +110,7 @@ {% if bool %} {{ ok }} {% else %} - <span style="color:red">{{ error }}</span> + <span style="color:red;">{{ error }}</span> {% endif %} {{ dir }} <br/> diff --git a/plugins/Installation/templates/databaseCheck.twig b/plugins/Installation/templates/databaseCheck.twig index a65be33046..e5c8e8bea8 100644 --- a/plugins/Installation/templates/databaseCheck.twig +++ b/plugins/Installation/templates/databaseCheck.twig @@ -21,7 +21,7 @@ <tr> <td colspan="2"> <small> - <span style="color:#FF7F00">{{ clientVersionWarning }}</span> + <span style="color:#FF7F00;">{{ clientVersionWarning }}</span> </small> </td> </tr> diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig index d7b8fb4ff5..63bf07cc0f 100644 --- a/plugins/Installation/templates/layout.twig +++ b/plugins/Installation/templates/layout.twig @@ -22,7 +22,7 @@ <img id="title" width='160' src="plugins/Zeitgeist/images/logo.png"/> <span id="subtitle"># {{ 'General_OpenSourceWebAnalytics'|translate }}</span> </div> - <div style="float:right" id="topRightBar"> + <div style="float:right;" id="topRightBar"> <br/> {{ postEvent('template_topBar')|raw }} </div> diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig index 51dbc46167..0cc06ae41d 100644 --- a/plugins/Installation/templates/systemCheck.twig +++ b/plugins/Installation/templates/systemCheck.twig @@ -3,7 +3,7 @@ {% block content %} {% if not showNextStep %} {% include "@Installation/_systemCheckLegend.twig" %} - <br style="clear:both"> + <br style="clear:both;"> {% endif %} <h3>{{ 'Installation_SystemCheck'|translate }}</h3> diff --git a/plugins/Installation/templates/systemCheckPage.twig b/plugins/Installation/templates/systemCheckPage.twig index 7739f7c72e..eea9ca86b9 100755 --- a/plugins/Installation/templates/systemCheckPage.twig +++ b/plugins/Installation/templates/systemCheckPage.twig @@ -3,15 +3,15 @@ {% block content %} {% if isSuperUser %} <h2>{{ 'Installation_SystemCheck'|translate }}</h2> - <p style="margin-left:1em"> + <p style="margin-left:1em;"> {% if infos.has_errors %} - <img src='plugins/Zeitgeist/images/error.png'/> + <img src="plugins/Zeitgeist/images/error.png"/> {{ 'Installation_SystemCheckSummaryThereWereErrors'|translate('<strong>','</strong>','<strong><em>','</em></strong>')|raw }} {{ 'Installation_SeeBelowForMoreInfo'|translate }} {% elseif infos.has_warnings %} - <img src='plugins/Zeitgeist/images/warning.png'/> + <img src="plugins/Zeitgeist/images/warning.png"/> {{ 'Installation_SystemCheckSummaryThereWereWarnings'|translate }} {{ 'Installation_SeeBelowForMoreInfo'|translate }} {% else %} - <img src='plugins/Zeitgeist/images/ok.png'/> + <img src="plugins/Zeitgeist/images/ok.png"/> {{ 'Installation_SystemCheckSummaryNoProblems'|translate }} {% endif %} </p> diff --git a/plugins/Installation/templates/tablesCreation.twig b/plugins/Installation/templates/tablesCreation.twig index dac4d26e11..e6ad3e174b 100644 --- a/plugins/Installation/templates/tablesCreation.twig +++ b/plugins/Installation/templates/tablesCreation.twig @@ -7,7 +7,7 @@ <div class="warning">{{ 'Installation_TablesWithSameNamesFound'|translate("<span id='linkToggle'>","</span>")|raw }} <img src="plugins/Zeitgeist/images/warning_medium.png"/> </div> - <div id="toggle" style="display:none;color:#4F2410"> + <div id="toggle" style="display:none;color:#4F2410;"> <small> <i>{{ 'Installation_TablesFound'|translate }}: <br/> {{ tablesInstalled }} </i> diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig index e643b9c2dd..2caf10b017 100644 --- a/plugins/Live/templates/_actionsList.twig +++ b/plugins/Live/templates/_actionsList.twig @@ -22,7 +22,7 @@ {% if action.type == 'ecommerceOrder' %} {% set visitorHasSomeEcommerceActivity %}1{% endset %} <strong>{{ 'Goals_EcommerceOrder'|translate }}</strong> - <span style='color:#666666'>({{ action.orderId }})</span> + <span style='color:#666;'>({{ action.orderId }})</span> {% else %} <strong>{{'Goals_AbandonedCart'|translate}}</strong> @@ -32,7 +32,7 @@ {% endif %} {% endif %} <p> - <span {% if not isWidget %}style='margin-left:20px'{% endif %}> + <span {% if not isWidget %}style='margin-left:20px;'{% endif %}> {% if action.type == 'ecommerceOrder' %} <abbr title=" {{ 'Live_GoalRevenue'|translate }}: {{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }} @@ -52,7 +52,7 @@ {# Ecommerce items in Cart/Order #} {% if action.itemDetails is not empty %} - <ul style='list-style:square;margin-left:{% if isWidget %}15{% else %}50{% endif %}px'> + <ul style='list-style:square;margin-left:{% if isWidget %}15{% else %}50{% endif %}px;'> {% for product in action.itemDetails %} <li> {{ product.itemSKU }}{% if product.itemName is not empty %}: {{ product.itemName }}{% endif %} diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig index 678757b7d6..1681bcbfd8 100644 --- a/plugins/Live/templates/getLastVisitsStart.twig +++ b/plugins/Live/templates/getLastVisitsStart.twig @@ -4,9 +4,9 @@ <ul id='visitsLive'> {% for visitor in visitors %} <li id="{{ visitor.idVisit }}" class="visit"> - <div style="display:none" class="idvisit">{{ visitor.idVisit }}</div> + <div style="display:none;" class="idvisit">{{ visitor.idVisit }}</div> <div title="{{ visitor.actionDetails|length }} {{ 'Live_Actions'|translate }}" class="datetime"> - <span style='display:none' class='serverTimestamp'>{{ visitor.serverTimestamp|raw }}</span> + <span style="display:none;" class="serverTimestamp">{{ visitor.serverTimestamp|raw }}</span> {{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<i>({{ visitor.visitDurationPretty|raw }})</i>{% endif %} <img src="{{ visitor.countryFlag }}" title="{{ visitor.location }}, {{ 'Provider_ColumnProvider'|translate }} {{ visitor.providerName }}"/> <img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}, {{ 'UserSettings_Plugins'|translate }}: {{ visitor.plugins }}"/> diff --git a/plugins/Live/templates/getVisitorLog.twig b/plugins/Live/templates/getVisitorLog.twig index 5ad2e59e00..29023245df 100644 --- a/plugins/Live/templates/getVisitorLog.twig +++ b/plugins/Live/templates/getVisitorLog.twig @@ -18,22 +18,22 @@ <table class="dataTable" cellspacing="0" width="100%" style="width:100%;"> <thead> <tr> - <th style="display:none"></th> - <th id="label" class="sortable label" style="cursor: auto;width:12%" width="12%"> + <th style="display:none;"></th> + <th id="label" class="sortable label" style="cursor: auto;width:12%;" width="12%"> <div id="thDIV">{{ 'General_Date'|translate }} <div> </th> {% if displayVisitorsInOwnColumn %} - <th id="label" class="sortable label" style="cursor: auto;width:13%" width="13%"> + <th id="label" class="sortable label" style="cursor: auto;width:13%;" width="13%"> <div id="thDIV">{{ 'General_Visitors'|translate }} <div> </th> {% endif %} - <th id="label" class="sortable label" style="cursor: auto;width:15%" width="15%"> + <th id="label" class="sortable label" style="cursor: auto;width:15%;" width="15%"> <div id="thDIV">{{ 'Live_Referrer_URL'|translate }} <div> </th> - <th id="label" class="sortable label" style="cursor: auto;width:62%" width="62%"> + <th id="label" class="sortable label" style="cursor: auto;width:62%;" width="62%"> <div id="thDIV">{{ 'General_ColumnNbActions'|translate }} <div> </th> @@ -68,7 +68,7 @@ {% if visitor.getColumn('visitConverted') %} <span title="{{ 'General_VisitConvertedNGoals'|translate(visitor.getColumn('goalConversions')) }}" class='visitorRank' - {% if not displayVisitorsInOwnColumn %}style='margin-left:0'{% endif %}> + {% if not displayVisitorsInOwnColumn %}style='margin-left:0;'{% endif %}> <img src="{{ visitor.getColumn('visitConvertedIcon') }}"/> <span class='hash'>#</span> {{ visitor.getColumn('goalConversions') }} @@ -94,7 +94,7 @@ <tr class="label{{ cycle(['odd','even'], cycleIndex) }}"> {% set cycleIndex=cycleIndex+1 %} <td style="display:none;"></td> - <td class="label" style="width:12%" width="12%"> + <td class="label" style="width:12%;" width="12%"> <strong title="{% if visitor.getColumn('visitorType')=='new' %}{{ 'General_NewVisitor'|translate }}{% else %}{{ 'Live_VisitorsLastVisit'|translate(visitor.getColumn('daysSinceLastVisit')) }}{% endif %}"> {{ visitor.getColumn('serverDatePrettyFirstAction') }} {% if isWidget %}<br/>{% else %}-{% endif %} {{ visitor.getColumn('serverTimePrettyFirstAction') }}</strong> @@ -132,12 +132,12 @@ </td> {% if displayVisitorsInOwnColumn %} - <td class="label" style="width:13%" width="13%"> + <td class="label" style="width:13%;" width="13%"> {{ visitorColumnContent }} </td> {% endif %} - <td class="column" style="width:20%" width="20%"> + <td class="column" style="width:20%;" width="20%"> <div class="referer"> {% if visitor.getColumn('referrerType') == 'website' %} {{ 'Referers_ColumnWebsite'|translate }}: @@ -175,7 +175,7 @@ {% if visitor.getColumn('referrerType') == 'direct' %}{{ 'Referers_DirectEntry'|translate }}{% endif %} </div> </td> - <td class="column {% if visitor.getColumn('visitConverted') and not isWidget %}highlightField{% endif %}" style="width:55%" width="55%"> + <td class="column {% if visitor.getColumn('visitConverted') and not isWidget %}highlightField{% endif %}" style="width:55%;" width="55%"> <strong> {{ visitor.getColumn('actionDetails')|length }} {% if visitor.getColumn('actionDetails')|length <= 1 %} diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index e31fe0137d..9f6aefd27a 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -10,7 +10,7 @@ <img src="plugins/Live/images/paperclip.png" alt=""/> </div> <div> - <h1>{{ 'Live_VisitorProfile'|translate }} <img class="loadingPiwik" style='display:none' src="plugins/Zeitgeist/images/loading-blue.gif"/></h1> + <h1>{{ 'Live_VisitorProfile'|translate }} <img class="loadingPiwik" style="display:none;" src="plugins/Zeitgeist/images/loading-blue.gif"/></h1> <div class="visitor-profile-latest-visit"> {% include "@Live/getSingleVisitSummary.twig" with {'visitData': visitorData.lastVisits.getFirstRow().getColumns()} %} </div> @@ -73,7 +73,7 @@ </ol> <br/> </div> - <div class="loadingPiwik" style='display:none'> + <div class="loadingPiwik" style="display:none;"> <div> <div> <img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }} diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index 7b1e37e7f7..91a9fffe0b 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -77,9 +77,9 @@ <strong>{{ 'General_Warning'|translate }}: </strong>{{ invalidHostMessage }} <br><br>{{ invalidHostMessageHowToFix }} - <br/><br/><a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" + <br/><br/><a style="float:right;" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank">{{ 'General_Help'|translate }} - <img style='vertical-align: bottom' src="plugins/Zeitgeist/images/help_grey.png"/></a><br/> + <img style="vertical-align: bottom;" src="plugins/Zeitgeist/images/help_grey.png"/></a><br/> </div> {% else %} <div id="message_container"> diff --git a/plugins/MobileMessaging/templates/index.twig b/plugins/MobileMessaging/templates/index.twig index 13583a42de..64a8abfdf9 100644 --- a/plugins/MobileMessaging/templates/index.twig +++ b/plugins/MobileMessaging/templates/index.twig @@ -55,35 +55,35 @@ <table style="width:900px;" class="adminTable"> <tbody> <tr> - <td style="width:480px"> + <td style="width:480px;"> <strong>{{ 'MobileMessaging_Settings_PhoneNumbers_Add'|translate }}</strong> <br/><br/> - <span id='suspiciousPhoneNumber' style='display:none;'> + <span id="suspiciousPhoneNumber" style="display:none;"> {{ 'MobileMessaging_Settings_SuspiciousPhoneNumber'|translate('54184032') }} <br/><br/> </span> - + <input id='countryCallingCode' size='4' maxlength='4'/> - <input id='newPhoneNumber'/> - <input type='submit' value='{{ 'MobileMessaging_Settings_AddPhoneNumber'|translate }}' - id='addPhoneNumberSubmit'/> + + <input id="countryCallingCode" size="4" maxlength="4"/> + <input id="newPhoneNumber"/> + <input type="submit" value='{{ 'MobileMessaging_Settings_AddPhoneNumber'|translate }}' + id="addPhoneNumberSubmit"/> <br/> <span style=' font-size: 11px;'><span class="form-description">{{ 'MobileMessaging_Settings_CountryCode'|translate }}</span> <span class="form-description" - style="margin-left:50px">{{ 'MobileMessaging_Settings_PhoneNumber'|translate }}</span></span> + style="margin-left:50px;">{{ 'MobileMessaging_Settings_PhoneNumber'|translate }}</span></span> <br/><br/> {{ 'MobileMessaging_Settings_PhoneNumbers_CountryCode_Help'|translate }} - <select id='countries'> + <select id="countries"> {# this is a trick to avoid selecting the first country when no default could be found #} - <option value=''> </option> + <option value=""> </option> {% for countryCode, country in countries %} <option value='{{ country.countryCallingCode }}' - {% if defaultCountry==countryCode %} selected='selected' {% endif %} + {% if defaultCountry==countryCode %} selected="selected" {% endif %} > {{ country.countryName }} </option> @@ -91,7 +91,7 @@ </select> </td> - <td style="width:220px"> + <td style="width:220px;"> {% import 'macros.twig' as piwik %} {{ piwik.inlineHelp(strHelpAddPhone) }} </td> @@ -154,8 +154,8 @@ <h2>{{ 'MobileMessaging_Settings_SuperAdmin'|translate }}</h2> <table class='adminTable' style='width:650px;'> <tr> - <td style='width:400px'>{{ 'MobileMessaging_Settings_LetUsersManageAPICredential'|translate }}</td> - <td style='width:250px'> + <td style="width:400px;">{{ 'MobileMessaging_Settings_LetUsersManageAPICredential'|translate }}</td> + <td style="width:250px;"> <fieldset> <label> <input diff --git a/plugins/MultiSites/templates/_siteRow.twig b/plugins/MultiSites/templates/_siteRow.twig index bd4ea54276..167761904f 100644 --- a/plugins/MultiSites/templates/_siteRow.twig +++ b/plugins/MultiSites/templates/_siteRow.twig @@ -1,7 +1,7 @@ <td class="multisites-label label"> <a title="View reports" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%">%name%</a> - <span style="width: 10px; margin-left:3px"> + <span style="width: 10px; margin-left:3px;"> <a target="_blank" title="{{ 'General_GoTo'|translate("%main_url%") }}" href="%main_url%"><img src="plugins/MultiSites/images/link.gif"/></a> </span> </td> @@ -17,16 +17,16 @@ </td> {% endif %} {% if period!='range' %} -<td style="width:170px"> - <div class="visits" style="display:none">%visitsSummary%</div> - <div class="pageviews" style="display:none">%pageviewsSummary%</div> +<td style="width:170px;"> + <div class="visits" style="display:none;">%visitsSummary%</div> + <div class="pageviews" style="display:none;">%pageviewsSummary%</div> {% if displayRevenueColumn %} - <div class="revenue" style="display:none">%revenueSummary%</div> + <div class="revenue" style="display:none;">%revenueSummary%</div> {% endif %} {% endif %} {% if show_sparklines %} - <td style="width:180px"> - <div id="sparkline_%idsite%" class="sparkline" style="width: 100px; margin: auto"> + <td style="width:180px;"> + <div id="sparkline_%idsite%" class="sparkline" style="width: 100px; margin: auto;"> <a target="_blank" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%" title="{% set dashboardName %}{{ 'Dashboard_DashboardOf'|translate('%name%') }}{% endset %} {{ 'General_GoTo'|translate(dashboardName) }}">%sparkline%</a> </div> diff --git a/plugins/MultiSites/templates/getSitesInfo.twig b/plugins/MultiSites/templates/getSitesInfo.twig index e704514a01..23c053a317 100644 --- a/plugins/MultiSites/templates/getSitesInfo.twig +++ b/plugins/MultiSites/templates/getSitesInfo.twig @@ -57,21 +57,21 @@ <span>{{ 'General_Website'|translate }}</span> <span class="arrow {% if evolutionBy=='names' %}multisites_{{ order }}{% endif %}"></span> </th> - <th id="visits" class="multisites-column" style="width: 100px" onClick="params = setOrderBy(this,allSites, params, 'visits');"> + <th id="visits" class="multisites-column" style="width: 100px;" onClick="params = setOrderBy(this,allSites, params, 'visits');"> <span>{{ 'General_ColumnNbVisits'|translate }}</span> <span class="arrow {% if evolutionBy=='visits' %}multisites_{{ order }}{% endif %}"></span> </th> - <th id="pageviews" class="multisites-column" style="width: 110px" onClick="params = setOrderBy(this,allSites, params, 'pageviews');"> + <th id="pageviews" class="multisites-column" style="width: 110px;" onClick="params = setOrderBy(this,allSites, params, 'pageviews');"> <span>{{ 'General_ColumnPageviews'|translate }}</span> <span class="arrow {% if evolutionBy=='pageviews' %}multisites_{{ order }}{% endif %}"></span> </th> {% if displayRevenueColumn %} - <th id="revenue" class="multisites-column" style="width: 110px" onClick="params = setOrderBy(this,allSites, params, 'revenue');"> + <th id="revenue" class="multisites-column" style="width: 110px;" onClick="params = setOrderBy(this,allSites, params, 'revenue');"> <span>{{ 'Goals_ColumnRevenue'|translate }}</span> <span class="arrow {% if evolutionBy=='revenue' %}multisites_{{ order }}{% endif %}"></span> </th> {% endif %} - <th id="evolution" style=" width:350px" colspan="{% if show_sparklines %}2{% else %}1{% endif %}"> + <th id="evolution" style=" width:350px;" colspan="{% if show_sparklines %}2{% else %}1{% endif %}"> <span class="arrow "></span> <span class="evolution" style="cursor:pointer;" onClick="params = setOrderBy(this,allSites, params, $('#evolution_selector').val() + 'Summary');"> {{ 'MultiSites_Evolution'|translate }}</span> @@ -93,7 +93,7 @@ <tfoot> {% if isSuperUser %} <tr> - <td colspan="8" class="clean" style="text-align: right; padding-top: 15px;padding-right:10px"> + <td colspan="8" class="clean" style="text-align: right; padding-top: 15px;padding-right:10px;"> <a href="{{ url }}&module=SitesManager&action=index&showaddsite=1"> <img src='plugins/UsersManager/images/add.png' alt="" style="margin: 0;"/> {{ 'SitesManager_AddSite'|translate }} </a> @@ -101,7 +101,7 @@ </tr> {% endif %} <tr row_id="last"> - <td colspan="8" class="clean" style="padding: 20px"> + <td colspan="8" class="clean" style="padding: 20px;"> <span id="prev" class="pager" style="padding-right: 20px;"></span> <span class="dataTablePages"> <span id="counter"> diff --git a/plugins/Overlay/stylesheets/overlay.css b/plugins/Overlay/stylesheets/overlay.css index fee597d845..df0e1f7283 100644 --- a/plugins/Overlay/stylesheets/overlay.css +++ b/plugins/Overlay/stylesheets/overlay.css @@ -126,7 +126,7 @@ a#Overlay_Transitions:hover { } h2.Overlay_MainMetrics { - background: url(../images/info.png) 0 1px no-repeat + background: url(../images/info.png) 0 1px no-repeat; } body .ui-tooltip.Overlay_Tooltip { @@ -135,7 +135,7 @@ body .ui-tooltip.Overlay_Tooltip { } #Overlay_NoFrame { - padding: 20px 0 40px 2px + padding: 20px 0 40px 2px; } #Overlay_Error_NotLoading { diff --git a/plugins/PDFReports/templates/_addReport.twig b/plugins/PDFReports/templates/_addReport.twig index 8f919e7562..f2040008c7 100644 --- a/plugins/PDFReports/templates/_addReport.twig +++ b/plugins/PDFReports/templates/_addReport.twig @@ -1,4 +1,4 @@ -<div class='entityAddContainer' style='display:none'> +<div class="entityAddContainer" style="display:none;"> <div class='entityCancel'> {{ 'PDFReports_CancelAndReturnToReports'|translate("<a class='entityCancelLink'>","</a>")|raw }} </div> @@ -13,7 +13,7 @@ <tbody> <tr> <td class="first">{{ 'General_Website'|translate }} </td> - <td style="width:650px"> + <td style="width:650px;"> {{ siteName }} </td> </tr> @@ -69,12 +69,12 @@ </td> </tr> - <tr {% if reportTypes|length == 1 %}style='display:none'{% endif %}> - <td class='first'> + <tr {% if reportTypes|length == 1 %}style="display:none;"{% endif %}> + <td class="first"> {{ 'PDFReports_ReportType'|translate }} </td> <td> - <select id='report_type'> + <select id="report_type"> {% for reportType, reportTypeIcon in reportTypes %} <option value="{{ reportType }}">{{ reportType|upper }}</option> {% endfor %} @@ -83,7 +83,7 @@ </tr> <tr> - <td class='first'> + <td class="first"> {{ 'PDFReports_ReportFormat'|translate }} </td> diff --git a/plugins/PDFReports/templates/_listReports.twig b/plugins/PDFReports/templates/_listReports.twig index 2e6668a9c9..57f0b6aa25 100644 --- a/plugins/PDFReports/templates/_listReports.twig +++ b/plugins/PDFReports/templates/_listReports.twig @@ -62,7 +62,7 @@ <br/> {% endfor %} {# send now link #} - <a href='#' idreport='{{ report.idreport }}' name='linkSendNow' class="link_but" style='margin-top:3px'> + <a href="#" idreport="{{ report.idreport }}" name="linkSendNow" class="link_but" style="margin-top:3px;"> <img border=0 src='{{ reportTypes[report.type] }}'/> {{ 'PDFReports_SendReportNow'|translate }} </a> diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig index 314dd8130f..b3d8fe706b 100644 --- a/plugins/PrivacyManager/templates/privacySettings.twig +++ b/plugins/PrivacyManager/templates/privacySettings.twig @@ -181,8 +181,8 @@ <td width="250">{{ 'PrivacyManager_ReportsDataSavedEstimate'|translate }}<br/></td> <td width="500"> <div id="deleteDataEstimate"></div> - <span class='loadingPiwik' style='display:none'><img - src='./plugins/Zeitgeist/images/loading-blue.gif'/> {{ 'General_LoadingData'|translate }}</span> + <span class="loadingPiwik" style="display:none;"><img + src="./plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span> </td> <td width="200"> {% if deleteData.config.enable_auto_database_size_estimate == '0' %} @@ -218,8 +218,8 @@ <br/> <br/> <em><a id="purgeDataNowLink" href="#">{{ 'PrivacyManager_PurgeNow'|translate }}</a></em> - <span class='loadingPiwik' style='display:none'><img - src='./plugins/Zeitgeist/images/loading-blue.gif'/> {{ 'PrivacyManager_PurgingData'|translate }}</span> + <span class="loadingPiwik" style="display:none;"><img + src="./plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'PrivacyManager_PurgingData'|translate }}</span> <span id="db-purged-message" style="display: none;"><em>{{ 'PrivacyManager_DBPurged'|translate }}</em></span> {% endset %} {{ piwik.inlineHelp(purgeStats) }} @@ -243,7 +243,7 @@ {{ 'PrivacyManager_DoNotTrack_Disabled'|translate }} {{ 'PrivacyManager_DoNotTrack_DisabledMoreInfo'|translate }} {% endif %} </p> - <span style='margin-left:20px'> + <span style="margin-left:20px;"> <a href='{{ {'module':'CorePluginsAdmin','token_auth':token_auth,'action':action,'pluginName':'DoNotTrack'} | urlRewriteWithParameters }}#DNT'>› {% if dntSupport %}{{ 'PrivacyManager_DoNotTrack_Disable'|translate }} {{ 'General_NotRecommended'|translate }} {% else %}{{ 'PrivacyManager_DoNotTrack_Enable'|translate }} {{ 'General_Recommended'|translate }}{% endif %} @@ -266,5 +266,5 @@ {{ 'CoreAdminHome_OptOutExplanationBis'|translate("<a href='" ~ optOutUrl ~ "' target='_blank'>","</a>")|raw }} </p> -<div style='height:100px'></div> +<div style="height:100px;"></div> {% endblock %} diff --git a/plugins/Referers/templates/index.twig b/plugins/Referers/templates/index.twig index b3bb76b9b0..0d7babbd6d 100644 --- a/plugins/Referers/templates/index.twig +++ b/plugins/Referers/templates/index.twig @@ -2,7 +2,7 @@ {{ graphEvolutionReferers|raw }} <br/> -<div id='leftcolumn' style="position:relative"> +<div id='leftcolumn' style="position:relative;"> <h2>{{ 'Referers_Type'|translate }}</h2> <div id='leftcolumn'> @@ -46,9 +46,9 @@ </div> </div> - <div style="clear:both"/> + <div style="clear:both;"/> - <div style="float:left"> + <div style="float:left;"> <br/> <h2>{{ 'General_MoreDetails'|translate }} @@ -56,7 +56,7 @@ </h2> </div> - <div id="distinctReferrersByType" style="display:none;float:left"> + <div id="distinctReferrersByType" style="display:none;float:left;"> <table cellpadding="15"> <tr> <td width="50%"> @@ -93,9 +93,9 @@ <br/> </div> - <p style="clear:both"/> + <p style="clear:both;"/> - <div style="float:left">{{ 'General_View'|translate }} + <div style="float:left;">{{ 'General_View'|translate }} <a href="javascript:broadcast.propagateAjax('module=Referers&action=getSearchEnginesAndKeywords')">{{ 'Referers_SubmenuSearchEngines'|translate }}</a>, <a href="javascript:broadcast.propagateAjax('module=Referers&action=indexWebsites')">{{ 'Referers_SubmenuWebsites'|translate }}</a>, <a href="javascript:broadcast.propagateAjax('module=Referers&action=indexCampaigns')">{{ 'Referers_SubmenuCampaigns'|translate }}</a>. diff --git a/plugins/SEO/templates/getRank.twig b/plugins/SEO/templates/getRank.twig index 8e0882c80b..427a252f6e 100644 --- a/plugins/SEO/templates/getRank.twig +++ b/plugins/SEO/templates/getRank.twig @@ -13,15 +13,15 @@ {% import "ajaxMacros.twig" as ajax %} {{ ajax.LoadingDiv('ajaxLoadingSEO') }} - <div id="rankStats" align="left" style='margin-top:10px'> + <div id="rankStats" align="left" style="margin-top:10px;"> {% if ranks is empty %} {{ 'General_Error'|translate }} {% else %} {% set cleanUrl %} - <a href='http://{{ urlToRank }}' target='_blank'>{{ urlToRank }}</a> + <a href="http://{{ urlToRank }}" target="_blank">{{ urlToRank }}</a> {% endset %} {{ 'SEO_SEORankingsFor'|translate(cleanUrl)|raw }} - <table cellspacing='2' style='margin:auto;line-height:1.5em;padding-top:10px'> + <table cellspacing="2" style="margin:auto;line-height:1.5em;padding-top:10px;"> {% for rank in ranks %} <tr> {% set seoLink %}{% if rank.logo_link is defined %}<a class="linkContent" href="?module=Proxy&action=redirect&url={{ rank.logo_link|url_encode }}" @@ -34,7 +34,7 @@ majesticLink})|raw }} </td> <td> - <div style='margin-left:15px'> + <div style="margin-left:15px;"> {% if rank.logo_link is defined %}{{ seoLink|raw }}{% endif %} {% if rank.rank %}{{ rank.rank|raw }}{% else %}-{% endif %} {% if rank.id=='pagerank' %} /10 diff --git a/plugins/SegmentEditor/templates/getSelector.twig b/plugins/SegmentEditor/templates/getSelector.twig index 1ca6f34414..7b899b350d 100644 --- a/plugins/SegmentEditor/templates/getSelector.twig +++ b/plugins/SegmentEditor/templates/getSelector.twig @@ -87,7 +87,7 @@ {% for category,segmentsInCategory in segmentsByCategory %} <li data="visit"> <a class="metric_category" href="#">{{ category }}</a> - <ul style="display:none"> + <ul style="display:none;"> {% for segmentInCategory in segmentsInCategory %} <li data-metric="{{ segmentInCategory.segment }}"><a class="ddmetric" href="#">{{ segmentInCategory.name }}</a></li> {% endfor %} diff --git a/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig b/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig index a4bb985c54..a4d6b1cd97 100644 --- a/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig +++ b/plugins/SitesManager/templates/displayAlternativeTagsHelp.twig @@ -2,7 +2,7 @@ The Image Tracker code can be used when Javascript is not allowed. <br/> -<div class='toggleHelp' id='imageTracker' style='display:none'> +<div class='toggleHelp' id='imageTracker' style='display:none;'> <a name='image'>› Display Image Tracker code </a> </div> @@ -39,8 +39,8 @@ The Image Tracker code can be used when Javascript is not allowed. <h3>Piwik Tracking API (Advanced users)</h3> It is also possible to call the Piwik Tracking API using your favorite programming language. <br/> -<div class='toggleHelp' id='trackingAPI' style='display:none'><a name='image'>› Display Piwik Tracking API documentation </a></div> -<div class='trackingAPI'> +<div class="toggleHelp" id="trackingAPI" style="display:none;"><a name="image">› Display Piwik Tracking API documentation </a></div> +<div class="trackingAPI"> <p> The Piwik Tracking API allows to trigger visits (page views and Goal conversions) from any environment (Desktop App, iPhone or Android app, Mobile website, etc.). diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig index c9cb0000d7..6dd623d7c3 100644 --- a/plugins/SitesManager/templates/index.twig +++ b/plugins/SitesManager/templates/index.twig @@ -143,7 +143,7 @@ <th>{{ 'SitesManager_ExcludedIps'|translate }}</th> <th>{{ 'SitesManager_ExcludedParameters'|translate|replace({" ":"<br />"})|raw }}</th> <th id='exclude-user-agent-header' - {% if not allowSiteSpecificUserAgentExclude %}style="display:none"{% endif %}>{{ 'SitesManager_ExcludedUserAgents'|translate }}</th> + {% if not allowSiteSpecificUserAgentExclude %}style="display:none;"{% endif %}>{{ 'SitesManager_ExcludedUserAgents'|translate }}</th> <th>{{ 'Actions_SubmenuSitesearch'|translate }}</th> <th>{{ 'SitesManager_Timezone'|translate }}</th> <th>{{ 'SitesManager_Currency'|translate }}</th> @@ -176,18 +176,18 @@ {%- endfor -%} </td> <td id="excludedUserAgents" class="editableSite" - {% if not allowSiteSpecificUserAgentExclude %}style="display:none"{% endif %}> + {% if not allowSiteSpecificUserAgentExclude %}style="display:none;"{% endif %}> {%- for ua in site.excluded_user_agents -%} {{- ua|raw -}}<br /> {%- endfor -%} </td> <td id="sitesearch" class="editableSite"> {% if site.sitesearch %} - <span class='sitesearchActive'>{{ 'General_Yes'|translate }}</span> + <span class="sitesearchActive">{{ 'General_Yes'|translate }}</span> {% else %} - <span class='sitesearchInactive'>-</span> + <span class="sitesearchInactive">-</span> {% endif %} - <span class='sskp' sitesearch_keyword_parameters="{{- site.sitesearch_keyword_parameters -}}" + <span class="sskp" sitesearch_keyword_parameters="{{- site.sitesearch_keyword_parameters -}}" sitesearch_category_parameters="{{- site.sitesearch_category_parameters -}}" id="sitesearch_parameters"> </span> @@ -243,7 +243,7 @@ <h2 id="globalSettings">{{ 'SitesManager_GlobalWebsitesSettings'|translate }}</h2> <br/> - <table style='width:600px' class="adminTable"> + <table style="width:600px;" class="adminTable"> <tr> <td colspan="2"> @@ -308,8 +308,8 @@ <label for="enableSiteUserAgentExclude"> {{ 'SitesManager_EnableSiteSpecificUserAgentExclude'|translate }} </label> - <span id='enableSiteUserAgentExclude-loading' class='loadingPiwik' style='display:none'> - <img src='plugins/Zeitgeist/images/loading-blue.gif'/> + <span id="enableSiteUserAgentExclude-loading" class="loadingPiwik" style="display:none;"> + <img src="plugins/Zeitgeist/images/loading-blue.gif"/> </span> </td> <td> @@ -338,7 +338,7 @@ <b id="globalSiteSearch">{{ 'SitesManager_TrackingSiteSearch'|translate }}</b> <p>{{ sitesearchIntro }}</p> - <span class="form-description" style='font-size:8pt'> + <span class="form-description" style="font-size:8pt;"> {{ 'SitesManager_SearchParametersNote'|translate }} {{ 'SitesManager_SearchParametersNote2'|translate }} </span> </td> @@ -408,7 +408,7 @@ </td> </tr> </table> - <span style="margin-left:20px"> + <span style="margin-left:20px;"> <input type="submit" class="submit" id='globalSettingsSubmit' value="{{ 'General_Save'|translate }}"/> </span> {{ ajax.errorDiv('ajaxErrorGlobalSettings') }} diff --git a/plugins/UserCountry/templates/_updaterManage.twig b/plugins/UserCountry/templates/_updaterManage.twig index 7ed533051a..23bf9eb97d 100755 --- a/plugins/UserCountry/templates/_updaterManage.twig +++ b/plugins/UserCountry/templates/_updaterManage.twig @@ -1,4 +1,4 @@ -<div id="geoipdb-update-info" {% if not geoIPDatabasesInstalled %}style="display:none"{% endif %}> +<div id="geoipdb-update-info" {% if not geoIPDatabasesInstalled %}style="display:none;"{% endif %}> <p>{{ 'UserCountry_GeoIPUpdaterInstructions'|translate('<a href="http://www.maxmind.com/en/download_files?rId=piwik" _target="blank">','</a>', '<a href="http://www.maxmind.com/?rId=piwik">','</a>')|raw }} <br/><br/> @@ -7,7 +7,7 @@ <br/><br/>{{ 'UserCountry_GeoIPUpdaterIntro'|translate }}: {% endif %} </p> - <table class="adminTable" style="width:900px"> + <table class="adminTable" style="width:900px;"> <tr> <th>{{ 'Live_GoalType'|translate }}</th> <th>{{ 'Actions_ColumnDownloadURL'|translate }}</th> @@ -53,13 +53,13 @@ </td> </tr> </table> - <p style="display:inline-block;vertical-align:top"> + <p style="display:inline-block;vertical-align:top;"> <input type="button" class="submit" value="{% if not geoIPDatabasesInstalled %}{{ 'General_Continue'|translate }}{% else %}{{ 'General_Save'|translate }}{% endif %}" id="update-geoip-links"/> </p> - <div style="display:inline-block;width:700px"> - <span style="display:none" class="ajaxSuccess" id="done-updating-updater">{{ 'General_Done'|translate }}!</span> - <span id="geoipdb-update-info-error" style="display:none" class="error"></span> - <div id="geoip-progressbar-container" style="display:none"> + <div style="display:inline-block;width:700px;"> + <span style="display:none;" class="ajaxSuccess" id="done-updating-updater">{{ 'General_Done'|translate }}!</span> + <span id="geoipdb-update-info-error" style="display:none;" class="error"></span> + <div id="geoip-progressbar-container" style="display:none;"> <div id="geoip-updater-progressbar"></div> <span id="geoip-updater-progressbar-label"></span> </div> diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig index 27e2fc5722..c06bd75619 100755 --- a/plugins/UserCountry/templates/adminIndex.twig +++ b/plugins/UserCountry/templates/adminIndex.twig @@ -6,14 +6,14 @@ <h2 id="location-providers">{{ 'UserCountry_Geolocation'|translate }}</h2> -<div style="width:900px"> +<div style="width:900px;"> <p>{{ 'UserCountry_GeolocationPageDesc'|translate }}</p> {% if not isThereWorkingProvider %} - <h3 style="margin-top:0">{{ 'UserCountry_HowToSetupGeoIP'|translate }}</h3> + <h3 style="margin-top:0;">{{ 'UserCountry_HowToSetupGeoIP'|translate }}</h3> <p>{{ 'UserCountry_HowToSetupGeoIPIntro'|translate }}</p> - <ul style="list-style:disc;margin-left:2em"> + <ul style="list-style:disc;margin-left:2em;"> <li>{{ 'UserCountry_HowToSetupGeoIP_Step1'|translate('<a href="http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz">','</a>','<a target="_blank" href="http://www.maxmind.com/?rId=piwik">','</a>')|raw }}</li> <li>{{ 'UserCountry_HowToSetupGeoIP_Step2'|translate("'GeoLiteCity.dat'",'<strong>','</strong>')|raw }}</li> <li>{{ 'UserCountry_HowToSetupGeoIP_Step3'|translate('<strong>','</strong>','<span style="color:green"><strong>','</strong></span>')|raw }}</li> @@ -35,8 +35,8 @@ <input class="location-provider" name="location-provider" value="{{ id }}" type="radio" {% if currentProviderId == id %}checked="checked"{% endif %} id="provider_input_{{ id }}" {% if provider.status != 1 %}disabled="disabled"{% endif %}/> <label for="provider_input_{{ id }}">{{ provider.title|translate }}</label><br/> - <span class='loadingPiwik' style='display:none'><img src='./plugins/Zeitgeist/images/loading-blue.gif'/></span> - <span class="ajaxSuccess" style='display:none'>{{ 'General_Done'|translate }}</span> + <span class="loadingPiwik" style="display:none;"><img src=""./plugins/Zeitgeist/images/loading-blue.gif"/></span> + <span class="ajaxSuccess" style="display:none;">{{ 'General_Done'|translate }}</span> </p> <p class="loc-provider-status"> @@ -64,9 +64,9 @@ {{ 'UserCountry_CurrentLocationIntro'|translate }}: <div style="text-align:left;"> <br/> - <span class='loadingPiwik' style='display:none;position:absolute'> - <img src='./plugins/Zeitgeist/images/loading-blue.gif'/> {{ 'General_Loading_js'|translate }}</span> - <span class='location'><strong><em>{{ provider.location }}</em></strong></span> + <span class="loadingPiwik" style="display:none;position:absolute;"> + <img src="./plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_Loading_js'|translate }}</span> + <span class="location"><strong><em>{{ provider.location }}</em></strong></span> </div> <div style="text-align:right;"> <a href="#" class="refresh-loc" data-impl-id="{{ id }}"><em>{{ 'Dashboard_Refresh_js'|translate }}</em></a> @@ -103,7 +103,7 @@ {% endif %} {% if showGeoIPUpdateSection %} - <div id="manage-geoip-dbs" style="width:900px" class="adminTable"> + <div id="manage-geoip-dbs" style="width:900px;" class="adminTable"> {% if not geoIPDatabasesInstalled %} <div id="geoipdb-screen1"> @@ -118,7 +118,7 @@ <input type="button" class="submit" value="{{ 'General_GetStarted'|translate }}..." id="start-automatic-update-geoip"/> </div> </div> - <div id="geoipdb-screen2-download" style="display:none"> + <div id="geoipdb-screen2-download" style="display:none;"> <p class='loadingPiwik'><img src='./plugins/Zeitgeist/images/loading-blue.gif'/> {{ 'UserCountry_DownloadingDb'|translate('<a href="'~geoLiteUrl~'">GeoLiteCity.dat</a>')|raw }}...</p> <div id="geoip-download-progress"></div> @@ -126,7 +126,7 @@ {% endif %} {% include "@UserCountry/_updaterManage.twig" %} {% else %} -<p style="width:900px" class="form-description">{{ 'UserCountry_CannotSetupGeoIPAutoUpdating'|translate }}</p> +<p style="width:900px;" class="form-description">{{ 'UserCountry_CannotSetupGeoIPAutoUpdating'|translate }}</p> {% endif %} </div> diff --git a/plugins/UserCountryMap/templates/realtimeMap.twig b/plugins/UserCountryMap/templates/realtimeMap.twig index 7642f8e05c..dbc0f96c5d 100644 --- a/plugins/UserCountryMap/templates/realtimeMap.twig +++ b/plugins/UserCountryMap/templates/realtimeMap.twig @@ -1,12 +1,12 @@ <div id="RealTimeMap" style="position:relative; overflow:hidden;"> <div id="RealTimeMap_container"> - <div id="RealTimeMap_map" style="overflow:hidden"></div> + <div id="RealTimeMap_map" style="overflow:hidden;"></div> <div class="realTimeMap_overlay"> - <span class="showing_visits_of" style="display:none">{{ 'UserCountryMap_ShowingVisits'|translate }} - <span class="realTimeMap_timeSpan" style="font-weight:bold"></span> + <span class="showing_visits_of" style="display:none;">{{ 'UserCountryMap_ShowingVisits'|translate }} + <span class="realTimeMap_timeSpan" style="font-weight:bold;"></span> </span> - <span class="no_data" style="display:none">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</span> + <span class="no_data" style="display:none;">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</span> <span class="loading_data">{{ 'General_LoadingData'|translate }}...</span> <img src="{{ piwikUrl }}plugins/UserCountryMap/images/realtimemap-loading.gif" style="vertical-align:baseline;position:relative;left:-2px;"> </div> diff --git a/plugins/UserCountryMap/templates/visitorMap.twig b/plugins/UserCountryMap/templates/visitorMap.twig index 45a2519138..be9c5e50e2 100644 --- a/plugins/UserCountryMap/templates/visitorMap.twig +++ b/plugins/UserCountryMap/templates/visitorMap.twig @@ -1,6 +1,6 @@ <div class="UserCountryMap" style="position:relative; overflow:hidden;"> <div class="UserCountryMap_container"> - <div class="UserCountryMap_map" style="overflow:hidden"></div> + <div class="UserCountryMap_map" style="overflow:hidden;"></div> <div class="UserCountryMap-overlay UserCountryMap-title"> <div class="content"> <!--<div class="map-title" style="font-weight:bold; color:#9A9386;"></div>--> @@ -44,22 +44,22 @@ <a var="tableAllColumns" class="UserCountryMap-btn-region tableIcon activeIcon" format="tableAllColumns" data-region="{{ 'UserCountryMap_Regions'|translate }}" data-country="{{ 'UserCountryMap_Countries'|translate }}"> <img src="{{ piwikUrl }}plugins/UserCountryMap/images/regions.png" title="Show visitors per region/country" /> - <span style="margin:0">{{ 'UserCountryMap_Countries'|translate }}</span> + <span style="margin:0;">{{ 'UserCountryMap_Countries'|translate }}</span> </a> <a var="tableGoals" class="UserCountryMap-btn-city tableIcon inactiveIco" format="tableGoals"> <img src="{{ piwikUrl }}plugins/UserCountryMap/images/cities.png" title="Show visitors per city" /> - <span style="margin:0">{{ 'UserCountryMap_Cities'|translate }}</span> + <span style="margin:0;">{{ 'UserCountryMap_Cities'|translate }}</span> </a> </span> </div> </div> - <select class="userCountryMapSelectMetrics" style="float:right;margin-right:0;margin-bottom:5px;max-width: 9em;font-size:10px"> + <select class="userCountryMapSelectMetrics" style="float:right;margin-right:0;margin-bottom:5px;max-width: 9em;font-size:10px;"> {% for metric in metrics %} <option value="{{ metric[0] }}" {% if metric[0] == defaultMetric %}selected="selected"{% endif %}}>{{ metric[1] }}</option> {% endfor %} </select> - <select class="userCountryMapSelectCountry" style="float:right;margin-right:5px;margin-bottom:5px; max-width: 9em;font-size:10px"> + <select class="userCountryMapSelectCountry" style="float:right;margin-right:5px;margin-bottom:5px; max-width: 9em;font-size:10px;"> <option value="world">{{ 'UserCountryMap_WorldWide'|translate }}</option> <option disabled="disabled">––––––</option> <option value="AF">{{ 'UserCountry_continent_afr'|translate }}</option> diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig index a90fe124b8..4a299430ce 100644 --- a/plugins/UsersManager/templates/index.twig +++ b/plugins/UsersManager/templates/index.twig @@ -28,9 +28,9 @@ {{ ajax.errorDiv }} {{ ajax.loadingDiv }} -<div class="entityContainer" style='width:600px'> +<div class="entityContainer" style="width:600px;"> {% if anonymousHasViewAccess %} - <div class="ajaxSuccess" style="display:inline-block"> + <div class="ajaxSuccess" style="display:inline-block;"> {{ 'UsersManager_AnonymousUserHasViewAccess'|translate("'anonymous'","'view'") }}<br/> {{ 'UsersManager_AnonymousUserHasViewAccess2'|translate }} </div> @@ -93,7 +93,7 @@ {% import 'ajaxMacros.twig' as ajax %} {{ ajax.errorDiv('ajaxErrorUsersManagement') }} {{ ajax.loadingDiv('ajaxLoadingUsersManagement') }} - <div class="entityContainer" style='margin-bottom:50px'> + <div class="entityContainer" style="margin-bottom:50px;"> <table class="entityTable dataTable" id="users"> <thead> <tr> diff --git a/plugins/UsersManager/templates/userSettings.twig b/plugins/UsersManager/templates/userSettings.twig index 4af206e6a7..7b1a211ff6 100644 --- a/plugins/UsersManager/templates/userSettings.twig +++ b/plugins/UsersManager/templates/userSettings.twig @@ -12,7 +12,7 @@ <input role="no" type="button" value="{{ 'General_No'|translate }}"/> </div> -<table id='userSettingsTable' class="adminTable" style='width:1050px'> +<table id='userSettingsTable' class="adminTable" style="width:1050px;"> <tr> <td><label for="username">{{ 'General_Username'|translate }} </label></td> <td> @@ -106,7 +106,7 @@ {{ 'UsersManager_YourVisitsAreNotIgnored'|translate("<strong>","</strong>")|raw }} {% endif %} </p> -<span style='margin-left:20px'> +<span style="margin-left:20px;"> <a href='{{ linkTo({'token_auth':token_auth, 'action':'setIgnoreCookie'}) }}#excludeCookie'>› {% if ignoreCookieSet %}{{ 'UsersManager_ClickHereToDeleteTheCookie'|translate }} {% else %}{{'UsersManager_ClickHereToSetTheCookieOnDomain'|translate(piwikHost) }}{% endif %} <br/> @@ -124,7 +124,7 @@ {{ ajax.loadingDiv('ajaxLoadingAnonymousUserSettings') }} <table id='anonymousUserSettingsTable' class="adminTable" style='width:850px;'> <tr> - <td style='width:400px'>{{ 'UsersManager_WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess'|translate }}</td> + <td style="width:400px;">{{ 'UsersManager_WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess'|translate }}</td> <td> <fieldset> <label><input type="radio" value="Login" diff --git a/plugins/Widgetize/templates/testJsInclude1.twig b/plugins/Widgetize/templates/testJsInclude1.twig index 95c4a3945c..f064807d3c 100644 --- a/plugins/Widgetize/templates/testJsInclude1.twig +++ b/plugins/Widgetize/templates/testJsInclude1.twig @@ -5,7 +5,7 @@ <h2>Test tag cloud in a JS include</h2> -<div style="width:500px"> +<div style="width:500px;"> <script type="text/javascript" src="{{ url1 }}"></script> <noscript>Powered by <a href="http://piwik.org">Piwik</a></noscript> </div> diff --git a/plugins/Zeitgeist/templates/admin.twig b/plugins/Zeitgeist/templates/admin.twig index ef0fca6029..fd4c1c5e5f 100644 --- a/plugins/Zeitgeist/templates/admin.twig +++ b/plugins/Zeitgeist/templates/admin.twig @@ -40,17 +40,17 @@ {% include "@CoreHome/_headerMessage.twig" %} {% if configFileNotWritable is defined and configFileNotWritable%} - <div class="ajaxSuccess" style="display:inline-block"> + <div class="ajaxSuccess" style="display:inline-block;"> {{ 'General_ConfigFileIsNotWritable'|translate("(config/config.ini.php)","<br/>")|raw }} </div> {% elseif false %} - <div class="ajaxSuccess" style="display:inline-block"> + <div class="ajaxSuccess" style="display:inline-block;"> {{ 'General_YourChangesHaveBeenSaved'|translate }} </div> {% endif %} {% if statisticsNotRecorded is defined and statisticsNotRecorded is not empty %} - <div class="ajaxSuccess" style="display:inline-block"> + <div class="ajaxSuccess" style="display:inline-block;"> {{ 'General_StatisticsAreNotRecorded'|translate }} </div> {% endif %} diff --git a/plugins/Zeitgeist/templates/ajaxMacros.twig b/plugins/Zeitgeist/templates/ajaxMacros.twig index 059892706b..7b0d8ff796 100644 --- a/plugins/Zeitgeist/templates/ajaxMacros.twig +++ b/plugins/Zeitgeist/templates/ajaxMacros.twig @@ -1,9 +1,9 @@ {% macro errorDiv(id) %} - <div class="ajaxError" id="{{ id }}" style="display:none"></div> + <div class="ajaxError" id="{{ id }}" style="display:none;"></div> {% endmacro %} {% macro loadingDiv(id='ajaxLoadingDiv') %} -<div id="{{ id }}" style="display:none"> +<div id="{{ id }}" style="display:none;"> <div class="loadingPiwik"> <img src="plugins/Zeitgeist/images/loading-blue.gif" alt="{{ 'General_LoadingData'|translate }}" />{{ 'General_LoadingData'|translate }} </div> diff --git a/plugins/Zeitgeist/templates/javascriptCode.tpl b/plugins/Zeitgeist/templates/javascriptCode.tpl index 4effa42276..eb5dc52dfd 100644 --- a/plugins/Zeitgeist/templates/javascriptCode.tpl +++ b/plugins/Zeitgeist/templates/javascriptCode.tpl @@ -12,5 +12,5 @@ })(); </script> -<noscript><p><img src="http://{$piwikUrl}piwik.php?idsite={$idSite}" style="border:0" alt="" /></p></noscript> +<noscript><p><img src="http://{$piwikUrl}piwik.php?idsite={$idSite}" style="border:0;" alt="" /></p></noscript> <!-- End Piwik Code --> diff --git a/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl b/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl index 8e58feb808..bd10070517 100644 --- a/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl +++ b/plugins/Zeitgeist/templates/simpleLayoutHeader.tpl @@ -8,4 +8,4 @@ </head> <body id="simple"> <div id="contentsimple"> - <div id="title"><img title='Piwik' alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png' style='margin-left:10px' /><span id="subh1"> # <a href='http://piwik.org/'>Web Analytics</a></span></div> + <div id="title"><img title="Piwik" alt="Piwik" src="plugins/Zeitgeist/images/logo-header.png" style="margin-left:10px;" /><span id="subh1"> # <a href='http://piwik.org/'>Web Analytics</a></span></div> |