From 1605905fc1f263478f1146c6791068df9c1bd554 Mon Sep 17 00:00:00 2001
From: Klimov Paul <klimov.paul@gmail.com>
Date: Tue, 11 Nov 2014 13:37:39 +0200
Subject: [PATCH] Fixed CCS for `yii\authclient\widgets\AuthChoice` does not
 loaded if `popupMode` disabled

---
 extensions/authclient/CHANGELOG.md                 |  2 +-
 extensions/authclient/widgets/AuthChoice.php       |  4 +++-
 extensions/authclient/widgets/AuthChoiceAsset.php  |  6 +++---
 .../authclient/widgets/AuthChoiceStyleAsset.php    | 24 ++++++++++++++++++++++
 4 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 extensions/authclient/widgets/AuthChoiceStyleAsset.php

diff --git a/extensions/authclient/CHANGELOG.md b/extensions/authclient/CHANGELOG.md
index 65b978a..c3ad3bb 100644
--- a/extensions/authclient/CHANGELOG.md
+++ b/extensions/authclient/CHANGELOG.md
@@ -4,7 +4,7 @@ Yii Framework 2 authclient extension Change Log
 2.0.1 under development
 -----------------------
 
-- no changes in this release.
+- Bug #6000: Fixed CCS for `yii\authclient\widgets\AuthChoice` does not loaded if `popupMode` disabled (klimov-paul)
 
 
 2.0.0 October 12, 2014
diff --git a/extensions/authclient/widgets/AuthChoice.php b/extensions/authclient/widgets/AuthChoice.php
index 163a071..f537fdf 100644
--- a/extensions/authclient/widgets/AuthChoice.php
+++ b/extensions/authclient/widgets/AuthChoice.php
@@ -225,10 +225,12 @@ class AuthChoice extends Widget
      */
     public function init()
     {
+        $view = Yii::$app->getView();
         if ($this->popupMode) {
-            $view = Yii::$app->getView();
             AuthChoiceAsset::register($view);
             $view->registerJs("\$('#" . $this->getId() . "').authchoice();");
+        } else {
+            AuthChoiceStyleAsset::register($view);
         }
         $this->options['id'] = $this->getId();
         echo Html::beginTag('div', $this->options);
diff --git a/extensions/authclient/widgets/AuthChoiceAsset.php b/extensions/authclient/widgets/AuthChoiceAsset.php
index bef31b2..abba083 100644
--- a/extensions/authclient/widgets/AuthChoiceAsset.php
+++ b/extensions/authclient/widgets/AuthChoiceAsset.php
@@ -12,6 +12,8 @@ use yii\web\AssetBundle;
 /**
  * AuthChoiceAsset is an asset bundle for [[AuthChoice]] widget.
  *
+ * @see AuthChoiceStyleAsset
+ *
  * @author Paul Klimov <klimov.paul@gmail.com>
  * @since 2.0
  */
@@ -21,10 +23,8 @@ class AuthChoiceAsset extends AssetBundle
     public $js = [
         'authchoice.js',
     ];
-    public $css = [
-        'authchoice.css',
-    ];
     public $depends = [
+        'yii\authclient\widgets\AuthChoiceStyleAsset',
         'yii\web\YiiAsset',
     ];
 }
diff --git a/extensions/authclient/widgets/AuthChoiceStyleAsset.php b/extensions/authclient/widgets/AuthChoiceStyleAsset.php
new file mode 100644
index 0000000..37e770b
--- /dev/null
+++ b/extensions/authclient/widgets/AuthChoiceStyleAsset.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * @link http://www.yiiframework.com/
+ * @copyright Copyright (c) 2008 Yii Software LLC
+ * @license http://www.yiiframework.com/license/
+ */
+
+namespace yii\authclient\widgets;
+
+use yii\web\AssetBundle;
+
+/**
+ * AuthChoiceAsset is an asset bundle for [[AuthChoice]] widget.
+ *
+ * @author Paul Klimov <klimov.paul@gmail.com>
+ * @since 2.0
+ */
+class AuthChoiceStyleAsset extends AssetBundle
+{
+    public $sourcePath = '@yii/authclient/assets';
+    public $css = [
+        'authchoice.css',
+    ];
+}
\ No newline at end of file