refs #4987 apply a max width of 1200px, add a separator before switch…

…, use alt+f instead of alt+s
matomo-org · May 19, 2014 · b02e74e · b02e74e
1 parent 37cafff
commit b02e74e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 8 deletions.
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js
@@ -306,7 +306,13 @@ $.extend(DataTable.prototype, UIControl.prototype, {
     setFixWidthToMakeEllipsisWork: function (domElem) {
         var self = this;
 
-        function getTableWidth(domElem) {
+        function isWidgetized()
+        {
+            return -1 !== location.search.indexOf('module=Widgetize');
+        }
+
+        function getTableWidth(domElem)
+        {
             var totalWidth      = $(domElem).width();
             var totalWidthTable = $('table.dataTable', domElem).width(); // fixes tables in dbstats, referrers, ...
 
@@ -321,6 +327,28 @@ $.extend(DataTable.prototype, UIControl.prototype, {
             return parseInt(totalWidth, 10);
         }
 
+        function setMaxTableWidthIfNeeded (domElem, maxTableWidth)
+        {
+            var tableWidth = getTableWidth(domElem);
+
+            if (tableWidth <= maxTableWidth) {
+                return;
+            }
+
+            if (isWidgetized() || self.isDashboard()) {
+                return;
+            }
+
+            $(domElem).width(maxTableWidth);
+
+            var parentDataTable = $(domElem).parent('.dataTable');
+            if (parentDataTable && parentDataTable.length) {
+                // makes sure dataTableWrapper and DataTable has same size => makes sure maxLabelWidth does not get
+                // applied in getLabelWidth() since they will have the same size.
+                parentDataTable.width(maxTableWidth);
+            }
+        }
+
         function getLabelWidth(domElem, tableWidth, minLabelWidth, maxLabelWidth)
         {
             var labelWidth = minLabelWidth;
@@ -338,16 +366,14 @@ $.extend(DataTable.prototype, UIControl.prototype, {
                 labelWidth = tableWidth * 0.5;
             }
 
-            var isWidgetized  = -1 !== location.search.indexOf('module=Widgetize');
-
             var innerWidth = 0;
             var innerWrapper = domElem.find('.dataTableWrapper');
             if (innerWrapper && innerWrapper.length) {
                 innerWidth = innerWrapper.width();
             }
 
             if (labelWidth > maxLabelWidth
-                && !isWidgetized
+                && !isWidgetized()
                 && innerWidth !== domElem.width()
                 && !self.isDashboard()) {
                 labelWidth = maxLabelWidth; // prevent for instance table in Actions-Pages is not too wide
@@ -405,7 +431,8 @@ $.extend(DataTable.prototype, UIControl.prototype, {
         var minLabelWidth = 125;
         var maxLabelWidth = 440;
 
-        var tableWidth          = getTableWidth(domElem);
+        setMaxTableWidthIfNeeded(domElem, 1200);
+        var tableWidth = getTableWidth(domElem);
         var labelColumnMinWidth = getLabelColumnMinWidth(domElem);
         var labelColumnWidth    = getLabelWidth(domElem, tableWidth, 125, 440);
 

diff --git a/plugins/ZenMode/javascripts/zen-mode.js b/plugins/ZenMode/javascripts/zen-mode.js
@@ -12,7 +12,7 @@ $(document).ready(function () {
     }
 
     var addedElement = $('#topRightBar').append(
-          '<span class="topBarElem activateZenMode" piwik-zen-mode-switcher>'
+          ' | <span class="topBarElem activateZenMode" piwik-zen-mode-switcher>'
         + '<img src="plugins/CoreHome/images/navigation_expand.png">'
         + ' </span>'
     );
@@ -64,7 +64,7 @@ $(document).ready(function () {
             toggleZenMode();
         });
 
-        Mousetrap.bind('alt+s', function(event) {
+        Mousetrap.bind('alt+f', function(event) {
             if (event.preventDefault) {
                 event.preventDefault();
             } else {

diff --git a/plugins/ZenMode/lang/en.json b/plugins/ZenMode/lang/en.json
@@ -2,7 +2,7 @@
     "ZenMode": {
         "SearchForAnything": "Search for anything",
         "QuickAccessTitle": "Search for menu entries, reports and websites",
-        "HowToSearch": "To search for menu items, reports or websites use the search box on the top right or press 'alt+s'.",
+        "HowToSearch": "To search for menu items, reports or websites use the search box on the top right or press 'alt+f'.",
         "HowToToggleZenMode": "To leave the zen mode click the arrow on the top right or press 'alt+z'.",
         "Activated": "Zen mode activated"
     }