self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-11-24 08:12:24 +02:00
Code Issues Releases Activity

Update website

Browse Source
This commit is contained in:
Laurent Cozic 2017-11-18 16:13:27 +00:00
parent 716b1315a9
commit 9519bb1218
13 changed files with 242 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/DemoDesktop.PNG Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 92 KiB

BIN
Assets/DemoDesktop.psd Normal file
View File

Binary file not shown.

14
CliClient/app/build-website.js
View File

@ -128,16 +128,13 @@ const headerHtml = `<!doctype html>
.nav a {
color: white;
display: inline-block;
padding: .7em 1.4em .7em 1.4em;
}
.nav.sticky a {
padding: .4em 1.4em .4em 1.4em;
padding: .6em 1.1em .6em 1.1em;
}
.nav ul {
padding-left: 2em;
margin-bottom: 0;
display: table-cell;
min-width: 400px;
min-width: 420px;
}
.nav ul li {
display: inline-block;
@ -178,6 +175,7 @@ const headerHtml = `<!doctype html>
<ul>
<li class="{{selectedHome}}"><a href="{{baseUrl}}/">Home</a></li>
<li class="{{selectedTerminal}}"><a href="{{baseUrl}}/terminal">Terminal App Manual</a></li>
<li class="{{selectedDesktop}}"><a href="{{baseUrl}}/desktop">Desktop App</a></li>
</ul>
<div class="nav-right">
<iframe src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
@ -297,14 +295,16 @@ function renderFileToHtml(sourcePath, targetPath, params) {
async function main() {
renderFileToHtml(rootDir + '/README.md', rootDir + '/docs/index.html', {
baseUrl: '',
selectedHome: 'selected',
});
renderFileToHtml(rootDir + '/README_terminal.md', rootDir + '/docs/terminal/index.html', {
baseUrl: '..',
selectedTerminal: 'selected',
});
renderFileToHtml(rootDir + '/README_desktop.md', rootDir + '/docs/desktop/index.html', {
selectedDesktop: 'selected',
});
}
main().catch((error) => {

6
CliClient/locales/en_GB.po
View File

@ -562,12 +562,6 @@ msgstr ""
msgid "Rename notebook:"
msgstr ""
msgid "Seach:"
msgstr ""
msgid "Seach"
msgstr ""
msgid "Layout"
msgstr ""

12
CliClient/locales/fr_FR.po
View File

@ -614,12 +614,6 @@ msgstr "Séparez chaque étiquette par une virgule."
msgid "Rename notebook:"
msgstr "Renommer le carnet :"
msgid "Seach:"
msgstr "Chercher :"
msgid "Seach"
msgstr "Chercher"
msgid "Layout"
msgstr "Disposition"
@ -951,6 +945,12 @@ msgstr ""
msgid "Welcome"
msgstr "Bienvenue"
#~ msgid "Seach:"
#~ msgstr "Chercher :"
#~ msgid "Seach"
#~ msgstr "Chercher"
#~ msgid ""
#~ "Command line argument \"%s\" contains both quotes and double-quotes - "
#~ "aborting."

6
CliClient/locales/joplin.pot
View File

@ -562,12 +562,6 @@ msgstr ""
msgid "Rename notebook:"
msgstr ""
msgid "Seach:"
msgstr ""
msgid "Seach"
msgstr ""
msgid "Layout"
msgstr ""

2
ElectronClient/app/locales/en_GB.json
View File

File diff suppressed because one or more lines are too long

2
ElectronClient/app/locales/fr_FR.json
View File

File diff suppressed because one or more lines are too long

1
README_desktop.md Normal file
View File

@ -0,0 +1 @@
<img src="https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/DemoDesktop.png" style="max-width: 100%">

222
docs/desktop/index.html Normal file
View File

@ -0,0 +1,222 @@
<!doctype html>
<html>
<head>
<title>Joplin - an open source note taking and to-do application with synchronisation capabilities</title>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
<script src="https://code.jquery.com/jquery-3.2.1.slim.min.js" integrity="sha256-k2WSCIexGzOj3Euiig+TlR8gA0EmPjuc79OEeY5L45g=" crossorigin="anonymous"></script>
<style>
body {
background-color: #F1F1F1;
color: #333333;
}
table {
margin-bottom: 1em;
}
td, th {
padding: .8em;
border: 1px solid #ccc;
}
h1, h2 {
border-bottom: 1px solid #eaecef;
padding-bottom: 0.3em;
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol";
font-weight: 600;
font-size: 2em;
margin-bottom: 16px;
}
h2 {
font-size: 1.6em;
}
h3 {
font-size: 1.3em;
}
code {
color: black;
background-color: #eee;
border: 1px solid #ccc;
}
pre code {
border: none;
}
.title-icon {
height: 2em;
}
.sub-title {
font-weight: bold;
font-size: 1.5em;
}
.container {
background-color: white;
padding: 0;
box-shadow: 0 10px 20px #888888;
}
table.screenshots {
margin-top: 2em;
margin-bottom: 2em;
}
table.screenshots th {
height: 3em;
text-align: center;
}
table.screenshots th,
table.screenshots td {
border: 1px solid #C2C2C2;
}
.mobile-screenshot {
height: 40em;
padding: 1em;
}
.cli-screenshot-wrapper {
background-color: black;
vertical-align: top;
padding: 1em 2em 1em 1em;
}
.cli-screenshot {
font-family: "Monaco", "Inconsolata", "CONSOLAS", "Deja Vu Sans Mono", "Droid Sans Mono", "Andale Mono", monospace;
background-color: black;
color: white;
border: none;
}
.cli-screenshot .prompt {
color: #48C2F0;
}
.header {
position: relative;
padding-left: 2em;
padding-right: 2em;
padding-top: 1em;
padding-bottom: 1em;
color: white;
background-color: #2B2B3D;
}
.content {
padding-left: 2em;
padding-right: 2em;
padding-bottom: 2em;
padding-top: 2em;
}
.forkme {
position: absolute;
right: 0;
top:0;
}
.nav-wrapper {
position: relative;
width: inherit;
}
.nav {
background-color: black;
display: table;
width: inherit;
}
.nav.sticky {
position:fixed;
top: 0;
width: inherit;
box-shadow: 0 0 10px #000000;
}
.nav a {
color: white;
display: inline-block;
padding: .6em 1.1em .6em 1.1em;
}
.nav ul {
padding-left: 2em;
margin-bottom: 0;
display: table-cell;
min-width: 400px;
}
.nav ul li {
display: inline-block;
padding: 0;
}
.nav li.selected {
background-color: #222;
font-weight: bold;
}
.nav-right {
display: table-cell;
width: 100%;
text-align: right;
vertical-align: middle;
padding-top: 3px;
}
.twitter-share-button {
}
.github-share-button {
display: inline-block;
}
</style>
</head>
<body>
<div class="container">
<div class="header">
<a class="forkme" href="https://github.com/laurent22/joplin"><img src="http://joplin.cozic.net/images/ForkMe.png"/></a>
<h1 id="joplin"><img class="title-icon" src="http://joplin.cozic.net/images/Icon512.png">oplin</h1>
<p class="sub-title">An open source note taking and to-do application with synchronisation capabilities.</p>
</div>
<div class="nav-wrapper">
<div class="nav">
<ul>
<li class=""><a href="http:&#x2F;&#x2F;joplin.cozic.net/">Home</a></li>
<li class=""><a href="http:&#x2F;&#x2F;joplin.cozic.net/terminal">Terminal App Manual</a></li>
<li class="selected"><a href="http:&#x2F;&#x2F;joplin.cozic.net/desktop">Desktop App</a></li>
</ul>
<div class="nav-right">
<iframe src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>
<a class="twitter-share-button" href="https://twitter.com/intent/tweet?url=http%3A%2F%2Fjoplin.cozic.net">Tweet</a>
<iframe class="github-share-button" src="https://ghbtns.com/github-btn.html?user=laurent22&repo=joplin&type=star&count=true" frameborder="0" scrolling="0" width="110px" height="20px"></iframe>
</div>
</div>
</div>
<div class="content">
<p><img src="https://raw.githubusercontent.com/laurent22/joplin/master/docs/images/DemoDesktop.png" style="max-width: 100%"></p>
<script>window.twttr = (function(d, s, id) {
var js, fjs = d.getElementsByTagName(s)[0],
t = window.twttr || {};
if (d.getElementById(id)) return t;
js = d.createElement(s);
js.id = id;
js.src = "https://platform.twitter.com/widgets.js";
fjs.parentNode.insertBefore(js, fjs);
t._e = [];
t.ready = function(f) {
t._e.push(f);
};
return t;
}(document, "script", "twitter-wjs"));</script>
<script>
function stickyHeader() {
if ($(window).scrollTop() > 179) {
$('.nav').addClass('sticky');
} else {
$('.nav').removeClass('sticky');
}
}
$(window).scroll(function() {
stickyHeader();
});
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-103586105-1', 'auto');
ga('send', 'pageview');
</script>
</body>
</html>

BIN
docs/images/DemoDesktop.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 72 KiB

6
docs/index.html
View File

@ -122,10 +122,7 @@
.nav a {
color: white;
display: inline-block;
padding: .7em 1.4em .7em 1.4em;
}
.nav.sticky a {
padding: .4em 1.4em .4em 1.4em;
padding: .6em 1.1em .6em 1.1em;
}
.nav ul {
padding-left: 2em;
@ -172,6 +169,7 @@
<ul>
<li class="selected"><a href="http:&#x2F;&#x2F;joplin.cozic.net/">Home</a></li>
<li class=""><a href="http:&#x2F;&#x2F;joplin.cozic.net/terminal">Terminal App Manual</a></li>
<li class=""><a href="http:&#x2F;&#x2F;joplin.cozic.net/desktop">Desktop App</a></li>
</ul>
<div class="nav-right">
<iframe src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>

6
docs/terminal/index.html
View File

@ -122,10 +122,7 @@
.nav a {
color: white;
display: inline-block;
padding: .7em 1.4em .7em 1.4em;
}
.nav.sticky a {
padding: .4em 1.4em .4em 1.4em;
padding: .6em 1.1em .6em 1.1em;
}
.nav ul {
padding-left: 2em;
@ -172,6 +169,7 @@
<ul>
<li class=""><a href="http:&#x2F;&#x2F;joplin.cozic.net/">Home</a></li>
<li class="selected"><a href="http:&#x2F;&#x2F;joplin.cozic.net/terminal">Terminal App Manual</a></li>
<li class=""><a href="http:&#x2F;&#x2F;joplin.cozic.net/desktop">Desktop App</a></li>
</ul>
<div class="nav-right">
<iframe src="https://www.facebook.com/plugins/share_button.php?href=http%3A%2F%2Fjoplin.cozic.net&layout=button&size=small&mobile_iframe=true&width=60&height=20&appId" width="60" height="20" style="border:none;overflow:hidden" scrolling="no" frameborder="0" allowTransparency="true"></iframe>