From 628148d0018be9017185d99638771c1635551b8c Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 7 Feb 2017 13:09:14 +0100
Subject: [PATCH 1/3] Display the contextmenu button only if contextmenu exists

---
 www/drive/main.js | 56 +++++++++++++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 14 deletions(-)

diff --git a/www/drive/main.js b/www/drive/main.js
index 43f469aff..5e5cb7451 100644
--- a/www/drive/main.js
+++ b/www/drive/main.js
@@ -334,6 +334,29 @@ define([
             });
         };
 
+        var updateContextButton = function () {
+            var $li = $content.find('.selected');
+            if ($li.length !== 1) {
+                $li = $tree.find('.element.active').closest('li');
+            }
+            var $button = $driveToolbar.find('#contextButton');
+            if ($li.length !== 1
+                || !$._data($li[0], 'events').contextmenu
+                || $._data($li[0], 'events').contextmenu.length === 0) {
+                $button.hide();
+                return;
+            }
+            $button.show();
+            $button.css({
+                background: '#000'
+            });
+            window.setTimeout(function () {
+                $button.css({
+                    background: ''
+                });
+            }, 500);
+        };
+
         // Add the "selected" class to the "li" corresponding to the clicked element
         var onElementClick = function (e, $element, path) {
             // If "Ctrl" is pressed, do not remove the current selection
@@ -354,14 +377,7 @@ define([
             } else {
                 $element.removeClass("selected");
             }
-            $driveToolbar.find('#contextButton').css({
-                background: '#000'
-            });
-            window.setTimeout(function () {
-                $driveToolbar.find('#contextButton').css({
-                    background: ''
-                });
-            }, 500);
+            updateContextButton();
         };
 
         // Open the selected context menu on the closest "li" element
@@ -408,7 +424,7 @@ define([
         var openDirectoryContextMenu = function (e) {
             var $element = $(e.target).closest('li');
             $contextMenu.find('li').show();
-            if ($element.find('.file-element').length) {
+            if ($element.is('.file-element')) {
                 $contextMenu.find('a.newfolder').parent('li').hide();
             } else {
                 $contextMenu.find('a.open_ro').parent('li').hide();
@@ -420,7 +436,7 @@ define([
         var openDefaultContextMenu = function (e) {
             var $element = $(e.target).closest('li');
             $defaultContextMenu.find('li').show();
-            if ($element.find('.file-element').length) {
+            if ($element.is('.file-element')) {
                 $defaultContextMenu.find('a.newfolder').parent('li').hide();
             } else {
                 $defaultContextMenu.find('a.open_ro').parent('li').hide();
@@ -1215,6 +1231,8 @@ define([
                 var $icon = getFileIcon(file.href);
                 var $element = $('<li>', { 'class': 'file-element element' });
                 addFileData(file.href, file.title, $element, false);
+                $element.data('path', [FILES_DATA, allfiles.indexOf(file)]);
+                $element.data('element', file.href);
                 $element.prepend($icon).dblclick(function () {
                     openFile(file.href);
                 });
@@ -1324,6 +1342,7 @@ define([
             if (APP.mobile) {
                 var $context = $('<button>', {'class': 'element right dropdown-bar', id: 'contextButton'});
                 $context.append($('<span>', {'class': 'fa fa-caret-down'}));
+                $context.appendTo($toolbar.find('.rightside'));
                 $context.click(function (e) {
                     e.preventDefault();
                     e.stopPropagation();
@@ -1331,14 +1350,20 @@ define([
                     if ($li.length !== 1) {
                         $li = $tree.find('.element.active').closest('li');
                     }
+                    // Close if already opened
+                    if ($iframe.find('.contextMenu:visible').length) {
+                        module.hideMenu();
+                        return;
+                    }
+                    // Open the menu
                     $iframe.find('.contextMenu').css({
-                        top: ($li.offset().top + 10) + 'px',
-                        left: ($li.offset().left + 50) + 'px'
+                        top: ($context.offset().top + 32) + 'px',
+                        right: '0px'
                     });
                     $li.contextmenu();
                 });
-                $context.appendTo($toolbar.find('.rightside'));
             }
+            updateContextButton();
 
             // NewButton can be undefined if we're in read only mode
             $toolbar.find('.leftside').append(createNewButton(isInRoot));
@@ -1623,7 +1648,10 @@ define([
             }
             else if ($(this).hasClass('open_ro')) {
                 var el = filesOp.findElement(files, path);
-                if (filesOp.isFolder(el)) { return; }
+                if (filesOp.isPathInFilesData(path)) {
+                    el = el.href;
+                }
+                if (!el || filesOp.isFolder(el)) { return; }
                 var roUrl = getReadOnlyUrl(el);
                 openFile(roUrl);
             }

From 367a02c031db853b222163acec94bbd362c9216a Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 7 Feb 2017 16:49:25 +0100
Subject: [PATCH 2/3] Add mobile support for the code app

---
 www/code/index.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/www/code/index.html b/www/code/index.html
index b4b1e025f..5975e79d9 100644
--- a/www/code/index.html
+++ b/www/code/index.html
@@ -3,6 +3,7 @@
 <head>
     <title>CryptPad</title>
     <meta content="text/html; charset=utf-8" http-equiv="content-type"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <script data-main="main" src="/bower_components/requirejs/require.js"></script>
     <script>
         require.config({

From 4aaaa2f647cd12a4711bf38a86dd8d27b3bdd390 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Tue, 7 Feb 2017 18:06:36 +0100
Subject: [PATCH 3/3] Update the footer

---
 customize.dist/about.html                | 11 ++++++-----
 customize.dist/contact.html              | 11 ++++++-----
 customize.dist/index.html                | 11 ++++++-----
 customize.dist/main.css                  | 15 ++++++++++++++-
 customize.dist/privacy.html              | 11 ++++++-----
 customize.dist/src/fragments/footer.html | 12 ++++++------
 customize.dist/src/less/footer.less      | 17 +++++++++++++++--
 customize.dist/terms.html                | 11 ++++++-----
 8 files changed, 65 insertions(+), 34 deletions(-)

diff --git a/customize.dist/about.html b/customize.dist/about.html
index e0a6525ad..65cbe1abe 100644
--- a/customize.dist/about.html
+++ b/customize.dist/about.html
@@ -77,7 +77,7 @@
     </div>
 
         <footer>
-        <div class="container">    
+        <div class="container">
             <div class="row">
                     <div class="col">
                         <ul class="list-unstyled">
@@ -93,8 +93,8 @@
                             <li><a href="/pad/" data-localization="main_richText"></a></li>
                             <li><a href="#" data-localization="main_code"></a></li>
                             <li><a href="#" data-localization="main_slide"></a></li>
-                            <li><a href="#" data-localization="main_poll"></a></li>							
-                            <li><a href="#" data-localization="main_drive"></a></li>							
+                            <li><a href="#" data-localization="main_poll"></a></li>
+                            <li><a href="#" data-localization="main_drive"></a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -102,7 +102,7 @@
                             <li data-localization="footer_aboutUs"><li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
-                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaSS</a></li>					
+                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -113,10 +113,11 @@
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact">Email</a></li>
                         </ul>
-                    </div>					
+                    </div>
             </div>
         </div>
     </footer>
+
 </body>
 </html>
 
diff --git a/customize.dist/contact.html b/customize.dist/contact.html
index 56ce036d9..e1060bacb 100644
--- a/customize.dist/contact.html
+++ b/customize.dist/contact.html
@@ -74,7 +74,7 @@
     </div>
 
         <footer>
-        <div class="container">    
+        <div class="container">
             <div class="row">
                     <div class="col">
                         <ul class="list-unstyled">
@@ -90,8 +90,8 @@
                             <li><a href="/pad/" data-localization="main_richText"></a></li>
                             <li><a href="#" data-localization="main_code"></a></li>
                             <li><a href="#" data-localization="main_slide"></a></li>
-                            <li><a href="#" data-localization="main_poll"></a></li>							
-                            <li><a href="#" data-localization="main_drive"></a></li>							
+                            <li><a href="#" data-localization="main_poll"></a></li>
+                            <li><a href="#" data-localization="main_drive"></a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -99,7 +99,7 @@
                             <li data-localization="footer_aboutUs"><li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
-                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaSS</a></li>					
+                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -110,10 +110,11 @@
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact">Email</a></li>
                         </ul>
-                    </div>					
+                    </div>
             </div>
         </div>
     </footer>
+
 </body>
 </html>
 
diff --git a/customize.dist/index.html b/customize.dist/index.html
index 562c7722d..ceb2872a1 100644
--- a/customize.dist/index.html
+++ b/customize.dist/index.html
@@ -200,7 +200,7 @@
     </div>
 
         <footer>
-        <div class="container">    
+        <div class="container">
             <div class="row">
                     <div class="col">
                         <ul class="list-unstyled">
@@ -216,8 +216,8 @@
                             <li><a href="/pad/" data-localization="main_richText"></a></li>
                             <li><a href="#" data-localization="main_code"></a></li>
                             <li><a href="#" data-localization="main_slide"></a></li>
-                            <li><a href="#" data-localization="main_poll"></a></li>							
-                            <li><a href="#" data-localization="main_drive"></a></li>							
+                            <li><a href="#" data-localization="main_poll"></a></li>
+                            <li><a href="#" data-localization="main_drive"></a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -225,7 +225,7 @@
                             <li data-localization="footer_aboutUs"><li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
-                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaSS</a></li>					
+                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -236,10 +236,11 @@
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact">Email</a></li>
                         </ul>
-                    </div>					
+                    </div>
             </div>
         </div>
     </footer>
+
 </body>
 </html>
 
diff --git a/customize.dist/main.css b/customize.dist/main.css
index d722e38cb..b00a31bab 100644
--- a/customize.dist/main.css
+++ b/customize.dist/main.css
@@ -455,11 +455,24 @@
 #cryptpadTopBar .right a:hover {
   text-decoration: underline;
 }
-footer {
+.cp footer {
   background: #cccccc;
   font-family: -apple-system, system-ui, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif;
   padding-top: 1em;
 }
+.cp footer a {
+  color: #555;
+}
+.cp footer a:visited {
+  color: #777;
+}
+.cp footer a:hover {
+  color: #333;
+}
+.cp footer li:first-child {
+  font-weight: bold;
+  text-decoration: underline;
+}
 html.cp,
 .cp body {
   font-size: .875em;
diff --git a/customize.dist/privacy.html b/customize.dist/privacy.html
index d9d744688..ba8550ee7 100644
--- a/customize.dist/privacy.html
+++ b/customize.dist/privacy.html
@@ -96,7 +96,7 @@
     </div>
 
         <footer>
-        <div class="container">    
+        <div class="container">
             <div class="row">
                     <div class="col">
                         <ul class="list-unstyled">
@@ -112,8 +112,8 @@
                             <li><a href="/pad/" data-localization="main_richText"></a></li>
                             <li><a href="#" data-localization="main_code"></a></li>
                             <li><a href="#" data-localization="main_slide"></a></li>
-                            <li><a href="#" data-localization="main_poll"></a></li>							
-                            <li><a href="#" data-localization="main_drive"></a></li>							
+                            <li><a href="#" data-localization="main_poll"></a></li>
+                            <li><a href="#" data-localization="main_drive"></a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -121,7 +121,7 @@
                             <li data-localization="footer_aboutUs"><li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
-                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaSS</a></li>					
+                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -132,10 +132,11 @@
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact">Email</a></li>
                         </ul>
-                    </div>					
+                    </div>
             </div>
         </div>
     </footer>
+
 </body>
 </html>
 
diff --git a/customize.dist/src/fragments/footer.html b/customize.dist/src/fragments/footer.html
index 78441d5c4..97344bf52 100644
--- a/customize.dist/src/fragments/footer.html
+++ b/customize.dist/src/fragments/footer.html
@@ -1,5 +1,5 @@
     <footer>
-        <div class="container">    
+        <div class="container">
             <div class="row">
                     <div class="col">
                         <ul class="list-unstyled">
@@ -15,8 +15,8 @@
                             <li><a href="/pad/" data-localization="main_richText"></a></li>
                             <li><a href="#" data-localization="main_code"></a></li>
                             <li><a href="#" data-localization="main_slide"></a></li>
-                            <li><a href="#" data-localization="main_poll"></a></li>							
-                            <li><a href="#" data-localization="main_drive"></a></li>							
+                            <li><a href="#" data-localization="main_poll"></a></li>
+                            <li><a href="#" data-localization="main_drive"></a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -24,7 +24,7 @@
                             <li data-localization="footer_aboutUs"><li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
-                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaSS</a></li>					
+                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -35,7 +35,7 @@
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact">Email</a></li>
                         </ul>
-                    </div>					
+                    </div>
             </div>
         </div>
-    </footer>
\ No newline at end of file
+    </footer>
diff --git a/customize.dist/src/less/footer.less b/customize.dist/src/less/footer.less
index 6cc79487a..6b13ea4e0 100644
--- a/customize.dist/src/less/footer.less
+++ b/customize.dist/src/less/footer.less
@@ -1,7 +1,20 @@
 @import "./variables.less";
 
-footer {
+.cp footer {
     background: @dark-base;
     font-family: -apple-system,system-ui,BlinkMacSystemFont,"Segoe UI",Roboto,"Helvetica Neue",Arial,sans-serif;
     padding-top: 1em;
-}
\ No newline at end of file
+    a {
+        color: #555;
+        &:visited {
+            color: #777;
+        }
+        &:hover {
+            color: #333;
+        }
+    }
+    li:first-child {
+        font-weight: bold;
+        text-decoration: underline;
+    }
+}
diff --git a/customize.dist/terms.html b/customize.dist/terms.html
index 7a4157137..014148e9a 100644
--- a/customize.dist/terms.html
+++ b/customize.dist/terms.html
@@ -78,7 +78,7 @@
     </div>
 
         <footer>
-        <div class="container">    
+        <div class="container">
             <div class="row">
                     <div class="col">
                         <ul class="list-unstyled">
@@ -94,8 +94,8 @@
                             <li><a href="/pad/" data-localization="main_richText"></a></li>
                             <li><a href="#" data-localization="main_code"></a></li>
                             <li><a href="#" data-localization="main_slide"></a></li>
-                            <li><a href="#" data-localization="main_poll"></a></li>							
-                            <li><a href="#" data-localization="main_drive"></a></li>							
+                            <li><a href="#" data-localization="main_poll"></a></li>
+                            <li><a href="#" data-localization="main_drive"></a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -103,7 +103,7 @@
                             <li data-localization="footer_aboutUs"><li>
                             <li><a href="https://labs.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki Labs</a></li>
                             <li><a href="http://www.xwiki.com" target="_blank" rel="noopener noreferrer">XWiki SAS</a></li>
-                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaSS</a></li>					
+                            <li><a href="https://www.openpass.fr/" target="_blank" rel="noopener noreferrer">OpenPaaS</a></li>
                         </ul>
                     </div>
                     <div class="col">
@@ -114,10 +114,11 @@
                             <li><a href="https://github.com/xwiki-labs/cryptpad" target="_blank" rel="noopener noreferrer">GitHub</a></li>
                             <li><a href="/contact">Email</a></li>
                         </ul>
-                    </div>					
+                    </div>
             </div>
         </div>
     </footer>
+
 </body>
 </html>