Commit 8ba81e2e71c2ea684aa15eaaaf407d852e50149b
Merge remote-tracking branch 'origin/master'
Conflicts: frontend/web/robots.txt
Showing
15 changed files
with
72 additions
and
21 deletions
Show diff stats
common/messages/ru/app.php
common/messages/ru/artbox-comment.php
common/messages/ru/blog.php
common/messages/ru/core.php
| ... | ... | @@ -55,4 +55,9 @@ return [ |
| 55 | 55 | 'Visited At' => 'Последнее посещение', |
| 56 | 56 | 'page_id' => 'ID страницы', |
| 57 | 57 | 'Create {item}' => 'Создать {item}', |
| 58 | + 'name' => 'Имя', | |
| 59 | + 'email' => 'Email', | |
| 60 | + 'phone' => 'Номер телефона', | |
| 61 | + 'message' => 'Сообщение', | |
| 62 | + 'Comment posted' => 'Ваш комментарий появится после проверки модератором', | |
| 58 | 63 | ]; |
| 59 | 64 | \ No newline at end of file | ... | ... |
frontend/assets/AppAsset.php
frontend/config/main.php
frontend/views/layouts/main.php
| ... | ... | @@ -445,20 +445,24 @@ _________________________________________________________ --> |
| 445 | 445 | ); ?> |
| 446 | 446 | |
| 447 | 447 | <?= $form->field($feedback, 'name') |
| 448 | - ->textInput(); ?> | |
| 448 | + ->textInput() | |
| 449 | + ->Label('Имя'); ?> | |
| 449 | 450 | |
| 450 | 451 | <?= $form->field($feedback, 'email') |
| 451 | - ->textInput(); ?> | |
| 452 | + ->textInput() | |
| 453 | + ->Label('Email'); ?> | |
| 452 | 454 | |
| 453 | 455 | <?= $form->field($feedback, 'phone') |
| 454 | - ->textInput(); ?> | |
| 456 | + ->textInput() | |
| 457 | + ->Label('Номер телефона'); ?> | |
| 455 | 458 | |
| 456 | 459 | <?= $form->field($feedback, 'message') |
| 457 | 460 | ->textarea( |
| 458 | 461 | [ |
| 459 | 462 | 'rows' => 4, |
| 460 | 463 | ] |
| 461 | - ); ?> | |
| 464 | + ) | |
| 465 | + ->Label('Сообщение'); ?> | |
| 462 | 466 | |
| 463 | 467 | <p class="text-center"> |
| 464 | 468 | <?= Html::submitButton( | ... | ... |
frontend/views/site/error.php
| ... | ... | @@ -17,16 +17,10 @@ $this->title = $name; |
| 17 | 17 | |
| 18 | 18 | <div class="box"> |
| 19 | 19 | |
| 20 | - <p class="text-center"> | |
| 21 | - <a href="index.html"> | |
| 22 | - <img src="img/logo.png" alt="Obaju template"> | |
| 23 | - </a> | |
| 24 | - </p> | |
| 25 | - | |
| 26 | - <h3>We are sorry - this page is not here anymore</h3> | |
| 27 | - <h4 class="text-muted">Error 404 - Page not found</h4> | |
| 20 | + <h3>Похоже, мы не можем найти нужную вам страницу.</h3> | |
| 21 | + <h4 class="text-muted">Попробуйте ещё раз</h4> | |
| 28 | 22 | |
| 29 | - <p class="buttons"><a href="index.html" class="btn btn-template-main"><i class="fa fa-home"></i> Go to Homepage</a> | |
| 23 | + <p class="buttons"><a href="/" class="btn btn-template-main"><i class="fa fa-home"></i> На главную</a> | |
| 30 | 24 | </p> |
| 31 | 25 | </div> |
| 32 | 26 | ... | ... |
frontend/views/site/index.php
| ... | ... | @@ -17,7 +17,7 @@ _________________________________________________________ --> |
| 17 | 17 | <div class="container"> |
| 18 | 18 | <div class="row mb-small"> |
| 19 | 19 | <div class="col-sm-12 text-center"> |
| 20 | - <h1><span>"Кристал Эстет"</span> — ваш стоматологический центр</h1> | |
| 20 | + <h1><span>"Кристал Естет"</span> — ваш стоматологический центр</h1> | |
| 21 | 21 | </div> |
| 22 | 22 | <div class="col-sm-12 col-md-8 col-md-offset-4"> |
| 23 | 23 | <p class="header-text-right">Мы заботимся о Вашем здоровье.<br />Все виды стоматологических услуг европейского качества.</p> |
| ... | ... | @@ -164,9 +164,6 @@ _________________________________________________________ --> |
| 164 | 164 | |
| 165 | 165 | <ul class="owl-carousel customers"> |
| 166 | 166 | <li class="item"> |
| 167 | - <img src="/img/customer-1.png" alt="" class="img-responsive"> | |
| 168 | - </li> | |
| 169 | - <li class="item"> | |
| 170 | 167 | <img src="/img/customer-2.png" alt="" class="img-responsive"> |
| 171 | 168 | </li> |
| 172 | 169 | <li class="item"> | ... | ... |
frontend/web/css/custom.css
| ... | ... | @@ -278,7 +278,7 @@ ul.list-style-none { |
| 278 | 278 | } |
| 279 | 279 | input[type="text"].form-control{ |
| 280 | 280 | border-radius: 0; |
| 281 | - padding: 17px 13px; | |
| 281 | + padding: 7px 13px; | |
| 282 | 282 | } |
| 283 | 283 | .input_bl input{ |
| 284 | 284 | width: 100%; |
| ... | ... | @@ -480,6 +480,10 @@ div.modal-title{ |
| 480 | 480 | display: inline-block; |
| 481 | 481 | margin-right: 15px; |
| 482 | 482 | } |
| 483 | +.customers{ | |
| 484 | + max-width: 720px; | |
| 485 | + margin: 0 auto; | |
| 486 | +} | |
| 483 | 487 | @media (max-width: 991px) { |
| 484 | 488 | .footer-copyrights{ |
| 485 | 489 | margin-top:0; | ... | ... |
16.4 KB
| 1 | +/* Russian (UTF-8) initialisation for the jQuery UI date picker plugin. */ | |
| 2 | +/* Written by Andrew Stromnov (stromnov@gmail.com). */ | |
| 3 | +( function( factory ) { | |
| 4 | + if ( typeof define === "function" && define.amd ) { | |
| 5 | + | |
| 6 | + // AMD. Register as an anonymous module. | |
| 7 | + define( [ "../widgets/datepicker" ], factory ); | |
| 8 | + } else { | |
| 9 | + | |
| 10 | + // Browser globals | |
| 11 | + factory( jQuery.datepicker ); | |
| 12 | + } | |
| 13 | +}( function( datepicker ) { | |
| 14 | + | |
| 15 | +datepicker.regional.ru = { | |
| 16 | + closeText: "Закрыть", | |
| 17 | + prevText: "<Пред", | |
| 18 | + nextText: "След>", | |
| 19 | + currentText: "Сегодня", | |
| 20 | + monthNames: [ "Январь","Февраль","Март","Апрель","Май","Июнь", | |
| 21 | + "Июль","Август","Сентябрь","Октябрь","Ноябрь","Декабрь" ], | |
| 22 | + monthNamesShort: [ "Янв","Фев","Мар","Апр","Май","Июн", | |
| 23 | + "Июл","Авг","Сен","Окт","Ноя","Дек" ], | |
| 24 | + dayNames: [ "воскресенье","понедельник","вторник","среда","четверг","пятница","суббота" ], | |
| 25 | + dayNamesShort: [ "вск","пнд","втр","срд","чтв","птн","сбт" ], | |
| 26 | + dayNamesMin: [ "Вс","Пн","Вт","Ср","Чт","Пт","Сб" ], | |
| 27 | + weekHeader: "Нед", | |
| 28 | + dateFormat: "dd.mm.yy", | |
| 29 | + firstDay: 1, | |
| 30 | + isRTL: false, | |
| 31 | + showMonthAfterYear: false, | |
| 32 | + yearSuffix: "" }; | |
| 33 | +datepicker.setDefaults( datepicker.regional.ru ); | |
| 34 | + | |
| 35 | +return datepicker.regional.ru; | |
| 36 | + | |
| 37 | +} ) ); | ... | ... |
frontend/web/js/front.js
frontend/web/robots.txt