diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 2a0274e..4b7de8e 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -271,7 +271,7 @@ LOGIN_REDIRECT_URL = '/projects/' LOGIN_URL = '/users/login/' PAGE_SIZE = 10 # Non-api page size (regular views) -API_PAGE_SIZE = 100 # Django REST framework +API_PAGE_SIZE = 2000 # Django REST framework REST_FRAMEWORK = { 'DEFAULT_AUTHENTICATION_CLASSES': [ diff --git a/assets/css/main.css b/assets/css/main.css index 595b0ac..62037d6 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -1329,10 +1329,10 @@ footer:after { } .titleResF1, div p.titleResF1 { - font-size: 15px; + font-size: 14pt; font-family: 'Arial-MT-Regular', sans-serif; - font-weight: bold; - color: #2c2c2c; + /*font-weight: bold;*/ + color: #000000; float: left; } diff --git a/assets/lib/proekton-components/css/other.css b/assets/lib/proekton-components/css/other.css index 375262d..21206b3 100644 --- a/assets/lib/proekton-components/css/other.css +++ b/assets/lib/proekton-components/css/other.css @@ -10,8 +10,8 @@ label { } .selected-container .selected-element { - display: inline-block; - padding: 5px 25px 5px 10px; + /*display: inline-block;*/ + padding: 5px 35px 5px 10px; margin-top: 8px; min-height: 45px; background-color: #e3e3e3; @@ -21,35 +21,45 @@ label { -webkit-border-radius: 10px; /* Safari 4 */ border-radius: 10px; /* IE 9, Safari 5, Chrome */ } +.horizontal .selected-element{ + display: inline-block; +} -.selected-element .header{ - font-size: 9pt; - color: #979494; +.selected-element .header,.name{ white-space: nowrap; text-overflow: ellipsis; overflow: hidden; - word-wrap: break-word; + width: 100%; +} + +.selected-element .header{ + font-size: 7pt; + color: #676363; + /*white-space: nowrap;*/ + /*text-overflow: ellipsis;*/ + /*overflow: hidden;*/ + /*word-wrap: break-word;*/ + /*width: 100%;*/ } .selected-element .name { - font-size: 14pt; - white-space: nowrap; - text-overflow: ellipsis; - overflow: hidden; - vertical-align: middle; - width: 100%; + font-size: 11pt; + /*white-space: nowrap;*/ + /*text-overflow: ellipsis;*/ + /*overflow: hidden;*/ + /*width: 100%;*/ } .selected-element .icon-remove{ background-image: url('../img/cross01.png'); - background-size: 24px 24px; + background-size: 20px 20px; /*display: inline-block;*/ position: absolute; right: 5px; top: 15px; - width: 16px; - height: 16px; + width: 20px; + height: 20px; cursor: pointer; margin-left: -20px; } @@ -66,7 +76,8 @@ label { } .separator { - margin: 20px 0; + margin-top: 35px; + margin-bottom: 5px; } .max-width { @@ -83,26 +94,26 @@ label { } .custom-check { background: url("../img/rect01.png") no-repeat center; - background-size: 200px 40px; - width: 200px; - height: 40px; + background-size: 210px 51px; + width: 210px; + height: 51px; cursor: pointer; } .custom-check.checked { background: url("../img/rect02.png") no-repeat center; - background-size: 200px 40px; - width: 200px; - height: 40px; + background-size: 210px 51px; + width: 210px; + height: 51px; } #page-preloader { - position: fixed; + position: absolute; left: 0; top: 0; right: 0; bottom: 0; - background: #000; + background: #090909; z-index: 100500; } diff --git a/assets/lib/proekton-components/css/select-box.css b/assets/lib/proekton-components/css/select-box.css index 15d067e..54eeb1a 100644 --- a/assets/lib/proekton-components/css/select-box.css +++ b/assets/lib/proekton-components/css/select-box.css @@ -1,10 +1,38 @@ +body { + font-size: 11pt; + font-family: Arial-MT-Regular, Arial, Sans-Serif; +} + +input[type="checkbox"] + span, input[type="checkbox"]:checked + span { + all: initial; + font-size: 9pt; + color: #494546; + cursor: pointer; +} + +.noselect { + -webkit-touch-callout: none; /* iOS Safari */ + -webkit-user-select: none; /* Chrome/Safari/Opera */ + -moz-user-select: none; /* Firefox */ + -ms-user-select: none; /* Internet Explorer/Edge */ + user-select: none; + /* Non-prefixed version, currently + not supported by any browser */ +} + +/*input[type="checkbox"]:checked + span {*/ +/*all: initial;*/ +/*font-size: 9pt;*/ +/*color: #494546;*/ +/*}*/ + .select-box-container { display: block; /*margin-top: 40px;*/ /*min-width: 200px;*/ } -.select-box-header{ +.select-box-header { font-size: 14pt; white-space: nowrap; word-wrap: break-word; @@ -12,7 +40,7 @@ /*top:10px;*/ } -.select-box-header .header{ +.select-box-header .header { display: inline-block; color: black; text-overflow: ellipsis; @@ -23,11 +51,15 @@ } /*.select-box-header i {*/ - /*position: relative;*/ - /*top: -5px;*/ +/*position: relative;*/ +/*top: -5px;*/ /*}*/ -.select-box-header .fa:hover{ +.select-box-header .fa { + color: #565656; +} + +.select-box-header .fa:hover { cursor: pointer; } @@ -70,17 +102,21 @@ padding: 2px 10px; border-bottom: 1px solid #afb2b6; list-style: none; + font-size: 9pt; + color: #494546; } .select-box-results label, .select-box-options label, .select-box-results li, .select-box-options li { cursor: pointer; + display: inline-block; width: 100%; } .select-box-results li:hover, .select-box-options li:hover { background-color: #dcdcdc; border-left: 2px solid red; + color: #0b0b0b; } .select-box-search { @@ -88,7 +124,7 @@ } input.select-box-search { - height: 40px; + height: 51px; width: 100%; border: 1px solid #cccccc; outline: none; @@ -157,15 +193,16 @@ input.select-box-search { .editable-container { display: block; float: left; - /*max-width: 400px;*/ background-color: #e5e5e5; - min-height: 40px; + color: #585858; + font-size: 9pt; padding: 5px 10px; - /*min-width: 40px;*/ + height: 51px; + margin-left: 8px; position: relative; left: -30px; } -.vertical-child{ +.vertical-child { margin-top: 30px; } \ No newline at end of file diff --git a/assets/lib/proekton-components/img/rect01.png b/assets/lib/proekton-components/img/rect01.png index 841209e..aa314ce 100644 Binary files a/assets/lib/proekton-components/img/rect01.png and b/assets/lib/proekton-components/img/rect01.png differ diff --git a/assets/lib/proekton-components/img/rect02.png b/assets/lib/proekton-components/img/rect02.png index a46d1d4..a3f5826 100644 Binary files a/assets/lib/proekton-components/img/rect02.png and b/assets/lib/proekton-components/img/rect02.png differ diff --git a/assets/lib/proekton-components/js/SelectBox.js b/assets/lib/proekton-components/js/SelectBox.js index 59f6ece..5edb2a8 100644 --- a/assets/lib/proekton-components/js/SelectBox.js +++ b/assets/lib/proekton-components/js/SelectBox.js @@ -245,7 +245,8 @@ class SelectBox { } // FILL RESULTS - let result_template = (el, id) => `
`; + let result_template = (el, id) => + ``; // MAIN PART let $container = this.$results_box.find('.main-part ul'); fillContainer($container, result_template, search_text, self.parent_id); diff --git a/assets/lib/proekton-components/js/SelectedContainer.js b/assets/lib/proekton-components/js/SelectedContainer.js index fccc924..43e0b30 100644 --- a/assets/lib/proekton-components/js/SelectedContainer.js +++ b/assets/lib/proekton-components/js/SelectedContainer.js @@ -22,9 +22,9 @@ class SelectedContainer { let htmlTemplate = `+ {% if num_results > 0 %} + Найдено {{ num_results }} проектов + {% else %} + Ничего не найдено + {% endif %} +
+{# SORT_BY #} +{% include 'partials/inc-projects-sort_by.html' %} +{{ project.text|linebreaksbr|truncatechars:300 }}
+ + {% if TEMPLATE_DEBUG %} +Specialization: {{ project.specialization }}
Realty location: {{ project.realty.location }}
Constr. type: {{ project.realty.construction_type }}
Build. classif.: {{ project.realty.building_classification }}
+ {% endif %}
+
+ + {{ project.budget }} +
+ +Сортировать по:
+ + {% for val, text in choices %} + + {% endfor %} + +{# #} +{# #} +Поиск заказов