From b39f3b553ecb29e934895c98ceb3217b2fcd5cda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 22 Nov 2019 11:16:48 +0000
Subject: [PATCH 1/5] re-remove text fields in properties modal

---
 .../src/less2/include/modals-ui-elements.less | 10 +++++++
 www/common/common-ui-elements.js              | 29 ++++---------------
 2 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index a3cc41004..e2bbd0667 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -15,4 +15,14 @@
         }
     }
 
+    // Properties modal
+    .cp-app-prop{
+        margin-bottom: 10px;
+    }
+
+    .cp-app-prop-content{
+        color: @cryptpad_text_col;
+    }
+    
+
 }
\ No newline at end of file
diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 1512cb761..e0f9446a6 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -684,28 +684,17 @@ define([
         }
 
         if (data.tags && Array.isArray(data.tags)) {
-            $('<label>', {'for': 'cp-app-prop-tags'}).text(Messages.fm_prop_tagsList).appendTo($d);
-            $d.append(UI.dialog.selectable(data.tags.join(', '), {
-                id: 'cp-app-prop-tags',
-            }));
+            $d.append(h('div.cp-app-prop', [Messages.fm_prop_tagsList, ': ', h('span.cp-app-prop-content', data.tags.join(', '))]));
         }
 
         if (data.ctime) {
-            $('<label>', {'for': 'cp-app-prop-ctime'}).text(Messages.fm_creation)
-                .appendTo($d);
-            $d.append(UI.dialog.selectable(new Date(data.ctime).toLocaleString(), {
-                id: 'cp-app-prop-ctime',
-            }));
+            $d.append(h('div.cp-app-prop', [Messages.fm_creation, ': ', h('span.cp-app-prop-content', new Date(data.ctime).toLocaleString())]));
         }
 
         if (data.atime) {
-            $('<label>', {'for': 'cp-app-prop-atime'}).text(Messages.fm_lastAccess)
-                .appendTo($d);
-            $d.append(UI.dialog.selectable(new Date(data.atime).toLocaleString(), {
-                id: 'cp-app-prop-atime',
-            }));
+            $d.append(h('div.cp-app-prop', [Messages.fm_lastAccess, ': ', h('span.cp-app-prop-content', new Date(data.atime).toLocaleString())]));
         }
-
+        
         if (common.isLoggedIn()) {
             // check the size of this file...
             var bytes = 0;
@@ -727,15 +716,7 @@ define([
                 var KB = Util.bytesToKilobytes(bytes);
 
                 var formatted = Messages._getKey('formattedKB', [KB]);
-                $('<br>').appendTo($d);
-
-                $('<label>', {
-                    'for': 'cp-app-prop-size'
-                }).text(Messages.fc_sizeInKilobytes).appendTo($d);
-
-                $d.append(UI.dialog.selectable(formatted, {
-                    id: 'cp-app-prop-size',
-                }));
+                $d.append(h('div.cp-app-prop', [Messages.fc_sizeInKilobytes, ': ', h('span.cp-app-prop-content', formatted)]));
 
         if (data.sharedFolder && false) {
             $('<label>', {'for': 'cp-app-prop-channel'}).text('Channel ID').appendTo($d);

From 09b07de6f23c31c67a4ddff8c83c39406555f770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 22 Nov 2019 16:10:24 +0000
Subject: [PATCH 2/5] lint

---
 customize.dist/src/less2/include/modals-ui-elements.less | 2 --
 1 file changed, 2 deletions(-)

diff --git a/customize.dist/src/less2/include/modals-ui-elements.less b/customize.dist/src/less2/include/modals-ui-elements.less
index 88403b201..57c9b0a53 100644
--- a/customize.dist/src/less2/include/modals-ui-elements.less
+++ b/customize.dist/src/less2/include/modals-ui-elements.less
@@ -23,6 +23,4 @@
     .cp-app-prop-content {
         color: @cryptpad_text_col;
     }
-    
-
 }

From 09a162c6be066de001b02d5cc7e98fbd08aee4ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Fri, 22 Nov 2019 16:48:09 +0000
Subject: [PATCH 3/5] XXX problem

---
 www/common/common-ui-elements.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 94be4e374..51e35eaed 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -683,6 +683,8 @@ define([
             }));
         }
 
+        // XXX problem with the hardcoded ": " here
+        // possibly duplicate translation keys 
         if (data.tags && Array.isArray(data.tags)) {
             $d.append(h('div.cp-app-prop', [Messages.fm_prop_tagsList, ': ', h('span.cp-app-prop-content', data.tags.join(', '))]));
         }

From 9a3c4c43501584db959a08932af90877a6168ae0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 25 Nov 2019 11:13:04 +0000
Subject: [PATCH 4/5] remove hard-coded punctuation

---
 www/common/common-ui-elements.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 51e35eaed..09c4ce802 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -686,15 +686,15 @@ define([
         // XXX problem with the hardcoded ": " here
         // possibly duplicate translation keys 
         if (data.tags && Array.isArray(data.tags)) {
-            $d.append(h('div.cp-app-prop', [Messages.fm_prop_tagsList, ': ', h('span.cp-app-prop-content', data.tags.join(', '))]));
+            $d.append(h('div.cp-app-prop', [Messages.fm_prop_tagsList, h('br'), h('span.cp-app-prop-content', data.tags.join(', '))]));
         }
 
         if (data.ctime) {
-            $d.append(h('div.cp-app-prop', [Messages.fm_creation, ': ', h('span.cp-app-prop-content', new Date(data.ctime).toLocaleString())]));
+            $d.append(h('div.cp-app-prop', [Messages.fm_creation,  h('br'), h('span.cp-app-prop-content', new Date(data.ctime).toLocaleString())]));
         }
 
         if (data.atime) {
-            $d.append(h('div.cp-app-prop', [Messages.fm_lastAccess, ': ', h('span.cp-app-prop-content', new Date(data.atime).toLocaleString())]));
+            $d.append(h('div.cp-app-prop', [Messages.fm_lastAccess,  h('br'), h('span.cp-app-prop-content', new Date(data.atime).toLocaleString())]));
         }
         
         if (common.isLoggedIn()) {
@@ -718,7 +718,7 @@ define([
                 var KB = Util.bytesToKilobytes(bytes);
 
                 var formatted = Messages._getKey('formattedKB', [KB]);
-                $d.append(h('div.cp-app-prop', [Messages.fc_sizeInKilobytes, ': ', h('span.cp-app-prop-content', formatted)]));
+                $d.append(h('div.cp-app-prop', [Messages.fc_sizeInKilobytes, h('br'), h('span.cp-app-prop-content', formatted)]));
 
         if (data.sharedFolder && false) {
             $('<label>', {'for': 'cp-app-prop-channel'}).text('Channel ID').appendTo($d);

From 06434e576e95b0b66c69dfb03f01dea7d81fecb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Benqu=C3=A9?= <mail@davidbenque.com>
Date: Mon, 25 Nov 2019 11:22:07 +0000
Subject: [PATCH 5/5] change size message

---
 www/common/common-ui-elements.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js
index 09c4ce802..64c9c2101 100644
--- a/www/common/common-ui-elements.js
+++ b/www/common/common-ui-elements.js
@@ -718,7 +718,7 @@ define([
                 var KB = Util.bytesToKilobytes(bytes);
 
                 var formatted = Messages._getKey('formattedKB', [KB]);
-                $d.append(h('div.cp-app-prop', [Messages.fc_sizeInKilobytes, h('br'), h('span.cp-app-prop-content', formatted)]));
+                $d.append(h('div.cp-app-prop', [Messages.upload_size, h('br'), h('span.cp-app-prop-content', formatted)]));
 
         if (data.sharedFolder && false) {
             $('<label>', {'for': 'cp-app-prop-channel'}).text('Channel ID').appendTo($d);