Merge branch 'develop' of github.com:Pita/etherpad-lite into feature/frontend-tests

settings.json.template

@@ -27,7 +27,7 @@
   */
   
   //the default text of a pad
-  "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nEtherpad Lite on Github: http:\/\/j.mp/ep-lite\n",
+  "defaultPadText" : "Welcome to Etherpad Lite!\n\nThis pad text is synchronized as you type, so that everyone viewing this page sees the same text. This allows you to collaborate seamlessly on documents!\n\nGet involved with Etherpad at http:\/\/etherpad.org\n",
   
   /* Users must have a session to access pads. This effectively allows only group pads to be accessed. */
   "requireSession" : false,

src/static/css/pad.css

@@ -783,6 +783,23 @@ input[type=checkbox] {
       padding: 4px 1px
     }
 }
+@media screen and (max-width: 400px){
+  #editorcontainer { 
+    top: 68px;
+  }
+  #editbar { 
+    height: 62px;
+  }
+  .toolbar ul.menu_right { 
+    float: left;
+    margin-top:2px;
+  }
+  .popup {
+    width:100%;
+    max-width:300px;
+    top: 72px !important;
+  }
+}
 @media only screen and (min-device-width: 320px) and (max-device-width: 720px) {
     #users {
       top: 36px;

src/static/js/pad_editor.js

@@ -85,11 +85,13 @@ var padeditor = (function()
         if (value == "false") return false;
         return defaultValue;
       }
-
       self.ace.setProperty("rtlIsTrue", settings.rtlIsTrue);
 
       var v;
 
+      v = getOption('rtlIsTrue', false);
+      self.ace.setProperty("rtlIsTrue", v);
+
       v = getOption('showLineNumbers', true);
       self.ace.setProperty("showslinenumbers", v);
       padutils.setCheckbox($("#options-linenoscheck"), v);

src/templates/index.html

@@ -55,7 +55,6 @@
               background: -moz-linear-gradient(#fff,#ccc);
               background: -ms-linear-gradient(#fff,#ccc);
               background: -o-linear-gradient(#fff,#ccc);
-              opacity: .9;
               box-shadow: 0px 1px 8px rgba(0,0,0,0.3);
             }
             #inner {

src/templates/pad.html

@@ -334,7 +334,7 @@
             <div id="chattext" class="authorColors"></div>
             <div id="chatinputbox">
                 <form>
-                    <input id="chatinput" type="text" maxlength="140">
+                    <input id="chatinput" type="text" maxlength="999">
                 </form>
             </div>
         </div>