Merge branch 'hpbs' into newtoolbar

cryptpad · Jan 30, 2017 · 29578a7 · 29578a7
2 parents 2d79649 + e63ef76
commit 29578a7
Show file tree

Hide file tree

Showing 45 changed files with 1,467 additions and 260 deletions.
diff --git a/bower.json b/bower.json
@@ -42,6 +42,6 @@
     "alertifyjs": "^1.0.11",
     "spin.js": "^2.3.2",
     "scrypt-async": "^1.2.0",
-    "bootstrap": "^3.3.7"
+    "bootstrap": "#v4.0.0-alpha.6"
   }
 }
diff --git a/config.js.dist b/config.js.dist
@@ -81,6 +81,7 @@ module.exports = {
         'privacy',
         'terms',
         'about',
+        'contact',
     ],
 
     /*

diff --git a/customize.dist/about.html b/customize.dist/about.html
@@ -3,9 +3,12 @@
 <head>
     <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
     <link rel="stylesheet" type="text/css" href="/customize/main.css" />
     <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
     <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
     <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
     <script src="/bower_components/requirejs/require.js"></script>
     <script>
@@ -14,18 +17,30 @@
         });
     </script>
 </head>
-<body>
-        <a data-localization-title="github_ribbon" href="https://github.com/xwiki-labs/cryptpad" class="github-corner" aria-label="View source on Github"><svg width="80" height="80" viewBox="0 0 250 250" style="position: absolute; top: 0; border: 0; left: 0; transform: scale(-1, 1);" aria-hidden="true"><path d="M0,0 L115,115 L130,115 L142,142 L250,250 L250,0 Z"></path><path d="M128.3,109.0 C113.8,99.7 119.0,89.6 119.0,89.6 C122.0,82.7 120.5,78.6 120.5,78.6 C119.2,72.0 123.4,76.3 123.4,76.3 C127.3,80.9 125.5,87.3 125.5,87.3 C122.9,97.6 130.6,101.9 134.4,103.2" fill="currentColor" style="transform-origin: 130px 106px;" class="octo-arm"></path><path d="M115.0,115.0 C114.9,115.1 118.7,116.5 119.8,115.4 L133.7,101.6 C136.9,99.2 139.9,98.4 142.2,98.6 C133.8,88.0 127.5,74.4 143.8,58.0 C148.5,53.4 154.0,51.2 159.7,51.0 C160.3,49.4 163.2,43.6 171.4,40.1 C171.4,40.1 176.1,42.5 178.8,56.2 C183.1,58.6 187.2,61.8 190.9,65.4 C194.5,69.0 197.7,73.2 200.1,77.6 C213.8,80.2 216.3,84.9 216.3,84.9 C212.7,93.1 206.9,96.0 205.4,96.6 C205.1,102.4 203.0,107.8 198.3,112.5 C181.9,128.9 168.3,122.5 157.7,114.1 C157.9,116.9 156.7,120.9 152.7,124.9 L141.0,136.5 C139.8,137.7 141.6,141.9 141.8,141.8 Z" fill="currentColor" class="octo-body"></path></svg></a><style>.github-corner:hover .octo-arm{animation:octocat-wave 560ms ease-in-out}@keyframes octocat-wave{0%,100%{transform:rotate(0)}20%,60%{transform:rotate(-25deg)}40%,80%{transform:rotate(10deg)}}@media (max-width:500px){.github-corner:hover .octo-arm{animation:none}.github-corner .octo-arm{animation:octocat-wave 560ms ease-in-out}}</style>
-<!-- Thanks! http://tholman.com/github-corners/ -->
+<body class="html">
+    <div id="cryptpadTopBar">
+    <span>
+        <a class="gotoMain" href="/">
+            <img src="customize/cryptofist_mini.png" class="cryptpad-logo" alt="" /> CryptPad
+        </a>
+    </span>
 
+    <!--<span class="slogan" data-localization="main_slogan"></span>-->
 
-
-    <span id="language-selector" class="dropdown-bar"></span>
-
-    <div id="main">
-      <center>
-          <a href="/"><img class="imgcenter cryptofist" src="/customize/cryptofist_small.png" /></a>
-      </center>
+    <span id="language-selector" class="right dropdown-bar"></span>
+    <span class="right">
+        <a href="/about.html" data-localization="about">About</a>
+    </span>
+    <span class="right">
+        <a href="/privacy.html" data-localization="privacy">Privacy</a>
+    </span>
+    <span class="right">
+        <a href="/terms.html" data-localization="terms">ToS</a>
+    </span>
+    <span class="right">
+        <a href="/contact.html" data-localization="contact">Contact</a>
+    </span>
+</div>
 
 
     <center>
@@ -42,18 +57,18 @@
 
 
 
+<div id="main_other">
       <center>
-          <h1>About</h1>
+          <h1 data-localization="about">About</h1>
       </center>
 
       <p data-localization="main_p2"><!-- CkEditor, CodeMirror, Chainpad --></p>
 
       <h2 id="howitworks" data-localization="main_howitworks"></h2>
       <p data-localization="main_howitworks_p1"><!-- Operational transform, Nakamoto blockchain, server kept unaware of the content--></p>
+</div>
 
 
-
-    </div>
 </body>
 </html>
 
diff --git a/customize.dist/bg.jpg b/customize.dist/bg.jpg
diff --git a/customize.dist/bg2.jpg b/customize.dist/bg2.jpg
diff --git a/customize.dist/bg3.jpg b/customize.dist/bg3.jpg
diff --git a/customize.dist/contact.html b/customize.dist/contact.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html class="cp">
+<head>
+    <title data-localization="main_title">Cryptpad: Zero Knowledge, Collaborative Real Time Editing</title>
+    <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
+    <link rel="stylesheet" type="text/css" href="/customize/main.css" />
+    <link rel="stylesheet" href="/bower_components/components-font-awesome/css/font-awesome.min.css">
+    <link rel="icon" type="image/png" href="/customize/main-favicon.png" id="favicon"/>
+    <script src="/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+    <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
+    <script data-main="/customize/main" src="/bower_components/requirejs/require.js"></script>
+    <script src="/bower_components/requirejs/require.js"></script>
+    <script>
+        require.config({
+            waitSeconds: 60,
+        });
+    </script>
+</head>
+<body class="html">
+    <div id="cryptpadTopBar">
+    <span>
+        <a class="gotoMain" href="/">
+            <img src="customize/cryptofist_mini.png" class="cryptpad-logo" alt="" /> CryptPad
+        </a>
+    </span>
+
+    <!--<span class="slogan" data-localization="main_slogan"></span>-->
+
+    <span id="language-selector" class="right dropdown-bar"></span>
+    <span class="right">
+        <a href="/about.html" data-localization="about">About</a>
+    </span>
+    <span class="right">
+        <a href="/privacy.html" data-localization="privacy">Privacy</a>
+    </span>
+    <span class="right">
+        <a href="/terms.html" data-localization="terms">ToS</a>
+    </span>
+    <span class="right">
+        <a href="/contact.html" data-localization="contact">Contact</a>
+    </span>
+</div>
+
+
+    <center>
+        <noscript>
+          <p>
+            <strong>OOPS</strong> In order to do encryption in your browser, Javascript is really <strong>really</strong> required.
+          </p>
+          <hr>
+          <p>
+            <strong>OUPS</strong> Afin de pouvoir réaliser le chiffrement dans votre navigateur, Javascript est <strong>vraiment</strong> nécessaire.
+          </p>
+        </noscript>
+    </center>
+
+
+
+<div id="main_other">
+    <center>
+        <h1 data-localization="contact">Contact</h1>
+    </center>
+
+    <p data-localization="main_about_p2"><!-- Contact us--></p>
+</div>
+
+
+</body>
+</html>
+
diff --git a/customize.dist/images/code.png b/customize.dist/images/code.png
diff --git a/customize.dist/images/hash.png b/customize.dist/images/hash.png
diff --git a/customize.dist/images/pad.png b/customize.dist/images/pad.png
diff --git a/customize.dist/images/poll.png b/customize.dist/images/poll.png
diff --git a/customize.dist/images/realtime.png b/customize.dist/images/realtime.png
diff --git a/customize.dist/images/slide.png b/customize.dist/images/slide.png
diff --git a/customize.dist/images/useraccount.png b/customize.dist/images/useraccount.png
diff --git a/customize.dist/images/zk.png b/customize.dist/images/zk.png