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

Merge branch 'master' into setup-karma-for-unit-tests

Browse Source
This commit is contained in:
simplyahmazing
2017-12-13 09:54:05 -05:00
parent 3f01774d0a d7a0b63d62
commit 600e8acdfa
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/renderer/js/pages/preference/new-server-form.js
View File

@@ -13,9 +13,9 @@ class NewServerForm extends BaseComponent {
return `
<div class="settings-card">
<div class="server-info-right">
<div class="title">Enter URL of your Zulip Organization</div>
<div class="title">URL of your Zulip organization</div>
<div class="server-info-row">
<input class="setting-input-value" autofocus placeholder="example.zulipchat.com"/>
<input class="setting-input-value" autofocus placeholder="acme.zulipchat.com"/>
</div>
<div class="server-info-row">
<div class="action blue server-save-action">

4
app/renderer/js/pages/preference/servers-section.js
View File

@@ -15,7 +15,7 @@ class ServersSection extends BaseSection {
template() {
return `
<div class="settings-pane" id="server-settings-pane">
<div class="page-title">Register or login to a Zulip Organization to get started</div>
<div class="page-title">Register or login to a Zulip organization to get started</div>
<div id="new-server-container"></div>
<div class="title" id="existing-servers"></div>
<div id="server-info-container"></div>
@@ -40,7 +40,7 @@ class ServersSection extends BaseSection {
this.$serverInfoContainer.innerHTML = servers.length ? '' : '';
// Show Existing servers if servers are there otherwise hide it
this.$existingServers.innerHTML = servers.length === 0 ? '' : 'Existing Organizations';
this.$existingServers.innerHTML = servers.length === 0 ? '' : 'Existing organizations';
this.initNewServerForm();
this.$createOrganizationContainer = document.getElementById('create-organization-container');