use getMainCurrentView instead of CurrentView

Victoire · Jul 18, 2016 · d5c6f37 · d5c6f37
1 parent bcb1527
commit d5c6f37
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 28 deletions.
diff --git a/Resolver/WidgetLocaleSwitcherContentResolver.php b/Resolver/WidgetLocaleSwitcherContentResolver.php
@@ -64,7 +64,7 @@ public function getWidgetStaticContent(Widget $widget)
     {
         $widgetParams = parent::getWidgetStaticContent($widget);
 
-        $currentView = $this->currentViewHelper->getCurrentView();
+        $currentView = $this->currentViewHelper->getMainCurrentView();
         $viewTranslations = $currentView->getTranslations();
         unset($this->locales[$currentView->getCurrentLocale()]);
 

diff --git a/Resources/style/locale-switcher.scss b/Resources/style/locale-switcher.scss
@@ -1,30 +1,28 @@
-#header {
-  .localeSwitcher {
-    z-index: 1;
-    .btn {
-      padding-top: 6px;
-      padding-right: 7px;
-      padding-bottom: 6px;
-      padding-left: 7px;
-      line-height: 18px;
-    }
-    .dropdown-menu {
-      min-width: 0;
-      > li > a {
-        padding: 4px 0;
-        width: 56px;
-        text-align: center;
-      }
-    }
-    .localeSwitcher-flag {
-      width: 24px;
-      height: 24px;
-    }
-    .localeSwitcher-flag + .caret {
-      margin-left: 6px;
-    }
-    .caret + .localeSwitcher-flag {
-      margin-left: 6px;
+.localeSwitcher {
+  z-index: 1;
+  .btn {
+    padding-top: 6px;
+    padding-right: 7px;
+    padding-bottom: 6px;
+    padding-left: 7px;
+    line-height: 18px;
+  }
+  .dropdown-menu {
+    min-width: 0;
+    > li > a {
+      padding: 4px 0;
+      width: 56px;
+      text-align: center;
     }
   }
+  .localeSwitcher-flag {
+    width: 24px;
+    height: 24px;
+  }
+  .localeSwitcher-flag + .caret {
+    margin-left: 6px;
+  }
+  .caret + .localeSwitcher-flag {
+    margin-left: 6px;
+  }
 }