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

expo-33 clear button done

Browse Source
remotes/origin/1203
pavel 11 years ago
parent d6f457d0a7
commit 8ae67e3c6a
6 changed files with 300 additions and 279 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      templates/client/includes/catalog_search_main.html
  2. 5
      templates/client/popups/place.html
  3. 7
      templates/client/popups/theme.html
  4. 195
      templates/client/static_client/css/main.css
  5. 4
      templates/client/static_client/js/_modules/block.search.js
  6. 2
      templates/client/static_client/js_min/_modules/block.search.min.js

2
templates/client/includes/catalog_search_main.html
Unescape View File

@ -35,7 +35,7 @@
</div> </div>
</div> </div>
<div class="sf-field-wrap"> <div class="sf-field-wrap">
<button type="submit"><span>{% trans 'найти' %}</span></button> <button type="submit" class="search_submit"><span>{% trans 'найти' %}</span></button>
</div> </div>
</div> </div>
<div class="search-line sl-options"> <div class="search-line sl-options">

5
templates/client/popups/place.html
Unescape View File

@ -65,7 +65,6 @@
</div> </div>
<div class="q-sel"> <div class="q-sel">
<a class="clear" href="#">{% trans 'Сбросить выбранное' %}</a>
<div class="q-sel-title">{% trans 'Быстрый выбор' %}:</div> <div class="q-sel-title">{% trans 'Быстрый выбор' %}:</div>
<ul> <ul>
<li><a href="#" data-name="ci" data-id="-2960561">{% trans 'Москва' %}</a></li> <li><a href="#" data-name="ci" data-id="-2960561">{% trans 'Москва' %}</a></li>
@ -85,7 +84,9 @@
</div> </div>
</div> </div>
<div class="pwf-buttons-line"> <div class="pwf-buttons-line">
<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a> <button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button>
<button class="gray modal-clear" type="submit">{% trans 'Очистить' %}</button>
<a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwSubj">{% trans 'Уточнить тему' %}</a>
{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %} {% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
</div> </div>
</div> </div>

7
templates/client/popups/theme.html
Unescape View File

@ -68,15 +68,14 @@
</ul> </ul>
</div> </div>
<div class="q-sel">
<a class="clear" href="#">{% trans 'Сбросить выбранное' %}</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
<div class="pwf-buttons-line"> <div class="pwf-buttons-line">
<button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button><a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a> <button class="icon-check modal-approve" type="submit">{% if submitText %}{{ submitText }}{% else %}{% trans 'Искать' %}{% endif %}</button>
<button class="gray modal-clear" type="submit">{% trans 'Очистить' %}</button>
<a class="{% if filter %}{{ filter }}{% else %}search-{% endif %}modal-open specify-link" href="#{{ filter }}pwPlace">{% trans 'Уточнить географию' %}</a>
{% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %} {% if hasDate %}<a class=" search-modal-open specify-link" href="#pwPeriod">{% trans 'Уточнить дату' %}</a>{% endif %}
</div> </div>
</div> </div>

195
templates/client/static_client/css/main.css
Unescape View File

@ -1902,7 +1902,7 @@ button.icon-save:before {
# форма поиска # форма поиска
\**************************/ \**************************/
.in-search-form { .in-search-form {
position: relative; position: relative;
/*display: none;*/ /*display: none;*/
font-family: 'dindisplay_pro', Arial, sans-serif; font-family: 'dindisplay_pro', Arial, sans-serif;
@ -1918,74 +1918,74 @@ button.icon-save:before {
border-radius: 4px; border-radius: 4px;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.modals .popup-window{ .modals .popup-window{
display: none; display: none;
} }
.search-form aside .s-title { .search-form aside .s-title {
font-size: 25px; font-size: 25px;
line-height: 25px; line-height: 25px;
text-transform: uppercase; text-transform: uppercase;
white-space: nowrap; white-space: nowrap;
margin-right: -20px; margin-right: -20px;
} }
.in-search-form .s-title { .in-search-form .s-title {
font-size: 25px; font-size: 25px;
line-height: 25px; line-height: 25px;
text-transform: uppercase; text-transform: uppercase;
margin-bottom: 15px; margin-bottom: 15px;
} }
.search-form .mcl { .search-form .mcl {
padding-right: 50px; padding-right: 50px;
} }
.search-form-wrap { .search-form-wrap {
display: table; display: table;
width: 100%; width: 100%;
border-collapse: collapse; border-collapse: collapse;
} }
.search-form-wrap .search-line { .search-form-wrap .search-line {
display: table-row; display: table-row;
} }
.search-form-wrap .search-line .sf-field-wrap { .search-form-wrap .search-line .sf-field-wrap {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
padding: 0 10px 8px 0; padding: 0 10px 8px 0;
color: #ffd9bf; color: #ffd9bf;
line-height: 15px; line-height: 15px;
} }
.search-form-wrap .search-line .sf-field-wrap:first-child { .search-form-wrap .search-line .sf-field-wrap:first-child {
width: 48%; width: 48%;
} }
.search-form-wrap .search-line .sf-field-wrap + .sf-field-wrap { .search-form-wrap .search-line .sf-field-wrap + .sf-field-wrap {
width: 32%; width: 32%;
} }
.search-form-wrap .search-line .sf-field-wrap + .sf-field-wrap + .sf-field-wrap { .search-form-wrap .search-line .sf-field-wrap + .sf-field-wrap + .sf-field-wrap {
width: 20%; width: 20%;
} }
.search-line.sl-options a { .search-line.sl-options a {
display: inline-block; display: inline-block;
color: #fff; color: #fff;
text-decoration: none; text-decoration: none;
border-bottom: 1px dashed; border-bottom: 1px dashed;
line-height: 13px; line-height: 13px;
} }
.search-line.sl-options a:hover { .search-line.sl-options a:hover {
border-bottom: none; border-bottom: none;
} }
.search-line.sl-options a.sf-clear { .search-line.sl-options a.sf-clear {
position: relative; position: relative;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
@ -1995,9 +1995,9 @@ button.icon-save:before {
padding-top: 24px; padding-top: 24px;
margin: -5px 0 -5px 2px; margin: -5px 0 -5px 2px;
overflow: hidden; overflow: hidden;
} }
.search-line.sl-options a.sf-clear:before { .search-line.sl-options a.sf-clear:before {
content: ''; content: '';
display: block; display: block;
width: 6px; width: 6px;
@ -2007,9 +2007,9 @@ button.icon-save:before {
left: 50%; left: 50%;
top: 50%; top: 50%;
margin: -3px 0 0 -3px; margin: -3px 0 0 -3px;
} }
.sf-field { .sf-field {
position: relative; position: relative;
display: table; display: table;
width: 100%; width: 100%;
@ -2019,31 +2019,31 @@ button.icon-save:before {
color: #aaa; color: #aaa;
box-shadow: inset 0 1px 0 #d9d9d9, 0 -1px 0 rgba(0, 0, 0, .2); box-shadow: inset 0 1px 0 #d9d9d9, 0 -1px 0 rgba(0, 0, 0, .2);
z-index: 1; z-index: 1;
} }
.sf-field-wrap:first-child .sf-field { .sf-field-wrap:first-child .sf-field {
border-radius: 4px 0 0 4px; border-radius: 4px 0 0 4px;
} }
.sf-field > * { .sf-field > * {
display: table-cell; display: table-cell;
vertical-align: middle; vertical-align: middle;
} }
.sf-field label { .sf-field label {
font-size: 16px; font-size: 16px;
line-height: 20px; line-height: 20px;
font-weight: normal; font-weight: normal;
padding: 10px 5px 10px 20px; padding: 10px 5px 10px 20px;
white-space: nowrap; white-space: nowrap;
} }
.sf-field .input-text { .sf-field .input-text {
width: 100%; width: 100%;
height: 100%; height: 100%;
} }
.sf-field .input-text input[type="text"] { .sf-field .input-text input[type="text"] {
display: block; display: block;
width: 100%; width: 100%;
height: 100%; height: 100%;
@ -2057,10 +2057,12 @@ button.icon-save:before {
line-height: 20px; line-height: 20px;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.search-form button, .search-form button.search_submit,
.in-search-form button{ .search-form button.modal-approve,
.in-search-form button.search_submit,
.in-search-form button.modal-approve{
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
height: 40px; height: 40px;
@ -2080,13 +2082,15 @@ button.icon-save:before {
box-shadow: 0 1px 0 rgba(0, 0, 0, .2), inset 0 1px 0 rgba(0, 0, 0, .2); box-shadow: 0 1px 0 rgba(0, 0, 0, .2), inset 0 1px 0 rgba(0, 0, 0, .2);
-webkit-filter: none; -webkit-filter: none;
filter: none; filter: none;
} }
.pwf-buttons-line button{ button.modal-approve{
border-radius: 4px; border-radius: 4px !important;
} }
.search-form button:before, .search-form button.search_submit:before,
.in-search-form button:before { .search-form button.modal-approve:before,
.in-search-form button.search_submit:before ,
.in-search-form button.modal-approve:before {
content: ' '; content: ' ';
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
@ -2094,26 +2098,26 @@ button.icon-save:before {
height: 14px; height: 14px;
background: url(../img/sprites.png) -98px 0 no-repeat; background: url(../img/sprites.png) -98px 0 no-repeat;
margin: -2px 5px 0 -1px; margin: -2px 5px 0 -1px;
} }
.search-form button:hover, .search-form button:hover,
.in-search-form button:hover { .in-search-form button:hover {
position: relative; position: relative;
top: -1px; top: -1px;
/*background: none;*/ /*background: none;*/
} }
.sf-autocomplete { .sf-autocomplete {
position: relative; position: relative;
z-index: 3048; z-index: 3048;
height: 40px; height: 40px;
display: none; display: none;
} }
.sf-autocomplete.show { .sf-autocomplete.show {
display: block; display: block;
} }
.sf-autocomplete .sfa-wrap { .sf-autocomplete .sfa-wrap {
position: absolute; position: absolute;
left: 0; left: 0;
width: 100%; width: 100%;
@ -2135,17 +2139,17 @@ button.icon-save:before {
background: linear-gradient(to bottom, #ffffff 10%,#efefef 100%); /* W3C */ background: linear-gradient(to bottom, #ffffff 10%,#efefef 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#efefef',GradientType=0 ); /* IE6-9 */ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#efefef',GradientType=0 ); /* IE6-9 */
} }
.sf-autocomplete .sfa-wrap { .sf-autocomplete .sfa-wrap {
border-radius: 4px 0 4px 4px; border-radius: 4px 0 4px 4px;
} }
.sf-autocomplete .sfa-wrap.show { .sf-autocomplete .sfa-wrap.show {
visibility: visible; visibility: visible;
} }
.ui-autocomplete { .ui-autocomplete {
position: relative; position: relative;
width: 100%; width: 100%;
max-height: 265px; max-height: 265px;
@ -2157,43 +2161,46 @@ button.icon-save:before {
border-top: 1px dotted #ccc; border-top: 1px dotted #ccc;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
} }
.ui-autocomplete-category { .ui-autocomplete-category {
font-size: 15px; font-size: 15px;
line-height: 17px; line-height: 17px;
color: #ff6600; color: #ff6600;
padding: 8px 10px 0 0; padding: 8px 10px 0 0;
} }
.ui-menu .ui-menu-item { .ui-menu .ui-menu-item {
padding: 0 10px 0 5px; padding: 0 10px 0 5px;
margin-top: 2px; margin-top: 2px;
} }
.ui-menu .ui-menu-item a { .ui-menu .ui-menu-item a {
color: #464646; color: #464646;
font-size: 15px; font-size: 15px;
line-height: 15px; line-height: 15px;
border: none; border: none;
padding: 2px 5px; padding: 2px 5px;
cursor: pointer; cursor: pointer;
} }
.ui-menu .ui-menu-item a.ui-state-focus, .ui-menu .ui-menu-item a.ui-state-focus,
.ui-menu .ui-menu-item a.ui-state-active { .ui-menu .ui-menu-item a.ui-state-active {
color: #ff6600; color: #ff6600;
margin: 0; margin: 0;
} }
.ui-menu .ui-menu-item a i { .ui-menu .ui-menu-item a i {
font-style: normal; font-style: normal;
color: #a2a2a2; color: #a2a2a2;
} }
/* # clear all button*/
.in-search-form .modal-clear,
.mp-catalog { .search-form .modal-clear{
height: 40px;
} border: 1px solid #fff;
padding: 0 25px;
box-shadow: 0 1px 0 rgba(0, 0, 0, .2), inset 0 1px 0 rgba(0, 0, 0, .2);
}
/* end of search block*/ /* end of search block*/
@ -4032,7 +4039,6 @@ form.s-message {
.c-select-box .csb-menu .q-sel { .c-select-box .csb-menu .q-sel {
width: 190px; width: 190px;
float: right; float: right;
margin-top: 1em;
} }
@ -12013,6 +12019,21 @@ hr + .rq-note {
.mt-0{ .mt-0{
margin-top: 0; margin-top: 0;
} }
button.gray{
background: #dbdbdb; /* Old browsers */
background: -moz-linear-gradient(top, #dbdbdb 0%, #bdbdbd 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#dbdbdb), color-stop(100%,#bdbdbd)); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #dbdbdb 0%,#bdbdbd 100%); /* Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #dbdbdb 0%,#bdbdbd 100%); /* Opera 11.10+ */
background: -ms-linear-gradient(top, #dbdbdb 0%,#bdbdbd 100%); /* IE10+ */
background: linear-gradient(to bottom, #dbdbdb 0%,#bdbdbd 100%); /* W3C */
filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dbdbdb', endColorstr='#bdbdbd',GradientType=0 ); /* IE6-9 */
}
button.gray:hover{
background: #dbdbdb; /* Old browsers */
}
@ -12020,16 +12041,16 @@ hr + .rq-note {
# Модальное окно выбора тематики # Модальное окно выбора тематики
\******************************/ \******************************/
.pw-subj .q-sel{ .pw-subj .q-sel{
top: 0; top: 0;
position: absolute; position: absolute;
right: 0; right: 0;
margin-top: 1em; margin-top: 1em;
} }
.search_form .scroll-container{ .search_form .scroll-container{
overflow: hidden; overflow: hidden;
} }
/******************************\ /******************************\
# Модальное окно общий вид # Модальное окно общий вид
\******************************/ \******************************/

4
templates/client/static_client/js/_modules/block.search.js
Unescape View File

@ -359,7 +359,7 @@ if (EXPO.searchBlock){
} }
return false; return false;
}); });
$('.clear', $modal).on('click', function () { $('.modal-clear', $modal).on('click', function () {
self.resetList(); self.resetList();
return false; return false;
}); });
@ -1118,7 +1118,7 @@ if (EXPO.searchBlock){
/** /**
* clear all button behavior * clear all button behavior
*/ */
$('.clear',$modal).on('click', function () { $('.modal-clear',$modal).on('click', function () {
self.resetList(); self.resetList();
return false; return false;
}); });

2
templates/client/static_client/js_min/_modules/block.search.min.js vendored
View File

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