mirror of
				https://github.com/zulip/zulip.git
				synced 2025-11-03 21:43:21 +00:00 
			
		
		
		
	stream settings: Move subscription_settings.hbs to stream_settings.
This commmit does following two changes to subscription_settings.hbs: * Rename subscription_settings to stream_settings to have a uniform naming pattern for stream settings. * Move it to stream_settings folder.
This commit is contained in:
		
				
					committed by
					
						
						Tim Abbott
					
				
			
			
				
	
			
			
			
						parent
						
							662d485c15
						
					
				
				
					commit
					36c8923797
				
			@@ -119,7 +119,7 @@ test_ui("subscriber_pills", ({override, mock_template}) => {
 | 
			
		||||
        assert.equal(typeof data.display_value, "string");
 | 
			
		||||
        return html;
 | 
			
		||||
    });
 | 
			
		||||
    mock_template("subscription_settings.hbs", false, () => "subscription_settings");
 | 
			
		||||
    mock_template("stream_settings/stream_settings.hbs", false, () => "stream_settings");
 | 
			
		||||
    mock_template(
 | 
			
		||||
        "stream_subscription_request_result.hbs",
 | 
			
		||||
        false,
 | 
			
		||||
 
 | 
			
		||||
@@ -5,8 +5,8 @@ import render_settings_deactivation_stream_modal from "../templates/confirm_dial
 | 
			
		||||
import render_unsubscribe_private_stream_modal from "../templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs";
 | 
			
		||||
import render_stream_description from "../templates/stream_settings/stream_description.hbs";
 | 
			
		||||
import render_stream_member_list_entry from "../templates/stream_settings/stream_member_list_entry.hbs";
 | 
			
		||||
import render_stream_settings from "../templates/stream_settings/stream_settings.hbs";
 | 
			
		||||
import render_stream_subscription_request_result from "../templates/stream_subscription_request_result.hbs";
 | 
			
		||||
import render_subscription_settings from "../templates/subscription_settings.hbs";
 | 
			
		||||
import render_subscription_stream_privacy_modal from "../templates/subscription_stream_privacy_modal.hbs";
 | 
			
		||||
 | 
			
		||||
import * as blueslip from "./blueslip";
 | 
			
		||||
@@ -526,7 +526,7 @@ export function show_settings_for(node) {
 | 
			
		||||
    stream_data.clean_up_description(slim_sub);
 | 
			
		||||
    const sub = stream_settings_data.get_sub_for_settings(slim_sub);
 | 
			
		||||
 | 
			
		||||
    const html = render_subscription_settings({
 | 
			
		||||
    const html = render_stream_settings({
 | 
			
		||||
        sub,
 | 
			
		||||
        settings: stream_settings(sub),
 | 
			
		||||
        stream_post_policy_values: stream_data.stream_post_policy_values,
 | 
			
		||||
 
 | 
			
		||||
@@ -3,8 +3,8 @@ import _ from "lodash";
 | 
			
		||||
import tippy from "tippy.js";
 | 
			
		||||
 | 
			
		||||
import render_unsubscribe_private_stream_modal from "../templates/confirm_dialog/confirm_unsubscribe_private_stream.hbs";
 | 
			
		||||
import render_stream_settings from "../templates/stream_settings/stream_settings.hbs";
 | 
			
		||||
import render_subscription from "../templates/subscription.hbs";
 | 
			
		||||
import render_subscription_settings from "../templates/subscription_settings.hbs";
 | 
			
		||||
import render_subscription_table_body from "../templates/subscription_table_body.hbs";
 | 
			
		||||
import render_subscriptions from "../templates/subscriptions.hbs";
 | 
			
		||||
 | 
			
		||||
@@ -256,7 +256,7 @@ export function add_sub_to_table(sub) {
 | 
			
		||||
        ui.get_content_element($(".streams-list")).append(new_row);
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    const settings_html = render_subscription_settings(sub);
 | 
			
		||||
    const settings_html = render_stream_settings(sub);
 | 
			
		||||
    ui.get_content_element($(".subscriptions .settings")).append($(settings_html));
 | 
			
		||||
 | 
			
		||||
    if (stream_create.get_name() === sub.name) {
 | 
			
		||||
 
 | 
			
		||||
@@ -19,7 +19,7 @@
 | 
			
		||||
        <div class="general_settings stream_section">
 | 
			
		||||
            {{#with sub}}
 | 
			
		||||
            <div class="stream-header">
 | 
			
		||||
                {{> stream_settings/stream_privacy_icon
 | 
			
		||||
                {{> stream_privacy_icon
 | 
			
		||||
                  invite_only=invite_only
 | 
			
		||||
                  is_web_public=is_web_public }}
 | 
			
		||||
                <div class="stream-name">
 | 
			
		||||
@@ -33,7 +33,7 @@
 | 
			
		||||
                </div>
 | 
			
		||||
            </div>
 | 
			
		||||
            <div class="stream-description">
 | 
			
		||||
                {{> stream_settings/stream_description
 | 
			
		||||
                {{> stream_description
 | 
			
		||||
                  rendered_description=rendered_description
 | 
			
		||||
                  }}
 | 
			
		||||
            </div>
 | 
			
		||||
@@ -52,7 +52,7 @@
 | 
			
		||||
            </div>
 | 
			
		||||
            <div class="subscription-type">
 | 
			
		||||
                <div class="subscription-type-text">
 | 
			
		||||
                    {{> stream_settings/stream_permission_description
 | 
			
		||||
                    {{> stream_permission_description
 | 
			
		||||
                      stream_post_policy_values=../stream_post_policy_values
 | 
			
		||||
                      message_retention_text=../message_retention_text}}
 | 
			
		||||
                </div>
 | 
			
		||||
@@ -61,7 +61,7 @@
 | 
			
		||||
            <div class="stream-email-box" {{#unless sub.email_address}}style="display: none;"{{/unless}}>
 | 
			
		||||
                <h3 class="stream_setting_subsection_title">
 | 
			
		||||
                    {{t "Email address" }}
 | 
			
		||||
                    {{> help_link_widget link="/help/message-a-stream-by-email" }}
 | 
			
		||||
                    {{> ../help_link_widget link="/help/message-a-stream-by-email" }}
 | 
			
		||||
                </h3>
 | 
			
		||||
                <div class="stream-email">
 | 
			
		||||
                    <span class="email-address">{{sub.email_address}}</span>
 | 
			
		||||
@@ -78,7 +78,7 @@
 | 
			
		||||
                <ul class="grey-box">
 | 
			
		||||
                    {{#each settings}}
 | 
			
		||||
                    <li>
 | 
			
		||||
                        {{> stream_settings/stream_settings_checkbox
 | 
			
		||||
                        {{> stream_settings_checkbox
 | 
			
		||||
                          setting_name=name
 | 
			
		||||
                          is_checked=is_checked
 | 
			
		||||
                          is_muted=(lookup ../sub "is_muted")
 | 
			
		||||
@@ -102,7 +102,7 @@
 | 
			
		||||
        <div class="subscriber_settings stream_section">
 | 
			
		||||
            {{#with sub}}
 | 
			
		||||
            <div class="subscription-members-setting">
 | 
			
		||||
                {{> stream_settings/stream_members}}
 | 
			
		||||
                {{> stream_members}}
 | 
			
		||||
            </div>
 | 
			
		||||
            {{/with}}
 | 
			
		||||
        </div>
 | 
			
		||||
		Reference in New Issue
	
	Block a user