From 419d2bbd939040b68c973f90b6bb2cd2be9ab29a Mon Sep 17 00:00:00 2001
From: Mark Schmale <masch@masch.it>
Date: Fri, 26 Aug 2011 16:19:23 +0200
Subject: [PATCH 01/14] added a button to toggle the font

---
 static/img/etherpad_lite_icons.png | Bin 2307 -> 2762 bytes
 static/js/pad_editbar.js           |   4 ++++
 static/pad.html                    |   6 ++++++
 3 files changed, 10 insertions(+)

diff --git a/static/img/etherpad_lite_icons.png b/static/img/etherpad_lite_icons.png
index 606612313dd64b158a7ad0007a56271346aa53ac..590a49653e465f7b915d2368aec242a9c2e3e92f 100644
GIT binary patch
delta 2380
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

delta 1902
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

diff --git a/static/js/pad_editbar.js b/static/js/pad_editbar.js
index ae1090687..2d05330a6 100644
--- a/static/js/pad_editbar.js
+++ b/static/js/pad_editbar.js
@@ -122,6 +122,10 @@ var padeditbar = (function()
         else if (cmd == 'save')
         {
           padsavedrevs.saveNow();
+        } 
+        else if (cmd == 'tglfont') 
+        {
+            pad.changeViewOption('useMonospaceFont', !(pad.padOptions.view&&pad.padOptions.view.useMonospaceFont));
         }
         else
         {
diff --git a/static/pad.html b/static/pad.html
index 980905e99..c4826c484 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -76,6 +76,12 @@
     <div class="buttonicon" style="background-position:0px -86px"></div>
   </a>
 </li>
+<li class="separator"></li>
+<li onClick="window.pad&&pad.editbarClick('tglfont');return false;" >
+  <a id="monospace" title="toggle the font between monospace and normal">
+     <div class="buttonicon" style="background-position:0px -436px"></div>
+  </a>
+</li>
 </ul>
 
 <ul id="menu_right">

From 2f0e45efe331d7a98c98ae2f3e5d385c6f71878c Mon Sep 17 00:00:00 2001
From: Wikinaut <root@s15434088.onlinehome-server.info>
Date: Thu, 10 Nov 2011 00:06:43 +0100
Subject: [PATCH 02/14] patch allows nice pad urls server/padname and also the
 old form server/p/padname; first commit to my remote repository

---
 node/server.js    | 41 ++++++++++++++++++++++-------------------
 static/index.html | 32 ++++++++++++++++----------------
 static/pad.html   |  6 +++---
 3 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/node/server.js b/node/server.js
index 2bebe6a24..5ff11ca7e 100644
--- a/node/server.js
+++ b/node/server.js
@@ -196,24 +196,27 @@ async.waterfall([
           res.send(html);
       });
     });
-        
-    //serve pad.html under /p
-    app.get('/p/:pad', function(req, res, next)
+    
+    //serve pad.html under / and /p for compatibility
+    app.get( "(/p)?/:pad", function(req, res, next)
     {    
-      //ensure the padname is valid and the url doesn't end with a /
-      if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
-      {
-        res.send('Such a padname is forbidden', 404);
+      // ensure the padname is valid and the url doesn't end with a /
+      // and that reserved pathnames are served as files, not as pads
+      if( !padManager.isValidPadId(req.params.pad) || /\/+$/.test(req.url)) {
+        res.send('Such a padname is forbidden.', 404);
         return;
+      } else if ( /(favicon\.ico|robots\.txt)/.test(req.url) )
+      {
+        next();
+	return;
       }
-      
       res.header("Server", serverName);
       var filePath = path.normalize(__dirname + "/../static/pad.html");
       res.sendfile(filePath, { maxAge: exports.maxAge });
     });
-    
-    //serve timeslider.html under /p/$padname/timeslider
-    app.get('/p/:pad/timeslider', function(req, res, next)
+        
+    //serve timeslider.html under /$padname/timeslider
+    app.get('/:pad/timeslider', function(req, res, next)
     {
       //ensure the padname is valid and the url doesn't end with a /
       if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
@@ -226,9 +229,9 @@ async.waterfall([
       var filePath = path.normalize(__dirname + "/../static/timeslider.html");
       res.sendfile(filePath, { maxAge: exports.maxAge });
     });
-    
-    //serve timeslider.html under /p/$padname/timeslider
-    app.get('/p/:pad/export/:type', function(req, res, next)
+
+    //serve export files under /$padname/export
+    app.get('/:pad/export/:type', function(req, res, next)
     {
       //ensure the padname is valid and the url doesn't end with a /
       if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
@@ -262,7 +265,7 @@ async.waterfall([
     });
     
     //handle import requests
-    app.post('/p/:pad/import', function(req, res, next)
+    app.post('/:pad/import', function(req, res, next)
     {
       //ensure the padname is valid and the url doesn't end with a /
       if(!padManager.isValidPadId(req.params.pad) || /\/$/.test(req.url))
@@ -341,9 +344,9 @@ async.waterfall([
       var filePath = path.normalize(__dirname + "/../static/index.html");
       res.sendfile(filePath, { maxAge: exports.maxAge });
     });
-    
+	       
     //serve robots.txt
-    app.get('/robots.txt', function(req, res)
+    app.get( /.*\/robots.txt/, function(req, res)
     {
       res.header("Server", serverName);
       var filePath = path.normalize(__dirname + "/../static/robots.txt");
@@ -351,7 +354,7 @@ async.waterfall([
     });
     
     //serve favicon.ico
-    app.get('/favicon.ico', function(req, res)
+    app.get( /.*\/favicon\.ico/, function(req, res)
     {
       res.header("Server", serverName);
       var filePath = path.normalize(__dirname + "/../static/custom/favicon.ico");
@@ -365,7 +368,7 @@ async.waterfall([
         }
       });
     });
-    
+
     //let the server listen
     app.listen(settings.port, settings.ip);
     console.log("Server is listening at " + settings.ip + ":" + settings.port);
diff --git a/static/index.html b/static/index.html
index e995cdb2f..fb53acb20 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <html>   
-        <title>Etherpad Lite</title> 
+        <title>Etherpad</title> 
         <style> 
             *{ margin:0;padding:0; }
             body {
@@ -39,7 +39,7 @@
               text-shadow: 0 -1px 0 rgba(0,0,0,.8);
               height: 70px;
               line-height: 70px;
-              width: 300px;
+              width: 500px;
               background: #555;
               background: -webkit-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
               background: -moz-linear-gradient(#5F5F5F,#565656 50%,#4C4C4C 51%,#373737);
@@ -62,7 +62,7 @@
             #label {
               text-align: left;
               margin: 0 auto;
-              width: 300px
+              width: 500px
             }
             input {
               vertical-align: middle;
@@ -70,7 +70,7 @@
               font-size: 15px
             }
             input[type="text"] {
-              width: 243px;
+              width: 443px; /* 243px */
               padding: 10px 47px 10px 10px;
               background: #fff;
               border: 1px solid #bbb;
@@ -88,29 +88,22 @@
         </style> 
         <link href="static/custom/index.css" rel="stylesheet"> 
         <script src="static/custom/index.js"></script>
-        <div id="container"> 
-            <div id="button" onclick="go2Random()">New Pad</div><br><div id="label">or create/open a Pad with the name</div> 
-            <form action="#" onsubmit="go2Name();return false;"> 
-                    <input type="text" id="padname" autofocus> 
-                    <input type="submit" value="OK"> 
-            </form> 
-        </div> 
-        <script> 
+	<script>
             function go2Name() 
             {
                 var padname = document.getElementById("padname").value;
-                padname.length > 0 ? window.location = "p/" + padname : alert("Please enter a name")
+                padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
             }
  
             function go2Random() 
             {
-                window.location = "p/" + randomPadName();
+                window.location = /** "p/" + **/ randomPadName();
             }
  
             function randomPadName() 
             {
-                var chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-                var string_length = 10;
+                var chars = "23456789ABCDEFGHJKLMNPQRSTUWXYZabcdefghijkmnopqrstuwxyz";
+                var string_length = 16;
                 var randomstring = '';
                 for (var i = 0; i < string_length; i++) 
                 {
@@ -123,4 +116,11 @@
             //start the costum js
             if(typeof costumStart == "function") costumStart();
         </script> 
+        <div id="container"> 
+            <div id="button" onclick="go2Random()" title="open a new pad with a generated random name like 'B3GYd74mn2yBH6'">create new random pad</div><br><div id="label">open an existing pad or create a new pad with the name</div> 
+            <form action="#" onsubmit="go2Name();return false;"> 
+                    <input type="text" id="padname" autofocus> 
+                    <input type="submit" value="OK"> 
+            </form> 
+        </div> 
 </html>
\ No newline at end of file
diff --git a/static/pad.html b/static/pad.html
index 980905e99..d1679202e 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -172,7 +172,7 @@
   <!-- -->
 </div>
 <div id="editorloadingbox">
-  Loading...
+<img alt="Loading..." title="Loading..." src="data:image/x-icon;base64,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">
 </div>
 
 </div>
@@ -266,7 +266,7 @@ Use this link to share a read-only version of your pad:<input id="readonlyInput"
 <div id="connectionbox" class="modaldialog">
 <div id="connectionboxinner" class="modaldialog-inner">
 <div class="connecting">
-	 Connecting...
+         Connecting...
 </div>
 <div class="reconnecting">
 	 Reestablishing connection...
@@ -315,7 +315,7 @@ Use this link to share a read-only version of your pad:<input id="readonlyInput"
 	</div>
 	<div id="reconnect_advise">
 		<p>
-			If this continues to happen, please let us know
+			<!--If this continues to happen, please let us know-->
 		</p>
 	</div>
 	<div id="reconnect_form">

From bda20a38a46ee159d802f3aa9952c85326af84a6 Mon Sep 17 00:00:00 2001
From: Wikinaut <root@s15434088.onlinehome-server.info>
Date: Thu, 10 Nov 2011 22:37:48 +0100
Subject: [PATCH 03/14] patch to allow user-added prefixes and modification to
 random pad names; correctly process uri-encoded  utf-8 characters in pad
 names and page titles

---
 static/favicon.ico     | Bin 1150 -> 1150 bytes
 static/index.html      |  40 +++++++++++++++++++++++++++-------------
 static/js/pad2.js      |   2 +-
 static/timeslider.html |   2 +-
 4 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/static/favicon.ico b/static/favicon.ico
index 2529c923f30e7ad806630c1ec40c4ca9db439d64..a4777862b46721026e1fcddf3c6534cfb3a9e046 100644
GIT binary patch
delta 132
zcmeyz@sDFe9uxon{|x_;@Z?%1LkzLKSj7Hf5wm5+)LYAJD1c->*sjS385<_su{Zz#
D_eM|v

delta 132
zcmeyz@sDFe9uq&qf1dwHcycY1A%@sqEMkALh}kk@>aArq6hJZ`Y}e$2j180RSR4T7
Cj5#;}

diff --git a/static/index.html b/static/index.html
index fb53acb20..3b3944cc2 100644
--- a/static/index.html
+++ b/static/index.html
@@ -89,18 +89,8 @@
         <link href="static/custom/index.css" rel="stylesheet"> 
         <script src="static/custom/index.js"></script>
 	<script>
-            function go2Name() 
-            {
-                var padname = document.getElementById("padname").value;
-                padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
-            }
- 
-            function go2Random() 
-            {
-                window.location = /** "p/" + **/ randomPadName();
-            }
- 
-            function randomPadName() 
+
+	    function randomPadName() 
             {
                 var chars = "23456789ABCDEFGHJKLMNPQRSTUWXYZabcdefghijkmnopqrstuwxyz";
                 var string_length = 16;
@@ -112,7 +102,31 @@
                 }
                 return randomstring;
             }
-            
+
+            function go2Name() 
+            {
+                var padname = document.getElementById("padname").value;
+                padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
+            }
+ 
+            function go2Random() 
+            {
+		var rnd = randomPadName();
+		var prefixedName = prompt( "You can prefix or modify your random pad name with some reasonable characters.\nSpecial characters will be removed or escaped.\n\n", "-"+rnd );
+		if ( prefixedName == "-" + rnd ) prefixedName = rnd;
+		var escPrefixedName = encodeURIComponent( prefixedName.replace( /\//, "" ) );
+		if ( prefixedName == null ) return;
+		if ( prefixedName == decodeURIComponent( escPrefixedName )
+		     || ( prefixedName != escPrefixedName 
+			&& confirm( "You have used characters which are not allowed in Urls, and the padname will therefore be modified to "
+			+ decodeURIComponent( escPrefixedName ) 
+			+ ".\nDo you want to use this modifed name?" ) ) ) {
+			window.location = /** "p/" + **/ escPrefixedName;
+		} else {
+			return;
+		}
+            }
+           
             //start the costum js
             if(typeof costumStart == "function") costumStart();
         </script> 
diff --git a/static/js/pad2.js b/static/js/pad2.js
index 9df57ae8f..ea06d8cfd 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -172,7 +172,7 @@ function handshake()
   socket.once('connect', function()
   {
     var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1);
-    padId = unescape(padId); // unescape neccesary due to Safari and Opera interpretation of spaces
+    padId = decodeURIComponent(padId);
 
     document.title = document.title + " | " + padId;
 
diff --git a/static/timeslider.html b/static/timeslider.html
index 4dbf8d939..73bc5fcd1 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -62,7 +62,7 @@
     
     //get the padId out of the url 
     var urlParts= document.location.pathname.split("/");
-    padId = urlParts[urlParts.length-2];
+    padId = decodeURIComponent( urlParts[urlParts.length-2] );
         
     //set the title
     document.title = document.title + " | " + padId;

From 223016d78da86c2ae4a6f9fd7b0cb565cf1e159f Mon Sep 17 00:00:00 2001
From: Wikinaut <root@s15434088.onlinehome-server.info>
Date: Thu, 10 Nov 2011 22:42:30 +0100
Subject: [PATCH 04/14] Revert "patch to allow user-added prefixes and
 modification to random pad names; correctly process uri-encoded  utf-8
 characters in pad names and page titles"

This reverts commit bda20a38a46ee159d802f3aa9952c85326af84a6.
---
 static/favicon.ico     | Bin 1150 -> 1150 bytes
 static/index.html      |  40 +++++++++++++---------------------------
 static/js/pad2.js      |   2 +-
 static/timeslider.html |   2 +-
 4 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/static/favicon.ico b/static/favicon.ico
index a4777862b46721026e1fcddf3c6534cfb3a9e046..2529c923f30e7ad806630c1ec40c4ca9db439d64 100644
GIT binary patch
delta 132
zcmeyz@sDFe9uq&qf1dwHcycY1A%@sqEMkALh}kk@>aArq6hJZ`Y}e$2j180RSR4T7
Cj5#;}

delta 132
zcmeyz@sDFe9uxon{|x_;@Z?%1LkzLKSj7Hf5wm5+)LYAJD1c->*sjS385<_su{Zz#
D_eM|v

diff --git a/static/index.html b/static/index.html
index 3b3944cc2..fb53acb20 100644
--- a/static/index.html
+++ b/static/index.html
@@ -89,8 +89,18 @@
         <link href="static/custom/index.css" rel="stylesheet"> 
         <script src="static/custom/index.js"></script>
 	<script>
-
-	    function randomPadName() 
+            function go2Name() 
+            {
+                var padname = document.getElementById("padname").value;
+                padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
+            }
+ 
+            function go2Random() 
+            {
+                window.location = /** "p/" + **/ randomPadName();
+            }
+ 
+            function randomPadName() 
             {
                 var chars = "23456789ABCDEFGHJKLMNPQRSTUWXYZabcdefghijkmnopqrstuwxyz";
                 var string_length = 16;
@@ -102,31 +112,7 @@
                 }
                 return randomstring;
             }
-
-            function go2Name() 
-            {
-                var padname = document.getElementById("padname").value;
-                padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
-            }
- 
-            function go2Random() 
-            {
-		var rnd = randomPadName();
-		var prefixedName = prompt( "You can prefix or modify your random pad name with some reasonable characters.\nSpecial characters will be removed or escaped.\n\n", "-"+rnd );
-		if ( prefixedName == "-" + rnd ) prefixedName = rnd;
-		var escPrefixedName = encodeURIComponent( prefixedName.replace( /\//, "" ) );
-		if ( prefixedName == null ) return;
-		if ( prefixedName == decodeURIComponent( escPrefixedName )
-		     || ( prefixedName != escPrefixedName 
-			&& confirm( "You have used characters which are not allowed in Urls, and the padname will therefore be modified to "
-			+ decodeURIComponent( escPrefixedName ) 
-			+ ".\nDo you want to use this modifed name?" ) ) ) {
-			window.location = /** "p/" + **/ escPrefixedName;
-		} else {
-			return;
-		}
-            }
-           
+            
             //start the costum js
             if(typeof costumStart == "function") costumStart();
         </script> 
diff --git a/static/js/pad2.js b/static/js/pad2.js
index ea06d8cfd..9df57ae8f 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -172,7 +172,7 @@ function handshake()
   socket.once('connect', function()
   {
     var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1);
-    padId = decodeURIComponent(padId);
+    padId = unescape(padId); // unescape neccesary due to Safari and Opera interpretation of spaces
 
     document.title = document.title + " | " + padId;
 
diff --git a/static/timeslider.html b/static/timeslider.html
index 73bc5fcd1..4dbf8d939 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -62,7 +62,7 @@
     
     //get the padId out of the url 
     var urlParts= document.location.pathname.split("/");
-    padId = decodeURIComponent( urlParts[urlParts.length-2] );
+    padId = urlParts[urlParts.length-2];
         
     //set the title
     document.title = document.title + " | " + padId;

From 74fdfec1c2e2d4ed2a3df66c97224c06cb397b8a Mon Sep 17 00:00:00 2001
From: Wikinaut <root@s15434088.onlinehome-server.info>
Date: Thu, 10 Nov 2011 22:48:20 +0100
Subject: [PATCH 05/14] removing my favicon from master

---
 static/favicon.ico | Bin 1150 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 static/favicon.ico

diff --git a/static/favicon.ico b/static/favicon.ico
deleted file mode 100644
index 2529c923f30e7ad806630c1ec40c4ca9db439d64..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1150
zcmc)J&q@MO6vy$S1hx=!5ki9KvS?#%+GrSr&;ukPRNI#A16OVW-ABDZi(Vj6(kE!u
zDk!3;Aczo+Bx?E|?p(O&6ye4rAJ6^cZ^ju%kr1zVTzJpO-jql}MCQQ~D`uVcTWzuN
zjV9Wt;0ztux?*tZPr`H$m$-oDyKw72`Me((H?QA8jhio#P5+T^v$um=4A8?JmZ0Z-
zgzo9>&cUrkCRrp=7!qT?=BzQCXsvK|y&mg;@q$064V4%5#AWXPC!Z=~7aLf|14hfu
z>e%Gp>C0F}1VwzHfn%g#Dmbslxxo|Wp!rv9LyvI}Q^9%tZD*0e3^f0YB&v9Uso=c5
yciQ#;qu0^L7p}1hQ=@siGm(CHByxTN+oyRDxC*QOCelK4U!=|x-9nAA-Twi9>5l{e


From bfafed3ef22799768251b0d2d130742c66429b32 Mon Sep 17 00:00:00 2001
From: Wikinaut <root@s15434088.onlinehome-server.info>
Date: Mon, 14 Nov 2011 00:26:46 +0100
Subject: [PATCH 06/14] index.html

---
 static/index.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/static/index.html b/static/index.html
index 82cbc9e63..0d200688d 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <html>   
-        <title>Etherpad</title> 
+        <title>Etherpad Lite</title> 
         <style> 
             *{ margin:0;padding:0; }
             body {
@@ -70,7 +70,7 @@
               font-size: 15px
             }
             input[type="text"] {
-              width: 443px; /* 243px */
+              width: 443px;
               padding: 10px 47px 10px 10px;
               background: #fff;
               border: 1px solid #bbb;
@@ -86,9 +86,17 @@
             input[type="submit"]::-moz-focus-inner { border: 0 }
             @-moz-document url-prefix() { input[type="submit"] { padding: 7px } }
         </style> 
+        <body onload="document.mainform.padname.focus();">
         <link href="static/custom/index.css" rel="stylesheet"> 
         <script src="static/custom/index.js"></script>
-	<script>
+        <div id="container"> 
+            <div id="button" onclick="go2Random()">New Pad</div><br><div id="label">or create/open a Pad with the name</div> 
+            <form action="#" name="mainform" onsubmit="go2Name();return false;"> 
+                    <input type="text" name="padname" id="padname" autofocus> 
+                    <input type="submit" value="OK"> 
+            </form> 
+        </div> 
+        <script> 
 	function go2Name() 
             {
                 var padname = document.getElementById("padname").value;
@@ -116,13 +124,5 @@
             //start the costum js
             if(typeof costumStart == "function") costumStart();
         </script> 
-<body onload= "document.mainform.padname.focus();" >
-        <div id="container"> 
-            <div id="button" onclick="go2Random()" title="open a new pad with a generated random name like 'B3GYd74mn2yBH6'">create new random pad</div><br><div id="label">open an existing pad or create a new pad with the name</div> 
-            <form action="#" name="mainform" onsubmit="go2Name();return false;"> 
-                    <input type="text" name="padname" id="padname" autofocus> 
-                    <input type="submit" value="OK"> 
-            </form> 
-        </div> 
 </body>
 </html>
\ No newline at end of file

From b3c75a619d8061e91ef765b25cacdf0e91455ca8 Mon Sep 17 00:00:00 2001
From: Wikinaut <root@s15434088.onlinehome-server.info>
Date: Mon, 14 Nov 2011 00:29:51 +0100
Subject: [PATCH 07/14] index.html title -lite

---
 static/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/index.html b/static/index.html
index 0d200688d..f45d75967 100644
--- a/static/index.html
+++ b/static/index.html
@@ -1,6 +1,6 @@
 <!doctype html>
 <html>   
-        <title>Etherpad Lite</title> 
+        <title>Etherpad</title> 
         <style> 
             *{ margin:0;padding:0; }
             body {

From 4e104e8c83a9225a125e603d995f98841708b662 Mon Sep 17 00:00:00 2001
From: Wikinaut <mail@tgries.de>
Date: Mon, 14 Nov 2011 08:51:37 +0100
Subject: [PATCH 08/14] changing index.html to prompt user to allow to change
 the random padname, for example to add a reasonable prefix

---
 static/index.html      | 39 ++++++++++++++++++++++++++-------------
 static/pad.html        |  2 +-
 static/timeslider.html |  2 +-
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/static/index.html b/static/index.html
index f45d75967..822a6ad8a 100644
--- a/static/index.html
+++ b/static/index.html
@@ -90,25 +90,14 @@
         <link href="static/custom/index.css" rel="stylesheet"> 
         <script src="static/custom/index.js"></script>
         <div id="container"> 
-            <div id="button" onclick="go2Random()">New Pad</div><br><div id="label">or create/open a Pad with the name</div> 
+            <div id="button" onclick="go2Random()" title="open a new pad with a generated random name like 'B3GYd74mn2yBH6'">create new random pad</div><br><div id="label">open an existing pad or create a new pad with the name</div> 
             <form action="#" name="mainform" onsubmit="go2Name();return false;"> 
                     <input type="text" name="padname" id="padname" autofocus> 
                     <input type="submit" value="OK"> 
             </form> 
         </div> 
         <script> 
-	function go2Name() 
-            {
-                var padname = document.getElementById("padname").value;
-                padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
-            }
- 
-            function go2Random() 
-            {
-                window.location = /** "p/" + **/ randomPadName();
-            }
- 
-            function randomPadName() 
+	    function randomPadName() 
             {
                 var chars = "23456789ABCDEFGHJKLMNPQRSTUWXYZabcdefghijkmnopqrstuwxyz";
                 var string_length = 16;
@@ -120,6 +109,30 @@
                 }
                 return randomstring;
             }
+
+            function go2Name() 
+            {
+                var padname = document.getElementById("padname").value;
+                padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
+            }
+ 
+            function go2Random() 
+            {
+		var rnd = randomPadName();
+		var prefixedName = prompt( "You can prefix or modify your random pad name with some reasonable characters.\nSpecial characters will be removed or escaped.\n\n", "-"+rnd );
+		if ( prefixedName == "-" + rnd ) prefixedName = rnd;
+		var escPrefixedName = encodeURIComponent( prefixedName.replace( /\//, "" ) );
+		if ( prefixedName == null ) return;
+		if ( prefixedName == decodeURIComponent( escPrefixedName )
+		     || ( prefixedName != escPrefixedName 
+			&& confirm( "You have used characters which are not allowed in Urls, and the padname will therefore be modified to "
+			+ decodeURIComponent( escPrefixedName ) 
+			+ ".\nDo you want to use this modifed name?" ) ) ) {
+			window.location = /** "p/" + **/ escPrefixedName;
+		} else {
+			return;
+		}
+            }
             
             //start the costum js
             if(typeof costumStart == "function") costumStart();
diff --git a/static/pad.html b/static/pad.html
index d1679202e..16f0f1ea8 100644
--- a/static/pad.html
+++ b/static/pad.html
@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8">
   <meta name="robots" content="noindex, nofollow">
-  <title>Etherpad Lite</title>
+  <title>Etherpad</title>
   <!-- CSS -->
   <link href="../static/css/pad.css" rel="stylesheet">
   <!-- javascript -->
diff --git a/static/timeslider.html b/static/timeslider.html
index 4dbf8d939..48572d422 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -4,7 +4,7 @@
   <meta charset="utf-8">
   <meta name="robots" content="noindex, nofollow">
 
-  <title>Etherpad Lite Timeslider</title>
+  <title>Etherpad Timeslider</title>
   <link rel="stylesheet" href="../../static/css/pad.css">
   <link rel="stylesheet" href="../../static/css/timeslider.css">
   <style type="text/css" title="dynamicsyntax"></style>

From 5ea8dd6b7005c69cda8824197e8ec849e559207a Mon Sep 17 00:00:00 2001
From: Wikinaut <mail@tgries.de>
Date: Mon, 14 Nov 2011 09:00:18 +0100
Subject: [PATCH 09/14] correcting the uri decoding, so that also non-ASCII
 characters are correctly shown in hml page titles

---
 static/js/pad2.js      | 2 +-
 static/timeslider.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/pad2.js b/static/js/pad2.js
index 9df57ae8f..28a9ac14c 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -172,7 +172,7 @@ function handshake()
   socket.once('connect', function()
   {
     var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1);
-    padId = unescape(padId); // unescape neccesary due to Safari and Opera interpretation of spaces
+    padId = decodeURIComponent(padId); // unescape neccesary due to Safari and Opera interpretation of spaces
 
     document.title = document.title + " | " + padId;
 
diff --git a/static/timeslider.html b/static/timeslider.html
index 48572d422..f95b33a67 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -62,7 +62,7 @@
     
     //get the padId out of the url 
     var urlParts= document.location.pathname.split("/");
-    padId = urlParts[urlParts.length-2];
+    padId = decodeURIComponent(urlParts[urlParts.length-2]);
         
     //set the title
     document.title = document.title + " | " + padId;

From dc2aafa0625ffb042a9ecbac8c6330e8e9e6b52e Mon Sep 17 00:00:00 2001
From: Wikinaut <mail@tgries.de>
Date: Mon, 14 Nov 2011 20:32:27 +0100
Subject: [PATCH 10/14] changing spaces or slashes in padnames to underscores

---
 static/index.html | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/static/index.html b/static/index.html
index 822a6ad8a..3159288ee 100644
--- a/static/index.html
+++ b/static/index.html
@@ -96,7 +96,10 @@
                     <input type="submit" value="OK"> 
             </form> 
         </div> 
-        <script> 
+        <script>
+	    // var pathName = "p/";
+	    var pathName = "";
+	    
 	    function randomPadName() 
             {
                 var chars = "23456789ABCDEFGHJKLMNPQRSTUWXYZabcdefghijkmnopqrstuwxyz";
@@ -110,10 +113,14 @@
                 return randomstring;
             }
 
+	    function encodeSanitizedName( name ) {
+		return encodeURIComponent( name.replace( /[\/ ]/g, "_") );
+	    }
+	    
             function go2Name() 
             {
                 var padname = document.getElementById("padname").value;
-                padname.length > 0 ? window.location = /** "p/" + **/ padname : alert("Please enter a name")
+                padname.length > 0 ? window.location = pathName + encodeSanitizedName( padname ) : alert("Please enter a name")
             }
  
             function go2Random() 
@@ -121,14 +128,14 @@
 		var rnd = randomPadName();
 		var prefixedName = prompt( "You can prefix or modify your random pad name with some reasonable characters.\nSpecial characters will be removed or escaped.\n\n", "-"+rnd );
 		if ( prefixedName == "-" + rnd ) prefixedName = rnd;
-		var escPrefixedName = encodeURIComponent( prefixedName.replace( /\//, "" ) );
+		var escPrefixedName = encodeSanitizedName( prefixedName );
 		if ( prefixedName == null ) return;
 		if ( prefixedName == decodeURIComponent( escPrefixedName )
 		     || ( prefixedName != escPrefixedName 
 			&& confirm( "You have used characters which are not allowed in Urls, and the padname will therefore be modified to "
 			+ decodeURIComponent( escPrefixedName ) 
 			+ ".\nDo you want to use this modifed name?" ) ) ) {
-			window.location = /** "p/" + **/ escPrefixedName;
+			window.location = pathName + escPrefixedName;
 		} else {
 			return;
 		}

From 0a795724c8008624db3790c6399db00846608342 Mon Sep 17 00:00:00 2001
From: Wikinaut <mail@tgries.de>
Date: Wed, 16 Nov 2011 23:20:23 +0100
Subject: [PATCH 11/14] my changes in pad2.js

---
 static/js/pad2.js | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/static/js/pad2.js b/static/js/pad2.js
index 28a9ac14c..e59ba7033 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -79,12 +79,13 @@ function randomString()
 
 function getParams()
 {
-  var showControls = getUrlVars()["showControls"];
-  var showChat = getUrlVars()["showChat"];
-  var userName = unescape(getUrlVars()["userName"]);
-  var showLineNumbers = getUrlVars()["showLineNumbers"];
-  var useMonospaceFont = getUrlVars()["useMonospaceFont"];
-  var IsnoColors = getUrlVars()["noColors"];
+var params = getUrlVars()
+var showControls = params["showControls"];
+var showChat = params["showChat"];
+var userName = params["userName"];
+var showLineNumbers = params["showLineNumbers"];
+var useMonospaceFont = params["useMonospaceFont"];
+var IsnoColors = params["noColors"];
 
   if(IsnoColors)
   {
@@ -130,7 +131,7 @@ function getParams()
   if(userName)
   {
     // If the username is set as a parameter we should set a global value that we can call once we have initiated the pad.
-    globalUserName = userName;
+    globalUserName = unescape( userName );
   }
 }
 

From 0d760f0dbb83839cca2a0435504580855dc40199 Mon Sep 17 00:00:00 2001
From: Wikinaut <mail@tgries.de>
Date: Wed, 16 Nov 2011 23:31:20 +0100
Subject: [PATCH 12/14] replace underscores back to spaces in page titles

---
 static/js/pad2.js      | 2 +-
 static/timeslider.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/pad2.js b/static/js/pad2.js
index 977c56328..fca3f6009 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -175,7 +175,7 @@ function handshake()
     var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1);
     padId = decodeURIComponent(padId); // unescape neccesary due to Safari and Opera interpretation of spaces
 
-    document.title = document.title + " | " + padId;
+    document.title = document.title + " | " + padId.replace( /_/g, " " );
 
     var token = readCookie("token");
     if (token == null)
diff --git a/static/timeslider.html b/static/timeslider.html
index f95b33a67..f64cf3cac 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -65,7 +65,7 @@
     padId = decodeURIComponent(urlParts[urlParts.length-2]);
         
     //set the title
-    document.title = document.title + " | " + padId;
+    document.title = document.title + " | " + padId.replace( /_/g, " ");
         
     //ensure we have a token
     token = readCookie("token");

From 0fc72bc7e72362bed3adc8e2326246564ac09416 Mon Sep 17 00:00:00 2001
From: Wikinaut <mail@tgries.de>
Date: Fri, 18 Nov 2011 07:43:51 +0100
Subject: [PATCH 13/14] auto-open on chat icon; auto-focus on chat input; fix
 for https://github.com/Pita/etherpad-lite/issues/208

---
 static/js/chat.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/static/js/chat.js b/static/js/chat.js
index c3eddacb2..32e679273 100644
--- a/static/js/chat.js
+++ b/static/js/chat.js
@@ -18,7 +18,7 @@ var chat = (function()
 {
   var self = {
     show: function () 
-    {      
+    {
       $("#chaticon").hide("slide", {
         direction: "down"
       }, 500, function ()
@@ -55,9 +55,10 @@ var chat = (function()
     scrollDown: function()
     {
       //console.log($('#chatbox').css("display"));
-    
-      if($('#chatbox').css("display") != "none")
+      if($('#chatbox').css("display") != "none") {
         $('#chattext').animate({scrollTop: $('#chattext')[0].scrollHeight}, "slow");
+        $("#chatinput").focus();
+      }
     }, 
     send: function()
     {
@@ -98,7 +99,7 @@ var chat = (function()
         var count = Number($("#chatcounter").text());
         count++;
         $("#chatcounter").text(count);
-        // chat throb stuff -- Just make it throb in for ~2 secs then fadeotu
+        // chat throb stuff -- Just make it throb in for ~2 secs then fadeout
         $('#chatthrob').html("<b>"+authorName+"</b>" + ": " + text);
         $('#chatthrob').effect("pulsate", {times:1,mode:"hide"},2000);
       }
@@ -108,6 +109,13 @@ var chat = (function()
     },
     init: function()
     {
+      $("#chaticon").mouseenter(function(){
+        self.show();
+      });
+      $("#chatbox").mouseenter(function(evt){
+        if ( !$("#chatinput").is(":focus") ) $("#chatinput").focus();
+      });
+      
       $("#chatinput").keypress(function(evt)
       {
         //if the user typed enter, fire the send

From a6711403784c424537b8e7d534307f9398391665 Mon Sep 17 00:00:00 2001
From: Wikinaut <mail@tgries.de>
Date: Sat, 19 Nov 2011 10:40:57 +0100
Subject: [PATCH 14/14] changing layout of page titles. padname, then '|
 Etherpad' string in the document.title

---
 static/js/pad2.js      | 2 +-
 static/timeslider.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/static/js/pad2.js b/static/js/pad2.js
index fca3f6009..c4853c734 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -175,7 +175,7 @@ function handshake()
     var padId = document.location.pathname.substring(document.location.pathname.lastIndexOf("/") + 1);
     padId = decodeURIComponent(padId); // unescape neccesary due to Safari and Opera interpretation of spaces
 
-    document.title = document.title + " | " + padId.replace( /_/g, " " );
+    document.title = padId.replace( /_/g, " ") + " | " + document.title;
 
     var token = readCookie("token");
     if (token == null)
diff --git a/static/timeslider.html b/static/timeslider.html
index f64cf3cac..fddfb58ef 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -65,7 +65,7 @@
     padId = decodeURIComponent(urlParts[urlParts.length-2]);
         
     //set the title
-    document.title = document.title + " | " + padId.replace( /_/g, " ");
+    document.title = padId.replace( /_/g, " ") + " | " + document.title;
         
     //ensure we have a token
     token = readCookie("token");