Merge remote-tracking branch 'origin/master'

7 files changed, 48 insertions, 25 deletions

diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
index 9c8b33989c..f31aa7e869 100644
--- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
+++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less
@@ -18,6 +18,7 @@
 
   td.highlight .ratio {
     display: inline-block;
+    line-height: 15px;
   }
 }
 
diff --git a/plugins/CoreVisualizations/Visualizations/Graph.php b/plugins/CoreVisualizations/Visualizations/Graph.php
index f6569ae1e6..751176eb7b 100644
--- a/plugins/CoreVisualizations/Visualizations/Graph.php
+++ b/plugins/CoreVisualizations/Visualizations/Graph.php
@@ -130,14 +130,8 @@ abstract class Graph extends Visualization
             }
         }
 
-        $availableColumns = $this->dataTable->getColumns();
-
         $transformed = array();
         foreach ($selectableColumns as $column) {
-            if (!in_array($column, $availableColumns)) {
-                continue;
-            }
-
             $transformed[] = array(
                 'column'      => $column,
                 'translation' => @$this->config->translations[$column],
diff --git a/plugins/Morpheus/stylesheets/admin.less b/plugins/Morpheus/stylesheets/admin.less
index 213915560c..54e1d23281 100644
--- a/plugins/Morpheus/stylesheets/admin.less
+++ b/plugins/Morpheus/stylesheets/admin.less
@@ -39,6 +39,9 @@
         .font-default(18px, 24px);
         font-weight: normal;
     }
+    a:hover {
+        text-decoration:underline;
+    }
 }
 
 .ui-state-highlight {
diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less
index bf3c1f9b67..b393080227 100644
--- a/plugins/Morpheus/stylesheets/theme.less
+++ b/plugins/Morpheus/stylesheets/theme.less
@@ -85,6 +85,10 @@ body {
     }
 }
 
+table.entityTable tr td a:hover {
+    text-decoration: underline !important;
+}
+
 #root {
     margin: 0;
     padding: 0;
@@ -771,4 +775,18 @@ div.sparkline {
 
 tr:hover #token_auth {
   background: #FFFFF7;
+}
+
+table#users {
+    .deleteuser:hover > span,
+    .edituser:hover > span {
+        text-decoration:underline;
+    }
+}
+
+table#editSites {
+    .editSite:hover > span,
+    .deleteSite:hover > span {
+        text-decoration:underline;
+    }
 }
\ No newline at end of file
diff --git a/plugins/PrivacyManager/templates/privacySettings.twig b/plugins/PrivacyManager/templates/privacySettings.twig
index ba6a9bd2a5..5080c5d509 100644
--- a/plugins/PrivacyManager/templates/privacySettings.twig
+++ b/plugins/PrivacyManager/templates/privacySettings.twig
@@ -181,26 +181,33 @@
                         {{ 'CoreHome_PeriodMonths'|translate }}
                     </label><br/>
                     <span class="form-description">{{ 'PrivacyManager_LeastMonthsInput'|translate("3") }}</span><br/><br/>
-                    <label><input type="checkbox" name="deleteReportsKeepBasic" value="1"
-                                  {% if deleteData.config.delete_reports_keep_basic_metrics %}checked="true"{% endif %}>{{ 'PrivacyManager_KeepBasicMetrics'|translate }}
+                    <input id="deleteReportsKeepBasic" type="checkbox" name="deleteReportsKeepBasic" value="1"
+                                  {% if deleteData.config.delete_reports_keep_basic_metrics %}checked="true"{% endif %}>
+                    <label for="deleteReportsKeepBasic">{{ 'PrivacyManager_KeepBasicMetrics'|translate }}
                         <span class="form-description">{{ 'General_Recommended'|translate }}</span>
                     </label><br/><br/>
-                    {{ 'PrivacyManager_KeepDataFor'|translate }}<br/>
-                    <label><input type="checkbox" name="deleteReportsKeepDay" value="1"
-                                  {% if deleteData.config.delete_reports_keep_day_reports %}checked="true"{% endif %}>{{ 'General_DailyReports'|translate }}</label><br/>
-                    <label><input type="checkbox" name="deleteReportsKeepWeek" value="1"
-                                  {% if deleteData.config.delete_reports_keep_week_reports %}checked="true"{% endif %}>{{ 'General_WeeklyReports'|translate }}</label><br/>
-                    <label><input type="checkbox" name="deleteReportsKeepMonth" value="1"
-                                  {% if deleteData.config.delete_reports_keep_month_reports %}checked="true"{% endif %}>{{ 'General_MonthlyReports'|translate }}<span
+                    {{ 'PrivacyManager_KeepDataFor'|translate }}<br/><br/>
+                    <input id="deleteReportsKeepDay" type="checkbox" name="deleteReportsKeepDay" value="1"
+                                  {% if deleteData.config.delete_reports_keep_day_reports %}checked="true"{% endif %}>
+                    <label for="deleteReportsKeepDay">{{ 'General_DailyReports'|translate }}</label><br/>
+                    <input type="checkbox" name="deleteReportsKeepWeek" value="1" id="deleteReportsKeepWeek"
+                                  {% if deleteData.config.delete_reports_keep_week_reports %}checked="true"{% endif %}>
+                    <label for="deleteReportsKeepWeek">{{ 'General_WeeklyReports'|translate }}</label><br/>
+                    <input type="checkbox" name="deleteReportsKeepMonth" value="1" id="deleteReportsKeepMonth"
+                                  {% if deleteData.config.delete_reports_keep_month_reports %}checked="true"{% endif %}>
+                    <label for="deleteReportsKeepMonth">{{ 'General_MonthlyReports'|translate }}<span
                                 class="form-description">{{ 'General_Recommended'|translate }}</span></label><br/>
-                    <label><input type="checkbox" name="deleteReportsKeepYear" value="1"
-                                  {% if deleteData.config.delete_reports_keep_year_reports %}checked="true"{% endif %}>{{ 'General_YearlyReports'|translate }}<span
+                    <input type="checkbox" name="deleteReportsKeepYear" value="1" id="deleteReportsKeepYear"
+                                  {% if deleteData.config.delete_reports_keep_year_reports %}checked="true"{% endif %}>
+                    <label for="deleteReportsKeepYear">{{ 'General_YearlyReports'|translate }}<span
                                 class="form-description">{{ 'General_Recommended'|translate }}</span></label><br/>
-                    <label><input type="checkbox" name="deleteReportsKeepRange" value="1"
-                                  {% if deleteData.config.delete_reports_keep_range_reports %}checked="true"{% endif %}>{{ 'General_RangeReports'|translate }}
+                    <input type="checkbox" name="deleteReportsKeepRange" value="1" id="deleteReportsKeepRange"
+                                  {% if deleteData.config.delete_reports_keep_range_reports %}checked="true"{% endif %}>
+                    <label for="deleteReportsKeepRange">{{ 'General_RangeReports'|translate }}
                     </label><br/><br/>
-                    <label><input type="checkbox" name="deleteReportsKeepSegments" value="1"
-                                  {% if deleteData.config.delete_reports_keep_segment_reports %}checked="true"{% endif %}>{{ 'PrivacyManager_KeepReportSegments'|translate }}</label><br/>
+                    <input type="checkbox" name="deleteReportsKeepSegments" value="1" id="deleteReportsKeepSegments"
+                                  {% if deleteData.config.delete_reports_keep_segment_reports %}checked="true"{% endif %}>
+                    <label for="deleteReportsKeepSegments">{{ 'PrivacyManager_KeepReportSegments'|translate }}</label><br/>
                 </td>
                 <td width="200">
 
diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig
index 3f32b04638..0817efa87f 100644
--- a/plugins/SitesManager/templates/index.twig
+++ b/plugins/SitesManager/templates/index.twig
@@ -205,14 +205,14 @@
                     <span id="row{{ site.idsite }}" class='editSite link_but'>
                         <img src='plugins/Zeitgeist/images/ico_edit.png' title="{{ 'General_Edit'|translate }}"
                              border="0"/>
-                        {{ 'General_Edit'|translate }}
+                        <span>{{ 'General_Edit'|translate }}</span>
                     </span>
                         </td>
                         <td>
                     <span id="row{{ site.idsite }}" class="deleteSite link_but">
                         <img src='plugins/Zeitgeist/images/ico_delete.png' title="{{ 'General_Delete'|translate }}"
                              border="0"/>
-                        {{ 'General_Delete'|translate }}
+                        <span>{{ 'General_Delete'|translate }}</span>
                     </span>
                         </td>
                         <td>
diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
index f6fb25166c..6f1c6477f5 100644
--- a/plugins/UsersManager/templates/index.twig
+++ b/plugins/UsersManager/templates/index.twig
@@ -117,13 +117,13 @@
                         <td>
                             <span class="edituser link_but" id="row{{ i }}">
                                 <img title="{{ 'General_Edit'|translate }}" src='plugins/Zeitgeist/images/ico_edit.png'/>
-                                {{ 'General_Edit'|translate }}
+                                <span>{{ 'General_Edit'|translate }}</span>
                             </span>
                         </td>
                         <td>
                             <span class="deleteuser link_but" id="row{{ i }}">
                                 <img title="{{ 'General_Delete'|translate }}" src='plugins/Zeitgeist/images/ico_delete.png'/>
-                                {{ 'General_Delete'|translate }}
+                                <span>{{ 'General_Delete'|translate }}</span>
                             </span>
                         </td>
                     </tr>