From a540bff652beacd7d720a085f0cd93fd567f660b Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Sun, 19 Feb 2012 17:00:43 +0100
Subject: [PATCH 1/5] more robust index page + fix for iOS Safari rotation-bug

---
 static/index.html | 93 +++++++++++++++++++++++++----------------------
 static/pad.html   |  2 +-
 2 files changed, 50 insertions(+), 45 deletions(-)

diff --git a/static/index.html b/static/index.html
index 97736d1e..da24a7a7 100644
--- a/static/index.html
+++ b/static/index.html
@@ -4,27 +4,24 @@
         <title>Etherpad Lite</title>
 
         <meta charset="utf-8"> 
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <meta name="viewport" content="width=device-width, user-scalable=0">
 
-        <style> 
-            *{ margin:0;padding:0; }
+        <style>
             body {
-              background: rgba(0,0,0,.05);
+              margin: 0;
+              height: 100%;
               color: #333;
-              font: 14px helvetica,sans-serif;
-              background: #ccc;
+              font: 14px helvetica, sans-serif;
+              background: #ddd;
               background: -webkit-radial-gradient(circle,#aaa,#eee 60%) center fixed;
               background: -moz-radial-gradient(circle,#aaa,#eee 60%) center fixed;
               background: -ms-radial-gradient(circle,#aaa,#eee 60%) center fixed;
               background: -o-radial-gradient(circle,#aaa,#eee 60%) center fixed;
-              overflow-x: hidden;
               border-top: 8px solid rgba(51,51,51,.8);
             }
-            #container {
-              text-shadow: 0 1px 1px #fff;
+            #wrapper {
               border-top: 1px solid #999;
               margin-top: 160px;
-              text-align: center;
               padding: 15px;
               background: #eee;
               background: -webkit-linear-gradient(#fff,#ccc);
@@ -34,6 +31,10 @@
               opacity: .9;
               box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
             }
+            #inner {
+              width: 300px;
+              margin: 0 auto;
+            }
             #button {
               margin: 0 auto;
               border-radius: 3px;
@@ -43,7 +44,6 @@
               text-shadow: 0 -1px 0 rgba(0,0,0,.8);
               height: 70px;
               line-height: 70px;
-              width: 300px;
               background: #555;
               background: -webkit-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
               background: -moz-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
@@ -65,64 +65,69 @@
             }
             #label {
               text-align: left;
-              margin: 0 auto;
-              width: 300px;
+              text-shadow: 0 1px 1px #fff;
+              margin: 16px auto 0;
             }
-            input {
-              vertical-align: middle;
+            form {
+              height: 38px;
+              background: #fff;
+              border: 1px solid #bbb;
+              border-radius: 3px;
+              position: relative;
+            }
+            button, input {
               font-weight: bold;
               font-size: 15px;
             }
             input[type="text"] {
-              width: 243px;
-              padding: 10px 47px 10px 10px;
-              background: #fff;
-              border: 1px solid #bbb;
-              outline: none;
               border-radius: 3px;
-              text-shadow: 0 0 1px #fff;
+              box-sizing: border-box;
+              -moz-box-sizing: border-box;   
+              padding: 0 45px 0 10px;
+              width: 100%;
+              height: 100%;
+              outline: none;
+              border: none;
+              position: absolute;
             }
-            input[type="submit"] {
+            button[type="submit"] {
+              position: absolute;
+              right: 0;
               width: 45px;
-              margin-left: -50px;
-              padding: 8px;
+              height: 38px;
             }
-            input[type="submit"]::-moz-focus-inner { border: 0 }
-            @-moz-document url-prefix() { input[type="submit"] { padding: 7px } }     
             @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
               body {
                 background: #bbb;
                 background: -webkit-linear-gradient(#aaa,#eee 60%) center fixed;
-                height: 100%;
+                background: -moz-linear-gradient(#aaa,#eee 60%) center fixed;
+                background: -ms-linear-gradient(#aaa,#eee 60%) center fixed;
               }
-              #container {
+              #wrapper {
                 margin-top: 0;
-                text-align: left;
               }
-              #button, #label {
-                text-align: center;
+              #inner {
                 width: 95%;        
               }
-              form {
-               text-align: center;
-              }
-              input[type=text] {
-                width: 75%;
+              #label {
+                text-align: center;
               }
             }
-        </style> 
-
+        </style>
         <link href="static/custom/index.css" rel="stylesheet"> 
-        <script src="static/custom/index.js"></script>
 
-        <div id="container"> 
-            <div id="button" onclick="go2Random()" class="translate">New Pad</div><br><div id="label" class="translate">or create/open a Pad with the name</div> 
-            <form action="#" onsubmit="go2Name();return false;"> 
+        <div id="wrapper">
+            <div id="inner">
+                <div id="button" onclick="go2Random()" class="translate">New Pad</div>
+                <div id="label" class="translate">or create/open a Pad with the name</div> 
+                <form action="#" onsubmit="go2Name();return false;"> 
                     <input type="text" id="padname" autofocus x-webkit-speech> 
-                    <input type="submit" value="OK"> 
-            </form> 
+                    <button type="submit">OK</button>
+                </form>
+            </div>
         </div>
 
+        <script src="static/custom/index.js"></script>
         <script> 
             function go2Name() 
             {
diff --git a/static/pad.html b/static/pad.html
index 0345d65b..d5eb2f56 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -5,7 +5,7 @@
 
         <meta charset="utf-8">
         <meta name="robots" content="noindex, nofollow">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
+        <meta name="viewport" content="width=device-width, user-scalable=0">
 
         <link href="../static/css/pad.css" rel="stylesheet">
         <link href="../static/custom/pad.css" rel="stylesheet">

From 255cf8c5f00d72b41fbe725e13e3d31c6621a6ca Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Sun, 19 Feb 2012 17:04:36 +0100
Subject: [PATCH 2/5] qr codes now have equal margins

---
 static/js/pad_editbar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/pad_editbar.js b/static/js/pad_editbar.js
index 8e4ffa3c..23692631 100644
--- a/static/js/pad_editbar.js
+++ b/static/js/pad_editbar.js
@@ -239,14 +239,14 @@ var padeditbar = (function()
         var readonlyLink = basePath + "/ro/" + clientVars.readOnlyId;
         $('#embedinput').val("<iframe src='" + readonlyLink + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(readonlyLink);
-        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=H|0&chl=" + readonlyLink);
+        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + readonlyLink);
       }
       else
       {
         var padurl = window.location.href.split("?")[0];
         $('#embedinput').val("<iframe src='" + padurl + "?showControls=true&showChat=true&showLineNumbers=true&useMonospaceFont=false' width=600 height=400>");
         $('#linkinput').val(padurl);
-        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=H|0&chl=" + padurl);
+        $('#embedreadonlyqr').attr("src","https://chart.googleapis.com/chart?chs=200x200&cht=qr&chld=|0&chl=" + padurl);
       }
     }
   };

From 12298a926c0d949885f35ae091ed583ad7faf305 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Sun, 19 Feb 2012 17:16:05 +0100
Subject: [PATCH 3/5] move width-specific css to bottom + transfer js-css to a
 class [#chatbox:.stickyChat]

---
 static/css/pad.css | 167 ++++++++++++++++++++++++---------------------
 static/js/chat.js  |   4 +-
 2 files changed, 92 insertions(+), 79 deletions(-)

diff --git a/static/css/pad.css b/static/css/pad.css
index e407b3a4..35fe8df8 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -1104,83 +1104,6 @@ width:33px !important;
   transform: scale(1.5);
 }
 
-@media screen and (max-width: 960px) {
-  .modaldialog {
-    position: relative;
-    margin: 0 auto;
-    width: 80%;
-    top: 40px;
-    left: 0;
-  }
-}
-
-@media screen and (max-width: 600px) {
-  #editbar ul li {
-    padding: 4px 1px;
-  }  
-}
-
-@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
-  #editbar ul li {
-    padding: 4px 3px;
-  }
-  #editbar ul#menu_right > li {
-    padding: 4px 8px;
-    margin-top: 2px;
-  }
-  #chaticon {
-    opacity: .8;
-  }
-  #users {
-    right: 4px;
-  }
-  #mycolorpicker {
-    left: -72px; /* #mycolorpicker:width - #users:width */
-  }
-  #editorcontainer {
-    margin-bottom: 33px;
-  }
-  #editbar ul#menu_right  {
-    background: #f7f7f7;
-    background: linear-gradient(#f7f7f7, #f1f1f1 80%);
-    width: 100%;
-    overflow: hidden;
-    height: 32px;
-    position: fixed;
-    bottom: 0;
-    border-top: 1px solid #ccc;
-  }
-  #editbar ul#menu_right li:not(:last-child) {
-    display: none;
-  }
-  #editbar ul#menu_right li:last-child {
-    height: 24px;
-    border-radius: 0;
-    margin-top: 0;
-    border: 0;
-    float: right;
-  }
-  #chaticon {
-    bottom: 0;
-    right: 55px;
-    border-right: none;
-    border-radius: 0;
-    background: #f7f7f7;
-    background: linear-gradient(#f7f7f7, #f1f1f1 80%);
-    border: 0;
-  }
-  #chatbox {
-    bottom: 32px;
-    right: 0;
-    border-top-right-radius: 0;
-  }
-  #editbar ul li a span {
-    top: -3px;
-  }
-  #usericonback {
-    margin-top: 4px;
-  }
-}
 .rtl{
   direction:RTL;
 } 
@@ -1262,3 +1185,93 @@ label {
  background: #eee !important;
  background: linear-gradient(#EEE, #F0F0F0) !important;
 }
+
+.stickyChat {
+ background-color: #f1f1f1 !important;
+ right: 0px !important;
+ top: 36px;
+ border-radius: 0px !important;
+ height: auto !important;
+ border: none !important;
+ border-left: 1px solid #ccc !important;
+ width: 185px !important;
+}
+
+@media screen and (max-width: 960px) {
+  .modaldialog {
+    position: relative;
+    margin: 0 auto;
+    width: 80%;
+    top: 40px;
+    left: 0;
+  }
+}
+
+@media screen and (max-width: 600px) {
+  #editbar ul li {
+    padding: 4px 1px;
+  }  
+}
+
+@media only screen and (min-width: 320px) and (max-width: 720px) {
+  #editbar ul li {
+    padding: 4px 3px;
+  }
+  #editbar ul#menu_right > li {
+    padding: 4px 8px;
+    margin-top: 2px;
+  }
+  #chaticon {
+    opacity: .8;
+  }
+  #users {
+    right: 4px;
+  }
+  #mycolorpicker {
+    left: -72px; /* #mycolorpicker:width - #users:width */
+  }
+  #editorcontainer {
+    margin-bottom: 33px;
+  }
+  #editbar ul#menu_right  {
+    background: #f7f7f7;
+    background: linear-gradient(#f7f7f7, #f1f1f1 80%);
+    width: 100%;
+    overflow: hidden;
+    height: 32px;
+    position: fixed;
+    bottom: 0;
+    border-top: 1px solid #ccc;
+  }
+  #editbar ul#menu_right li:not(:last-child) {
+    display: none;
+  }
+  #editbar ul#menu_right li:last-child {
+    height: 24px;
+    border-radius: 0;
+    margin-top: 0;
+    border: 0;
+    float: right;
+  }
+  #chaticon {
+    bottom: 0;
+    right: 55px;
+    border-right: none;
+    border-radius: 0;
+    background: #f7f7f7;
+    background: linear-gradient(#f7f7f7, #f1f1f1 80%);
+    border: 0;
+  }
+  #chatbox {
+    bottom: 32px;
+    right: 0;
+    border-top-right-radius: 0;
+    border-right: none;
+  }
+  #editbar ul li a span {
+    top: -3px;
+  }
+  #usericonback {
+    margin-top: 4px;
+  }
+}
diff --git a/static/js/chat.js b/static/js/chat.js
index 9f0903cf..42c60be6 100644
--- a/static/js/chat.js
+++ b/static/js/chat.js
@@ -42,13 +42,13 @@ var chat = (function()
       chat.show();
       if(!isStuck || fromInitialCall) { // Stick it to
         padcookie.setPref("chatAlwaysVisible", true);
-        $('#chatbox').css({"right":"0px", "top":"36px", "border-radius":"0px", "height":"auto", "border-right":"none", "border-left":"1px solid #ccc", "border-top":"none", "background-color":"#f1f1f1", "width":"185px"});
+        $('#chatbox').addClass("stickyChat");
         $('#chattext').css({"top":"0px"});
         $('#editorcontainer').css({"right":"192px", "width":"auto"});
         isStuck = true;
       } else { // Unstick it
         padcookie.setPref("chatAlwaysVisible", false);
-        $('#chatbox').css({"right":"20px", "top":"auto", "border-top-left-radius":"5px", "border-top-right-radius":"5px", "border-right":"1px solid #999", "height":"200px", "border-top":"1px solid #999", "background-color":"#f7f7f7"});
+        $('#chatbox').removeClass("stickyChat");
         $('#chattext').css({"top":"25px"});
         $('#editorcontainer').css({"right":"0px", "width":"100%"});
         isStuck = false;

From fc0114fc2d9b5b8c7a66644213660f432348020a Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Sun, 19 Feb 2012 17:51:10 +0100
Subject: [PATCH 4/5] added settings to mobile version

---
 static/css/pad.css      | 40 +++++++++++++++++++++++++++++-----------
 static/js/pad_impexp.js |  2 --
 2 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/static/css/pad.css b/static/css/pad.css
index 35fe8df8..caa61b4e 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -1165,7 +1165,6 @@ label {
 .right_popup {
  float: left;
  width: 50%;
- box-sizing: border-box;
 }
 
 #settingsmenu, #importexport, #embed {
@@ -1217,13 +1216,6 @@ label {
   #editbar ul li {
     padding: 4px 3px;
   }
-  #editbar ul#menu_right > li {
-    padding: 4px 8px;
-    margin-top: 2px;
-  }
-  #chaticon {
-    opacity: .8;
-  }
   #users {
     right: 4px;
   }
@@ -1243,9 +1235,6 @@ label {
     bottom: 0;
     border-top: 1px solid #ccc;
   }
-  #editbar ul#menu_right li:not(:last-child) {
-    display: none;
-  }
   #editbar ul#menu_right li:last-child {
     height: 24px;
     border-radius: 0;
@@ -1274,4 +1263,33 @@ label {
   #usericonback {
     margin-top: 4px;
   }
+  #qrcode {
+    display: none;
+  }
+  #editbar ul#menu_right li:not(:last-child) {
+    display: block;
+  }
+  #editbar ul#menu_right > li {
+    background: none;
+    border: none;
+    margin-top: 4px;
+    padding: 4px 8px;
+  }
+  .selected {
+    background: none !important;
+  }
+  #timesliderlink {
+    display: none !important;
+  }
+  .popup {
+    border-radius: 0;
+    box-sizing: border-box;
+    width: 100%;
+  }
+  #settingsmenu, #importexport, #embed {
+    left: 0;
+    top: 0;
+    bottom: 33px;
+    right: 0; 
+  }
 }
diff --git a/static/js/pad_impexp.js b/static/js/pad_impexp.js
index 0037195f..6fe42c70 100644
--- a/static/js/pad_impexp.js
+++ b/static/js/pad_impexp.js
@@ -257,8 +257,6 @@ var padimpexp = (function()
         $("#exportworda").remove();
         $("#exportpdfa").remove();
         $("#exportopena").remove();
-        $("#importexport").css({"height":"115px"});
-        $("#importexportline").css({"height":"115px"});
         $("#import").html("Import is not available.  To enable import please install abiword");
       }
       else if(clientVars.abiwordAvailable == "withoutPDF")

From 0261ab653e29c9f1d49796f7bf65b8d6d1ef4cc2 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Sun, 19 Feb 2012 20:10:10 +0100
Subject: [PATCH 5/5] Update static/css/pad.css

---
 static/css/pad.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/css/pad.css b/static/css/pad.css
index caa61b4e..167aed25 100644
--- a/static/css/pad.css
+++ b/static/css/pad.css
@@ -1212,7 +1212,7 @@ label {
   }  
 }
 
-@media only screen and (min-width: 320px) and (max-width: 720px) {
+@media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
   #editbar ul li {
     padding: 4px 3px;
   }