paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-23 04:52:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

stream-settings: Fix duplicate IDs.

Browse Source 
"stream-advanced-configurations" was being used as ID for
advanced configurations section in both stream edit and
creation UI, which is not correct as ID should be unique.

This commit fixes it by removing the ID and instead using
class in selectors. Also, there was some unused CSS, as
we do not have dropdown widget buttons in advanced
configurations section, written using the duplicate ID so
removed that as well.
This commit is contained in:
Sahil Batra
2025-05-19 19:15:45 +05:30
committed by Tim Abbott
parent a2d4913cc0
commit 72e2605b98
5 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
web/src/settings_components.ts
View File

@@ -1452,7 +1452,7 @@ function enable_or_disable_save_button($subsection_elem: JQuery): void {
) { ) {
if ( if (
$subsection_elem.attr("id") === "org-message-retention" || $subsection_elem.attr("id") === "org-message-retention" ||
$subsection_elem.attr("id") === "stream-advanced-configurations" $subsection_elem.hasClass("advanced-configurations-container")
) { ) {
ui_util.disable_element_and_add_tooltip( ui_util.disable_element_and_add_tooltip(
$save_button, $save_button,

2
web/src/stream_ui_updates.ts
View File

@@ -340,7 +340,7 @@ export function enable_or_disable_permission_settings_in_edit_panel(
.prop("disabled", !sub.can_change_stream_permissions_requiring_metadata_access); .prop("disabled", !sub.can_change_stream_permissions_requiring_metadata_access);
const $advanced_configurations_container = $stream_settings.find( const $advanced_configurations_container = $stream_settings.find(
$("#stream-advanced-configurations"), $(".advanced-configurations-container"),
); );
$advanced_configurations_container $advanced_configurations_container
.find("input, select, button") .find("input, select, button")

6
web/styles/dark_theme.css
View File

@@ -96,8 +96,7 @@
input:not([type="radio"]):read-only, input:not([type="radio"]):read-only,
textarea:read-only, textarea:read-only,
#organization-permissions .dropdown-widget-button:disabled, #organization-permissions .dropdown-widget-button:disabled,
#organization-settings .dropdown-widget-button:disabled, #organization-settings .dropdown-widget-button:disabled {
#stream-advanced-configurations .dropdown-widget-button:disabled {
color: inherit; color: inherit;
opacity: 0.5; opacity: 0.5;
} }
@@ -119,8 +118,7 @@
.user-status-content-wrapper, .user-status-content-wrapper,
.custom-time-input-value, .custom-time-input-value,
#organization-permissions .dropdown-widget-button, #organization-permissions .dropdown-widget-button,
#organization-settings .dropdown-widget-button, #organization-settings .dropdown-widget-button {
#stream-advanced-configurations .dropdown-widget-button {
background-color: hsl(0deg 0% 0% / 20%); background-color: hsl(0deg 0% 0% / 20%);
border-color: hsl(0deg 0% 0% / 60%); border-color: hsl(0deg 0% 0% / 60%);
color: inherit; color: inherit;

6
web/styles/subscriptions.css
View File

@@ -1332,12 +1332,6 @@ div.settings-radio-input-parent {
margin-bottom: 10px; margin-bottom: 10px;
} }
#stream-advanced-configurations {
.dropdown-widget-button {
color: hsl(0deg 0% 33%);
}
}
#change_user_group_description, #change_user_group_description,
#change_stream_description { #change_stream_description {
width: 100%; width: 100%;

2
web/templates/stream_settings/stream_types.hbs
View File

@@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<div id="stream-advanced-configurations" class="advanced-configurations-container {{#if is_stream_edit}}settings-subsection-parent{{/if}}"> <div class="advanced-configurations-container {{#if is_stream_edit}}settings-subsection-parent{{/if}}">
<div class="advance-config-title-container {{#if is_stream_edit}}subsection-header{{/if}}"> <div class="advance-config-title-container {{#if is_stream_edit}}subsection-header{{/if}}">
<div class="advance-config-toggle-area"> <div class="advance-config-toggle-area">
<i class="fa fa-sm fa-caret-right toggle-advanced-configurations-icon" aria-hidden="true"></i> <i class="fa fa-sm fa-caret-right toggle-advanced-configurations-icon" aria-hidden="true"></i>