Merge branch 'master' into prod

shi-yang · Jun 21, 2015 · 762b14f · 762b14f
2 parents b6b7684 + a3e36f9
commit 762b14f
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 3 deletions.
diff --git a/frontend/themes/basic/explore/index.php b/frontend/themes/basic/explore/index.php
@@ -91,7 +91,10 @@
             </div>
         </div>
         <div class="col-md-4">
-            <?= \shiyang\login\Login::widget(['visible' => Yii::$app->user->isGuest]); ?>
+            <?= \shiyang\login\Login::widget([
+              'title' => Yii::t('app', 'Log in'),
+              'visible' => Yii::$app->user->isGuest,
+            ]); ?>
             <p class="bg-success" style="padding:15px;">
                 <b><?= Yii::t('app', 'Recommendation') ?></b>
                 <?= Html::a(Yii::t('app', 'More'), ['/explore/forums'], ['class' => 'pull-right']) ?>

diff --git a/frontend/themes/basic/layouts/basic.php b/frontend/themes/basic/layouts/basic.php
@@ -25,6 +25,7 @@
       <script src="http://cdn.bootcss.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
+    <link rel="shortcut icon" href="<?= Yii::getAlias('@web') ?>/favicon.ico">
 </head>
 <body>
 <?php $this->beginBody() ?>

diff --git a/frontend/themes/basic/layouts/main.php b/frontend/themes/basic/layouts/main.php
@@ -27,6 +27,7 @@
       <script src="http://cdn.bootcss.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
+    <link rel="shortcut icon" href="<?= Yii::getAlias('@web') ?>/favicon.ico">
 </head>
 <body>
     <?php $this->beginBody() ?>

diff --git a/frontend/themes/basic/modules/forum/views/layouts/forum.php b/frontend/themes/basic/modules/forum/views/layouts/forum.php
@@ -26,6 +26,7 @@
       <script src="http://cdn.bootcss.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
+    <link rel="shortcut icon" href="<?= Yii::getAlias('@web') ?>/favicon.ico">
 </head>
 <body>
     <?php $this->beginBody() ?>

diff --git a/frontend/themes/basic/modules/user/views/layouts/profile.php b/frontend/themes/basic/modules/user/views/layouts/profile.php
@@ -33,6 +33,7 @@
     <?= Html::csrfMetaTags() ?>
     <title><?= Html::encode($this->title) ?></title>
     <?php $this->head() ?>
+    <link rel="shortcut icon" href="<?= Yii::getAlias('@web') ?>/favicon.ico">
 </head>
 <body>
     <?php $this->beginBody() ?>

diff --git a/frontend/themes/basic/modules/user/views/layouts/user.php b/frontend/themes/basic/modules/user/views/layouts/user.php
@@ -31,6 +31,7 @@
       <script src="http://cdn.bootcss.com/html5shiv/3.7.2/html5shiv.min.js"></script>
       <script src="http://cdn.bootcss.com/respond.js/1.4.2/respond.min.js"></script>
     <![endif]-->
+    <link rel="shortcut icon" href="<?= Yii::getAlias('@web') ?>/favicon.ico">
 </head>
 <body class="overflow-hidden">
     <?php $this->beginBody() ?>

diff --git a/frontend/themes/basic/site/login.php b/frontend/themes/basic/site/login.php
@@ -13,12 +13,14 @@
       padding-top: 40px;
       background-color: #eef0f3;
     }
-
     .form-signin {
       max-width: 330px;
       padding: 15px;
       margin: 0 auto;
     }
+    .logo img {
+      max-width: 100%;
+    }
     .form-signin .form-signin-heading,
     .form-signin .checkbox {
       margin-bottom: 10px;
@@ -55,6 +57,9 @@
         'class' => 'form-signin' 
     ]
 ]); ?>
+  <div class="logo">
+    <img src="<?= Yii::getAlias('@web') ?>/images/logo.png">
+  </div>
 
   <h1><?= Html::encode($this->title) ?></h1>
 

diff --git a/frontend/themes/basic/site/signup.php b/frontend/themes/basic/site/signup.php
@@ -12,7 +12,9 @@
       padding-top: 40px;
       background-color: #eef0f3;
     }
-
+    .logo img {
+      max-width: 100%;
+    }
     .form-signin {
       max-width: 330px;
       padding: 15px;
@@ -50,6 +52,9 @@
 ');
 ?>
 <div class="form-signin">
+    <div class="logo">
+      <img src="<?= Yii::getAlias('@web') ?>/images/logo.png">
+    </div>
     <h1><?= Html::encode($this->title) ?></h1>
 
     <?php $form = ActiveForm::begin(['id' => 'form-signup']); ?>

diff --git a/frontend/web/favicon.ico b/frontend/web/favicon.ico
diff --git a/frontend/web/images/logo.png b/frontend/web/images/logo.png