diff --git a/customize.dist/images/apps-preview.png b/customize.dist/images/apps-preview.png
deleted file mode 100644
index 1ef33fede..000000000
Binary files a/customize.dist/images/apps-preview.png and /dev/null differ
diff --git a/customize.dist/images/collaboration.png b/customize.dist/images/collaboration.png
deleted file mode 100644
index decbb9b58..000000000
Binary files a/customize.dist/images/collaboration.png and /dev/null differ
diff --git a/customize.dist/images/drive-grid.png b/customize.dist/images/drive-grid.png
deleted file mode 100644
index b9b55157e..000000000
Binary files a/customize.dist/images/drive-grid.png and /dev/null differ
diff --git a/customize.dist/images/logo_XWiki.svg b/customize.dist/images/logo_XWiki.svg
deleted file mode 100644
index 270d03e63..000000000
--- a/customize.dist/images/logo_XWiki.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-
-
diff --git a/customize.dist/images/logo_bpifrance.svg b/customize.dist/images/logo_bpifrance.svg
deleted file mode 100644
index 4ea9e36a8..000000000
--- a/customize.dist/images/logo_bpifrance.svg
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
\ No newline at end of file
diff --git a/customize.dist/images/logo_moss.jpg b/customize.dist/images/logo_moss.jpg
deleted file mode 100644
index 06c3a06dd..000000000
Binary files a/customize.dist/images/logo_moss.jpg and /dev/null differ
diff --git a/customize.dist/images/logo_ngi.png b/customize.dist/images/logo_ngi.png
deleted file mode 100644
index 15c6f24fa..000000000
Binary files a/customize.dist/images/logo_ngi.png and /dev/null differ
diff --git a/customize.dist/images/logo_ngi_dapsi.png b/customize.dist/images/logo_ngi_dapsi.png
deleted file mode 100644
index efd52c482..000000000
Binary files a/customize.dist/images/logo_ngi_dapsi.png and /dev/null differ
diff --git a/customize.dist/images/logo_ngi_trust.png b/customize.dist/images/logo_ngi_trust.png
deleted file mode 100644
index 79db383d0..000000000
Binary files a/customize.dist/images/logo_ngi_trust.png and /dev/null differ
diff --git a/customize.dist/images/logo_nlnet.svg b/customize.dist/images/logo_nlnet.svg
deleted file mode 100644
index 1d1be5ecf..000000000
--- a/customize.dist/images/logo_nlnet.svg
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
diff --git a/customize.dist/maintenance.html b/customize.dist/maintenance.html
deleted file mode 100644
index 0f224d69b..000000000
--- a/customize.dist/maintenance.html
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
- CryptPad: Collaboration suite, encrypted and open-source
-
-
-
-
-
-
-
-Maintenance
-We are currently upgrading CryptPad. We will be back shortly!
-
diff --git a/customize.dist/pages.js b/customize.dist/pages.js
index 13c803075..d4a36ad43 100644
--- a/customize.dist/pages.js
+++ b/customize.dist/pages.js
@@ -112,10 +112,13 @@ define([
var customURLs = Pages.customURLs = {};
(function () {
+ // XXX DB: review this:
+ // almost all pages are commented out
+ // would the imprint page get generated if it was present?
var defaultURLs = {
//imprint: '/imprint.html',
//privacy: '/privacy.html',
- terms: '/terms.html',
+ // terms: '/terms.html',
//roadmap: '/roadmap.html',
source: 'https://github.com/xwiki-labs/cryptpad',
};
diff --git a/customize.dist/src/less2/include/drive.less b/customize.dist/src/less2/include/drive.less
index fa4d4846b..705bcce47 100644
--- a/customize.dist/src/less2/include/drive.less
+++ b/customize.dist/src/less2/include/drive.less
@@ -121,6 +121,9 @@
.cp-app-drive-tree-category {
margin-top: 0.5em;
}
+ .cp-splitter {
+ display: none;
+ }
}
}
}
@@ -265,7 +268,6 @@
box-sizing: border-box;
background: @cp_sidebar-left-bg;
overflow: auto;
- resize: horizontal;
width: auto;
white-space: nowrap;
max-width: 500px;
@@ -467,8 +469,27 @@
#cp-app-drive-content-container {
display: flex;
flex-flow: column;
- flex: 1 1 100%;
+ flex: 1;
min-width: 0;
+ position: relative;
+ .cp-splitter {
+ position: absolute;
+ height: 100%;
+ width: 8px;
+ top: 0;
+ left: 0;
+ cursor: col-resize;
+ display: flex;
+ align-items: center;
+ justify-content: flex-end;
+ &:hover {
+ border-left: 1px solid @cryptpad_text_col;
+ }
+ i {
+ color: @cryptpad_text_col;
+ font-size: 1.6rem;
+ }
+ }
}
#cp-app-drive-content {
box-sizing: border-box;
diff --git a/lib/defaults.js b/lib/defaults.js
index 524ef0720..5078c9a84 100644
--- a/lib/defaults.js
+++ b/lib/defaults.js
@@ -54,13 +54,12 @@ Default.httpHeaders = function (Env) {
"Permissions-policy":"interest-cohort=()"
};
};
+
+// XXX check links to terms.html
Default.mainPages = function () {
return [
'index',
- 'privacy',
- 'terms',
'contact',
- 'what-is-cryptpad',
'features',
'maintenance'
];
diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 053f2809d..607c1d1b1 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -626,6 +626,7 @@ define([
// UI containers
var $tree = APP.$tree = $("#cp-app-drive-tree");
var $content = APP.$content = $("#cp-app-drive-content");
+ var $contentContainer = APP.$content = $("#cp-app-drive-content-container");
var $appContainer = $(".cp-app-drive-container");
var $driveToolbar = APP.toolbar.$bottom;
var $contextMenu = createContextMenu(common).appendTo($appContainer);
@@ -635,6 +636,26 @@ define([
var $trashTreeContextMenu = $("#cp-app-drive-context-trashtree");
var $trashContextMenu = $("#cp-app-drive-context-trash");
+
+ var splitter = h('div.cp-splitter', [
+ h('i.fa.fa-ellipsis-v')
+ ]);
+ $contentContainer.append(splitter);
+ APP.$splitter = $(splitter).on('mousedown', function (e) {
+ e.preventDefault();
+ var x = e.pageX;
+ var w = $tree.width();
+ var handler = function (evt) {
+ if (evt.type === 'mouseup') {
+ $(window).off('mouseup mousemove', handler);
+ return;
+ }
+ $tree.css('width', (w - x + evt.pageX) + 'px');
+ };
+ $(window).off('mouseup mousemove', handler);
+ $(window).on('mouseup mousemove', handler);
+ });
+
// TOOLBAR
// DRIVE
@@ -3391,6 +3412,7 @@ define([
APP.toolbar.$bottomL.append(APP.$collapseButton);
APP.$collapseButton.off('click').on('click', function () {
APP.$tree.toggle();
+ APP.$splitter.toggle(APP.$tree.is(':visible'));
checkCollapseButton();
});
};