From c1358936389ccf0d7f672435615a38cc932f3845 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Fri, 16 Mar 2018 18:14:21 +0100
Subject: [PATCH] Improve UI for polls on mobiles

---
 www/poll/app-poll.less | 46 ++++++++++++++++++++++++++++++++++--------
 www/poll/inner.js      | 11 ++++------
 2 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/www/poll/app-poll.less b/www/poll/app-poll.less
index 0a5d5ca59..c86653a6c 100644
--- a/www/poll/app-poll.less
+++ b/www/poll/app-poll.less
@@ -111,11 +111,9 @@ table#cp-app-poll-table {
 }
 #cp-app-poll-table-container {
     position: relative;
-    padding: 30px 0;
-    width: ~"calc(100% - 30px)";
+    margin: 20px;
 }
 #cp-app-poll-table-container button {
-    //display: none;
     border-radius: 0;
     border: 0;
 }
@@ -148,8 +146,8 @@ table#cp-app-poll-table {
 #cp-app-poll-table-scroll {
     overflow-y: hidden;
     overflow-x: auto;
-    margin-left: ~"calc(25% + 30px)";
-    max-width: ~"calc(75% - 30px - 100px - 100px)";
+    margin-left: 25%;
+    max-width: ~"calc(75% - 100px - 100px)";
     width: auto;
     display: inline-block;
 }
@@ -227,7 +225,6 @@ table {
     margin: 20px;
 }
 tbody {
-    //border: 1px solid @poll-border-color;
     * {
         box-sizing: border-box;
     }
@@ -298,7 +295,7 @@ div.cp-app-poll-realtime {
             /* Options */
             td:first-child {
                 position:absolute;
-                left: 30px;
+                left: 0;
                 top: auto;
                 width: 25%;
             }
@@ -454,7 +451,6 @@ div.cp-app-poll-realtime {
                 &:nth-last-child(2) {
                     border-right: 1px solid @poll-border-color;
                 }
-                //text-align: center;
                 &.cp-app-poll-table-own {
                     background: @poll-th-user-bg;
                     .cp-app-poll-table-lock {
@@ -631,8 +627,42 @@ div.cp-app-poll-realtime {
             }
         }
     }
+
+    @media screen and (max-width: 500px) {
+        #cp-app-poll-table-scroll {
+            max-width: 100%;
+            padding: 0;
+            margin: 0;
+            table {
+                tr {
+                    td {
+                        &:first-child {
+                            position: unset;
+                            min-width: 100px;
+                            &:hover:not(:empty) {
+                                position: absolute;
+                                min-width: 100px;
+                                width: auto;
+                                z-index: 100;
+                            }
+                        }
+                        &:nth-last-child(2) {
+                            position: unset;
+                        }
+                        &:last-child {
+                            position: unset;
+                        }
+                    }
+                }
+            }
+        }
+        #cp-app-poll-comments {
+            min-width: 90%;
+        }
+    }
 }
 
+
 .btn {
     display: inline-flex;
     align-items: center;
diff --git a/www/poll/inner.js b/www/poll/inner.js
index 9222d90a0..1a0c14f8c 100644
--- a/www/poll/inner.js
+++ b/www/poll/inner.js
@@ -163,11 +163,10 @@ define([
     var sortColumns = function (order, firstcol) {
         var colsOrder = order.slice();
         // Never put at the first position an uncommitted column
-        if (APP.proxy.content.colsOrder.indexOf(firstcol) === -1) { return colsOrder; }
-        colsOrder.sort(function (a, b) {
-            return (a === firstcol) ? -1 :
-                        ((b === firstcol) ? 1 : 0);
-        });
+        var idx = APP.proxy.content.colsOrder.indexOf(firstcol);
+        if (!firstcol || idx === -1) { return colsOrder; }
+        colsOrder.splice(idx, 1);
+        colsOrder.unshift(firstcol);
         return colsOrder;
     };
 
@@ -618,7 +617,6 @@ define([
             // If readOnly, always put the app in published mode
             bool = true;
         }
-        console.log(bool);
         $(APP.$mediaTagButton).toggle(!bool);
         setTablePublished(bool);
         /*['textarea'].forEach(function (sel) {
@@ -1270,7 +1268,6 @@ define([
         }).nThen(function (waitFor) {
             common.handleNewFile(waitFor);
         }).nThen(function (/* waitFor */) {
-            console.log('here');
             Test.registerInner(common.getSframeChannel());
             var metadataMgr = common.getMetadataMgr();
             APP.locked = APP.readOnly = metadataMgr.getPrivateData().readOnly;