in admin area make sure to use as much content width as possible

matomo-org · Jan 15, 2015 · c1f3328 · c1f3328
1 parent 0a87460
commit c1f3328
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 18 deletions.
diff --git a/plugins/CoreAdminHome/stylesheets/generalSettings.less b/plugins/CoreAdminHome/stylesheets/generalSettings.less
@@ -21,6 +21,7 @@
 
 .admin #header_message {
     margin-top: 10px;
+    margin-right: 10px;
 }
 
 table.admin {

diff --git a/plugins/CoreHome/CoreHome.php b/plugins/CoreHome/CoreHome.php
@@ -99,6 +99,7 @@ public function getJsFiles(&$jsFiles)
         $jsFiles[] = "plugins/Morpheus/javascripts/ajaxHelper.js";
         $jsFiles[] = "plugins/Morpheus/javascripts/jquery.icheck.min.js";
         $jsFiles[] = "plugins/Morpheus/javascripts/morpheus.js";
+        $jsFiles[] = "plugins/Morpheus/javascripts/layout.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/require.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/uiControl.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/dataTable.js";
@@ -107,7 +108,6 @@ public function getJsFiles(&$jsFiles)
         $jsFiles[] = "plugins/CoreHome/javascripts/broadcast.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/menu.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/menu_init.js";
-        $jsFiles[] = "plugins/CoreHome/javascripts/user_layout.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/calendar.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/sparkline.js";
         $jsFiles[] = "plugins/CoreHome/javascripts/corehome.js";

diff --git a/plugins/CoreHome/javascripts/user_layout.js b/plugins/CoreHome/javascripts/user_layout.js
diff --git a/plugins/Morpheus/javascripts/layout.js b/plugins/Morpheus/javascripts/layout.js
@@ -0,0 +1,32 @@
+/*!
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ */
+
+$(function () {
+    var contentUser = $('#content.user');
+
+    function adjustSize(content)
+    {
+        var width = $('body').width() - content.offset().left - 10;
+        content.css('width', width + 'px');
+    }
+
+    if (contentUser.length) {
+        adjustSize(contentUser);
+        $(window).resize(function () {
+            adjustSize(contentUser);
+        });
+    }
+
+    var contentAdmin = $('#content.admin');
+
+    if (contentAdmin.length) {
+        adjustSize(contentAdmin);
+        $(window).resize(function () {
+            adjustSize(contentAdmin);
+        });
+    }
+});