Skip to content

Commit a474529

Browse files
Readme updates
1 parent 39bce2b commit a474529

4 files changed

Lines changed: 42 additions & 56 deletions

File tree

CONTRIBUTING.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
Contributing Guide
2+
==================
3+
4+
## Any fixes or propositions are very welcome, just a couple of very basic guidelines:
5+
* Use spaces instead of tabs;
6+
* Comment well every new contribution;
7+
* Feel free to create a discussion or a new issue for every new contribution.

DEVELOPMENT.md

Lines changed: 0 additions & 25 deletions
This file was deleted.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"printableName": "Cache Web Terminal",
66
"description": "Web-based terminal emulator for Caché administering.",
77
"author": "ZitRo",
8-
"version": "4.0.0-alpha.78",
8+
"version": "4.0.0-beta.1",
99
"gaID": "UA-83005064-2",
1010
"releaseNumber": 26,
1111
"scripts": {

readme.md

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,87 @@
11
# Caché Web Terminal
22
Web-based Caché terminal for InterSystems products. Access your database from everywhere!
33

4-
Visit [project page](http://intersystems-ru.github.io/webterminal) for more details, **download** the latest version [here](http://intersystems-ru.github.io/webterminal/#downloads).
4+
Visit [project page](http://intersystems-ru.github.io/webterminal) for more details and **download** the latest version [here](http://intersystems-ru.github.io/webterminal/#downloads).
55

6-
### Installation
7-
Download the latest version from <a href="http://intersystems-ru.github.io/webterminal/#downloads">project page</a>
8-
and import XML file into any namespace. Later you can update application only by typing `/update` command in terminal.
6+
### Preview
97

10-
### Usage
11-
After installation, you will be able to access application at `http://[host]:[port]/terminal/` (slash at the end is required).
12-
Type `/help` there to get more information.
8+
Syntax highlighting & intelligent autocomplete!
9+
![2016-09-18_212035](https://cloud.githubusercontent.com/assets/4989256/18618027/33a4b544-7de6-11e6-9bf5-a535a2dc4bca.png)
10+
11+
Embedded SQL mode!
12+
![2016-09-18_212244](https://cloud.githubusercontent.com/assets/4989256/18618029/33a7183e-7de6-11e6-9a98-cceacca7b078.png)
1313

14-
### Features
14+
Even more features!
15+
![2016-09-18_212325](https://cloud.githubusercontent.com/assets/4989256/18618028/33a4c246-7de6-11e6-9ee9-4970223b0b31.png)
16+
17+
### Key Features
1518
<table>
1619
<tr>
1720
<td class="info">Native browser application</td>
18-
<td>This allows to access terminal both from desktop or mobile devices. No Telnet, only HTTP and WebSocket.</td>
21+
<td>Allows to access Caché terminal both from desktop or mobile devices.</td>
1922
</tr>
2023
<tr>
2124
<td class="info">Autocompletion</td>
22-
<td>Enables you to complete your input faster. Except keywords, autocomplete also available for classes, properties and globals.</td>
25+
<td>Type faster. Autocomplete is available in the most cases.</td>
2326
</tr>
2427
<tr>
2528
<td class="info">Tracing</td>
2629
<td>Monitor any changes in globals or files.</td>
2730
</tr>
2831
<tr>
2932
<td class="info">SQL mode</td>
30-
<td>Execute SQL queries simply by switching to SQL mode.</td>
33+
<td>A convenient way to execute SQL queries.</td>
3134
</tr>
3235
<tr>
3336
<td class="info">Syntax highlighting</td>
34-
<td>Visually attractive highlighted input.</td>
35-
</tr>
36-
<tr>
37-
<td class="info">Appearance</td>
38-
<td>Change the appearance of web-terminal or even code you own.</td>
37+
<td>Intelligently highlighted input.</td>
3938
</tr>
4039
<tr>
4140
<td class="info">Favorites</td>
42-
<td>Remember your best commands for later execution.</td>
43-
</tr>
44-
<tr>
45-
<td class="info">Definitions</td>
46-
<td>Define any piece of code as short expression and make your administering experience faster.</td>
41+
<td>Save commands you execute frequently.</td>
4742
</tr>
4843
<tr>
4944
<td class="info">Security</td>
50-
<td>Access to WebSocket is granted only if client will pass a session key given by csp page.</td>
45+
<td>All you need is to protect /terminal/ entry point, and all sessions are guaranteed to be secure.</td>
5146
</tr>
5247
<tr>
5348
<td class="info">Self-updating</td>
54-
<td>Terminal version 3.1.4 and higher can be automatically updated by using `/update` command.</td>
49+
<td>Terminal version 4 and higher prompts to update automatically, so you will not miss the important update.</td>
5550
</tr>
5651
<tr>
5752
<td class="info">Explore!</td>
58-
<td>Hope you will find this useful.</td>
53+
<td>Enjoy using WebTerminal!</td>
5954
</tr>
6055
</table>
6156

57+
### Installation
58+
Download the latest version from <a href="http://intersystems-ru.github.io/webterminal/#downloads">project page</a> and import XML file into any namespace.
59+
60+
### Usage
61+
After installation, you will be able to access application at `http://[host]:[port]/terminal/` (slash at the end is required).
62+
Type `/help` there to get more information.
63+
6264
Development
6365
-----------
6466

6567
We are glad to see anyone who want to contribute to Caché WEB Terminal development! Check the
66-
[developer's](https://github.com/intersystems-ru/webterminal/blob/master/DEVELOPMENT.md) guide.
68+
[developer's](https://github.com/intersystems-ru/webterminal/blob/master/CONTRIBUTING.md) guide.
6769

6870
In short, the "hot start" is extremely easy. Having latest [Git](https://git-scm.com/) and
6971
[NodeJS](https://nodejs.org/en/) installed (tested on NodeJS v4-6), execute the following:
7072

7173
```sh
7274
git clone https://github.com/intersystems-ru/webterminal
73-
cd webterminal # enter just created directory
75+
cd webterminal # enter repository directory
7476
npm install # install all project's dependencies
7577

7678
npm run build # build the project
7779
# OR edit import.bat script (on Windows) and then use only the following command:
7880
import
7981
```
8082

81-
Now, in `build` folder you will find `CacheWebTerminal-v*.xml` file ready to import. Every time you
82-
changes is ready to be tested, just run `gulp` command and import generated XML into Caché.
83-
83+
Now, in `build` folder you will find `WebTerminal-v*.xml` file. Every time you
84+
changes is ready to be tested, just run `import`.
8485

8586
Integration and WebTerminal's API
8687
---------------------------------
@@ -89,9 +90,12 @@ To embed WebTerminal to any other web application, you can use `<iframe>` tag.
8990
Example:
9091

9192
```html
92-
<iframe id="terminal" src="http://127.0.0.1:57772/terminal/"></iframe>
93+
<iframe id="terminal" src="http://127.0.0.1:57772/terminal/?NS=SAMPLES"></iframe>
9394
```
9495

96+
Note that terminal URL may include optional `NS` GET parameter, which specifies namespace
97+
where WebTerminal's session will start.
98+
9599
To use WebTerminal's API, you need to get WebTerminal instance first. Use iframe's
96100
`onTerminalInit` function to get it.
97101

0 commit comments

Comments
 (0)