paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-03 05:23:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

settings: Redesign buttons in channel and group settings.

Browse Source 
Fixes: #34253.
This commit is contained in:
Maneesh Shukla
2025-04-14 14:07:26 +05:30
committed by Tim Abbott
parent 2ae2589494
commit 46cd38d1b0
5 changed files with 133 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
web/templates/stream_settings/stream_settings.hbs
View File

@@ -11,7 +11,7 @@
{{/tr}}
</span>
</template>
<button class="button small rounded subscribe-button sub_unsub_button {{#if should_display_subscription_button}}toggle-subscription-tooltip{{/if}} {{#unless subscribed }}unsubscribed{{/unless}}" type="button" name="button" data-tooltip-template-id="toggle-subscription-tooltip-template" {{#unless should_display_subscription_button}}disabled="disabled"{{/unless}}>
<button class="action-button action-button-quiet-brand subscribe-button sub_unsub_button {{#if should_display_subscription_button}}toggle-subscription-tooltip{{/if}} {{#unless subscribed }}unsubscribed{{/unless}}" type="button" name="button" data-tooltip-template-id="toggle-subscription-tooltip-template" {{#unless should_display_subscription_button}}disabled="disabled"{{/unless}}>
{{#if subscribed }}
{{t "Unsubscribe" }}
{{else}}
@@ -19,13 +19,22 @@
{{/if}}
</button>
</div>
<a href="{{preview_url}}" class="button small rounded tippy-zulip-delayed-tooltip" id="preview-stream-button" role="button" data-tooltip-template-id="view-stream-tooltip-template" data-tippy-placement="bottom" {{#unless should_display_preview_button }}style="display: none"{{/unless}}><i class="fa fa-eye"></i></a>
{{> ../components/action_button
icon="eye"
attention="quiet"
intent="info"
custom_classes="tippy-zulip-delayed-tooltip"
data-tooltip-template-id="view-stream-tooltip-template"
id="preview-stream-button"
hidden=(not should_display_preview_button)
}}
{{#if can_archive_stream}}
<button class="button small rounded button-danger deactivate tippy-zulip-delayed-tooltip" type="button" data-tippy-content="{{t 'Archive channel'}}">
<span class="icon-container">
<i class="zulip-icon zulip-icon-archive" aria-hidden="true"></i>
</span>
</button>
{{> ../components/icon_button
icon="archive"
intent="danger"
custom_classes="tippy-zulip-delayed-tooltip deactivate"
data-tippy-content=(t 'Archive channel')
}}
{{/if}}
</div>
{{/with}}
@@ -48,9 +57,13 @@
</div>
<div class="stream_change_property_info alert-notification"></div>
<div class="button-group" {{#unless can_change_name_description}}style="display:none"{{/unless}}>
<button id="open_stream_info_modal" class="button rounded small button-warning tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Edit channel name and description' }}">
<i class="fa fa-pencil" aria-hidden="true"></i>
</button>
{{> ../components/icon_button
icon="edit"
intent="neutral"
custom_classes="tippy-zulip-delayed-tooltip"
id="open_stream_info_modal"
data-tippy-content=(t 'Edit channel name and description' )
}}
</div>
</div>
<div class="stream-description">
@@ -95,9 +108,15 @@
{{> ../help_link_widget link="/help/message-a-channel-by-email" }}
</p>
<span class="generate-channel-email-button-container {{#unless can_access_stream_email}}disabled_setting_tooltip{{/unless}}">
<button class="button small rounded copy_email_button" {{#unless can_access_stream_email}}disabled="disabled"{{/unless}} id="copy_stream_email_button" type="button">
<span class="copy_button">{{t "Generate email address" }}</span>
</button>
{{> ../components/action_button
label=(t "Generate email address")
attention="quiet"
intent="neutral"
type="button"
custom_classes="copy_email_button"
id="copy_stream_email_button"
disabled=(not can_access_stream_email)
}}
</span>
</div>
</div>
@@ -137,7 +156,13 @@
</div>
<p>{{t "In muted channels, channel notification settings apply only to unmuted topics." }}</p>
<div class="input-group">
<button class="button small rounded reset-stream-notifications-button" type="button">{{t "Reset to default notifications" }}</button>
{{> ../components/action_button
label=(t "Reset to default notifications")
attention="quiet"
intent="neutral"
custom_classes="reset-stream-notifications-button"
type="button"
}}
</div>
{{#each notification_settings}}
<div class="input-group">

22
web/templates/user_group_settings/user_group_settings.hbs
View File

@@ -2,16 +2,17 @@
<div class="tab-container"></div>
<div class="button-group">
<div class="join_leave_button_wrapper inline-block">
<button class="button small rounded join_leave_button" type="button" name="button">
{{#if is_direct_member}}
{{t "Leave group" }}
{{else}}
{{t "Join group" }}
{{/if}}
</button>
{{#if is_direct_member}}
{{> ../components/action_button label=(t "Leave group") custom_classes="join_leave_button" type="button"
attention="quiet" intent="brand" }}
{{else}}
{{> ../components/action_button label=(t "Join group") custom_classes="join_leave_button" type="button"
attention="quiet" intent="brand" }}
{{/if}}
</div>
{{#unless group.deactivated}}
<button class="button small rounded button-danger deactivate deactivate-group-button tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Deactivate group'}}" type="button"> <i class="zulip-icon zulip-icon-user-group-x" aria-hidden="true"></i></button>
{{> ../components/icon_button icon="user-group-x" intent="danger" custom_classes="deactivate-group-button deactivate tippy-zulip-delayed-tooltip"
data-tippy-content=(t 'Deactivate group') }}
{{/unless}}
</div>
</div>
@@ -26,9 +27,8 @@
</div>
<div class="group_change_property_info alert-notification"></div>
<div class="button-group">
<button id="open_group_info_modal" class="button rounded small button-warning tippy-zulip-delayed-tooltip" data-tippy-content="{{t 'Change group info' }}">
<i class="zulip-icon zulip-icon-user-group-edit" aria-hidden="true"></i>
</button>
{{> ../components/icon_button icon="user-group-edit" intent="neutral" custom_classes="tippy-zulip-delayed-tooltip"
data-tippy-content=(t 'Change group info') id="open_group_info_modal" }}
</div>
</div>
<div class="group-description-wrapper">