remotes/origin/1203
pavel 11 years ago
parent 7c101745a5
commit d44879a157
  1. 7
      templates/client/includes/accounts/current_user.html
  2. 7
      templates/client/includes/company/company_edit.html
  3. 9
      templates/client/static_client/css/main.css
  4. 2
      templates/client/static_client/css_min/main.min.css
  5. 18
      templates/client/static_client/js/_modules/page.company.js
  6. 17
      templates/client/static_client/js/_modules/page.profile.js
  7. 2
      templates/client/static_client/js_min/_modules/page.company.min.js
  8. 2
      templates/client/static_client/js_min/_modules/page.profile.calendar.min.js
  9. 2
      templates/client/static_client/js_min/_modules/page.profile.min.js

@ -214,11 +214,12 @@
<div class="i-contacts clearfix">
<div class="ic-buttons dd_width_4">
<div class="ic-buttons_text">{% trans 'Добавить профили в соц.сетях:' %}</div>
<div class="ic-buttons_text">{% trans 'Профили в соц.сетях:' %}</div>
<div class="form-item-wrap"><!-- 1 -->
<div class="p-editable editable-wrap social">
<div class="i-descr add_link_text add_link_text_medium soc-media-indent">
<a class="e-btn no-refresh social " href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn social not-complete no-refresh" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn social full-complete no-refresh" href="#" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a>
<ul class="soc-media-buttons soc-media-buttons1">
<li>
@ -260,7 +261,7 @@
</li></li>
</ul>
<div class="add_link_text_text"><b>{% trans '+5 за каждый' %}</b></div>
<div class="add_link_text_text not-complete"><b>{% trans '+5 за каждый' %}</b></div>
</div>

@ -248,14 +248,15 @@
<div class="i-contacts clearfix">
<div class="ic-buttons ic-buttons_pos dd_width_4">
<div class="ic-buttons_text">{% trans 'Добавить профили в соц.сетях:' %}</div>
<div class="ic-buttons_text">{% trans 'Профили в соц.сетях:' %}</div>
<div class="form-item-wrap">
<div class="p-editable editable-wrap social">
<div class="i-descr add_link_text add_link_text_medium soc-media-indent">
<a class="e-btn no-refresh social" href="#" title="">{% trans 'Добавить' %}</a>
<a class="e-btn social not-complete no-refresh" href="#" title=""><i class="fa fa-plus-circle">&nbsp;</i>{% trans 'Добавить' %}</a>
<a class="e-btn social full-complete no-refresh" href="#" title=""><i class="fa fa-pencil-square-o">&nbsp;</i></a>
<ul class="soc-media-buttons soc-media-buttons1">
<li>
@ -298,7 +299,7 @@
</ul>
<div class="add_link_text_text"><b>{% trans '+5 за каждый' %}</b></div>
<div class="add_link_text_text not-complete"><b>{% trans '+5 за каждый' %}</b></div>
</div>
<div class="edit-wrap">
<div class="e-form">

@ -12871,12 +12871,21 @@ hr + .rq-note {
.edit-profile .pe-current .e-form{
display: block;
}
.edit-profile .p-editable{
padding-left: 22px;
}
.edit-profile .p-editable.i-place{
padding-left: 36px;
}
.edit-profile .p-editable.social .e-btn.full-complete{
color: #ff6600;
}
.edit-profile .p-editable.social .e-btn.full-complete:hover{
opacity: 0.7;
}
.edit-profile .i-pict.p-editable{
padding: 0;
}

File diff suppressed because one or more lines are too long

@ -216,6 +216,8 @@ if (EXPO.company){
$input.parent('.required').addClass('err');
}
}
this.refreshState();
};
this.pushHandler = function (data, formName){
var formData = $('#'+formName).serialize();
@ -225,6 +227,22 @@ if (EXPO.company){
};
this.refreshState = function () {
console.log(this);
var fullComplete = true;
$('input:text',this.$form).each(function () {
if($.trim($(this).val()) == ''){
fullComplete = false;
}
});
if(fullComplete){
$('.full-complete',this.$description).removeClass('hidden');
$('.not-complete',this.$description).addClass('hidden');
}else{
$('.full-complete',this.$description).addClass('hidden');
$('.not-complete',this.$description).removeClass('hidden');
}
};
this.ajaxPath = path;

@ -317,6 +317,7 @@ if (EXPO.profile){
}
$('.p-editable').removeClass('pe-current');
this.refreshState();
}else {
for (item in data.errors) {
@ -333,6 +334,22 @@ if (EXPO.profile){
};
this.refreshState = function () {
console.log(this);
var fullComplete = true;
$('input:text',this.$form).each(function () {
if($.trim($(this).val()) == ''){
fullComplete = false;
}
});
if(fullComplete){
$('.full-complete',this.$description).removeClass('hidden');
$('.not-complete',this.$description).addClass('hidden');
}else{
$('.full-complete',this.$description).addClass('hidden');
$('.not-complete',this.$description).removeClass('hidden');
}
};
this.ajaxPath = path;

File diff suppressed because one or more lines are too long

@ -1 +1 @@
var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var t=(EXPO.common,{});return t.opt={},$(function(){}),t.init=function(t){$.extend(this.opt,t);var e=this,s=$("#"+this.opt.scrollBoxId),n=$("#"+this.opt.calenadrId),o=(n.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,$("#"+this.opt.scrollLeftId)),a=$("#"+this.opt.scrollRightId),l=$("."+this.opt.noEventsClass),i=$("."+this.opt.calendarToggleClass),r=this.opt.cellWidth*this.opt.cellsToScroll,c=0,d=function(){var t=0,s=0,n=e.opt.cellWidth,o=$("#"+e.opt.calenadrId),a=o.find("td."+e.opt.currentDayClass).index()+1,l=e.opt.cellsToScroll,i=o.find("."+e.opt.daysClass+" td").length,r=i/l,c=i/a;return s=r-c,e.stepWidth=l*n,e.calendarWidth=n*i,s?(s=Math.floor(s),t=l*s*n):t=0,t};this.currentOffset=d(),this.$messages=[],$(function(){l.each(function(){$(this).attr("colspan")&&1!=$(this).attr("colspan")?$(this).width()>e.stepWidth&&e.$messages.push($(".message",$(this)).width(e.stepWidth).css({marginLeft:e.currentOffset+"px"})):$(this).find("."+e.opt.eventWrapClass).addClass("small")}),$("."+e.opt.eventsClass).each(function(){c++,3==c&&$(this).addClass("grey"),4==c&&($(this).addClass("grey"),c=0)})}),$(window).load(function(){s.mCustomScrollbar({axis:"y",horizontalScroll:!0,setLeft:"-"+EXPO.profile.calendar.currentOffset+"px",mouseWheel:{enable:!1},scrollButtons:{enable:!1},contentTouchScroll:!1,scrollInertia:1e3,timeout:0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1},keyboard:{enable:!1}})}),o.on("click",function(){if(e.currentOffset>=e.stepWidth){e.currentOffset-=r,s.mCustomScrollbar("scrollTo","+="+r);for(var t=0;t<e.$messages.length;t++){var n=parseInt(e.$messages[t].inlineStyle("margin-left"));n>0&&e.$messages[t].css({marginLeft:e.currentOffset+"px"})}}}),a.on("click",function(){if(e.currentOffset+e.stepWidth<e.calendarWidth){e.currentOffset+=r,s.mCustomScrollbar("scrollTo","-="+r);for(var t=0;t<e.$messages.length;t++){var n=parseInt(e.$messages[t].inlineStyle("margin-left"));n+e.$messages[t].width()<e.calendarWidth&&e.$messages[t].css({marginLeft:e.currentOffset+"px"})}}}),i.on("click",function(){var t=$(this),e=t.closest(".ep-sect"),s=e.children("div.ep-sect-body");return e.hasClass("eps-opened")?(a.hide(),o.hide(),s.stop().animate({opacity:0},300,function(){e.removeClass("eps-opened")})):(a.show(),o.show(),s.stop().animate({opacity:1},300,function(){e.addClass("eps-opened")})),!1})},t}();
var EXPO=EXPO||{};EXPO.profile=EXPO.profile||{},EXPO.profile.calendar?console.warn("WARNING: EXPO.profile.calendar is already defined!"):EXPO.profile.calendar=function(){var t=(EXPO.common,{});return t.opt={},$(function(){}),t.init=function(t){$.extend(this.opt,t);var e=this,s=$("#"+this.opt.scrollBoxId),n=$("#"+this.opt.calenadrId),a=(n.find("td."+this.opt.currentDayClass).index()*this.opt.cellWidth,$("#"+this.opt.scrollLeftId)),o=$("#"+this.opt.scrollRightId),r=$("."+this.opt.noEventsClass),l=$("."+this.opt.calendarToggleClass),i=this.opt.cellWidth*this.opt.cellsToScroll,c=0,d=function(){var t,s,n=0,a=0,o=e.opt.cellWidth,r=$("#"+e.opt.calenadrId),l=r.find("td."+e.opt.currentDayClass).index(),i=e.opt.cellsToScroll,c=r.find("."+e.opt.daysClass+" td").length;return e.stepWidth=i*o,e.calendarWidth=o*c,l>0?(l++,t=c/i,s=c/l,a=t-s,e.currentDay=l,a?(a=Math.floor(a-1),n=i*a*o):n=0):(e.currentDay=0,n=0),n};this.currentOffset=d(),this.$messages=[],$(function(){r.each(function(){$(this).attr("colspan")&&1!=$(this).attr("colspan")?$(this).width()>e.stepWidth&&e.$messages.push($(".message",$(this)).width(e.stepWidth).css({marginLeft:e.currentOffset+"px"})):$(this).find("."+e.opt.eventWrapClass).addClass("small")}),$("."+e.opt.eventsClass).each(function(){c++,3==c&&$(this).addClass("grey"),4==c&&($(this).addClass("grey"),c=0)})}),$(window).load(function(){s.mCustomScrollbar({axis:"y",horizontalScroll:!0,setLeft:"-"+EXPO.profile.calendar.currentOffset+"px",mouseWheel:{enable:!1},scrollButtons:{enable:!1},contentTouchScroll:!1,scrollInertia:1e3,timeout:0,advanced:{autoScrollOnFocus:!1,updateOnContentResize:!1,updateOnBrowserResize:!1},keyboard:{enable:!1}})}),a.on("click",function(){if(e.currentOffset>=e.stepWidth){e.currentOffset-=i,s.mCustomScrollbar("scrollTo","+="+i);for(var t=0;t<e.$messages.length;t++){var n=parseInt(e.$messages[t].inlineStyle("margin-left"));n>0&&e.$messages[t].css({marginLeft:e.currentOffset+"px"})}}}),o.on("click",function(){if(e.currentOffset+e.stepWidth<e.calendarWidth){e.currentOffset+=i,s.mCustomScrollbar("scrollTo","-="+i);for(var t=0;t<e.$messages.length;t++){var n=parseInt(e.$messages[t].inlineStyle("margin-left"));n+e.$messages[t].width()<e.calendarWidth&&e.$messages[t].css({marginLeft:e.currentOffset+"px"})}}}),l.on("click",function(){var t=$(this),e=t.closest(".ep-sect"),s=e.children("div.ep-sect-body");return e.hasClass("eps-opened")?(o.hide(),a.hide(),s.stop().animate({opacity:0},300,function(){e.removeClass("eps-opened")})):(o.show(),a.show(),s.stop().animate({opacity:1},300,function(){e.addClass("eps-opened")})),!1})},t}();

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