Merge remote-tracking branch 'origin/master' into plugin_namespaces

Conflicts:
	core/Tracker/Request.php
	core/ViewDataTable.php
	core/ViewDataTable/HtmlTable/Goals.php
	plugins/Actions/Actions.php
	plugins/Annotations/API.php
	plugins/CoreHome/CoreHome.php
	plugins/DBStats/DBStats.php
	plugins/DevicesDetection/DevicesDetection.php
	plugins/Goals/Goals.php
	plugins/Live/Live.php
	plugins/Referers/Referers.php
	plugins/UserSettings/UserSettings.php
	plugins/UsersManager/API.php
	plugins/VisitTime/VisitTime.php
	plugins/VisitorInterest/VisitorInterest.php

4 files changed, 46 insertions, 19 deletions

diff --git a/plugins/Dashboard/javascripts/dashboard.js b/plugins/Dashboard/javascripts/dashboard.js
index e23ff669a4..e2a73be1d3 100644
--- a/plugins/Dashboard/javascripts/dashboard.js
+++ b/plugins/Dashboard/javascripts/dashboard.js
@@ -12,9 +12,9 @@ function initDashboard(dashboardId, dashboardLayout) {
         $('#periodString').after($('#dashboardSettings'));
 
         var leftMargin = $('#periodString')[0].offsetWidth;
-        var segmentSelector = $('.segmentationContainer:visible');
+        var segmentSelector = $('#segmentEditorPanel:visible');
         if(segmentSelector.length) {
-            segmentSelector = $($('.segmentationContainer:visible')[0]);
+            segmentSelector = $($('#segmentEditorPanel:visible')[0]);
             leftMargin = segmentSelector.position().left + segmentSelector.outerWidth();
         }
         $('#dashboardSettings').css({left: leftMargin});
diff --git a/plugins/Dashboard/javascripts/dashboardObject.js b/plugins/Dashboard/javascripts/dashboardObject.js
index 67614dd231..a91b9ad46a 100644
--- a/plugins/Dashboard/javascripts/dashboardObject.js
+++ b/plugins/Dashboard/javascripts/dashboardObject.js
@@ -409,9 +409,7 @@
         }
 
         //launch 'sortable' property on every dashboard widgets
-        if ($( "div.col", dashboardElement ).is( ":data('ui-sortable')" )) {
-            $( "div.col", dashboardElement ).sortable('destroy');
-        }
+        $( "div.col:data('ui-sortable')", dashboardElement ).sortable('destroy');
 
         $('div.col', dashboardElement)
                     .sortable({
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
index a287a438fc..f00fe46366 100644
--- a/plugins/Dashboard/stylesheets/dashboard.less
+++ b/plugins/Dashboard/stylesheets/dashboard.less
@@ -8,9 +8,24 @@
 }
 
 .top_controls_inner {
-  position: relative;
-  height: 32px;
-  padding-bottom: 20px;
+   clear: left;
+   position: relative;
+   height: 32px;
+   padding-bottom: 20px;
+}
+
+@media all and (max-width: 749px) {
+  .top_controls {
+    height: auto;
+  }
+
+  .top_controls #periodString,
+  .top_controls #dashboardSettings,
+  .top_controls #segmentEditorPanel {
+    position: static;
+    margin: 0 0 10px;
+    float: none;
+  }
 }
 
 #dashboardWidgetsArea {
@@ -43,7 +58,7 @@
 }
 
 .col.width-33 {
-    width: 33%;
+    width: 33.33%;
 }
 
 .col.width-30 {
@@ -65,6 +80,7 @@
     overflow: hidden;
     border-radius: 4px;
     font-size: 14px;
+    z-index: 1;
 }
 
 .widgetHover {
@@ -86,7 +102,7 @@
 
 .widgetContent.loading {
     opacity: 0.5;
-    background: url(../../../plugins/Zeitgeist/images/loading-blue.gif) no-repeat top right;
+    background: url(plugins/Zeitgeist/images/loading-blue.gif) no-repeat top right;
 }
 
 .widget h2 {
@@ -95,10 +111,12 @@
     font-weight: bold;
 }
 
+.widget p {
+   margin-left: 10px;
+}
+
 .widgetTop {
-    background: #b5b0a7 url(../../../plugins/Zeitgeist/images/dashboard_h_bg.png) repeat-x 0 0;
-    border-radius: 4px 4px 0 0;
-    width: 100%;
+    background: #b5b0a7 url(plugins/Zeitgeist/images/dashboard_h_bg.png) repeat-x 0 0;
     cursor: move;
     font-size: 10pt;
     font-weight: bold;
@@ -106,7 +124,7 @@
 }
 
 .widgetTopHover {
-    background: #B0A798 url(../../../plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0;
+    background: #B0A798 url(plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0;
 }
 
 .widgetName {
@@ -117,6 +135,11 @@
     text-shadow: 1px 1px 2px #7e7363;
 }
 
+// Overriding some dataTable css for better dashboard display
+.widget .dataTableWrapper {
+    width: 100% !important;
+}
+
 .button {
     cursor: pointer;
 }
@@ -157,7 +180,7 @@
 }
 
 .ui-dialog-buttonset input[type=button], .ui-dialog-buttonset button{
-    background: #B5B0A7 url(../../../plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0 !important;
+    background: #B5B0A7 url(plugins/Zeitgeist/images/dashboard_h_bg_hover.png) repeat-x 0 0 !important;
     color: #fff !important;
     border: 0 !important;
     font-size: 12px !important;
@@ -215,6 +238,7 @@
     color: #444;
     font-size: 14px;
     cursor: pointer;
+  overflow: hidden;
 }
 
 #dashboardSettings:hover {
@@ -223,7 +247,7 @@
 }
 
 #dashboardSettings > span {
-    background: url(../../../plugins/Zeitgeist/images/sort_subtable_desc.png) right center no-repeat;
+    background: url(plugins/Zeitgeist/images/sort_subtable_desc.png) right center no-repeat;
     padding-right: 20px;
     display: block;
 }
@@ -358,7 +382,7 @@ ul.widgetpreview-widgetlist li {
 }
 
 .widgetpreview-base li.widgetpreview-choosen {
-    background: #e4e2d7 url(../../../plugins/Zeitgeist/images/arr_r.png) no-repeat right 6px;
+    background: #e4e2d7 url(plugins/Zeitgeist/images/arr_r.png) no-repeat right 6px;
     color: #255792;
     font-weight: bold;
 }
@@ -487,5 +511,9 @@ div.widgetpreview-preview {
   .col.width-30,
   .col.width-25 {
     width: 100%;
+    .widget {
+      margin-right: 0;
+    }
   }
+
 }
\ No newline at end of file
diff --git a/plugins/Dashboard/templates/index.twig b/plugins/Dashboard/templates/index.twig
index cc86a56715..e16fb1955e 100644
--- a/plugins/Dashboard/templates/index.twig
+++ b/plugins/Dashboard/templates/index.twig
@@ -4,8 +4,9 @@
     <div id="Dashboard">
         <ul>
             {% for dashboard in dashboards %}
-                <li class="dashboardMenuItem" id="Dashboard_embeddedIndex_{{ dashboard.iddashboard }}"><a
-                            href="javascript:$('#dashboardWidgetsArea').dashboard('loadDashboard', {{ dashboard.iddashboard }});">{{ dashboard.name|escape }}</a></li>
+                <li class="dashboardMenuItem" id="Dashboard_embeddedIndex_{{ dashboard.iddashboard }}">
+                    <a href="javascript:$('#dashboardWidgetsArea').dashboard('loadDashboard', {{ dashboard.iddashboard }});">{{ dashboard.name|escape }}</a>
+                </li>
             {% endfor %}
         </ul>
     </div>