Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

settings: Make custom profile fields table consistent with others. 

We change the custom profile fields table to have same header as
of other table and as a result this also makes the page look
better if an organization has zero custom profile fields.
This commit is contained in:
Sahil Batra 2023-07-27 12:56:04 +05:30 committed by Tim Abbott
parent 7bd7ccc439
commit db3b9e4742
3 changed files with 14 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/src/settings_profile_fields.js
View File

@ -67,17 +67,6 @@ function is_valid_to_display_in_summary(field_type) {
return true; return true;
} }
function update_profile_fields_table_element() {
const $profile_fields_table = $("#admin_profile_fields_table").expectOne();
// If there are no custom fields, hide the table headers at the top
if (page_params.custom_profile_fields.length < 1) {
$profile_fields_table.hide();
} else {
$profile_fields_table.show();
}
}
function delete_profile_field(e) { function delete_profile_field(e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@ -104,7 +93,6 @@ function delete_profile_field(e) {
const opts = { const opts = {
success_continuation() { success_continuation() {
display_success_status(); display_success_status();
update_profile_fields_table_element();
}, },
}; };
dialog_widget.submit_api_request(channel.del, url, {}, opts); dialog_widget.submit_api_request(channel.del, url, {}, opts);
@ -681,7 +669,6 @@ export function do_populate_profile_fields(profile_fields_data) {
} }
update_profile_fields_checkboxes(); update_profile_fields_checkboxes();
update_profile_fields_table_element();
loading.destroy_indicator($("#admin_page_profile_fields_loading_indicator")); loading.destroy_indicator($("#admin_page_profile_fields_loading_indicator"));
} }

3
web/styles/settings.css
View File

@ -132,7 +132,7 @@ h3,
margin-right: 10px; margin-right: 10px;
} }
#admin_profile_fields_table { .admin_profile_fields_table {
& th.display, & th.display,
td.display_in_profile_summary_cell { td.display_in_profile_summary_cell {
text-align: center; text-align: center;
@ -226,6 +226,7 @@ h3,
/* Limit the actions column to not using excessive width */ /* Limit the actions column to not using excessive width */
.admin-table-wrapper table.admin_profile_fields_table tr .actions { .admin-table-wrapper table.admin_profile_fields_table tr .actions {
width: 11%; width: 11%;
min-width: 70px;
} }
} }

21
web/templates/settings/profile_field_settings_admin.hbs
View File

@ -8,15 +8,18 @@
</div> </div>
<div class="admin-table-wrapper"> <div class="admin-table-wrapper">
<table class="table table-condensed table-striped admin_profile_fields_table"> <table class="table table-condensed table-striped admin_profile_fields_table">
<tbody id="admin_profile_fields_table"> <thead>
<th>{{t "Label" }}</th> <tr>
<th>{{t "Hint" }}</th> <th>{{t "Label" }}</th>
<th>{{t "Type" }}</th> <th>{{t "Hint" }}</th>
{{#if is_admin}} <th>{{t "Type" }}</th>
<th class="display">{{t "Card"}}</th> {{#if is_admin}}
<th class="actions">{{t "Actions" }}</th> <th class="display">{{t "Card"}}</th>
{{/if}} <th class="actions">{{t "Actions" }}</th>
</tbody> {{/if}}
</tr>
</thead>
<tbody id="admin_profile_fields_table" class="required-text" data-empty="{{t 'No custom profile field configured for this organization.' }}"></tbody>
</table> </table>
</div> </div>
</div> </div>