Remove top_controls_inner div + other fixes, preparing for this ticke…

…t refs matomo-org#4502
sabl0r · Jan 16, 2014 · e30df99 · e30df99
1 parent 53847bd
commit e30df99
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 29 deletions.
diff --git a/plugins/API/stylesheets/listAllAPI.less b/plugins/API/stylesheets/listAllAPI.less
@@ -12,7 +12,6 @@
 
 .page_api {
     padding: 0 15px 0 15px;
-    font-size: 13px;
 }
 
 .page_api h2 {

diff --git a/plugins/API/templates/listAllAPI.twig b/plugins/API/templates/listAllAPI.twig
@@ -5,9 +5,9 @@
 
 {% include "@CoreHome/_siteSelectHeader.twig" %}
 
-<div class="page_api">
+<div class="page_api pageWrap">
 
-    <div class="top_controls_inner">
+    <div class="top_controls">
         {% include "@CoreHome/_periodSelect.twig" %}
     </div>
 

diff --git a/plugins/CoreHome/stylesheets/coreHome.less b/plugins/CoreHome/stylesheets/coreHome.less
@@ -44,6 +44,7 @@ h3 {
   overflow: visible;
   padding: 15px 15px 0;
   position: relative;
+  font-size: 13px;
 }
 
 /* Content */

diff --git a/plugins/CoreHome/templates/_siteSelectHeader.twig b/plugins/CoreHome/templates/_siteSelectHeader.twig
@@ -1,4 +1,4 @@
-<div class="top_bar_sites_selector">
+<div class="top_bar_sites_selector {% if currentModule == 'CoreHome' %}sites_selector_in_dashboard{% endif %}">
     <label>{{ 'General_Website'|translate }}</label>
     {% include "@CoreHome/_siteSelect.twig" %}
 </div>
diff --git a/plugins/Dashboard/stylesheets/dashboard.less b/plugins/Dashboard/stylesheets/dashboard.less
@@ -2,16 +2,14 @@
   margin: 0 -7px;
 }
 
+#root>.top_controls {
+  margin-left:15px;
+  margin-right:15px;
+}
 .top_controls {
   position: relative;
   height: 32px;
-}
-
-.top_controls_inner {
   clear: left;
-  position: relative;
-  height: 32px;
-  padding-bottom: 20px;
 }
 
 @media all and (max-width: 749px) {

diff --git a/plugins/Dashboard/templates/index.twig b/plugins/Dashboard/templates/index.twig
@@ -1,6 +1,7 @@
 {% include "@Dashboard/_header.twig" %}
 <div class="top_controls">
     {% include "@CoreHome/_periodSelect.twig" %}
+    {{ postEvent("Template.nextToCalendar") }}
     {% include "@Dashboard/_dashboardSettings.twig" %}
     <div id="Dashboard" class="js-autoLeftPanel">
         <ul>

diff --git a/plugins/ImageGraph/templates/testAllSizes.twig b/plugins/ImageGraph/templates/testAllSizes.twig
@@ -6,7 +6,7 @@
     <div>
         <h2>{{ 'ImageGraph_ImageGraph'|translate }} ::: {{ siteName }}</h2>
 
-        <div class="top_controls_inner">
+        <div class="top_controls">
             {% include '@CoreHome/_periodSelect.twig' %}
         </div>
 

diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less
@@ -114,7 +114,6 @@ table.entityTable tr td a:hover {
 
     .top_bar_sites_selector {
         margin-right: 10px;
-        margin-top: 10px;
         label {
             padding-top: 9px;
             .font-default(13px, 15px);
@@ -196,10 +195,6 @@ table.entityTable tr td a:hover {
         .box-shadow-1(~"inset 0 2px 4px #d8d8d8");
     }
 
-    .top_controls_inner {
-        margin: 0 10px;
-    }
-
     .widgetize {
         width: auto;
     }

diff --git a/plugins/MultiSites/stylesheets/multiSites.less b/plugins/MultiSites/stylesheets/multiSites.less
@@ -4,7 +4,7 @@
     font-size: 14px;
 }
 
-#multisites .top_controls_inner {
+#multisites .top_controls {
     height: 10px;
 }
 

diff --git a/plugins/MultiSites/templates/getSitesInfo.twig b/plugins/MultiSites/templates/getSitesInfo.twig
@@ -2,12 +2,12 @@
 
 {% block content %}
 
-    <div class="top_controls_inner">
-        {% include "@CoreHome/_periodSelect.twig" %}
-        {% include "@CoreHome/_headerMessage.twig" %}
-    </div>
+<div class="top_controls">
+    {% include "@CoreHome/_periodSelect.twig" %}
+    {% include "@CoreHome/_headerMessage.twig" %}
+</div>
 
-<div id="multisites">
+<div id="pageWrap multisites">
     <div id="main">
         <script type="text/javascript">
             var allSites = [];

diff --git a/plugins/ScheduledReports/templates/index.twig b/plugins/ScheduledReports/templates/index.twig
@@ -4,7 +4,7 @@
 
 {% include "@CoreHome/_siteSelectHeader.twig" %}
 
-<div class="top_controls_inner">
+<div class="top_controls">
     {% include "@CoreHome/_periodSelect.twig" %}
 </div>
 

diff --git a/plugins/Widgetize/templates/index.twig b/plugins/Widgetize/templates/index.twig
@@ -2,7 +2,14 @@
 
 {% block content %}
 
-<script type="text/javascript">
+
+<div class="pageWrap">
+    <div class="top_controls">
+        {% include "@CoreHome/_siteSelectHeader.twig" %}
+        {% include "@CoreHome/_periodSelect.twig" %}
+    </div>
+
+    <script type="text/javascript">
     $(function () {
         var widgetized = new widgetize();
         var urlPath = document.location.protocol + '//' + document.location.hostname + (document.location.port == '' ? '' : (':' + document.location.port)) + document.location.pathname;
@@ -24,11 +31,6 @@
     });
 </script>
 
-{% include "@CoreHome/_siteSelectHeader.twig" %}
-
-<div class="top_controls_inner">
-    {% include "@CoreHome/_periodSelect.twig" %}
-</div>
 
 <div class="widgetize">
     <p>With Piwik, you can export your Web Analytics reports on your blog, website, or intranet dashboard... in one click.
@@ -60,4 +62,5 @@
 
     <div id='iframeDivToExport' style='display:none;'></div>
 </div>
+</div>
 {% endblock %}
diff --git a/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less b/plugins/Zeitgeist/stylesheets/ui/_siteSelect.less
@@ -8,6 +8,9 @@
   height: 30px; /* Hack to not push the dashboard widget below */
 }
 
+.sites_selector_in_dashboard {
+  margin-top:10px;
+}
 .top_bar_sites_selector {
   float: right
 }