server-page: Responsive tweaks for divider.

release: 🎉 new-release v1.9.0.
org-settings-page: UI fixes and tweaks for the org-settings page.
2025-10-27 10:03:38 +00:00 · 2018-03-23 12:18:44 +05:30 · 2018-03-23 03:59:56 +05:30 · 2018-03-23 03:45:50 +05:30 · 2018-03-23 01:36:43 +05:30 · 2018-03-22 23:23:18 +05:30
27 changed files with 395 additions and 243 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,31 +2,16 @@ sudo: required
 dist: trusty

 os:
-  - osx
-  - linux
-
-osx_image: xcode9.0
+- osx
+- linux

 addons:
  apt:
    packages:
-      - build-essential
-      - libxext-dev
-      - libxtst-dev
-      - libxkbfile-dev
-  artifacts:
-    paths:
-      - $(ls ./dist/*.AppImage | tr "\n" ":")
-      - $(ls ./dist/*.deb | tr "\n" ":")
-      - $(ls ./dist/*.dmg | tr "\n" ":")
-      - $(ls ./dist/*.zip | tr "\n" ":")
-      - $(ls ./dist/*.dmg.blockmap | tr "\n" ":")
-      - $(ls ./dist/github/*.json | tr "\n" ":")
-      - $(ls ./dist/github/*.yml | tr "\n" ":")
-      - $(ls ./dist/*.yml | tr "\n" ":")
-      - $(ls ./dist/mac/*.yml | tr "\n" ":")
-      - $(ls ./dist/linux/*.yml | tr "\n" ":")
-    debug: true
+    - build-essential
+    - libxext-dev
+    - libxtst-dev
+    - libxkbfile-dev

 language: node_js
 node_js:
@@ -39,23 +24,14 @@ before_install:

 cache:
  directories:
-    - node_modules
-    - app/node_modules
-    - ~/.cache
+  - node_modules
+  - app/node_modules

 script:
-  - npm run travis
-  - chmod +x ./scripts/install-release-dependencies.sh
-  - ./scripts/install-release-dependencies.sh
-  - npm run dist
-  - node ./scripts/prepare-artifacts.js
-  # log out /dist files might be useful to know
-  # what files are uploaded
-  - ls dist
-
+- npm run travis
 notifications:
  webhooks:
    urls:
      - https://zulip.org/zulipbot/travis
    on_success: always
-    on_failure: always
+    on_failure: always
--- a/app/main/index.js
+++ b/app/main/index.js
@@ -52,8 +52,8 @@ const iconPath = () => {
 function createMainWindow() {
 	// Load the previous state with fallback to defaults
 	const mainWindowState = windowStateKeeper({
-		defaultWidth: 1000,
-		defaultHeight: 600
+		defaultWidth: 1100,
+		defaultHeight: 720
 	});

 	// Let's keep the window position global so that we can access it in other process
@@ -71,7 +71,6 @@ function createMainWindow() {
 		minHeight: 400,
 		webPreferences: {
 			plugins: true,
-			allowDisplayingInsecureContent: true,
 			nodeIntegration: true
 		},
 		show: false
--- a/app/package.json
+++ b/app/package.json
@@ -1,7 +1,7 @@
 {
  "name": "zulip",
  "productName": "Zulip",
-  "version": "1.8.2",
+  "version": "1.9.0",
  "description": "Zulip Desktop App",
  "license": "Apache-2.0",
  "copyright": "Kandra Labs, Inc.",
@@ -30,7 +30,7 @@
    "electron-is-dev": "0.3.0",
    "electron-log": "2.2.7",
    "electron-spellchecker": "1.1.2",
-    "electron-updater": "2.21.0",
+    "electron-updater": "2.18.2",
    "electron-window-state": "4.1.1",
    "is-online": "7.0.0",
    "node-json-db": "0.7.3",
--- a/app/renderer/about.html
+++ b/app/renderer/about.html
@@ -1,45 +1,50 @@
 <!DOCTYPE html>
 <html lang="en">
-	<head>
-		<meta charset="UTF-8">
-		<link rel="stylesheet" href="css/about.css">
-	</head>
-	<body>
+
+<head>
+	<meta charset="UTF-8">
+	<link rel="stylesheet" href="css/about.css">
+</head>
+
+<body>
 	<div class="about">
 		<img class="logo" src="../resources/zulip.png" />
 		<p class="detail" id="version">v?.?.?</p>
 		<div class="maintenance-info">
 			<p class="detail maintainer">
-				Maintained by <a onclick="linkInBrowser('website')">Zulip</a>
+				Maintained by
+				<a onclick="linkInBrowser('website')">Zulip</a>
 			</p>
 			<p class="detail license">
-				Available under the <a onclick="linkInBrowser('license')">Apache 2.0 License</a>
+				Available under the
+				<a onclick="linkInBrowser('license')">Apache 2.0 License</a>
 			</p>
 			<a class="bug" onclick="linkInBrowser('bug')" href="#">Found bug?</a>
 		</div>
 	</div>
 	<script>

-	const { app } = require('electron').remote;
-	const { shell } = require('electron');
-	const version_tag = document.querySelector('#version');
-	version_tag.innerHTML = 'v' + app.getVersion();
+		const { app } = require('electron').remote;
+		const { shell } = require('electron');
+		const version_tag = document.querySelector('#version');
+		version_tag.innerHTML = 'v' + app.getVersion();

-	function linkInBrowser(type) {
-		let url;
-		switch (type) {
-			case 'website': 
-				url = "https://zulipchat.com";
-				break;
-			case 'license': 
-				url = "https://github.com/zulip/zulip-electron/blob/master/LICENSE";
-				break;
-			default:
-				url = 'https://github.com/zulip/zulip-electron/issues/new?body=' + 
-				      '%3C!--Please%20describe%20your%20issue%20and%20steps%20to%20reproduce%20it.--%3E';
+		function linkInBrowser(type) {
+			let url;
+			switch (type) {
+				case 'website':
+					url = "https://zulipchat.com";
+					break;
+				case 'license':
+					url = "https://github.com/zulip/zulip-electron/blob/master/LICENSE";
+					break;
+				default:
+					url = 'https://github.com/zulip/zulip-electron/issues/new?body=' +
+						'%3C!--Please%20describe%20your%20issue%20and%20steps%20to%20reproduce%20it.--%3E';
+			}
+			shell.openExternal(url);
 		}
-		shell.openExternal(url);
-	}
 	</script>
-	</body>
+	<script>require('./js/shared/preventdrag.js')</script>
+</body>
 </html>
--- a/app/renderer/css/main.css
+++ b/app/renderer/css/main.css
@@ -121,11 +121,14 @@ body {
 }

 .action-button.active {
-    background-color: rgba(255, 255, 255, 0.25);
+    /* background-color: rgba(255, 255, 255, 0.25); */
+    background-color: #efefef;
+    opacity: 0.9;
+    padding-right: 14px;
 }

 .action-button.active i {
-    color: #eee;
+    color: #1c262b;
 }

 .tab:first-child {
@@ -284,7 +287,7 @@ webview.focus {
 #setting-tooltip {
    font-family: sans-serif;
    background: #222c31;
-    margin-left: 45px;
+    margin-left: 48px;
    padding: 6px 8px;
    position: absolute;
    margin-top: 0px;
@@ -356,6 +359,8 @@ webview.focus {
    height: 100%;
    width: 100%;
    position: relative;
+    flex-grow: 1;
+    flex-basis: 0px;
 }

 .hidden {
--- a/app/renderer/css/preference.css
+++ b/app/renderer/css/preference.css
@@ -115,7 +115,7 @@ td:nth-child(odd) {
 }

 .nav.active {
-    color: #464e5a;
+    color: #4ebfac;
    cursor: default;
    position: relative;
 }
@@ -123,12 +123,19 @@ td:nth-child(odd) {
 .nav.active::before {
    background: #464e5a;
    width: 3px;
-    height: 16px;
+    height: 18px;
    position: absolute;
    left: -8px;
    content: '';
 }

+
+/* We don't want to show this in nav item since we have the + button for adding an Organization */
+
+#nav-AddServer {
+    display: none;
+}
+
 #settings-header {
    font-size: 22px;
    color: #222c31;
@@ -144,12 +151,12 @@ td:nth-child(odd) {
 }

 #new-server-container {
-    opacity: 1;
-    transition: opacity 0.3s;
+    padding-left: 42px;
+    padding-top: 25px;
+    margin-right: 16px;
 }

 .title {
-    padding: 4px 0 6px 0;
    font-weight: 500;
    color: #222c31;
 }
@@ -161,6 +168,16 @@ td:nth-child(odd) {
    padding: 4px 0 6px 0;
 }

+.add-server-info-row {
+    display: flex;
+    margin: 8px 0 0 0;
+}
+
+.add-server-info-right {
+    flex-grow: 1;
+    margin-top: 10px;
+}
+
 .sub-title {
    padding: 4px 0 6px 0;
    font-weight: bold;
@@ -171,20 +188,40 @@ img.server-info-icon {
    width: 36px;
    height: 36px;
    padding: 4px;
+    cursor: pointer;
+    vertical-align: middle;
 }

 .server-info-left {
-    margin: 10px 20px 0 0;
+    margin: 4px 20px 0 0;
+    min-width: 40%;
 }

 .server-info-right {
+    margin-top: 4px;
+    width: 55%;
+    display: flex;
+    align-items: baseline;
+    justify-content: space-between;
    flex-grow: 1;
-    margin-right: 10px;
 }

 .server-info-row {
-    display: flex;
-    margin: 8px 0 0 0;
+    display: inline-block;
+    margin: 5px 0 0 0;
+}
+
+.server-info-left .server-info-row {
+    display: inline-flex;
+    align-items: inherit;
+    vertical-align: -2px;
+    position: relative;
+}
+
+.server-url {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
 }

 .server-info-alias {
@@ -192,6 +229,10 @@ img.server-info-icon {
    cursor: pointer;
 }

+.server-url-info {
+    margin-right: 10px;
+}
+
 .setting-input-key {
    font-size: 14px;
    height: 27px;
@@ -205,18 +246,16 @@ img.server-info-icon {
 .setting-input-value {
    flex-grow: 1;
    font-size: 14px;
-    height: 22px;
    border-radius: 3px;
-    padding: 7px;
+    padding: 13px;
    border: #ededed 2px solid;
    outline-width: 0;
    background: transparent;
-    max-width: 500px;
+    max-width: 450px;
 }

 .setting-input-value:focus {
-    border: #7cb980 2px solid;
-    border-radius: 3px;
+    border: #4EBFAC 2px solid;
 }

 .setting-block {
@@ -272,7 +311,6 @@ img.server-info-icon {
 }

 .settings-card:hover {
-    border-left: 8px solid #bcbcbc;
    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 0px 0px rgba(0, 0, 0, 0.12);
 }

@@ -282,11 +320,15 @@ img.server-info-icon {
 }

 .red {
-    color: #ffffff;
-    background: #ef5350;
-    padding: 3px;
-    padding-right: 10px;
-    padding-left: 10px;
+    color: #ef5350;
+    padding: 8px;
+    border: rgba(239, 83, 80, 0.5) solid 1px;
+}
+
+.red:hover {
+    color: #e63431;
+    border: rgba(239, 83, 80, 0.7) solid 1px;
+    ;
 }

 .blue {
@@ -316,8 +358,8 @@ img.server-info-icon {
 }

 i.open-tab-button {
-    padding: 0 5px;
-    font-size: 18px;
+    padding-left: 2px;
+    font-size: 19px;
    cursor: pointer;
 }

@@ -370,17 +412,10 @@ i.open-tab-button {
 }

 #open-create-org-link {
-    color: #666;
    cursor: pointer;
    text-decoration: none;
 }

-#open-create-org-link:hover {
-    color: #005580;
-    ;
-    text-decoration: underline;
-}
-
 .toggle {
    position: absolute;
    margin-left: -9999px;
@@ -435,6 +470,94 @@ input.toggle-round:checked+label:after {
 }


+/*  Add new server modal */
+
+.add-server-modal {
+    display: block;
+    position: fixed;
+    z-index: 1;
+    padding-top: 15vh;
+    left: 0;
+    top: 0;
+    margin: auto;
+    width: 100%;
+    height: 100%;
+    /* background: rgba(61, 64, 67, 15); */
+    background: linear-gradient(35deg, #003b52, #45b59b);
+    overflow: auto;
+}
+
+
+/* Modal Content */
+
+.modal-container {
+    background-color: #f4f7f8;
+    margin: auto;
+    padding: 57px;
+    border: #dae1e3 1px solid;
+    width: 550px;
+    height: 370px;
+    border-radius: 4px;
+}
+
+.add-server-modal .page-title {
+    text-align: center;
+    font-size: 1.6rem;
+}
+
+.divider {
+    margin-bottom: 30px;
+    margin-top: 30px;
+    color: #7d878a;
+}
+
+.divider hr {
+    margin-left: 8px;
+    margin-right: 8px;
+    width: 44%;
+}
+
+.left {
+    float: left;
+}
+
+.right {
+    float: right;
+}
+
+.server-center {
+    width: 100%;
+    text-align: center;
+    align-items: center;
+    padding-top: 13px;
+    margin-left: -5px;
+}
+
+.server-center button {
+    font-weight: bold;
+    font-size: 1.1rem;
+    margin: auto;
+    align-items: center;
+    text-align: center;
+    color: #fff;
+    background: #4EBFAC;
+    border-color: none;
+    border: none;
+    width: 98%;
+    height: 46px;
+    border-radius: 3px;
+    cursor: pointer;
+}
+
+.server-center button:hover {
+    background: #329588;
+}
+
+.server-center button:focus {
+    background: #329588;
+}
+
+
 /* responsive grid */

@media (max-width: 650px) {
@@ -447,4 +570,38 @@ input.toggle-round:checked+label:after {
    #css-delete-action span {
        display: none;
    }
+}
+
+@media (max-width: 720px) {
+    .modal-container {
+        width: 60vw;
+        padding: 40px;
+        min-width: 300px;
+    }
+    .server-center button {
+        margin-right: -12px;
+        width: 100%;
+    }
+    .divider {
+        margin-right: -8px;
+    }
+    .divider hr {
+        margin-left: 6px;
+        margin-right: 6px;
+        width: 43%;
+    }
+    #new-server-container {
+        padding-left: 0px;
+    }
+}
+
+@media (max-width: 600px) {
+    .divider {
+        margin-left: 4%;
+    }
+    .divider hr {
+        margin-left: 2px;
+        margin-right: 2px;
+        width: 40%;
+    }
 }
--- a/app/renderer/js/main.js
+++ b/app/renderer/js/main.js
@@ -122,7 +122,7 @@ class ServerManagerView {
 			// Remove focus from the settings icon at sidebar bottom
 			this.$settingsButton.classList.remove('active');
 		} else {
-			this.openSettings('Servers');
+			this.openSettings('AddServer');
 		}
 	}

@@ -159,7 +159,7 @@ class ServerManagerView {
 			this.tabs[this.activeTabIndex].webview.reload();
 		});
 		this.$addServerButton.addEventListener('click', () => {
-			this.openSettings('Servers');
+			this.openSettings('AddServer');
 		});
 		this.$settingsButton.addEventListener('click', () => {
 			this.openSettings('General');
@@ -268,10 +268,10 @@ class ServerManagerView {
 	}

 	activateLastTab(index) {
-		// Open last active tab
-		ConfigUtil.setConfigItem('lastActiveTab', index);
-		// Open all the tabs in background
+		// Open all the tabs in background, also activate the tab based on the index
 		this.activateTab(index);
+		// Save last active tab
+		ConfigUtil.setConfigItem('lastActiveTab', index);
 	}

 	activateTab(index, hideOldTab = true) {
@@ -311,7 +311,7 @@ class ServerManagerView {
 			webContents.send('toggle-sidebar', state);
 		});

-		ipcRenderer.on('toogle-silent', (event, state) => {
+		ipcRenderer.on('toggle-silent', (event, state) => {
 			const webviews = document.querySelectorAll('webview');
 			webviews.forEach(webview => {
 				try {
--- a/app/renderer/js/pages/preference/connected-org-section.js
+++ b/app/renderer/js/pages/preference/connected-org-section.js
@@ -0,0 +1,51 @@
+'use strict';
+
+const BaseSection = require(__dirname + '/base-section.js');
+const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+const ServerInfoForm = require(__dirname + '/server-info-form.js');
+
+class ConnectedOrgSection extends BaseSection {
+	constructor(props) {
+		super();
+		this.props = props;
+	}
+
+	template() {
+		return `
+			<div class="settings-pane" id="server-settings-pane">
+				<div class="page-title">Connected organizations</div>
+				<div class="title" id="existing-servers">All the connected orgnizations will appear here.</div>
+				<div id="server-info-container"></div>
+			</div>
+		`;
+	}
+
+	init() {
+		this.initServers();
+	}
+
+	initServers() {
+		this.props.$root.innerHTML = '';
+
+		const servers = DomainUtil.getDomains();
+		this.props.$root.innerHTML = this.template();
+		this.$serverInfoContainer = document.getElementById('server-info-container');
+		this.$existingServers = document.getElementById('existing-servers');
+
+		const noServerText = 'All the connected orgnizations will appear here';
+		// Show noServerText if no servers are there otherwise hide it
+		this.$existingServers.innerHTML = servers.length === 0 ? noServerText : '';
+
+		for (let i = 0; i < servers.length; i++) {
+			new ServerInfoForm({
+				$root: this.$serverInfoContainer,
+				server: servers[i],
+				index: i,
+				onChange: this.reloadApp
+			}).init();
+		}
+	}
+
+}
+
+module.exports = ConnectedOrgSection;
--- a/app/renderer/js/pages/preference/create-new-org.js
+++ b/app/renderer/js/pages/preference/create-new-org.js
@@ -1,37 +0,0 @@
-'use strict';
-
-const BaseComponent = require(__dirname + '/../../components/base.js');
-const shell = require('electron').shell;
-
-class CreateOrganziation extends BaseComponent {
-	constructor(props) {
-		super();
-		this.props = props;
-	}
-
-	template() {
-		return `
-			<div class="setting-row">
-				<div class="setting-description">
-					<span id="open-create-org-link">Or create a new organization on zulipchat.com<i class="material-icons open-tab-button">open_in_new</i></span>
-				</div>
-				<div class="setting-control"></div>
-			</div>
-		`;
-	}
-
-	init() {
-		this.props.$root.innerHTML = this.template();
-		this.openCreateNewOrgExternalLink();
-	}
-
-	openCreateNewOrgExternalLink() {
-		const link = 'https://zulipchat.com/beta/';
-		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
-		externalCreateNewOrgEl.addEventListener('click', () => {
-			shell.openExternal(link);
-		});
-	}
-}
-
-module.exports = CreateOrganziation;
--- a/app/renderer/js/pages/preference/general-section.js
+++ b/app/renderer/js/pages/preference/general-section.js
@@ -180,7 +180,7 @@ class GeneralSection extends BaseSection {
 				const newValue = !ConfigUtil.getConfigItem('silent', true);
 				ConfigUtil.setConfigItem('silent', newValue);
 				this.updateSilentOption();
-				currentBrowserWindow.send('toogle-silent', newValue);
+				currentBrowserWindow.send('toggle-silent', newValue);
 			}
 		});
 	}
--- a/app/renderer/js/pages/preference/nav.js
+++ b/app/renderer/js/pages/preference/nav.js
@@ -8,7 +8,7 @@ class PreferenceNav extends BaseComponent {

 		this.props = props;

-		this.navItems = ['General', 'Network', 'Servers', 'Shortcuts'];
+		this.navItems = ['General', 'Network', 'AddServer', 'Organizations', 'Shortcuts'];

 		this.init();
 	}
--- a/app/renderer/js/pages/preference/new-server-form.js
+++ b/app/renderer/js/pages/preference/new-server-form.js
@@ -2,6 +2,7 @@

 const BaseComponent = require(__dirname + '/../../components/base.js');
 const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
+const shell = require('electron').shell;

 class NewServerForm extends BaseComponent {
 	constructor(props) {
@@ -11,19 +12,26 @@ class NewServerForm extends BaseComponent {

 	template() {
 		return `
-			<div class="settings-card">
-				<div class="server-info-right">
-					<div class="title">URL of Zulip organization</div>
-					<div class="server-info-row">
-						<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or chat.your-organization.com"/>
-					</div>
-					<div class="server-info-row">
-						<div class="action blue server-save-action">
-							<i class="material-icons">add_box</i>
-							<span>Add</span>
-						</div>
+			<div class="server-input-container">
+				<div class="title">Organization URL</div>
+				<div class="add-server-info-row">
+					<input class="setting-input-value" autofocus placeholder="your-organization.zulipchat.com or zulip.your-organization.com"/>
+				</div>
+				<div class="server-center">
+					<div class="server-save-action">
+						<button id="connect">Connect</button>
 					</div>
 				</div>
+				<div class="server-center">
+				<div class="divider">
+					<hr class="left"/>OR<hr class="right" />
+				</div>
+				</div>
+				<div class="server-center">
+				<div class="server-save-action">
+					<button id="open-create-org-link">Create a new organization</button>
+			</div>
+					</div>
 			</div>
 		`;
 	}
@@ -43,17 +51,25 @@ class NewServerForm extends BaseComponent {
 	}

 	submitFormHandler() {
-		this.$saveServerButton.children[1].innerHTML = 'Adding...';
+		this.$saveServerButton.children[0].innerHTML = 'Connecting...';
 		DomainUtil.checkDomain(this.$newServerUrl.value).then(serverConf => {
 			DomainUtil.addDomain(serverConf).then(() => {
 				this.props.onChange(this.props.index);
 			});
 		}, errorMessage => {
-			this.$saveServerButton.children[1].innerHTML = 'Add';
+			this.$saveServerButton.children[0].innerHTML = 'Connect';
 			alert(errorMessage);
 		});
 	}

+	openCreateNewOrgExternalLink() {
+		const link = 'https://zulipchat.com/new/';
+		const externalCreateNewOrgEl = document.getElementById('open-create-org-link');
+		externalCreateNewOrgEl.addEventListener('click', () => {
+			shell.openExternal(link);
+		});
+	}
+
 	initActions() {
 		this.$saveServerButton.addEventListener('click', () => {
 			this.submitFormHandler();
@@ -65,6 +81,8 @@ class NewServerForm extends BaseComponent {
 				this.submitFormHandler();
 			}
 		});
+		// open create new org link in default browser
+		this.openCreateNewOrgExternalLink();
 	}
 }

--- a/app/renderer/js/pages/preference/preference.js
+++ b/app/renderer/js/pages/preference/preference.js
@@ -7,6 +7,7 @@ const Nav = require(__dirname + '/js/pages/preference/nav.js');
 const ServersSection = require(__dirname + '/js/pages/preference/servers-section.js');
 const GeneralSection = require(__dirname + '/js/pages/preference/general-section.js');
 const NetworkSection = require(__dirname + '/js/pages/preference/network-section.js');
+const ConnectedOrgSection = require(__dirname + '/js/pages/preference/connected-org-section.js');
 const ShortcutsSection = require(__dirname + '/js/pages/preference/shortcuts-section.js');

 class PreferenceView extends BaseComponent {
@@ -39,7 +40,7 @@ class PreferenceView extends BaseComponent {
 	handleNavigation(navItem) {
 		this.nav.select(navItem);
 		switch (navItem) {
-			case 'Servers': {
+			case 'AddServer': {
 				this.section = new ServersSection({
 					$root: this.$settingsContainer
 				});
@@ -51,6 +52,12 @@ class PreferenceView extends BaseComponent {
 				});
 				break;
 			}
+			case 'Organizations': {
+				this.section = new ConnectedOrgSection({
+					$root: this.$settingsContainer
+				});
+				break;
+			}
 			case 'Network': {
 				this.section = new NetworkSection({
 					$root: this.$settingsContainer
--- a/app/renderer/js/pages/preference/server-info-form.js
+++ b/app/renderer/js/pages/preference/server-info-form.js
@@ -16,19 +16,18 @@ class ServerInfoForm extends BaseComponent {
 			<div class="settings-card">
 				<div class="server-info-left">
 					<img class="server-info-icon" src="${this.props.server.icon}"/>
-				</div>
-				<div class="server-info-right">
 					<div class="server-info-row">
 						<span class="server-info-alias">${this.props.server.alias}</span>
 						<i class="material-icons open-tab-button">open_in_new</i>
 					</div>
-					<div class="server-info-row">
-						<input class="setting-input-value" disabled value="${this.props.server.url}"/>
+				</div>
+				<div class="server-info-right">
+					<div class="server-info-row server-url">
+						<span class="server-url-info" title="${this.props.server.url}">${this.props.server.url}</span>
 					</div>
 					<div class="server-info-row">
 						<div class="action red server-delete-action">
-							<i class="material-icons">indeterminate_check_box</i>
-							<span>Delete</span>
+							<span>Disconnect</span>
 						</div>
 					</div>
 				</div>
@@ -44,6 +43,7 @@ class ServerInfoForm extends BaseComponent {
 	initForm() {
 		this.$serverInfoForm = this.generateNodeFromTemplate(this.template());
 		this.$serverInfoAlias = this.$serverInfoForm.getElementsByClassName('server-info-alias')[0];
+		this.$serverIcon = this.$serverInfoForm.getElementsByClassName('server-info-icon')[0];
 		this.$deleteServerButton = this.$serverInfoForm.getElementsByClassName('server-delete-action')[0];
 		this.$openServerButton = this.$serverInfoForm.getElementsByClassName('open-tab-button')[0];
 		this.props.$root.appendChild(this.$serverInfoForm);
@@ -71,7 +71,12 @@ class ServerInfoForm extends BaseComponent {
 		this.$serverInfoAlias.addEventListener('click', () => {
 			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
 		});
+
+		this.$serverIcon.addEventListener('click', () => {
+			ipcRenderer.send('forward-message', 'switch-server-tab', this.props.index);
+		});
 	}
+
 }

 module.exports = ServerInfoForm;
--- a/app/renderer/js/pages/preference/servers-section.js
+++ b/app/renderer/js/pages/preference/servers-section.js
@@ -1,10 +1,7 @@
 'use strict';

 const BaseSection = require(__dirname + '/base-section.js');
-const DomainUtil = require(__dirname + '/../../utils/domain-util.js');
-const ServerInfoForm = require(__dirname + '/server-info-form.js');
 const NewServerForm = require(__dirname + '/new-server-form.js');
-const CreateOrganziation = require(__dirname + '/create-new-org.js');

 class ServersSection extends BaseSection {
 	constructor(props) {
@@ -14,13 +11,14 @@ 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 id="new-server-container"></div>
-				<div class="title" id="existing-servers"></div>
-				<div id="server-info-container"></div>
-				<div id="create-organization-container"></div>
+		<div class="add-server-modal">
+			<div class="modal-container">
+				<div class="settings-pane" id="server-settings-pane">
+					<div class="page-title">Add a Zulip organization</div>
+					<div id="new-server-container"></div>
+				</div>
 			</div>
+		</div>
 		`;
 	}

@@ -31,35 +29,10 @@ class ServersSection extends BaseSection {
 	initServers() {
 		this.props.$root.innerHTML = '';

-		const servers = DomainUtil.getDomains();
 		this.props.$root.innerHTML = this.template();
-		this.$serverInfoContainer = document.getElementById('server-info-container');
-		this.$existingServers = document.getElementById('existing-servers');
 		this.$newServerContainer = document.getElementById('new-server-container');
-		this.$newServerButton = document.getElementById('new-server-action');

-		this.$serverInfoContainer.innerHTML = servers.length ? '' : '';
-		// Show Existing servers if servers are there otherwise hide it
-		this.$existingServers.innerHTML = servers.length === 0 ? '' : 'Connected organizations';
 		this.initNewServerForm();
-
-		this.$createOrganizationContainer = document.getElementById('create-organization-container');
-		this.initCreateNewOrganization();
-
-		for (let i = 0; i < servers.length; i++) {
-			new ServerInfoForm({
-				$root: this.$serverInfoContainer,
-				server: servers[i],
-				index: i,
-				onChange: this.reloadApp
-			}).init();
-		}
-	}
-
-	initCreateNewOrganization() {
-		new CreateOrganziation({
-			$root: this.$createOrganizationContainer
-		}).init();
 	}

 	initNewServerForm() {
--- a/app/renderer/js/preload.js
+++ b/app/renderer/js/preload.js
@@ -8,6 +8,9 @@ const ConfigUtil = require(__dirname + '/utils/config-util.js');
 // eslint-disable-next-line import/no-unassigned-import
 require('./notification');

+// Prevent drag and drop event in main process which prevents remote code executaion
+require(__dirname + '/shared/preventdrag.js');
+
 const logout = () => {
 	// Create the menu for the below
 	document.querySelector('.dropdown-toggle').click();
--- a/app/renderer/js/shared/preventdrag.js
+++ b/app/renderer/js/shared/preventdrag.js
@@ -0,0 +1,17 @@
+'use strict';
+
+// This is a security fix. Following function prevents drag and drop event in the app
+// so that attackers can't execute any remote code within the app
+// It doesn't affect the compose box so that users can still
+// use drag and drop event to share files etc
+
+const preventDragAndDrop = () => {
+	const preventEvents = ['dragover', 'drop'];
+	preventEvents.forEach(dragEvents => {
+		document.addEventListener(dragEvents, event => {
+			event.preventDefault();
+		});
+	});
+};
+
+preventDragAndDrop();
--- a/app/renderer/main.html
+++ b/app/renderer/main.html
@@ -44,4 +44,5 @@
  </div>
 </body>
 <script src="js/main.js"></script>
+<script>require('./js/shared/preventdrag.js')</script>
 </html>
--- a/app/renderer/network.html
+++ b/app/renderer/network.html
@@ -17,5 +17,6 @@
      <div id="reconnect">Try now</div>
    </div>
  </body>
-  <script src="js/pages/network.js"></script>  
+  <script src="js/pages/network.js"></script>
+  <script>require('./js/shared/preventdrag.js')</script>
 </html>
--- a/app/renderer/preference.html
+++ b/app/renderer/preference.html
@@ -13,4 +13,5 @@
    </div>
  </body>
  <script src="js/pages/preference/preference.js"></script>
+  <script>require('./js/shared/preventdrag.js')</script>
 </html>
--- a/development.md
+++ b/development.md
@@ -25,7 +25,7 @@ manager (see [here][nodesource-install] for more on the first command):

 ```sh
 $ curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash -
-$ sudo apt install git nodejs python build-essential libxext-dev libxtst-dev libxkbfile-dev
+$ sudo apt install git nodejs python build-essential libxext-dev libxtst-dev libxkbfile-dev libgconf-2-4
 ```

 [nodesource-install]: https://nodejs.org/en/download/package-manager/#debian-and-ubuntu-based-linux-distributions
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "zulip",
  "productName": "Zulip",
-  "version": "1.8.2",
+  "version": "1.9.0",
  "main": "./app/main",
  "description": "Zulip Desktop App",
  "license": "Apache-2.0",
@@ -113,8 +113,8 @@
    "assert": "1.4.1",
    "cp-file": "^5.0.0",
    "devtron": "1.4.0",
-    "electron": "1.8.2",
-    "electron-builder": "20.4.1",
+    "electron": "1.8.4",
+    "electron-builder": "19.53.6",
    "electron-connect": "0.6.2",
    "electron-debug": "1.4.0",
    "google-translate-api": "2.3.0",
@@ -123,7 +123,7 @@
    "is-ci": "^1.0.10",
    "nodemon": "^1.14.11",
    "pre-commit": "1.2.2",
-    "spectron": "3.7.2",
+    "spectron": "3.8.0",
    "tap-colorize": "^1.2.0",
    "tape": "^4.8.0",
    "xo": "0.18.2"
@@ -164,8 +164,7 @@
    ],
    "ignore": [
      "tests/*.js",
-      "tools/locale-helper/*.js",
-      "scripts/*.js"
+      "tools/locale-helper/*.js"
    ],
    "envs": [
      "node",
--- a/scripts/debian-add-repo.sh
+++ b/scripts/debian-add-repo.sh
@@ -2,6 +2,10 @@

 # This script runs when user install the debian package

+# Link to the binary
+ln -sf '/opt/${productFilename}/${executable}' '/usr/local/bin/${executable}';
+echo 'Successfully added /opt/${productFilename}/${executable} to /usr/local/bin/${executable}'
+
 # Install apt repository source list if it does not exist
 if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep zulip.list; then
    sudo apt-key adv --keyserver pool.sks-keyservers.net --recv 69AD12704E71A4803DCA3A682424BE5AE9BD10D9
--- a/scripts/debian-uninstaller.sh
+++ b/scripts/debian-uninstaller.sh
@@ -28,4 +28,8 @@ appDirectory=/home/$getSudoUser/.config/Zulip/;

 if [ -d $appDirectory ]; then
    sudo rm -rf $appDirectory;
-fi
+fi
+
+# Delete the link to the binary
+echo 'Removing binary link'
+sudo rm -f '/usr/local/bin/${executable}';
--- a/scripts/install-release-dependencies.sh
+++ b/scripts/install-release-dependencies.sh
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
-  sudo apt-get install --no-install-recommends -y icnsutils
-
-  # to build 32 bit from a machine with 64 bit
-  sudo apt-get install --no-install-recommends -y gcc-multilib g++-multilib
-fi
--- a/scripts/prepare-artifacts.js
+++ b/scripts/prepare-artifacts.js
@@ -1,28 +0,0 @@
-#!/usr/bin/env node
-
-if (!process.env.TRAVIS_OS_NAME === 'linux') {
-  process.exit(0);
-}
-
-const fs = require('fs');
-const path = require('path');
-
-// go to dist directory
-process.chdir(path.resolve(__dirname, '../dist'));
-
-const extensions = /\.deb|\.AppImage|\.zip/;
-const files = fs.readdirSync(process.cwd()).filter(file => file.includes);
-
-function changeFileName(file) {
-  file = file.replace(/^z/, 'Z');
-  file = file.replace(/_{2}/, '-');
-  return file;
-}
-
-// Change file name to what we want
-// eg zulip_1.8.2_amd64.deb -> Zulip-1.8.2-amd64.deb
-// and change file name
-files.map(file => {
-  const newFileName = changeFileName(file);
-  fs.renameSync(file, newFileName);
-});
--- a/tests/index.js
+++ b/tests/index.js
@@ -7,7 +7,7 @@ test('app runs', function (t) {
  const app = setup.createApp()
  setup.waitForLoad(app, t)
    .then(() => app.client.windowByIndex(1)) // focus on webview
-    .then(() => app.client.waitForExist('//*[@id="new-server-container"]/div/div/div[2]/input'))
+    .then(() => app.client.waitForExist('//*[@id="connect"]')) // id of the connect button
    .then(() => setup.endTest(app, t),
          (err) => setup.endTest(app, t, err || 'error'))
 })
Author	SHA1	Message	Date
Akash Nimare	b80c3d007b	server-page: Responsive tweaks for divider.	2018-03-23 12:18:44 +05:30
Akash Nimare	70fb198a0b	release: 🎉 new-release v1.9.0.	2018-03-23 03:59:56 +05:30
Abhigyan Khaund	7276bfeaa7	org-settings-page: UI fixes and tweaks for the org-settings page. Fixes: * Move "Disconnect" button to be at the far right. * Ellipsis text-overflow for server-url. * Show server url as title tooltip on hover. * Remove settings-card's right transition on hover. Improves: #456.	2018-03-23 03:45:50 +05:30
Akash Nimare	abd71330ba	setting-page: Minor UI fixes for add new server page. Minor fixes - * Update link to create a new organization. * Update placeholder text for demo zulip server. * Remove border from connect button. * Add overflow for smaller window. * Fix a typo in background color. * Use buttons for server actions. * Make new server page responsive. * Focus buttons on tab. * Update styling of button. * Make add new server page responsive. Fixes: #457.	2018-03-23 01:36:43 +05:30
Akash Nimare	e776222d6b	browser-window: Prevent drag and drop events. This stops a remote code execution via drag and drop event in the main/renderer process. Fixes #453.	2018-03-22 23:23:18 +05:30
Akash Nimare	30b05571e7	electron: Upgrade to v1.8.4. This upgrade includes some webview security fixes. https://www.electronjs.org/blog/webview-fix	2018-03-22 11:14:32 +05:30
Akash Nimare	0a155c63e7	security: Do not allow running insecure contents in app.	2018-03-22 10:57:35 +05:30
Akash Nimare	13c750ac6c	tests: Update Spectron to latest.	2018-03-20 20:54:32 +05:30
Akash Nimare	48799f75d1	tests: Fix failing renderer tests.	2018-03-20 20:53:10 +05:30
Akash Nimare	29f4e702ad	Merge branch 'master' of github.com:zulip/zulip-electron	2018-03-19 20:45:54 +05:30
Akash Nimare	3eb4cf4f64	Ubuntu: Add Zulip link to the binrary. Zulip can't be run from the terminal because we were not linking the binary to the bin. The electron-builder used to support this by default but we as we added the afterInstall script it got removed. More info - https://github.com/electron-userland/electron-builder/issues/2682, https://github.com/electron-userland/electron-builder/issues/2689 Fixes #444.	2018-03-19 20:38:38 +05:30
Abhigyan Khaund	1a97d8a5b0	design: Improve connected organization design. This PR updates the connected organization page. Changes - * All the server details are now inline. * Change "Delete" to "Disconnect". * Club org logo and name together on the right, and URL and "Disconnect" to the left. * Link to organization logo on the server tab. Improves #340.	2018-03-19 17:10:42 +05:30
Akash Nimare	2f96ec6199	settings: Fix a typo in silent setting option.	2018-03-17 03:49:43 +05:30
Akash Nimare	52de465457	settings: Fix app settings overriding issue. (#449 ) This fixes an issue which was caused by saving the last active tab before a functional tab activates. The bug was introduced in `f409bb0449`. It was unnoticed from v1.5.0 to the latest v1.8.2. The bug causes a serious issue where the app can't change the app settings and all settings were getting overridden when a user switches back to setting page. Fixes #448.	2018-03-17 03:06:41 +05:30
Ganesha Danu Enastika	e3039cf5a9	tools: Add missing Ubuntu dependancy.	2018-03-14 23:43:07 +05:30
Akash Nimare	6c120269eb	design: Redesign Add new server page. (#446 ) Changes - * New setting nav item for connected organizations. * All new page for adding a new server. * Minor UI changes in setting page. * Update default height, width of the main window. * Fix webview showing outline. * Hide Server nav item in setting page. Fixes #340.	2018-03-14 23:41:12 +05:30
Akash Nimare	b31fc6b66d	setting-page: Better looking nav items.	2018-03-10 23:14:42 +05:30