From 9d5d197747273d21611b324c035fb799ed8ce4cf Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Fri, 17 Nov 2017 23:07:04 +0000 Subject: [PATCH] Added share buttons --- CliClient/app/build-website.js | 88 ++++++++++++++++++++++++++++------ README.md | 2 +- docs/index.html | 84 +++++++++++++++++++++++++++----- docs/terminal/index.html | 82 ++++++++++++++++++++++++++----- 4 files changed, 215 insertions(+), 41 deletions(-) diff --git a/CliClient/app/build-website.js b/CliClient/app/build-website.js index 559e1ad47..d87801138 100644 --- a/CliClient/app/build-website.js +++ b/CliClient/app/build-website.js @@ -4,8 +4,7 @@ const { _, setLocale, languageCode } = require('lib/locale.js'); const marked = require('lib/marked.js'); const Mustache = require('mustache'); -const headerHtml = ` - +const headerHtml = ` Joplin - an open source note taking and to-do application with synchronisation capabilities @@ -14,6 +13,7 @@ const headerHtml = ` + @@ -143,11 +169,18 @@ const headerHtml = `

An open source note taking and to-do application with synchronisation capabilities.

-
- +
+
+ +
+ + + +
+
@@ -193,16 +226,41 @@ const footerHtml = ` // // `; -const gaHtml = ` +const scriptHtml = ` + + `; @@ -222,7 +280,7 @@ function markdownToHtml(md) { //output = output.replace(//, screenshotHtml); - return headerHtml + output + gaHtml + footerHtml; + return headerHtml + output + scriptHtml + footerHtml; } function renderFileToHtml(sourcePath, targetPath, params) { diff --git a/README.md b/README.md index 7493cbc62..37d4ff3b5 100644 --- a/README.md +++ b/README.md @@ -72,7 +72,7 @@ This will open a new screen which will display the import progress. The notes wi ## Terminal application * First, export your Evernote notebooks to ENEX files as described [here](https://help.evernote.com/hc/en-us/articles/209005557-How-to-back-up-export-and-restore-import-notes-and-notebooks). -* In Joplin, in [command-line mode](#command-line-mode), type `import-enex /path/to/file.enex`. This will import the notes into a new notebook named after the filename. +* In Joplin, in [command-line mode](/terminal#command-line-mode), type `import-enex /path/to/file.enex`. This will import the notes into a new notebook named after the filename. * Then repeat the process for each notebook that needs to be imported. # Synchronisation diff --git a/docs/index.html b/docs/index.html index 036d93456..70196c48a 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,4 +1,3 @@ - @@ -8,6 +7,7 @@ + @@ -137,11 +163,18 @@

An open source note taking and to-do application with synchronisation capabilities.

-
- +
+
+ +
+ + + +
+
@@ -230,7 +263,7 @@

Terminal application

  • First, export your Evernote notebooks to ENEX files as described here.
    • -
  • In Joplin, in command-line mode, type import-enex /path/to/file.enex. This will import the notes into a new notebook named after the filename.
    • +
  • In Joplin, in command-line mode, type import-enex /path/to/file.enex. This will import the notes into a new notebook named after the filename.
  • Then repeat the process for each notebook that needs to be imported.

Synchronisation

@@ -269,15 +302,40 @@

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ + diff --git a/docs/terminal/index.html b/docs/terminal/index.html index 80a4772d9..41583feb5 100644 --- a/docs/terminal/index.html +++ b/docs/terminal/index.html @@ -1,4 +1,3 @@ - @@ -8,6 +7,7 @@ + @@ -137,11 +163,18 @@

An open source note taking and to-do application with synchronisation capabilities.

-
- +
+
+ +
+ + + +
+
@@ -438,15 +471,40 @@ version

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

+ +