Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move stream setting templates to stream settings folder #19309

Merged
merged 6 commits into from Jul 19, 2021
Merged

Move stream setting templates to stream settings folder #19309

merged 6 commits into from Jul 19, 2021

Conversation

m-e-l-u-h-a-n
Copy link
Member

@m-e-l-u-h-a-n m-e-l-u-h-a-n commented Jul 19, 2021

Migrate stream setting templates to a separate stream_settings folder.
Follow up for: #19156.

@@ -3,10 +3,10 @@ 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_settings_stream_list from "../templates/stream_settings/settings_stream_list.hbs";
import render_settings_stream_list_item from "../templates/stream_settings/settings_stream_list_item.hbs";
Copy link
Sponsor Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we want to call these browse_streams_list and browse_streams_list_item? I think "browse streams" is a reasonable name within the "stream settings" namespace for the left side of "stream settings" just like have "stream_edit" / "stream_create" for the right side.

@timabbott
Copy link
Sponsor Member

This looks great and makes the templates feel much more organized; I posted one comment on a naming choice that might be worth tweaking, and then we can merge this.

Following changes are done to subscription_table_body.hbs:

* Rename subscription_table_body.hbs to stream_settings_overlay.hbs,
  to have a uniform naming pattern for stream settings templates.

* Move it to stream_settings folder.
We do following changes to two small independet templates used
in stream_settings area:

* Move subscription_setting_icon.hbs to stream settings folder
  to have a consistent folder structure for stream settings templates.
* Rename `subscription_count.hbs` to `subscriber_count.hbs`.
* Move `subscriber_count.hbs` to `stream_settings` folder.
We move templates related to listing streams in left pannel of
stream settings overlay to stream_settings folder by making
following changes:

* Rename `subscriptions.hbs` to `browse_streams_list.hbs`.
* Move `settings_stream_list.hbs` to stream_settings folder.
* Rename `subscription.hbs` to `browse_streams_list_item.hbs`.
* Move `settings_stream_list_item.hbs` to stream_settings folder.
This commit moves stream_subscription_request_result.hbs to
stream_settings folder to have a consistent file structure
for stream setting templates.
@timabbott timabbott merged commit b23fd2f into zulip:master Jul 19, 2021
@timabbott
Copy link
Sponsor Member

Merged, thanks @m-e-l-u-h-a-n!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants