EXPO-176 ready

remotes/origin/1203
pavel 11 years ago
parent fd50c18e20
commit 8b52f851d6
  1. 3
      templates/client/popups/user_information.html
  2. 31
      templates/client/static_client/css/main.css
  3. 2
      templates/client/static_client/css_min/main.min.css
  4. 4
      templates/client/static_client/js/_modules/block.common.js
  5. 14
      templates/client/static_client/js/_modules/block.registration.completion.js
  6. 2
      templates/client/static_client/js_min/_modules/block.common.min.js
  7. 2
      templates/client/static_client/js_min/_modules/block.registration.completion.min.js

@ -77,9 +77,10 @@
<th>www.expomap.ru/</th> <th>www.expomap.ru/</th>
<td class="input_bottom" colspan="3"> <td class="input_bottom" colspan="3">
<div class="pwf-line"> <div class="pwf-line">
<div class="pwf-field"> <div class="pwf-field url-field">
{{ form.url }} {{ form.url }}
</div> </div>
<div class="hint-box">ivanova</div>
<div class="pwf-msg err-message-box"></div> <div class="pwf-msg err-message-box"></div>
</div> </div>

@ -13460,6 +13460,7 @@ hr + .rq-note {
/************************\ /************************\
# completion of registration modal # completion of registration modal
# after registration form
\***********************/ \***********************/
.after-register-modal .pw-form .pwf-line{ .after-register-modal .pw-form .pwf-line{
@ -13510,7 +13511,37 @@ hr + .rq-note {
.after-register-modal .pwf-line .err-message-box{ .after-register-modal .pwf-line .err-message-box{
margin-top: 4px; margin-top: 4px;
} }
.after-register-modal .pwf-line .hint-box{
display: none;
width: 62px;
position: absolute;
text-align: center;
margin-left: 31px;
padding: 8px 12px;
color: #000000;
background-color: #aaaaaa;
opacity:.6;
margin-top: -68px;
border-radius:4px;
}
.after-register-modal .pwf-line .err + .hint-box{
display: none !important;
}
.after-register-modal .pwf-line .hint-box:after{
top: 100%;
left: 50%;
border: solid transparent;
content: " ";
height: 0;
width: 0;
position: absolute;
pointer-events: none;
border-color: rgba(170, 170, 170, 0);
border-top-color: #aaaaaa;
border-width: 4px;
margin-left: -4px;
}
/************************\ /************************\
# successful registration message # successful registration message
\***********************/ \***********************/

File diff suppressed because one or more lines are too long

@ -218,12 +218,12 @@ if (EXPO.common){
formData = $(this).serialize(), formData = $(this).serialize(),
method = $form.attr("method"), method = $form.attr("method"),
$succesRegisterModal = $("#pw-reg-complete"), $succesRegisterModal = $("#pw-reg-complete"),
$resend = $(".resend-letter", $succesRegisterModal); $resend = $(".resend-letter", $succesRegisterModal),
mailVal = $.trim($('#id_email',$form).val()), mailVal = $.trim($('#id_email',$form).val()),
callback = function (data) { callback = function (data) {
if (data.success){ if (data.success){
$.fancybox.close();
$(".error", $form).remove(); $(".error", $form).remove();
$(".required.err", $form).removeClass("required err"); $(".required.err", $form).removeClass("required err");

@ -108,13 +108,15 @@ if (EXPO.registration.completion) {
var com = EXPO.common; var com = EXPO.common;
$(function () { $(function () {
var $form = $('#end-reg-form');
$('body').addClass('body-fixed'); $('body').addClass('body-fixed');
placeInput('100%'); placeInput('100%');
$('#id_code_country').select2({ $('#id_code_country').val('7').select2({
width: '95px' width: '95px'
}); });
$.fancybox.open([ $.fancybox.open([
{ {
href: '#end-reg' href: '#end-reg'
@ -137,12 +139,20 @@ if (EXPO.registration.completion) {
}); });
$('#end-reg-form').on('submit', function (e) { $form.on('submit', function (e) {
e.preventDefault(); e.preventDefault();
var url = $(this).attr('action'); var url = $(this).attr('action');
var formData = $(this).serialize(); var formData = $(this).serialize();
$.post(url, formData, registrationSuccess) $.post(url, formData, registrationSuccess)
}); });
$(".url-field:not(.err) input",$form).focusin(function () {
$(this).parent().siblings(".hint-box").fadeIn();
});
$(".url-field:not(err) input",$form).focusout(function () {
$(this).parent().siblings(".hint-box").fadeOut();
});
}); });

File diff suppressed because one or more lines are too long

@ -1 +1 @@
var EXPO=EXPO||{};EXPO.registration=EXPO.registration||{},EXPO.registration.completion?console.warn("WARNING: EXPO.registration..completion is already defined!"):EXPO.registration.completion=function(){var e={},t=function(e){var t=$("#end-reg"),o="pwf-line",i=EXPO.common.opt.activeClass,r="phone",n="label",a=EXPO.common.opt.errMessageClass;if($("."+a,t).removeClass(i),e.success)location=e.redirect;else{console.log(e);for(var s in e.errors)e.errors.hasOwnProperty(s)&&($itemWrap=$("#id_"+s).closest("."+o),$("."+a,$itemWrap).addClass(i).text(e.errors[s][0]),$itemWrap.hasClass(r)&&$("."+n,$itemWrap).hide())}},o=function(e){$("#id_country").val("159").select2({placeholder:"Ваша страна",width:e}).on("change",function(){var e=$("option:selected",this).attr("data-phone-code");""!=$.trim(e)?$("#id_code_country").select2("val",e):$("#id_code_country").select2("val","")}),$("#id_city").select2({placeholder:"Ваш город",width:e,ajax:{url:"/city/get-city/",dataType:"json",quietMillis:200,data:function(e,t,o){var o=$("#id_country").val();return{term:e,page:t,country:o}},results:function(e){var t=[];return $.each(e,function(e,o){t.push({id:o.id,text:o.label})}),{results:t}}},initSelection:function(e,t){var o=$(e).val(),i=$(e).attr("data-init-text");t({id:o,text:i})}})};e.opt={};EXPO.common;return $(function(){$("body").addClass("body-fixed"),o("100%"),$("#id_code_country").select2({width:"95px"}),$.fancybox.open([{href:"#end-reg"}],{closeBtn:!1,closeClick:!1,modal:!0,scrolling:"no",helpers:{overlay:{closeClick:!1},locked:!0},keys:{close:null}}),$("#end-reg-form").on("submit",function(e){e.preventDefault();var o=$(this).attr("action"),i=$(this).serialize();$.post(o,i,t)})}),e.init=function(e){$.extend(this.opt,e)},e}(); var EXPO=EXPO||{};EXPO.registration=EXPO.registration||{},EXPO.registration.completion?console.warn("WARNING: EXPO.registration..completion is already defined!"):EXPO.registration.completion=function(){var t={},e=function(t){var e=$("#end-reg"),i="pwf-line",o=EXPO.common.opt.activeClass,n="phone",r="label",a=EXPO.common.opt.errMessageClass;if($("."+a,e).removeClass(o),t.success)location=t.redirect;else{console.log(t);for(var s in t.errors)t.errors.hasOwnProperty(s)&&($itemWrap=$("#id_"+s).closest("."+i),$("."+a,$itemWrap).addClass(o).text(t.errors[s][0]),$itemWrap.hasClass(n)&&$("."+r,$itemWrap).hide())}},i=function(t){$("#id_country").val("159").select2({placeholder:"Ваша страна",width:t}).on("change",function(){var t=$("option:selected",this).attr("data-phone-code");""!=$.trim(t)?$("#id_code_country").select2("val",t):$("#id_code_country").select2("val","")}),$("#id_city").select2({placeholder:"Ваш город",width:t,ajax:{url:"/city/get-city/",dataType:"json",quietMillis:200,data:function(t,e,i){var i=$("#id_country").val();return{term:t,page:e,country:i}},results:function(t){var e=[];return $.each(t,function(t,i){e.push({id:i.id,text:i.label})}),{results:e}}},initSelection:function(t,e){var i=$(t).val(),o=$(t).attr("data-init-text");e({id:i,text:o})}})};t.opt={};EXPO.common;return $(function(){var t=$("#end-reg-form");$("body").addClass("body-fixed"),i("100%"),$("#id_code_country").val("7").select2({width:"95px"}),$.fancybox.open([{href:"#end-reg"}],{closeBtn:!1,closeClick:!1,modal:!0,scrolling:"no",helpers:{overlay:{closeClick:!1},locked:!0},keys:{close:null}}),t.on("submit",function(t){t.preventDefault();var i=$(this).attr("action"),o=$(this).serialize();$.post(i,o,e)}),$(".url-field:not(.err) input",t).focusin(function(){$(this).parent().siblings(".hint-box").fadeIn()}),$(".url-field:not(err) input",t).focusout(function(){$(this).parent().siblings(".hint-box").fadeOut()})}),t.init=function(t){$.extend(this.opt,t)},t}();
Loading…
Cancel
Save