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

organization_settings: Restyle remaining sea-green button to action-button-quiet-brand.

Browse Source 
Fixes part of #33130.
This commit is contained in:
Maneesh Shukla
2025-03-04 23:13:26 +05:30
committed by Tim Abbott
parent 325f077d3f
commit d0be7ec9f0
12 changed files with 69 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web/e2e-tests/realm-linkifier.test.ts
View File

@@ -10,7 +10,7 @@ async function test_add_linkifier(page: Page): Promise<void> {
pattern: "#(?P<id>[0-9]+)",
url_template: "https://trac.example.com/ticket/{id}",
});
await page.click("form.admin-linkifier-form button.button");
await page.click('form.admin-linkifier-form button[type="submit"]');
const admin_linkifier_status_selector = "div#admin-linkifier-status";
await page.waitForSelector(admin_linkifier_status_selector, {visible: true});
@@ -52,7 +52,7 @@ async function test_add_invalid_linkifier_pattern(page: Page): Promise<void> {
pattern: "(foo",
url_template: "https://trac.example.com/ticket/{id}",
});
await page.click("form.admin-linkifier-form button.button");
await page.click('form.admin-linkifier-form button[type="submit"]');
await page.waitForSelector("div#admin-linkifier-status", {visible: true});
assert.strictEqual(

4
web/src/settings_org.ts
View File

@@ -1538,5 +1538,9 @@ export function build_page(): void {
realm_logo.build_realm_logo_widget(upload_realm_logo_or_icon, true);
}
$("#id_org_profile_preview").on("click", () => {
window.open("/login/?preview=true", "_blank", "noopener,noreferrer");
});
$("#organization-profile .deactivate_realm_button").on("click", deactivate_organization);
}

2
web/templates/components/action_button.hbs
View File

@@ -1,4 +1,4 @@
<button type="button" {{#if id}}id="{{id}}"{{/if}} class="{{#if custom_classes}}{{custom_classes}} {{/if}}action-button action-button-{{attention}}-{{intent}} {{#if hidden}}hide{{/if}}" {{#if data-tooltip-template-id}}data-tooltip-template-id="{{data-tooltip-template-id}}"{{/if}} tabindex="0" {{#if aria-label}}aria-label="{{aria-label}}"{{/if}}
<button type="{{#if type}}{{type}}{{else}}button{{/if}}" {{#if id}}id="{{id}}"{{/if}} class="{{#if custom_classes}}{{custom_classes}} {{/if}}action-button action-button-{{attention}}-{{intent}} {{#if hidden}}hide{{/if}}" {{#if data-tooltip-template-id}}data-tooltip-template-id="{{data-tooltip-template-id}}"{{/if}} tabindex="0" {{#if aria-label}}aria-label="{{aria-label}}"{{/if}}
{{#if disabled}}disabled{{/if}}
>
{{#if icon}}

9
web/templates/settings/account_settings.hbs
View File

@@ -36,9 +36,12 @@
{{#*inline "z-link-convert-demo-organization-help"}}<a href="/help/demo-organizations#convert-a-demo-organization-to-a-permanent-organization" target="_blank" rel="noopener noreferrer">{{> @partial-block}}</a>{{/inline}}
{{/tr}}
</p>
<button id="demo_organization_add_email_button" type="button" class="button rounded sea-green">
{{t "Add email"}}
</button>
{{> ../components/action_button
id="demo_organization_add_email_button"
label=(t "Add email")
attention="quiet"
intent="brand"
}}
</div>
{{/if}}
</form>

10
web/templates/settings/data_exports_admin.hbs
View File

@@ -19,9 +19,13 @@
<span class="export_status_text"></span>
</div>
<form>
<button type="submit" class="button rounded sea-green" id="start-export-button">
{{t 'Start export' }}
</button>
{{> ../components/action_button
label=(t "Start export")
id="start-export-button"
attention="quiet"
intent="brand"
type="submit"
}}
</form>
{{/if}}

8
web/templates/settings/default_streams_list_admin.hbs
View File

@@ -5,7 +5,13 @@
<h3>{{t "Default channels"}}</h3>
<div class="add_default_streams_button_container">
{{#if is_admin}}
<button type="submit" id="show-add-default-streams-modal" class="button rounded sea-green">{{t "Add channel" }}</button>
{{> ../components/action_button
id="show-add-default-streams-modal"
label=(t "Add channel")
attention="quiet"
intent="brand"
type="submit"
}}
{{/if}}
{{> filter_text_input placeholder=(t 'Filter') aria_label=(t 'Filter default channels')}}
</div>

10
web/templates/settings/emoji_settings_admin.hbs
View File

@@ -5,9 +5,13 @@
<p class="add-emoji-text {{#unless can_add_emojis}}hide{{/unless}}">
{{t "Add extra emoji for members of the {realm_name} organization." }}
</p>
<button id="add-custom-emoji-button" class="button rounded sea-green {{#unless can_add_emojis}}hide{{/unless}}">
{{t 'Add a new emoji' }}
</button>
{{> ../components/action_button
id="add-custom-emoji-button"
attention="quiet"
intent="brand"
label=(t "Add a new emoji")
hidden=(not can_add_emojis)
}}
<div class="settings_panel_list_header">
<h3>{{t "Custom emoji"}}</h3>

9
web/templates/settings/linkifier_settings_admin.hbs
View File

@@ -46,9 +46,12 @@
<input type="text" id="linkifier_template" class="settings_text_input" name="url_template" placeholder="https://github.com/zulip/zulip/issues/{id}" />
<div class="alert" id="admin-linkifier-template-status"></div>
</div>
<button type="submit" class="button rounded sea-green">
{{t 'Add linkifier' }}
</button>
{{> ../components/action_button
label=(t 'Add linkifier')
attention="quiet"
intent="brand"
type="submit"
}}
</div>
</div>
</form>

13
web/templates/settings/organization_profile_admin.hbs
View File

@@ -49,11 +49,14 @@
is_editable_by_current_user = is_admin
image = realm_icon_url }}
</div>
<a href="/login/?preview=true" target="_blank" rel="noopener noreferrer" class="button rounded sea-green block" id="id_org_profile_preview">
{{t 'Preview organization profile' }}
<i class="fa fa-external-link" aria-hidden="true"></i>
</a>
{{> ../components/action_button
label=(t "Preview organization profile")
custom_classes="block"
id="id_org_profile_preview"
icon="external-link"
attention="quiet"
intent="brand"
}}
<div class="subsection-header">
<h3>{{t "Organization logo" }}
{{> ../help_link_widget link="/help/create-your-organization-profile#add-a-wide-logo" }}

10
web/templates/settings/playground_settings_admin.hbs
View File

@@ -54,9 +54,13 @@
<label for="playground_url_template"> {{t "URL template" }}</label>
<input type="text" id="playground_url_template" class="settings_text_input" name="url_template" placeholder="https://play.rust-lang.org/?code={code}" />
</div>
<button type="submit" id="submit_playground_button" class="button rounded sea-green">
{{t 'Add code playground' }}
</button>
{{> ../components/action_button
id="submit_playground_button"
label=(t "Add code playground")
attention="quiet"
intent="brand"
type="submit"
}}
</div>
</div>
</form>

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

@@ -3,7 +3,12 @@
<h3>{{t "Custom profile fields"}}</h3>
<div class="alert-notification" id="admin-profile-field-status"></div>
{{#if is_admin}}
<button class="button rounded sea-green" id="add-custom-profile-field-button">{{t "Add a new profile field" }}</button>
{{> ../components/action_button
id="add-custom-profile-field-button"
label=(t "Add a new profile field")
attention="quiet"
intent="brand"
}}
{{/if}}
</div>
<div class="progressive-table-wrapper" data-simplebar data-simplebar-tab-index="-1">

9
web/templates/settings/realm_domains_modal.hbs
View File

@@ -15,7 +15,14 @@
<span class="rendered-checkbox"></span>
</label>
</td>
<td><button type="button" class="button sea-green small rounded" id="submit-add-realm-domain">{{t "Add" }}</button></td>
<td>
{{> ../components/action_button
label=(t "Add")
id="submit-add-realm-domain"
attention="quiet"
intent="brand"
}}
</td>
</tr>
</tfoot>
</table>