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

org settings: Replace usage of ids with classes for upload button.

Browse Source
This commit is contained in:
Pragati Agrawal
2019-08-21 15:55:14 +05:30
committed by Tim Abbott
parent 67861529ac
commit c29b197ec7
4 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/js/realm_logo.js
View File

@@ -13,7 +13,7 @@ var realm_logo = (function () {
var delete_button_elem = $(selector_prefix + "logo_delete_button"); var delete_button_elem = $(selector_prefix + "logo_delete_button");
var file_input_elem = $(logo_section_id + " .realm-logo-file-input"); var file_input_elem = $(logo_section_id + " .realm-logo-file-input");
var file_input_error_elem = $(logo_section_id + " .realm-logo-file-input-error"); var file_input_error_elem = $(logo_section_id + " .realm-logo-file-input-error");
var upload_button_elem = $(selector_prefix + "logo_upload_button"); var upload_button_elem = $(logo_section_id + " .realm-logo-upload-button");
var get_file_input = function () { var get_file_input = function () {
return file_input_elem.expectOne(); return file_input_elem.expectOne();

8
static/js/settings_org.js
View File

@@ -1145,12 +1145,12 @@ exports.build_page = function () {
}); });
if (night) { if (night) {
error_field = $("#night-logo-section .realm-logo-file-input-error"); error_field = $("#night-logo-section .realm-logo-file-input-error");
spinner = $("#upload_night_logo_spinner"); spinner = $("#night-logo-section .upload-logo-spinner");
button_text = $("#upload_night_logo_button_text"); button_text = $("#night-logo-section .upload-logo-button-text");
} else { } else {
error_field = $("#day-logo-section .realm-logo-file-input-error"); error_field = $("#day-logo-section .realm-logo-file-input-error");
spinner = $("#upload_logo_spinner"); spinner = $("#day-logo-section .upload-logo-spinner");
button_text = $("#upload_logo_button_text"); button_text = $("#day-logo-section .upload-logo-button-text");
} }
spinner.expectOne(); spinner.expectOne();
error_field.hide(); error_field.hide();

3
static/styles/settings.scss
View File

@@ -1008,9 +1008,8 @@ input[type=checkbox].inline-block {
} }
#upload_avatar_spinner, #upload_avatar_spinner,
#upload_logo_spinner,
#upload_icon_spinner, #upload_icon_spinner,
#upload_night_logo_spinner { .upload-logo-spinner {
font-size: 14px; font-size: 14px;
margin: auto; margin: auto;
} }

14
static/templates/settings/organization_profile_admin.hbs
View File

@@ -75,10 +75,9 @@
<div class="inline-block avatar-controls"> <div class="inline-block avatar-controls">
<div class="realm-logo-file-input-error alert text-error"></div> <div class="realm-logo-file-input-error alert text-error"></div>
{{#if plan_includes_wide_organization_logo}} {{#if plan_includes_wide_organization_logo}}
<button class="button rounded sea-green w-200 block input-size day-settings" <button class="realm-logo-upload-button button rounded sea-green w-200 block input-size day-settings">
id="realm_logo_upload_button"> <span class="upload-logo-button-text">{{t 'Upload new logo' }}</span>
<span id="upload_logo_button_text">{{t 'Upload new logo' }}</span> <span class="upload-logo-spinner"></span>
<span id="upload_logo_spinner"></span>
</button> </button>
<button class="button rounded btn-danger w-200 m-t-10 block input-size" <button class="button rounded btn-danger w-200 m-t-10 block input-size"
id="realm_logo_delete_button">{{t 'Delete logo' }}</button> id="realm_logo_delete_button">{{t 'Delete logo' }}</button>
@@ -96,10 +95,9 @@
<div class="inline-block avatar-controls"> <div class="inline-block avatar-controls">
<div class="realm-logo-file-input-error alert text-error"></div> <div class="realm-logo-file-input-error alert text-error"></div>
{{#if plan_includes_wide_organization_logo}} {{#if plan_includes_wide_organization_logo}}
<button class="button rounded sea-green w-200 block input-size night-settings" <button class="realm-logo-upload-button button rounded sea-green w-200 block input-size night-settings">
id="realm_night_logo_upload_button"> <span class="upload-logo-button-text">{{t 'Upload new logo' }}</span>
<span id="upload_night_logo_button_text">{{t 'Upload new logo' }}</span> <span class="upload-logo-spinner"></span>
<span id="upload_night_logo_spinner"></span>
</button> </button>
<button class="button rounded btn-danger w-200 m-t-10 block input-size" <button class="button rounded btn-danger w-200 m-t-10 block input-size"
id="realm_night_logo_delete_button">{{t 'Delete logo' }}</button> id="realm_night_logo_delete_button">{{t 'Delete logo' }}</button>