Commit c7b2967dca801cdfec62f3083817ad1a2f3ddcc7
Merge remote-tracking branch 'origin/master'
Showing
2 changed files
with
3 additions
and
42 deletions
Show diff stats
frontend/views/site/individual.php
... | ... | @@ -92,7 +92,7 @@ |
92 | 92 | </div> |
93 | 93 | </div> |
94 | 94 | <div class="col-md-12 col-xs-12 get_station_center"> |
95 | - <a href="#" class="btn button1 modaled init-button-сalculate mini" data-title="<?= Yii::t('app', 'modal3') ?> <?= Yii::t('app', 'modal3_1') ?>" data-toggle="modal" data-target="#feedback-modal"><?= Yii::t('app', 'modal3') ?> <span><?= Yii::t('app', 'modal3_1') ?></span></a> | |
95 | + <a href="#" class="btn button1 modaled init-button-сalculate mini press-calculate" data-title="<?= Yii::t('app', 'modal3') ?> <?= Yii::t('app', 'modal3_1') ?>" data-toggle="modal" data-target="#feedback-modal"><?= Yii::t('app', 'modal3') ?> <span><?= Yii::t('app', 'modal3_1') ?></span></a> | |
96 | 96 | </div> |
97 | 97 | </div> |
98 | 98 | </div> |
... | ... | @@ -142,7 +142,7 @@ |
142 | 142 | </div> |
143 | 143 | </div> |
144 | 144 | <div class="col-md-12 col-xs-12 get_station_center"> |
145 | - <a href="#" class="btn button1 modaled init-button-сalculate mini" data-title="<?= Yii::t('app', 'modal3') ?> <?= Yii::t('app', 'modal3_1') ?>" data-toggle="modal" data-target="#feedback-modal"><?= Yii::t('app', 'modal3') ?> <span><?= Yii::t('app', 'modal3_1') ?></span></a> | |
145 | + <a href="#" class="btn button1 modaled init-button-сalculate mini press-calculate" data-title="<?= Yii::t('app', 'modal3') ?> <?= Yii::t('app', 'modal3_1') ?>" data-toggle="modal" data-target="#feedback-modal"><?= Yii::t('app', 'modal3') ?> <span><?= Yii::t('app', 'modal3_1') ?></span></a> | |
146 | 146 | </div> |
147 | 147 | </div> |
148 | 148 | </div> | ... | ... |
frontend/web/js/script.js
... | ... | @@ -112,16 +112,7 @@ $( |
112 | 112 | } |
113 | 113 | ); |
114 | 114 | |
115 | - $(".close").on('click', function(){ | |
116 | - $(".send-form").removeClass("specialist"); | |
117 | - $(".send-form").removeClass("calculate"); | |
118 | - $(".send-form").removeClass("order"); | |
119 | - $(".send-form").removeClass("call"); | |
120 | - $(".send-form").removeClass("callback"); | |
121 | - $(".send-form").removeClass("consultation"); | |
122 | - $("#feedback-form")['0'].reset(); | |
123 | - }); | |
124 | - $(".modal.fade.in").on('click',function(){ | |
115 | + $(".close, .modal.fade").on('click', function(){ | |
125 | 116 | $("#feedback-form")['0'].reset(); |
126 | 117 | $(".send-form").removeClass("specialist"); |
127 | 118 | $(".send-form").removeClass("calculate"); |
... | ... | @@ -132,57 +123,27 @@ $( |
132 | 123 | }); |
133 | 124 | $(".press-consultation").on('click',function(){ |
134 | 125 | $("#feedback-form")['0'].reset(); |
135 | - $(".send-form").removeClass("specialist"); | |
136 | - $(".send-form").removeClass("calculate"); | |
137 | - $(".send-form").removeClass("order"); | |
138 | - $(".send-form").removeClass("call"); | |
139 | - $(".send-form").removeClass("callback"); | |
140 | 126 | $(".send-form").addClass("consultation"); |
141 | 127 | }); |
142 | 128 | $(".press-specialist").on('click',function(){ |
143 | 129 | $("#feedback-form")['0'].reset(); |
144 | 130 | $(".send-form").addClass("specialist"); |
145 | - $(".send-form").removeClass("calculate"); | |
146 | - $(".send-form").removeClass("order"); | |
147 | - $(".send-form").removeClass("call"); | |
148 | - $(".send-form").removeClass("callback"); | |
149 | - $(".send-form").removeClass("consultation"); | |
150 | 131 | }); |
151 | 132 | $(".press-calculate").on('click',function(){ |
152 | 133 | $("#feedback-form")['0'].reset(); |
153 | - $(".send-form").removeClass("specialist"); | |
154 | 134 | $(".send-form").addClass("calculate"); |
155 | - $(".send-form").removeClass("order"); | |
156 | - $(".send-form").removeClass("call"); | |
157 | - $(".send-form").removeClass("callback"); | |
158 | - $(".send-form").removeClass("consultation"); | |
159 | 135 | }); |
160 | 136 | $(".press-order").on('click',function(){ |
161 | 137 | $("#feedback-form")['0'].reset(); |
162 | - $(".send-form").removeClass("specialist"); | |
163 | - $(".send-form").removeClass("calculate"); | |
164 | 138 | $(".send-form").addClass("order"); |
165 | - $(".send-form").removeClass("call"); | |
166 | - $(".send-form").removeClass("callback"); | |
167 | - $(".send-form").removeClass("consultation"); | |
168 | 139 | }); |
169 | 140 | $(".press-call").on('click',function(){ |
170 | 141 | $("#feedback-form")['0'].reset(); |
171 | - $(".send-form").removeClass("specialist"); | |
172 | - $(".send-form").removeClass("calculate"); | |
173 | - $(".send-form").removeClass("order"); | |
174 | 142 | $(".send-form").addClass("call"); |
175 | - $(".send-form").removeClass("callback"); | |
176 | - $(".send-form").removeClass("consultation"); | |
177 | 143 | }); |
178 | 144 | $(".press-callback").on('click',function(){ |
179 | 145 | $("#feedback-form")['0'].reset(); |
180 | - $(".send-form").removeClass("specialist"); | |
181 | - $(".send-form").removeClass("calculate"); | |
182 | - $(".send-form").removeClass("order"); | |
183 | - $(".send-form").removeClass("call"); | |
184 | 146 | $(".send-form").addClass("callback"); |
185 | - $(".send-form").removeClass("consultation"); | |
186 | 147 | }); |
187 | 148 | } |
188 | 149 | ); |
189 | 150 | \ No newline at end of file | ... | ... |