Commit 2402211fe2f720be5feddc652517fb803178dd14
1 parent
a6795694
calculate modal - layout
Showing
3 changed files
with
198 additions
and
190 deletions
Show diff stats
frontend/views/layouts/main.php
... | ... | @@ -439,211 +439,217 @@ |
439 | 439 | |
440 | 440 | <div class="row calculate-main-wr"> |
441 | 441 | <div class="col-md-8 col-md-offset-2"> |
442 | - <p style="font-weight:bold;"><?= \Yii::t('app', 'contact_datas') ?></p> | |
443 | - | |
444 | - <?= $form->field($feedback, 'topic') | |
445 | - ->hiddenInput(['value' => Feedback::SCENARIO_CALCULATOR]) | |
446 | - ->label(false)?> | |
447 | - | |
448 | - <?=$form->field($feedback, "name")->textInput()?> | |
449 | - <?=$form->field($feedback, "phone")->textInput()?> | |
450 | - <?=$form->field($feedback, "email")->textInput()?> | |
451 | - | |
452 | - </div> | |
453 | - </div> | |
454 | - | |
455 | - <div class="row"> | |
456 | - <div class="col-md-12"> | |
457 | - <p style="font-weight:bold;"><?= \Yii::t('app', 'ses_info_install') ?></p> | |
458 | - <div class="row"> | |
459 | - <div class="col-md-6"> | |
460 | - | |
461 | - <?=$form->field($feedback, "adress") | |
462 | - ->textInput() | |
463 | - ->label( | |
464 | - \Yii::t( | |
465 | - 'app', | |
466 | - 'address1' | |
467 | - ) | |
468 | - )?> | |
469 | - | |
470 | - <?=$form->field($feedback, "module_install_angle") | |
471 | - ->textInput() | |
472 | - ->label( | |
473 | - \Yii::t( | |
474 | - 'app', | |
475 | - 'install_modules' | |
476 | - ) | |
477 | - )?> | |
478 | - | |
479 | - </div> | |
480 | - | |
481 | - <div class="col-md-6"> | |
482 | - <p class="coord1"><?= \Yii::t('app', 'coord1_title') ?>:</p> | |
483 | - | |
484 | - <?=$form->field($feedback, "latitude") | |
485 | - ->textInput() | |
486 | - ->label( | |
487 | - \Yii::t( | |
488 | - 'app', | |
489 | - 'Latitude' | |
490 | - ) | |
491 | - )?> | |
492 | - | |
493 | - <?=$form->field($feedback, "longitude") | |
494 | - ->textInput() | |
495 | - ->label( | |
496 | - \Yii::t( | |
497 | - 'app', | |
498 | - 'Longitude' | |
499 | - ) | |
500 | - )?> | |
501 | - | |
502 | - <?=$form->field($feedback, "south_deviation") | |
503 | - ->textInput() | |
504 | - ->label( | |
505 | - \Yii::t( | |
506 | - 'app', | |
507 | - 'south_deviation' | |
508 | - ) | |
509 | - )?> | |
510 | - | |
511 | - </div> | |
512 | - </div> | |
513 | - | |
514 | - <div class="row"> | |
515 | - <div class="col-md-6 text-center"> | |
516 | - <img src="/img/form_img_1.jpg" class="img-responsive"> | |
517 | - </div> | |
518 | - <div class="col-md-6 text-center"> | |
519 | - <img src="/img/form_img_2.jpg" class="img-responsive"> | |
520 | - </div> | |
442 | + <div style="width:100%;max-width:500px;margin:0 auto;"> | |
443 | + <p style="font-weight:bold;"><?= \Yii::t('app', 'contact_datas') ?></p> | |
444 | + | |
445 | + <?= $form->field($feedback, 'topic') | |
446 | + ->hiddenInput(['value' => Feedback::SCENARIO_CALCULATOR]) | |
447 | + ->label(false)?> | |
448 | + | |
449 | + <?=$form->field($feedback, "name")->textInput()?> | |
450 | + <?=$form->field($feedback, "phone")->textInput()?> | |
451 | + <?=$form->field($feedback, "email")->textInput()?> | |
521 | 452 | </div> |
522 | - | |
523 | 453 | </div> |
524 | 454 | </div> |
525 | - | |
455 | + | |
526 | 456 | <div class="row"> |
527 | - <div class="col-md-12"> | |
528 | - <p style="font-weight:bold;"><?= \Yii::t('app', 'info_power_ses') ?></p> | |
457 | + <div class="col-lg-6 col-md-12"> | |
529 | 458 | <div class="row"> |
530 | 459 | <div class="col-md-12"> |
531 | - <div class="row" style="margin-bottom: 15px;"> | |
532 | - | |
533 | - <?=$form->field($feedback, "power_station_type") | |
534 | - ->radioList( | |
535 | - [ | |
536 | - "ะะฒัะพะฝะพะผะฝะฐั" => "<span style=\"margin-left:5px;\">".\Yii::t('app', 'authonomous')."</span>", | |
537 | - "ะกะตัะตะฒะฐั" => '<span style="margin-left:5px;">'.\Yii::t('app', 'ses_network')."</span>", | |
538 | - ], | |
539 | - [ | |
540 | - 'tag' => false, | |
541 | - 'unselect' => null, | |
542 | - 'encode' => false, | |
543 | - 'item' => function ($index, $label, $name, $checked, $value){ | |
544 | - $content = '<div class="col-md-3 col-sm-12 col-xs-12">'; | |
545 | - | |
546 | - $content .= Html::radio( | |
547 | - $name, | |
548 | - ($index===0)?true:false, | |
549 | - [ | |
550 | - 'label' => $label, | |
551 | - 'value' => $value, | |
552 | - ] | |
553 | - ); | |
554 | - | |
555 | - $content .= '</div>'; | |
556 | - | |
557 | - return $content; | |
558 | - }, | |
559 | - ] | |
560 | - )->label(false)?> | |
561 | - | |
562 | - </div> | |
563 | - </div> | |
564 | - | |
565 | - <div class="col-md-12"> | |
460 | + <p style="font-weight:bold;"><?= \Yii::t('app', 'ses_info_install') ?></p> | |
566 | 461 | <div class="row"> |
567 | - <div class="col-md-4"> | |
568 | - <?= $form->field($feedback, "area") | |
569 | - ->textInput() | |
570 | - ->label( | |
571 | - \Yii::t( | |
572 | - 'app', | |
573 | - 'info_area' | |
574 | - ) | |
575 | - )?> | |
462 | + <div class="col-md-6"> | |
463 | + | |
464 | + <?=$form->field($feedback, "adress") | |
465 | + ->textInput() | |
466 | + ->label( | |
467 | + \Yii::t( | |
468 | + 'app', | |
469 | + 'address1' | |
470 | + ) | |
471 | + )?> | |
472 | + | |
473 | + <?=$form->field($feedback, "module_install_angle") | |
474 | + ->textInput() | |
475 | + ->label( | |
476 | + \Yii::t( | |
477 | + 'app', | |
478 | + 'install_modules' | |
479 | + ) | |
480 | + )?> | |
481 | + | |
482 | + </div> | |
483 | + | |
484 | + <div class="col-md-6"> | |
485 | + <p class="coord1"><?= \Yii::t('app', 'coord1_title') ?>:</p> | |
486 | + | |
487 | + <?=$form->field($feedback, "latitude") | |
488 | + ->textInput() | |
489 | + ->label( | |
490 | + \Yii::t( | |
491 | + 'app', | |
492 | + 'Latitude' | |
493 | + ) | |
494 | + )?> | |
495 | + | |
496 | + <?=$form->field($feedback, "longitude") | |
497 | + ->textInput() | |
498 | + ->label( | |
499 | + \Yii::t( | |
500 | + 'app', | |
501 | + 'Longitude' | |
502 | + ) | |
503 | + )?> | |
504 | + | |
505 | + <?=$form->field($feedback, "south_deviation") | |
506 | + ->textInput() | |
507 | + ->label( | |
508 | + \Yii::t( | |
509 | + 'app', | |
510 | + 'south_deviation' | |
511 | + ) | |
512 | + )?> | |
513 | + | |
576 | 514 | </div> |
577 | - <div class="col-md-4"> | |
578 | - <?= $form->field($feedback, "power") | |
579 | - ->textInput() | |
580 | - ->label( | |
581 | - \Yii::t( | |
582 | - 'app', | |
583 | - 'info_power' | |
584 | - ) | |
585 | - )?> | |
515 | + </div> | |
516 | + | |
517 | + <div class="row"> | |
518 | + <div class="col-md-6 text-center"> | |
519 | + <img src="/img/form_img_1.jpg" class="img-responsive"> | |
586 | 520 | </div> |
587 | - <div class="col-md-4"> | |
588 | - <?= $form->field($feedback, "budget") | |
589 | - ->textInput() | |
590 | - ->label( | |
591 | - \Yii::t( | |
592 | - 'app', | |
593 | - 'info_budget' | |
594 | - ) | |
595 | - )?> | |
521 | + <div class="col-md-6 text-center"> | |
522 | + <img src="/img/form_img_2.jpg" class="img-responsive"> | |
596 | 523 | </div> |
597 | 524 | </div> |
525 | + | |
598 | 526 | </div> |
599 | 527 | </div> |
600 | 528 | </div> |
601 | - </div> | |
602 | - | |
603 | - <div class="row"> | |
604 | - <div class="col-md-12"> | |
605 | - <p style="font-weight:bold;"><?= \Yii::t( | |
606 | - 'app', | |
607 | - 'info_power_ses_auth' | |
608 | - ) ?></p> | |
529 | + <div class="col-lg-6 col-md-12"> | |
609 | 530 | <div class="row"> |
610 | - <div class="col-md-6"> | |
611 | - <?=$form->field($feedback, "auth_day") | |
612 | - ->textInput() | |
613 | - ->label( | |
614 | - \Yii::t( | |
615 | - 'app', | |
616 | - 'info_auth_day' | |
617 | - ) | |
618 | - )?> | |
619 | - | |
620 | - <?=$form->field($feedback, "auth_month") | |
621 | - ->textInput() | |
622 | - ->label( | |
623 | - \Yii::t( | |
624 | - 'app', | |
625 | - 'info_auth_month' | |
626 | - ) | |
627 | - )?> | |
531 | + <div class="col-md-12"> | |
532 | + <p style="font-weight:bold;"><?= \Yii::t('app', 'info_power_ses') ?></p> | |
533 | + <div class="row"> | |
534 | + <div class="col-md-12"> | |
535 | + <div class="row" style="margin-bottom: 15px;"> | |
536 | + | |
537 | + <?=$form->field($feedback, "power_station_type") | |
538 | + ->radioList( | |
539 | + [ | |
540 | + "ะะฒัะพะฝะพะผะฝะฐั" => "<span style=\"margin-left:5px;\">".\Yii::t('app', 'authonomous')."</span>", | |
541 | + "ะกะตัะตะฒะฐั" => '<span style="margin-left:5px;">'.\Yii::t('app', 'ses_network')."</span>", | |
542 | + ], | |
543 | + [ | |
544 | + 'tag' => false, | |
545 | + 'unselect' => null, | |
546 | + 'encode' => false, | |
547 | + 'item' => function ($index, $label, $name, $checked, $value){ | |
548 | + $content = '<div class="col-md-3 col-sm-12 col-xs-12">'; | |
549 | + | |
550 | + $content .= Html::radio( | |
551 | + $name, | |
552 | + ($index===0)?true:false, | |
553 | + [ | |
554 | + 'label' => $label, | |
555 | + 'value' => $value, | |
556 | + ] | |
557 | + ); | |
558 | + | |
559 | + $content .= '</div>'; | |
560 | + | |
561 | + return $content; | |
562 | + }, | |
563 | + ] | |
564 | + )->label(false)?> | |
565 | + | |
566 | + </div> | |
567 | + </div> | |
568 | + | |
569 | + <div class="col-md-12"> | |
570 | + <div class="row"> | |
571 | + <div class="col-md-4"> | |
572 | + <?= $form->field($feedback, "area") | |
573 | + ->textInput() | |
574 | + ->label( | |
575 | + \Yii::t( | |
576 | + 'app', | |
577 | + 'info_area' | |
578 | + ) | |
579 | + )?> | |
580 | + </div> | |
581 | + <div class="col-md-4"> | |
582 | + <?= $form->field($feedback, "power") | |
583 | + ->textInput() | |
584 | + ->label( | |
585 | + \Yii::t( | |
586 | + 'app', | |
587 | + 'info_power' | |
588 | + ) | |
589 | + )?> | |
590 | + </div> | |
591 | + <div class="col-md-4"> | |
592 | + <?= $form->field($feedback, "budget") | |
593 | + ->textInput() | |
594 | + ->label( | |
595 | + \Yii::t( | |
596 | + 'app', | |
597 | + 'info_budget' | |
598 | + ) | |
599 | + )?> | |
600 | + </div> | |
601 | + </div> | |
602 | + </div> | |
603 | + </div> | |
628 | 604 | </div> |
629 | - | |
630 | - <div class="col-md-6"> | |
631 | - <?=$form->field($feedback, "auth_pwr_all") | |
632 | - ->textInput() | |
633 | - ->label( | |
634 | - \Yii::t( | |
635 | - 'app', | |
636 | - 'info_auth_pwr_all' | |
637 | - ) | |
638 | - )?> | |
639 | - <?=$form->field($feedback, "auth_pwr_days") | |
640 | - ->textInput() | |
641 | - ->label( | |
642 | - \Yii::t( | |
643 | - 'app', | |
644 | - 'info_auth_pwr_days' | |
645 | - ) | |
646 | - )?> | |
605 | + </div> | |
606 | + | |
607 | + <div class="row"> | |
608 | + <div class="col-md-12"> | |
609 | + <p style="font-weight:bold;"><?= \Yii::t( | |
610 | + 'app', | |
611 | + 'info_power_ses_auth' | |
612 | + ) ?></p> | |
613 | + <div class="row"> | |
614 | + <div class="col-md-6"> | |
615 | + <?=$form->field($feedback, "auth_day") | |
616 | + ->textInput() | |
617 | + ->label( | |
618 | + \Yii::t( | |
619 | + 'app', | |
620 | + 'info_auth_day' | |
621 | + ) | |
622 | + )?> | |
623 | + | |
624 | + <?=$form->field($feedback, "auth_month") | |
625 | + ->textInput() | |
626 | + ->label( | |
627 | + \Yii::t( | |
628 | + 'app', | |
629 | + 'info_auth_month' | |
630 | + ) | |
631 | + )?> | |
632 | + </div> | |
633 | + | |
634 | + <div class="col-md-6"> | |
635 | + <?=$form->field($feedback, "auth_pwr_all") | |
636 | + ->textInput() | |
637 | + ->label( | |
638 | + \Yii::t( | |
639 | + 'app', | |
640 | + 'info_auth_pwr_all' | |
641 | + ) | |
642 | + )?> | |
643 | + <?=$form->field($feedback, "auth_pwr_days") | |
644 | + ->textInput() | |
645 | + ->label( | |
646 | + \Yii::t( | |
647 | + 'app', | |
648 | + 'info_auth_pwr_days' | |
649 | + ) | |
650 | + )?> | |
651 | + </div> | |
652 | + </div> | |
647 | 653 | </div> |
648 | 654 | </div> |
649 | 655 | </div> | ... | ... |
frontend/views/site/index.php
... | ... | @@ -310,7 +310,7 @@ JS; |
310 | 310 | </div> |
311 | 311 | <div class="row"> |
312 | 312 | <div class="col-md-12 col-xs-12" style="text-align:center;margin-top: 20px;margin-bottom: -35px;"> |
313 | - <a href='site/object/' class="button1 more-projects"><?= Yii::t('app', 'sect2_6') ?></a> | |
313 | + <a href='site/object/index' class="button1 more-projects"><?= Yii::t('app', 'sect2_6') ?></a> | |
314 | 314 | </div> |
315 | 315 | </div> |
316 | 316 | </div> | ... | ... |
frontend/web/css/main.css
... | ... | @@ -332,6 +332,7 @@ section.bar.background-gray.steps-pre:before { |
332 | 332 | .steps-pre h2{margin: 4px 0;font-size: 42px;} |
333 | 333 | #get-it {padding: 30px 0 10px;background-color:#0080ca;} |
334 | 334 | #main-page .blue-fon .heading h2{border:none;} |
335 | +#main-page .row.portfolio{display: flex;flex-wrap: wrap;} | |
335 | 336 | .main-slider .carousel-inner, .main-slider .carousel-inner > .item {height:100%;width:100%;position:relative;} |
336 | 337 | .main-slider .img-responsive, .thumbnail > img, .main-slider .thumbnail a > img, .carousel-inner > .item > img, .main-slider .carousel-inner > .item > a > img { |
337 | 338 | width: 100%; |
... | ... | @@ -525,6 +526,7 @@ section.bar.background-gray.steps-pre:before { |
525 | 526 | .main-slider {min-height: 620px;} |
526 | 527 | } |
527 | 528 | @media(min-width:992px){ |
529 | + #calculate-modal .modal-dialog{width: 90%!important;max-width: 1550px!important;} | |
528 | 530 | .links-ses-for-wr .container .row p {margin: 7px 0px;} |
529 | 531 | p.coord1{margin-top:-30px;} |
530 | 532 | .object_main_title .main_omt{ | ... | ... |