Fixes #1213. Switch roster filter input and icons
This commit is contained in:
parent
c26dde34f9
commit
d4fbdf5629
|
@ -5,6 +5,7 @@
|
|||
- Allow setting of debug mode via URL with `/#converse?debug=true`
|
||||
- New config setting [locked_muc_domain](https://conversejs.org/docs/html/configuration.html#locked-muc-domain)
|
||||
- New config setting [show_client_info](https://conversejs.org/docs/html/configuration.html#show-client-info)
|
||||
- #1213: Switch roster filter input and icons
|
||||
- #1373: Re-add support for the [muc_domain](https://conversejs.org/docs/html/configuration.html#muc-domain) setting
|
||||
- #1400: When a chat message is just an emoji, enlarge the emoji
|
||||
- #1437: List of groupchats in modal doesn't scroll
|
||||
|
|
|
@ -94781,7 +94781,25 @@ __p += '<!-- src/templates/roster_filter.html -->\n<form class="controlbox-padde
|
|||
if (!o.visible) { ;
|
||||
__p += ' hidden ';
|
||||
} ;
|
||||
__p += '">\n <div class="form-inline flex-nowrap">\n <div class="btn-group">\n <input ';
|
||||
__p += '">\n <div class="form-inline flex-nowrap">\n <div class="filter-by d-flex flex-nowrap">\n <span class="fa fa-user ';
|
||||
if (o.filter_type === 'contacts') { ;
|
||||
__p += ' selected ';
|
||||
} ;
|
||||
__p += '" data-type="contacts" title="' +
|
||||
__e(o.title_contact_filter) +
|
||||
'"></span>\n <span class="fa fa-users ';
|
||||
if (o.filter_type === 'groups') { ;
|
||||
__p += ' selected ';
|
||||
} ;
|
||||
__p += '" data-type="groups" title="' +
|
||||
__e(o.title_group_filter) +
|
||||
'"></span>\n <span class="fa fa-circle ';
|
||||
if (o.filter_type === 'state') { ;
|
||||
__p += ' selected ';
|
||||
} ;
|
||||
__p += '" data-type="state" title="' +
|
||||
__e(o.title_status_filter) +
|
||||
'"></span>\n </div>\n\n <div class="btn-group">\n <input ';
|
||||
if (o.filter_text) { ;
|
||||
__p += ' value="' +
|
||||
__e(o.filter_text) +
|
||||
|
@ -94845,25 +94863,7 @@ __p += ' selected="selected" ';
|
|||
} ;
|
||||
__p += '\n value="offline">' +
|
||||
__e(o.label_offline) +
|
||||
'</option>\n </select>\n\n <div class="filter-by d-flex flex-nowrap">\n <span class="fa fa-user ';
|
||||
if (o.filter_type === 'contacts') { ;
|
||||
__p += ' selected ';
|
||||
} ;
|
||||
__p += '" data-type="contacts" title="' +
|
||||
__e(o.title_contact_filter) +
|
||||
'"></span>\n <span class="fa fa-users ';
|
||||
if (o.filter_type === 'groups') { ;
|
||||
__p += ' selected ';
|
||||
} ;
|
||||
__p += '" data-type="groups" title="' +
|
||||
__e(o.title_group_filter) +
|
||||
'"></span>\n <span class="fa fa-circle ';
|
||||
if (o.filter_type === 'state') { ;
|
||||
__p += ' selected ';
|
||||
} ;
|
||||
__p += '" data-type="state" title="' +
|
||||
__e(o.title_status_filter) +
|
||||
'"></span>\n </div>\n </div>\n</form>\n';
|
||||
'</option>\n </select>\n </div>\n</form>\n';
|
||||
return __p
|
||||
};
|
||||
|
||||
|
|
|
@ -1,5 +1,11 @@
|
|||
<form class="controlbox-padded roster-filter-form input-button-group {[ if (!o.visible) { ]} hidden {[ } ]}">
|
||||
<div class="form-inline flex-nowrap">
|
||||
<div class="filter-by d-flex flex-nowrap">
|
||||
<span class="fa fa-user {[ if (o.filter_type === 'contacts') { ]} selected {[ } ]}" data-type="contacts" title="{{{o.title_contact_filter}}}"></span>
|
||||
<span class="fa fa-users {[ if (o.filter_type === 'groups') { ]} selected {[ } ]}" data-type="groups" title="{{{o.title_group_filter}}}"></span>
|
||||
<span class="fa fa-circle {[ if (o.filter_type === 'state') { ]} selected {[ } ]}" data-type="state" title="{{{o.title_status_filter}}}"></span>
|
||||
</div>
|
||||
|
||||
<div class="btn-group">
|
||||
<input {[ if (o.filter_text) { ]} value="{{{o.filter_text}}}" {[ } ]}
|
||||
class="roster-filter form-control {[ if (o.filter_type === 'state') { ]} hidden {[ } ]}"
|
||||
|
@ -24,11 +30,5 @@
|
|||
<option {[ if (o.chat_state === 'offline') { ]} selected="selected" {[ } ]}
|
||||
value="offline">{{{o.label_offline}}}</option>
|
||||
</select>
|
||||
|
||||
<div class="filter-by d-flex flex-nowrap">
|
||||
<span class="fa fa-user {[ if (o.filter_type === 'contacts') { ]} selected {[ } ]}" data-type="contacts" title="{{{o.title_contact_filter}}}"></span>
|
||||
<span class="fa fa-users {[ if (o.filter_type === 'groups') { ]} selected {[ } ]}" data-type="groups" title="{{{o.title_group_filter}}}"></span>
|
||||
<span class="fa fa-circle {[ if (o.filter_type === 'state') { ]} selected {[ } ]}" data-type="state" title="{{{o.title_status_filter}}}"></span>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
|
Loading…
Reference in New Issue