mitri4
/
expomap
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

EXPO-95_2

Browse Source
remotes/origin/1203
pavel 11 years ago
parent ead65c743c
commit 01c9462c0c
6 changed files with 141 additions and 74 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      templates/client/includes/accounts/current_user.html
  2. 1
      templates/client/includes/company/company_edit.html
  3. 85
      templates/client/static_client/js/_modules/page.company.js
  4. 120
      templates/client/static_client/js/_modules/page.profile.js
  5. 2
      templates/client/static_client/js_min/_modules/page.company.min.js
  6. 2
      templates/client/static_client/js_min/_modules/page.profile.min.js

5
templates/client/includes/accounts/current_user.html
Unescape View File

@ -538,7 +538,10 @@
noImageSrc:"{% static 'client/img/no-userpic-big.gif' %}",
// text and paths for dynamically rendered selectboxes
addCompanyButtonId:'add-new-company',
selectBox:[
companyAddInputMask:'http://expomap.ru/members/',
avatarInputId:"id_avatar",
selectBox:[
{id:'id_country'},
{id:'id_theme',
placeholder:'Выберите тематику компании'

1
templates/client/includes/company/company_edit.html
Unescape View File

@ -606,6 +606,7 @@
editButtonClass:'e-btn',
avatarButtonClass:'avatar-btn',
avatarImageClass:'user-avatar',
avatarInputId:"id_avatar",
noImageSrc:"{% static 'client/img/no-logo.png' %}",
// text and paths for dynamically rendered selectboxes

85
templates/client/static_client/js/_modules/page.company.js
Unescape View File

@ -369,8 +369,9 @@ if (EXPO.company){
if($avatar.length){
$avatar.attr('src', data.url);
this.refreshState();
}
$('.p-editable').removeClass('pe-current');
}
};
@ -657,53 +658,67 @@ if (EXPO.company){
self.forms[formName].refreshState();
return false;
});
/**
* edit button
*/
$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
//close other active editable forms
var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
$description = $wrapper.find('.'+self.opt.descriptionClass),
$editable = $wrapper.find('.'+self.opt.editableClass);
$editables.each(function () {
if($('.'+self.opt.avatarButtonClass).length){
/**
* avatar image choose button
*/
$('.'+self.opt.editButtonClass+','+' .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
var $input = $('#'+self.opt.avatarInputId);
$input.trigger('click');
return false;
});
}else{
/**
* edit button
*/
$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
//close other active editable forms
var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
$description = $wrapper.find('.'+self.opt.descriptionClass),
$editable = $wrapper.find('.'+self.opt.editableClass);
if($(this).hasClass(self.opt.formCurrentClass)){
if(self.forms[formId].refrashable){
$editables.each(function () {
var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
$description = $wrapper.find('.'+self.opt.descriptionClass),
$editable = $wrapper.find('.'+self.opt.editableClass);
if($(this).hasClass(self.opt.formCurrentClass)){
if(self.forms[formId].refrashable){
self.forms[formId].refreshState();
$editable.removeClass(EXPO.company.opt.formCurrentClass);
}else{
$editable.removeClass(self.opt.formCurrentClass);
}
self.forms[formId].refreshState();
$editable.removeClass(EXPO.company.opt.formCurrentClass);
}else{
$editable.removeClass(self.opt.formCurrentClass);
}
});
}
});
if(self.forms[formId].refrashable){
$editable.removeClass('hidden');
$description.addClass('hidden');
}else{
if(self.forms[formId].refrashable){
$editable.removeClass('hidden');
$description.addClass('hidden');
}else{
}
$editable.addClass(self.opt.formCurrentClass);
$(document).on('click.form', function(event) {
var targetObj = $(event.target);
if (targetObj.parents().filter('.e-form').length < 1) {
$editable.removeClass(self.opt.formCurrentClass);
self.forms[formName].refreshState();
$(document).off('click.form');
}
});
return false;
$editable.addClass(self.opt.formCurrentClass);
$(document).on('click.form', function(event) {
var targetObj = $(event.target);
if (targetObj.parents().filter('.e-form').length < 1) {
$editable.removeClass(self.opt.formCurrentClass);
self.forms[formName].refreshState();
$(document).off('click.form');
}
});
return false;
});
});
}
});
});
};

120
templates/client/static_client/js/_modules/page.profile.js
Unescape View File

@ -363,8 +363,9 @@ if (EXPO.profile){
if($avatar.length){
$avatar.attr('src', data.url);
this.refreshState();
}
$('.p-editable').removeClass('pe-current');
}
};
@ -468,7 +469,8 @@ if (EXPO.profile){
$(function () {
var $editables = $('.'+self.opt.editableClass),
$country = $('#'+self.opt.selectBox[0].id),
$city = $('#'+self.opt.selectBox[2].id);
$city = $('#'+self.opt.selectBox[2].id),
$companyUrl = $("#id_url");
$waiter = $('#wait-ajax').css({'z-index': '8012'});
/**
@ -627,50 +629,62 @@ if (EXPO.profile){
self.forms[formName].refreshState();
return false;
});
/**
* edit button
*/
$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
//close other active editable forms
var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
$description = $wrapper.find('.'+self.opt.descriptionClass),
$editable = $wrapper.find('.'+self.opt.editableClass);
$editables.each(function () {
if($('.'+self.opt.avatarButtonClass).length){
/**
* avatar image choose button
*/
$('.'+self.opt.editButtonClass+','+' .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
var $input = $('#'+self.opt.avatarInputId);
$input.trigger('click');
return false;
});
}else{
/**
* edit button
*/
$('.'+self.opt.editButtonClass+', .'+self.opt.avatarButtonClass, $wrapper).on('click', function () {
//close other active editable forms
var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
$description = $wrapper.find('.'+self.opt.descriptionClass),
$editable = $wrapper.find('.'+self.opt.editableClass);
if($(this).hasClass(self.opt.formCurrentClass)){
if(self.forms[formId].refrashable){
$editables.each(function () {
var $wrapper = $(this).closest('.'+self.opt.formWrapperClass),
formId = $wrapper.find('.'+self.opt.updateFormClass).attr('id'),
$description = $wrapper.find('.'+self.opt.descriptionClass),
$editable = $wrapper.find('.'+self.opt.editableClass);
if($(this).hasClass(self.opt.formCurrentClass)){
if(self.forms[formId].refrashable){
self.forms[formId].refreshState();
$editable.removeClass(EXPO.company.opt.formCurrentClass);
}else{
$editable.removeClass(self.opt.formCurrentClass);
}
self.forms[formId].refreshState();
$editable.removeClass(EXPO.profile.opt.formCurrentClass);
}else{
$editable.removeClass(self.opt.formCurrentClass);
}
});
}
});
if(self.forms[formId].refrashable){
$editable.removeClass('hidden');
$description.addClass('hidden');
}else{
if(self.forms[formId].refrashable){
$editable.removeClass('hidden');
$description.addClass('hidden');
}else{
}
$editable.addClass(self.opt.formCurrentClass);
$(document).on('click.form', function(event) {
var targetObj = $(event.target);
if (targetObj.parents().filter('.e-form').length < 1) {
$editable.removeClass(self.opt.formCurrentClass);
self.forms[formName].refreshState();
$(document).off('click.form');
}
});
return false;
$editable.addClass(self.opt.formCurrentClass);
$(document).on('click.form', function(event) {
var targetObj = $(event.target);
if (targetObj.parents().filter('.e-form').length < 1) {
$editable.removeClass(self.opt.formCurrentClass);
self.forms[formName].refreshState();
$(document).off('click.form');
}
});
return false;
});
});
}
});
@ -682,7 +696,41 @@ if (EXPO.profile){
$.fancybox.open('#'+ self.opt.addCompany.modalId);
return false;
});
/**
* add company url placeholder
*/
$companyUrl.on('focus', function () {
var $this = $(this),
placeholder = self.opt.companyAddInputMask;
if($.trim($this.val()) == ''){
$this.val(placeholder);
}
return false;
});
$companyUrl.on('click', function () {
if (this.setSelectionRange && $.trim($(this).val()) == self.opt.companyAddInputMask){
var len = $(this).val().length;
this.setSelectionRange(len, len);
}
});
$companyUrl.on('keypress', function () {
var $this = $(this),
placeholder = self.opt.companyAddInputMask;
if($.trim($this.val()) == ''){
$this.val(placeholder);
}
});
$companyUrl.on('blur', function () {
var $this = $(this),
placeholder = self.opt.companyAddInputMask;
if($.trim($this.val()) == placeholder){
$this.val('');
}
});
});

2
templates/client/static_client/js_min/_modules/page.company.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
templates/client/static_client/js_min/_modules/page.profile.min.js vendored
View File

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