Yarik / artbox-shop

Commit 0a6545c676c10148712cef9a106e9b11963f52b5

Authored by Alexey Boroda
2 parents ac6e2c67 17107850

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	frontend/views/account/wishlist.php
Showing 7 changed files with 88 additions and 12 deletions   Show diff stats
Inline Side-by-side
common/messages/ru/app.php
  Show/Hide comments   View file @0a6545c
1 <?php 1 <?php
2 - return [];  
3 \ No newline at end of file 2 \ No newline at end of file
  3 + return [
  4 + 'Customer login' => 'Вход для пользователей',
  5 + 'Login' => 'Войти',
  6 + 'Not registered yet?' => 'Не зарегистрированы?',
  7 + 'Register now!' => 'Зарегистрироваться',
  8 + 'Отправить' => ' Отправить',
  9 + ];
4 \ No newline at end of file 10 \ No newline at end of file
common/models/LoginForm.php
  Show/Hide comments   View file @0a6545c
@@ -94,4 +94,13 @@ @@ -94,4 +94,13 @@
94 94
95 return $this->_user; 95 return $this->_user;
96 } 96 }
  97 +
  98 + public function attributeLabels()
  99 + {
  100 + return [
  101 + 'username' => 'Логин',
  102 + 'password' => 'Пароль',
  103 + 'rememberMe' => 'Запомнить',
  104 + ];
  105 + }
97 } 106 }
frontend/views/category/_product_item.php
  Show/Hide comments   View file @0a6545c
@@ -99,6 +99,14 @@ @@ -99,6 +99,14 @@
99 </div> 99 </div>
100 <?php 100 <?php
101 } 101 }
  102 + if ($product->is('top')) {
  103 + ?>
  104 + <div class="ribbon top">
  105 + <div class="theribbon"><?php echo \Yii::t('app', 'Топ'); ?></div>
  106 + <div class="ribbon-background"></div>
  107 + </div>
  108 + <?php
  109 + }
102 ?> 110 ?>
103 111
104 <!-- /.ribbon --> 112 <!-- /.ribbon -->
frontend/views/layouts/main.php
  Show/Hide comments   View file @0a6545c
@@ -360,7 +360,7 @@ _________________________________________________________ --&gt; @@ -360,7 +360,7 @@ _________________________________________________________ --&gt;
360 <div class="modal-content"> 360 <div class="modal-content">
361 <div class="modal-header"> 361 <div class="modal-header">
362 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> 362 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
363 - <h4 class="modal-title" id="Login"> 363 + <h4 class="modal-title text-center" id="Login">
364 <?php echo \Yii::t('app', 'Customer login'); ?> 364 <?php echo \Yii::t('app', 'Customer login'); ?>
365 </h4> 365 </h4>
366 </div> 366 </div>
@@ -385,11 +385,14 @@ _________________________________________________________ --&gt; @@ -385,11 +385,14 @@ _________________________________________________________ --&gt;
385 ->label(false) 385 ->label(false)
386 ->passwordInput( 386 ->passwordInput(
387 [ 387 [
388 - 'placeholder' => $loginForm->getAttributeLabel('password'), 388 + 'placeholder' => $loginForm->getAttributeLabel('пароль'),
389 ] 389 ]
390 ); 390 );
391 echo $login->field($loginForm, 'rememberMe') 391 echo $login->field($loginForm, 'rememberMe')
392 ->checkbox(); 392 ->checkbox();
  393 + ?>
  394 + <div class="text-center">
  395 + <?
393 echo Html::submitButton( 396 echo Html::submitButton(
394 \Yii::t('app', 'Login'), 397 \Yii::t('app', 'Login'),
395 [ 398 [
@@ -398,20 +401,17 @@ _________________________________________________________ --&gt; @@ -398,20 +401,17 @@ _________________________________________________________ --&gt;
398 ); 401 );
399 $login::end(); 402 $login::end();
400 ?> 403 ?>
  404 + </div>
401 <p class="text-center text-muted"> 405 <p class="text-center text-muted">
402 <?php echo \Yii::t('app', 'Not registered yet?'); ?></p> 406 <?php echo \Yii::t('app', 'Not registered yet?'); ?></p>
403 <p class="text-center text-muted"> 407 <p class="text-center text-muted">
404 <?php 408 <?php
405 echo Html::a( 409 echo Html::a(
406 - Html::tag('strong', \Yii::t('app', 'Register now! ')), 410 + Html::tag('strong', \Yii::t('app', 'Register now!')),
407 [ 411 [
408 '/site/login', 412 '/site/login',
409 ] 413 ]
410 ); 414 );
411 - echo \Yii::t(  
412 - 'app',  
413 - 'It is easy and done in 1&nbsp;minute and gives you access to special discounts and much more!'  
414 - );  
415 ?> 415 ?>
416 </p> 416 </p>
417 417
@@ -468,7 +468,7 @@ _________________________________________________________ --&gt; @@ -468,7 +468,7 @@ _________________________________________________________ --&gt;
468 <div class="modal-content"> 468 <div class="modal-content">
469 <div class="modal-header"> 469 <div class="modal-header">
470 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button> 470 <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
471 - <h4 class="modal-title callback" id="Login">Обратный звонок</h4> 471 + <h4 class="modal-title callback text-center" id="Login">Обратный звонок</h4>
472 </div> 472 </div>
473 <div class="modal-body"> 473 <div class="modal-body">
474 <?php 474 <?php
@@ -484,14 +484,14 @@ _________________________________________________________ --&gt; @@ -484,14 +484,14 @@ _________________________________________________________ --&gt;
484 ->label(false) 484 ->label(false)
485 ->textInput( 485 ->textInput(
486 [ 486 [
487 - 'placeholder' => $callback->getAttributeLabel('name'), 487 + 'placeholder' => $callback->getAttributeLabel('Ваше имя'),
488 ] 488 ]
489 ); 489 );
490 echo $form->field($callback, 'phone') 490 echo $form->field($callback, 'phone')
491 ->label(false) 491 ->label(false)
492 ->textInput( 492 ->textInput(
493 [ 493 [
494 - 'placeholder' => $callback->getAttributeLabel('phone'), 494 + 'placeholder' => $callback->getAttributeLabel('Номер телефона'),
495 ] 495 ]
496 ); 496 );
497 echo Html::tag( 497 echo Html::tag(
frontend/views/product/view.php
  Show/Hide comments   View file @0a6545c
@@ -96,6 +96,15 @@ @@ -96,6 +96,15 @@
96 <!-- /.ribbon --> 96 <!-- /.ribbon -->
97 <?php 97 <?php
98 } 98 }
  99 + if ($model->is('top')) {
  100 + ?>
  101 + <div class="ribbon top">
  102 + <div class="theribbon">TOP</div>
  103 + <div class="ribbon-background"></div>
  104 + </div>
  105 + <!-- /.ribbon -->
  106 + <?php
  107 + }
99 ?> 108 ?>
100 109
101 <div class="row" id="thumbs"> 110 <div class="row" id="thumbs">
frontend/views/site/_slider_product.php
  Show/Hide comments   View file @0a6545c
@@ -99,6 +99,14 @@ @@ -99,6 +99,14 @@
99 </div> 99 </div>
100 <?php 100 <?php
101 } 101 }
  102 + if ($product->is('top')) {
  103 + ?>
  104 + <div class="ribbon top">
  105 + <div class="theribbon"><?php echo \Yii::t('app', 'Топ'); ?></div>
  106 + <div class="ribbon-background"></div>
  107 + </div>
  108 + <?php
  109 + }
102 ?> 110 ?>
103 111
104 <!-- /.ribbon --> 112 <!-- /.ribbon -->
frontend/web/css/style.css
  Show/Hide comments   View file @0a6545c
@@ -764,7 +764,7 @@ body.boxed .navbar-affixed-top.affix { @@ -764,7 +764,7 @@ body.boxed .navbar-affixed-top.affix {
764 764
765 #login-modal p { 765 #login-modal p {
766 font-weight: 300; 766 font-weight: 300;
767 - margin-bottom: 20px; 767 + /*margin-bottom: 20px;*/
768 font-size: 13px; 768 font-size: 13px;
769 } 769 }
770 770
@@ -1466,15 +1466,26 @@ fieldset[disabled] .btn-template-primary.active { @@ -1466,15 +1466,26 @@ fieldset[disabled] .btn-template-primary.active {
1466 top: 50px; 1466 top: 50px;
1467 } 1467 }
1468 1468
  1469 +.ribbon.top {
  1470 + top: 100px;
  1471 +}
1469 .ribbon.new .theribbon { 1472 .ribbon.new .theribbon {
1470 background-color: #5bc0de; 1473 background-color: #5bc0de;
1471 text-shadow: 0px 1px 2px #bbb; 1474 text-shadow: 0px 1px 2px #bbb;
1472 } 1475 }
  1476 +.ribbon.top .theribbon {
  1477 + background-color: #8a21fd;
  1478 + text-shadow: 0px 1px 2px #bbb;
  1479 +}
1473 1480
1474 .ribbon.new .theribbon:after { 1481 .ribbon.new .theribbon:after {
1475 border-color: #2390b0 #2390b0 transparent transparent; 1482 border-color: #2390b0 #2390b0 transparent transparent;
1476 } 1483 }
1477 1484
  1485 +.ribbon.top .theribbon:after {
  1486 + border-color: #4f00a5 #4f00a5 transparent transparent;
  1487 +}
  1488 +
1478 .ribbon.gift { 1489 .ribbon.gift {
1479 top: 100px; 1490 top: 100px;
1480 } 1491 }
@@ -4667,4 +4678,29 @@ a.list-group-item.active &gt; .badge, @@ -4667,4 +4678,29 @@ a.list-group-item.active &gt; .badge,
4667 .panel.sidebar-menu ul.nav.category-menu li a.active:hover { 4678 .panel.sidebar-menu ul.nav.category-menu li a.active:hover {
4668 background-color: #fd9131; 4679 background-color: #fd9131;
4669 color: white; 4680 color: white;
  4681 +}
  4682 +
  4683 +#login-modal .form-group.field-loginform-returnurl{
  4684 + display:none;
  4685 +}
  4686 +
  4687 +@media (min-width: 768px){
  4688 + #login-modal .modal-sm {
  4689 + width: 350px;
  4690 + }
  4691 +}
  4692 +
  4693 +h4.modal-title.callback{
  4694 + text-transform:uppercase;
  4695 +}
  4696 +.form-group.field-feedback-returnurl{
  4697 + display: none;
  4698 +}
  4699 +
  4700 +a i.fa, button i.fa, span.fa {
  4701 + margin: 0 5px;
  4702 +}
  4703 +
  4704 +.modal-dialog.modal-sm {
  4705 + min-width: 350px;
4670 } 4706 }
4671 \ No newline at end of file 4707 \ No newline at end of file