Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

customize.dist/fsStore.js

@@ -19,6 +19,7 @@ define([
     var storeObj;
     var ready = false;
     var filesOp;
+    var exp = {};
 
     var safeSet = function (key, val) {
         storeObj[key] = val;
@@ -85,6 +86,10 @@ define([
         cb();
     };
 
+    Store.getProxy = function () {
+        return exp;
+    };
+
     var changeHandlers = Store.changeHandlers = [];
 
     Store.change = function (f) {
@@ -134,7 +139,9 @@ define([
         };
 
         var rt = window.rt = Listmap.create(listmapConfig);
+        exp.proxy = rt.proxy;
         rt.proxy.on('create', function (info) {
+            exp.info = info;
             var realtime = info.realtime;
             if (!Cryptpad.getUserHash()) {
                 localStorage.FS_hash = Cryptpad.getEditHashFromKeys(info.channel, secret.keys);
@@ -170,12 +177,12 @@ define([
     };
 
     Store.ready = function (f, Cryptpad) {
-        if (Cryptpad.parsePadUrl(window.location.href).type === "file") {
+        /*if (Cryptpad.parsePadUrl(window.location.href).type === "file") {
             if (typeof(f) === 'function') {
                 f(void 0, Cryptpad.getStore(true));
             }
             return;
-        }
+        }*/
         if (ready) {
             if (typeof(f) === 'function') {
                 f(void 0, Store);

customize.dist/index.html

@@ -80,7 +80,7 @@
 
             </tbody>
         </table>-->
-        <iframe src="/file/#iframe" id="fileManagerIframe" style="display: none;"></iframe>
+        <iframe src="/file/#iframe" id="fileManagerIframe"></iframe>
 
         <div id="buttons" class="buttons">
           <a id="create-pad" class="button create" href="/pad/" data-localization="button_newpad"></a>

customize.dist/src/fragments/index.html

@@ -40,7 +40,7 @@
 
             </tbody>
         </table>-->
-        <iframe src="/file/#iframe" id="fileManagerIframe" style="display: none;"></iframe>
+        <iframe src="/file/#iframe" id="fileManagerIframe"></iframe>
 
         <div id="buttons" class="buttons">
           <a id="create-pad" class="button create" href="/pad/" data-localization="button_newpad"></a>

customize.dist/src/toolbar.less

@@ -10,15 +10,16 @@
 }
 
 .toolbar-container {
-    .cryptpad-lag {
-        position: relative;
-        top: -2px;
-    }
     font: 12px Arial,Helvetica,Tahoma,Verdana,sans-serif;
     background: -webkit-linear-gradient(#EEEEEE, #DADADA); /* For Safari 5.1 to 6.0 */
     background: -o-linear-gradient(#f5f5f5, #DDDDDD); /* For Opera 11.1 to 12.0 */
     background: -moz-linear-gradient(#f5f5f5, #DDDDDD); /* For Firefox 3.6 to 15 */
     background: linear-gradient(#f5f5f5, #DDDDDD); /* Standard syntax */
+    .cryptpad-toolbar {
+        select {
+            box-sizing: border-box;
+        }
+    }
 }
 
 .cryptpad-toolbar {
@@ -37,6 +38,18 @@
         float: right;
     }
 
+    .cryptpad-lag {
+        box-sizing: content-box;
+        vertical-align: top;
+        height: 16px;
+        width: 16px;
+        display: inline-block;
+        margin: 2px 0px;
+        padding: 5px;
+        div {
+            margin: auto;
+        }
+    }
     div {
         white-space: normal;
         &.cryptpad-back {
@@ -45,11 +58,6 @@
             cursor: pointer;
             color: #000;
         }
-        &.cryptpad-lag {
-            float: left;
-            line-height: 26px;
-            margin: 2px 0px;
-        }
     }
 
     button, select, .rightside-element {
@@ -116,6 +124,11 @@
         padding-left: 5px;
         border: 1px solid #A6A6A6;
         border-bottom-color: #979797;
+        vertical-align: top;
+        box-sizing: content-box;
+        option {
+            height: 24px;
+        }
     }
 }
 
@@ -229,6 +242,9 @@
     .cryptpad-user {
         position: absolute;
         right: 0;
+        span:not(.cryptpad-lag) {
+            vertical-align: top;
+        }
         @media screen and (max-width: 400px) {
             top: 3em;
         }
@@ -276,9 +292,11 @@
                     padding: 5px 0px;
                     margin: 5px 0px;
                     font-size: 16px;
+                    white-space: normal;
                 }
             }
             button {
+                white-space: normal;
                 margin: 2px 0px;
             }
         }
@@ -295,7 +313,7 @@
     //float: right;
 }
 .cryptpad-spinner {
-    float: left;
+    //float: left;
     display: inline-block;
     height: 26px;
     margin: 2px;
@@ -310,10 +328,6 @@
 .cryptpad-toolbar-username {
 }
 .lag {
-    display: inline-block;
-    vertical-align: middle;
-    padding: 0 !important;
-    margin: 0 5px !important;
     height: 15px !important;
     width: 15px !important;
     border-radius: 50%;

customize.dist/toolbar.css

@@ -17,9 +17,8 @@
   background: linear-gradient(#f5f5f5, #DDDDDD);
   /* Standard syntax */
 }
-.toolbar-container .cryptpad-lag {
-  position: relative;
-  top: -2px;
+.toolbar-container .cryptpad-toolbar select {
+  box-sizing: border-box;
 }
 .cryptpad-toolbar {
   box-sizing: border-box;
@@ -39,6 +38,18 @@
 .cryptpad-toolbar a {
   float: right;
 }
+.cryptpad-toolbar .cryptpad-lag {
+  box-sizing: content-box;
+  vertical-align: top;
+  height: 16px;
+  width: 16px;
+  display: inline-block;
+  margin: 2px 0px;
+  padding: 5px;
+}
+.cryptpad-toolbar .cryptpad-lag div {
+  margin: auto;
+}
 .cryptpad-toolbar div {
   white-space: normal;
 }
@@ -48,11 +59,6 @@
   cursor: pointer;
   color: #000;
 }
-.cryptpad-toolbar div.cryptpad-lag {
-  float: left;
-  line-height: 26px;
-  margin: 2px 0px;
-}
 .cryptpad-toolbar button,
 .cryptpad-toolbar select,
 .cryptpad-toolbar .rightside-element {
@@ -118,6 +124,11 @@
   padding-left: 5px;
   border: 1px solid #A6A6A6;
   border-bottom-color: #979797;
+  vertical-align: top;
+  box-sizing: content-box;
+}
+.cryptpad-toolbar select option {
+  height: 24px;
 }
 .cryptpad-toolbar-top {
   display: block;
@@ -234,6 +245,9 @@
   position: absolute;
   right: 0;
 }
+.cryptpad-toolbar-top .cryptpad-user span:not(.cryptpad-lag) {
+  vertical-align: top;
+}
 @media screen and (max-width: 400px) {
   .cryptpad-toolbar-top .cryptpad-user {
     top: 3em;
@@ -289,8 +303,10 @@
   padding: 5px 0px;
   margin: 5px 0px;
   font-size: 16px;
+  white-space: normal;
 }
 .cryptpad-toolbar-leftside .cryptpad-dropdown-container .cryptpad-dropdown button {
+  white-space: normal;
   margin: 2px 0px;
 }
 .cryptpad-toolbar-leftside button {
@@ -303,7 +319,6 @@
   text-align: right;
 }
 .cryptpad-spinner {
-  float: left;
   display: inline-block;
   height: 26px;
   margin: 2px;
@@ -316,10 +331,6 @@
   text-transform: uppercase;
 }
 .lag {
-  display: inline-block;
-  vertical-align: middle;
-  padding: 0 !important;
-  margin: 0 5px !important;
   height: 15px !important;
   width: 15px !important;
   border-radius: 50%;