From f4be70c45e5f9b0197a656b9a398e842d4378cda Mon Sep 17 00:00:00 2001
From: Edy <eduard@baun.de>
Date: Thu, 12 Apr 2012 20:24:38 +0200
Subject: [PATCH 1/2] add more blocks to pad.html

... to allow plugins to be more flexible extending etherpad
---
 src/templates/pad.html | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index 91583b360..b9c77ea40 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -18,6 +18,7 @@
 
         <!-- head and body had been removed intentionally -->
 
+        <% e.begin_block("body"); %>
         <div id="editbar" class="toolbar">
             <ul class="menu_left">
 	        <% e.begin_block("editbarMenuLeft"); %>
@@ -57,7 +58,7 @@
 		    <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.end_block(); %>
             </ul>    
             <ul class="menu_right">
 	        <% e.begin_block("editbarMenuRight"); %>
@@ -83,7 +84,7 @@
 			<span class="buttonicon buttonicon-showusers" id="usericonback"></span>
 			<span id="online_count">1</span>
 		    </li>
-		<% e.end_block(); %>
+            <% e.end_block(); %>
             </ul>
         </div>
 
@@ -118,6 +119,7 @@
         <div id="settingsmenu" class="popup">
             <h1>Pad settings</h1>
             <div class="column">
+                <% e.begin_block("mySettings"); %>
                 <h2>My view</h2>
                 <p>
                     <input type="checkbox" id="options-stickychat" onClick="chat.stickToScreen();">
@@ -138,16 +140,20 @@
                         <option value="monospace">Monospaced</option>
                     </select>
                 </p>
+                <% e.end_block(); %>
             </div>
             <div class="column">
+                <% e.begin_block("globalSettings"); %>
                 <h2>Global view</h2>
                 <p>Currently nothing.</p>
                 <p class="note">These options affect everyone viewing this pad.</p>
+                <% e.end_block(); %>
             </div>
         </div>
 
         <div id="importexport" class="popup">
             <div class="column">
+                <% e.begin_block("importColumn"); %>
                 <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"> 
@@ -165,9 +171,11 @@
                         </span> 
                     </div> 
                 </form>
+                <% e.end_block(); %>
             </div>
             <div class="column">
                 <h2>Export current pad as</h2>
+                <% e.begin_block("exportColumn"); %>
                 <a id="exporthtmla" target="_blank" class="exportlink"><div class="exporttype" id="exporthtml">HTML</div></a>
                 <a id="exportplaina" target="_blank" class="exportlink"><div class="exporttype" id="exportplain">Plain text</div></a>
                 <a id="exportworda" target="_blank" class="exportlink"><div class="exporttype" id="exportword">Microsoft Word</div></a>
@@ -175,10 +183,12 @@
                 <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>
+                <% e.end_block(); %>
             </div>
         </div>
 
         <div id="embed" class="popup">
+            <% e.begin_block("embedPopup"); %>
             <div id="embedreadonly" class="right">
                 <input type="checkbox" id="readonlyinput" onClick="padeditbar.setEmbedLinks();">
                 <label for="readonlyinput">Read only</label>
@@ -198,6 +208,7 @@
                 <h2>QR code</h2>
                 <div id="qr_center"><img id="embedreadonlyqr"></div>
             </div>
+            <% e.end_block(); %>
         </div>
 
         <div id="chatthrob"></div>
@@ -271,7 +282,8 @@
                 </div>
             <% e.end_block(); %>
         </div>
- 
+        <% e.end_block(); %>
+
         <% 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 47a257ff72e15e87b2de80204c5734ee0bca0cf0 Mon Sep 17 00:00:00 2001
From: Edy <eduard@baun.de>
Date: Tue, 1 May 2012 12:02:12 +0200
Subject: [PATCH 2/2] accidentally deleted an end block in last merge

---
 src/templates/pad.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/templates/pad.html b/src/templates/pad.html
index ecf1a20bd..9a5113e10 100644
--- a/src/templates/pad.html
+++ b/src/templates/pad.html
@@ -201,6 +201,7 @@
                 <h2>Embed URL</h2>
                 <input id="embedinput" type="text" value="">
             </div>
+            <% e.end_block(); %>
         </div>
 
         <div id="chatthrob"></div>