placeholder for social for fields both for profile edit page and comapny edit page

remotes/origin/1203
pavel 11 years ago
parent 1b223a58ae
commit 82feee4acf
  1. 2
      templates/client/accounts/new_profile.html
  2. 4
      templates/client/blank.html
  3. 2
      templates/client/includes/company/company_edit.html
  4. 6
      templates/client/static_client/css/main.css
  5. 33
      templates/client/static_client/js/_modules/block.common.js
  6. 1
      templates/client/static_client/js/_modules/page.company.js
  7. 2
      templates/client/static_client/js_min/_modules/block.common.min.js
  8. 2
      templates/client/static_client/js_min/_modules/page.profile.min.js

@ -120,7 +120,7 @@
</div>
</div>
<div class="site_link" {% if home_form.instance.country and home_form.instance.city %}style="right:-70px;"{% endif %}>
<div class="site_link">
<a href="{{ request.user.get_permanent_url }}" title="">
{{ request.user.get_permanent_url }}
</a>

@ -45,7 +45,9 @@ This template include basic anf main styles and js files,
errorClass:'error-field',
blobClass:'error-blob',
containerClass:'validate-field'
}
},
socialFormId:'social_form',
socialInputMask:['http://','https://']
});
</script>
</head>

@ -576,6 +576,8 @@
workIn:'в'// there must be 'at' in English
}
});
</script>
{% endblock %}

@ -11822,13 +11822,13 @@ hr + .rq-note {
.add_link_teg b:before {content:'';display:inline-block;width:14px;height:12px;background:url(../img/sprites.png) -365px -53px no-repeat;margin:0 4px 0 0;}
.ic-buttons_pos { position: relative;}
.ic-buttons_text { position: absolute; left: 0; top: 32px; font-size: 13px; color: #a2a2a2; font-weight: 500;font-family:'dindisplay_pro';}
.ic-buttons_text { left: 0; top: 32px; font-size: 13px; color: #a2a2a2; font-weight: 500;font-family:'dindisplay_pro';}
.add_indent { margin-bottom: 4px;}
.ic-links_indent { padding-top: 5px;}
.soc-media-buttons1 { display: inline-block; position: relative; margin: 0 0 0 0!important; top: -2px; left: 5px;}
.soc-media-indent { margin: 29px 0 0 0;}
.soc-media-indent { margin: 10px 0 0 0;}
.pe-current .soc-media-buttons1 { position: static;}
@ -11882,7 +11882,7 @@ hr + .rq-note {
.i-info header { position: relative;}
.site_link { position: absolute; right: 0; width: 201px; top: 41px; font-size: 15px !important; color: #ff6600 !important;font-family:'dindisplay_pro', sans-serif; font-weight: 500; }
.site_link { text-align: right; position: absolute; right: 0; width: 201px; top: 41px; font-size: 15px !important; color: #ff6600 !important;font-family:'dindisplay_pro', sans-serif; font-weight: 500; }
.site_link a { text-decoration: none !important;color: #ff6600 !important;}
.site_link a:before { content:''; width: 16px; height: 16px; background: url(../img/sprites.png) -426px -73px; display: inline-block; margin: 0 5px 0 0; position: relative; top: 4px;}

@ -187,10 +187,12 @@ if (EXPO.common){
validErrorClass = self.opt.staticValidation.errorClass,
validContainerClass = self.opt.staticValidation.containerClass,
$staticFields,
$socialForm,
blobClass = self.opt.staticValidation.blobClass;
$(function () {
$staticFields = $('.'+validErrorClass);
$socialForm = $('#'+self.opt.socialFormId);
$('.'+addClass+', .'+remClass).on('click', function(event){
addText = self.opt.addCalendarText;
remText = self.opt.removeCalendarText;
@ -227,6 +229,37 @@ if (EXPO.common){
}
})
}
/**
* "http://" placeholder for social profiles form on user and company "edit profiles" pages
*/
if($socialForm.length){
$('input:text', $socialForm).on('focus', function () {
var $this = $(this),
placeholder = self.opt.socialInputMask;
if($.trim($this.val()) == ''){
$this.val(placeholder[0]);
}
});
$('input:text', $socialForm).on('keypress', function () {
var $this = $(this),
placeholder = self.opt.socialInputMask;
if($.trim($this.val()) == ''){
$this.val(placeholder[0]);
}
});
$('input:text', $socialForm).on('blur', function () {
var $this = $(this),
placeholder = self.opt.socialInputMask;
for(var i =0; i< placeholder.length; i++){
if($.trim($this.val()) == placeholder[i]){
$this.val('');
}
}
});
}
});

@ -452,6 +452,7 @@ if (EXPO.company){
});
});
});
};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long
Loading…
Cancel
Save