From 6061acc11ad8b79bac8edfb1b476fc967c688c05 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@gmail.com>
Date: Tue, 12 Nov 2013 01:39:58 +0000
Subject: [PATCH] refs #4256 updated inline help layout to be consistent with
notifications
---
.../stylesheets/generalSettings.less | 4 ----
.../CoreAdminHome/templates/generalSettings.twig | 16 +++++++++-------
.../CoreAdminHome/templates/pluginSettings.twig | 3 +--
.../templates/privacySettings.twig | 14 ++++++++++----
.../Zeitgeist/stylesheets/general/_jqueryUI.less | 16 +++++++++++-----
plugins/Zeitgeist/templates/macros.twig | 7 ++-----
6 files changed, 33 insertions(+), 27 deletions(-)
diff --git a/plugins/CoreAdminHome/stylesheets/generalSettings.less b/plugins/CoreAdminHome/stylesheets/generalSettings.less
index c372146971..9b97ee18d6 100644
--- a/plugins/CoreAdminHome/stylesheets/generalSettings.less
+++ b/plugins/CoreAdminHome/stylesheets/generalSettings.less
@@ -136,10 +136,6 @@ table.admin tbody td:hover, table.admin tbody th:hover {
width: 100%;
}
-#logoSettings .ui-inline-help {
- width: 550px;
-}
-
/* other styles */
.form-description {
color: #666666;
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index 7039ce798b..04bbf7b698 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -189,9 +189,9 @@
<h2>{{ 'CoreAdminHome_BrandingSettings'|translate }}</h2>
<div id='brandSettings'>
{{ 'CoreAdminHome_CustomLogoHelpText'|translate }}
- <table class="adminTable" style="width:600px;">
+ <table class="adminTable" style="width:900px;">
<tr>
- <td>{{ 'CoreAdminHome_UseCustomLogo'|translate }}</td>
+ <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 %}/>
@@ -202,15 +202,17 @@
{{ 'General_No'|translate }}
</label>
</td>
+ <td>
+ {% set giveUsFeedbackText %}"{{ 'General_GiveUsYourFeedback'|translate }}"{% endset %}
+ {% set customLogoHelp %}
+ {{ 'CoreAdminHome_CustomLogoFeedbackInfo'|translate(giveUsFeedbackText,"<a href='?module=CorePluginsAdmin&action=plugins' target='_blank'>","</a>")|raw }}
+ {% endset %}
+ {{ piwik.inlineHelp(customLogoHelp) }}
+ </td>
</tr>
</table>
</div>
<div id='logoSettings'>
- {% set giveUsFeedbackText %}"{{ 'General_GiveUsYourFeedback'|translate }}"{% endset %}
- {% set customLogoHelp %}
- {{ 'CoreAdminHome_CustomLogoFeedbackInfo'|translate(giveUsFeedbackText,"<a href='?module=CorePluginsAdmin&action=plugins' target='_blank'>","</a>")|raw }}
- {% endset %}
- {{ piwik.inlineHelp(customLogoHelp) }}
<form id="logoUploadForm" method="post" enctype="multipart/form-data" action="index.php?module=CoreAdminHome&format=json&action=uploadCustomLogo">
<table class="adminTable" style='width:550px;'>
<tr>
diff --git a/plugins/CoreAdminHome/templates/pluginSettings.twig b/plugins/CoreAdminHome/templates/pluginSettings.twig
index f5a9a69339..c42676c35c 100644
--- a/plugins/CoreAdminHome/templates/pluginSettings.twig
+++ b/plugins/CoreAdminHome/templates/pluginSettings.twig
@@ -146,8 +146,7 @@
<td class="columnHelp">
{% if setting.inlineHelp %}
<div class="ui-widget">
- <div class="ui-inline-help ui-state-highlight ui-corner-all">
- <span class="ui-icon ui-icon-info" style="float:left;margin-right:.3em;"></span>
+ <div class="ui-inline-help">
{{ setting.inlineHelp }}
</div>
</div>
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index 7cf4d73bf1..dc2753f6df 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -25,7 +25,9 @@
<input type="hidden" name="pluginName" value="{{ anonymizeIP.name }}"/>
</td>
<td width="200">
- {{ piwik.inlineHelp('AnonymizeIP_PluginDescription'|translate) }}
+ <div style="width:180px">
+ {{ piwik.inlineHelp('AnonymizeIP_PluginDescription'|translate) }}
+ </div>
</td>
</tr>
</table>
@@ -45,7 +47,9 @@
checked {% endif %}/> {{ 'PrivacyManager_AnonymizeIpMaskLength'|translate("3","192.xxx.xxx.xxx") }}</label>
</td>
<td width="200">
- {{ piwik.inlineHelp('PrivacyManager_GeolocationAnonymizeIpNote'|translate) }}
+ <div style="width:180px">
+ {{ piwik.inlineHelp('PrivacyManager_GeolocationAnonymizeIpNote'|translate) }}
+ </div>
</td>
</tr>
<tr>
@@ -66,7 +70,9 @@
</label>
</td>
<td width="200">
- {{ piwik.inlineHelp('PrivacyManager_UseAnonymizedIpForVisitEnrichmentNote'|translate) }}
+ <div style="width:180px">
+ {{ piwik.inlineHelp('PrivacyManager_UseAnonymizedIpForVisitEnrichmentNote'|translate) }}
+ </div>
</td>
</tr>
</table>
@@ -211,7 +217,7 @@
<td width="200">
{% if deleteData.config.enable_auto_database_size_estimate == '0' %}
{% set manualEstimate %}
- <em><a id="getPurgeEstimateLink" class="ui-inline-help" href="#">{{ 'PrivacyManager_GetPurgeEstimate'|translate }}</a></em>
+ <em><a id="getPurgeEstimateLink" style="width:280px" class="ui-inline-help" href="#">{{ 'PrivacyManager_GetPurgeEstimate'|translate }}</a></em>
{% endset %}
{{ piwik.inlineHelp(manualEstimate) }}
{% endif %}
diff --git a/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less b/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
index ea0820c28b..172f13f208 100644
--- a/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
+++ b/plugins/Zeitgeist/stylesheets/general/_jqueryUI.less
@@ -51,11 +51,17 @@
}
.ui-inline-help {
- padding: 0.7em;
- width: 170px;
- margin-top: 20px;
- font-size: 8pt;
- line-height: 140%;
+ display: inline-block;
+ background-color: #f4f8fa;
+ margin: 0px;
+ font-size: 12px;
+ padding: 20px;
+ color: #3a87ad;
+ opacity: 1.0;
+ border-left: 1px solid #bce8f1;
+ text-align: justify;
+ line-height: 1.3em;
+ max-width: 550px;
}
div.ui-state-highlight {
diff --git a/plugins/Zeitgeist/templates/macros.twig b/plugins/Zeitgeist/templates/macros.twig
index fe24be5b0c..6a3b2e58b6 100644
--- a/plugins/Zeitgeist/templates/macros.twig
+++ b/plugins/Zeitgeist/templates/macros.twig
@@ -17,10 +17,7 @@
{% endmacro %}
{% macro inlineHelp(text) %}
- <div class="ui-widget">
- <div class="ui-inline-help ui-state-highlight ui-corner-all">
- <span class="ui-icon ui-icon-info" style="float:left;margin-right:.3em;"></span>
- {{ text|raw }}
- </div>
+ <div class="ui-inline-help" >
+ {{ text|raw }}
</div>
{% endmacro %}
\ No newline at end of file
--
GitLab