diff --git a/archilance/settings/base.py b/archilance/settings/base.py index b391b4b..40003c7 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -43,6 +43,7 @@ THIRD_PARTY_APPS = [ 'generic_relations', # https://github.com/Ian-Foote/rest-framework-generic-relations 'hitcount', 'django_activeurl', + 'import_export', ] LOCAL_APPS = [ diff --git a/assets/css/extra.css b/assets/css/extra.css index de2c7f4..2636046 100644 --- a/assets/css/extra.css +++ b/assets/css/extra.css @@ -111,3 +111,26 @@ #jGrowl .jGrowl-notification a, #jGrowl .jGrowl-notification a:visited { color: #777620; } + +#document-send-contact a { + float: left; + font-family: 'pfdintextcomppro-regular', sans-serif; + color: #373737; + font-size: 15px; + border:0; + padding: 0px; + text-transform:lowercase; +} + +.documentsChat a.file-link, .documentsChat a.file-link:link, .documentsChat a.file-link:visited { + color: #5a5a5a; + border-radius: 0; + border: 0; + font-family: Arial, Verdana, Helvetica, sans-serif; + font-size: 12px; + font-style: italic; + padding:0; + background:none; + float: none; + margin: 19px 0 -10px 0; +} diff --git a/assets/js/chat.js b/assets/js/chat.js index 103c328..fb25bba 100644 --- a/assets/js/chat.js +++ b/assets/js/chat.js @@ -165,7 +165,7 @@ $(function () { console.log(json); $.each(json.results, function (i, v) { - docList.innerHTML += '
  • ' + v.file + '
  • '; + docList.innerHTML += '
  • ' + v.file + '
  • '; }); }, error: function (e) { @@ -283,6 +283,7 @@ $(function () { if (chatMessage) { $("#chat-order-add .errorEmptyMessage").hide(); + chatMessage += '
    ' + $("#document-send-order").html(); socket.add_contact_message({ "format_type": "add_message_order", "data": { @@ -302,7 +303,7 @@ $(function () { }); - + // Добавление сообщения для контакта $('#contact-chat-add-message').on('click', function (e) { e.preventDefault(); var chatMessage = $("#chat").val(); @@ -310,6 +311,7 @@ $(function () { var senderId = $("#senderContactId").val(); if (chatMessage) { $("#contact-chat-form .errorEmptyMessage").hide(); + chatMessage += '
    ' + $("#document-send-contact").html(); socket.add_contact_message({ "format_type": "add_message_contact", "data": { @@ -386,6 +388,7 @@ $(function () { recipent: $("#chat-order-add #recipentId").val(), order: $("#chat-order-add #orderId").val(), } + console.log(data.formData); }); //Загрузка документов @@ -404,8 +407,8 @@ $(function () { dataType: 'json', done: function (e, data) { $.each(data.result.files, function (index, file) { - var currentValue = ''; - currentValue += file.id + ';'; + // var currentValue = ''; + // currentValue += file.id + ';'; //$("#documentSendIds").val(currentValue); var htmlImg = '

    ' + file.name + '

    '; var document_send = $(htmlImg).appendTo("#document-send-order"); @@ -450,7 +453,7 @@ $(function () { dataType: 'json', done: function (e, data) { $.each(data.result.files, function (index, file) { - var htmlImg = '

    ' + file.name + '

    '; + var htmlImg = '' + file.name + ''; var document_send = $(htmlImg).appendTo("#document-send-contact"); }); }, diff --git a/assets/lib/jquery-jgrowl/jquery.jgrowl.min.js b/assets/lib/jquery-jgrowl/jquery.jgrowl.min.js new file mode 100644 index 0000000..7e8b6fb --- /dev/null +++ b/assets/lib/jquery-jgrowl/jquery.jgrowl.min.js @@ -0,0 +1,2 @@ +!function(a){a.jGrowl=function(b,c){0===a("#jGrowl").length&&a('
    ').addClass(c&&c.position?c.position:a.jGrowl.defaults.position).appendTo(c&&c.appendTo?c.appendTo:a.jGrowl.defaults.appendTo),a("#jGrowl").jGrowl(b,c)},a.fn.jGrowl=function(b,c){if(void 0===c&&a.isPlainObject(b)&&(c=b,b=c.message),a.isFunction(this.each)){var d=arguments;return this.each(function(){void 0===a(this).data("jGrowl.instance")&&(a(this).data("jGrowl.instance",a.extend(new a.fn.jGrowl,{notifications:[],element:null,interval:null})),a(this).data("jGrowl.instance").startup(this)),a.isFunction(a(this).data("jGrowl.instance")[b])?a(this).data("jGrowl.instance")[b].apply(a(this).data("jGrowl.instance"),a.makeArray(d).slice(1)):a(this).data("jGrowl.instance").create(b,c)})}},a.extend(a.fn.jGrowl.prototype,{defaults:{pool:0,header:"",group:"",sticky:!1,position:"top-right",appendTo:"body",glue:"after",theme:"default",themeState:"highlight",corners:"10px",check:250,life:3e3,closeDuration:"normal",openDuration:"normal",easing:"swing",closer:!0,closeTemplate:"×",closerTemplate:"
    [ close all ]
    ",log:function(){},beforeOpen:function(){},afterOpen:function(){},open:function(){},beforeClose:function(){},close:function(){},click:function(){},animateOpen:{opacity:"show"},animateClose:{opacity:"hide"}},notifications:[],element:null,interval:null,create:function(b,c){var d=a.extend({},this.defaults,c);"undefined"!=typeof d.speed&&(d.openDuration=d.speed,d.closeDuration=d.speed),this.notifications.push({message:b,options:d}),d.log.apply(this.element,[this.element,b,d])},render:function(b){var c=this,d=b.message,e=b.options;e.themeState=""===e.themeState?"":"ui-state-"+e.themeState;var f=a("
    ").addClass("jGrowl-notification alert "+e.themeState+" ui-corner-all"+(void 0!==e.group&&""!==e.group?" "+e.group:"")).append(a("