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

user docs: Use tabbed instructions on desktop-app-install-guide.

Browse Source 
Note that the correct tab is automatically activated depending on
the user's OS.
This commit is contained in:
Eeshan Garg
2018-09-15 17:05:25 -02:30
committed by Rishi Gupta
parent ecd4f821be
commit 2443919a7e
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
static/js/portico/landing-page.js
View File

@@ -49,7 +49,7 @@ var apps_events = function () {
description: "Zulip for Windows is even better than Zulip on the web, with a cleaner look, tray integration, native notifications, and support for multiple Zulip accounts.", description: "Zulip for Windows is even better than Zulip on the web, with a cleaner look, tray integration, native notifications, and support for multiple Zulip accounts.",
link: ELECTRON_APP_URL_WINDOWS, link: ELECTRON_APP_URL_WINDOWS,
show_instructions: true, show_instructions: true,
install_guide: "/help/desktop-app-install-guide#installing-on-windows", install_guide: "/help/desktop-app-install-guide",
}, },
mac: { mac: {
image: "/static/images/landing-page/macbook.png", image: "/static/images/landing-page/macbook.png",
@@ -57,7 +57,7 @@ var apps_events = function () {
description: "Zulip on macOS is even better than Zulip on the web, with a cleaner look, tray integration, native notifications, and support for multiple Zulip accounts.", description: "Zulip on macOS is even better than Zulip on the web, with a cleaner look, tray integration, native notifications, and support for multiple Zulip accounts.",
link: ELECTRON_APP_URL_MAC, link: ELECTRON_APP_URL_MAC,
show_instructions: true, show_instructions: true,
install_guide: "/help/desktop-app-install-guide#installing-on-macos", install_guide: "/help/desktop-app-install-guide",
}, },
android: { android: {
image: "/static/images/app-screenshots/zulip-android.png", image: "/static/images/app-screenshots/zulip-android.png",
@@ -77,7 +77,7 @@ var apps_events = function () {
description: "Zulip on the Linux desktop is even better than Zulip on the web, with a cleaner look, tray integration, native notifications, and support for multiple Zulip accounts.", description: "Zulip on the Linux desktop is even better than Zulip on the web, with a cleaner look, tray integration, native notifications, and support for multiple Zulip accounts.",
link: ELECTRON_APP_URL_LINUX, link: ELECTRON_APP_URL_LINUX,
show_instructions: true, show_instructions: true,
install_guide: "/help/desktop-app-install-guide#installing-on-linux", install_guide: "/help/desktop-app-install-guide",
}, },
}; };

12
templates/zerver/help/desktop-app-install-guide.md
View File

@@ -8,8 +8,8 @@ To install the latest stable release (recommended for most users),
find your operating system below. If you're interested in an early find your operating system below. If you're interested in an early
look at the newest features, consider the [beta releases](#beta-releases). look at the newest features, consider the [beta releases](#beta-releases).
<!-- This heading is linked to directly from /apps; change with caution --> {start_tabs}
## Installing on macOS {tab|mac}
### Disk image (recommended) ### Disk image (recommended)
<!-- TODO why zip? --> <!-- TODO why zip? -->
@@ -27,8 +27,7 @@ The app will update automatically to future versions.
The app will update automatically to future versions. `brew upgrade` will The app will update automatically to future versions. `brew upgrade` will
also work, if you prefer. also work, if you prefer.
<!-- This heading is linked to directly from /apps; change with caution --> {tab|windows}
## Installing on Windows
### Web installer (recommended) ### Web installer (recommended)
@@ -48,8 +47,7 @@ The app will update automatically to future versions.
The app will NOT update automatically. You can repeat these steps to upgrade The app will NOT update automatically. You can repeat these steps to upgrade
to future versions. <!-- TODO fact check --> to future versions. <!-- TODO fact check -->
<!-- This heading is linked to directly from /apps; change with caution --> {tab|linux}
## Installing on Linux
### apt (Ubuntu or Debian 8+) ### apt (Ubuntu or Debian 8+)
@@ -83,6 +81,8 @@ update automatically. You can repeat these steps to upgrade to future versions.
<!-- TODO why dpkg? --> <!-- TODO why dpkg? -->
{end_tabs}
## Beta releases ## Beta releases
Get a peek at new features before they're released! Get a peek at new features before they're released!

3
zerver/lib/bugdown/tabbed_sections.py
View File

@@ -40,6 +40,9 @@ TAB_DISPLAY_NAMES = {
'desktop-web': 'Desktop/Web', 'desktop-web': 'Desktop/Web',
'ios': 'iOS', 'ios': 'iOS',
'android': 'Android', 'android': 'Android',
'mac': 'macOS',
'windows': 'Windows',
'linux': 'Linux',
} }
class TabbedSectionsGenerator(Extension): class TabbedSectionsGenerator(Extension):