mirror of
https://github.com/zulip/zulip-desktop.git
synced 2025-10-24 16:43:38 +00:00
network: Prompts Desktop App to ask for network setting in add-org page.
Fixes: #540.
This commit is contained in:
committed by
Akash Nimare
parent
b76f01349a
commit
30b40e2ff2
@@ -642,6 +642,26 @@ input.toggle-round:checked + label::after {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.server-network-option {
|
||||
font-weight: bold;
|
||||
font-size: 1.1rem;
|
||||
margin-top: 10px;
|
||||
padding-top: 15px;
|
||||
align-items: center;
|
||||
text-align: center;
|
||||
color: rgb(78, 191, 172);
|
||||
width: 98%;
|
||||
height: 46px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
i.open-network-button {
|
||||
font-size: 16px;
|
||||
cursor: pointer;
|
||||
padding-left: 5px;
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
/* responsive grid */
|
||||
|
||||
@media (max-width: 650px) {
|
||||
|
||||
@@ -1005,6 +1005,10 @@ class ServerManagerView {
|
||||
webview.send('set-idle');
|
||||
});
|
||||
});
|
||||
|
||||
ipcRenderer.on('open-network-settings', () => {
|
||||
this.openSettings('Network');
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
'use strict';
|
||||
|
||||
import { shell } from 'electron';
|
||||
import { shell, ipcRenderer } from 'electron';
|
||||
|
||||
import BaseComponent = require('../../components/base');
|
||||
import DomainUtil = require('../../utils/domain-util');
|
||||
@@ -30,15 +30,21 @@ class NewServerForm extends BaseComponent {
|
||||
</div>
|
||||
</div>
|
||||
<div class="server-center">
|
||||
<div class="divider">
|
||||
<hr class="left"/>${t.__('OR')}<hr class="right" />
|
||||
</div>
|
||||
<div class="divider">
|
||||
<hr class="left"/>${t.__('OR')}<hr class="right" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="server-center">
|
||||
<div class="server-save-action">
|
||||
<button id="open-create-org-link">${t.__('Create a new organization')}</button>
|
||||
</div>
|
||||
<div class="server-save-action">
|
||||
<button id="open-create-org-link">${t.__('Create a new organization')}</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="server-center">
|
||||
<div class="server-network-option">
|
||||
<span id="open-network-settings">${t.__('Network and Proxy Settings')}</span>
|
||||
<i class="material-icons open-network-button">open_in_new</i>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
}
|
||||
@@ -76,6 +82,11 @@ class NewServerForm extends BaseComponent {
|
||||
});
|
||||
}
|
||||
|
||||
networkSettingsLink(): void {
|
||||
const networkSettingsId = document.querySelectorAll('.server-network-option')[0];
|
||||
networkSettingsId.addEventListener('click', () => ipcRenderer.send('forward-message', 'open-network-settings'));
|
||||
}
|
||||
|
||||
initActions(): void {
|
||||
this.$saveServerButton.addEventListener('click', () => {
|
||||
this.submitFormHandler();
|
||||
@@ -89,6 +100,7 @@ class NewServerForm extends BaseComponent {
|
||||
});
|
||||
// open create new org link in default browser
|
||||
this.openCreateNewOrgExternalLink();
|
||||
this.networkSettingsLink();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -105,4 +105,4 @@
|
||||
"View Shortcuts": "View Shortcuts",
|
||||
"History Shortcuts": "History Shortcuts",
|
||||
"Window Shortcuts": "Window Shortcuts"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user