From 9cbb897c45ced7c8affce33a72057ea6bcbab80e Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Mon, 16 Apr 2012 15:13:07 +0200
Subject: [PATCH 1/3] template/pad.html removed some whitespace

---
 src/templates/pad.html | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 91583b36..08e34fa2 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -58,7 +58,7 @@
 			<a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a>
 		    </li>
 		<% e.end_block(); %>
-            </ul>    
+            </ul>
             <ul class="menu_right">
 	        <% e.begin_block("editbarMenuRight"); %>
                     <li onClick="window.pad&amp;&amp;pad.editbarClick('savedRevision');return false;">
@@ -95,17 +95,17 @@
                     <button id="mycolorpickersave">Save</button>
                     <button id="mycolorpickercancel">Cancel</button>
                     <span id="mycolorpickerpreview" class="myswatchboxhoverable"></span>
-                </div>   
+                </div>
                 <div id="myswatchbox"><div id="myswatch"></div></div>
                 <div id="myusernameform"><input type="text" id="myusernameedit" disabled="disabled"></div>
-                <div id="mystatusform"><input type="text" id="mystatusedit" disabled="disabled"></div>   
+                <div id="mystatusform"><input type="text" id="mystatusedit" disabled="disabled"></div>
             </div>
             <div id="otherusers">
                 <div id="guestprompts"></div>
                 <table id="otheruserstable" cellspacing="0" cellpadding="0" border="0">
                     <tr><td></td></tr>
                 </table>
-                <div id="nootherusers"></div>       
+                <div id="nootherusers"></div>
             </div>
             <div id="userlistbuttonarea"></div>
         </div>
@@ -150,20 +150,20 @@
             <div class="column">
                 <h2>Import from text file, HTML, PDF, Word, ODT or RTF</h2><br>
                 <form id="importform" method="post" action="" target="importiframe" enctype="multipart/form-data">
-                    <div class="importformdiv" id="importformfilediv"> 
-                        <input type="file" name="file" size="15" id="importfileinput"> 
-                        <div class="importmessage" id="importmessagefail"></div> 
-                    </div> 
+                    <div class="importformdiv" id="importformfilediv">
+                        <input type="file" name="file" size="15" id="importfileinput">
+                        <div class="importmessage" id="importmessagefail"></div>
+                    </div>
                     <div id="import"></div>
-                    <div class="importmessage" id="importmessagesuccess">Successful!</div> 
-                    <div class="importformdiv" id="importformsubmitdiv"> 
-                        <input type="hidden" name="padId" value="blpmaXT35R"> 
-                        <span class="nowrap"> 
-                            <input type="submit" name="submit" value="Import Now" disabled="disabled" id="importsubmitinput"> 
-                            <img alt="" id="importstatusball" src="../static/img/loading.gif" align="top"> 
-                            <img alt="" id="importarrow" src="../static/img/leftarrow.png" align="top"> 
-                        </span> 
-                    </div> 
+                    <div class="importmessage" id="importmessagesuccess">Successful!</div>
+                    <div class="importformdiv" id="importformsubmitdiv">
+                        <input type="hidden" name="padId" value="blpmaXT35R">
+                        <span class="nowrap">
+                            <input type="submit" name="submit" value="Import Now" disabled="disabled" id="importsubmitinput">
+                            <img alt="" id="importstatusball" src="../static/img/loading.gif" align="top">
+                            <img alt="" id="importarrow" src="../static/img/leftarrow.png" align="top">
+                        </span>
+                    </div>
                 </form>
             </div>
             <div class="column">
@@ -223,7 +223,7 @@
         <div id="modaloverlay">
             <div id="modaloverlay-inner"></div>
         </div>
-        
+
         <div id="mainmodals">
             <% e.begin_block("modals"); %>
                 <div id="connectionbox" class="modaldialog">
@@ -271,7 +271,7 @@
                 </div>
             <% e.end_block(); %>
         </div>
- 
+
         <% e.begin_block("scripts"); %>
             <script type="text/javascript" src="../static/js/require-kernel.js"></script>
             <script type="text/javascript" src="../static/js/jquery.js"></script>

From 3e4730058785209e0ca863b37dddcbbf9f2ce103 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Mon, 16 Apr 2012 15:19:53 +0200
Subject: [PATCH 2/3] template/pad.html removed id duplicates, moved revision
 button, converted TABS to spaces

---
 src/templates/pad.html | 252 ++++++++++++++++++++---------------------
 1 file changed, 125 insertions(+), 127 deletions(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 08e34fa2..6181b062 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -11,79 +11,77 @@
         <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=0">
 
         <% e.begin_block("styles"); %>
-            <link href="../static/css/pad.css" rel="stylesheet">
-            <link href="../static/custom/pad.css" rel="stylesheet">
-            <style title="dynamicsyntax"></style>
+        <link href="../static/css/pad.css" rel="stylesheet">
+        <link href="../static/custom/pad.css" rel="stylesheet">
+        <style title="dynamicsyntax"></style>
         <% e.end_block(); %>
 
         <!-- head and body had been removed intentionally -->
 
         <div id="editbar" class="toolbar">
             <ul class="menu_left">
-	        <% e.begin_block("editbarMenuLeft"); %>
-		    <li id="bold" onClick="window.pad&amp;&amp;pad.editbarClick('bold');return false">
-			<a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a>
-		    </li>
-		    <li id="italic" onClick="window.pad&amp;&amp;pad.editbarClick('italic'); return false;">
-			<a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a>
-		    </li>
-		    <li id="underline" onClick="window.pad&amp;&amp;pad.editbarClick('underline');return false;" >
-			<a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a>
-		    </li>
-		    <li id="strikethrough" onClick="window.pad&amp;&amp;pad.editbarClick('strikethrough');return false;">
-			<a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a>
-		    </li>
-		    <li class="separator"></li>
-		    <li id="oderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertorderedlist');return false;">
-			<a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a>
-		    </li>
-		    <li id="unoderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertunorderedlist');return false;">
-			<a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a>
-		    </li>
-		    <li id="indent" onClick="window.pad&amp;&amp;pad.editbarClick('indent');return false;">
-			<a class="buttonicon buttonicon-indent" title="Indent"></a>
-		    </li>
-		    <li id="outdent" onClick="window.pad&amp;&amp;pad.editbarClick('outdent');return false;">
-			<a class="buttonicon buttonicon-outdent" title="Unindent"></a>
-		    </li>
-		    <li class="separator"></li>
-		    <li id="undo" onClick="window.pad&amp;&amp;pad.editbarClick('undo');return false;">
-			<a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a>
-		    </li>
-		    <li id="redo" onClick="window.pad&amp;&amp;pad.editbarClick('redo');return false;">
-			<a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a>
-		    </li>
-		    <li class="separator"></li>
-		    <li id="clearAuthorship" onClick="window.pad&amp;&amp;pad.editbarClick('clearauthorship');return false;">
-			<a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a>
-		    </li>
-		<% e.end_block(); %>
+                <% e.begin_block("editbarMenuLeft"); %>
+                <li id="bold" onClick="window.pad&amp;&amp;pad.editbarClick('bold');return false">
+                    <a class="buttonicon buttonicon-bold" title="Bold (ctrl-B)"></a>
+                </li>
+                <li id="italic" onClick="window.pad&amp;&amp;pad.editbarClick('italic'); return false;">
+                    <a class="buttonicon buttonicon-italic" title="Italics (ctrl-I)"></a>
+                </li>
+                <li id="underline" onClick="window.pad&amp;&amp;pad.editbarClick('underline');return false;" >
+                    <a class="buttonicon buttonicon-underline" title="Underline (ctrl-U)"></a>
+                </li>
+                <li id="strikethrough" onClick="window.pad&amp;&amp;pad.editbarClick('strikethrough');return false;">
+                    <a class="buttonicon buttonicon-strikethrough" title="Strikethrough"></a>
+                </li>
+                <li class="separator"></li>
+                <li id="oderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertorderedlist');return false;">
+                    <a class="buttonicon buttonicon-insertorderedlist" title="Toggle Ordered List"></a>
+                </li>
+                <li id="unoderedlist" onClick="window.pad&amp;&amp;pad.editbarClick('insertunorderedlist');return false;">
+                    <a class="buttonicon buttonicon-insertunorderedlist" title="Toggle Bullet List"></a>
+                </li>
+                <li id="indent" onClick="window.pad&amp;&amp;pad.editbarClick('indent');return false;">
+                    <a class="buttonicon buttonicon-indent" title="Indent"></a>
+                </li>
+                <li id="outdent" onClick="window.pad&amp;&amp;pad.editbarClick('outdent');return false;">
+                    <a class="buttonicon buttonicon-outdent" title="Unindent"></a>
+                </li>
+                <li class="separator"></li>
+                <li id="undo" onClick="window.pad&amp;&amp;pad.editbarClick('undo');return false;">
+                    <a class="buttonicon buttonicon-undo" title="Undo (ctrl-Z)"></a>
+                </li>
+                <li id="redo" onClick="window.pad&amp;&amp;pad.editbarClick('redo');return false;">
+                    <a class="buttonicon buttonicon-redo" title="Redo (ctrl-Y)"></a>
+                </li>
+                <li class="separator"></li>
+                <li id="clearAuthorship" onClick="window.pad&amp;&amp;pad.editbarClick('clearauthorship');return false;">
+                    <a class="buttonicon buttonicon-clearauthorship" title="Clear Authorship Colors"></a>
+                </li>
+                <% e.end_block(); %>
             </ul>
             <ul class="menu_right">
-	        <% e.begin_block("editbarMenuRight"); %>
-                    <li onClick="window.pad&amp;&amp;pad.editbarClick('savedRevision');return false;">
-                        <a id="settingslink" title="Mark this revision as a saved revision">
-                            <div class="buttonicon buttonicon-savedRevision"></div>
-                        </a>
-                    </li>
-		    <li id="settingslink" onClick="window.pad&amp;&amp;pad.editbarClick('settings');return false;">
-			<a class="buttonicon buttonicon-settings" id="settingslink" title="Settings of this pad"></a>
-		    </li>
-		    <li id="importexportlink" onClick="window.pad&amp;&amp;pad.editbarClick('import_export');return false;">
-			<a class="buttonicon buttonicon-import_export" id="exportlink" title="Import/Export from/to different document formats"></a>
-		    </li>
-		    <li id="embedlink" onClick="window.pad&amp;&amp;pad.editbarClick('embed');return false;" >
-			<a class="buttonicon buttonicon-embed" id="embedlink" title="Share and Embed this pad"></a>
-		    </li>
-		    <li class="separator"></li>
-		    <li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'">
-			<a class="buttonicon buttonicon-history" title="Show the history of this pad"></a>
-		    </li>
-		    <li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" title="Show connected users">
-			<span class="buttonicon buttonicon-showusers" id="usericonback"></span>
-			<span id="online_count">1</span>
-		    </li>
-		<% e.end_block(); %>
+                <% e.begin_block("editbarMenuRight"); %>
+                <li id="settingslink" onClick="window.pad&amp;&amp;pad.editbarClick('settings');return false;">
+                    <a class="buttonicon buttonicon-settings" title="Settings of this pad"></a>
+                </li>
+                <li id="importexportlink" onClick="window.pad&amp;&amp;pad.editbarClick('import_export');return false;">
+                    <a class="buttonicon buttonicon-import_export" title="Import/Export from/to different document formats"></a>
+                </li>
+                <li id="embedlink" onClick="window.pad&amp;&amp;pad.editbarClick('embed');return false;">
+                    <a class="buttonicon buttonicon-embed" title="Share and Embed this pad"></a>
+                </li>
+                <li id="revisionlink" onClick="window.pad&amp;&amp;pad.editbarClick('savedRevision');return false;">
+                    <a class="buttonicon buttonicon-savedRevision" title="Mark this revision as a saved revision"></a>
+                </li>
+                <li class="separator"></li>
+                <li id="timesliderlink" onClick="document.location = document.location.pathname+ '/timeslider'">
+                    <a class="buttonicon buttonicon-history" title="Show the history of this pad"></a>
+                </li>
+                <li id="usericon" onClick="window.pad&amp;&amp;pad.editbarClick('showusers');return false;" title="Show connected users">
+                <span class="buttonicon buttonicon-showusers" id="usericonback"></span>
+                <span id="online_count">1</span>
+                </li>
+                <% e.end_block(); %>
             </ul>
         </div>
 
@@ -226,76 +224,76 @@
 
         <div id="mainmodals">
             <% e.begin_block("modals"); %>
-                <div id="connectionbox" class="modaldialog">
-                    <div id="connectionboxinner" class="modaldialog-inner">
-                        <div class="connecting">Connecting...</div>
-                        <div class="reconnecting">Reestablishing connection...</div>
-                        <div class="disconnected">
-                            <h2 class="h2_disconnect">Disconnected.</h2>
-                            <h2 class="h2_userdup">Opened in another window.</h2>
-                            <h2 class="h2_unauth">No Authorization.</h2>
-                            <div id="disconnected_looping">
-                                <p><b>We're having trouble talking to the EtherPad lite synchronization server.</b> You may be connecting through an incompatible firewall or proxy server.</p>
-                            </div>
-                            <div id="disconnected_initsocketfail">
-                                <p><b>We were unable to connect to the EtherPad lite synchronization server.</b> This may be due to an incompatibility with your web browser or internet connection.</p>
-                            </div>
-                            <div id="disconnected_userdup">
-                                <p><b>You seem to have opened this pad in another browser window.</b> If you'd like to use this window instead, you can reconnect.</p>
-                            </div>
-                            <div id="disconnected_unknown">
-                                <p><b>Lost connection with the EtherPad lite synchronization server.</b> This may be due to a loss of network connectivity.</p>
-                            </div>
-                            <div id="disconnected_slowcommit">
-                                <p><b>Server not responding.</b> This may be due to network connectivity issues or high load on the server.</p>
-                            </div>
-                            <div id="disconnected_unauth">
-                                <p>Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.</p>
-                            </div>
-                            <div id="disconnected_deleted">
-                                <p>This pad was deleted.</p>
-                            </div>
-                            <div id="reconnect_advise">
-                                <p>If this continues to happen, please let us know</p>
-                            </div>
-                            <div id="reconnect_form">
-                                <button id="forcereconnect">Reconnect Now</button>
-                            </div>
+            <div id="connectionbox" class="modaldialog">
+                <div id="connectionboxinner" class="modaldialog-inner">
+                    <div class="connecting">Connecting...</div>
+                    <div class="reconnecting">Reestablishing connection...</div>
+                    <div class="disconnected">
+                        <h2 class="h2_disconnect">Disconnected.</h2>
+                        <h2 class="h2_userdup">Opened in another window.</h2>
+                        <h2 class="h2_unauth">No Authorization.</h2>
+                        <div id="disconnected_looping">
+                            <p><b>We're having trouble talking to the EtherPad lite synchronization server.</b> You may be connecting through an incompatible firewall or proxy server.</p>
+                        </div>
+                        <div id="disconnected_initsocketfail">
+                            <p><b>We were unable to connect to the EtherPad lite synchronization server.</b> This may be due to an incompatibility with your web browser or internet connection.</p>
+                        </div>
+                        <div id="disconnected_userdup">
+                            <p><b>You seem to have opened this pad in another browser window.</b> If you'd like to use this window instead, you can reconnect.</p>
+                        </div>
+                        <div id="disconnected_unknown">
+                            <p><b>Lost connection with the EtherPad lite synchronization server.</b> This may be due to a loss of network connectivity.</p>
+                        </div>
+                        <div id="disconnected_slowcommit">
+                            <p><b>Server not responding.</b> This may be due to network connectivity issues or high load on the server.</p>
+                        </div>
+                        <div id="disconnected_unauth">
+                            <p>Your browser's credentials or permissions have changed while viewing this pad. Try reconnecting.</p>
+                        </div>
+                        <div id="disconnected_deleted">
+                            <p>This pad was deleted.</p>
+                        </div>
+                        <div id="reconnect_advise">
+                            <p>If this continues to happen, please let us know</p>
+                        </div>
+                        <div id="reconnect_form">
+                            <button id="forcereconnect">Reconnect Now</button>
                         </div>
                     </div>
-                    <form id="reconnectform" method="post" action="/ep/pad/reconnect" accept-charset="UTF-8" style="display: none;">
-                        <input type="hidden" class="padId" name="padId">
-                        <input type="hidden" class="diagnosticInfo" name="diagnosticInfo">
-                        <input type="hidden" class="missedChanges" name="missedChanges">
-                    </form>
                 </div>
+                <form id="reconnectform" method="post" action="/ep/pad/reconnect" accept-charset="UTF-8" style="display: none;">
+                    <input type="hidden" class="padId" name="padId">
+                    <input type="hidden" class="diagnosticInfo" name="diagnosticInfo">
+                    <input type="hidden" class="missedChanges" name="missedChanges">
+                </form>
+            </div>
             <% e.end_block(); %>
         </div>
 
         <% e.begin_block("scripts"); %>
-            <script type="text/javascript" src="../static/js/require-kernel.js"></script>
-            <script type="text/javascript" src="../static/js/jquery.js"></script>
-            <script type="text/javascript" src="../socket.io/socket.io.js"></script>
-            <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
-            <script type="text/javascript">
-                document.domain = document.domain;
-                var clientVars = {};
-                (function () {
-                  require.setRootURI("../javascripts/src");
-                  require.setLibraryURI("../javascripts/lib");
-                  require.setGlobalKeyPath("require");
+        <script type="text/javascript" src="../static/js/require-kernel.js"></script>
+        <script type="text/javascript" src="../static/js/jquery.js"></script>
+        <script type="text/javascript" src="../socket.io/socket.io.js"></script>
+        <script type="text/javascript" src="../javascripts/lib/ep_etherpad-lite/static/js/pad.js?callback=require.define"></script>
+        <script type="text/javascript">
+            document.domain = document.domain;
+            var clientVars = {};
+            (function () {
+              require.setRootURI("../javascripts/src");
+              require.setLibraryURI("../javascripts/lib");
+              require.setGlobalKeyPath("require");
 
-                  var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
-                  plugins.update(function () {
-                    require('ep_etherpad-lite/static/js/pad').init();
-                  });
+              var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins');
+              plugins.update(function () {
+                require('ep_etherpad-lite/static/js/pad').init();
+              });
 
-                  /* TODO: These globals shouldn't exist. */
-                  pad = require('ep_etherpad-lite/static/js/pad').pad;
-                  chat = require('ep_etherpad-lite/static/js/chat').chat;
-                  padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
-                  padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
-                }());
-            </script>
+              /* TODO: These globals shouldn't exist. */
+              pad = require('ep_etherpad-lite/static/js/pad').pad;
+              chat = require('ep_etherpad-lite/static/js/chat').chat;
+              padeditbar = require('ep_etherpad-lite/static/js/pad_editbar').padeditbar;
+              padimpexp = require('ep_etherpad-lite/static/js/pad_impexp').padimpexp;
+            }());
+        </script>
         <% e.end_block(); %>
 </html>

From d75aeeaf8f6d66a8d539956e0ecfe52fc36cb205 Mon Sep 17 00:00:00 2001
From: 0ip <me@factor.cc>
Date: Mon, 16 Apr 2012 15:23:19 +0200
Subject: [PATCH 3/3] pad_editbar adapated hacky highlighting of currently
 opened module to recent changes

---
 src/static/js/pad_editbar.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/static/js/pad_editbar.js b/src/static/js/pad_editbar.js
index 95d19505..dec32b46 100644
--- a/src/static/js/pad_editbar.js
+++ b/src/static/js/pad_editbar.js
@@ -182,7 +182,7 @@ var padeditbar = (function()
       //hide all modules
       if(moduleName == "none")
       {
-        $("#editbar ul#menu_right > li").removeClass("selected");
+        $(".toolbar ul.menu_right li").removeClass("selected");
         for(var i=0;i<modules.length;i++)
         {
           //skip the userlist
@@ -200,11 +200,11 @@ var padeditbar = (function()
       else 
       {
         var nth_child = indexOf(modules, moduleName) + 1;
-      	if (nth_child > 0 && nth_child <= (modules.length-1)) {
-          $("#editbar ul#menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected");
-          $("#editbar ul#menu_right li:nth-child(" + nth_child + ")").toggleClass("selected");
-      	}
-      	if(modules[modules.length-1] === moduleName) $("#editbar ul#menu_right li").removeClass("selected");
+        if (nth_child > 0 && nth_child <= (modules.length-1)) {
+          $(".toolbar ul.menu_right li:not(:nth-child(" + nth_child + "))").removeClass("selected");
+          $(".toolbar ul.menu_right li:nth-child(" + nth_child + ")").toggleClass("selected");
+        }
+        if(modules[modules.length-1] === moduleName) $(".toolbar ul.menu_right li").removeClass("selected");
         //hide all modules that are not selected and show the selected one
         for(var i=0;i<modules.length;i++)
         {