Merge branch 'master' of git://github.com/Pita/etherpad-lite

static/css/pad.css

@@ -1003,7 +1003,7 @@ position: relative;
   padding: 10px;
   -moz-border-radius: 6px;
   border-radius: 6px;
-  height:170px;
+  height:190px;
   display:none;
 }
 
@@ -1032,7 +1032,7 @@ position: relative;
 
 #importexportline{
   border: dotted 1px;
-  height: 165px;
+  height: 185px;
   position:absolute;
   width:0px;
   left:260px;
@@ -1068,6 +1068,10 @@ position: relative;
   background-position: 2px -49px;
 }
 
+#exportdokuwiki{
+  background-position: 2px -144px;
+}
+
 #export a{
   text-decoration: none;
 }
@@ -1158,7 +1162,6 @@ label[for=readonlyinput] {
   margin-left:10px;
 }
 
-
 @media screen and (max-width: 960px) {
   .modaldialog {
     position: relative;
@@ -1246,4 +1249,7 @@ label[for=readonlyinput] {
   #sidediv {
     display:none;
   }
-}
+}
+.rtl{
+  direction:RTL;
+} 

static/js/ace.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/ace2_common.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *
@@ -142,4 +148,4 @@ function htmlPrettyEscape(str)
 if (typeof exports !== "undefined")
 {
   exports.map = map;
-}
+}

static/js/ace2_inner.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *
@@ -1127,6 +1133,10 @@ function OUTER(gscope)
     {
       setTextSize(value);
     }
+    else if (k == 'rtlistrue')
+    {
+      setClassPresence(root, "rtl", !! value);
+    }
   }
 
   editorInfo.ace_setBaseText = function(txt)

static/js/broadcast.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/broadcast_revisions.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/broadcast_slider.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/changesettracker.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/chat.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
  *
@@ -20,18 +26,24 @@ var chat = (function()
   var isAndroid = ua.indexOf("android") > -1;
   var isMobileSafari = ua.indexOf("mobile") > -1;
   var bottomMargin = "0px";
+  var sDuration = 500;
+  var hDuration = 750;
   var chatMentions = 0;
   var title = document.title;
+  if (isAndroid || isMobileSafari){
+   sDuration = 0;
+   hDuration = 0;
+  }
   var self = {
     show: function () 
     {      
       $("#chaticon").hide("slide", {
         direction: "down"
-      }, 500, function ()
+      }, hDuration, function ()
       {
         $("#chatbox").show("slide", {
           direction: "down"
-        }, 750, self.scrollDown);
+        }, sDuration, self.scrollDown);
         $("#chatbox").resizable(
         {
           handles: 'nw',
@@ -60,14 +72,10 @@ var chat = (function()
     hide: function () 
     {
       $("#chatcounter").text("0");
-      if(isAndroid || isMobileSafari) {
-        $("#chatbox").toggle();
-      }
-      else
+      $("#chatbox").hide("slide", { direction: "down" }, sDuration, function()
       {
-        $("#chatbox").toggle("slide", { direction: "down" }, 625);
-      }
-
+        $("#chaticon").show("slide", { direction: "down" }, hDuration);
+      });
     },
     scrollDown: function()
     {
@@ -166,4 +174,4 @@ var chat = (function()
   }
 
   return self;
-}());
+}());

static/js/collab_client.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/colorutils.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // DO NOT EDIT THIS FILE, edit infrastructure/ace/www/colorutils.js
 // THIS FILE IS ALSO SERVED AS CLIENT-SIDE JS
 /**

static/js/contentcollector.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.contentcollector
 // %APPJET%: import("etherpad.collab.ace.easysync2.Changeset");
 // %APPJET%: import("etherpad.admin.plugins");

static/js/cssmanager.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/cssmanager_client.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // DO NOT EDIT THIS FILE, edit infrastructure/ace/www/cssmanager.js
 /**
  * Copyright 2009 Google Inc.

static/js/domline.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.domline
 // %APPJET%: import("etherpad.admin.plugins");
 /**

static/js/domline_client.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // DO NOT EDIT THIS FILE, edit infrastructure/ace/www/domline.js
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.domline
 /**

static/js/draggable.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/easysync2.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.easysync2
 // %APPJET%: jimport("com.etherpad.Easysync2Support");
 /**

static/js/easysync2_client.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // DO NOT EDIT THIS FILE, edit infrastructure/ace/www/easysync2.js
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.easysync2
 /**

static/js/linestylefilter.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.linestylefilter
 // %APPJET%: import("etherpad.collab.ace.easysync2.Changeset");
 // %APPJET%: import("etherpad.admin.plugins");

static/js/linestylefilter_client.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 // DO NOT EDIT THIS FILE, edit infrastructure/ace/www/linestylefilter.js
 // THIS FILE IS ALSO AN APPJET MODULE: etherpad.collab.ace.linestylefilter
 /**

static/js/pad2.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc., 2011 Peter 'Pita' Martischka (Primary Technology Ltd)
  *
@@ -22,6 +28,7 @@ var noColors = false;
 var useMonospaceFontGlobal = false;
 var globalUserName = false;
 var hideQRCode = false;
+var rtlIsTrue = false;
 
 $(document).ready(function()
 {
@@ -88,6 +95,7 @@ function getParams()
   var useMonospaceFont = params["useMonospaceFont"];
   var IsnoColors = params["noColors"];
   var hideQRCode = params["hideQRCode"];
+  var rtl = params["rtl"];
 
   if(IsnoColors)
   {
@@ -135,6 +143,13 @@ function getParams()
   {
     $('#qrcode').hide();
   }
+  if(rtl)
+  {
+    if(rtl == "true")
+    {
+      rtlIsTrue = true
+    }
+  }
 }
 
 function getUrlVars()
@@ -293,6 +308,11 @@ function handshake()
       {
         pad.changeViewOption('noColors', true);
       }
+      
+      if (rtlIsTrue == true)
+      {
+        pad.changeViewOption('rtl', true);
+      }
 
       // If the Monospacefont value is set to true then change it to monospace.
       if (useMonospaceFontGlobal == true)

static/js/pad_connectionstatus.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_cookie.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_docbar.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_editbar.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_editor.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *
@@ -89,6 +95,7 @@ var padeditor = (function()
 
       self.ace.setProperty("showsauthorcolors", noColors);
 
+      self.ace.setProperty("rtlIsTrue", rtlIsTrue);
     },
     initViewZoom: function()
     {

static/js/pad_impexp.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *
@@ -234,6 +240,7 @@ var padimpexp = (function()
       $("#exporthtmla").attr("href", document.location.pathname + "/export/html");
       $("#exportplaina").attr("href", document.location.pathname + "/export/txt");
       $("#exportwordlea").attr("href", document.location.pathname + "/export/wordle");
+      $("#exportdokuwikia").attr("href", document.location.pathname + "/export/dokuwiki");
       
       //hide stuff thats not avaible if abiword is disabled
       if(clientVars.abiwordAvailable == "no")
@@ -241,8 +248,8 @@ var padimpexp = (function()
         $("#exportworda").remove();
         $("#exportpdfa").remove();
         $("#exportopena").remove();
-        $("#importexport").css({"height":"95px"});
-        $("#importexportline").css({"height":"95px"});
+        $("#importexport").css({"height":"115px"});
+        $("#importexportline").css({"height":"115px"});
         $("#import").html("Import is not available");
       }
       else if(clientVars.abiwordAvailable == "withoutPDF")

static/js/pad_modals.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_savedrevs.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_userlist.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/pad_utils.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/plugins.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 plugins = {
   callHook: function(hookName, args)
   {

static/js/skiplist.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/undo-xpopup.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/undomodule.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/js/virtual_lines.js

@@ -1,3 +1,9 @@
+/**
+ * This code is mostly from the old Etherpad. Please help us to comment this code. 
+ * This helps other people to understand this code better and helps them to improve it.
+ * TL;DR COMMENTS ON THIS FILE ARE HIGHLY APPRECIATED
+ */
+
 /**
  * Copyright 2009 Google Inc.
  *

static/pad.html

@@ -204,6 +204,7 @@
   <a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword">Microsoft Word</div></a>
   <a id="exportpdfa" target="_blank" class="exportlink"><div class="exporttype" id="exportpdf">PDF</div></a>
   <a id="exportopena" target="_blank" class="exportlink"><div class="exporttype" id="exportopen">OpenDocument</div></a>
+  <a id="exportdokuwikia" target="_blank" class="exportlink"><div class="exporttype" id="exportdokuwiki">DokuWiki text</div></a>
   <a id="exportwordlea" target="_blank" onClick="padimpexp.export2Wordle();return false;" class="exportlink"><div class="exporttype" id="exportwordle">Wordle</div></a>
   <form id="wordlepost" name="wall" action="http://wordle.net/advanced" method="POST" style="margin-left:0px;"> 
     <div id="hidetext" style=""><textarea id="text" name="text" id="text" style="display:none;">Coming soon!</textarea></div>