From 88fcbfaf7c2102a11aca9f94317afbdf2e188cd7 Mon Sep 17 00:00:00 2001
From: Eugeny Galkovskiy <zhegal@gmail.com>
Date: Fri, 12 May 2017 16:15:01 +0300
Subject: [PATCH] Модалка "вход", плашка "топ" для товаров

---
 common/messages/ru/app.php                |  7 ++++++-
 frontend/views/account/wishlist.php       | 12 ++++++++++++
 frontend/views/category/_product_item.php |  8 ++++++++
 frontend/views/layouts/main.php           | 12 ++++++------
 frontend/views/product/view.php           |  9 +++++++++
 frontend/views/site/_slider_product.php   |  8 ++++++++
 frontend/web/css/style.css                | 23 ++++++++++++++++++++++-
 7 files changed, 71 insertions(+), 8 deletions(-)

diff --git a/common/messages/ru/app.php b/common/messages/ru/app.php
index e3b6834..42bfc28 100755
--- a/common/messages/ru/app.php
+++ b/common/messages/ru/app.php
@@ -1,2 +1,7 @@
 <?php
-    return [];
\ No newline at end of file
+    return [
+        'Customer login'        =>  'Вход для пользователей',
+        'Login'                 =>  'Войти',
+        'Not registered yet?'   =>  'Не зарегистрированы?',
+        'Register now!'         =>  'Зарегистрироваться',
+    ];
\ No newline at end of file
diff --git a/frontend/views/account/wishlist.php b/frontend/views/account/wishlist.php
index 2a2ea0d..1c016ed 100644
--- a/frontend/views/account/wishlist.php
+++ b/frontend/views/account/wishlist.php
@@ -73,6 +73,12 @@ _________________________________________________________ -->
                 <div class="ribbon-background"></div>
               </div>
               <!-- /.ribbon -->
+
+              <div class="ribbon top">
+                  <div class="theribbon"><?php echo \Yii::t('app', 'Топ'); ?></div>
+                  <div class="ribbon-background"></div>
+              </div>
+                <!-- /.ribbon -->
             </div>
             <!-- /.product -->
           </div>
@@ -153,6 +159,12 @@ _________________________________________________________ -->
                 <div class="ribbon-background"></div>
               </div>
               <!-- /.ribbon -->
+
+                <div class="ribbon top">
+                    <div class="theribbon">TOP</div>
+                    <div class="ribbon-background"></div>
+                </div>
+                <!-- /.ribbon -->
             </div>
             <!-- /.product -->
           </div>
diff --git a/frontend/views/category/_product_item.php b/frontend/views/category/_product_item.php
index 550674a..acb4ada 100755
--- a/frontend/views/category/_product_item.php
+++ b/frontend/views/category/_product_item.php
@@ -99,6 +99,14 @@
             </div>
               <?php
           }
+          if ($product->is('top')) {
+              ?>
+              <div class="ribbon top">
+                  <div class="theribbon"><?php echo \Yii::t('app', 'Топ'); ?></div>
+                  <div class="ribbon-background"></div>
+              </div>
+              <?php
+          }
       ?>
     
     <!-- /.ribbon -->
diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php
index f39e541..9ceb535 100755
--- a/frontend/views/layouts/main.php
+++ b/frontend/views/layouts/main.php
@@ -360,7 +360,7 @@ _________________________________________________________ -->
                     <div class="modal-content">
                       <div class="modal-header">
                         <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                        <h4 class="modal-title" id="Login">
+                        <h4 class="modal-title text-center" id="Login">
                             <?php echo \Yii::t('app', 'Customer login'); ?>
                         </h4>
                       </div>
@@ -390,6 +390,9 @@ _________________________________________________________ -->
                                          );
                               echo $login->field($loginForm, 'rememberMe')
                                          ->checkbox();
+                          ?>
+                          <div class="text-center">
+                          <?
                               echo Html::submitButton(
                                   \Yii::t('app', 'Login'),
                                   [
@@ -398,20 +401,17 @@ _________________________________________________________ -->
                               );
                               $login::end();
                           ?>
+                          </div>
                         <p class="text-center text-muted">
                             <?php echo \Yii::t('app', 'Not registered yet?'); ?></p>
                         <p class="text-center text-muted">
                             <?php
                                 echo Html::a(
-                                    Html::tag('strong', \Yii::t('app', 'Register now! ')),
+                                    Html::tag('strong', \Yii::t('app', 'Register now!')),
                                     [
                                         '/site/login',
                                     ]
                                 );
-                                echo \Yii::t(
-                                    'app',
-                                    'It is easy and done in 1&nbsp;minute and gives you access to special discounts and much more!'
-                                );
                             ?>
                         </p>
 
diff --git a/frontend/views/product/view.php b/frontend/views/product/view.php
index c7dc777..992fe55 100755
--- a/frontend/views/product/view.php
+++ b/frontend/views/product/view.php
@@ -95,6 +95,15 @@
                     <!-- /.ribbon -->
                       <?php
                   }
+                  if ($model->is('top')) {
+                      ?>
+                      <div class="ribbon top">
+                          <div class="theribbon">TOP</div>
+                          <div class="ribbon-background"></div>
+                      </div>
+                      <!-- /.ribbon -->
+                      <?php
+                  }
               ?>
             
             <div class="row" id="thumbs">
diff --git a/frontend/views/site/_slider_product.php b/frontend/views/site/_slider_product.php
index a7a87c5..8104521 100755
--- a/frontend/views/site/_slider_product.php
+++ b/frontend/views/site/_slider_product.php
@@ -99,6 +99,14 @@
             </div>
               <?php
           }
+          if ($product->is('top')) {
+              ?>
+              <div class="ribbon top">
+                  <div class="theribbon"><?php echo \Yii::t('app', 'Топ'); ?></div>
+                  <div class="ribbon-background"></div>
+              </div>
+              <?php
+          }
       ?>
     
     <!-- /.ribbon -->
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
index dbb2368..f31da8f 100755
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
@@ -764,7 +764,7 @@ body.boxed .navbar-affixed-top.affix {
 
 #login-modal p {
     font-weight: 300;
-    margin-bottom: 20px;
+    /*margin-bottom: 20px;*/
     font-size: 13px;
 }
 
@@ -1466,15 +1466,26 @@ fieldset[disabled] .btn-template-primary.active {
     top: 50px;
 }
 
+.ribbon.top {
+    top: 100px;
+}
 .ribbon.new .theribbon {
     background-color: #5bc0de;
     text-shadow: 0px 1px 2px #bbb;
 }
+.ribbon.top .theribbon {
+    background-color: #8a21fd;
+    text-shadow: 0px 1px 2px #bbb;
+}
 
 .ribbon.new .theribbon:after {
     border-color: #2390b0 #2390b0 transparent transparent;
 }
 
+.ribbon.top .theribbon:after {
+    border-color: #4f00a5 #4f00a5 transparent transparent;
+}
+
 .ribbon.gift {
     top: 100px;
 }
@@ -4667,4 +4678,14 @@ a.list-group-item.active > .badge,
 .panel.sidebar-menu ul.nav.category-menu li a.active:hover {
     background-color: #fd9131;
     color: white;
+}
+
+#login-modal .form-group.field-loginform-returnurl{
+    display:none;
+}
+
+@media (min-width: 768px){
+    #login-modal .modal-sm {
+        width: 350px;
+    }
 }
\ No newline at end of file
--
libgit2 0.21.4