Refs #4189, adding Overlay screenshot tests:

- Make 'idsite' parameter in certain Overlay URLs 'idSite'.
- Make sure Overlay sidebar has width so screenshot test framework can find position.
- Add overlay test site so Overlay can be loaded in phantomjs.
- Remove createSuperUser call from TrackerTest (done in Fixture setUp).
- Make sure piwik.js link is created for screenshot tests & make sure the test environment JSON file is loaded after the database is setup.
- Modify logic that waits for images to load in screenshot testing framework's page renderer to wait for CSS image URLs.

4 files changed, 44 insertions, 38 deletions

diff --git a/plugins/Overlay/Controller.php b/plugins/Overlay/Controller.php
index 487a0a77ee..89eb36063f 100644
--- a/plugins/Overlay/Controller.php
+++ b/plugins/Overlay/Controller.php
@@ -126,7 +126,7 @@ class Controller extends \Piwik\Plugin\Controller
      */
     public function startOverlaySession()
     {
-        $idSite = Common::getRequestVar('idsite', 0, 'int');
+        $idSite = Common::getRequestVar('idSite', 0, 'int');
         Piwik::checkUserHasViewAccess($idSite);
 
         $sitesManager = APISitesManager::getInstance();
diff --git a/plugins/Overlay/stylesheets/overlay.css b/plugins/Overlay/stylesheets/overlay.css
index df0e1f7283..f80a6a7f7e 100644
--- a/plugins/Overlay/stylesheets/overlay.css
+++ b/plugins/Overlay/stylesheets/overlay.css
@@ -153,3 +153,7 @@ body .ui-tooltip.Overlay_Tooltip {
 #topBars {
     display: none;
 }
+
+.overlay-sidebar-container {
+    width: 220px;
+}
\ No newline at end of file
diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig
index ce377ef0a4..2b6b8976f3 100644
--- a/plugins/Overlay/templates/index.twig
+++ b/plugins/Overlay/templates/index.twig
@@ -7,49 +7,51 @@
 {% endblock %}
 
 {% block content %}
-    <a id="Overlay_Title" href="http://piwik.org/docs/page-overlay/" target="_blank">
-        {{ 'Overlay_Overlay'|translate }}
-        <img src="plugins/Zeitgeist/images/help.png" alt="Documentation"/>
-    </a>
+    <div class="overlay-sidebar-container">
+        <a id="Overlay_Title" href="http://piwik.org/docs/page-overlay/" target="_blank">
+            {{ 'Overlay_Overlay'|translate }}
+            <img src="plugins/Zeitgeist/images/help.png" alt="Documentation"/>
+        </a>
 
-    <div id="Overlay_DateRangeSelection">
-        <select id="Overlay_DateRangeSelect" name="Overlay_DateRangeSelect">
-            <option value="day;today">{{ 'General_Today'|translate }}</option>
-            <option value="day;yesterday">{{ 'General_Yesterday'|translate }}</option>
-            <option value="week;today">{{ 'General_CurrentWeek'|translate }}</option>
-            <option value="month;today">{{ 'General_CurrentMonth'|translate }}</option>
-            <option value="year;today">{{ 'General_CurrentYear'|translate }}</option>
-        </select>
-    </div>
+        <div id="Overlay_DateRangeSelection">
+            <select id="Overlay_DateRangeSelect" name="Overlay_DateRangeSelect">
+                <option value="day;today">{{ 'General_Today'|translate }}</option>
+                <option value="day;yesterday">{{ 'General_Yesterday'|translate }}</option>
+                <option value="week;today">{{ 'General_CurrentWeek'|translate }}</option>
+                <option value="month;today">{{ 'General_CurrentMonth'|translate }}</option>
+                <option value="year;today">{{ 'General_CurrentYear'|translate }}</option>
+            </select>
+        </div>
 
-    <div id="Overlay_Error_NotLoading">
-        <p>
-            <span>{{ 'Overlay_ErrorNotLoading'|translate }}</span>
-        </p>
+        <div id="Overlay_Error_NotLoading">
+            <p>
+                <span>{{ 'Overlay_ErrorNotLoading'|translate }}</span>
+            </p>
 
-        <p>
-            {% if ssl %}
-                {{ 'Overlay_ErrorNotLoadingDetailsSSL'|translate }}
-            {% else %}
-                {{ 'Overlay_ErrorNotLoadingDetails'|translate }}
-            {% endif %}
-        </p>
+            <p>
+                {% if ssl %}
+                    {{ 'Overlay_ErrorNotLoadingDetailsSSL'|translate }}
+                {% else %}
+                    {{ 'Overlay_ErrorNotLoadingDetails'|translate }}
+                {% endif %}
+            </p>
 
-        <p>
-            <a href="http://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" target="_blank">
-                {{ 'Overlay_ErrorNotLoadingLink'|translate }}
-            </a>
-        </p>
-    </div>
+            <p>
+                <a href="http://piwik.org/docs/page-overlay/#toc-page-overlay-troubleshooting" target="_blank">
+                    {{ 'Overlay_ErrorNotLoadingLink'|translate }}
+                </a>
+            </p>
+        </div>
 
-    <div id="Overlay_Location">&nbsp;</div>
+        <div id="Overlay_Location">&nbsp;</div>
 
-    <div id="Overlay_Loading">{{ 'General_Loading'|translate }}</div>
+        <div id="Overlay_Loading">{{ 'General_Loading'|translate }}</div>
 
-    <div id="Overlay_Sidebar"></div>
+        <div id="Overlay_Sidebar"></div>
 
-    <a id="Overlay_RowEvolution">{{ 'General_RowEvolutionRowActionTooltipTitle'|translate }}</a>
-    <a id="Overlay_Transitions">{{ 'General_TransitionsRowActionTooltipTitle'|translate }}</a>
+        <a id="Overlay_RowEvolution">{{ 'General_RowEvolutionRowActionTooltipTitle'|translate }}</a>
+        <a id="Overlay_Transitions">{{ 'General_TransitionsRowActionTooltipTitle'|translate }}</a>
+    </div>
 
     <!-- TODO: rethink the way the sidebar works -->
     <!-- <a id="Overlay_FullScreen" href="#">
@@ -62,7 +64,7 @@
     </div>
 
     <script type="text/javascript">
-        var iframeSrc = 'index.php?module=Overlay&action=startOverlaySession&idsite={{ idSite }}&period={{ period }}&date={{ date }}';
+        var iframeSrc = 'index.php?module=Overlay&action=startOverlaySession&idSite={{ idSite }}&period={{ period }}&date={{ date }}';
         Piwik_Overlay.init(iframeSrc, '{{ idSite }}', '{{ period }}', '{{ date }}');
 
         Piwik_Overlay_Translations = {
diff --git a/plugins/Overlay/templates/index_noframe.twig b/plugins/Overlay/templates/index_noframe.twig
index 626cd4cd2d..f3948357a3 100644
--- a/plugins/Overlay/templates/index_noframe.twig
+++ b/plugins/Overlay/templates/index_noframe.twig
@@ -6,7 +6,7 @@
 <div id="Overlay_NoFrame">
 
     <script type="text/javascript">
-        var newLocation = 'index.php?module=Overlay&action=startOverlaySession&idsite={{ idSite }}&period={{ period }}&date={{ date }}';
+        var newLocation = 'index.php?module=Overlay&action=startOverlaySession&idSite={{ idSite }}&period={{ period }}&date={{ date }}';
 
         var locationParts = window.location.href.split('#');
         if (locationParts.length > 1) {