From f61f63e2702b03c74f6924efdc2d79f82389aab1 Mon Sep 17 00:00:00 2001 From: icemate Date: Wed, 24 Feb 2016 13:27:46 +0200 Subject: [PATCH] tokar commit --- frontend/controllers/SiteController.php | 5 +++++ frontend/views/layouts/main.php | 2 +- frontend/views/site/forms-modal-login.php | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/web/css/style.css | 14 ++++++++++---- frontend/web/images/arrow-main-menu.png | Bin 544 -> 0 bytes frontend/web/images/arrow-search.png | Bin 2895 -> 0 bytes frontend/web/images/artweb.png | Bin 953 -> 0 bytes frontend/web/images/ico-contact.png | Bin 886 -> 0 bytes frontend/web/images/ico-fed-1.png | Bin 1301 -> 0 bytes frontend/web/images/ico-fed-2.png | Bin 1574 -> 0 bytes frontend/web/images/ico-fed-3.png | Bin 1294 -> 0 bytes frontend/web/images/ico-profile.png | Bin 998 -> 0 bytes frontend/web/images/ico-question.png | Bin 789 -> 0 bytes frontend/web/images/ico-search.png | Bin 754 -> 0 bytes frontend/web/images/logo.png | Bin 3333 -> 0 bytes frontend/web/images/menu-pic-1.jpg | Bin 19490 -> 0 bytes frontend/web/images/sect-bg-1.jpg | Bin 137258 -> 0 bytes frontend/web/images/sect-bg-4.jpg | Bin 28112 -> 0 bytes frontend/web/images/shadow-map.png | Bin 478 -> 0 bytes frontend/web/images/soc-ico-2.png | Bin 3104 -> 0 bytes frontend/web/images/soc-ico-4.png | Bin 3094 -> 0 bytes frontend/web/js/forms.js | 25 +++++++++++++++++++++++++ 22 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 frontend/views/site/forms-modal-login.php diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index d138150..af7e7f5 100755 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -93,6 +93,11 @@ class SiteController extends Controller return $out; } + public function actionFormsModalLogin() + { + return $this->renderAjax('forms-modal-login', []); + } + public function actionFormsModalContacts() { return $this->renderAjax('forms-modal-contacts', []); diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 9a2b3a2..3bcffc4 100755 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -51,7 +51,7 @@ AppAsset::register($this);
Профиль
- + 'loginLinkModal']) ?>
diff --git a/frontend/views/site/forms-modal-login.php b/frontend/views/site/forms-modal-login.php new file mode 100644 index 0000000..6d94fca --- /dev/null +++ b/frontend/views/site/forms-modal-login.php @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css index 3b96e52..bdd8514 100755 --- a/frontend/web/css/style.css +++ b/frontend/web/css/style.css @@ -950,7 +950,6 @@ li.project-home-active span{ font-weight: 700; width: 100%; float: left; - margin-bottom: 5px; } .form-resume-wr form input { width: 240px; @@ -959,6 +958,7 @@ li.project-home-active span{ box-sizing: border-box; padding-left: 10px; margin-bottom: 13px; + margin-top: 5px; } .form-resume-wr form textarea { width: 240px; @@ -3373,7 +3373,7 @@ ul.proektant-comments {margin-top: 15px} background:url("/images/menu_icons.png") -44px 0 no-repeat; } /***modal***/ -#modal_form_favorite, #modal_form_offer, #modal_form_question { +#modal_form_favorite, #modal_form_offer, #modal_form_question, #modal_form_login { width: 460px; height: 263px; position: absolute; @@ -3385,6 +3385,7 @@ ul.proektant-comments {margin-top: 15px} z-index: 9992; } #modal_form_question {height: 533px} +#modal_form_login {height: 423px} #modal_form_favorite .res_form_line {bottom: 85px} .page-favorite { height: 85px; @@ -4104,7 +4105,7 @@ ul.min_markers_two .comments_block{width:938px;height:498px;background-color:#fcfcfc;border:1px solid #b7b7b7;border-right:none;margin-bottom:57px;color:#333;font-family:Roboto;font-size:13px;position:relative;overflow:hidden;outline:none}.comment_type{width:940px}.comment_type .pole{width:660px;margin:0 auto;position:relative}.comment_type .mes_title{font-size:18px;color:#333;margin:18px 0}.message_text{width:638px;height:78px;resize:none;border:1px solid #c2c2c2;margin:0 auto;margin-bottom:26px;margin-top:18px;padding:10px;font-family:Roboto}.send_mess_but{outline:none;border:none;cursor:pointer;font-size:12px!important;padding-top:2px;width:170px;height:43px;text-align:center;text-transform:uppercase;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr = '#148ad6',endColorstr = '#0072bc');-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr = '#148ad6',endColorstr = '#0072bc')";background-image:-moz-linear-gradient(top,#148ad6,#0072bc);background-image:-ms-linear-gradient(top,#148ad6,#0072bc);background-image:-o-linear-gradient(top,#148ad6,#0072bc);background-image:-webkit-gradient(linear,center top,center bottom,from(#148ad6),to(#0072bc));background-image:-webkit-linear-gradient(top,#148ad6,#0072bc);background-image:linear-gradient(top,#148ad6,#0072bc);color:#fff;border-bottom:2px solid #0054a6;border-radius:4px;transition:.1s;top:170px;line-height:3.5}.send_mess_but:hover{opacity:.9}.send_mess_but:active{line-height:3.7}.pick_file{position:absolute;top:170px;right:0;width:130px}.pick_file .link:after{content:'';background:url(/images/skrpk.png) left center no-repeat;position:absolute;width:19px;height:21px;left:-28px;top:0}.pick_file .link{text-transform:uppercase;color:#0276c0;font-size:13px;cursor:pointer;text-decoration:none;border-bottom:1px solid #70b2db;position:relative}.pick_file .capt{color:#c2c2c2;font-size:11px;line-height:16px;margin-top:3px}.comment_text{position:relative;padding:12px 13px;width:602px;border:1px solid #c2c2c2;min-height:74px;left:10px;line-height:1.3;background-color:#fff}.comment.left .comment_text{float:left}.comment.right .comment_text{float:right}.comment.left .comment_text:before{content:'';background:url(/images/mes_bord_left.png);position:absolute;width:11px;height:11px;top:-1px;left:-11px}.comment.right .comment_text:before{content:'';background:url(/images/mes_bord_right.png);position:absolute;width:11px;height:11px;top:-1px;right:-11px}.comment.left .author_pic{float:left;margin:0 10px}.comment.right .author_pic{float:right;margin:0 25px 0 30px}.comment_time{color:#c6c6c6;font-family:Roboto;font-size:13px;font-weight:600;line-height:32px;position:absolute}.comment.left .comment_time{top:17px;right:-64px}.comment.right .comment_time{top:18px;left:-64px}.comment{position:relative;margin:30px 21px 30px 1px}.comment .offer_link a{color:#0173bd;position:relative}.comment .offer_link a:before{content:'';position:absolute;background:url(/images/skrpk_sm.png) left center no-repeat;width:19px;height:21px;left:-26px;top:-3px}.comment.right .offer_link{float:right;margin-right:94px;margin-top:12px;margin-bottom:-17px}.comment.left .offer_link{left:104px;bottom:-27px}.comment_block .content{overflow:auto;width:938px;height:498px}.fileform{background-color:#FFF;border:1px solid #CCC;border-radius:2px;cursor:pointer;height:26px;overflow:hidden;padding:2px;position:relative;text-align:left;vertical-align:middle;width:230px}.comment_type form{width:660px;margin:0 auto}.comment_type form label{color:#333;font-family:Roboto;font-size:18px}.input_file_text{color:#c2c2c2;font-size:11px;font-family:Roboto;width:125px;position:absolute;right:0;line-height:16px;top:18px;overflow:hidden;text-overflow:ellipsis;white-space:pre-line}.inputfile{float:right;position:relative;width:153px;padding-bottom:10px;background:url(/images/skrpk.png);background-repeat:no-repeat}.input_file{opacity:0;cursor:pointer;width:160px}.inputfile .file_input_title{position:absolute;color:#0276c0;border-bottom:1px solid #0276c0;text-transform:uppercase;font-family:Roboto;font-size:13px;right:0}.jspArrow{background-color:#0173bd;width:20px;height:20px}.jspVerticalBar{width:20px}.jspVerticalBar .jspArrow{height:20px}.jspTrack{background:#ebebeb;position:relative}.jspDrag{background:#c2c2c2;position:relative;top:0;left:0;cursor:pointer;border-left:2px solid #ebebeb;border-right:2px solid #ebebeb}.jspVerticalBar{background:#ebebeb}.jspArrowUp{background:#0173bd url(/images/scroll_up.png) center center no-repeat}.jspArrowUp:hover{opacity:.8}.jspArrowUp:active{background-position-y:1px!important}.jspDisabled.jspArrowUp{background:#80808d url(/images/scroll_up_grey.png) center center no-repeat}.jspArrowDown{background:#0173bd url(/images/scroll_down.png) center center no-repeat}.jspArrowDown:hover{opacity:.8}.jspArrowDown:active{background-position-y:1px!important}.jspArrowDown{background:#0173bd url(/images/scroll_down.png) center center no-repeat}.jspDisabled.jspArrowDown{background:#80808d url(/images/scroll_down_grey.png) center center no-repeat}.jspContainer{outline:none;border:none} /***form-order***/ #modal_form_offer {height: 505px;} -#modal_form_offer,#modal_form_question{margin-top: 70px;} +#modal_form_offer,#modal_form_question, #modal_form_question{margin-top: 70px;} .form-resume-wr form input[type="submit"]{margin-left: 55px;} .form-resume-wr form{top:72px;} .form-resume-wr.offer form textarea { @@ -5301,7 +5302,12 @@ input.disabled.admin-check:checked + label, input.disabled.admin-check:checked + float: right; margin-right: -5px; } - +.who-you-are input.custom-radio + label span, .who-you-are input.custom-check + label span{margin-top: 2px} +.login-check-remember label{ + margin-left: 6px !important; + width: auto !important; +} +.login-check-remember label span {margin-left: 0 !important;margin-top: 2px !important;} diff --git a/frontend/web/images/arrow-main-menu.png b/frontend/web/images/arrow-main-menu.png index dc6f47b..0736019 100755 Binary files a/frontend/web/images/arrow-main-menu.png and b/frontend/web/images/arrow-main-menu.png differ diff --git a/frontend/web/images/arrow-search.png b/frontend/web/images/arrow-search.png index a1e06ad..524e589 100644 Binary files a/frontend/web/images/arrow-search.png and b/frontend/web/images/arrow-search.png differ diff --git a/frontend/web/images/artweb.png b/frontend/web/images/artweb.png index fa9f1e3..076f6ed 100755 Binary files a/frontend/web/images/artweb.png and b/frontend/web/images/artweb.png differ diff --git a/frontend/web/images/ico-contact.png b/frontend/web/images/ico-contact.png index 381d003..28de496 100755 Binary files a/frontend/web/images/ico-contact.png and b/frontend/web/images/ico-contact.png differ diff --git a/frontend/web/images/ico-fed-1.png b/frontend/web/images/ico-fed-1.png index 5734a95..2fb3d91 100755 Binary files a/frontend/web/images/ico-fed-1.png and b/frontend/web/images/ico-fed-1.png differ diff --git a/frontend/web/images/ico-fed-2.png b/frontend/web/images/ico-fed-2.png index 9259818..a45acb8 100755 Binary files a/frontend/web/images/ico-fed-2.png and b/frontend/web/images/ico-fed-2.png differ diff --git a/frontend/web/images/ico-fed-3.png b/frontend/web/images/ico-fed-3.png index 00b10b3..abd8765 100755 Binary files a/frontend/web/images/ico-fed-3.png and b/frontend/web/images/ico-fed-3.png differ diff --git a/frontend/web/images/ico-profile.png b/frontend/web/images/ico-profile.png index 1eb46ce..08fe0af 100755 Binary files a/frontend/web/images/ico-profile.png and b/frontend/web/images/ico-profile.png differ diff --git a/frontend/web/images/ico-question.png b/frontend/web/images/ico-question.png index 85abad7..0463f0a 100755 Binary files a/frontend/web/images/ico-question.png and b/frontend/web/images/ico-question.png differ diff --git a/frontend/web/images/ico-search.png b/frontend/web/images/ico-search.png index 53f5c32..8d22750 100755 Binary files a/frontend/web/images/ico-search.png and b/frontend/web/images/ico-search.png differ diff --git a/frontend/web/images/logo.png b/frontend/web/images/logo.png index d43860b..8cccf91 100755 Binary files a/frontend/web/images/logo.png and b/frontend/web/images/logo.png differ diff --git a/frontend/web/images/menu-pic-1.jpg b/frontend/web/images/menu-pic-1.jpg index a9b5386..0daaa35 100755 Binary files a/frontend/web/images/menu-pic-1.jpg and b/frontend/web/images/menu-pic-1.jpg differ diff --git a/frontend/web/images/sect-bg-1.jpg b/frontend/web/images/sect-bg-1.jpg index 24a585d..aa5f597 100755 Binary files a/frontend/web/images/sect-bg-1.jpg and b/frontend/web/images/sect-bg-1.jpg differ diff --git a/frontend/web/images/sect-bg-4.jpg b/frontend/web/images/sect-bg-4.jpg index e2c65a3..2bc836d 100755 Binary files a/frontend/web/images/sect-bg-4.jpg and b/frontend/web/images/sect-bg-4.jpg differ diff --git a/frontend/web/images/shadow-map.png b/frontend/web/images/shadow-map.png index 91915d4..37946dc 100755 Binary files a/frontend/web/images/shadow-map.png and b/frontend/web/images/shadow-map.png differ diff --git a/frontend/web/images/soc-ico-2.png b/frontend/web/images/soc-ico-2.png index da018ad..69daa21 100755 Binary files a/frontend/web/images/soc-ico-2.png and b/frontend/web/images/soc-ico-2.png differ diff --git a/frontend/web/images/soc-ico-4.png b/frontend/web/images/soc-ico-4.png index 656d979..f9e3447 100755 Binary files a/frontend/web/images/soc-ico-4.png and b/frontend/web/images/soc-ico-4.png differ diff --git a/frontend/web/js/forms.js b/frontend/web/js/forms.js index 6bc3e01..91d585d 100755 --- a/frontend/web/js/forms.js +++ b/frontend/web/js/forms.js @@ -4,6 +4,25 @@ $(document).ready(function(){ $('body').append('
').append('
'); } + function addToLogin(){ + $.post("/site/forms-modal-login", function (data) { + $('.forms-modal-hide').append(data) + }) + .fail(function(){ + $('#overlay, .forms-modal-hide').remove(); + alert(txtErrorModal) + }) + .done(function() { + var newMarg = $(window).scrollTop(); + $('#overlay').fadeIn(400, + function(){ + $('.forms-modal-hide>div') + .css({display:'block', marginTop:-230+newMarg}) + .animate({opacity: 1, top: '50%'}, 200); + }); + }) + } + function addToFavorites(){ $.post("/site/forms-modal-fav", function (data) { $('.forms-modal-hide').append(data) @@ -61,6 +80,12 @@ $(document).ready(function(){ }) } + //login + $('a.loginLinkModal').click(function(e){ + e.preventDefault() + addRemoveBlocks() + addToLogin() + }) //contacts $('a.contactsLinkModalFirst').click(function(e){ e.preventDefault() -- libgit2 0.21.4